Merge branch 'master' into feature/gnumake4

Conflicts:
xmlreader/prj/d.lst

4975 files changed, 25288 insertions, 83787 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..441f779345a7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+# backup and temporary files
+*~
+.*.sw[op]
+.gitattributes
+
+# the build directories
+/*/unxlng??
+/*/unxlng??.pro
+/*/wntmsc???
+/*/wntmsc???.pro
+/*/wntgcc?
+/*/wntgcc?.pro
+/*/unxmac??.pro
+/*/unxmac??
+/*/unxios?
+/*/unxios?.pro
+/*/unxand?
+/*/unxand?.pro
diff --git a/binaryurp/prj/d.lst b/binaryurp/prj/d.lst
index 48ebd3be806f..af6a9d474ba4 100644
--- a/binaryurp/prj/d.lst
+++ b/binaryurp/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\binaryurp.uno.dll %_DEST%\bin%_EXT%\binaryurp.uno.dll
-..\%__SRC%\lib\binaryurp.uno.dylib %_DEST%\lib%_EXT%\binaryurp.uno.dylib
-..\%__SRC%\lib\binaryurp.uno.so %_DEST%\lib%_EXT%\binaryurp.uno.so
-..\%__SRC%\misc\binaryurp.component %_DEST%\xml%_EXT%\binaryurp.component
+..\%__SRC%\bin\binaryurp.uno.dll %_DEST%\bin\binaryurp.uno.dll
+..\%__SRC%\lib\binaryurp.uno.dylib %_DEST%\lib\binaryurp.uno.dylib
+..\%__SRC%\lib\binaryurp.uno.so %_DEST%\lib\binaryurp.uno.so
+..\%__SRC%\misc\binaryurp.component %_DEST%\xml\binaryurp.component
diff --git a/binaryurp/qa/makefile.mk b/binaryurp/qa/makefile.mk
index 14b80c86cfaf..9725c19ab687 100644
--- a/binaryurp/qa/makefile.mk
+++ b/binaryurp/qa/makefile.mk
@@ -33,6 +33,11 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 DLLPRE =
diff --git a/binaryurp/qa/test-cache.cxx b/binaryurp/qa/test-cache.cxx
index f9a3946c0df9..87c364cadc89 100644
--- a/binaryurp/qa/test-cache.cxx
+++ b/binaryurp/qa/test-cache.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,3 +83,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/qa/test-unmarshal.cxx b/binaryurp/qa/test-unmarshal.cxx
index 3d3c1795a724..81689d09bdfe 100644
--- a/binaryurp/qa/test-unmarshal.cxx
+++ b/binaryurp/qa/test-unmarshal.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,3 +111,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/binaryany.cxx b/binaryurp/source/binaryany.cxx
index c5b8b1a3cb3d..c8c8a4c63a3f 100644
--- a/binaryurp/source/binaryany.cxx
+++ b/binaryurp/source/binaryany.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,3 +97,5 @@ void * BinaryAny::getValue(css::uno::TypeDescription const & type) const
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/binaryany.hxx b/binaryurp/source/binaryany.hxx
index 4dd6112b5c57..ccebaa93a906 100644
--- a/binaryurp/source/binaryany.hxx
+++ b/binaryurp/source/binaryany.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,3 +72,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index dcf77662c56d..b4fced38d78d 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -976,3 +977,5 @@ void Bridge::terminateWhenUnused(bool unused) {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index 73e32aac0cac..cf281f2febfd 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -285,3 +286,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index 16bd9cf1b6f3..ebaf3d1a1777 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -230,3 +231,5 @@ component_getImplementationEnvironment(
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx
index af6499d61bd0..2ab14fd3dd84 100755..100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -142,3 +143,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx
index 118b8a07b98d..8a4a4b5789d6 100755..100644
--- a/binaryurp/source/cache.hxx
+++ b/binaryurp/source/cache.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -132,3 +133,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/currentcontext.cxx b/binaryurp/source/currentcontext.cxx
index aed9640d84a0..8fa748de53a1 100644
--- a/binaryurp/source/currentcontext.cxx
+++ b/binaryurp/source/currentcontext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,5 @@ void set(css::uno::UnoInterfaceReference const & value) {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/currentcontext.hxx b/binaryurp/source/currentcontext.hxx
index 558d9ac04d5c..dabd92c20583 100644
--- a/binaryurp/source/currentcontext.hxx
+++ b/binaryurp/source/currentcontext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,5 @@ void set(com::sun::star::uno::UnoInterfaceReference const & value);
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/incomingreply.hxx b/binaryurp/source/incomingreply.hxx
index 654542f701fa..08bf89735322 100644
--- a/binaryurp/source/incomingreply.hxx
+++ b/binaryurp/source/incomingreply.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,5 @@ struct IncomingReply: private boost::noncopyable {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index 646a868f66fd..f869c958c40c 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -131,6 +132,11 @@ void IncomingRequest::execute() const {
     }
 }
 
+static size_t size_t_round(size_t val)
+{
+    return (val + (sizeof(size_t)-1)) & ~(sizeof(size_t)-1);
+}
+
 bool IncomingRequest::execute_throw(
     BinaryAny * returnValue, std::vector< BinaryAny > * outArguments) const
 {
@@ -228,10 +234,10 @@ bool IncomingRequest::execute_throw(
                                     mtd->pParams[j].pTypeRef));
                         } else {
                             outBufs.push_back(
-                                std::vector< char >(
+                                std::vector< char >(size_t_round(
                                     css::uno::TypeDescription(
                                         mtd->pParams[j].pTypeRef).
-                                    get()->nSize));
+                                    get()->nSize)));
                             p = &outBufs.back()[0];
                         }
                         args.push_back(p);
@@ -246,7 +252,10 @@ bool IncomingRequest::execute_throw(
                 OSL_ASSERT(false); // this cannot happen
                 break;
             }
-            std::vector< char > retBuf(retType.is() ? retType.get()->nSize : 0);
+            size_t nSize = 0;
+            if (retType.is())
+                nSize = size_t_round(retType.get()->nSize);
+            std::vector< char > retBuf(nSize);
             uno_Any exc;
             uno_Any * pexc = &exc;
             (*object_.get()->pDispatcher)(
@@ -298,3 +307,5 @@ bool IncomingRequest::execute_throw(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/incomingrequest.hxx b/binaryurp/source/incomingrequest.hxx
index ead7067f8ae9..d1d940bd2914 100644
--- a/binaryurp/source/incomingrequest.hxx
+++ b/binaryurp/source/incomingrequest.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/lessoperators.cxx b/binaryurp/source/lessoperators.cxx
index 354118625ce8..316b9d1230e1 100644
--- a/binaryurp/source/lessoperators.cxx
+++ b/binaryurp/source/lessoperators.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ bool operator <(ByteSequence const & left, ByteSequence const & right) {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/lessoperators.hxx b/binaryurp/source/lessoperators.hxx
index 014f0f4d56bf..1fa0e9222496 100644
--- a/binaryurp/source/lessoperators.hxx
+++ b/binaryurp/source/lessoperators.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,3 +49,5 @@ bool operator <(ByteSequence const & left, ByteSequence const & right);
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index ce520382efac..e679ee1dd86e 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -312,3 +313,5 @@ void Marshal::writeMemberValues(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/marshal.hxx b/binaryurp/source/marshal.hxx
index a922ec1008f6..917a4148416e 100755..100644
--- a/binaryurp/source/marshal.hxx
+++ b/binaryurp/source/marshal.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/outgoingrequest.hxx b/binaryurp/source/outgoingrequest.hxx
index 7fe67bf96a3b..159a4874769b 100644
--- a/binaryurp/source/outgoingrequest.hxx
+++ b/binaryurp/source/outgoingrequest.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,3 +54,5 @@ struct OutgoingRequest {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/outgoingrequests.cxx b/binaryurp/source/outgoingrequests.cxx
index 388b7755466f..9ea1808100fa 100644
--- a/binaryurp/source/outgoingrequests.cxx
+++ b/binaryurp/source/outgoingrequests.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,5 @@ void OutgoingRequests::pop(rtl::ByteSequence const & tid) throw () {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/outgoingrequests.hxx b/binaryurp/source/outgoingrequests.hxx
index 92ee622bf682..c8cefa00f2f1 100644
--- a/binaryurp/source/outgoingrequests.hxx
+++ b/binaryurp/source/outgoingrequests.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index 876199e7bc17..3d97e19e0530 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -258,3 +259,5 @@ bool Proxy::isProxy(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx
index c67ab4eb522a..6843eeb4a165 100644
--- a/binaryurp/source/proxy.hxx
+++ b/binaryurp/source/proxy.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index f622fb5b0c42..d305bafb7508 100755..100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -551,3 +552,5 @@ rtl::ByteSequence Reader::getTid(Unmarshal & unmarshal, bool newTid) const {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/reader.hxx b/binaryurp/source/reader.hxx
index 37d0b9462ae4..3fb2fe3af3ad 100644
--- a/binaryurp/source/reader.hxx
+++ b/binaryurp/source/reader.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,3 +88,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/readerstate.hxx b/binaryurp/source/readerstate.hxx
index ef7ed4d7196f..fb87f8c34cef 100644
--- a/binaryurp/source/readerstate.hxx
+++ b/binaryurp/source/readerstate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,5 @@ struct ReaderState: private boost::noncopyable {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/specialfunctionids.hxx b/binaryurp/source/specialfunctionids.hxx
index a2a59791ba09..bb3913f6c4a3 100644
--- a/binaryurp/source/specialfunctionids.hxx
+++ b/binaryurp/source/specialfunctionids.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,5 @@ enum SpecialFunctionIds {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index 62f8683e33ad..490954eac841 100755..100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -561,3 +562,5 @@ void Unmarshal::readMemberValues(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/unmarshal.hxx b/binaryurp/source/unmarshal.hxx
index 33a4aafec75e..5d0019c175cd 100644
--- a/binaryurp/source/unmarshal.hxx
+++ b/binaryurp/source/unmarshal.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -104,3 +105,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index 97a60157eb6f..c01c56c7835b 100755..100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -474,3 +475,5 @@ void Writer::sendMessage(std::vector< unsigned char > const & buffer) {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/writer.hxx b/binaryurp/source/writer.hxx
index fe5dba2cc1d9..60d097e87647 100644
--- a/binaryurp/source/writer.hxx
+++ b/binaryurp/source/writer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -183,3 +184,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/writerstate.hxx b/binaryurp/source/writerstate.hxx
index cbb0208ba019..794369fd454d 100644
--- a/binaryurp/source/writerstate.hxx
+++ b/binaryurp/source/writerstate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,3 +54,5 @@ struct WriterState: private boost::noncopyable {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 9175adfb7858..26bb101017c3 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,9 +28,7 @@
 #ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
 #define _BRIDGES_CPP_UNO_BRIDGE_HXX_
 
-#ifndef _BRIDGES_CPP_UNO_BRIDGE_H_
 #include <bridges/cpp_uno/bridge.h>
-#endif
 #include <osl/mutex.hxx>
 #include <rtl/process.h>
 #include <rtl/ustrbuf.hxx>
@@ -467,7 +466,7 @@ inline void SAL_CALL cppu_cppenv_computeObjectIdentifier(
         }
         catch (::com::sun::star::uno::RuntimeException &)
         {
-            OSL_ENSURE( 0, "### RuntimeException occured udring queryInterface()!" );
+            OSL_FAIL( "### RuntimeException occurred udring queryInterface()!" );
         }
     }
 }
@@ -501,3 +500,5 @@ inline void SAL_CALL cppu_cppenv_initEnvironment( uno_Environment * pCppEnv ) SA
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx b/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx
index 07d6c179a9ab..542be6e0f3d6 100644
--- a/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,3 +54,5 @@ private:
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
index 38d722c6dc3c..4ee69e37b416 100644
--- a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -126,3 +127,5 @@ private:
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
index e3cafcc41101..31e19cc94d00 100644
--- a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -104,3 +105,5 @@ private:
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/bridges/cpp_uno/shared/types.hxx b/bridges/inc/bridges/cpp_uno/shared/types.hxx
index fa87637578ae..0cc87864af0e 100644
--- a/bridges/inc/bridges/cpp_uno/shared/types.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/types.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ bool relatesToInterfaceType(typelib_TypeDescription const * type);
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
index 4836348cdfe9..87c96ec36689 100644
--- a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -114,3 +115,5 @@ private:
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 434e0c6a0a28..c21fb7672bc3 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,10 +35,11 @@
 #include "sal/types.h"
 #include "typelib/typedescription.hxx"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
-#ifdef LINUX
+#if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
+    || defined(NETBSD) || defined(DRAGONFLY)
 #define USE_DOUBLE_MMAP
 #endif
 
@@ -201,7 +203,7 @@ private:
     static void flushCode(
         unsigned char const * begin, unsigned char const * end);
 
-    typedef std::hash_map< rtl::OUString, Vtables, rtl::OUStringHash > Map;
+    typedef boost::unordered_map< rtl::OUString, Vtables, rtl::OUStringHash > Map;
 
     osl::Mutex m_mutex;
     Map m_map;
@@ -212,3 +214,5 @@ private:
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtables.hxx b/bridges/inc/bridges/cpp_uno/shared/vtables.hxx
index 37cc9bf8eca2..2ea5c7c83121 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtables.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtables.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -106,3 +107,5 @@ VtableSlot getVtableSlot(
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/bridges/cpp_uno/type_misc.hxx b/bridges/inc/bridges/cpp_uno/type_misc.hxx
index 775373b2b47e..5fbd0da45cac 100644
--- a/bridges/inc/bridges/cpp_uno/type_misc.hxx
+++ b/bridges/inc/bridges/cpp_uno/type_misc.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -127,3 +128,5 @@ inline bool cppu_isSimpleType( typelib_TypeDescription * pTypeDescr ) SAL_THROW(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/pch/precompiled_bridges.cxx b/bridges/inc/pch/precompiled_bridges.cxx
index 9adda1e1a77e..05fd24f32377 100644
--- a/bridges/inc/pch/precompiled_bridges.cxx
+++ b/bridges/inc/pch/precompiled_bridges.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_bridges.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/pch/precompiled_bridges.hxx b/bridges/inc/pch/precompiled_bridges.hxx
index 3c52aed395d2..e0396ac9b835 100644
--- a/bridges/inc/pch/precompiled_bridges.hxx
+++ b/bridges/inc/pch/precompiled_bridges.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -146,3 +147,5 @@
 #include "uno/threadpool.h"
 //---MARKER---
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/prj/build.lst b/bridges/prj/build.lst
index d6e6d864db04..9c7b2f31548f 100644
--- a/bridges/prj/build.lst
+++ b/bridges/prj/build.lst
@@ -4,12 +4,12 @@ br	bridges\inc								nmake	-	all	br_inc NULL
 br	bridges\unotypes						nmake	-	all	br_unotypes NULL
 br	bridges\source\cpp_uno\mingw_intel	nmake	-	w	br_gcc3i br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\msvc_win32_intel	nmake	-	w	br_msci br_cppuno_shared br_unotypes br_inc NULL
+br	bridges\source\cpp_uno\msvc_win32_x86-64	nmake	-	w	br_mscx br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_linux_intel	nmake	-	u	br_gcc3li br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_os2_intel	nmake	-	p	br_gcc3os br_cppuno_shared br_unotypes br_inc NULL
-br	bridges\source\cpp_uno\gcc3_freebsd_intel	nmake	-	u	br_gcc3fi br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_linux_x86-64	nmake	-	u	br_gcc3lx br_cppuno_shared br_unotypes br_inc NULL
-br	bridges\source\cpp_uno\gcc3_freebsd_x86-64	nmake	-	u	br_gcc3fx br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_linux_powerpc	nmake	-	u	br_gcc3lp br_cppuno_shared br_unotypes br_inc NULL
+br	bridges\source\cpp_uno\gcc3_aix_powerpc	nmake	-	u	br_gcc3ap br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_linux_powerpc64	nmake	-	u	br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_linux_mips		nmake	-	u	br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_linux_m68k		nmake	-	u	br_gcc3lm68k br_cppuno_shared br_unotypes br_inc NULL
@@ -27,7 +27,6 @@ br  bridges\source\cpp_uno\cc5_solaris_sparc64 nmake - u br_cc5sols64 br_unotype
 br	bridges\source\cpp_uno\cc50_solaris_intel			nmake	-	u	br_cc50soli br_unotypes br_cppuno_shared br_inc NULL
 br	bridges\source\cpp_uno\gcc3_solaris_sparc			nmake	-	u	br_gcc3sogs br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_solaris_intel			nmake	-	u	br_gcc3sogi br_cppuno_shared br_unotypes br_inc NULL
-br	bridges\source\cpp_uno\gcc3_netbsd_intel	nmake	-	u	br_gccni br_unotypes br_inc NULL
 br  bridges\source\cpp_uno\shared           nmake   -   all br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\jni_uno					nmake	-	all	br_jni_uno br_unotypes br_inc NULL
 br	bridges\source\jni_uno\java\com\sun\star\bridges\jni_uno				nmake	-	all	br_jni_uno_java br_unotypes br_inc NULL
diff --git a/bridges/prj/d.lst b/bridges/prj/d.lst
index 1ca453a83c1d..a8d03e1f2a27 100644
--- a/bridges/prj/d.lst
+++ b/bridges/prj/d.lst
@@ -1,10 +1,11 @@
-..\%__SRC%\lib\libjava_uno* %_DEST%\lib%_EXT%\libjava_uno*
-..\%__SRC%\bin\java_uno* %_DEST%\bin%_EXT%\java_uno*
-..\%__SRC%\class\java_uno*.jar %_DEST%\bin%_EXT%\java_uno*.jar
+..\%__SRC%\lib\libjava_uno* %_DEST%\lib\libjava_uno*
+..\%__SRC%\bin\java_uno* %_DEST%\bin\java_uno*
+..\%__SRC%\class\java_uno*.jar %_DEST%\bin\java_uno*.jar
 
-..\%__SRC%\bin\msci_uno.* %_DEST%\bin%_EXT%\msci_uno.*
-..\%__SRC%\bin\gcc3_uno.dll %_DEST%\bin%_EXT%\gcc3_uno.dll
-..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib%_EXT%\libgcc2_uno.*
-..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib%_EXT%\libgcc3_uno.*
-..\%__SRC%\bin\gcc3_uno.* %_DEST%\bin%_EXT%\gcc3_uno.*
-..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.*
+..\%__SRC%\bin\msci_uno.* %_DEST%\bin\msci_uno.*
+..\%__SRC%\bin\mscx_uno.* %_DEST%\bin\mscx_uno.*
+..\%__SRC%\bin\gcc3_uno.dll %_DEST%\bin\gcc3_uno.dll
+..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib\libgcc2_uno.*
+..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib\libgcc3_uno.*
+..\%__SRC%\bin\gcc3_uno.* %_DEST%\bin\gcc3_uno.*
+..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib\libsunpro5_uno.*
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/cc50_solaris_intel.hxx b/bridges/source/cpp_uno/cc50_solaris_intel/cc50_solaris_intel.hxx
index 7abd0ffa2375..8e938e2c8105 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/cc50_solaris_intel.hxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/cc50_solaris_intel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,3 +72,4 @@ void cc50_solaris_intel_fillUnoException(
     uno_Any*, uno_Mapping * pCpp2Uno );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
index 06df5289bc00..1a57355f4890 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -159,7 +160,7 @@ void cpp2uno_call(
     (*pThis->getUnoI()->pDispatcher)(
         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case no exception occured...
+    // in case no exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -178,7 +179,7 @@ void cpp2uno_call(
             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
             // has to destruct the any
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -250,7 +251,7 @@ extern "C" void cpp_vtable_call(
                  "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
-        throw RuntimeException( rtl::OUString::createFromAscii("illegal vtable index!"), (XInterface *)pThis );
+        throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), (XInterface *)pThis );
     }
 
     // determine called method
@@ -339,7 +340,7 @@ extern "C" void cpp_vtable_call(
     }
     default:
     {
-        throw RuntimeException( rtl::OUString::createFromAscii("no member description found!"), (XInterface *)pThis );
+        throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), (XInterface *)pThis );
     }
     }
 }
@@ -525,3 +526,5 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 void bridges::cpp_uno::shared::VtableFactory::flushCode(
     unsigned char const *, unsigned char const *)
 {}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
index c598934b81b1..6a9b923a4e26 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,7 +49,11 @@
 #include <hash.cxx>
 
 // need a += operator for OString and sal_Char
-namespace rtl
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
 {
     inline OString& operator+=( OString& rString, sal_Char cAdd )
     {
@@ -61,7 +66,6 @@ namespace rtl
 
 using namespace std;
 using namespace osl;
-using namespace rtl;
 using namespace com::sun::star::uno;
 
 namespace CPPU_CURRENT_NAMESPACE
@@ -333,7 +337,7 @@ void cc50_solaris_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cp
         OUStringToOString(
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
     bridges::cpp_uno::shared::ArrayPointer< unsigned char > thunkPtr(
         new unsigned char[24]);
@@ -428,13 +432,13 @@ void cc50_solaris_intel_fillUnoException(
 #if OSL_DEBUG_LEVEL > 0
         OString cstr( OUStringToOString(
                           aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
         return;
     }
 
 #if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "> c++ exception occured: %s\n",
+    fprintf( stderr, "> c++ exception occurred: %s\n",
              ::rtl::OUStringToOString(
                  pExcTypeDescr->pTypeName,
                  RTL_TEXTENCODING_ASCII_US ).getStr() );
@@ -447,3 +451,4 @@ void cc50_solaris_intel_fillUnoException(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx
index 37f53da11141..c1c2c2dc8eb6 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
 
 
 #ifndef TEST
-#ifndef _SAL_TYPES_H_
 #include <sal/types.h>
-#endif
 #else
 typedef unsigned int sal_uInt32;
 #endif
@@ -261,3 +260,5 @@ int main( int argc, const char** argv )
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
index 401f77873c90..287ca5deadd7 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,9 +42,10 @@
 
 #include "cc50_solaris_intel.hxx"
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 
+using ::rtl::OUString;
+
 namespace
 {
 
@@ -212,7 +214,7 @@ static inline void cpp_call(
             nStackLongs
             );
 
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -416,3 +418,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx b/bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx
index d327d0307c51..06667e4a366c 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,3 +86,4 @@ void cc50_solaris_sparc_fillUnoException(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx
index df16b62bdf27..6076f66093d1 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,7 +163,7 @@ static typelib_TypeClass cpp2uno_call(
     (*pThis->getUnoI()->pDispatcher)(
         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case no exception occured...
+    // in case no exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -183,7 +184,7 @@ static typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -259,13 +260,6 @@ static typelib_TypeClass cpp_mediate(
 
       OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
                 "### illegal vtable index!" );
-//      if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-//      {
-//          RuntimeException aExc;
-//          aExc.Message = OUString::createFromAscii("illegal vtable index!");
-//          aExc.Context = (XInterface *)pThis;
-//          throw aExc;
-//      }
 
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
@@ -355,15 +349,6 @@ static typelib_TypeClass cpp_mediate(
         }
         break;
     }
-//      default:
-//      {
-//          RuntimeException aExc;
-//          aExc.Message = OUString::createFromAscii("no member description found!");
-//          aExc.Context = (XInterface *)pThis;
-//          throw aExc;
-//          // is here for dummy
-//          eRet = typelib_TypeClass_VOID;
-//      }
     }
 
     return eRet;
@@ -528,3 +513,5 @@ void bridges::cpp_uno::shared::VtableFactory::flushCode(
 {
     bridges::cpp_uno::cc50_solaris_sparc::flushCode(begin, end);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
index 2ee6bb3614b6..84ce64ee1841 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,7 +50,12 @@
 #include <hash.cxx>
 
 // need a += operator for OString and sal_Char
-namespace rtl
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+
 {
     inline OString& operator+=( OString& rString, sal_Char cAdd )
     {
@@ -62,7 +68,6 @@ namespace rtl
 
 using namespace std;
 using namespace osl;
-using namespace rtl;
 using namespace com::sun::star::uno;
 
 namespace CPPU_CURRENT_NAMESPACE
@@ -334,7 +339,7 @@ void cc50_solaris_sparc_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cp
         OUStringToOString(
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
     bridges::cpp_uno::shared::ArrayPointer< unsigned int > thunkPtr(
         new unsigned int[6]);
@@ -421,13 +426,13 @@ void cc50_solaris_sparc_fillUnoException(
 #if OSL_DEBUG_LEVEL > 0
         OString cstr( OUStringToOString(
                           aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
         return;
     }
 
 #if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "> c++ exception occured: %s\n",
+    fprintf( stderr, "> c++ exception occurred: %s\n",
              ::rtl::OUStringToOString(
                  pExcTypeDescr->pTypeName,
                  RTL_TEXTENCODING_ASCII_US ).getStr() );
@@ -443,3 +448,4 @@ void cc50_solaris_sparc_fillUnoException(
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/flushcode.hxx b/bridges/source/cpp_uno/cc50_solaris_sparc/flushcode.hxx
index af0c551f10df..5d89d81efed8 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/flushcode.hxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/flushcode.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,5 @@ inline void flushCode(void const * begin, void const * end) {
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx
index 0d1c49a23c11..29064c19a28f 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
 
 
 #ifndef TEST
-#ifndef _SAL_TYPES_H_
 #include <sal/types.h>
-#endif
 #else
 typedef unsigned int sal_uInt32;
 #endif
@@ -262,3 +261,5 @@ int main( int argc, const char** argv )
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk b/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
index 2af2f29a02a3..74d156abbf75 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
@@ -44,8 +44,6 @@ CHECKFORPIC=
 
 .IF "$(COM)" == "C52" && "$(CPU)"=="S"
 
-#CFLAGS += -O5 -xO5
-
 .IF "$(cppu_no_leak)" == ""
 CFLAGS += -DLEAK_STATIC_DATA
 .ENDIF
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx
index 896695540f90..9d0d139850ec 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,9 +42,10 @@
 
 #include "cc50_solaris_sparc.hxx"
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 
+using ::rtl::OUString;
+
 namespace
 {
 
@@ -203,7 +205,7 @@ static void cpp_call(
             nStackLongs
             );
 
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -394,3 +396,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.hxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.hxx
index 889df40a5b40..16f6c1090ff2 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.hxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,3 +35,5 @@ extern "C" void callVirtualMethod(
     unsigned long function, long * stack, sal_Int32 excess);
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx
index 19be97baf7fa..c49330b2223f 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -609,3 +610,5 @@ void bridges::cpp_uno::shared::VtableFactory::flushCode(
 {
     bridges::cpp_uno::cc5_solaris_sparc64::flushCode(begin, end);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx
index 020cdea27333..bf6b1512a41d 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -457,3 +458,5 @@ void fillUnoException(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.hxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.hxx
index 7a0963bc695d..8ba17dad842f 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.hxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -70,3 +71,5 @@ void fillUnoException(
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/flushcode.hxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/flushcode.hxx
index bdce67c4da89..de7028d3faa2 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/flushcode.hxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/flushcode.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,5 @@ inline void flushCode(void const * begin, void const * end) {
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/fp.hxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/fp.hxx
index 84bdbc74bf15..ba32b141d338 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/fp.hxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/fp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -111,3 +112,5 @@ void fp_stored30(double *);
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.cxx
index f2af8103417c..9b004078c35f 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,3 +80,5 @@ bool isDirectReturnType(typelib_TypeDescriptionReference * type) {
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.hxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.hxx
index a5c182cf7985..f9741a8898a5 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.hxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@ bool isDirectReturnType(typelib_TypeDescriptionReference * type);
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
index 05733f2bd9ed..e6646dca42a1 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -507,3 +508,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.hxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.hxx
index 9ccc4a517f82..c63f674c1549 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.hxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,3 +34,5 @@
 extern "C" void vtableSlotCall();
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
new file mode 100644
index 000000000000..b343edee7048
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
@@ -0,0 +1,660 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_bridges.hxx"
+
+#include <com/sun/star/uno/genfunc.hxx>
+#include <uno/data.h>
+#include <typelib/typedescription.hxx>
+
+#include "bridges/cpp_uno/shared/bridge.hxx"
+#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx"
+#include "bridges/cpp_uno/shared/types.hxx"
+#include "bridges/cpp_uno/shared/vtablefactory.hxx"
+
+#include "share.hxx"
+
+#include <string.h>
+
+using namespace ::com::sun::star::uno;
+
+namespace
+{
+
+//==================================================================================================
+static typelib_TypeClass cpp2uno_call(
+        bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
+        const typelib_TypeDescription * pMemberTypeDescr,
+        typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
+        sal_Int32 nParams, typelib_MethodParameter * pParams,
+        void ** gpreg, double * fpreg, void ** ovrflw,
+        sal_uInt64 * pRegisterReturn /* space for register return */ )
+{
+        // gpreg:  [ret *], this, [gpr params]
+        // fpreg:  [fpr params]
+        // ovrflw: [remainder of params]
+
+        // return
+        typelib_TypeDescription * pReturnTypeDescr = 0;
+        if (pReturnTypeRef)
+                TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
+
+        void * pUnoReturn = 0;
+        void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
+
+        sal_Int32 ng = 0;
+        sal_Int32 nf = 0;
+
+    ovrflw -= ppc::MAX_GPR_REGS;
+
+        if (pReturnTypeDescr)
+        {
+                if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
+                        pUnoReturn = pRegisterReturn; // direct way for simple types
+                else // complex return via ptr (pCppReturn)
+                {
+                        pCppReturn = *gpreg;
+                        ++gpreg;
+                        ++ng;
+                        ++ovrflw;
+
+                        pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
+                                                  ? __builtin_alloca( pReturnTypeDescr->nSize )
+                                                  : pCppReturn); // direct way
+                }
+        }
+        // pop this
+        ++gpreg;
+        ++ng;
+        ++ovrflw;
+
+        // stack space
+        OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
+        // parameters
+        void ** pUnoArgs = (void **)__builtin_alloca( 4 * sizeof(void *) * nParams );
+        void ** pCppArgs = pUnoArgs + nParams;
+
+        // indizes of values this have to be converted (interface conversion cpp<=>uno)
+        sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
+
+        // type descriptions for reconversions
+        typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
+
+        sal_Int32 nTempIndizes   = 0;
+
+        for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
+        {
+                const typelib_MethodParameter & rParam = pParams[nPos];
+                typelib_TypeDescription * pParamTypeDescr = 0;
+                TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
+
+                if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
+                // value
+                {
+                        switch (pParamTypeDescr->eTypeClass)
+                        {
+                        case typelib_TypeClass_BOOLEAN:
+                        case typelib_TypeClass_BYTE:
+                                if (ng < ppc::MAX_GPR_REGS)
+                                {
+                                    *ovrflw = *gpreg++;
+                                    ++ng;
+                }
+                pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) + (sizeof(void*)-1));
+                ++ovrflw;
+                                break;
+                        case typelib_TypeClass_CHAR:
+                        case typelib_TypeClass_SHORT:
+                        case typelib_TypeClass_UNSIGNED_SHORT:
+                                if (ng < ppc::MAX_GPR_REGS)
+                                {
+                                    *ovrflw = *gpreg++;
+                                    ++ng;
+                                }
+                                pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) + (sizeof(void*)-2));
+                                ++ovrflw;
+                                break;
+                        case typelib_TypeClass_HYPER:
+                        case typelib_TypeClass_UNSIGNED_HYPER:
+                                pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
+                            for (int i = 0; i < 2; ++i)
+                            {
+                                if (ng < ppc::MAX_GPR_REGS)
+                                {
+                                        *ovrflw = *gpreg++;
+                                        ++ng;
+                                }
+                                    ++ovrflw;
+                            }
+                            break;
+                        case typelib_TypeClass_DOUBLE:
+                                if (nf < ppc::MAX_SSE_REGS)
+                                {
+                                    pCppArgs[nPos] = pUnoArgs[nPos] = fpreg;
+                                    ++fpreg;
+                                    ++nf;
+                                }
+                                else
+                                {
+                                    pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
+                                }
+                                if (ng < ppc::MAX_GPR_REGS)
+                                {
+                                    ng+=2;
+                                    gpreg+=2;
+                                }
+                                ovrflw+=2;
+                                break;
+                        case typelib_TypeClass_FLOAT:
+                            if (nf < ppc::MAX_SSE_REGS)
+                            {
+                                    pCppArgs[nPos] = pUnoArgs[nPos] = fpreg;
+                                    ++fpreg;
+                                    ++nf;
+                            }
+                            else
+                            {
+                                pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
+                            }
+                                if (ng < ppc::MAX_GPR_REGS)
+                                {
+                                    ++gpreg;
+                                    ++ng;
+                                }
+                ++ovrflw;
+                            break;
+                        default:
+                                if (ng < ppc::MAX_GPR_REGS)
+                                {
+                                    *ovrflw = *gpreg++;
+                                    ++ng;
+                                }
+                                pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
+                                ++ovrflw;
+                            break;
+                        }
+
+                        // no longer needed
+                        TYPELIB_DANGER_RELEASE( pParamTypeDescr );
+                }
+                else // ptr to complex value | ref
+                {
+                        void *pCppStack; //temporary stack pointer
+
+                        if (ng < ppc::MAX_GPR_REGS)
+                        {
+                            *ovrflw = *gpreg++;
+                            ++ng;
+                        }
+                    pCppArgs[nPos] = pCppStack = *ovrflw++;
+
+                        if (! rParam.bIn) // is pure out
+                        {
+                                // uno out is unconstructed mem!
+                                pUnoArgs[nPos] = __builtin_alloca( pParamTypeDescr->nSize );
+                                pTempIndizes[nTempIndizes] = nPos;
+                                // will be released at reconversion
+                                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
+                        }
+                        // is in/inout
+                        else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ))
+                        {
+                                uno_copyAndConvertData( pUnoArgs[nPos] = __builtin_alloca( pParamTypeDescr->nSize ),
+                                                                                pCppStack, pParamTypeDescr,
+                                                                                pThis->getBridge()->getCpp2Uno() );
+                                pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
+                                // will be released at reconversion
+                                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
+                        }
+                        else // direct way
+                        {
+                                pUnoArgs[nPos] = pCppStack;
+                                // no longer needed
+                                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
+                        }
+                }
+        }
+
+        // ExceptionHolder
+        uno_Any aUnoExc; // Any will be constructed by callee
+        uno_Any * pUnoExc = &aUnoExc;
+
+        // invoke uno dispatch call
+        (*pThis->getUnoI()->pDispatcher)(
+         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
+
+        // in case an exception occurred...
+        if (pUnoExc)
+        {
+                // destruct temporary in/inout params
+                for ( ; nTempIndizes--; )
+                {
+                        sal_Int32 nIndex = pTempIndizes[nTempIndizes];
+
+                        if (pParams[nIndex].bIn) // is in/inout => was constructed
+                                uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
+                        TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
+                }
+                if (pReturnTypeDescr)
+                        TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
+
+                CPPU_CURRENT_NAMESPACE::raiseException(
+                    &aUnoExc, pThis->getBridge()->getUno2Cpp() );
+                // has to destruct the any
+                // is here for dummy
+                return typelib_TypeClass_VOID;
+        }
+        else // else no exception occurred...
+        {
+                // temporary params
+                for ( ; nTempIndizes--; )
+                {
+                        sal_Int32 nIndex = pTempIndizes[nTempIndizes];
+                        typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
+
+                        if (pParams[nIndex].bOut) // inout/out
+                        {
+                                // convert and assign
+                                uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
+                                uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
+                                                                                pThis->getBridge()->getUno2Cpp() );
+                        }
+                        // destroy temp uno param
+                        uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
+
+                        TYPELIB_DANGER_RELEASE( pParamTypeDescr );
+                }
+                // return
+                if (pCppReturn) // has complex return
+                {
+                        if (pUnoReturn != pCppReturn) // needs reconversion
+                        {
+                                uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
+                                                                                pThis->getBridge()->getUno2Cpp() );
+                                // destroy temp uno return
+                                uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
+                        }
+                        // complex return ptr is set to return reg
+                        *(void **)pRegisterReturn = pCppReturn;
+                }
+                if (pReturnTypeDescr)
+                {
+                        typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
+                        TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
+                        return eRet;
+                }
+                else
+                        return typelib_TypeClass_VOID;
+        }
+}
+
+
+//==================================================================================================
+static typelib_TypeClass cpp_mediate(
+        sal_Int32 nFunctionIndex,
+        sal_Int32 nVtableOffset,
+        void ** gpreg, double * fpreg, void ** ovrflw,
+        sal_uInt64 * pRegisterReturn /* space for register return */ )
+{
+        OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
+
+        // gpreg:  [ret *], this, [other gpr params]
+        // fpreg:  [fpr params]
+        // ovrflw: [gpr or fpr params (in space allocated for all params properly aligned)]
+
+        void * pThis;
+        if( nFunctionIndex & 0x8000 )
+        {
+                nFunctionIndex &= 0x7fff;
+                pThis = gpreg[1];
+        }
+        else
+        {
+                pThis = gpreg[0];
+        }
+
+        pThis = static_cast< char * >(pThis) - nVtableOffset;
+
+        bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
+        = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(pThis);
+
+        typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
+
+        OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
+        if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
+        {
+                throw RuntimeException(
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+            (XInterface *)pThis );
+        }
+
+        // determine called method
+        sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
+        OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
+
+        TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
+
+        typelib_TypeClass eRet;
+        switch (aMemberDescr.get()->eTypeClass)
+        {
+        case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+        {
+                if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
+                {
+                        // is GET method
+                        eRet = cpp2uno_call(
+                                pCppI, aMemberDescr.get(),
+                                ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
+                                0, 0, // no params
+                                gpreg, fpreg, ovrflw, pRegisterReturn );
+                }
+                else
+                {
+                        // is SET method
+                        typelib_MethodParameter aParam;
+                        aParam.pTypeRef =
+                                ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
+                        aParam.bIn              = sal_True;
+                        aParam.bOut             = sal_False;
+
+                        eRet = cpp2uno_call(
+                                pCppI, aMemberDescr.get(),
+                                0, // indicates void return
+                                1, &aParam,
+                                gpreg, fpreg, ovrflw, pRegisterReturn );
+                }
+                break;
+        }
+        case typelib_TypeClass_INTERFACE_METHOD:
+        {
+                // is METHOD
+                switch (nFunctionIndex)
+                {
+                case 1: // acquire()
+                        pCppI->acquireProxy(); // non virtual call!
+                        eRet = typelib_TypeClass_VOID;
+                        break;
+                case 2: // release()
+                        pCppI->releaseProxy(); // non virtual call!
+                        eRet = typelib_TypeClass_VOID;
+                        break;
+                case 0: // queryInterface() opt
+                {
+                        typelib_TypeDescription * pTD = 0;
+                        TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( gpreg[2] )->getTypeLibType() );
+                        if (pTD)
+                        {
+                XInterface * pInterface = 0;
+                (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
+                    pCppI->getBridge()->getCppEnv(),
+                    (void **)&pInterface, pCppI->getOid().pData, (typelib_InterfaceTypeDescription *)pTD );
+
+                if (pInterface)
+                {
+                    ::uno_any_construct(
+                        reinterpret_cast< uno_Any * >( gpreg[0] ),
+                        &pInterface, pTD, cpp_acquire );
+                    pInterface->release();
+                    TYPELIB_DANGER_RELEASE( pTD );
+                    *(void **)pRegisterReturn = gpreg[0];
+                    eRet = typelib_TypeClass_ANY;
+                    break;
+                }
+                TYPELIB_DANGER_RELEASE( pTD );
+            }
+                } // else perform queryInterface()
+                default:
+                        eRet = cpp2uno_call(
+                                pCppI, aMemberDescr.get(),
+                                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
+                                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
+                                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
+                                gpreg, fpreg, ovrflw, pRegisterReturn );
+                }
+                break;
+        }
+        default:
+        {
+                throw RuntimeException(
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+            (XInterface *)pThis );
+                // is here for dummy
+                eRet = typelib_TypeClass_VOID;
+        }
+        }
+
+        return eRet;
+}
+
+//==================================================================================================
+/**
+ * is called on incoming vtable calls
+ * (called by asm snippets)
+ */
+static sal_uInt64 cpp_vtable_call(sal_Int32 r3, sal_Int32 r4, sal_Int32 r5,
+    sal_Int32 r6, sal_Int32 r7, sal_Int32 r8, sal_Int32 r9,
+    sal_Int32 r10, sal_Int32 firstonstack)
+{
+    volatile unsigned long nOffsetAndIndex;
+
+    __asm__ __volatile__(
+      "mr %0, 11\n\t"
+      : "=r" (nOffsetAndIndex) : );
+
+    sal_Int32 nVtableOffset = (nOffsetAndIndex >> 16);
+    sal_Int32 nFunctionIndex = (nOffsetAndIndex & 0xFFFF);
+
+    void ** ovrflw = (void**)&firstonstack;
+
+    sal_Int32 gpreg[ppc::MAX_GPR_REGS];
+    gpreg[0] = r3;
+    gpreg[1] = r4;
+    gpreg[2] = r5;
+    gpreg[3] = r6;
+    gpreg[4] = r7;
+    gpreg[5] = r8;
+    gpreg[6] = r9;
+    gpreg[7] = r10;
+
+    double fpreg[ppc::MAX_SSE_REGS];
+    register double d0 asm("fr1"); fpreg[0] = d0;
+    register double d1 asm("fr2"); fpreg[1] = d1;
+    register double d2 asm("fr3"); fpreg[2] = d2;
+    register double d3 asm("fr4"); fpreg[3] = d3;
+    register double d4 asm("fr5"); fpreg[4] = d4;
+    register double d5 asm("fr6"); fpreg[5] = d5;
+    register double d6 asm("fr7"); fpreg[6] = d6;
+    register double d7 asm("fr8"); fpreg[7] = d7;
+    register double d8 asm("fr9"); fpreg[8] = d8;
+    register double d9 asm("fr10"); fpreg[9] = d9;
+    register double d10 asm("fr11"); fpreg[10] = d10;
+    register double d11 asm("fr12"); fpreg[11] = d11;
+    register double d12 asm("fr13"); fpreg[12] = d12;
+
+#if OSL_DEBUG_LEVEL > 2
+    for(int i = 0; i < 8; ++i)
+    {
+        fprintf(stderr, "general reg %d is %x\n", i, gpreg[i]);
+    }
+    for(int i = 0; i < 13; ++i)
+    {
+        fprintf(stderr, "sse reg %d is %f\n", i, fpreg[i]);
+        fprintf(stderr, "sse reg %d is %llx\n", i, fpreg[i]);
+    }
+    for(int i = -8; i < 8; ++i)
+    {
+        fprintf(stderr, "overflow arg %d is %x\n", i, ovrflw[i]);
+    }
+#endif
+        sal_uInt64 nRegReturn=0;
+
+        typelib_TypeClass aType =
+             cpp_mediate( nFunctionIndex, nVtableOffset, (void**)gpreg, fpreg, ovrflw, &nRegReturn );
+
+        sal_uInt32 *pRegReturn = (sal_uInt32*)&nRegReturn;
+        switch( aType )
+        {
+        case typelib_TypeClass_BOOLEAN:
+            pRegReturn[0] = (sal_uInt32)(*(char *)pRegReturn);
+            break;
+        case typelib_TypeClass_BYTE:
+            pRegReturn[0] = (sal_Int32)(*(unsigned char *)pRegReturn);
+            break;
+        case typelib_TypeClass_SHORT:
+            pRegReturn[0] = (sal_Int32)(*(short *)pRegReturn);
+            break;
+        case typelib_TypeClass_CHAR:
+        case typelib_TypeClass_UNSIGNED_SHORT:
+            pRegReturn[0] = (sal_uInt32)(*(unsigned short *)pRegReturn);
+            break;
+                case typelib_TypeClass_FLOAT:
+                        __asm__("lfs 1,%0\n\t" : : "m"(*((float*)&nRegReturn)));
+                    break;
+                case typelib_TypeClass_DOUBLE:
+                        __asm__("lfd 1,%0\n\t" : : "m"(*((double*)&nRegReturn)));
+                    break;
+                case typelib_TypeClass_HYPER:
+                case typelib_TypeClass_UNSIGNED_HYPER:
+                    break;
+                default:
+            pRegReturn[0] = (sal_uInt32)(*(unsigned int*)pRegReturn);
+                    break;
+        }
+    return nRegReturn;
+}
+
+
+int const codeSnippetSize = 3 * sizeof(void*);
+
+unsigned char * codeSnippet( unsigned char * code, sal_Int16 functionIndex,
+                  sal_Int16 vtableOffset, bool simpleRetType )
+{
+    sal_uInt32 nOffsetAndIndex = ( ( vtableOffset ) << 16 ) | (functionIndex );
+    if (! simpleRetType )
+        nOffsetAndIndex |= 0x8000;
+
+    void **raw = (void**)&code[0];
+    memcpy(raw, (char*)cpp_vtable_call, 2 * sizeof(void*));
+    raw[2] = (void*)nOffsetAndIndex;
+
+    return (code + codeSnippetSize);
+}
+
+}
+
+void bridges::cpp_uno::shared::VtableFactory::flushCode(unsigned char const * bptr, unsigned char const * eptr)
+{
+    int const lineSize = 32;
+    for (unsigned char const * p = bptr; p < eptr + lineSize; p += lineSize) {
+        __asm__ volatile ("dcbst 0, %0" : : "r"(p) : "memory");
+    }
+    __asm__ volatile ("sync" : : : "memory");
+    for (unsigned char const * p = bptr; p < eptr + lineSize; p += lineSize) {
+        __asm__ volatile ("icbi 0, %0" : : "r"(p) : "memory");
+    }
+    __asm__ volatile ("isync" : : : "memory");
+}
+
+struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; };
+
+bridges::cpp_uno::shared::VtableFactory::Slot *
+bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
+{
+    return static_cast< Slot * >(block) + 2;
+}
+
+sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+    sal_Int32 slotCount)
+{
+    return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
+}
+
+bridges::cpp_uno::shared::VtableFactory::Slot *
+bridges::cpp_uno::shared::VtableFactory::initializeBlock(
+    void * block, sal_Int32 slotCount)
+{
+    Slot * slots = mapBlockToVtable(block);
+    slots[-2].fn = 0;
+    slots[-1].fn = 0;
+    return slots + slotCount;
+}
+
+unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+    Slot ** slots, unsigned char * code,
+    typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
+    sal_Int32 functionCount, sal_Int32 vtableOffset)
+{
+    (*slots) -= functionCount;
+    Slot * s = *slots;
+
+    for (sal_Int32 i = 0; i < type->nMembers; ++i) {
+        typelib_TypeDescription * member = 0;
+        TYPELIB_DANGER_GET(&member, type->ppMembers[i]);
+        OSL_ASSERT(member != 0);
+        switch (member->eTypeClass) {
+        case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+            // Getter:
+            (s++)->fn = code;
+            code = codeSnippet(
+                code, functionOffset++, vtableOffset,
+                bridges::cpp_uno::shared::isSimpleType(
+                    reinterpret_cast<
+                    typelib_InterfaceAttributeTypeDescription * >(
+                        member)->pAttributeTypeRef));
+
+            // Setter:
+            if (!reinterpret_cast<
+                typelib_InterfaceAttributeTypeDescription * >(
+                    member)->bReadOnly)
+            {
+                (s++)->fn = code;
+                code = codeSnippet(code, functionOffset++, vtableOffset, true);
+            }
+            break;
+
+        case typelib_TypeClass_INTERFACE_METHOD:
+            (s++)->fn = code;
+            code = codeSnippet(
+                code, functionOffset++, vtableOffset,
+                bridges::cpp_uno::shared::isSimpleType(
+                    reinterpret_cast<
+                    typelib_InterfaceMethodTypeDescription * >(
+                        member)->pReturnTypeRef));
+            break;
+
+        default:
+            OSL_ASSERT(false);
+            break;
+        }
+        TYPELIB_DANGER_RELEASE(member);
+    }
+    return code;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index be5686af2807..2086ef7e7bba 100644
--- a/bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -1,8 +1,9 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -31,22 +32,20 @@
 #include <stdio.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 
-#include <bridges/cpp_uno/bridge.hxx>
+#include <com/sun/star/uno/genfunc.hxx>
 #include <typelib/typedescription.hxx>
 #include <uno/any2.h>
 
 #include "share.hxx"
+#include <string.h>
 
-#ifndef RTLD_DEFAULT
-#define RTLD_DEFAULT    ((void *) -2)
-#endif
 
 using namespace ::std;
 using namespace ::osl;
@@ -65,7 +64,7 @@ void dummy_can_throw_anything( char const * )
 //==================================================================================================
 static OUString toUNOname( char const * p ) SAL_THROW( () )
 {
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG
     char const * start = p;
 #endif
 
@@ -90,7 +89,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
             buf.append( (sal_Unicode)'.' );
     }
 
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG
     OUString ret( buf.makeStringAndClear() );
     OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
     fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
@@ -103,10 +102,10 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
-    t_rtti_map m_rttis;
+        t_rtti_map m_rttis;
     t_rtti_map m_generatedRttis;
 
     void * m_hApp;
@@ -119,7 +118,7 @@ public:
 };
 //__________________________________________________________________________________________________
 RTTI::RTTI() SAL_THROW( () )
-    : m_hApp( dlopen( 0 , RTLD_LAZY ) )
+    : m_hApp( dlopen( 0, RTLD_LAZY ) )
 {
 }
 //__________________________________________________________________________________________________
@@ -154,7 +153,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
         buf.append( 'E' );
 
         OString symName( buf.makeStringAndClear() );
-        rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
 
         if (rtti)
         {
@@ -165,14 +164,14 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
         else
         {
             // try to lookup the symbol in the generated rtti map
-            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-            if (iFind == m_generatedRttis.end())
+            t_rtti_map::const_iterator iiFind( m_generatedRttis.find( unoName ) );
+            if (iiFind == m_generatedRttis.end())
             {
                 // we must generate it !
                 // symbol and rtti-name is nearly identical,
                 // the symbol is prefixed with _ZTI
                 char const * rttiName = symName.getStr() +4;
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG
                 fprintf( stderr,"generated rtti for %s\n", rttiName );
 #endif
                 if (pTypeDescr->pBaseTypeDescription)
@@ -195,7 +194,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
             }
             else // taking already generated rtti
             {
-                rtti = iFind->second;
+                rtti = iiFind->second;
             }
         }
     }
@@ -203,7 +202,6 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     {
         rtti = iFind->second;
     }
-
     return rtti;
 }
 
@@ -217,115 +215,74 @@ static void deleteException( void * pExc )
     OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
     if (pTD)
     {
-        ::uno_destructData( pExc, pTD, cpp_release );
-        ::typelib_typedescription_release( pTD );
-    }
+                ::uno_destructData( pExc, pTD, cpp_release );
+                ::typelib_typedescription_release( pTD );
+        }
 }
 
 //==================================================================================================
 void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
 {
-#if defined DEBUG
-    OString cstr(
-        OUStringToOString(
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
-#endif
     void * pCppExc;
     type_info * rtti;
 
     {
     // construct cpp exception object
-    typelib_TypeDescription * pTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-    OSL_ASSERT( pTypeDescr );
-    if (! pTypeDescr)
-    {
-        throw RuntimeException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
-    }
-
-    pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-    ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-
-    // destruct uno exception
-    ::uno_any_destruct( pUnoExc, 0 );
-    // avoiding locked counts
-    static RTTI * s_rtti = 0;
-    if (! s_rtti)
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
+        typelib_TypeDescription * pTypeDescr = 0;
+        TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
+        OSL_ASSERT( pTypeDescr );
+        if (! pTypeDescr)
+            terminate();
+
+        pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+            ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+
+        // destruct uno exception
+        ::uno_any_destruct( pUnoExc, 0 );
+        // avoiding locked counts
+        static RTTI * s_rtti = 0;
         if (! s_rtti)
         {
+            MutexGuard guard( Mutex::getGlobalMutex() );
+            if (! s_rtti)
+            {
 #ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
+                s_rtti = new RTTI();
 #else
-            static RTTI rtti_data;
-            s_rtti = &rtti_data;
+                static RTTI rtti_data;
+                s_rtti = &rtti_data;
 #endif
+            }
         }
-    }
-    rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-    TYPELIB_DANGER_RELEASE( pTypeDescr );
-    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-    if (! rtti)
-    {
-        throw RuntimeException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
-    }
+        rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
+        TYPELIB_DANGER_RELEASE( pTypeDescr );
+        OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+        if (! rtti)
+            terminate();
     }
 
     __cxa_throw( pCppExc, rtti, deleteException );
 }
 
 //==================================================================================================
-void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno )
 {
+    OSL_ENSURE( header, "### no exception header!!!" );
     if (! header)
-    {
-        RuntimeException aRE(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
-            Reference< XInterface >() );
-        Type const & rType = ::getCppuType( &aRE );
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
-#if defined _DEBUG
-        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
-#endif
-        return;
-    }
+        terminate();
 
     typelib_TypeDescription * pExcTypeDescr = 0;
     OUString unoName( toUNOname( header->exceptionType->name() ) );
-#if defined DEBUG
-    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
-#endif
-    typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-    if (0 == pExcTypeDescr)
-    {
-        RuntimeException aRE(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
-            Reference< XInterface >() );
-        Type const & rType = ::getCppuType( &aRE );
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
-#if defined _DEBUG
-        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
-#endif
-    }
-    else
-    {
-        // construct uno exception any
-        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-        typelib_typedescription_release( pExcTypeDescr );
-    }
+    ::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
+    OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
+    if (! pExcTypeDescr)
+        terminate();
+
+    // construct uno exception any
+    ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
+    ::typelib_typedescription_release( pExcTypeDescr );
 }
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_aix_powerpc/makefile.mk
index 794501d0b5f3..48c51c138d4d 100644
--- a/bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/makefile.mk
@@ -1,8 +1,8 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -38,12 +38,16 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDIgcc3"
+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCAIXPgcc3"
 
 .IF "$(cppu_no_leak)" == ""
 CFLAGS += -DLEAK_STATIC_DATA
 .ENDIF
 
+NOOPTFILES= \
+    $(SLO)$/uno2cpp.obj \
+    $(SLO)$/cpp2uno.obj
+
 CFLAGSNOOPT=-O0
 
 SLOFILES= \
@@ -58,18 +62,16 @@ SHL1IMPLIB=i$(TARGET)
 SHL1VERSIONMAP=..$/..$/bridge_exports.map
 SHL1RPATH=URELIB
 
-SHL1OBJS= \
-    $(SLO)$/except.obj		\
-    $(SLO)$/cpp2uno.obj		\
-    $(SLO)$/uno2cpp.obj
+SHL1OBJS= $(SLOFILES)
+SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
 
 SHL1STDLIBS= \
     $(CPPULIB)			\
-    $(SALLIB)
+    $(SALLIB)			\
+    -ldl
 
 .ENDIF
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
index 930094738b20..e3f8370d501f 100644
--- a/bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
@@ -1,8 +1,9 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -34,7 +35,8 @@
 namespace CPPU_CURRENT_NAMESPACE
 {
 
-void dummy_can_throw_anything( char const * );
+  void dummy_can_throw_anything( char const * );
+
 
 // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
 
@@ -88,3 +90,10 @@ void raiseException(
 void fillUnoException(
     __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
 }
+
+namespace ppc
+{
+    enum ppclimits { MAX_GPR_REGS = 8, MAX_SSE_REGS = 13 };
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
new file mode 100644
index 000000000000..dcb4793e98d3
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
@@ -0,0 +1,499 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_bridges.hxx"
+
+#include <sys/types.h>
+#include <sys/malloc.h>
+
+#include <com/sun/star/uno/genfunc.hxx>
+#include <uno/data.h>
+
+#include "bridges/cpp_uno/shared/bridge.hxx"
+#include "bridges/cpp_uno/shared/types.hxx"
+#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
+#include "bridges/cpp_uno/shared/vtables.hxx"
+
+#include "share.hxx"
+#include <stdio.h>
+#include <string.h>
+
+
+using namespace ::rtl;
+using namespace ::com::sun::star::uno;
+
+namespace
+{
+
+void MapReturn(sal_uInt32 r3, sal_uInt32 r4, double dret, typelib_TypeClass eReturnType, void *pRegisterReturn)
+{
+    switch( eReturnType )
+        {
+                case typelib_TypeClass_HYPER:
+                case typelib_TypeClass_UNSIGNED_HYPER:
+                        ((long*)pRegisterReturn)[1] = r4;
+            // fall through on purpose
+                case typelib_TypeClass_LONG:
+                case typelib_TypeClass_UNSIGNED_LONG:
+                case typelib_TypeClass_ENUM:
+                        ((long*)pRegisterReturn)[0] = r3;
+                        break;
+                case typelib_TypeClass_CHAR:
+                case typelib_TypeClass_SHORT:
+                case typelib_TypeClass_UNSIGNED_SHORT:
+                    *(unsigned short*)pRegisterReturn = (unsigned short)r3;
+                        break;
+                case typelib_TypeClass_BOOLEAN:
+                case typelib_TypeClass_BYTE:
+                    *(unsigned char*)pRegisterReturn = (unsigned char)r3;
+                        break;
+                case typelib_TypeClass_FLOAT:
+                    *(float*)pRegisterReturn = (float)dret;
+                        break;
+                case typelib_TypeClass_DOUBLE:
+                        *(double*)pRegisterReturn = dret;
+                        break;
+                default:
+                        break;
+        }
+}
+
+#define DISPLACEMENT -2
+
+static void callVirtualMethod(
+    void * pThis,
+    sal_uInt32 nVtableIndex,
+    void * pRegisterReturn,
+    typelib_TypeClass eReturnType,
+    sal_uInt32 * pStack,
+    sal_uInt32 nStack,
+    double *pFPR,
+    sal_uInt32 nFPR)
+{
+    sal_uInt32 nStackWords = nStack;
+    if (nStackWords < ppc::MAX_GPR_REGS)
+        nStackWords = 0;
+    else
+        nStackWords-=ppc::MAX_GPR_REGS;
+    if (nStackWords)
+        nStackWords = ( nStackWords + 1) & ~1;
+    sal_uInt32 *stack = (sal_uInt32*)__builtin_alloca( nStackWords * sizeof(sal_uInt32) );
+    memcpy(stack+DISPLACEMENT, pStack+ppc::MAX_GPR_REGS, nStack * sizeof(sal_uInt32));
+
+    // Get pointer to method
+    sal_uInt32 pMethod = *((sal_uInt32 *)pThis);
+    pMethod += 4 * nVtableIndex;
+    pMethod = *((sal_uInt32 *)pMethod);
+
+    typedef void (* FunctionCall )( sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32 );
+    FunctionCall pFunc = (FunctionCall)pMethod;
+
+    register double d0 asm("fr1"); d0 = pFPR[0];
+    register double d1 asm("fr2"); d1 = pFPR[1];
+    register double d2 asm("fr3"); d2 = pFPR[2];
+    register double d3 asm("fr4"); d3 = pFPR[3];
+    register double d4 asm("fr5"); d4 = pFPR[4];
+    register double d5 asm("fr6"); d5 = pFPR[5];
+    register double d6 asm("fr7"); d6 = pFPR[6];
+    register double d7 asm("fr8"); d7 = pFPR[7];
+    register double d8 asm("fr9"); d8 = pFPR[8];
+    register double d9 asm("fr10"); d9 = pFPR[9];
+    register double d10 asm("fr11"); d10 = pFPR[10];
+    register double d11 asm("fr12"); d11 = pFPR[11];
+    register double d12 asm("fr13"); d12 = pFPR[12];
+
+    (*pFunc)(pStack[0], pStack[1], pStack[2], pStack[3], pStack[4], pStack[5], pStack[6], pStack[7]);
+
+    register sal_uInt32 r3 asm("r3");
+    register sal_uInt32 r4 asm("r4");
+    MapReturn(r3, r4, d0, eReturnType, pRegisterReturn);
+}
+
+#define INSERT_INT32(pSV, pDS) \
+{ \
+    *pDS++ = *reinterpret_cast<sal_uInt32 *>(pSV); \
+}
+
+#define INSERT_INT16(pSV, pDS) \
+{ \
+    *pDS++ = *reinterpret_cast<sal_uInt16 *>(pSV); \
+}
+
+#define INSERT_INT8(pSV, pDS) \
+{ \
+    *pDS++ = *reinterpret_cast<sal_uInt8 *>(pSV); \
+}
+
+#define INSERT_FLOAT(pSV, nr, pFPR, pDS) \
+{ \
+    if (nr < ppc::MAX_SSE_REGS) \
+    { \
+        sal_uInt32 *pDouble = (sal_uInt32 *)&(pFPR[nr++]); \
+        pDouble[0] = *reinterpret_cast<sal_uInt32 *>(pSV); \
+    } \
+    *pDS++ = *reinterpret_cast<sal_uInt32 *>(pSV); \
+}
+
+#define INSERT_DOUBLE(pSV, nr, pFPR, pDS) \
+{ \
+    if (nr < ppc::MAX_SSE_REGS) \
+    { \
+        pFPR[nr++] = *reinterpret_cast<double *>(pSV); \
+    } \
+    *pDS++ = reinterpret_cast<sal_uInt32 *>(pSV)[1]; \
+    *pDS++ = reinterpret_cast<sal_uInt32 *>(pSV)[0]; \
+}
+
+#define INSERT_INT64(pSV, pDS) \
+{ \
+    INSERT_INT32(pSV, pDS) \
+    INSERT_INT32(((sal_uInt32*)pSV)+1, pDS) \
+}
+//==================================================================================================
+static void cpp_call(
+        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
+        bridges::cpp_uno::shared::VtableSlot aVtableSlot,
+        typelib_TypeDescriptionReference * pReturnTypeRef,
+        sal_Int32 nParams, typelib_MethodParameter * pParams,
+        void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
+{
+    // max space for: [complex ret ptr], values|ptr ...
+    sal_uInt32 * pStack = (sal_uInt32*)__builtin_alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
+    sal_uInt32 * pStackStart = pStack;
+
+    double pFPR[ppc::MAX_SSE_REGS];
+    sal_uInt32 nFPR = 0;
+
+    // return
+    typelib_TypeDescription * pReturnTypeDescr = 0;
+    TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
+    OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
+
+    void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
+
+    if (pReturnTypeDescr)
+    {
+        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
+        {
+            pCppReturn = pUnoReturn; // direct way for simple types
+        }
+        else
+        {
+                        // complex return via ptr
+                        pCppReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
+                           ? __builtin_alloca( pReturnTypeDescr->nSize )
+                           : pUnoReturn); // direct way
+                        INSERT_INT32(&pCppReturn, pStack);
+                }
+        }
+        // push this
+    void * pAdjustedThisPtr = reinterpret_cast< void ** >(pThis->getCppI()) + aVtableSlot.offset;
+        INSERT_INT32(&pAdjustedThisPtr, pStack);
+
+        // stack space
+        OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
+        // args
+        void ** pCppArgs  = (void **)__builtin_alloca( 3 * sizeof(void *) * nParams );
+        // indizes of values this have to be converted (interface conversion cpp<=>uno)
+        sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
+        // type descriptions for reconversions
+        typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
+
+        sal_Int32 nTempIndizes   = 0;
+
+        for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
+        {
+                const typelib_MethodParameter & rParam = pParams[nPos];
+                typelib_TypeDescription * pParamTypeDescr = 0;
+                TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
+
+                if (!rParam.bOut
+                    && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
+                {
+                        uno_copyAndConvertData( pCppArgs[nPos] = pStack, pUnoArgs[nPos], pParamTypeDescr,
+                                                                        pThis->getBridge()->getUno2Cpp() );
+
+                        switch (pParamTypeDescr->eTypeClass)
+                        {
+                        case typelib_TypeClass_LONG:
+                        case typelib_TypeClass_UNSIGNED_LONG:
+                        case typelib_TypeClass_ENUM:
+                                INSERT_INT32(pCppArgs[nPos], pStack);
+                                break;
+                        case typelib_TypeClass_SHORT:
+                        case typelib_TypeClass_CHAR:
+                        case typelib_TypeClass_UNSIGNED_SHORT:
+                    INSERT_INT16(pCppArgs[nPos], pStack);
+                    break;
+                        case typelib_TypeClass_BOOLEAN:
+                        case typelib_TypeClass_BYTE:
+                    INSERT_INT8(pCppArgs[nPos], pStack);
+                    break;
+                        case typelib_TypeClass_FLOAT:
+                    INSERT_FLOAT(pCppArgs[nPos], nFPR, pFPR, pStack);
+                                break;
+                        case typelib_TypeClass_DOUBLE:
+                                INSERT_DOUBLE(pCppArgs[nPos], nFPR, pFPR, pStack);
+                                break;
+                            case typelib_TypeClass_HYPER:
+                            case typelib_TypeClass_UNSIGNED_HYPER:
+                                INSERT_INT64(pCppArgs[nPos], pStack);
+                                break;
+                            default:
+                                break;
+                        }
+
+                        // no longer needed
+                        TYPELIB_DANGER_RELEASE( pParamTypeDescr );
+                }
+                else // ptr to complex value | ref
+                {
+                        if (! rParam.bIn) // is pure out
+                        {
+                                // cpp out is constructed mem, uno out is not!
+                                uno_constructData(
+                                        pCppArgs[nPos] = __builtin_alloca( pParamTypeDescr->nSize ),
+                                        pParamTypeDescr );
+                                pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
+                                // will be released at reconversion
+                                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
+                        }
+                        // is in/inout
+                        else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ))
+                        {
+                                uno_copyAndConvertData(
+                                        pCppArgs[nPos] = __builtin_alloca( pParamTypeDescr->nSize ),
+                                        pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
+
+                                pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
+                                // will be released at reconversion
+                                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
+                        }
+                        else // direct way
+                        {
+                                pCppArgs[nPos] = pUnoArgs[nPos];
+                                // no longer needed
+                                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
+                        }
+                        INSERT_INT32(&(pCppArgs[nPos]), pStack);
+                }
+        }
+
+        try
+        {
+                OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
+                callVirtualMethod(
+                        pAdjustedThisPtr, aVtableSlot.index,
+                        pCppReturn, pReturnTypeDescr->eTypeClass,
+                        pStackStart, (pStack - pStackStart), pFPR, nFPR );
+                // NO exception occurred...
+                *ppUnoExc = 0;
+
+                // reconvert temporary params
+                for ( ; nTempIndizes--; )
+                {
+                        sal_Int32 nIndex = pTempIndizes[nTempIndizes];
+                        typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
+
+                        if (pParams[nIndex].bIn)
+                        {
+                                if (pParams[nIndex].bOut) // inout
+                                {
+                                        uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
+                                        uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
+                                                                                        pThis->getBridge()->getCpp2Uno() );
+                                }
+                        }
+                        else // pure out
+                        {
+                                uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
+                                                                                pThis->getBridge()->getCpp2Uno() );
+                        }
+                        // destroy temp cpp param => cpp: every param was constructed
+                        uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
+
+                        TYPELIB_DANGER_RELEASE( pParamTypeDescr );
+                }
+                // return value
+                if (pCppReturn && pUnoReturn != pCppReturn)
+                {
+                        uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
+                                                                        pThis->getBridge()->getCpp2Uno() );
+                        uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
+                }
+        }
+        catch (...)
+        {
+                // fill uno exception
+                fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
+
+                // temporary params
+                for ( ; nTempIndizes--; )
+                {
+                        sal_Int32 nIndex = pTempIndizes[nTempIndizes];
+                        // destroy temp cpp param => cpp: every param was constructed
+                        uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
+                        TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
+                }
+                // return type
+                if (pReturnTypeDescr)
+                        TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
+        }
+}
+
+}
+
+namespace bridges { namespace cpp_uno { namespace shared {
+
+void unoInterfaceProxyDispatch(
+        uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
+        void * pReturn, void * pArgs[], uno_Any ** ppException )
+{
+        // is my surrogate
+        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
+           = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * > (pUnoI);
+        //      typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
+
+        switch (pMemberDescr->eTypeClass)
+        {
+        case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+        {
+
+        VtableSlot aVtableSlot(
+            getVtableSlot(
+                reinterpret_cast<
+                    typelib_InterfaceAttributeTypeDescription const * >(
+                        pMemberDescr)));
+
+                if (pReturn)
+                {
+                        // dependent dispatch
+                        cpp_call(
+                                pThis, aVtableSlot,
+                                ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
+                                0, 0, // no params
+                                pReturn, pArgs, ppException );
+                }
+                else
+                {
+                        // is SET
+                        typelib_MethodParameter aParam;
+                        aParam.pTypeRef =
+                                ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
+                        aParam.bIn              = sal_True;
+                        aParam.bOut             = sal_False;
+
+                        typelib_TypeDescriptionReference * pReturnTypeRef = 0;
+                        OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+                        typelib_typedescriptionreference_new(
+                                &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
+
+                        // dependent dispatch
+                        aVtableSlot.index += 1; //get then set method
+                        cpp_call(
+                                pThis, aVtableSlot,
+                                pReturnTypeRef,
+                                1, &aParam,
+                                pReturn, pArgs, ppException );
+
+                        typelib_typedescriptionreference_release( pReturnTypeRef );
+                }
+
+                break;
+        }
+        case typelib_TypeClass_INTERFACE_METHOD:
+        {
+
+        VtableSlot aVtableSlot(
+            getVtableSlot(
+                reinterpret_cast<
+                    typelib_InterfaceMethodTypeDescription const * >(
+                        pMemberDescr)));
+                switch (aVtableSlot.index)
+                {
+                        // standard calls
+                case 1: // acquire uno interface
+                        (*pUnoI->acquire)( pUnoI );
+                        *ppException = 0;
+                        break;
+                case 2: // release uno interface
+                        (*pUnoI->release)( pUnoI );
+                        *ppException = 0;
+                        break;
+                case 0: // queryInterface() opt
+                {
+                        typelib_TypeDescription * pTD = 0;
+                        TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
+                        if (pTD)
+                        {
+                uno_Interface * pInterface = 0;
+                (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
+                    pThis->pBridge->getUnoEnv(),
+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
+
+                if (pInterface)
+                {
+                    ::uno_any_construct(
+                        reinterpret_cast< uno_Any * >( pReturn ),
+                        &pInterface, pTD, 0 );
+                    (*pInterface->release)( pInterface );
+                    TYPELIB_DANGER_RELEASE( pTD );
+                    *ppException = 0;
+                    break;
+                }
+                TYPELIB_DANGER_RELEASE( pTD );
+            }
+                } // else perform queryInterface()
+                default:
+                        // dependent dispatch
+                        cpp_call(
+                                pThis, aVtableSlot,
+                                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
+                                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
+                                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
+                                pReturn, pArgs, ppException );
+                }
+                break;
+        }
+        default:
+        {
+                ::com::sun::star::uno::RuntimeException aExc(
+                        OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+                        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
+
+                Type const & rExcType = ::getCppuType( &aExc );
+                // binary identical null reference
+                ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
+        }
+        }
+}
+
+} } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_intel/call.s b/bridges/source/cpp_uno/gcc3_freebsd_intel/call.s
deleted file mode 100644
index f345e3a764ac..000000000000
--- a/bridges/source/cpp_uno/gcc3_freebsd_intel/call.s
+++ /dev/null
@@ -1,268 +0,0 @@
-    .text
-
-.globl privateSnippetExecutorGeneral
-    .type   privateSnippetExecutorGeneral,@function
-privateSnippetExecutorGeneral:
-.LFBg:
-    movl    %esp,%ecx
-    pushl   %ebp              # proper stack frame needed for exception handling
-.LCFIg0:
-    movl    %esp,%ebp
-.LCFIg1:
-    subl    $0x4,%esp         # 32bit returnValue
-    pushl   %esp              # 32bit &returnValue
-    pushl   %ecx              # 32bit pCallStack
-    pushl   %edx              # 32bit nVtableOffset
-    pushl   %eax              # 32bit nFunctionIndex
-    call    cpp_vtable_call
-    movl    16(%esp),%eax     # 32bit returnValue
-    leave
-    ret
-.LFEg:
-    .size   privateSnippetExecutorGeneral,.-privateSnippetExecutorGeneral
-
-.globl privateSnippetExecutorVoid
-    .type   privateSnippetExecutorVoid,@function
-privateSnippetExecutorVoid:
-.LFBv:
-    movl    %esp,%ecx
-    pushl   %ebp              # proper stack frame needed for exception handling
-.LCFIv0:
-    movl    %esp,%ebp
-.LCFIv1:
-    pushl   $0                # 32bit null pointer (returnValue not used)
-    pushl   %ecx              # 32bit pCallStack
-    pushl   %edx              # 32bit nVtableOffset
-    pushl   %eax              # 32bit nFunctionIndex
-    call    cpp_vtable_call
-    leave
-    ret
-.LFEv:
-    .size   privateSnippetExecutorVoid,.-privateSnippetExecutorVoid
-
-.globl privateSnippetExecutorHyper
-    .type   privateSnippetExecutorHyper,@function
-privateSnippetExecutorHyper:
-.LFBh:
-    movl    %esp,%ecx
-    pushl   %ebp              # proper stack frame needed for exception handling
-.LCFIh0:
-    movl    %esp,%ebp
-.LCFIh1:
-    subl    $0x8,%esp         # 64bit returnValue
-    pushl   %esp              # 32bit &returnValue
-    pushl   %ecx              # 32bit pCallStack
-    pushl   %edx              # 32bit nVtableOffset
-    pushl   %eax              # 32bit nFunctionIndex
-    call    cpp_vtable_call
-    movl    16(%esp),%eax     # 64bit returnValue, lower half
-    movl    20(%esp),%edx     # 64bit returnValue, upper half
-    leave
-    ret
-.LFEh:
-    .size   privateSnippetExecutorHyper,.-privateSnippetExecutorHyper
-
-.globl privateSnippetExecutorFloat
-    .type   privateSnippetExecutorFloat,@function
-privateSnippetExecutorFloat:
-.LFBf:
-    movl    %esp,%ecx
-    pushl   %ebp              # proper stack frame needed for exception handling
-.LCFIf0:
-    movl    %esp,%ebp
-.LCFIf1:
-    subl    $0x4,%esp         # 32bit returnValue
-    pushl   %esp              # 32bit &returnValue
-    pushl   %ecx              # 32bit pCallStack
-    pushl   %edx              # 32bit nVtableOffset
-    pushl   %eax              # 32bit nFunctionIndex
-    call    cpp_vtable_call
-    flds    16(%esp)          # 32bit returnValue
-    leave
-    ret
-.LFEf:
-    .size   privateSnippetExecutorFloat,.-privateSnippetExecutorFloat
-
-.globl privateSnippetExecutorDouble
-    .type   privateSnippetExecutorDouble,@function
-privateSnippetExecutorDouble:
-.LFBd:
-    movl    %esp,%ecx
-    pushl   %ebp              # proper stack frame needed for exception handling
-.LCFId0:
-    movl    %esp,%ebp
-.LCFId1:
-    subl    $0x8,%esp         # 64bit returnValue
-    pushl   %esp              # 32bit &returnValue
-    pushl   %ecx              # 32bit pCallStack
-    pushl   %edx              # 32bit nVtableOffset
-    pushl   %eax              # 32bit nFunctionIndex
-    call    cpp_vtable_call
-    fldl    16(%esp)          # 64bit returnValue
-    leave
-    ret
-.LFEd:
-    .size   privateSnippetExecutorDouble,.-privateSnippetExecutorDouble
-
-.globl privateSnippetExecutorClass
-    .type   privateSnippetExecutorClass,@function
-privateSnippetExecutorClass:
-.LFBc:
-    movl    %esp,%ecx
-    pushl   %ebp              # proper stack frame needed for exception handling
-.LCFIc0:
-    movl    %esp,%ebp
-.LCFIc1:
-    subl    $0x4,%esp         # 32bit returnValue
-    pushl   %esp              # 32bit &returnValue
-    pushl   %ecx              # 32bit pCallStack
-    pushl   %edx              # 32bit nVtableOffset
-    pushl   %eax              # 32bit nFunctionIndex
-    call    cpp_vtable_call
-    movl    16(%esp),%eax     # 32bit returnValue
-    leave
-    ret     $4
-.LFEc:
-    .size   privateSnippetExecutorClass,.-privateSnippetExecutorClass
-
-    .section .eh_frame,"a",@progbits
-.Lframe1:
-    .long   .LECIE1-.LSCIE1   # length
-.LSCIE1:
-    .long   0                 # CIE_ID
-    .byte   1                 # version
-    .string "zR"              # augmentation
-    .uleb128 1                # code_alignment_factor
-    .sleb128 -4               # data_alignment_factor
-    .byte   8                 # return_address_register
-    .uleb128 1                # augmentation size 1:
-    .byte   0x1B              #  FDE Encoding (pcrel sdata4)
-                              # initial_instructions:
-    .byte   0x0C              #  DW_CFA_def_cfa %esp, 4
-    .uleb128 4
-    .uleb128 4
-    .byte   0x88              #  DW_CFA_offset ret, 1
-    .uleb128 1
-    .align 4
-.LECIE1:
-.LSFDEg:
-    .long   .LEFDEg-.LASFDEg  # length
-.LASFDEg:
-    .long   .LASFDEg-.Lframe1 # CIE_pointer
-    .long   .LFBg-.           # initial_location
-    .long   .LFEg-.LFBg       # address_range
-    .uleb128 0                # augmentation size 0
-                              # instructions:
-    .byte   0x04              #  DW_CFA_advance_loc4
-    .long   .LCFIg0-.LFBg
-    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-    .uleb128 8
-    .byte   0x85              #  DW_CFA_offset %ebp, 2
-    .uleb128 2
-    .byte   0x04              #  DW_CFA_advance_loc4
-    .long   .LCFIg1-.LCFIg0
-    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-    .uleb128 5
-    .align 4
-.LEFDEg:
-.LSFDEv:
-    .long   .LEFDEv-.LASFDEv  # length
-.LASFDEv:
-    .long   .LASFDEv-.Lframe1 # CIE_pointer
-    .long   .LFBv-.           # initial_location
-    .long   .LFEv-.LFBv       # address_range
-    .uleb128 0                # augmentation size 0
-                              # instructions:
-    .byte   0x04              #  DW_CFA_advance_loc4
-    .long   .LCFIv0-.LFBv
-    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-    .uleb128 8
-    .byte   0x85              #  DW_CFA_offset %ebp, 2
-    .uleb128 2
-    .byte   0x04              #  DW_CFA_advance_loc4
-    .long   .LCFIv1-.LCFIv0
-    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-    .uleb128 5
-    .align 4
-.LEFDEv:
-.LSFDEh:
-    .long   .LEFDEh-.LASFDEh  # length
-.LASFDEh:
-    .long   .LASFDEh-.Lframe1 # CIE_pointer
-    .long   .LFBh-.           # initial_location
-    .long   .LFEh-.LFBh       # address_range
-    .uleb128 0                # augmentation size 0
-                              # instructions:
-    .byte   0x04              #  DW_CFA_advance_loc4
-    .long   .LCFIh0-.LFBh
-    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-    .uleb128 8
-    .byte   0x85              #  DW_CFA_offset %ebp, 2
-    .uleb128 2
-    .byte   0x04              #  DW_CFA_advance_loc4
-    .long   .LCFIh1-.LCFIh0
-    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-    .uleb128 5
-    .align 4
-.LEFDEh:
-.LSFDEf:
-    .long   .LEFDEf-.LASFDEf  # length
-.LASFDEf:
-    .long   .LASFDEf-.Lframe1 # CIE_pointer
-    .long   .LFBf-.           # initial_location
-    .long   .LFEf-.LFBf       # address_range
-    .uleb128 0                # augmentation size 0
-                              # instructions:
-    .byte   0x04              #  DW_CFA_advance_loc4
-    .long   .LCFIf0-.LFBf
-    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-    .uleb128 8
-    .byte   0x85              #  DW_CFA_offset %ebp, 2
-    .uleb128 2
-    .byte   0x04              #  DW_CFA_advance_loc4
-    .long   .LCFIf1-.LCFIf0
-    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-    .uleb128 5
-    .align 4
-.LEFDEf:
-.LSFDEd:
-    .long   .LEFDEd-.LASFDEd  # length
-.LASFDEd:
-    .long   .LASFDEd-.Lframe1 # CIE_pointer
-    .long   .LFBd-.           # initial_location
-    .long   .LFEd-.LFBd       # address_range
-    .uleb128 0                # augmentation size 0
-                              # instructions:
-    .byte   0x04              #  DW_CFA_advance_loc4
-    .long   .LCFId0-.LFBd
-    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-    .uleb128 8
-    .byte   0x85              #  DW_CFA_offset %ebp, 2
-    .uleb128 2
-    .byte   0x04              #  DW_CFA_advance_loc4
-    .long   .LCFId1-.LCFId0
-    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-    .uleb128 5
-    .align 4
-.LEFDEd:
-.LSFDEc:
-    .long   .LEFDEc-.LASFDEc  # length
-.LASFDEc:
-    .long   .LASFDEc-.Lframe1 # CIE_pointer
-    .long   .LFBc-.           # initial_location
-    .long   .LFEc-.LFBc       # address_range
-    .uleb128 0                # augmentation size 0
-                              # instructions:
-    .byte   0x04              #  DW_CFA_advance_loc4
-    .long   .LCFIc0-.LFBc
-    .byte   0x0E              #  DW_CFA_def_cfa_offset 8
-    .uleb128 8
-    .byte   0x85              #  DW_CFA_offset %ebp, 2
-    .uleb128 2
-    .byte   0x04              #  DW_CFA_advance_loc4
-    .long   .LCFIc1-.LCFIc0
-    .byte   0x0D              #  DW_CFA_def_cfa_register %ebp
-    .uleb128 5
-    .align 4
-.LEFDEc:
-    .section .note.GNU-stack,"",@progbits
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx
deleted file mode 100644
index 5740b27d9871..000000000000
--- a/bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx
+++ /dev/null
@@ -1,490 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <uno/data.h>
-#include <typelib/typedescription.hxx>
-
-#include "bridges/cpp_uno/shared/bridge.hxx"
-#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx"
-#include "bridges/cpp_uno/shared/types.hxx"
-#include "bridges/cpp_uno/shared/vtablefactory.hxx"
-
-#include "share.hxx"
-
-using namespace ::com::sun::star::uno;
-
-namespace
-{
-
-//==================================================================================================
-void cpp2uno_call(
-    bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
-    const typelib_TypeDescription * pMemberTypeDescr,
-    typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void ** pCallStack,
-    void * pReturnValue )
-{
-    // pCallStack: ret, [return ptr], this, params
-    char * pCppStack = (char *)(pCallStack +1);
-
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    if (pReturnTypeRef)
-        TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
-    void * pUnoReturn = 0;
-    void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
-    if (pReturnTypeDescr)
-    {
-        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-        {
-            pUnoReturn = pReturnValue; // direct way for simple types
-        }
-        else // complex return via ptr (pCppReturn)
-        {
-            pCppReturn = *(void **)pCppStack;
-            pCppStack += sizeof(void *);
-
-            pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType(
-                              pReturnTypeDescr )
-                          ? alloca( pReturnTypeDescr->nSize )
-                          : pCppReturn); // direct way
-        }
-    }
-    // pop this
-    pCppStack += sizeof( void* );
-
-    // stack space
-    OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-    // parameters
-    void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-    void ** pCppArgs = pUnoArgs + nParams;
-    // indizes of values this have to be converted (interface conversion cpp<=>uno)
-    sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
-    sal_Int32 nTempIndizes   = 0;
-
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-        if (!rParam.bOut
-            && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
-            // value
-        {
-            pCppArgs[nPos] = pCppStack;
-            pUnoArgs[nPos] = pCppStack;
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-            case typelib_TypeClass_DOUBLE:
-                pCppStack += sizeof(sal_Int32); // extra long
-                break;
-            default:
-                break;
-            }
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // ptr to complex value | ref
-        {
-            pCppArgs[nPos] = *(void **)pCppStack;
-
-            if (! rParam.bIn) // is pure out
-            {
-                // uno out is unconstructed mem!
-                pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-                pTempIndizes[nTempIndizes] = nPos;
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            // is in/inout
-            else if (bridges::cpp_uno::shared::relatesToInterfaceType(
-                         pParamTypeDescr ))
-            {
-                uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                                        *(void **)pCppStack, pParamTypeDescr,
-                                        pThis->getBridge()->getCpp2Uno() );
-                pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                pUnoArgs[nPos] = *(void **)pCppStack;
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-        }
-        pCppStack += sizeof(sal_Int32); // standard parameter length
-    }
-
-    // ExceptionHolder
-    uno_Any aUnoExc; // Any will be constructed by callee
-    uno_Any * pUnoExc = &aUnoExc;
-
-    // invoke uno dispatch call
-    (*pThis->getUnoI()->pDispatcher)(
-        pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
-    // in case an exception occured...
-    if (pUnoExc)
-    {
-        // destruct temporary in/inout params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
-            if (pParams[nIndex].bIn) // is in/inout => was constructed
-                uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-        }
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
-        CPPU_CURRENT_NAMESPACE::raiseException(
-            &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-            // has to destruct the any
-    }
-    else // else no exception occured...
-    {
-        // temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
-            if (pParams[nIndex].bOut) // inout/out
-            {
-                // convert and assign
-                uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-                uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-                                        pThis->getBridge()->getUno2Cpp() );
-            }
-            // destroy temp uno param
-            uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return
-        if (pCppReturn) // has complex return
-        {
-            if (pUnoReturn != pCppReturn) // needs reconversion
-            {
-                uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-                                        pThis->getBridge()->getUno2Cpp() );
-                // destroy temp uno return
-                uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-            }
-            // complex return ptr is set to eax
-            *static_cast< void ** >(pReturnValue) = pCppReturn;
-        }
-        if (pReturnTypeDescr)
-        {
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-        }
-    }
-}
-
-
-//==================================================================================================
-extern "C" void cpp_vtable_call(
-    int nFunctionIndex, int nVtableOffset, void** pCallStack,
-    void * pReturnValue )
-{
-    OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-
-    // pCallStack: ret adr, [ret *], this, params
-    void * pThis;
-    if( nFunctionIndex & 0x80000000 )
-    {
-        nFunctionIndex &= 0x7fffffff;
-        pThis = pCallStack[2];
-    }
-    else
-    {
-        pThis = pCallStack[1];
-    }
-    pThis = static_cast< char * >(pThis) - nVtableOffset;
-    bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
-        = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
-            pThis);
-
-    typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
-
-    OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-    if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-    {
-        throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
-            (XInterface *)pThis );
-    }
-
-    // determine called method
-    sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
-    OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-
-    TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
-    switch (aMemberDescr.get()->eTypeClass)
-    {
-    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-    {
-        if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
-        {
-            // is GET method
-            cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-                0, 0, // no params
-                pCallStack, pReturnValue );
-        }
-        else
-        {
-            // is SET method
-            typelib_MethodParameter aParam;
-            aParam.pTypeRef =
-                ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
-            cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                0, // indicates void return
-                1, &aParam,
-                pCallStack, pReturnValue );
-        }
-        break;
-    }
-    case typelib_TypeClass_INTERFACE_METHOD:
-    {
-        // is METHOD
-        switch (nFunctionIndex)
-        {
-        case 1: // acquire()
-            pCppI->acquireProxy(); // non virtual call!
-            break;
-        case 2: // release()
-            pCppI->releaseProxy(); // non virtual call!
-            break;
-        case 0: // queryInterface() opt
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-            if (pTD)
-            {
-                XInterface * pInterface = 0;
-                (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
-                    pCppI->getBridge()->getCppEnv(),
-                    (void **)&pInterface, pCppI->getOid().pData,
-                    (typelib_InterfaceTypeDescription *)pTD );
-
-                if (pInterface)
-                {
-                    ::uno_any_construct(
-                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-                        &pInterface, pTD, cpp_acquire );
-                    pInterface->release();
-                    TYPELIB_DANGER_RELEASE( pTD );
-                    *static_cast< void ** >(pReturnValue) = pCallStack[1];
-                    break;
-                }
-                TYPELIB_DANGER_RELEASE( pTD );
-            }
-        } // else perform queryInterface()
-        default:
-            cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-                pCallStack, pReturnValue );
-        }
-        break;
-    }
-    default:
-    {
-        throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
-            (XInterface *)pThis );
-    }
-    }
-}
-
-//==================================================================================================
-extern "C" void privateSnippetExecutorGeneral();
-extern "C" void privateSnippetExecutorVoid();
-extern "C" void privateSnippetExecutorHyper();
-extern "C" void privateSnippetExecutorFloat();
-extern "C" void privateSnippetExecutorDouble();
-extern "C" void privateSnippetExecutorClass();
-extern "C" typedef void (*PrivateSnippetExecutor)();
-
-int const codeSnippetSize = 16;
-
-unsigned char * codeSnippet(
-    unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
-    typelib_TypeClass returnTypeClass)
-{
-    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-        functionIndex |= 0x80000000;
-    }
-    PrivateSnippetExecutor exec;
-    switch (returnTypeClass) {
-    case typelib_TypeClass_VOID:
-        exec = privateSnippetExecutorVoid;
-        break;
-    case typelib_TypeClass_HYPER:
-    case typelib_TypeClass_UNSIGNED_HYPER:
-        exec = privateSnippetExecutorHyper;
-        break;
-    case typelib_TypeClass_FLOAT:
-        exec = privateSnippetExecutorFloat;
-        break;
-    case typelib_TypeClass_DOUBLE:
-        exec = privateSnippetExecutorDouble;
-        break;
-    case typelib_TypeClass_STRING:
-    case typelib_TypeClass_TYPE:
-    case typelib_TypeClass_ANY:
-    case typelib_TypeClass_SEQUENCE:
-    case typelib_TypeClass_STRUCT:
-    case typelib_TypeClass_INTERFACE:
-        exec = privateSnippetExecutorClass;
-        break;
-    default:
-        exec = privateSnippetExecutorGeneral;
-        break;
-    }
-    unsigned char * p = code;
-    OSL_ASSERT(sizeof (sal_Int32) == 4);
-    // mov function_index, %eax:
-    *p++ = 0xB8;
-    *reinterpret_cast< sal_Int32 * >(p) = functionIndex;
-    p += sizeof (sal_Int32);
-    // mov vtable_offset, %edx:
-    *p++ = 0xBA;
-    *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-    p += sizeof (sal_Int32);
-    // jmp privateSnippetExecutor:
-    *p++ = 0xE9;
-    *reinterpret_cast< sal_Int32 * >(p)
-        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
-    p += sizeof (sal_Int32);
-    OSL_ASSERT(p - code <= codeSnippetSize);
-    return code + codeSnippetSize;
-}
-
-}
-
-struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; };
-
-bridges::cpp_uno::shared::VtableFactory::Slot *
-bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
-{
-    return static_cast< Slot * >(block) + 2;
-}
-
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
-    sal_Int32 slotCount)
-{
-    return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
-}
-
-bridges::cpp_uno::shared::VtableFactory::Slot *
-bridges::cpp_uno::shared::VtableFactory::initializeBlock(
-    void * block, sal_Int32 slotCount)
-{
-    Slot * slots = mapBlockToVtable(block);
-    slots[-2].fn = 0;
-    slots[-1].fn = 0;
-    return slots + slotCount;
-}
-
-unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
-    typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
-    sal_Int32 functionCount, sal_Int32 vtableOffset)
-{
-    (*slots) -= functionCount;
-    Slot * s = *slots;
-    for (sal_Int32 i = 0; i < type->nMembers; ++i) {
-        typelib_TypeDescription * member = 0;
-        TYPELIB_DANGER_GET(&member, type->ppMembers[i]);
-        OSL_ASSERT(member != 0);
-        switch (member->eTypeClass) {
-        case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-            // Getter:
-            (s++)->fn = code;
-            code = codeSnippet(
-                code, functionOffset++, vtableOffset,
-                reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-                    member)->pAttributeTypeRef->eTypeClass);
-            // Setter:
-            if (!reinterpret_cast<
-                typelib_InterfaceAttributeTypeDescription * >(
-                    member)->bReadOnly)
-            {
-                (s++)->fn = code;
-                code = codeSnippet(
-                    code, functionOffset++, vtableOffset,
-                    typelib_TypeClass_VOID);
-            }
-            break;
-
-        case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
-            code = codeSnippet(
-                code, functionOffset++, vtableOffset,
-                reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-                    member)->pReturnTypeRef->eTypeClass);
-            break;
-
-        default:
-            OSL_ASSERT(false);
-            break;
-        }
-        TYPELIB_DANGER_RELEASE(member);
-    }
-    return code;
-}
-
-void bridges::cpp_uno::shared::VtableFactory::flushCode(
-    unsigned char const *, unsigned char const *)
-{}
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx b/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
deleted file mode 100644
index c2287b9b6fa9..000000000000
--- a/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
+++ /dev/null
@@ -1,338 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
-
-#include <stdio.h>
-#include <dlfcn.h>
-#include <cxxabi.h>
-#include <hash_map>
-#include <sys/param.h>
-
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/diagnose.h>
-#include <osl/mutex.hxx>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <typelib/typedescription.hxx>
-#include <uno/any2.h>
-
-#include "share.hxx"
-
-
-using namespace ::std;
-using namespace ::osl;
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-using namespace ::__cxxabiv1;
-
-
-namespace CPPU_CURRENT_NAMESPACE
-{
-
-void dummy_can_throw_anything( char const * )
-{
-}
-
-//==================================================================================================
-static OUString toUNOname( char const * p ) SAL_THROW( () )
-{
-#if OSL_DEBUG_LEVEL > 1
-    char const * start = p;
-#endif
-
-    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-
-    OUStringBuffer buf( 64 );
-    OSL_ASSERT( 'N' == *p );
-    ++p; // skip N
-
-    while ('E' != *p)
-    {
-        // read chars count
-        long n = (*p++ - '0');
-        while ('0' <= *p && '9' >= *p)
-        {
-            n *= 10;
-            n += (*p++ - '0');
-        }
-        buf.appendAscii( p, n );
-        p += n;
-        if ('E' != *p)
-            buf.append( (sal_Unicode)'.' );
-    }
-
-#if OSL_DEBUG_LEVEL > 1
-    OUString ret( buf.makeStringAndClear() );
-    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-    return ret;
-#else
-    return buf.makeStringAndClear();
-#endif
-}
-
-//==================================================================================================
-class RTTI
-{
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-
-    Mutex m_mutex;
-    t_rtti_map m_rttis;
-    t_rtti_map m_generatedRttis;
-
-    void * m_hApp;
-
-public:
-    RTTI() SAL_THROW( () );
-    ~RTTI() SAL_THROW( () );
-
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-};
-//__________________________________________________________________________________________________
-RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
-    : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-#else
-    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-#endif
-{
-}
-//__________________________________________________________________________________________________
-RTTI::~RTTI() SAL_THROW( () )
-{
-    dlclose( m_hApp );
-}
-
-//__________________________________________________________________________________________________
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-{
-    type_info * rtti;
-
-    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-
-    MutexGuard guard( m_mutex );
-    t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) );
-    if (iRttiFind == m_rttis.end())
-    {
-        // RTTI symbol
-        OStringBuffer buf( 64 );
-        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-        sal_Int32 index = 0;
-        do
-        {
-            OUString token( unoName.getToken( 0, '.', index ) );
-            buf.append( token.getLength() );
-            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-            buf.append( c_token );
-        }
-        while (index >= 0);
-        buf.append( 'E' );
-
-        OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103 /* #i22253# */
-        rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-#else
-        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-#endif
-
-        if (rtti)
-        {
-            pair< t_rtti_map::iterator, bool > insertion(
-                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-        }
-        else
-        {
-            // try to lookup the symbol in the generated rtti map
-            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-            if (iFind == m_generatedRttis.end())
-            {
-                // we must generate it !
-                // symbol and rtti-name is nearly identical,
-                // the symbol is prefixed with _ZTI
-                char const * rttiName = symName.getStr() +4;
-#if OSL_DEBUG_LEVEL > 1
-                fprintf( stderr,"generated rtti for %s\n", rttiName );
-#endif
-                if (pTypeDescr->pBaseTypeDescription)
-                {
-                    // ensure availability of base
-                    type_info * base_rtti = getRTTI(
-                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-                    rtti = new __si_class_type_info(
-                        strdup( rttiName ), (__class_type_info *)base_rtti );
-                }
-                else
-                {
-                    // this class has no base class
-                    rtti = new __class_type_info( strdup( rttiName ) );
-                }
-
-                pair< t_rtti_map::iterator, bool > insertion(
-                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-            }
-            else // taking already generated rtti
-            {
-                rtti = iFind->second;
-            }
-        }
-    }
-    else
-    {
-        rtti = iRttiFind->second;
-    }
-
-    return rtti;
-}
-
-//--------------------------------------------------------------------------------------------------
-static void deleteException( void * pExc )
-{
-    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-    typelib_TypeDescription * pTD = 0;
-    OUString unoName( toUNOname( header->exceptionType->name() ) );
-    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-    if (pTD)
-    {
-        ::uno_destructData( pExc, pTD, cpp_release );
-        ::typelib_typedescription_release( pTD );
-    }
-}
-
-//==================================================================================================
-void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-{
-#if OSL_DEBUG_LEVEL > 1
-    OString cstr(
-        OUStringToOString(
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
-#endif
-    void * pCppExc;
-    type_info * rtti;
-
-    {
-    // construct cpp exception object
-    typelib_TypeDescription * pTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-    OSL_ASSERT( pTypeDescr );
-    if (! pTypeDescr)
-    {
-        throw RuntimeException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
-    }
-
-    pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-    ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-
-    // destruct uno exception
-    ::uno_any_destruct( pUnoExc, 0 );
-    // avoiding locked counts
-    static RTTI * s_rtti = 0;
-    if (! s_rtti)
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if (! s_rtti)
-        {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
-            static RTTI rtti_data;
-            s_rtti = &rtti_data;
-#endif
-        }
-    }
-    rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-    TYPELIB_DANGER_RELEASE( pTypeDescr );
-    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-    if (! rtti)
-    {
-        throw RuntimeException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
-    }
-    }
-
-    __cxa_throw( pCppExc, rtti, deleteException );
-}
-
-//==================================================================================================
-void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
-{
-    if (! header)
-    {
-        RuntimeException aRE(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
-            Reference< XInterface >() );
-        Type const & rType = ::getCppuType( &aRE );
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
-#if OSL_DEBUG_LEVEL > 0
-        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
-#endif
-        return;
-    }
-
-    typelib_TypeDescription * pExcTypeDescr = 0;
-    OUString unoName( toUNOname( header->exceptionType->name() ) );
-#if OSL_DEBUG_LEVEL > 1
-    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
-#endif
-    typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-    if (0 == pExcTypeDescr)
-    {
-        RuntimeException aRE(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
-            Reference< XInterface >() );
-        Type const & rType = ::getCppuType( &aRE );
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
-#if OSL_DEBUG_LEVEL > 0
-        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
-#endif
-    }
-    else
-    {
-        // construct uno exception any
-        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-        typelib_typedescription_release( pExcTypeDescr );
-    }
-}
-
-}
-
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx
deleted file mode 100644
index 094a1d1d0177..000000000000
--- a/bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx
+++ /dev/null
@@ -1,444 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
-
-#include <stdlib.h>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <uno/data.h>
-
-#include "bridges/cpp_uno/shared/bridge.hxx"
-#include "bridges/cpp_uno/shared/types.hxx"
-#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
-#include "bridges/cpp_uno/shared/vtables.hxx"
-
-#include "share.hxx"
-
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-
-namespace
-{
-
-//==================================================================================================
-// The call instruction within the asm section of callVirtualMethod may throw
-// exceptions.  So that the compiler handles this correctly, it is important
-// that (a) callVirtualMethod might call dummy_can_throw_anything (although this
-// never happens at runtime), which in turn can throw exceptions, and (b)
-// callVirtualMethod is not inlined at its call site (so that any exceptions are
-// caught which are thrown from the instruction calling callVirtualMethod):
-void callVirtualMethod(
-    void * pAdjustedThisPtr,
-    sal_Int32 nVtableIndex,
-    void * pRegisterReturn,
-    typelib_TypeClass eReturnType,
-    sal_Int32 * pStackLongs,
-    sal_Int32 nStackLongs ) __attribute__((noinline));
-
-void callVirtualMethod(
-    void * pAdjustedThisPtr,
-    sal_Int32 nVtableIndex,
-    void * pRegisterReturn,
-    typelib_TypeClass eReturnType,
-    sal_Int32 * pStackLongs,
-    sal_Int32 nStackLongs )
-{
-    // parameter list is mixed list of * and values
-    // reference parameters are pointers
-
-    OSL_ENSURE( pStackLongs && pAdjustedThisPtr, "### null ptr!" );
-    OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-    OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-
-    // never called
-    if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
-
-    volatile long edx = 0, eax = 0; // for register returns
-    void * stackptr;
-    asm volatile (
-        "mov   %%esp, %6\n\t"
-        // copy values
-        "mov   %0, %%eax\n\t"
-        "mov   %%eax, %%edx\n\t"
-        "dec   %%edx\n\t"
-        "shl   $2, %%edx\n\t"
-        "add   %1, %%edx\n"
-        "Lcopy:\n\t"
-        "pushl 0(%%edx)\n\t"
-        "sub   $4, %%edx\n\t"
-        "dec   %%eax\n\t"
-        "jne   Lcopy\n\t"
-        // do the actual call
-        "mov   %2, %%edx\n\t"
-        "mov   0(%%edx), %%edx\n\t"
-        "mov   %3, %%eax\n\t"
-        "shl   $2, %%eax\n\t"
-        "add   %%eax, %%edx\n\t"
-        "mov   0(%%edx), %%edx\n\t"
-        "call  *%%edx\n\t"
-        // save return registers
-         "mov   %%eax, %4\n\t"
-         "mov   %%edx, %5\n\t"
-        // cleanup stack
-        "mov   %6, %%esp\n\t"
-        :
-        : "m"(nStackLongs), "m"(pStackLongs), "m"(pAdjustedThisPtr),
-          "m"(nVtableIndex), "m"(eax), "m"(edx), "m"(stackptr)
-        : "eax", "edx" );
-    switch( eReturnType )
-    {
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-            ((long*)pRegisterReturn)[1] = edx;
-        case typelib_TypeClass_LONG:
-        case typelib_TypeClass_UNSIGNED_LONG:
-        case typelib_TypeClass_CHAR:
-        case typelib_TypeClass_ENUM:
-            ((long*)pRegisterReturn)[0] = eax;
-            break;
-        case typelib_TypeClass_SHORT:
-        case typelib_TypeClass_UNSIGNED_SHORT:
-            *(unsigned short*)pRegisterReturn = eax;
-            break;
-        case typelib_TypeClass_BOOLEAN:
-        case typelib_TypeClass_BYTE:
-            *(unsigned char*)pRegisterReturn = eax;
-            break;
-        case typelib_TypeClass_FLOAT:
-            asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-            break;
-        case typelib_TypeClass_DOUBLE:
-            asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-            break;
-        default:
-            break;
-    }
-}
-
-//==================================================================================================
-static void cpp_call(
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
-    bridges::cpp_uno::shared::VtableSlot aVtableSlot,
-    typelib_TypeDescriptionReference * pReturnTypeRef,
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-{
-      // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      =
-          (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-      char * pCppStackStart = pCppStack;
-
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-    OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
-    void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
-    if (pReturnTypeDescr)
-    {
-        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-        {
-            pCppReturn = pUnoReturn; // direct way for simple types
-        }
-        else
-        {
-            // complex return via ptr
-            pCppReturn = *(void **)pCppStack
-                = (bridges::cpp_uno::shared::relatesToInterfaceType(
-                       pReturnTypeDescr )
-                   ? alloca( pReturnTypeDescr->nSize )
-                   : pUnoReturn); // direct way
-            pCppStack += sizeof(void *);
-        }
-    }
-    // push this
-    void * pAdjustedThisPtr = reinterpret_cast< void ** >(pThis->getCppI())
-        + aVtableSlot.offset;
-    *(void**)pCppStack = pAdjustedThisPtr;
-    pCppStack += sizeof( void* );
-
-    // stack space
-    OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-    // args
-    void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-    // indizes of values this have to be converted (interface conversion cpp<=>uno)
-    sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
-    sal_Int32 nTempIndizes   = 0;
-
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-        if (!rParam.bOut
-            && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
-        {
-            uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-                                    pThis->getBridge()->getUno2Cpp() );
-
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-            case typelib_TypeClass_DOUBLE:
-                pCppStack += sizeof(sal_Int32); // extra long
-                break;
-            default:
-                break;
-            }
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // ptr to complex value | ref
-        {
-            if (! rParam.bIn) // is pure out
-            {
-                // cpp out is constructed mem, uno out is not!
-                uno_constructData(
-                    *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                    pParamTypeDescr );
-                pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            // is in/inout
-            else if (bridges::cpp_uno::shared::relatesToInterfaceType(
-                         pParamTypeDescr ))
-            {
-                uno_copyAndConvertData(
-                    *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                    pUnoArgs[nPos], pParamTypeDescr,
-                    pThis->getBridge()->getUno2Cpp() );
-
-                pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-        }
-        pCppStack += sizeof(sal_Int32); // standard parameter length
-    }
-
-    try
-    {
-        OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-        callVirtualMethod(
-            pAdjustedThisPtr, aVtableSlot.index,
-            pCppReturn, pReturnTypeDescr->eTypeClass,
-            (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-        // NO exception occured...
-        *ppUnoExc = 0;
-
-        // reconvert temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
-            if (pParams[nIndex].bIn)
-            {
-                if (pParams[nIndex].bOut) // inout
-                {
-                    uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-                    uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-                                            pThis->getBridge()->getCpp2Uno() );
-                }
-            }
-            else // pure out
-            {
-                uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-                                        pThis->getBridge()->getCpp2Uno() );
-            }
-            // destroy temp cpp param => cpp: every param was constructed
-            uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return value
-        if (pCppReturn && pUnoReturn != pCppReturn)
-        {
-            uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-                                    pThis->getBridge()->getCpp2Uno() );
-            uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-        }
-    }
-     catch (...)
-     {
-          // fill uno exception
-        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
-        // temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            // destroy temp cpp param => cpp: every param was constructed
-            uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-        }
-        // return type
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-    }
-}
-
-}
-
-namespace bridges { namespace cpp_uno { namespace shared {
-
-void unoInterfaceProxyDispatch(
-    uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-    void * pReturn, void * pArgs[], uno_Any ** ppException )
-{
-    // is my surrogate
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
-        = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
-
-    switch (pMemberDescr->eTypeClass)
-    {
-    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-    {
-        VtableSlot aVtableSlot(
-            getVtableSlot(
-                reinterpret_cast<
-                    typelib_InterfaceAttributeTypeDescription const * >(
-                        pMemberDescr)));
-        if (pReturn)
-        {
-            // dependent dispatch
-            cpp_call(
-                pThis, aVtableSlot,
-                ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-                0, 0, // no params
-                pReturn, pArgs, ppException );
-        }
-        else
-        {
-            // is SET
-            typelib_MethodParameter aParam;
-            aParam.pTypeRef =
-                ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
-            typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-            OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-            typelib_typedescriptionreference_new(
-                &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
-            // dependent dispatch
-            aVtableSlot.index += 1; // get, then set method
-            cpp_call(
-                pThis, aVtableSlot,
-                pReturnTypeRef,
-                1, &aParam,
-                pReturn, pArgs, ppException );
-
-            typelib_typedescriptionreference_release( pReturnTypeRef );
-        }
-
-        break;
-    }
-    case typelib_TypeClass_INTERFACE_METHOD:
-    {
-        VtableSlot aVtableSlot(
-            getVtableSlot(
-                reinterpret_cast<
-                    typelib_InterfaceMethodTypeDescription const * >(
-                        pMemberDescr)));
-        switch (aVtableSlot.index)
-        {
-            // standard calls
-        case 1: // acquire uno interface
-            (*pUnoI->acquire)( pUnoI );
-            *ppException = 0;
-            break;
-        case 2: // release uno interface
-            (*pUnoI->release)( pUnoI );
-            *ppException = 0;
-            break;
-        case 0: // queryInterface() opt
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-            if (pTD)
-            {
-                uno_Interface * pInterface = 0;
-                (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
-                    pThis->pBridge->getUnoEnv(),
-                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
-                if (pInterface)
-                {
-                    ::uno_any_construct(
-                        reinterpret_cast< uno_Any * >( pReturn ),
-                        &pInterface, pTD, 0 );
-                    (*pInterface->release)( pInterface );
-                    TYPELIB_DANGER_RELEASE( pTD );
-                    *ppException = 0;
-                    break;
-                }
-                TYPELIB_DANGER_RELEASE( pTD );
-            }
-        } // else perform queryInterface()
-        default:
-            // dependent dispatch
-            cpp_call(
-                pThis, aVtableSlot,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-                pReturn, pArgs, ppException );
-        }
-        break;
-    }
-    default:
-    {
-        ::com::sun::star::uno::RuntimeException aExc(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
-        Type const & rExcType = ::getCppuType( &aExc );
-        // binary identical null reference
-        ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-    }
-    }
-}
-
-} } }
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx
deleted file mode 100644
index 937af0152d90..000000000000
--- a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx
+++ /dev/null
@@ -1,803 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
-
-// This is an implementation of the x86-64 ABI as described in 'System V
-// Application Binary Interface, AMD64 Architecture Processor Supplement'
-// (http://www.x86-64.org/documentation/abi-0.95.pdf)
-//
-// The code in this file is a modification of src/x86/ffi64.c from libffi
-// (http://sources.redhat.com/libffi/) which is under the following license:
-
-/* -----------------------------------------------------------------------
-   ffi.c - Copyright (c) 2002  Bo Thorsen <bo@suse.de>
-
-   x86-64 Foreign Function Interface
-
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   ``Software''), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, sublicense, and/or sell copies of the Software, and to
-   permit persons to whom the Software is furnished to do so, subject to
-   the following conditions:
-
-   The above copyright notice and this permission notice shall be included
-   in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
-   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-   OTHER DEALINGS IN THE SOFTWARE.
-   ----------------------------------------------------------------------- */
-
-#include <abi.hxx>
-
-#include <rtl/ustring.hxx>
-
-using namespace x86_64;
-
-typedef struct
-{
-    /* Registers for argument passing.  */
-    long gpr[MAX_GPR_REGS];
-    __int128_t sse[MAX_SSE_REGS];
-
-    /* Stack space for arguments.  */
-    char argspace[0];
-} stackLayout;
-
-/* Register class used for passing given 64bit part of the argument.
-   These represent classes as documented by the PS ABI, with the exception
-   of SSESF, SSEDF classes, that are basically SSE class, just gcc will
-   use SF or DFmode move instead of DImode to avoid reformating penalties.
-
-   Similary we play games with INTEGERSI_CLASS to use cheaper SImode moves
-   whenever possible (upper half does contain padding).
- */
-enum x86_64_reg_class
-{
-    X86_64_NO_CLASS,
-    X86_64_INTEGER_CLASS,
-    X86_64_INTEGERSI_CLASS,
-    X86_64_SSE_CLASS,
-    X86_64_SSESF_CLASS,
-    X86_64_SSEDF_CLASS,
-    X86_64_SSEUP_CLASS,
-    X86_64_X87_CLASS,
-    X86_64_X87UP_CLASS,
-    X86_64_MEMORY_CLASS
-};
-
-#define MAX_CLASSES 4
-
-#define ALIGN(v, a) (((((size_t) (v))-1) | ((a)-1))+1)
-
-/* x86-64 register passing implementation.  See x86-64 ABI for details.  Goal
-   of this code is to classify each 8bytes of incoming argument by the register
-   class and assign registers accordingly.  */
-
-/* Return the union class of CLASS1 and CLASS2.
-   See the x86-64 PS ABI for details.  */
-
-static enum x86_64_reg_class
-merge_classes (enum x86_64_reg_class class1, enum x86_64_reg_class class2)
-{
-    /* Rule #1: If both classes are equal, this is the resulting class.  */
-    if (class1 == class2)
-        return class1;
-
-    /* Rule #2: If one of the classes is NO_CLASS, the resulting class is
-       the other class.  */
-    if (class1 == X86_64_NO_CLASS)
-        return class2;
-    if (class2 == X86_64_NO_CLASS)
-        return class1;
-
-    /* Rule #3: If one of the classes is MEMORY, the result is MEMORY.  */
-    if (class1 == X86_64_MEMORY_CLASS || class2 == X86_64_MEMORY_CLASS)
-        return X86_64_MEMORY_CLASS;
-
-    /* Rule #4: If one of the classes is INTEGER, the result is INTEGER.  */
-    if ((class1 == X86_64_INTEGERSI_CLASS && class2 == X86_64_SSESF_CLASS)
-            || (class2 == X86_64_INTEGERSI_CLASS && class1 == X86_64_SSESF_CLASS))
-        return X86_64_INTEGERSI_CLASS;
-    if (class1 == X86_64_INTEGER_CLASS || class1 == X86_64_INTEGERSI_CLASS
-            || class2 == X86_64_INTEGER_CLASS || class2 == X86_64_INTEGERSI_CLASS)
-        return X86_64_INTEGER_CLASS;
-
-    /* Rule #5: If one of the classes is X87 or X87UP class, MEMORY is used.  */
-    if (class1 == X86_64_X87_CLASS || class1 == X86_64_X87UP_CLASS
-            || class2 == X86_64_X87_CLASS || class2 == X86_64_X87UP_CLASS)
-        return X86_64_MEMORY_CLASS;
-
-    /* Rule #6: Otherwise class SSE is used.  */
-    return X86_64_SSE_CLASS;
-}
-
-/* Classify the argument of type TYPE and mode MODE.
-   CLASSES will be filled by the register class used to pass each word
-   of the operand.  The number of words is returned.  In case the parameter
-   should be passed in memory, 0 is returned. As a special case for zero
-   sized containers, classes[0] will be NO_CLASS and 1 is returned.
-
-   See the x86-64 PS ABI for details.
-*/
-static int
-classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_class classes[], int &rByteOffset )
-{
-    /* First, align to the right place.  */
-    rByteOffset = ALIGN( rByteOffset, pTypeRef->pType->nAlignment );
-
-    switch ( pTypeRef->eTypeClass )
-    {
-        case typelib_TypeClass_VOID:
-            classes[0] = X86_64_NO_CLASS;
-            return 1;
-        case typelib_TypeClass_CHAR:
-        case typelib_TypeClass_BOOLEAN:
-        case typelib_TypeClass_BYTE:
-        case typelib_TypeClass_SHORT:
-        case typelib_TypeClass_UNSIGNED_SHORT:
-        case typelib_TypeClass_LONG:
-        case typelib_TypeClass_UNSIGNED_LONG:
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-        case typelib_TypeClass_ENUM:
-            if ( ( rByteOffset % 8 + pTypeRef->pType->nSize ) <= 4 )
-                classes[0] = X86_64_INTEGERSI_CLASS;
-            else
-                classes[0] = X86_64_INTEGER_CLASS;
-            return 1;
-        case typelib_TypeClass_FLOAT:
-            if ( ( rByteOffset % 8 ) == 0 )
-                classes[0] = X86_64_SSESF_CLASS;
-            else
-                classes[0] = X86_64_SSE_CLASS;
-            return 1;
-        case typelib_TypeClass_DOUBLE:
-            classes[0] = X86_64_SSEDF_CLASS;
-            return 1;
-        /*case LONGDOUBLE:
-            classes[0] = X86_64_X87_CLASS;
-            classes[1] = X86_64_X87UP_CLASS;
-            return 2;*/
-        case typelib_TypeClass_STRING:
-        case typelib_TypeClass_TYPE:
-        case typelib_TypeClass_ANY:
-        case typelib_TypeClass_TYPEDEF:
-        case typelib_TypeClass_UNION:
-        case typelib_TypeClass_SEQUENCE:
-        case typelib_TypeClass_ARRAY:
-        case typelib_TypeClass_INTERFACE:
-            return 0;
-        case typelib_TypeClass_STRUCT:
-        case typelib_TypeClass_EXCEPTION:
-            {
-                typelib_TypeDescription * pTypeDescr = 0;
-                TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
-
-                const int UNITS_PER_WORD = 8;
-                int words = ( pTypeDescr->nSize + UNITS_PER_WORD - 1 ) / UNITS_PER_WORD;
-                enum x86_64_reg_class subclasses[MAX_CLASSES];
-
-                /* If the struct is larger than 16 bytes, pass it on the stack.  */
-                if ( pTypeDescr->nSize > 16 )
-                {
-                    TYPELIB_DANGER_RELEASE( pTypeDescr );
-                    return 0;
-                }
-
-                for ( int i = 0; i < words; i++ )
-                    classes[i] = X86_64_NO_CLASS;
-
-                const typelib_CompoundTypeDescription *pStruct = reinterpret_cast<const typelib_CompoundTypeDescription*>( pTypeDescr );
-
-                /* Merge the fields of structure.  */
-                for ( sal_Int32 nMember = 0; nMember < pStruct->nMembers; ++nMember )
-                {
-                    typelib_TypeDescriptionReference *pTypeInStruct = pStruct->ppTypeRefs[ nMember ];
-
-                    int num = classify_argument( pTypeInStruct, subclasses, rByteOffset );
-
-                    if ( num == 0 )
-                    {
-                        TYPELIB_DANGER_RELEASE( pTypeDescr );
-                        return 0;
-                    }
-
-                    for ( int i = 0; i < num; i++ )
-                    {
-                        int pos = rByteOffset / 8;
-                        classes[i + pos] = merge_classes( subclasses[i], classes[i + pos] );
-                    }
-
-                    if ( pTypeInStruct->eTypeClass != typelib_TypeClass_STRUCT )
-                        rByteOffset = pStruct->pMemberOffsets[ nMember ];
-                }
-
-                TYPELIB_DANGER_RELEASE( pTypeDescr );
-
-                /* Final merger cleanup.  */
-                for ( int i = 0; i < words; i++ )
-                {
-                    /* If one class is MEMORY, everything should be passed in
-                       memory.  */
-                    if ( classes[i] == X86_64_MEMORY_CLASS )
-                        return 0;
-
-                    /* The X86_64_SSEUP_CLASS should be always preceded by
-                       X86_64_SSE_CLASS.  */
-                    if ( classes[i] == X86_64_SSEUP_CLASS
-                            && ( i == 0 || classes[i - 1] != X86_64_SSE_CLASS ) )
-                        classes[i] = X86_64_SSE_CLASS;
-
-                    /*  X86_64_X87UP_CLASS should be preceded by X86_64_X87_CLASS.  */
-                    if ( classes[i] == X86_64_X87UP_CLASS
-                            && ( i == 0 || classes[i - 1] != X86_64_X87_CLASS ) )
-                        classes[i] = X86_64_SSE_CLASS;
-                }
-                return words;
-            }
-
-        default:
-#if OSL_DEBUG_LEVEL > 1
-            OSL_TRACE( "Unhandled case: pType->eTypeClass == %d\n", pTypeRef->eTypeClass );
-#endif
-            OSL_ASSERT(0);
-    }
-    return 0; /* Never reached.  */
-}
-
-/* Examine the argument and return set number of register required in each
-   class.  Return 0 iff parameter should be passed in memory.  */
-bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE )
-{
-    enum x86_64_reg_class classes[MAX_CLASSES];
-    int offset = 0;
-    int n;
-
-    n = classify_argument( pTypeRef, classes, offset );
-
-    if ( n == 0 )
-        return false;
-
-    nUsedGPR = 0;
-    nUsedSSE = 0;
-    for ( n--; n >= 0; n-- )
-        switch ( classes[n] )
-        {
-            case X86_64_INTEGER_CLASS:
-            case X86_64_INTEGERSI_CLASS:
-                nUsedGPR++;
-                break;
-            case X86_64_SSE_CLASS:
-            case X86_64_SSESF_CLASS:
-            case X86_64_SSEDF_CLASS:
-                nUsedSSE++;
-                break;
-            case X86_64_NO_CLASS:
-            case X86_64_SSEUP_CLASS:
-                break;
-            case X86_64_X87_CLASS:
-            case X86_64_X87UP_CLASS:
-                if ( !bInReturn )
-                    return false;
-                break;
-            default:
-#if OSL_DEBUG_LEVEL > 1
-            OSL_TRACE( "Unhandled case: classes[n] == %d\n", classes[n] );
-#endif
-            OSL_ASSERT(0);
-        }
-    return true;
-}
-
-bool x86_64::return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef )
-{
-    int g, s;
-
-    return examine_argument( pTypeRef, true, g, s ) == 0;
-}
-
-void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, void * const *pGPR, void * const *pSSE, void *pStruct )
-{
-    enum x86_64_reg_class classes[MAX_CLASSES];
-    int offset = 0;
-    int n;
-
-    n = classify_argument( pTypeRef, classes, offset );
-
-    sal_uInt64 *pStructAlign = reinterpret_cast<sal_uInt64 *>( pStruct );
-    for ( n--; n >= 0; n-- )
-        switch ( classes[n] )
-        {
-            case X86_64_INTEGER_CLASS:
-            case X86_64_INTEGERSI_CLASS:
-                *pStructAlign++ = *reinterpret_cast<sal_uInt64 *>( *pGPR++ );
-                break;
-            case X86_64_SSE_CLASS:
-            case X86_64_SSESF_CLASS:
-            case X86_64_SSEDF_CLASS:
-                *pStructAlign++ = *reinterpret_cast<sal_uInt64 *>( *pSSE++ );
-                break;
-        }
-}
-
-#if 0
-
-/* Functions to load floats and double to an SSE register placeholder.  */
-extern void float2sse (float, __int128_t *);
-extern void double2sse (double, __int128_t *);
-extern void floatfloat2sse (void *, __int128_t *);
-
-/* Functions to put the floats and doubles back.  */
-extern float sse2float (__int128_t *);
-extern double sse2double (__int128_t *);
-extern void sse2floatfloat(__int128_t *, void *);
-
-/*@-exportheader@*/
-void
-ffi_prep_args (stackLayout *stack, extended_cif *ecif)
-/*@=exportheader@*/
-{
-  int gprcount, ssecount, i, g, s;
-  void **p_argv;
-  void *argp = &stack->argspace;
-  ffi_type **p_arg;
-
-  /* First check if the return value should be passed in memory. If so,
-     pass the pointer as the first argument.  */
-  gprcount = ssecount = 0;
-  if (ecif->cif->rtype->type != FFI_TYPE_VOID
-      && examine_argument (ecif->cif->rtype, 1, &g, &s) == 0)
-    (void *)stack->gpr[gprcount++] = ecif->rvalue;
-
-  for (i=ecif->cif->nargs, p_arg=ecif->cif->arg_types, p_argv = ecif->avalue;
-       i!=0; i--, p_arg++, p_argv++)
-    {
-      int in_register = 0;
-
-      switch ((*p_arg)->type)
-    {
-    case FFI_TYPE_SINT8:
-    case FFI_TYPE_SINT16:
-    case FFI_TYPE_SINT32:
-    case FFI_TYPE_SINT64:
-    case FFI_TYPE_UINT8:
-    case FFI_TYPE_UINT16:
-    case FFI_TYPE_UINT32:
-    case FFI_TYPE_UINT64:
-    case FFI_TYPE_POINTER:
-      if (gprcount < MAX_GPR_REGS)
-        {
-          stack->gpr[gprcount] = 0;
-          stack->gpr[gprcount++] = *(long long *)(*p_argv);
-          in_register = 1;
-        }
-      break;
-
-    case FFI_TYPE_FLOAT:
-      if (ssecount < MAX_SSE_REGS)
-        {
-          float2sse (*(float *)(*p_argv), &stack->sse[ssecount++]);
-          in_register = 1;
-        }
-      break;
-
-    case FFI_TYPE_DOUBLE:
-      if (ssecount < MAX_SSE_REGS)
-        {
-          double2sse (*(double *)(*p_argv), &stack->sse[ssecount++]);
-          in_register = 1;
-        }
-      break;
-    }
-
-      if (in_register)
-    continue;
-
-      /* Either all places in registers where filled, or this is a
-     type that potentially goes into a memory slot.  */
-      if (examine_argument (*p_arg, 0, &g, &s) == 0
-      || gprcount + g > MAX_GPR_REGS || ssecount + s > MAX_SSE_REGS)
-    {
-      /* Pass this argument in memory.  */
-      argp = (void *)ALIGN(argp, (*p_arg)->alignment);
-      memcpy (argp, *p_argv, (*p_arg)->size);
-      argp += (*p_arg)->size;
-    }
-      else
-    {
-      /* All easy cases are eliminated. Now fire the big guns.  */
-
-      enum x86_64_reg_class classes[MAX_CLASSES];
-      int offset = 0, j, num;
-      void *a;
-
-      num = classify_argument (*p_arg, classes, &offset);
-      for (j=0, a=*p_argv; j<num; j++, a+=8)
-        {
-          switch (classes[j])
-        {
-        case X86_64_INTEGER_CLASS:
-        case X86_64_INTEGERSI_CLASS:
-          stack->gpr[gprcount++] = *(long long *)a;
-          break;
-        case X86_64_SSE_CLASS:
-          floatfloat2sse (a, &stack->sse[ssecount++]);
-          break;
-        case X86_64_SSESF_CLASS:
-          float2sse (*(float *)a, &stack->sse[ssecount++]);
-          break;
-        case X86_64_SSEDF_CLASS:
-          double2sse (*(double *)a, &stack->sse[ssecount++]);
-          break;
-        default:
-          abort();
-        }
-        }
-    }
-    }
-}
-
-/* Perform machine dependent cif processing.  */
-ffi_status
-ffi_prep_cif_machdep (ffi_cif *cif)
-{
-  int gprcount, ssecount, i, g, s;
-
-  gprcount = ssecount = 0;
-
-  /* Reset the byte count. We handle this size estimation here.  */
-  cif->bytes = 0;
-
-  /* If the return value should be passed in memory, pass the pointer
-     as the first argument. The actual memory isn't allocated here.  */
-  if (cif->rtype->type != FFI_TYPE_VOID
-      && examine_argument (cif->rtype, 1, &g, &s) == 0)
-    gprcount = 1;
-
-  /* Go over all arguments and determine the way they should be passed.
-     If it's in a register and there is space for it, let that be so. If
-     not, add it's size to the stack byte count.  */
-  for (i=0; i<cif->nargs; i++)
-    {
-      if (examine_argument (cif->arg_types[i], 0, &g, &s) == 0
-      || gprcount + g > MAX_GPR_REGS || ssecount + s > MAX_SSE_REGS)
-    {
-      /* This is passed in memory. First align to the basic type.  */
-      cif->bytes = ALIGN(cif->bytes, cif->arg_types[i]->alignment);
-
-      /* Stack arguments are *always* at least 8 byte aligned.  */
-      cif->bytes = ALIGN(cif->bytes, 8);
-
-      /* Now add the size of this argument.  */
-      cif->bytes += cif->arg_types[i]->size;
-    }
-      else
-    {
-      gprcount += g;
-      ssecount += s;
-    }
-    }
-
-  /* Set the flag for the closures return.  */
-    switch (cif->rtype->type)
-    {
-    case FFI_TYPE_VOID:
-    case FFI_TYPE_STRUCT:
-    case FFI_TYPE_SINT64:
-    case FFI_TYPE_FLOAT:
-    case FFI_TYPE_DOUBLE:
-    case FFI_TYPE_LONGDOUBLE:
-      cif->flags = (unsigned) cif->rtype->type;
-      break;
-
-    case FFI_TYPE_UINT64:
-      cif->flags = FFI_TYPE_SINT64;
-      break;
-
-    default:
-      cif->flags = FFI_TYPE_INT;
-      break;
-    }
-
-  return FFI_OK;
-}
-
-typedef struct
-{
-  long gpr[2];
-  __int128_t sse[2];
-  long double st0;
-} return_value;
-
-//#endif
-
-void
-ffi_fill_return_value (return_value *rv, extended_cif *ecif)
-{
-    enum x86_64_reg_class classes[MAX_CLASSES];
-    int i = 0, num;
-    long *gpr = rv->gpr;
-    __int128_t *sse = rv->sse;
-    signed char sc;
-    signed short ss;
-
-    /* This is needed because of the way x86-64 handles signed short
-       integers.  */
-    switch (ecif->cif->rtype->type)
-    {
-        case FFI_TYPE_SINT8:
-            sc = *(signed char *)gpr;
-            *(long long *)ecif->rvalue = (long long)sc;
-            return;
-        case FFI_TYPE_SINT16:
-            ss = *(signed short *)gpr;
-            *(long long *)ecif->rvalue = (long long)ss;
-            return;
-        default:
-            /* Just continue.  */
-            ;
-    }
-
-    num = classify_argument (ecif->cif->rtype, classes, &i);
-
-    if (num == 0)
-        /* Return in memory.  */
-        ecif->rvalue = (void *) rv->gpr[0];
-    else if (num == 2 && classes[0] == X86_64_X87_CLASS &&
-            classes[1] == X86_64_X87UP_CLASS)
-        /* This is a long double (this is easiest to handle this way instead
-           of an eightbyte at a time as in the loop below.  */
-        *((long double *)ecif->rvalue) = rv->st0;
-    else
-    {
-        void *a;
-
-        for (i=0, a=ecif->rvalue; i<num; i++, a+=8)
-        {
-            switch (classes[i])
-            {
-                case X86_64_INTEGER_CLASS:
-                case X86_64_INTEGERSI_CLASS:
-                    *(long long *)a = *gpr;
-                    gpr++;
-                    break;
-                case X86_64_SSE_CLASS:
-                    sse2floatfloat (sse++, a);
-                    break;
-                case X86_64_SSESF_CLASS:
-                    *(float *)a = sse2float (sse++);
-                    break;
-                case X86_64_SSEDF_CLASS:
-                    *(double *)a = sse2double (sse++);
-                    break;
-                default:
-                    abort();
-            }
-        }
-    }
-}
-
-//#if 0
-
-/*@-declundef@*/
-/*@-exportheader@*/
-extern void ffi_call_UNIX64(void (*)(stackLayout *, extended_cif *),
-                void (*) (return_value *, extended_cif *),
-                /*@out@*/ extended_cif *,
-                unsigned, /*@out@*/ unsigned *, void (*fn)());
-/*@=declundef@*/
-/*@=exportheader@*/
-
-void ffi_call(/*@dependent@*/ ffi_cif *cif,
-          void (*fn)(),
-          /*@out@*/ void *rvalue,
-          /*@dependent@*/ void **avalue)
-{
-  extended_cif ecif;
-  int dummy;
-
-  ecif.cif = cif;
-  ecif.avalue = avalue;
-
-  /* If the return value is a struct and we don't have a return */
-  /* value address then we need to make one             */
-
-  if ((rvalue == NULL) &&
-      (examine_argument (cif->rtype, 1, &dummy, &dummy) == 0))
-    {
-      /*@-sysunrecog@*/
-      ecif.rvalue = alloca(cif->rtype->size);
-      /*@=sysunrecog@*/
-    }
-  else
-    ecif.rvalue = rvalue;
-
-  /* Stack must always be 16byte aligned. Make it so.  */
-  cif->bytes = ALIGN(cif->bytes, 16);
-
-  switch (cif->abi)
-    {
-    case FFI_SYSV:
-      /* Calling 32bit code from 64bit is not possible  */
-      FFI_ASSERT(0);
-      break;
-
-    case FFI_UNIX64:
-      /*@-usedef@*/
-      ffi_call_UNIX64 (ffi_prep_args, ffi_fill_return_value, &ecif,
-               cif->bytes, ecif.rvalue, fn);
-      /*@=usedef@*/
-      break;
-
-    default:
-      FFI_ASSERT(0);
-      break;
-    }
-}
-
-extern void ffi_closure_UNIX64(void);
-
-ffi_status
-ffi_prep_closure (ffi_closure* closure,
-          ffi_cif* cif,
-          void (*fun)(ffi_cif*, void*, void**, void*),
-          void *user_data)
-{
-  volatile unsigned short *tramp;
-
-  /* FFI_ASSERT (cif->abi == FFI_OSF);  */
-
-  tramp = (volatile unsigned short *) &closure->tramp[0];
-  tramp[0] = 0xbb49;        /* mov <code>, %r11 */
-  tramp[5] = 0xba49;        /* mov <data>, %r10 */
-  tramp[10] = 0xff49;       /* jmp *%r11    */
-  tramp[11] = 0x00e3;
-  *(void * volatile *) &tramp[1] = ffi_closure_UNIX64;
-  *(void * volatile *) &tramp[6] = closure;
-
-  closure->cif = cif;
-  closure->fun = fun;
-  closure->user_data = user_data;
-
-  return FFI_OK;
-}
-
-int
-ffi_closure_UNIX64_inner(ffi_closure *closure, va_list l, void *rp)
-{
-  ffi_cif *cif;
-  void **avalue;
-  ffi_type **arg_types;
-  long i, avn, argn;
-
-  cif = closure->cif;
-  avalue = alloca(cif->nargs * sizeof(void *));
-
-  argn = 0;
-
-  i = 0;
-  avn = cif->nargs;
-  arg_types = cif->arg_types;
-
-  /* Grab the addresses of the arguments from the stack frame.  */
-  while (i < avn)
-    {
-      switch (arg_types[i]->type)
-    {
-    case FFI_TYPE_SINT8:
-    case FFI_TYPE_UINT8:
-    case FFI_TYPE_SINT16:
-    case FFI_TYPE_UINT16:
-    case FFI_TYPE_SINT32:
-    case FFI_TYPE_UINT32:
-    case FFI_TYPE_SINT64:
-    case FFI_TYPE_UINT64:
-    case FFI_TYPE_POINTER:
-      {
-        if (l->gp_offset > 48-8)
-          {
-        avalue[i] = l->overflow_arg_area;
-        l->overflow_arg_area = (char *)l->overflow_arg_area + 8;
-          }
-        else
-          {
-        avalue[i] = (char *)l->reg_save_area + l->gp_offset;
-        l->gp_offset += 8;
-          }
-      }
-      break;
-
-    case FFI_TYPE_STRUCT:
-      /* FIXME  */
-      FFI_ASSERT(0);
-      break;
-
-    case FFI_TYPE_DOUBLE:
-      {
-        if (l->fp_offset > 176-16)
-          {
-        avalue[i] = l->overflow_arg_area;
-        l->overflow_arg_area = (char *)l->overflow_arg_area + 8;
-          }
-        else
-          {
-        avalue[i] = (char *)l->reg_save_area + l->fp_offset;
-        l->fp_offset += 16;
-          }
-      }
-#if DEBUG_FFI
-      fprintf (stderr, "double arg %d = %g\n", i, *(double *)avalue[i]);
-#endif
-      break;
-
-    case FFI_TYPE_FLOAT:
-      {
-        if (l->fp_offset > 176-16)
-          {
-        avalue[i] = l->overflow_arg_area;
-        l->overflow_arg_area = (char *)l->overflow_arg_area + 8;
-          }
-        else
-          {
-        avalue[i] = (char *)l->reg_save_area + l->fp_offset;
-        l->fp_offset += 16;
-          }
-      }
-#if DEBUG_FFI
-      fprintf (stderr, "float arg %d = %g\n", i, *(float *)avalue[i]);
-#endif
-      break;
-
-    default:
-      FFI_ASSERT(0);
-    }
-
-      argn += ALIGN(arg_types[i]->size, SIZEOF_ARG) / SIZEOF_ARG;
-      i++;
-    }
-
-  /* Invoke the closure.  */
-  (closure->fun) (cif, rp, avalue, closure->user_data);
-
-  /* FIXME: Structs not supported.  */
-  FFI_ASSERT(cif->rtype->type != FFI_TYPE_STRUCT);
-
-  /* Tell ffi_closure_UNIX64 how to perform return type promotions.  */
-
-  return cif->rtype->type;
-}
-
-#endif
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.hxx b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.hxx
deleted file mode 100644
index 1e2bc64fff93..000000000000
--- a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.hxx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
-#define _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
-
-// This is an implementation of the x86-64 ABI as described in 'System V
-// Application Binary Interface, AMD64 Architecture Processor Supplement'
-// (http://www.x86-64.org/documentation/abi-0.95.pdf)
-
-#include <typelib/typedescription.hxx>
-
-namespace x86_64
-{
-
-/* 6 general purpose registers are used for parameter passing */
-const sal_uInt32 MAX_GPR_REGS = 6;
-
-/* 8 SSE registers are used for parameter passing */
-const sal_uInt32 MAX_SSE_REGS = 8;
-
-/* Count number of required registers.
-
- Examine the argument and return set number of register required in each
- class.
-
- Return false iff parameter should be passed in memory.
-*/
-bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE );
-
-/** Does function that returns this type use a hidden parameter, or registers?
-
- The value can be returned either in a hidden 1st parameter (which is a
- pointer to a structure allocated by the caller), or in registers (rax, rdx
- for the integers, xmm0, xmm1 for the floating point numbers).
-*/
-bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef );
-
-void fill_struct( typelib_TypeDescriptionReference *pTypeRef, void * const *pGPR, void * const *pSSE, void *pStruct );
-
-} // namespace x86_64
-
-#endif // _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/call.s b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/call.s
deleted file mode 100644
index 736230705d5a..000000000000
--- a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/call.s
+++ /dev/null
@@ -1,93 +0,0 @@
-	.text
-	.align 2
-.globl privateSnippetExecutor
-	.type	privateSnippetExecutor, @function
-privateSnippetExecutor:
-.LFB3:
-	pushq	%rbp
-.LCFI0:
-	movq	%rsp, %rbp
-.LCFI1:
-	subq	$160, %rsp
-.LCFI2:
-	movq	%r10, -152(%rbp)		# Save (nVtableOffset << 32) + nFunctionIndex
-
-	movq	%rdi, -112(%rbp)		# Save GP registers
-	movq	%rsi, -104(%rbp)
-	movq	%rdx, -96(%rbp)
-	movq	%rcx, -88(%rbp)
-	movq	%r8 , -80(%rbp)
-	movq	%r9 , -72(%rbp)
-	
-	movsd	%xmm0, -64(%rbp)		# Save FP registers
-	movsd	%xmm1, -56(%rbp)
-	movsd	%xmm2, -48(%rbp)
-	movsd	%xmm3, -40(%rbp)
-	movsd	%xmm4, -32(%rbp)
-	movsd	%xmm5, -24(%rbp)
-	movsd	%xmm6, -16(%rbp)
-	movsd	%xmm7, -8(%rbp)
-
-	leaq	-144(%rbp), %r9			# 6th param: sal_uInt64 * pRegisterReturn
-	leaq	16(%rbp), %r8			# 5rd param: void ** ovrflw
-	leaq	-64(%rbp), %rcx			# 4th param: void ** fpreg
-	leaq	-112(%rbp), %rdx		# 3rd param: void ** gpreg
-	movl	-148(%rbp), %esi		# 2nd param: sal_int32 nVtableOffset
-	movl	-152(%rbp), %edi		# 1st param: sal_int32 nFunctionIndex
-	
-	call	cpp_vtable_call
-
-	cmp	$10, %rax					# typelib_TypeClass_FLOAT
-	je	.Lfloat
-	cmp	$11, %rax					# typelib_TypeClass_DOUBLE
-	je	.Lfloat
-
-	movq	-144(%rbp), %rax		# Return value (int case)
-	jmp	.Lfinish
-.Lfloat:
-	movlpd	-144(%rbp), %xmm0		# Return value (float/double case)
-
-.Lfinish:
-	leave
-	ret
-.LFE3:
-	.size	privateSnippetExecutor, .-privateSnippetExecutor
-	.section	.eh_frame,"a",@progbits
-.Lframe1:
-	.long	.LECIE1-.LSCIE1
-.LSCIE1:
-	.long	0x0
-	.byte	0x1
-	.string	"zR"
-	.uleb128 0x1
-	.sleb128 -8
-	.byte	0x10
-	.uleb128 0x1
-	.byte	0x1b
-	.byte	0xc
-	.uleb128 0x7
-	.uleb128 0x8
-	.byte	0x90
-	.uleb128 0x1
-	.align 8
-.LECIE1:
-.LSFDE1:
-	.long	.LEFDE1-.LASFDE1
-.LASFDE1:
-	.long	.LASFDE1-.Lframe1
-	.long	.LFB3-.
-	.long	.LFE3-.LFB3
-	.uleb128 0x0
-	.byte	0x4
-	.long	.LCFI0-.LFB3
-	.byte	0xe
-	.uleb128 0x10
-	.byte	0x86
-	.uleb128 0x2
-	.byte	0x4
-	.long	.LCFI1-.LCFI0
-	.byte	0xd
-	.uleb128 0x6
-	.align 8
-.LEFDE1:
-	.section	.note.GNU-stack,"",@progbits
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx
deleted file mode 100644
index d5c47f82a3f4..000000000000
--- a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx
+++ /dev/null
@@ -1,541 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <hash_map>
-
-#include <rtl/alloc.h>
-#include <osl/mutex.hxx>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <uno/data.h>
-#include <typelib/typedescription.hxx>
-
-#include "bridges/cpp_uno/shared/bridge.hxx"
-#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx"
-#include "bridges/cpp_uno/shared/types.hxx"
-#include "bridges/cpp_uno/shared/vtablefactory.hxx"
-
-#include "abi.hxx"
-#include "share.hxx"
-
-using namespace ::osl;
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-
-//==================================================================================================
-
-// Perform the UNO call
-//
-// We must convert the paramaters stored in gpreg, fpreg and ovrflw to UNO
-// arguments and call pThis->getUnoI()->pDispatcher.
-//
-// gpreg:  [ret *], this, [gpr params]
-// fpreg:  [fpr params]
-// ovrflw: [gpr or fpr params (properly aligned)]
-//
-// [ret *] is present when we are returning a structure bigger than 16 bytes
-// Simple types are returned in rax, rdx (int), or xmm0, xmm1 (fp).
-// Similarly structures <= 16 bytes are in rax, rdx, xmm0, xmm1 as necessary.
-static typelib_TypeClass cpp2uno_call(
-    bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
-    const typelib_TypeDescription * pMemberTypeDescr,
-    typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void ** gpreg, void ** fpreg, void ** ovrflw,
-    sal_uInt64 * pRegisterReturn /* space for register return */ )
-{
-    int nr_gpr = 0; //number of gpr registers used
-    int nr_fpr = 0; //number of fpr regsiters used
-
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    if (pReturnTypeRef)
-        TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
-    void * pUnoReturn = 0;
-    void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
-    if ( pReturnTypeDescr )
-    {
-        if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
-        {
-            pCppReturn = *gpreg++;
-            nr_gpr++;
-
-            pUnoReturn = ( bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
-                           ? alloca( pReturnTypeDescr->nSize )
-                           : pCppReturn ); // direct way
-        }
-        else
-            pUnoReturn = pRegisterReturn; // direct way for simple types
-    }
-
-    // pop this
-    gpreg++;
-    nr_gpr++;
-
-    // stack space
-    // parameters
-    void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-    void ** pCppArgs = pUnoArgs + nParams;
-    // indizes of values this have to be converted (interface conversion cpp<=>uno)
-    sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
-    sal_Int32 nTempIndizes = 0;
-
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-        int nUsedGPR = 0;
-        int nUsedSSE = 0;
-        bool bFitsRegisters = x86_64::examine_argument( rParam.pTypeRef, false, nUsedGPR, nUsedSSE );
-        if ( !rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ) ) // value
-        {
-            // Simple types must fit exactly one register on x86_64
-            OSL_ASSERT( bFitsRegisters && ( ( nUsedSSE == 1 && nUsedGPR == 0 ) || ( nUsedSSE == 0 && nUsedGPR == 1 ) ) );
-
-            if ( nUsedSSE == 1 )
-            {
-                if ( nr_fpr < x86_64::MAX_SSE_REGS )
-                {
-                    pCppArgs[nPos] = pUnoArgs[nPos] = fpreg++;
-                    nr_fpr++;
-                }
-                else
-                    pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw++;
-            }
-            else if ( nUsedGPR == 1 )
-            {
-                if ( nr_gpr < x86_64::MAX_GPR_REGS )
-                {
-                    pCppArgs[nPos] = pUnoArgs[nPos] = gpreg++;
-                    nr_gpr++;
-                }
-                else
-                    pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw++;
-            }
-
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // struct <= 16 bytes || ptr to complex value || ref
-        {
-            void *pCppStack;
-            char pTmpStruct[16];
-
-            if ( bFitsRegisters && !rParam.bOut &&
-                 ( pParamTypeDescr->eTypeClass == typelib_TypeClass_STRUCT ||
-                   pParamTypeDescr->eTypeClass == typelib_TypeClass_EXCEPTION ) )
-            {
-                if ( ( nr_gpr + nUsedGPR <= x86_64::MAX_GPR_REGS ) && ( nr_fpr + nUsedSSE <= x86_64::MAX_SSE_REGS ) )
-                {
-                    x86_64::fill_struct( rParam.pTypeRef, gpreg, fpreg, pTmpStruct );
-#if OSL_DEBUG_LEVEL > 1
-                    fprintf( stderr, "nUsedGPR == %d, nUsedSSE == %d, pTmpStruct[0] == 0x%x, pTmpStruct[1] == 0x%x, **gpreg == 0x%lx\n",
-                            nUsedGPR, nUsedSSE, pTmpStruct[0], pTmpStruct[1], *(sal_uInt64*)*gpreg );
-#endif
-
-                    pCppArgs[nPos] = pCppStack = reinterpret_cast<void *>( pTmpStruct );
-                    gpreg += nUsedGPR;
-                    fpreg += nUsedSSE;
-                }
-                else
-                    pCppArgs[nPos] = pCppStack = *ovrflw++;
-            }
-            else if ( nr_gpr < x86_64::MAX_GPR_REGS )
-            {
-                pCppArgs[nPos] = pCppStack = *gpreg++;
-                nr_gpr++;
-            }
-            else
-                pCppArgs[nPos] = pCppStack = *ovrflw++;
-
-            if (! rParam.bIn) // is pure out
-            {
-                // uno out is unconstructed mem!
-                pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-                pTempIndizes[nTempIndizes] = nPos;
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            else if ( bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ) ) // is in/inout
-            {
-                uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                                        pCppStack, pParamTypeDescr,
-                                        pThis->getBridge()->getCpp2Uno() );
-                pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                pUnoArgs[nPos] = pCppStack;
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-        }
-    }
-
-    // ExceptionHolder
-    uno_Any aUnoExc; // Any will be constructed by callee
-    uno_Any * pUnoExc = &aUnoExc;
-
-    // invoke uno dispatch call
-    (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
-    // in case an exception occured...
-    if ( pUnoExc )
-    {
-        // destruct temporary in/inout params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
-            if (pParams[nIndex].bIn) // is in/inout => was constructed
-                uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-        }
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
-        CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); // has to destruct the any
-        // is here for dummy
-        return typelib_TypeClass_VOID;
-    }
-    else // else no exception occured...
-    {
-        // temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
-            if ( pParams[nIndex].bOut ) // inout/out
-            {
-                // convert and assign
-                uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-                uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-                                        pThis->getBridge()->getUno2Cpp() );
-            }
-            // destroy temp uno param
-            uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return
-        if ( pCppReturn ) // has complex return
-        {
-            if ( pUnoReturn != pCppReturn ) // needs reconversion
-            {
-                uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-                                        pThis->getBridge()->getUno2Cpp() );
-                // destroy temp uno return
-                uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-            }
-            // complex return ptr is set to return reg
-            *(void **)pRegisterReturn = pCppReturn;
-        }
-        if ( pReturnTypeDescr )
-        {
-            typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-            return eRet;
-        }
-        else
-            return typelib_TypeClass_VOID;
-    }
-}
-
-
-//==================================================================================================
-extern "C" typelib_TypeClass cpp_vtable_call(
-    sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
-    void ** gpreg, void ** fpreg, void ** ovrflw,
-    sal_uInt64 * pRegisterReturn /* space for register return */ )
-{
-    // gpreg:  [ret *], this, [other gpr params]
-    // fpreg:  [fpr params]
-    // ovrflw: [gpr or fpr params (properly aligned)]
-    void * pThis;
-    if ( nFunctionIndex & 0x80000000 )
-    {
-        nFunctionIndex &= 0x7fffffff;
-        pThis = gpreg[1];
-    }
-    else
-    {
-        pThis = gpreg[0];
-    }
-    pThis = static_cast<char *>( pThis ) - nVtableOffset;
-
-    bridges::cpp_uno::shared::CppInterfaceProxy * pCppI =
-        bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy( pThis );
-
-    typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
-
-    OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
-    if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex )
-    {
-        throw RuntimeException( OUString::createFromAscii("illegal vtable index!"),
-                                reinterpret_cast<XInterface *>( pCppI ) );
-    }
-
-    // determine called method
-    sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
-    OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!\n" );
-
-    TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
-    typelib_TypeClass eRet;
-    switch ( aMemberDescr.get()->eTypeClass )
-    {
-        case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-        {
-            typelib_TypeDescriptionReference *pAttrTypeRef =
-                reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( aMemberDescr.get() )->pAttributeTypeRef;
-
-            if ( pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex )
-            {
-                // is GET method
-                eRet = cpp2uno_call( pCppI, aMemberDescr.get(), pAttrTypeRef,
-                        0, 0, // no params
-                        gpreg, fpreg, ovrflw, pRegisterReturn );
-            }
-            else
-            {
-                // is SET method
-                typelib_MethodParameter aParam;
-                aParam.pTypeRef = pAttrTypeRef;
-                aParam.bIn      = sal_True;
-                aParam.bOut     = sal_False;
-
-                eRet = cpp2uno_call( pCppI, aMemberDescr.get(),
-                        0, // indicates void return
-                        1, &aParam,
-                        gpreg, fpreg, ovrflw, pRegisterReturn );
-            }
-            break;
-        }
-        case typelib_TypeClass_INTERFACE_METHOD:
-        {
-            // is METHOD
-            switch ( nFunctionIndex )
-            {
-                case 1: // acquire()
-                    pCppI->acquireProxy(); // non virtual call!
-                    eRet = typelib_TypeClass_VOID;
-                    break;
-                case 2: // release()
-                    pCppI->releaseProxy(); // non virtual call!
-                    eRet = typelib_TypeClass_VOID;
-                    break;
-                case 0: // queryInterface() opt
-                {
-                    typelib_TypeDescription * pTD = 0;
-                    TYPELIB_DANGER_GET( &pTD, reinterpret_cast<Type *>( gpreg[2] )->getTypeLibType() );
-                    if ( pTD )
-                    {
-                        XInterface * pInterface = 0;
-                        (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)
-                            ( pCppI->getBridge()->getCppEnv(),
-                              (void **)&pInterface,
-                              pCppI->getOid().pData,
-                              reinterpret_cast<typelib_InterfaceTypeDescription *>( pTD ) );
-
-                        if ( pInterface )
-                        {
-                            ::uno_any_construct( reinterpret_cast<uno_Any *>( gpreg[0] ),
-                                                 &pInterface, pTD, cpp_acquire );
-
-                            pInterface->release();
-                            TYPELIB_DANGER_RELEASE( pTD );
-
-                            reinterpret_cast<void **>( pRegisterReturn )[0] = gpreg[0];
-                            eRet = typelib_TypeClass_ANY;
-                            break;
-                        }
-                        TYPELIB_DANGER_RELEASE( pTD );
-                    }
-                } // else perform queryInterface()
-                default:
-                {
-                    typelib_InterfaceMethodTypeDescription *pMethodTD =
-                        reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( aMemberDescr.get() );
-
-                    eRet = cpp2uno_call( pCppI, aMemberDescr.get(),
-                                         pMethodTD->pReturnTypeRef,
-                                         pMethodTD->nParams,
-                                         pMethodTD->pParams,
-                                         gpreg, fpreg, ovrflw, pRegisterReturn );
-                }
-            }
-            break;
-        }
-        default:
-        {
-            throw RuntimeException( OUString::createFromAscii("no member description found!"),
-                                    reinterpret_cast<XInterface *>( pCppI ) );
-            // is here for dummy
-            eRet = typelib_TypeClass_VOID;
-        }
-    }
-
-    return eRet;
-}
-
-//==================================================================================================
-extern "C" void privateSnippetExecutor( ... );
-
-const int codeSnippetSize = 24;
-
-// Generate a trampoline that redirects method calls to
-// privateSnippetExecutor().
-//
-// privateSnippetExecutor() saves all the registers that are used for
-// parameter passing on x86_64, and calls the cpp_vtable_call().
-// When it returns, privateSnippetExecutor() sets the return value.
-//
-// Note: The code snippet we build here must not create a stack frame,
-// otherwise the UNO exceptions stop working thanks to non-existing
-// unwinding info.
-unsigned char * codeSnippet( unsigned char * code,
-        sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
-        bool bHasHiddenParam ) SAL_THROW( () )
-{
-    sal_uInt64 nOffsetAndIndex = ( ( (sal_uInt64) nVtableOffset ) << 32 ) | ( (sal_uInt64) nFunctionIndex );
-
-    if ( bHasHiddenParam )
-        nOffsetAndIndex |= 0x80000000;
-
-    // movq $<nOffsetAndIndex>, %r10
-    *reinterpret_cast<sal_uInt16 *>( code ) = 0xba49;
-    *reinterpret_cast<sal_uInt64 *>( code + 2 ) = nOffsetAndIndex;
-
-    // movq $<address of the privateSnippetExecutor>, %r11
-    *reinterpret_cast<sal_uInt16 *>( code + 10 ) = 0xbb49;
-    *reinterpret_cast<sal_uInt64 *>( code + 12 ) = reinterpret_cast<sal_uInt64>( privateSnippetExecutor );
-
-    // jmpq *%r11
-    *reinterpret_cast<sal_uInt32 *>( code + 20 ) = 0x00e3ff49;
-
-    return code + codeSnippetSize;
-}
-
-//==================================================================================================
-struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; };
-
-bridges::cpp_uno::shared::VtableFactory::Slot *
-bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
-{
-    return static_cast< Slot * >(block) + 2;
-}
-
-//==================================================================================================
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
-    sal_Int32 slotCount)
-{
-    return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
-}
-
-//==================================================================================================
-bridges::cpp_uno::shared::VtableFactory::Slot *
-bridges::cpp_uno::shared::VtableFactory::initializeBlock(
-    void * block, sal_Int32 slotCount)
-{
-    Slot * slots = mapBlockToVtable(block);
-    slots[-2].fn = 0;
-    slots[-1].fn = 0;
-    return slots + slotCount;
-}
-
-//==================================================================================================
-
-unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
-    typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset,
-    sal_Int32 functionCount, sal_Int32 nVtableOffset )
-{
-    (*slots) -= functionCount;
-    Slot * s = *slots;
-
-    for ( sal_Int32 nPos = 0; nPos < type->nMembers; ++nPos )
-    {
-        typelib_TypeDescription * pTD = 0;
-
-        TYPELIB_DANGER_GET( &pTD, type->ppMembers[ nPos ] );
-        OSL_ASSERT( pTD );
-
-        if ( typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass )
-        {
-            typelib_InterfaceAttributeTypeDescription *pAttrTD =
-                reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( pTD );
-
-            // get method
-            (s++)->fn = code;
-            code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
-                                x86_64::return_in_hidden_param( pAttrTD->pAttributeTypeRef ) );
-
-            if ( ! pAttrTD->bReadOnly )
-            {
-                // set method
-                (s++)->fn = code;
-                code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false );
-            }
-        }
-        else if ( typelib_TypeClass_INTERFACE_METHOD == pTD->eTypeClass )
-        {
-            typelib_InterfaceMethodTypeDescription *pMethodTD =
-                reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( pTD );
-
-            (s++)->fn = code;
-            code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
-                                x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) );
-        }
-        else
-            OSL_ASSERT( false );
-
-        TYPELIB_DANGER_RELEASE( pTD );
-    }
-    return code;
-}
-
-//==================================================================================================
-void bridges::cpp_uno::shared::VtableFactory::flushCode(
-    unsigned char const *, unsigned char const * )
-{
-}
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
deleted file mode 100644
index a6ba69855a1c..000000000000
--- a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
+++ /dev/null
@@ -1,338 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
-
-#include <stdio.h>
-#include <dlfcn.h>
-#include <cxxabi.h>
-#include <hash_map>
-#include <sys/param.h>
-
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/diagnose.h>
-#include <osl/mutex.hxx>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <typelib/typedescription.hxx>
-#include <uno/any2.h>
-
-#include "share.hxx"
-
-
-using namespace ::std;
-using namespace ::osl;
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-using namespace ::__cxxabiv1;
-
-
-namespace CPPU_CURRENT_NAMESPACE
-{
-
-void dummy_can_throw_anything( char const * )
-{
-}
-
-//==================================================================================================
-static OUString toUNOname( char const * p ) SAL_THROW( () )
-{
-#if OSL_DEBUG_LEVEL > 1
-    char const * start = p;
-#endif
-
-    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-
-    OUStringBuffer buf( 64 );
-    OSL_ASSERT( 'N' == *p );
-    ++p; // skip N
-
-    while ('E' != *p)
-    {
-        // read chars count
-        long n = (*p++ - '0');
-        while ('0' <= *p && '9' >= *p)
-        {
-            n *= 10;
-            n += (*p++ - '0');
-        }
-        buf.appendAscii( p, n );
-        p += n;
-        if ('E' != *p)
-            buf.append( (sal_Unicode)'.' );
-    }
-
-#if OSL_DEBUG_LEVEL > 1
-    OUString ret( buf.makeStringAndClear() );
-    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-    return ret;
-#else
-    return buf.makeStringAndClear();
-#endif
-}
-
-//==================================================================================================
-class RTTI
-{
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-
-    Mutex m_mutex;
-    t_rtti_map m_rttis;
-    t_rtti_map m_generatedRttis;
-
-    void * m_hApp;
-
-public:
-    RTTI() SAL_THROW( () );
-    ~RTTI() SAL_THROW( () );
-
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-};
-//__________________________________________________________________________________________________
-RTTI::RTTI() SAL_THROW( () )
-#if __FreeBSD_version < 602103
-    : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
-#else
-    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-#endif
-{
-}
-//__________________________________________________________________________________________________
-RTTI::~RTTI() SAL_THROW( () )
-{
-    dlclose( m_hApp );
-}
-
-//__________________________________________________________________________________________________
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-{
-    type_info * rtti;
-
-    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-
-    MutexGuard guard( m_mutex );
-    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-    if (iFind == m_rttis.end())
-    {
-        // RTTI symbol
-        OStringBuffer buf( 64 );
-        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
-        sal_Int32 index = 0;
-        do
-        {
-            OUString token( unoName.getToken( 0, '.', index ) );
-            buf.append( token.getLength() );
-            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-            buf.append( c_token );
-        }
-        while (index >= 0);
-        buf.append( 'E' );
-
-        OString symName( buf.makeStringAndClear() );
-#if __FreeBSD_version < 602103  /* #i22253# */
-        rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
-#else
-        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-#endif
-
-        if (rtti)
-        {
-            pair< t_rtti_map::iterator, bool > insertion(
-                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-        }
-        else
-        {
-            // try to lookup the symbol in the generated rtti map
-            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-            if (iFind == m_generatedRttis.end())
-            {
-                // we must generate it !
-                // symbol and rtti-name is nearly identical,
-                // the symbol is prefixed with _ZTI
-                char const * rttiName = symName.getStr() +4;
-#if OSL_DEBUG_LEVEL > 1
-                fprintf( stderr,"generated rtti for %s\n", rttiName );
-#endif
-                if (pTypeDescr->pBaseTypeDescription)
-                {
-                    // ensure availability of base
-                    type_info * base_rtti = getRTTI(
-                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-                    rtti = new __si_class_type_info(
-                        strdup( rttiName ), (__class_type_info *)base_rtti );
-                }
-                else
-                {
-                    // this class has no base class
-                    rtti = new __class_type_info( strdup( rttiName ) );
-                }
-
-                pair< t_rtti_map::iterator, bool > insertion(
-                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-            }
-            else // taking already generated rtti
-            {
-                rtti = iFind->second;
-            }
-        }
-    }
-    else
-    {
-        rtti = iFind->second;
-    }
-
-    return rtti;
-}
-
-//--------------------------------------------------------------------------------------------------
-static void deleteException( void * pExc )
-{
-    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-    typelib_TypeDescription * pTD = 0;
-    OUString unoName( toUNOname( header->exceptionType->name() ) );
-    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-    if (pTD)
-    {
-        ::uno_destructData( pExc, pTD, cpp_release );
-        ::typelib_typedescription_release( pTD );
-    }
-}
-
-//==================================================================================================
-void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-{
-#if OSL_DEBUG_LEVEL > 1
-    OString cstr(
-        OUStringToOString(
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
-#endif
-    void * pCppExc;
-    type_info * rtti;
-
-    {
-    // construct cpp exception object
-    typelib_TypeDescription * pTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-    OSL_ASSERT( pTypeDescr );
-    if (! pTypeDescr)
-    {
-        throw RuntimeException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
-    }
-
-    pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-    ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-
-    // destruct uno exception
-    ::uno_any_destruct( pUnoExc, 0 );
-    // avoiding locked counts
-    static RTTI * s_rtti = 0;
-    if (! s_rtti)
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if (! s_rtti)
-        {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
-            static RTTI rtti_data;
-            s_rtti = &rtti_data;
-#endif
-        }
-    }
-    rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-    TYPELIB_DANGER_RELEASE( pTypeDescr );
-    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-    if (! rtti)
-    {
-        throw RuntimeException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
-    }
-    }
-
-    __cxa_throw( pCppExc, rtti, deleteException );
-}
-
-//==================================================================================================
-void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
-{
-    if (! header)
-    {
-        RuntimeException aRE(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
-            Reference< XInterface >() );
-        Type const & rType = ::getCppuType( &aRE );
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
-#if OSL_DEBUG_LEVEL > 0
-        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
-#endif
-        return;
-    }
-
-    typelib_TypeDescription * pExcTypeDescr = 0;
-    OUString unoName( toUNOname( header->exceptionType->name() ) );
-#if OSL_DEBUG_LEVEL > 1
-    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
-#endif
-    typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-    if (0 == pExcTypeDescr)
-    {
-        RuntimeException aRE(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
-            Reference< XInterface >() );
-        Type const & rType = ::getCppuType( &aRE );
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
-#if OSL_DEBUG_LEVEL > 0
-        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
-#endif
-    }
-    else
-    {
-        // construct uno exception any
-        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-        typelib_typedescription_release( pExcTypeDescr );
-    }
-}
-
-}
-
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk
deleted file mode 100644
index 9c37d6cd8227..000000000000
--- a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDXgcc3"
-
-.IF "$(cppu_no_leak)" == ""
-CFLAGS += -DLEAK_STATIC_DATA
-.ENDIF
-
-# In case someone enabled the non-standard -fomit-frame-pointer which does not
-# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
-
-SLOFILES= \
-    $(SLO)$/abi.obj			\
-    $(SLO)$/except.obj		\
-    $(SLO)$/cpp2uno.obj		\
-    $(SLO)$/uno2cpp.obj		\
-    $(SLO)$/call.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-SHL1RPATH=URELIB
-
-SHL1OBJS = $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
-    $(CPPULIB)			\
-    $(SALLIB)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(SLO)$/%.obj: %.s
-    $(CC) -c -o $(SLO)$/$(@:b).o $<
-    touch $@
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx
deleted file mode 100644
index 930094738b20..000000000000
--- a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "uno/mapping.h"
-
-#include <typeinfo>
-#include <exception>
-#include <cstddef>
-
-namespace CPPU_CURRENT_NAMESPACE
-{
-
-void dummy_can_throw_anything( char const * );
-
-// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-
-struct _Unwind_Exception
-{
-    unsigned exception_class __attribute__((__mode__(__DI__)));
-    void * exception_cleanup;
-    unsigned private_1 __attribute__((__mode__(__word__)));
-    unsigned private_2 __attribute__((__mode__(__word__)));
-} __attribute__((__aligned__));
-
-struct __cxa_exception
-{
-    ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
-    ::std::unexpected_handler unexpectedHandler;
-    ::std::terminate_handler terminateHandler;
-
-    __cxa_exception *nextException;
-
-    int handlerCount;
-
-    int handlerSwitchValue;
-    const unsigned char *actionRecord;
-    const unsigned char *languageSpecificData;
-    void *catchTemp;
-    void *adjustedPtr;
-
-    _Unwind_Exception unwindHeader;
-};
-
-extern "C" void *__cxa_allocate_exception(
-    std::size_t thrown_size ) throw();
-extern "C" void __cxa_throw (
-    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-
-struct __cxa_eh_globals
-{
-    __cxa_exception *caughtExceptions;
-    unsigned int uncaughtExceptions;
-};
-extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-
-// -----
-
-//==================================================================================================
-void raiseException(
-    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-//==================================================================================================
-void fillUnoException(
-    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-}
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx
deleted file mode 100644
index 6da45f9fb8ce..000000000000
--- a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx
+++ /dev/null
@@ -1,558 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <rtl/alloc.h>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <uno/data.h>
-
-#include <bridges/cpp_uno/shared/bridge.hxx>
-#include <bridges/cpp_uno/shared/types.hxx>
-#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
-#include "bridges/cpp_uno/shared/vtables.hxx"
-
-#include "abi.hxx"
-#include "share.hxx"
-
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-
-//==================================================================================================
-static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
-                              void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
-                              sal_uInt64 *pStack, sal_uInt32 nStack,
-                              sal_uInt64 *pGPR, sal_uInt32 nGPR,
-                              double *pFPR, sal_uInt32 nFPR) __attribute__((noinline));
-
-static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
-                              void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
-                              sal_uInt64 *pStack, sal_uInt32 nStack,
-                              sal_uInt64 *pGPR, sal_uInt32 nGPR,
-                              double *pFPR, sal_uInt32 nFPR)
-{
-#if OSL_DEBUG_LEVEL > 1
-    // Let's figure out what is really going on here
-    {
-        fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR );
-        for ( int i = 0; i < nGPR; ++i )
-            fprintf( stderr, "0x%lx, ", pGPR[i] );
-        fprintf( stderr, "\nFPR's (%d): ", nFPR );
-        for ( int i = 0; i < nFPR; ++i )
-            fprintf( stderr, "%f, ", pFPR[i] );
-        fprintf( stderr, "\nStack (%d): ", nStack );
-        for ( int i = 0; i < nStack; ++i )
-            fprintf( stderr, "0x%lx, ", pStack[i] );
-        fprintf( stderr, "\n" );
-    }
-#endif
-
-    // The call instruction within the asm section of callVirtualMethod may throw
-    // exceptions.  So that the compiler handles this correctly, it is important
-    // that (a) callVirtualMethod might call dummy_can_throw_anything (although this
-    // never happens at runtime), which in turn can throw exceptions, and (b)
-    // callVirtualMethod is not inlined at its call site (so that any exceptions are
-    // caught which are thrown from the instruction calling callVirtualMethod):
-    if ( !pThis )
-        CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything( "xxx" ); // address something
-
-    // Should not happen, but...
-    if ( nFPR > x86_64::MAX_SSE_REGS )
-        nFPR = x86_64::MAX_SSE_REGS;
-    if ( nGPR > x86_64::MAX_GPR_REGS )
-        nGPR = x86_64::MAX_GPR_REGS;
-
-    // Get pointer to method
-    sal_uInt64 pMethod = *((sal_uInt64 *)pThis);
-    pMethod += 8 * nVtableIndex;
-    pMethod = *((sal_uInt64 *)pMethod);
-
-    // Load parameters to stack, if necessary
-    if ( nStack )
-    {
-        // 16-bytes aligned
-        sal_uInt32 nStackBytes = ( ( nStack + 1 ) >> 1 ) * 16;
-        sal_uInt64 *pCallStack = (sal_uInt64 *) __builtin_alloca( nStackBytes );
-        memcpy( pCallStack, pStack, nStackBytes );
-    }
-
-    // Return values
-    sal_uInt64 rax;
-    sal_uInt64 rdx;
-    double xmm0;
-
-    asm volatile (
-
-        // Fill the xmm registers
-        "movq %2, %%rax\n\t"
-
-        "movsd   (%%rax), %%xmm0\n\t"
-        "movsd  8(%%rax), %%xmm1\n\t"
-        "movsd 16(%%rax), %%xmm2\n\t"
-        "movsd 24(%%rax), %%xmm3\n\t"
-        "movsd 32(%%rax), %%xmm4\n\t"
-        "movsd 40(%%rax), %%xmm5\n\t"
-        "movsd 48(%%rax), %%xmm6\n\t"
-        "movsd 56(%%rax), %%xmm7\n\t"
-
-        // Fill the general purpose registers
-        "movq %1, %%rax\n\t"
-
-        "movq    (%%rax), %%rdi\n\t"
-        "movq   8(%%rax), %%rsi\n\t"
-        "movq  16(%%rax), %%rdx\n\t"
-        "movq  24(%%rax), %%rcx\n\t"
-        "movq  32(%%rax), %%r8\n\t"
-        "movq  40(%%rax), %%r9\n\t"
-
-        // Perform the call
-        "movq %0, %%r11\n\t"
-        "movq %3, %%rax\n\t"
-        "call *%%r11\n\t"
-
-        // Fill the return values
-        "movq   %%rax, %4\n\t"
-        "movq   %%rdx, %5\n\t"
-        "movsd %%xmm0, %6\n\t"
-        :
-        : "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR ),
-          "m" ( rax ), "m" ( rdx ), "m" ( xmm0 )
-        : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r11"
-    );
-
-    switch (pReturnTypeDescr->eTypeClass)
-    {
-    case typelib_TypeClass_HYPER:
-    case typelib_TypeClass_UNSIGNED_HYPER:
-        *reinterpret_cast<sal_uInt64 *>( pRegisterReturn ) = rax;
-        break;
-    case typelib_TypeClass_LONG:
-    case typelib_TypeClass_UNSIGNED_LONG:
-    case typelib_TypeClass_ENUM:
-        *reinterpret_cast<sal_uInt32 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt32*>( &rax );
-        break;
-    case typelib_TypeClass_CHAR:
-    case typelib_TypeClass_SHORT:
-    case typelib_TypeClass_UNSIGNED_SHORT:
-        *reinterpret_cast<sal_uInt16 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt16*>( &rax );
-        break;
-    case typelib_TypeClass_BOOLEAN:
-    case typelib_TypeClass_BYTE:
-        *reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8*>( &rax );
-        break;
-    case typelib_TypeClass_FLOAT:
-    case typelib_TypeClass_DOUBLE:
-        *reinterpret_cast<double *>( pRegisterReturn ) = xmm0;
-        break;
-    default:
-        {
-            sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
-            if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0)
-            {
-                if (nRetSize > 8)
-                    static_cast<sal_uInt64 *>(pRegisterReturn)[1] = rdx;
-                static_cast<sal_uInt64 *>(pRegisterReturn)[0] = rax;
-            }
-            break;
-        }
-    }
-}
-
-//==================================================================================================
-
-// Macros for easier insertion of values to registers or stack
-// pSV - pointer to the source
-// nr - order of the value [will be increased if stored to register]
-// pFPR, pGPR - pointer to the registers
-// pDS - pointer to the stack [will be increased if stored here]
-
-// The value in %xmm register is already prepared to be retrieved as a float,
-// thus we treat float and double the same
-#define INSERT_FLOAT_DOUBLE( pSV, nr, pFPR, pDS ) \
-    if ( nr < x86_64::MAX_SSE_REGS ) \
-        pFPR[nr++] = *reinterpret_cast<double *>( pSV ); \
-    else \
-        *pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV ); // verbatim!
-
-#define INSERT_INT64( pSV, nr, pGPR, pDS ) \
-    if ( nr < x86_64::MAX_GPR_REGS ) \
-        pGPR[nr++] = *reinterpret_cast<sal_uInt64 *>( pSV ); \
-    else \
-        *pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV );
-
-#define INSERT_INT32( pSV, nr, pGPR, pDS ) \
-    if ( nr < x86_64::MAX_GPR_REGS ) \
-        pGPR[nr++] = *reinterpret_cast<sal_uInt32 *>( pSV ); \
-    else \
-        *pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV );
-
-#define INSERT_INT16( pSV, nr, pGPR, pDS ) \
-    if ( nr < x86_64::MAX_GPR_REGS ) \
-        pGPR[nr++] = *reinterpret_cast<sal_uInt16 *>( pSV ); \
-    else \
-        *pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV );
-
-#define INSERT_INT8( pSV, nr, pGPR, pDS ) \
-    if ( nr < x86_64::MAX_GPR_REGS ) \
-        pGPR[nr++] = *reinterpret_cast<sal_uInt8 *>( pSV ); \
-    else \
-        *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
-
-//==================================================================================================
-
-static void cpp_call(
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
-    bridges::cpp_uno::shared::VtableSlot aVtableSlot,
-    typelib_TypeDescriptionReference * pReturnTypeRef,
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-{
-    // Maxium space for [complex ret ptr], values | ptr ...
-    // (but will be used less - some of the values will be in pGPR and pFPR)
-      sal_uInt64 *pStack = (sal_uInt64 *)__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) );
-      sal_uInt64 *pStackStart = pStack;
-
-    sal_uInt64 pGPR[x86_64::MAX_GPR_REGS];
-    sal_uInt32 nGPR = 0;
-
-    double pFPR[x86_64::MAX_SSE_REGS];
-    sal_uInt32 nFPR = 0;
-
-    // Return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-    OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
-    void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion (see below)
-
-    bool bSimpleReturn = true;
-    if ( pReturnTypeDescr )
-    {
-        if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
-            bSimpleReturn = false;
-
-        if ( bSimpleReturn )
-            pCppReturn = pUnoReturn; // direct way for simple types
-        else
-        {
-            // complex return via ptr
-            pCppReturn = bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )?
-                         __builtin_alloca( pReturnTypeDescr->nSize ) : pUnoReturn;
-            INSERT_INT64( &pCppReturn, nGPR, pGPR, pStack );
-        }
-    }
-
-    // Push "this" pointer
-    void * pAdjustedThisPtr = reinterpret_cast< void ** >( pThis->getCppI() ) + aVtableSlot.offset;
-    INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack );
-
-    // Args
-    void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams );
-    // Indizes of values this have to be converted (interface conversion cpp<=>uno)
-    sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-    // Type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
-    sal_Int32 nTempIndizes = 0;
-
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-        if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
-        {
-            uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
-                                    pThis->getBridge()->getUno2Cpp() );
-
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-                INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack );
-                break;
-            case typelib_TypeClass_LONG:
-            case typelib_TypeClass_UNSIGNED_LONG:
-            case typelib_TypeClass_ENUM:
-                INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack );
-                break;
-            case typelib_TypeClass_SHORT:
-            case typelib_TypeClass_CHAR:
-            case typelib_TypeClass_UNSIGNED_SHORT:
-                INSERT_INT16( pCppArgs[nPos], nGPR, pGPR, pStack );
-                break;
-            case typelib_TypeClass_BOOLEAN:
-            case typelib_TypeClass_BYTE:
-                INSERT_INT8( pCppArgs[nPos], nGPR, pGPR, pStack );
-                break;
-            case typelib_TypeClass_FLOAT:
-            case typelib_TypeClass_DOUBLE:
-                INSERT_FLOAT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, pStack );
-                break;
-            }
-
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // ptr to complex value | ref
-        {
-            if (! rParam.bIn) // is pure out
-            {
-                // cpp out is constructed mem, uno out is not!
-                uno_constructData(
-                    pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                    pParamTypeDescr );
-                pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            // is in/inout
-            else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ))
-            {
-                uno_copyAndConvertData(
-                    pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                    pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
-
-                pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                pCppArgs[nPos] = pUnoArgs[nPos];
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-            INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack );
-        }
-    }
-
-    try
-    {
-        callVirtualMethod(
-            pAdjustedThisPtr, aVtableSlot.index,
-            pCppReturn, pReturnTypeDescr, bSimpleReturn,
-            pStackStart, ( pStack - pStackStart ),
-            pGPR, nGPR,
-            pFPR, nFPR );
-        // NO exception occured...
-        *ppUnoExc = 0;
-
-        // reconvert temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
-            if (pParams[nIndex].bIn)
-            {
-                if (pParams[nIndex].bOut) // inout
-                {
-                    uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-                    uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-                                            pThis->getBridge()->getCpp2Uno() );
-                }
-            }
-            else // pure out
-            {
-                uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-                                        pThis->getBridge()->getCpp2Uno() );
-            }
-            // destroy temp cpp param => cpp: every param was constructed
-            uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return value
-        if (pCppReturn && pUnoReturn != pCppReturn)
-        {
-            uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-                                    pThis->getBridge()->getCpp2Uno() );
-            uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-        }
-    }
-     catch (...)
-     {
-          // fill uno exception
-        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
-        // temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            // destroy temp cpp param => cpp: every param was constructed
-            uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-        }
-        // return type
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-    }
-}
-
-//==================================================================================================
-
-namespace bridges { namespace cpp_uno { namespace shared {
-
-void unoInterfaceProxyDispatch(
-    uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-    void * pReturn, void * pArgs[], uno_Any ** ppException )
-{
-    // is my surrogate
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
-        = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
-    typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-
-    switch (pMemberDescr->eTypeClass)
-    {
-    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-    {
-        // determine vtable call index
-        sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-        OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-
-        VtableSlot aVtableSlot(
-                getVtableSlot(
-                    reinterpret_cast<
-                    typelib_InterfaceAttributeTypeDescription const * >(
-                        pMemberDescr)));
-
-        if (pReturn)
-        {
-            // dependent dispatch
-            cpp_call(
-                pThis, aVtableSlot,
-                ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-                0, 0, // no params
-                pReturn, pArgs, ppException );
-        }
-        else
-        {
-            // is SET
-            typelib_MethodParameter aParam;
-            aParam.pTypeRef =
-                ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
-            typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-            OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-            typelib_typedescriptionreference_new(
-                &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
-            // dependent dispatch
-            aVtableSlot.index += 1; // get, then set method
-            cpp_call(
-                pThis, aVtableSlot, // get, then set method
-                pReturnTypeRef,
-                1, &aParam,
-                pReturn, pArgs, ppException );
-
-            typelib_typedescriptionreference_release( pReturnTypeRef );
-        }
-
-        break;
-    }
-    case typelib_TypeClass_INTERFACE_METHOD:
-    {
-        // determine vtable call index
-        sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-        OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-
-        VtableSlot aVtableSlot(
-                getVtableSlot(
-                    reinterpret_cast<
-                    typelib_InterfaceMethodTypeDescription const * >(
-                        pMemberDescr)));
-
-        switch (aVtableSlot.index)
-        {
-            // standard calls
-        case 1: // acquire uno interface
-            (*pUnoI->acquire)( pUnoI );
-            *ppException = 0;
-            break;
-        case 2: // release uno interface
-            (*pUnoI->release)( pUnoI );
-            *ppException = 0;
-            break;
-        case 0: // queryInterface() opt
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-            if (pTD)
-            {
-                uno_Interface * pInterface = 0;
-                (*pThis->getBridge()->getUnoEnv()->getRegisteredInterface)(
-                    pThis->getBridge()->getUnoEnv(),
-                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
-                if (pInterface)
-                {
-                    ::uno_any_construct(
-                        reinterpret_cast< uno_Any * >( pReturn ),
-                        &pInterface, pTD, 0 );
-                    (*pInterface->release)( pInterface );
-                    TYPELIB_DANGER_RELEASE( pTD );
-                    *ppException = 0;
-                    break;
-                }
-                TYPELIB_DANGER_RELEASE( pTD );
-            }
-        } // else perform queryInterface()
-        default:
-            // dependent dispatch
-            cpp_call(
-                pThis, aVtableSlot,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-                pReturn, pArgs, ppException );
-        }
-        break;
-    }
-    default:
-    {
-        ::com::sun::star::uno::RuntimeException aExc(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
-        Type const & rExcType = ::getCppuType( &aExc );
-        // binary identical null reference
-        ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-    }
-    }
-}
-
-} } }
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
index abc5ce67e4b4..d4f304f77841 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,7 +58,7 @@ static typelib_TypeClass cpp2uno_call(
         void ** gpreg, void ** fpreg, void ** ovrflw,
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "as far as cpp2uno_call\n");
 #endif
     int nregs = 0; //number of words passed in registers
@@ -114,13 +115,13 @@ static typelib_TypeClass cpp2uno_call(
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "arg %d of %d\n", nPos, nParams);
 #endif
 
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) // value
         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "simple type is %d\n", pParamTypeDescr->eTypeClass);
 #endif
 
@@ -215,7 +216,7 @@ static typelib_TypeClass cpp2uno_call(
         }
         else // ptr to complex value | ref
         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "complex, nregs is %d\n", nregs);
 #endif
 
@@ -261,7 +262,7 @@ static typelib_TypeClass cpp2uno_call(
         }
     }
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "end of params\n");
 #endif
 
@@ -272,7 +273,7 @@ static typelib_TypeClass cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -291,7 +292,7 @@ static typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -347,11 +348,11 @@ static typelib_TypeClass cpp_mediate(
     sal_Int32 nVtableOffset = (nOffsetAndIndex >> 32);
     sal_Int32 nFunctionIndex = (nOffsetAndIndex & 0xFFFFFFFF);
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "nVTableOffset, nFunctionIndex are %x %x\n", nVtableOffset, nFunctionIndex);
 #endif
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         // Let's figure out what is really going on here
         {
             fprintf( stderr, "= cpp_mediate () =\nGPR's (%d): ", 6 );
@@ -395,7 +396,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pCppI );
     }
 
@@ -489,7 +490,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pCppI );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
@@ -523,7 +524,7 @@ long cpp_vtable_call(long r16, long r17, long r18, long r19, long r20, long r21,
     register double f21  asm("$f21");  fpreg[5] = f21;
 
     volatile long nRegReturn[1];
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "before mediate with %lx\n",nOffsetAndIndex);
     fprintf(stderr, "non-doubles are %x %x %x %x %x %x\n", gpreg[0], gpreg[1], gpreg[2], gpreg[3], gpreg[4], gpreg[5]);
     fprintf(stderr, "doubles are %f %f %f %f %f %f\n", fpreg[0], fpreg[1], fpreg[2], fpreg[3], fpreg[4], fpreg[5]);
@@ -531,7 +532,7 @@ long cpp_vtable_call(long r16, long r17, long r18, long r19, long r20, long r21,
     typelib_TypeClass aType =
         cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, (void**)sp,
             (sal_Int64*)nRegReturn );
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "after mediate ret is %lx %ld\n", nRegReturn[0], nRegReturn[0]);
 #endif
 
@@ -624,7 +625,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 {
     (*slots) -= functionCount;
     Slot * s = *slots;
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "in addLocalFunctions functionOffset is %x\n",functionOffset);
     fprintf(stderr, "in addLocalFunctions vtableOffset is %x\n",vtableOffset);
 #endif
@@ -673,4 +674,4 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
     return code;
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index 3e666a11cdd0..ea4188bac998 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -101,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -284,4 +285,5 @@ void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * p
 }
 
 }
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
index 2650c4376933..5376b395e35f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
 
 # In case someone enabled the non-standard -fomit-frame-pointer which does not
 # work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
 
 CFLAGSNOOPT=-O0
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
index c2f0189a2065..d76cbf748db3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,4 +96,4 @@ namespace axp
     enum axplimits { MAX_WORDS_IN_REGS = 6, MAX_GPR_REGS = 6, MAX_SSE_REGS = 6 };
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
index 7f51d425806c..db6d18800c4f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,7 +53,7 @@ void MapReturn(long r0, typelib_TypeClass eTypeClass, sal_uInt64* pRegisterRetur
     register float fret asm("$f0");
     register double dret asm("$f0");
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr,"Mapping Return with %lx %ld %f\n", r0, r0, dret);
 #endif
     switch (eTypeClass)
@@ -84,7 +85,7 @@ void MapReturn(long r0, typelib_TypeClass eTypeClass, sal_uInt64* pRegisterRetur
     default:
             break;
     }
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "end of MapReturn with %x\n", pRegisterReturn ? *pRegisterReturn : 0);
 #endif
 }
@@ -145,7 +146,7 @@ void callVirtualMethod(
     if ( nGPR > axp::MAX_GPR_REGS )
         nGPR = axp::MAX_GPR_REGS;
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         // Let's figure out what is really going on here
         {
             fprintf( stderr, "= nStack is %d\n", nStack );
@@ -341,7 +342,7 @@ static void cpp_call(
             pStackStart, (pStack - pStackStart),
             pGPR, nRegs,
             pFPR, nRegs );
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -405,7 +406,7 @@ void unoInterfaceProxyDispatch(
     uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
     void * pReturn, void * pArgs[], uno_Any ** ppException )
 {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "unoInterfaceProxyDispatch\n");
 #endif
 
@@ -529,4 +530,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 0e801ab4433e..937f38784e41 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #include <malloc.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/alloc.h>
 #include <osl/mutex.hxx>
@@ -186,7 +187,7 @@ namespace
         (*pThis->getUnoI()->pDispatcher)(
           pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-        // in case an exception occured...
+        // in case an exception occurred...
         if (pUnoExc)
         {
             // destruct temporary in/inout params
@@ -207,7 +208,7 @@ namespace
             // is here for dummy
             return typelib_TypeClass_VOID;
         }
-        else // else no exception occured...
+        else // else no exception occurred...
         {
             // temporary params
             for ( ; nTempIndizes--; )
@@ -288,7 +289,7 @@ namespace
         if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
         {
             throw RuntimeException(
-                OUString::createFromAscii("illegal vtable index!"),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
                 (XInterface *)pCppI );
         }
 
@@ -387,7 +388,7 @@ namespace
         default:
         {
             throw RuntimeException(
-                OUString::createFromAscii("no member description found!"),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
                 (XInterface *)pCppI );
             // is here for dummy
             eRet = typelib_TypeClass_VOID;
@@ -547,4 +548,4 @@ void bridges::cpp_uno::shared::VtableFactory::flushCode(
    (*clear_cache)(beg, end);
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index ec1e671a72ba..d8452d8db027 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -100,7 +101,7 @@ namespace CPPU_CURRENT_NAMESPACE
     //=====================================================================
     class RTTI
     {
-        typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+        typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
         Mutex m_mutex;
         t_rtti_map m_rttis;
@@ -227,7 +228,7 @@ namespace CPPU_CURRENT_NAMESPACE
             OUStringToOString(
                 *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
                 RTL_TEXTENCODING_ASCII_US ) );
-        fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+        fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
         void * pCppExc;
         type_info * rtti;
@@ -305,7 +306,7 @@ namespace CPPU_CURRENT_NAMESPACE
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
             OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-            OSL_ENSURE( 0, cstr.getStr() );
+            OSL_FAIL( cstr.getStr() );
 #endif
             return;
         }
@@ -314,7 +315,7 @@ namespace CPPU_CURRENT_NAMESPACE
         OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if OSL_DEBUG_LEVEL > 1
         OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-        fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
+        fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
 #endif
         typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
         if (0 == pExcTypeDescr)
@@ -326,7 +327,7 @@ namespace CPPU_CURRENT_NAMESPACE
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
             OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-            OSL_ENSURE( 0, cstr.getStr() );
+            OSL_FAIL( cstr.getStr() );
 #endif
         }
         else
@@ -338,4 +339,4 @@ namespace CPPU_CURRENT_NAMESPACE
     }
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
index 0900ec11f41f..2c42dec5a415 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
@@ -45,7 +45,7 @@ NO_BSYMBOLIC=TRUE
 CFLAGS += -DLEAK_STATIC_DATA
 .ENDIF
 
-CFLAGSCXX += -fno-omit-frame-pointer 
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
 
 NOOPTFILES= \
     $(SLO)$/cpp2uno.obj \
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
index fb72c360fd45..2b00c6c008b4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,4 +98,5 @@ namespace arm
 }
 
 #endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index be67ed8fd830..5b02678b8fbf 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -393,7 +394,7 @@ static void cpp_call(
             {
             case typelib_TypeClass_HYPER:
             case typelib_TypeClass_UNSIGNED_HYPER:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "hyper is %lx\n", pCppArgs[nPos]);
 #endif
                 INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack, pStackStart, bOverFlow );
@@ -401,7 +402,7 @@ static void cpp_call(
             case typelib_TypeClass_LONG:
             case typelib_TypeClass_UNSIGNED_LONG:
             case typelib_TypeClass_ENUM:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "long is %x\n", pCppArgs[nPos]);
 #endif
                 INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
@@ -469,7 +470,7 @@ static void cpp_call(
             (pStack - pStackStart),
             pGPR, nGPR);
 
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -666,4 +667,4 @@ void unoInterfaceProxyDispatch(
 
 } } }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx
index 64302947d9a2..f434b7e0ba91 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -105,7 +106,7 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
     pMethod += 4 * nVtableIndex;
     pMethod = *((sal_uInt32 *)pMethod);
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "this is %p\n", pGPR[0]);
     for (int i = 0; i < hppa::MAX_GPR_REGS ; ++i)
         fprintf(stderr, "normal reg %d is %d %x\n", i, pGPR[i], pGPR[i]);
@@ -139,4 +140,4 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
     MapReturn(r28, r29, pReturnTypeDescr, bRegisterReturn, (sal_uInt32*)pRegisterReturn);
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index 959452b4d985..e96217495ddb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #include <malloc.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/alloc.h>
 #include <osl/mutex.hxx>
@@ -64,7 +65,7 @@ namespace
         void ** startovrflw = ovrflw;
         int nregs = 0; //number of words passed in registers
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "cpp2uno_call\n");
 #endif
         // return
@@ -80,14 +81,14 @@ namespace
         {
             if (hppa::isRegisterReturn(pReturnTypeRef))
             {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "simple return\n");
 #endif
                 pUnoReturn = pRegisterReturn; // direct way for simple types
             }
             else
             {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "complex return via r8\n");
 #endif
                 pCppReturn = (void *)r8;
@@ -294,18 +295,18 @@ namespace
         uno_Any aUnoExc; // Any will be constructed by callee
         uno_Any * pUnoExc = &aUnoExc;
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "before dispatch\n");
 #endif
         // invoke uno dispatch call
         (*pThis->getUnoI()->pDispatcher)(
           pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "after dispatch\n");
 #endif
 
-        // in case an exception occured...
+        // in case an exception occurred...
         if (pUnoExc)
         {
             // destruct temporary in/inout params
@@ -326,7 +327,7 @@ namespace
             // is here for dummy
             return typelib_TypeClass_VOID;
         }
-        else // else no exception occured...
+        else // else no exception occurred...
         {
             // temporary params
             for ( ; nTempIndizes--; )
@@ -383,7 +384,7 @@ namespace
 
     {
     void ** ovrflw = (void**)(sp);
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "cpp_mediate with\n");
     fprintf(stderr, "%x %x\n", nFunctionIndex, nVtableOffset);
     fprintf(stderr, "and %x %x\n", (long)(ovrflw[0]), (long)(ovrflw[-1]));
@@ -406,14 +407,14 @@ namespace
         {
         nFunctionIndex &= 0x7fffffff;
         pThis = gpreg[1];
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "pThis is gpreg[1]\n");
 #endif
         }
         else
         {
         pThis = gpreg[0];
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "pThis is gpreg[0]\n");
 #endif
         }
@@ -431,7 +432,7 @@ namespace
         if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
         {
             throw RuntimeException(
-                OUString::createFromAscii("illegal vtable index!"),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
                 (XInterface *)pCppI );
         }
 
@@ -530,7 +531,7 @@ namespace
         default:
         {
             throw RuntimeException(
-                OUString::createFromAscii("no member description found!"),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
                 (XInterface *)pCppI );
             // is here for dummy
             eRet = typelib_TypeClass_VOID;
@@ -577,7 +578,7 @@ sal_Int64 cpp_vtable_call( sal_uInt32 in0, sal_uInt32 in1, sal_uInt32 in2, sal_u
     register double d3 asm("fr7"); dpreg[3] = d3;
 
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "got to cpp_vtable_call with %x %x\n", functionIndex, vtableOffset);
     for (int i = 0; i < hppa::MAX_GPR_REGS; ++i)
     fprintf(stderr, "reg %d is %d %x\n", i, gpreg[i], gpreg[i]);
@@ -722,4 +723,4 @@ void bridges::cpp_uno::shared::VtableFactory::flushCode(
     }
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 9d036d1b5ae8..1128f0f85cd8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -100,7 +101,7 @@ namespace CPPU_CURRENT_NAMESPACE
     //=====================================================================
     class RTTI
     {
-        typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+        typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
         Mutex m_mutex;
         t_rtti_map m_rttis;
@@ -227,7 +228,7 @@ namespace CPPU_CURRENT_NAMESPACE
             OUStringToOString(
                 *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
                 RTL_TEXTENCODING_ASCII_US ) );
-        fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+        fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
         void * pCppExc;
         type_info * rtti;
@@ -298,7 +299,7 @@ namespace CPPU_CURRENT_NAMESPACE
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
             OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-            OSL_ENSURE( 0, cstr.getStr() );
+            OSL_FAIL( cstr.getStr() );
 #endif
             return;
         }
@@ -307,7 +308,7 @@ namespace CPPU_CURRENT_NAMESPACE
         OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if OSL_DEBUG_LEVEL > 1
         OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-        fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
+        fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
 #endif
         typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
         if (0 == pExcTypeDescr)
@@ -319,7 +320,7 @@ namespace CPPU_CURRENT_NAMESPACE
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
             OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-            OSL_ENSURE( 0, cstr.getStr() );
+            OSL_FAIL( cstr.getStr() );
 #endif
         }
         else
@@ -331,4 +332,4 @@ namespace CPPU_CURRENT_NAMESPACE
     }
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
index a160ed5fb4c9..6fab7a4d1f5f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
@@ -45,7 +45,7 @@ NO_BSYMBOLIC=TRUE
 CFLAGS += -DLEAK_STATIC_DATA
 .ENDIF
 
-CFLAGSCXX += -fno-omit-frame-pointer 
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
 
 NOOPTFILES= \
     $(SLO)$/cpp2uno.obj \
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
index 59b674363fd1..895acf6b1883 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,3 +98,5 @@ namespace hppa
 
     bool isRegisterReturn( typelib_TypeDescriptionReference *pTypeRef );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
index cbf88dd7a516..6c3b25c387fa 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -247,7 +248,7 @@ static void cpp_call(
             {
                 case typelib_TypeClass_HYPER:
                 case typelib_TypeClass_UNSIGNED_HYPER:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                     fprintf(stderr, "hyper is %llx\n", *((long long*)pCppArgs[nPos]));
 #endif
                     INSERT_INT64( pCppArgs[nPos], nRegs, pGPR, pStack, pStackStart, bOverFlow );
@@ -255,7 +256,7 @@ static void cpp_call(
                 case typelib_TypeClass_LONG:
                 case typelib_TypeClass_UNSIGNED_LONG:
                 case typelib_TypeClass_ENUM:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                     fprintf(stderr, "long is %x\n", pCppArgs[nPos]);
 #endif
                     INSERT_INT32( pCppArgs[nPos], nRegs, pGPR, pStack, bOverFlow );
@@ -322,7 +323,7 @@ static void cpp_call(
             pStackStart,
             (pStack - pStackStart), pGPR, pFPR);
 
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -518,4 +519,4 @@ void unoInterfaceProxyDispatch(
 
 } } }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index fe880b2aa449..e897397ce76b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,7 +56,7 @@ static typelib_TypeClass cpp2uno_call(
         void ** gpreg, void ** fpreg, void ** ovrflw,
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "as far as cpp2uno_call\n");
 #endif
 
@@ -120,14 +121,14 @@ static typelib_TypeClass cpp2uno_call(
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "arg %d of %d\n", nPos, nParams);
 #endif
 
         //I think it is impossible to get UNO to pass structs as parameters by copy
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "simple\n");
 #endif
 
@@ -193,7 +194,7 @@ static typelib_TypeClass cpp2uno_call(
         }
         else // ptr to complex value | ref
         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "complex, ng is %d\n", ng);
 #endif
             void *pCppStack; //temporary stack pointer
@@ -237,7 +238,7 @@ static typelib_TypeClass cpp2uno_call(
         }
     }
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "end of params\n");
 #endif
 
@@ -248,7 +249,7 @@ static typelib_TypeClass cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -268,7 +269,7 @@ static typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -335,25 +336,25 @@ static typelib_TypeClass cpp_mediate(
     {
     nFunctionIndex &= 0x7fffffff;
     pThis = gpreg[1];
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "pThis is gpreg[1]\n");
 #endif
     }
     else
     {
     pThis = gpreg[0];
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "pThis is gpreg[0]\n");
 #endif
     }
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "pThis is %p\n", pThis);
 #endif
 
     pThis = static_cast< char * >(pThis) - nVtableOffset;
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "pThis is now %p\n", pThis);
 #endif
 
@@ -363,7 +364,7 @@ static typelib_TypeClass cpp_mediate(
 
     typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "indexes are %d %d\n", nFunctionIndex, pTypeDescr->nMapFunctionIndexToMemberIndex);
 #endif
 
@@ -371,7 +372,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -379,7 +380,7 @@ static typelib_TypeClass cpp_mediate(
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "members are %d %d\n", nMemberPos, pTypeDescr->nAllMembers);
 #endif
 
@@ -467,19 +468,19 @@ static typelib_TypeClass cpp_mediate(
     }
     default:
     {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "screwed\n");
 #endif
 
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
     }
     }
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "end of cpp_mediate\n");
 #endif
     return eRet;
@@ -519,7 +520,7 @@ extern "C" ia64::RegReturn cpp_vtable_call(
     register double f14 asm("f14"); fpreg[6] = f14;
     register double f15 asm("f15"); fpreg[7] = f15;
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "cpp_vtable_call called with %lx\n", nOffsetAndIndex);
     fprintf(stderr, "adump is %lx %lx %lx %lx %lx %lx %lx %lx\n", in0, in1, in2, in3, in4, in5, in6, in7);
     fprintf(stderr, "bdump is %f %f %f %f %f %f %f %f\n", f8, f9, f10, f11, f12, f13, f14, f15);
@@ -575,7 +576,7 @@ const int codeSnippetSize = 40;
 bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
                               bool bHasHiddenParam )
 {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "size is %d\n", codeSnippetSize);
     fprintf(stderr,"in codeSnippet functionIndex is %x\n", nFunctionIndex);
     fprintf(stderr,"in codeSnippet vtableOffset is %x\n", nVtableOffset);
@@ -631,7 +632,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 {
     (*in_slots) -= functionCount;
     Slot * slots = *in_slots;
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "in addLocalFunctions functionOffset is %x\n",functionOffset);
     fprintf(stderr, "in addLocalFunctions vtableOffset is %x\n",vtableOffset);
 #endif
@@ -681,4 +682,4 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
     return code;
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
index 3e666a11cdd0..ea4188bac998 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -101,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -284,4 +285,5 @@ void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * p
 }
 
 }
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
index b4ac2edc3a71..1e82cfabe260 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
 
 # In case someone enabled the non-standard -fomit-frame-pointer which does not
 # work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
 
 NOOPTFILES= \
     $(SLO)$/uno2cpp.obj \
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx
index abf95470aafc..359c9c720212 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -127,4 +128,5 @@ namespace bridges
         }
     }
 }
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
index 7a07c5ea5dd9..19b586b557f2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -176,7 +177,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
     if ( nGPR > ia64::MAX_GPR_REGS )
         nGPR = ia64::MAX_GPR_REGS;
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         // Let's figure out what is really going on here
         {
                 fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR );
@@ -336,7 +337,7 @@ static void cpp_call(
     bool bSimpleReturn = true;
     if (pReturnTypeDescr)
     {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "return type is %d\n", pReturnTypeDescr->eTypeClass);
 #endif
         if ( ia64::return_in_hidden_param(pReturnTypeRef) || ia64::return_via_r8_buffer(pReturnTypeRef) )
@@ -345,7 +346,7 @@ static void cpp_call(
                 if ( bSimpleReturn )
         {
             pCppReturn = pUnoReturn; // direct way for simple types
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "simple return\n");
 #endif
         }
@@ -354,7 +355,7 @@ static void cpp_call(
             // complex return via ptr
             pCppReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                    ? alloca( pReturnTypeDescr->nSize ) : pUnoReturn);
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "pCppReturn/pUnoReturn is %lx/%lx", pCppReturn, pUnoReturn);
 #endif
                         if (!ia64::return_via_r8_buffer(pReturnTypeRef))
@@ -364,7 +365,7 @@ static void cpp_call(
     // push "this" pointer
         void * pAdjustedThisPtr = reinterpret_cast< void ** >( pThis->getCppI() ) + aVtableSlot.offset;
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "this pointer is %p\n", pAdjustedThisPtr);
 #endif
     INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack, bOverFlow );
@@ -378,7 +379,7 @@ static void cpp_call(
 
     sal_Int32 nTempIndizes   = 0;
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "n params is %d\n", nParams);
 #endif
 
@@ -388,7 +389,7 @@ static void cpp_call(
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "param %d is %d %d %d\n", nPos, rParam.bOut, bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ),
             pParamTypeDescr->eTypeClass);
 #endif
@@ -402,7 +403,7 @@ static void cpp_call(
                         {
                         case typelib_TypeClass_HYPER:
                         case typelib_TypeClass_UNSIGNED_HYPER:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "hyper is %lx\n", *(unsigned long*)(pCppArgs[nPos]));
 #endif
                                 INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
@@ -410,7 +411,7 @@ static void cpp_call(
                         case typelib_TypeClass_LONG:
                         case typelib_TypeClass_UNSIGNED_LONG:
                         case typelib_TypeClass_ENUM:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "long is %lx\n", *(unsigned int*)(pCppArgs[nPos]));
 #endif
                                 INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
@@ -418,27 +419,27 @@ static void cpp_call(
                         case typelib_TypeClass_SHORT:
                         case typelib_TypeClass_CHAR:
                         case typelib_TypeClass_UNSIGNED_SHORT:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "short is %x\n", *(unsigned short*)(pCppArgs[nPos]));
 #endif
                                 INSERT_INT16( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
                                 break;
                         case typelib_TypeClass_BOOLEAN:
                         case typelib_TypeClass_BYTE:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "byte is %x\n", *(unsigned char*)(pCppArgs[nPos]));
 #endif
                                 INSERT_INT8( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
                                 break;
                         case typelib_TypeClass_FLOAT:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "a float is %f\n", *(float*)(pCppArgs[nPos]));
                 fprintf(stderr, "b float is %f\n", *(double*)(pCppArgs[nPos]));
 #endif
                                 INSERT_FLOAT( pCppArgs[nPos], nFPR, pFPR, nGPR, pGPR, pStack, bOverFlow );
                 break;
                         case typelib_TypeClass_DOUBLE:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "double is %f\n", *(double*)(pCppArgs[nPos]));
 #endif
                                 INSERT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, nGPR, pGPR, pStack, bOverFlow );
@@ -453,12 +454,12 @@ static void cpp_call(
         }
         else // ptr to complex value | ref
         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "complex type again %d\n", rParam.bIn);
 #endif
                         if (! rParam.bIn) // is pure out
                         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "complex size is %d\n", pParamTypeDescr->nSize );
 #endif
                                 // cpp out is constructed mem, uno out is not!
@@ -472,7 +473,7 @@ static void cpp_call(
                         // is in/inout
                         else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ))
                         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "this one\n");
 #endif
                                 uno_copyAndConvertData(
@@ -485,7 +486,7 @@ static void cpp_call(
                         }
                         else // direct way
                         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "that one, passing %lx through\n", pUnoArgs[nPos]);
 #endif
                                 pCppArgs[nPos] = pUnoArgs[nPos];
@@ -504,7 +505,7 @@ static void cpp_call(
                         pStackStart, ( pStack - pStackStart ),
                         pGPR, nGPR,
                         pFPR, nFPR );
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -687,4 +688,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
index ac47e786588c..3f91c558f1d0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,7 +68,7 @@ void cpp2uno_call(
 
     if (pReturnTypeDescr)
     {
-        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
+        if (x86::isSimpleReturnType( pReturnTypeDescr ))
         {
             pUnoReturn = pReturnValue; // direct way for simple types
         }
@@ -163,7 +164,7 @@ void cpp2uno_call(
     (*pThis->getUnoI()->pDispatcher)(
         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -182,7 +183,7 @@ void cpp2uno_call(
             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
             // has to destruct the any
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -252,7 +253,7 @@ extern "C" void cpp_vtable_call(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -341,7 +342,7 @@ extern "C" void cpp_vtable_call(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
     }
     }
@@ -358,15 +359,40 @@ extern "C" typedef void (*PrivateSnippetExecutor)();
 
 int const codeSnippetSize = 16;
 
+#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) || \
+    defined(DRAGONFLY)
+namespace
+{
+    PrivateSnippetExecutor returnsInRegister(typelib_TypeDescriptionReference * pReturnTypeRef)
+    {
+        //These archs apparently are returning small structs in registers, while Linux
+        //doesn't
+        PrivateSnippetExecutor exec=NULL;
+
+        typelib_TypeDescription * pReturnTypeDescr = 0;
+        TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
+        const bool bSimpleReturnStruct = x86::isSimpleReturnType(pReturnTypeDescr);
+        const sal_Int32 nRetSize = pReturnTypeDescr->nSize;
+        TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
+        if (bSimpleReturnStruct)
+        {
+            exec = privateSnippetExecutorGeneral; // fills eax
+            if (nRetSize > 4)
+                exec = privateSnippetExecutorHyper; // fills eax/edx
+        }
+        return exec;
+    }
+}
+#endif
+
 unsigned char * codeSnippet(
     unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 functionIndex, sal_Int32 vtableOffset,
-    typelib_TypeClass returnTypeClass)
+    typelib_TypeDescriptionReference * pReturnTypeRef)
 {
-    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-        functionIndex |= 0x80000000;
-    }
     PrivateSnippetExecutor exec;
-    switch (returnTypeClass) {
+    typelib_TypeClass eReturnClass = pReturnTypeRef ? pReturnTypeRef->eTypeClass : typelib_TypeClass_VOID;
+    switch (eReturnClass)
+    {
     case typelib_TypeClass_VOID:
         exec = privateSnippetExecutorVoid;
         break;
@@ -380,13 +406,25 @@ unsigned char * codeSnippet(
     case typelib_TypeClass_DOUBLE:
         exec = privateSnippetExecutorDouble;
         break;
+    case typelib_TypeClass_STRUCT:
+    case typelib_TypeClass_EXCEPTION:
+#if defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) || \
+    defined(DRAGONFLY)
+        exec = returnsInRegister(pReturnTypeRef);
+        if (!exec)
+        {
+            exec = privateSnippetExecutorClass;
+            functionIndex |= 0x80000000;
+        }
+        break;
+#endif
     case typelib_TypeClass_STRING:
     case typelib_TypeClass_TYPE:
     case typelib_TypeClass_ANY:
     case typelib_TypeClass_SEQUENCE:
-    case typelib_TypeClass_STRUCT:
     case typelib_TypeClass_INTERFACE:
         exec = privateSnippetExecutorClass;
+        functionIndex |= 0x80000000;
         break;
     default:
         exec = privateSnippetExecutorGeneral;
@@ -454,7 +492,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
             code = codeSnippet(
                 code, writetoexecdiff, functionOffset++, vtableOffset,
                 reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
-                    member)->pAttributeTypeRef->eTypeClass);
+                    member)->pAttributeTypeRef);
             // Setter:
             if (!reinterpret_cast<
                 typelib_InterfaceAttributeTypeDescription * >(
@@ -463,7 +501,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
                 (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(
                     code, writetoexecdiff, functionOffset++, vtableOffset,
-                    typelib_TypeClass_VOID);
+                    NULL);
             }
             break;
 
@@ -472,7 +510,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
             code = codeSnippet(
                 code, writetoexecdiff, functionOffset++, vtableOffset,
                 reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
-                    member)->pReturnTypeRef->eTypeClass);
+                    member)->pReturnTypeRef);
             break;
 
         default:
@@ -487,3 +525,5 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 void bridges::cpp_uno::shared::VtableFactory::flushCode(
     unsigned char const *, unsigned char const *)
 {}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 95cb9dd68971..02ac42b1d4e7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,8 +32,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <dlfcn.h>
+#include <boost/unordered_map.hpp>
+
 #include <cxxabi.h>
-#include <hash_map>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -46,7 +48,6 @@
 
 #include "share.hxx"
 
-
 using namespace ::std;
 using namespace ::osl;
 using namespace ::rtl;
@@ -102,7 +103,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -118,7 +119,11 @@ public:
 };
 //__________________________________________________________________________________________________
 RTTI::RTTI() SAL_THROW( () )
+#if defined(FREEBSD) && __FreeBSD_version < 702104
+    : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
+#endif
 {
 }
 //__________________________________________________________________________________________________
@@ -153,7 +158,11 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
         buf.append( 'E' );
 
         OString symName( buf.makeStringAndClear() );
+#if defined(FREEBSD) && __FreeBSD_version < 702104 /* #i22253# */
+        rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else
         rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
+#endif
 
         if (rtti)
         {
@@ -229,7 +238,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         OUStringToOString(
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
     void * pCppExc;
     type_info * rtti;
@@ -294,7 +303,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
         return;
     }
@@ -303,7 +312,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if OSL_DEBUG_LEVEL > 1
     OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
+    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
 #endif
     typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
     if (0 == pExcTypeDescr)
@@ -315,7 +324,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
     }
     else
@@ -328,3 +337,4 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
index d5eb2dd6e1d9..beedf9dafa2a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
@@ -38,7 +38,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXIgcc3"
+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXIgcc3" || \
+    "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOPENBSDIgcc3" || \
+    "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" || \
+    "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDIgcc3" || \
+    "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCDRAGONFLYIgcc3"
 
 .IF "$(cppu_no_leak)" == ""
 CFLAGS += -DLEAK_STATIC_DATA
@@ -46,7 +50,7 @@ CFLAGS += -DLEAK_STATIC_DATA
 
 # In case someone enabled the non-standard -fomit-frame-pointer which does not
 # work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
 
 CFLAGSNOOPT=-O0
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
index 930094738b20..8a3e136bfb7b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,4 +88,12 @@ void raiseException(
 //==================================================================================================
 void fillUnoException(
     __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
+
 }
+
+namespace x86
+{
+    bool isSimpleReturnType(typelib_TypeDescription * pTD, bool recursive = false);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
index 4d1d3f2f8ca4..21febefad110 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_bridges.hxx"
 
+#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
+#include <stdlib.h>
+#else
 #include <malloc.h>
+#endif
 
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
@@ -58,7 +63,7 @@ void callVirtualMethod(
     void * pAdjustedThisPtr,
     sal_Int32 nVtableIndex,
     void * pRegisterReturn,
-    typelib_TypeClass eReturnType,
+    typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
     sal_Int32 * pStackLongs,
     sal_Int32 nStackLongs ) __attribute__((noinline));
 
@@ -66,7 +71,7 @@ void callVirtualMethod(
     void * pAdjustedThisPtr,
     sal_Int32 nVtableIndex,
     void * pRegisterReturn,
-    typelib_TypeClass eReturnType,
+    typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
     sal_Int32 * pStackLongs,
     sal_Int32 nStackLongs )
 {
@@ -119,8 +124,10 @@ void callVirtualMethod(
         : "m"(nStackLongs), "m"(pStackLongs), "m"(pAdjustedThisPtr),
           "m"(nVtableIndex), "m"(eax), "m"(edx), "m"(stackptr)
         : "eax", "edx" );
-    switch( eReturnType )
+    switch( pReturnTypeDescr->eTypeClass )
     {
+        case typelib_TypeClass_VOID:
+            break;
         case typelib_TypeClass_HYPER:
         case typelib_TypeClass_UNSIGNED_HYPER:
             ((long*)pRegisterReturn)[1] = edx;
@@ -145,7 +152,21 @@ void callVirtualMethod(
             asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
             break;
         default:
+        {
+#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) || \
+    defined(DRAGONFLY)
+            sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
+            if (bSimpleReturn && nRetSize <= 8 && nRetSize > 0)
+            {
+                if (nRetSize > 4)
+                    static_cast<long *>(pRegisterReturn)[1] = edx;
+                static_cast<long *>(pRegisterReturn)[0] = eax;
+            }
+#else
+            (void)bSimpleReturn;
+#endif
             break;
+        }
     }
 }
 
@@ -168,10 +189,12 @@ static void cpp_call(
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
 
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
+    bool bSimpleReturn = true;
 
     if (pReturnTypeDescr)
     {
-        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
+        bSimpleReturn = x86::isSimpleReturnType(pReturnTypeDescr);
+        if (bSimpleReturn)
         {
             pCppReturn = pUnoReturn; // direct way for simple types
         }
@@ -268,9 +291,9 @@ static void cpp_call(
         OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
         callVirtualMethod(
             pAdjustedThisPtr, aVtableSlot.index,
-            pCppReturn, pReturnTypeDescr->eTypeClass,
+            pCppReturn, pReturnTypeDescr, bSimpleReturn,
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -327,6 +350,39 @@ static void cpp_call(
 
 }
 
+namespace x86
+{
+    bool isSimpleReturnType(typelib_TypeDescription * pTD, bool recursive)
+    {
+        if (bridges::cpp_uno::shared::isSimpleType( pTD ))
+            return true;
+#if defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) || \
+    defined(MACOSX) || defined(DRAGONFLY)
+        // Only structs of exactly 1, 2, 4, or 8 bytes are returned through
+        // registers, see <http://developer.apple.com/documentation/DeveloperTools/
+        // Conceptual/LowLevelABI/Articles/IA32.html>:
+        if (pTD->eTypeClass == typelib_TypeClass_STRUCT &&
+            (recursive || pTD->nSize <= 2 || pTD->nSize == 4 || pTD->nSize == 8))
+        {
+            typelib_CompoundTypeDescription *const pCompTD =
+                (typelib_CompoundTypeDescription *) pTD;
+            for ( sal_Int32 pos = pCompTD->nMembers; pos--; ) {
+                typelib_TypeDescription * pMemberTD = 0;
+                TYPELIB_DANGER_GET( &pMemberTD, pCompTD->ppTypeRefs[pos] );
+                bool const b = isSimpleReturnType(pMemberTD, true);
+                TYPELIB_DANGER_RELEASE( pMemberTD );
+                if (! b)
+                    return false;
+            }
+            return true;
+        }
+#else
+        (void)recursive;
+#endif
+        return false;
+    }
+}
+
 namespace bridges { namespace cpp_uno { namespace shared {
 
 void unoInterfaceProxyDispatch(
@@ -449,3 +505,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
index 2121001d2820..7c46d1a0b408 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #include <malloc.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/alloc.h>
 #include <osl/mutex.hxx>
@@ -64,7 +65,7 @@ namespace
         // pCallStack: ret, [return ptr], this, params
         char * pTopStack = (char *)(pCallStack + 0);
         char * pCppStack = pTopStack;
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "cpp2uno_call\n");
 #endif
         // return
@@ -80,14 +81,14 @@ namespace
         {
             if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
             {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "simple return\n");
 #endif
                 pUnoReturn = pRegisterReturn; // direct way for simple types
             }
             else // complex return via ptr (pCppReturn)
             {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "complex return\n");
 #endif
                 pCppReturn = (void *)r8;
@@ -189,18 +190,18 @@ namespace
         uno_Any aUnoExc; // Any will be constructed by callee
         uno_Any * pUnoExc = &aUnoExc;
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "before dispatch\n");
 #endif
         // invoke uno dispatch call
         (*pThis->getUnoI()->pDispatcher)(
           pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "after dispatch\n");
 #endif
 
-        // in case an exception occured...
+        // in case an exception occurred...
         if (pUnoExc)
         {
             // destruct temporary in/inout params
@@ -221,7 +222,7 @@ namespace
             // is here for dummy
             return typelib_TypeClass_VOID;
         }
-        else // else no exception occured...
+        else // else no exception occurred...
         {
             // temporary params
             for ( ; nTempIndizes--; )
@@ -276,7 +277,7 @@ namespace
         sal_Int64 * pRegisterReturn /* space for register return */ )
     {
     void ** pCallStack = (void**)(sp);
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "cpp_mediate with\n");
     fprintf(stderr, "%x %x\n", nFunctionIndex, nVtableOffset);
     fprintf(stderr, "and %x %x\n", pCallStack, pRegisterReturn);
@@ -299,7 +300,7 @@ namespace
         if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
         {
             throw RuntimeException(
-                OUString::createFromAscii("illegal vtable index!"),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
                 (XInterface *)pCppI );
         }
 
@@ -398,7 +399,7 @@ namespace
         default:
         {
             throw RuntimeException(
-                OUString::createFromAscii("no member description found!"),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
                 (XInterface *)pCppI );
             // is here for dummy
             eRet = typelib_TypeClass_VOID;
@@ -513,9 +514,6 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
                     reinterpret_cast<
                         typelib_InterfaceMethodTypeDescription * >(member);
 
-                bool issimple = bridges::cpp_uno::shared::isSimpleType(
-                    pMethodTD->pReturnTypeRef);
-
                 code = codeSnippet(code, functionOffset++, vtableOffset);
                 break;
             }
@@ -533,4 +531,4 @@ void bridges::cpp_uno::shared::VtableFactory::flushCode(
 {
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 9d036d1b5ae8..1128f0f85cd8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -100,7 +101,7 @@ namespace CPPU_CURRENT_NAMESPACE
     //=====================================================================
     class RTTI
     {
-        typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+        typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
         Mutex m_mutex;
         t_rtti_map m_rttis;
@@ -227,7 +228,7 @@ namespace CPPU_CURRENT_NAMESPACE
             OUStringToOString(
                 *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
                 RTL_TEXTENCODING_ASCII_US ) );
-        fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+        fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
         void * pCppExc;
         type_info * rtti;
@@ -298,7 +299,7 @@ namespace CPPU_CURRENT_NAMESPACE
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
             OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-            OSL_ENSURE( 0, cstr.getStr() );
+            OSL_FAIL( cstr.getStr() );
 #endif
             return;
         }
@@ -307,7 +308,7 @@ namespace CPPU_CURRENT_NAMESPACE
         OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if OSL_DEBUG_LEVEL > 1
         OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-        fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
+        fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
 #endif
         typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
         if (0 == pExcTypeDescr)
@@ -319,7 +320,7 @@ namespace CPPU_CURRENT_NAMESPACE
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
             OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-            OSL_ENSURE( 0, cstr.getStr() );
+            OSL_FAIL( cstr.getStr() );
 #endif
         }
         else
@@ -331,4 +332,4 @@ namespace CPPU_CURRENT_NAMESPACE
     }
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
index 8ad89c973b9e..3978bda7cb16 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
@@ -45,7 +45,7 @@ NO_BSYMBOLIC=TRUE
 CFLAGS += -DLEAK_STATIC_DATA
 .ENDIF
 
-CFLAGSCXX += -fno-omit-frame-pointer 
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
 
 NOOPTFILES= \
     $(SLO)$/cpp2uno.obj \
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
index 6e148b489508..4ec09c29ff0a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ void raiseException(
 void fillUnoException(
     __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
index 2bee8f1e0fad..0d0fd27678eb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,7 +110,7 @@ void callVirtualMethod(
         memcpy( stack, pStack, nStackBytes );
     }
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         // Let's figure out what is really going on here
         {
                 fprintf( stderr, "\nStack (%d): ", nStack );
@@ -228,7 +229,7 @@ static void cpp_call(
             {
             case typelib_TypeClass_HYPER:
             case typelib_TypeClass_UNSIGNED_HYPER:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "hyper is %lx\n", pCppArgs[nPos]);
 #endif
                 INSERT_INT64( pCppArgs[nPos], pStack );
@@ -236,7 +237,7 @@ static void cpp_call(
             case typelib_TypeClass_LONG:
             case typelib_TypeClass_UNSIGNED_LONG:
             case typelib_TypeClass_ENUM:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "long is %x\n", pCppArgs[nPos]);
 #endif
                 INSERT_INT32( pCppArgs[nPos], pStack );
@@ -301,7 +302,7 @@ static void cpp_call(
             pStackStart,
             (pStack - pStackStart));
 
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -490,4 +491,4 @@ void unoInterfaceProxyDispatch(
 
 } } }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index 784657954d84..f1597c37bac4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -312,7 +313,7 @@ namespace
     fprintf(stderr,"cpp2uno_call2,after dispatch\n");
 #endif
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
       // destruct temporary in/inout params
@@ -332,7 +333,7 @@ namespace
       // is here for dummy
       return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
       // temporary params
       for ( ; nTempIndizes--; )
@@ -426,7 +427,7 @@ namespace
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
       throw RuntimeException(
-          rtl::OUString::createFromAscii("illegal vtable index!"),
+          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
           (XInterface *)pThis );
     }
 
@@ -539,7 +540,7 @@ namespace
     fprintf(stderr,"cpp_mediate6\n");
 #endif
           throw RuntimeException(
-              rtl::OUString::createFromAscii("no member description found!"),
+              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
               (XInterface *)pThis );
           // is here for dummy
           eRet = typelib_TypeClass_VOID;
@@ -801,3 +802,4 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
   return code;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index 99cf6df8fed8..f4c4e24c4374 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -97,7 +98,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -224,7 +225,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         OUStringToOString(
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
     void * pCppExc;
     type_info * rtti;
@@ -289,7 +290,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if defined _DEBUG
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
         return;
     }
@@ -298,7 +299,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if defined BRIDGES_DEBUG
     OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
+    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
 #endif
     typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
     if (0 == pExcTypeDescr)
@@ -310,7 +311,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if defined _DEBUG
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
     }
     else
@@ -323,3 +324,4 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
index c71849f06ea9..f71750e9108d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
 
 # In case someone enabled the non-standard -fomit-frame-pointer which does not
 # work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
 
 CFLAGSNOOPT=-O0
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx
index 6e148b489508..4ec09c29ff0a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ void raiseException(
 void fillUnoException(
     __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
index 746d43520a73..4507206f2508 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -405,7 +406,7 @@ namespace
           pAdjustedThisPtr, aVtableSlot.index,
           pCppReturn, pReturnTypeDescr->eTypeClass, pParamType,
           (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-      // NO exception occured...
+      // NO exception occurred...
       *ppUnoExc = 0;
 
       // reconvert temporary params
@@ -595,3 +596,4 @@ void unoInterfaceProxyDispatch(
 }
 }}}
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index bf2826594162..bc9702351464 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,6 @@
 #include "bridges/cpp_uno/shared/vtablefactory.hxx"
 
 #include "share.hxx"
-// #include <stdio.h>
 
 
 using namespace ::com::sun::star::uno;
@@ -48,7 +48,6 @@ using namespace ::com::sun::star::uno;
 namespace
 {
 
-//==================================================================================================
 static typelib_TypeClass cpp2uno_call(
     bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
     const typelib_TypeDescription * pMemberTypeDescr,
@@ -296,7 +295,7 @@ static typelib_TypeClass cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -316,7 +315,7 @@ static typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -396,7 +395,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -489,7 +488,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
@@ -793,3 +792,4 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
     return code;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
index 7012ac42eb28..ea4188bac998 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -101,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -285,3 +286,4 @@ void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * p
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
index 02906e1a0e94..9a752009904e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
@@ -45,7 +45,7 @@ CFLAGS += -DLEAK_STATIC_DATA
 
 # In case someone enabled the non-standard -fomit-frame-pointer which does not
 # work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
 
 NOOPTFILES= \
     $(SLO)$/uno2cpp.obj
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx
index 6e148b489508..4ec09c29ff0a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ void raiseException(
 void fillUnoException(
     __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
index ec585e95fabf..49a33f6d12ae 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -487,7 +488,7 @@ static void cpp_call(
             pAdjustedThisPtr, aVtableSlot.index,
             pCppReturn, pReturnTypeDescr->eTypeClass, pParamType,
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -670,3 +671,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index c80e20feb18a..e9a5e8c6bb8b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,7 +57,7 @@ static typelib_TypeClass cpp2uno_call(
         void ** gpreg, void ** fpreg, void ** ovrflw,
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "as far as cpp2uno_call\n");
 #endif
 
@@ -114,13 +115,13 @@ static typelib_TypeClass cpp2uno_call(
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "arg %d of %d\n", nPos, nParams);
 #endif
 
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "simple\n");
 #endif
 
@@ -212,7 +213,7 @@ static typelib_TypeClass cpp2uno_call(
         }
         else // ptr to complex value | ref
         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "complex, ng is %d\n", ng);
 #endif
             void *pCppStack; //temporary stack pointer
@@ -256,7 +257,7 @@ static typelib_TypeClass cpp2uno_call(
         }
     }
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "end of params\n");
 #endif
 
@@ -267,7 +268,7 @@ static typelib_TypeClass cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -287,7 +288,7 @@ static typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -355,25 +356,25 @@ static typelib_TypeClass cpp_mediate(
     {
     nFunctionIndex &= 0x7fffffff;
     pThis = gpreg[1];
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "pThis is gpreg[1]\n");
 #endif
     }
     else
     {
     pThis = gpreg[0];
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "pThis is gpreg[0]\n");
 #endif
     }
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "pThis is %lx\n", pThis);
 #endif
 
     pThis = static_cast< char * >(pThis) - nVtableOffset;
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "pThis is now %lx\n", pThis);
 #endif
 
@@ -383,7 +384,7 @@ static typelib_TypeClass cpp_mediate(
 
     typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "indexes are %d %d\n", nFunctionIndex, pTypeDescr->nMapFunctionIndexToMemberIndex);
 #endif
 
@@ -391,7 +392,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -399,7 +400,7 @@ static typelib_TypeClass cpp_mediate(
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "members are %d %d\n", nMemberPos, pTypeDescr->nAllMembers);
 #endif
 
@@ -487,19 +488,19 @@ static typelib_TypeClass cpp_mediate(
     }
     default:
     {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "screwed\n");
 #endif
 
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
     }
     }
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "end of cpp_mediate\n");
 #endif
     return eRet;
@@ -604,7 +605,7 @@ const int codeSnippetSize = 24;
 unsigned char *  codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
                               bool simpleRetType)
 {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr,"in codeSnippet functionIndex is %x\n", nFunctionIndex);
     fprintf(stderr,"in codeSnippet vtableOffset is %x\n", nVtableOffset);
 #endif
@@ -617,7 +618,7 @@ unsigned char *  codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sa
     void ** raw = (void **)&code[0];
     memcpy(raw, (char*) privateSnippetExecutor, 16);
     raw[2] = (void*) nOffsetAndIndex;
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "in: offset/index is %x %x %d, %lx\n",
     nFunctionIndex, nVtableOffset, !simpleRetType, raw[2]);
 #endif
@@ -670,7 +671,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 {
      (*slots) -= functionCount;
      Slot * s = *slots;
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "in addLocalFunctions functionOffset is %x\n",functionOffset);
     fprintf(stderr, "in addLocalFunctions vtableOffset is %x\n",vtableOffset);
 #endif
@@ -719,4 +720,4 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
     return code;
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
index 7012ac42eb28..ea4188bac998 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -101,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -285,3 +286,4 @@ void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * p
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
index 2dd11d815c69..77763d7c8b54 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
 
 # In case someone enabled the non-standard -fomit-frame-pointer which does not
 # work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
 
 NOOPTFILES= \
     $(SLO)$/uno2cpp.obj \
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
index 45c3cdd5fcc4..38ed48ee06c8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ namespace ppc64
 {
     enum ppclimits { MAX_GPR_REGS = 8, MAX_SSE_REGS = 13 };
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index d8486836b1a1..66db74288cb3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,7 +100,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
     if ( nGPR > ppc64::MAX_GPR_REGS )
         nGPR = ppc64::MAX_GPR_REGS;
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         // Let's figure out what is really going on here
         {
                 fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR );
@@ -266,13 +267,13 @@ static void cpp_call(
 
     if (pReturnTypeDescr)
     {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "return type is %d\n", pReturnTypeDescr->eTypeClass);
 #endif
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
         {
             pCppReturn = pUnoReturn; // direct way for simple types
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "simple return\n");
 #endif
         }
@@ -281,7 +282,7 @@ static void cpp_call(
             // complex return via ptr
             pCppReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                    ? alloca( pReturnTypeDescr->nSize ) : pUnoReturn);
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "pCppReturn/pUnoReturn is %lx/%lx", pCppReturn, pUnoReturn);
 #endif
             INSERT_INT64( &pCppReturn, nGPR, pGPR, pStack, bOverFlow );
@@ -289,7 +290,7 @@ static void cpp_call(
     }
     // push "this" pointer
         void * pAdjustedThisPtr = reinterpret_cast< void ** >( pThis->getCppI() ) + aVtableSlot.offset;
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "this pointer is %p\n", pAdjustedThisPtr);
 #endif
     INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack, bOverFlow );
@@ -303,7 +304,7 @@ static void cpp_call(
 
     sal_Int32 nTempIndizes   = 0;
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "n params is %d\n", nParams);
 #endif
 
@@ -313,7 +314,7 @@ static void cpp_call(
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "param %d is %d %d %d\n", nPos, rParam.bOut, bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ),
             pParamTypeDescr->eTypeClass);
 #endif
@@ -327,7 +328,7 @@ static void cpp_call(
                         {
                         case typelib_TypeClass_HYPER:
                         case typelib_TypeClass_UNSIGNED_HYPER:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "hyper is %lx\n", pCppArgs[nPos]);
 #endif
                                 INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
@@ -335,7 +336,7 @@ static void cpp_call(
                         case typelib_TypeClass_LONG:
                         case typelib_TypeClass_UNSIGNED_LONG:
                         case typelib_TypeClass_ENUM:
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "long is %x\n", pCppArgs[nPos]);
 #endif
                                 INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
@@ -363,12 +364,12 @@ static void cpp_call(
         }
         else // ptr to complex value | ref
         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "complex type again %d\n", rParam.bIn);
 #endif
                         if (! rParam.bIn) // is pure out
                         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "complex size is %d\n", pParamTypeDescr->nSize );
 #endif
                                 // cpp out is constructed mem, uno out is not!
@@ -382,7 +383,7 @@ static void cpp_call(
                         // is in/inout
                         else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ))
                         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "this one\n");
 #endif
                                 uno_copyAndConvertData(
@@ -395,7 +396,7 @@ static void cpp_call(
                         }
                         else // direct way
                         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "that one, passing %lx through\n", pUnoArgs[nPos]);
 #endif
                                 pCppArgs[nPos] = pUnoArgs[nPos];
@@ -414,7 +415,7 @@ static void cpp_call(
                         pStackStart, ( pStack - pStackStart ),
                         pGPR, nGPR,
                         pFPR, nFPR );
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -479,9 +480,8 @@ void unoInterfaceProxyDispatch(
     void * pReturn, void * pArgs[], uno_Any ** ppException )
 {
     // is my surrogate
-        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
-            = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
-    typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
+    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
+        = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
 
     switch (pMemberDescr->eTypeClass)
     {
@@ -598,3 +598,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index 6807884281c4..a29b7c38dba7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -255,7 +256,7 @@ static typelib_TypeClass cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -274,7 +275,7 @@ static typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -359,7 +360,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pCppI );
     }
 
@@ -453,7 +454,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pCppI );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
@@ -470,7 +471,7 @@ static typelib_TypeClass cpp_mediate(
  */
 static void privateSnippetExecutor( sal_uInt32 nOffsetAndIndex, void** gpregptr, void** fpregptr, void** ovrflw)
 {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "privateSnippetExecutor\n");
 #endif
 
@@ -643,7 +644,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 {
      (*slots) -= functionCount;
      Slot * s = *slots;
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "in addLocalFunctions functionOffset is %x\n",functionOffset);
     fprintf(stderr, "in addLocalFunctions vtableOffset is %x\n",vtableOffset);
 #endif
@@ -692,4 +693,4 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
     return code;
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
index 3e666a11cdd0..ea4188bac998 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -101,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -284,4 +285,5 @@ void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * p
 }
 
 }
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
index d71136adaff4..bda85f359210 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
 
 # In case someone enabled the non-standard -fomit-frame-pointer which does not
 # work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
 
 CFLAGSNOOPT=-O0
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx
index 00aa5670eef9..4ec09c29ff0a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,4 +90,5 @@ void raiseException(
 void fillUnoException(
     __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
 }
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
index 4b0b361cf5b2..ddaf1f368413 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -443,7 +444,7 @@ static void cpp_call(
             pAdjustedThisPtr, aVtableSlot.index,
             pCppReturn, pReturnTypeDescr->eTypeClass, pParamType,
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -507,7 +508,7 @@ void unoInterfaceProxyDispatch(
     uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
     void * pReturn, void * pArgs[], uno_Any ** ppException )
 {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "unoInterfaceProxyDispatch\n");
 #endif
 
@@ -632,4 +633,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
index 8d76d3ea37df..fa3bd5fb687a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,7 +53,7 @@ static typelib_TypeClass cpp2uno_call(
         void ** gpreg, void ** fpreg, void ** ovrflw,
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "as far as cpp2uno_call\n");
 #endif
     int ng = 0; //number of gpr registers used
@@ -108,13 +109,13 @@ static typelib_TypeClass cpp2uno_call(
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "arg %d of %d\n", nPos, nParams);
 #endif
 
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) // value
         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "simple\n");
 #endif
 
@@ -202,7 +203,7 @@ static typelib_TypeClass cpp2uno_call(
         }
         else // ptr to complex value | ref
         {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "complex, ng is %d\n", ng);
 #endif
 
@@ -246,7 +247,7 @@ static typelib_TypeClass cpp2uno_call(
         }
     }
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "end of params\n");
 #endif
 
@@ -257,7 +258,7 @@ static typelib_TypeClass cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -276,7 +277,7 @@ static typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -332,11 +333,11 @@ static typelib_TypeClass cpp_mediate(
     sal_Int32 nVtableOffset = (nOffsetAndIndex >> 32);
     sal_Int32 nFunctionIndex = (nOffsetAndIndex & 0xFFFFFFFF);
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "nVTableOffset, nFunctionIndex are %x %x\n", nVtableOffset, nFunctionIndex);
 #endif
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         // Let's figure out what is really going on here
         {
             fprintf( stderr, "= cpp_mediate () =\nGPR's (%d): ", 5 );
@@ -380,7 +381,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pCppI );
     }
 
@@ -474,7 +475,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pCppI );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
@@ -505,14 +506,14 @@ long privateSnippetExecutor(long r2, long r3, long r4, long r5, long r6, long fi
     register double f6  asm("f6");  fpreg[3] = f6;
 
     volatile long nRegReturn[1];
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "before mediate with %lx\n",nOffsetAndIndex);
     fprintf(stderr, "doubles are %f %f %f %f\n", fpreg[0], fpreg[1], fpreg[2], fpreg[3]);
 #endif
     typelib_TypeClass aType =
         cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, (void**)sp,
             (sal_Int64*)nRegReturn );
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "after mediate ret is %lx %ld\n", nRegReturn[0], nRegReturn[0]);
 #endif
 
@@ -605,7 +606,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 {
     (*slots) -= functionCount;
     Slot * s = *slots;
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "in addLocalFunctions functionOffset is %x\n",functionOffset);
     fprintf(stderr, "in addLocalFunctions vtableOffset is %x\n",vtableOffset);
 #endif
@@ -654,4 +655,4 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
     return code;
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
index 3e666a11cdd0..ea4188bac998 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -101,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -284,4 +285,5 @@ void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * p
 }
 
 }
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
index c14cb152faa8..9539dd6edf9b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
 
 # In case someone enabled the non-standard -fomit-frame-pointer which does not
 # work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
 
 CFLAGSNOOPT=-O0
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx
index 182730b9f162..69176377606b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,4 +96,4 @@ namespace s390x
     enum s390xlimits { MAX_GPR_REGS = 5, MAX_SSE_REGS = 4 };
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
index dbeafce10fe8..379d086ce85a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,7 +50,7 @@ using namespace ::com::sun::star::uno;
 
 void MapReturn(long r2, double f0, typelib_TypeClass eTypeClass, sal_uInt64* pRegisterReturn)
 {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr,"Mapping Return with %lx %ld %f\n", r2, r2, f0);
 #endif
     switch (eTypeClass)
@@ -81,7 +82,7 @@ void MapReturn(long r2, double f0, typelib_TypeClass eTypeClass, sal_uInt64* pRe
     default:
             break;
     }
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "end of MapReturn with %x\n", pRegisterReturn ? *pRegisterReturn : 0);
 #endif
 }
@@ -142,7 +143,7 @@ void callVirtualMethod(
     if ( nGPR > s390x::MAX_GPR_REGS )
         nGPR = s390x::MAX_GPR_REGS;
 
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
         // Let's figure out what is really going on here
         {
             fprintf( stderr, "= nStack is %d\n", nStack );
@@ -346,7 +347,7 @@ static void cpp_call(
             pStackStart, (pStack - pStackStart),
             pGPR, nGPR,
             pFPR, nFPR );
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -410,7 +411,7 @@ void unoInterfaceProxyDispatch(
     uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
     void * pReturn, void * pArgs[], uno_Any ** ppException )
 {
-#ifdef CMC_DEBUG
+#if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "unoInterfaceProxyDispatch\n");
 #endif
 
@@ -534,4 +535,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index 85168a422d80..54833796f337 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -163,7 +164,7 @@ static typelib_TypeClass cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)(pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -182,7 +183,7 @@ static typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -256,7 +257,7 @@ static typelib_TypeClass cpp_mediate(
                  "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
-        throw RuntimeException( rtl::OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
+        throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), (XInterface *)pCppI );
     }
 
     // determine called method
@@ -351,7 +352,7 @@ static typelib_TypeClass cpp_mediate(
     }
     default:
     {
-        throw RuntimeException(rtl::OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
+        throw RuntimeException(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), (XInterface *)pCppI );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
     }
@@ -573,3 +574,5 @@ void bridges::cpp_uno::shared::VtableFactory::flushCode(
         doFlushCode(adr - off, (n + off + 7) >> 3);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index 3bdc3590cd4d..f95848008920 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -100,7 +101,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -227,7 +228,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         OUStringToOString(
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
     void * pCppExc;
     type_info * rtti;
@@ -292,7 +293,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if defined _DEBUG
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
         return;
     }
@@ -301,7 +302,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if defined BRIDGES_DEBUG
     OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
+    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
 #endif
     typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
     if (0 == pExcTypeDescr)
@@ -313,7 +314,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if defined _DEBUG
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
     }
     else
@@ -326,3 +327,4 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
index 71e799f76c12..3940038247c3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
@@ -43,6 +43,10 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS += -DLEAK_STATIC_DATA
 .ENDIF
 
+# In case someone enabled the non-standard -fomit-frame-pointer which does not
+# # work with the .cxx sources in this directory:
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
+
 CFLAGSNOOPT=-O0
 
 NOOPTFILES = \
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx
index b894a99832dd..3526f19082cd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,3 +96,5 @@ inline char* adjustPointer( char* pIn, typelib_TypeDescription* pType )
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
index 0d85483760df..f99e60d0d6fd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,9 +39,12 @@
 
 #include "share.hxx"
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+
 namespace
 {
 //==================================================================================================
@@ -412,7 +416,7 @@ static void cpp_call(
             pReturnTypeDescr->eTypeClass,
             (sal_Int32 *)pCppStackStart,
              nStackLongs);
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -598,3 +602,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
index 0483e86b7280..938cbf5ded06 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,16 +67,6 @@
 
 using namespace x86_64;
 
-typedef struct
-{
-    /* Registers for argument passing.  */
-    long gpr[MAX_GPR_REGS];
-    __int128_t sse[MAX_SSE_REGS];
-
-    /* Stack space for arguments.  */
-    char argspace[0];
-} stackLayout;
-
 /* Register class used for passing given 64bit part of the argument.
    These represent classes as documented by the PS ABI, with the exception
    of SSESF, SSEDF classes, that are basically SSE class, just gcc will
@@ -346,451 +337,4 @@ void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_
         }
 }
 
-#if 0
-
-/* Functions to load floats and double to an SSE register placeholder.  */
-extern void float2sse (float, __int128_t *);
-extern void double2sse (double, __int128_t *);
-extern void floatfloat2sse (void *, __int128_t *);
-
-/* Functions to put the floats and doubles back.  */
-extern float sse2float (__int128_t *);
-extern double sse2double (__int128_t *);
-extern void sse2floatfloat(__int128_t *, void *);
-
-/*@-exportheader@*/
-void
-ffi_prep_args (stackLayout *stack, extended_cif *ecif)
-/*@=exportheader@*/
-{
-  int gprcount, ssecount, i, g, s;
-  void **p_argv;
-  void *argp = &stack->argspace;
-  ffi_type **p_arg;
-
-  /* First check if the return value should be passed in memory. If so,
-     pass the pointer as the first argument.  */
-  gprcount = ssecount = 0;
-  if (ecif->cif->rtype->type != FFI_TYPE_VOID
-      && examine_argument (ecif->cif->rtype, 1, &g, &s) == 0)
-    (void *)stack->gpr[gprcount++] = ecif->rvalue;
-
-  for (i=ecif->cif->nargs, p_arg=ecif->cif->arg_types, p_argv = ecif->avalue;
-       i!=0; i--, p_arg++, p_argv++)
-    {
-      int in_register = 0;
-
-      switch ((*p_arg)->type)
-    {
-    case FFI_TYPE_SINT8:
-    case FFI_TYPE_SINT16:
-    case FFI_TYPE_SINT32:
-    case FFI_TYPE_SINT64:
-    case FFI_TYPE_UINT8:
-    case FFI_TYPE_UINT16:
-    case FFI_TYPE_UINT32:
-    case FFI_TYPE_UINT64:
-    case FFI_TYPE_POINTER:
-      if (gprcount < MAX_GPR_REGS)
-        {
-          stack->gpr[gprcount] = 0;
-          stack->gpr[gprcount++] = *(long long *)(*p_argv);
-          in_register = 1;
-        }
-      break;
-
-    case FFI_TYPE_FLOAT:
-      if (ssecount < MAX_SSE_REGS)
-        {
-          float2sse (*(float *)(*p_argv), &stack->sse[ssecount++]);
-          in_register = 1;
-        }
-      break;
-
-    case FFI_TYPE_DOUBLE:
-      if (ssecount < MAX_SSE_REGS)
-        {
-          double2sse (*(double *)(*p_argv), &stack->sse[ssecount++]);
-          in_register = 1;
-        }
-      break;
-    }
-
-      if (in_register)
-    continue;
-
-      /* Either all places in registers where filled, or this is a
-     type that potentially goes into a memory slot.  */
-      if (examine_argument (*p_arg, 0, &g, &s) == 0
-      || gprcount + g > MAX_GPR_REGS || ssecount + s > MAX_SSE_REGS)
-    {
-      /* Pass this argument in memory.  */
-      argp = (void *)ALIGN(argp, (*p_arg)->alignment);
-      memcpy (argp, *p_argv, (*p_arg)->size);
-      argp += (*p_arg)->size;
-    }
-      else
-    {
-      /* All easy cases are eliminated. Now fire the big guns.  */
-
-      enum x86_64_reg_class classes[MAX_CLASSES];
-      int j, num;
-      void *a;
-
-      num = classify_argument (*p_arg, classes, 0);
-      for (j=0, a=*p_argv; j<num; j++, a+=8)
-        {
-          switch (classes[j])
-        {
-        case X86_64_INTEGER_CLASS:
-        case X86_64_INTEGERSI_CLASS:
-          stack->gpr[gprcount++] = *(long long *)a;
-          break;
-        case X86_64_SSE_CLASS:
-          floatfloat2sse (a, &stack->sse[ssecount++]);
-          break;
-        case X86_64_SSESF_CLASS:
-          float2sse (*(float *)a, &stack->sse[ssecount++]);
-          break;
-        case X86_64_SSEDF_CLASS:
-          double2sse (*(double *)a, &stack->sse[ssecount++]);
-          break;
-        default:
-          abort();
-        }
-        }
-    }
-    }
-}
-
-/* Perform machine dependent cif processing.  */
-ffi_status
-ffi_prep_cif_machdep (ffi_cif *cif)
-{
-  int gprcount, ssecount, i, g, s;
-
-  gprcount = ssecount = 0;
-
-  /* Reset the byte count. We handle this size estimation here.  */
-  cif->bytes = 0;
-
-  /* If the return value should be passed in memory, pass the pointer
-     as the first argument. The actual memory isn't allocated here.  */
-  if (cif->rtype->type != FFI_TYPE_VOID
-      && examine_argument (cif->rtype, 1, &g, &s) == 0)
-    gprcount = 1;
-
-  /* Go over all arguments and determine the way they should be passed.
-     If it's in a register and there is space for it, let that be so. If
-     not, add it's size to the stack byte count.  */
-  for (i=0; i<cif->nargs; i++)
-    {
-      if (examine_argument (cif->arg_types[i], 0, &g, &s) == 0
-      || gprcount + g > MAX_GPR_REGS || ssecount + s > MAX_SSE_REGS)
-    {
-      /* This is passed in memory. First align to the basic type.  */
-      cif->bytes = ALIGN(cif->bytes, cif->arg_types[i]->alignment);
-
-      /* Stack arguments are *always* at least 8 byte aligned.  */
-      cif->bytes = ALIGN(cif->bytes, 8);
-
-      /* Now add the size of this argument.  */
-      cif->bytes += cif->arg_types[i]->size;
-    }
-      else
-    {
-      gprcount += g;
-      ssecount += s;
-    }
-    }
-
-  /* Set the flag for the closures return.  */
-    switch (cif->rtype->type)
-    {
-    case FFI_TYPE_VOID:
-    case FFI_TYPE_STRUCT:
-    case FFI_TYPE_SINT64:
-    case FFI_TYPE_FLOAT:
-    case FFI_TYPE_DOUBLE:
-    case FFI_TYPE_LONGDOUBLE:
-      cif->flags = (unsigned) cif->rtype->type;
-      break;
-
-    case FFI_TYPE_UINT64:
-      cif->flags = FFI_TYPE_SINT64;
-      break;
-
-    default:
-      cif->flags = FFI_TYPE_INT;
-      break;
-    }
-
-  return FFI_OK;
-}
-
-typedef struct
-{
-  long gpr[2];
-  __int128_t sse[2];
-  long double st0;
-} return_value;
-
-//#endif
-
-void
-ffi_fill_return_value (return_value *rv, extended_cif *ecif)
-{
-    enum x86_64_reg_class classes[MAX_CLASSES];
-    int i = 0, num;
-    long *gpr = rv->gpr;
-    __int128_t *sse = rv->sse;
-    signed char sc;
-    signed short ss;
-
-    /* This is needed because of the way x86-64 handles signed short
-       integers.  */
-    switch (ecif->cif->rtype->type)
-    {
-        case FFI_TYPE_SINT8:
-            sc = *(signed char *)gpr;
-            *(long long *)ecif->rvalue = (long long)sc;
-            return;
-        case FFI_TYPE_SINT16:
-            ss = *(signed short *)gpr;
-            *(long long *)ecif->rvalue = (long long)ss;
-            return;
-        default:
-            /* Just continue.  */
-            ;
-    }
-
-    num = classify_argument (ecif->cif->rtype, classes, 0);
-
-    if (num == 0)
-        /* Return in memory.  */
-        ecif->rvalue = (void *) rv->gpr[0];
-    else if (num == 2 && classes[0] == X86_64_X87_CLASS &&
-            classes[1] == X86_64_X87UP_CLASS)
-        /* This is a long double (this is easiest to handle this way instead
-           of an eightbyte at a time as in the loop below.  */
-        *((long double *)ecif->rvalue) = rv->st0;
-    else
-    {
-        void *a;
-
-        for (i=0, a=ecif->rvalue; i<num; i++, a+=8)
-        {
-            switch (classes[i])
-            {
-                case X86_64_INTEGER_CLASS:
-                case X86_64_INTEGERSI_CLASS:
-                    *(long long *)a = *gpr;
-                    gpr++;
-                    break;
-                case X86_64_SSE_CLASS:
-                    sse2floatfloat (sse++, a);
-                    break;
-                case X86_64_SSESF_CLASS:
-                    *(float *)a = sse2float (sse++);
-                    break;
-                case X86_64_SSEDF_CLASS:
-                    *(double *)a = sse2double (sse++);
-                    break;
-                default:
-                    abort();
-            }
-        }
-    }
-}
-
-//#if 0
-
-/*@-declundef@*/
-/*@-exportheader@*/
-extern void ffi_call_UNIX64(void (*)(stackLayout *, extended_cif *),
-                void (*) (return_value *, extended_cif *),
-                /*@out@*/ extended_cif *,
-                unsigned, /*@out@*/ unsigned *, void (*fn)());
-/*@=declundef@*/
-/*@=exportheader@*/
-
-void ffi_call(/*@dependent@*/ ffi_cif *cif,
-          void (*fn)(),
-          /*@out@*/ void *rvalue,
-          /*@dependent@*/ void **avalue)
-{
-  extended_cif ecif;
-  int dummy;
-
-  ecif.cif = cif;
-  ecif.avalue = avalue;
-
-  /* If the return value is a struct and we don't have a return */
-  /* value address then we need to make one             */
-
-  if ((rvalue == NULL) &&
-      (examine_argument (cif->rtype, 1, &dummy, &dummy) == 0))
-    {
-      /*@-sysunrecog@*/
-      ecif.rvalue = alloca(cif->rtype->size);
-      /*@=sysunrecog@*/
-    }
-  else
-    ecif.rvalue = rvalue;
-
-  /* Stack must always be 16byte aligned. Make it so.  */
-  cif->bytes = ALIGN(cif->bytes, 16);
-
-  switch (cif->abi)
-    {
-    case FFI_SYSV:
-      /* Calling 32bit code from 64bit is not possible  */
-      FFI_ASSERT(0);
-      break;
-
-    case FFI_UNIX64:
-      /*@-usedef@*/
-      ffi_call_UNIX64 (ffi_prep_args, ffi_fill_return_value, &ecif,
-               cif->bytes, ecif.rvalue, fn);
-      /*@=usedef@*/
-      break;
-
-    default:
-      FFI_ASSERT(0);
-      break;
-    }
-}
-
-extern void ffi_closure_UNIX64(void);
-
-ffi_status
-ffi_prep_closure (ffi_closure* closure,
-          ffi_cif* cif,
-          void (*fun)(ffi_cif*, void*, void**, void*),
-          void *user_data)
-{
-  volatile unsigned short *tramp;
-
-  /* FFI_ASSERT (cif->abi == FFI_OSF);  */
-
-  tramp = (volatile unsigned short *) &closure->tramp[0];
-  tramp[0] = 0xbb49;        /* mov <code>, %r11 */
-  tramp[5] = 0xba49;        /* mov <data>, %r10 */
-  tramp[10] = 0xff49;       /* jmp *%r11    */
-  tramp[11] = 0x00e3;
-  *(void * volatile *) &tramp[1] = ffi_closure_UNIX64;
-  *(void * volatile *) &tramp[6] = closure;
-
-  closure->cif = cif;
-  closure->fun = fun;
-  closure->user_data = user_data;
-
-  return FFI_OK;
-}
-
-int
-ffi_closure_UNIX64_inner(ffi_closure *closure, va_list l, void *rp)
-{
-  ffi_cif *cif;
-  void **avalue;
-  ffi_type **arg_types;
-  long i, avn, argn;
-
-  cif = closure->cif;
-  avalue = alloca(cif->nargs * sizeof(void *));
-
-  argn = 0;
-
-  i = 0;
-  avn = cif->nargs;
-  arg_types = cif->arg_types;
-
-  /* Grab the addresses of the arguments from the stack frame.  */
-  while (i < avn)
-    {
-      switch (arg_types[i]->type)
-    {
-    case FFI_TYPE_SINT8:
-    case FFI_TYPE_UINT8:
-    case FFI_TYPE_SINT16:
-    case FFI_TYPE_UINT16:
-    case FFI_TYPE_SINT32:
-    case FFI_TYPE_UINT32:
-    case FFI_TYPE_SINT64:
-    case FFI_TYPE_UINT64:
-    case FFI_TYPE_POINTER:
-      {
-        if (l->gp_offset > 48-8)
-          {
-        avalue[i] = l->overflow_arg_area;
-        l->overflow_arg_area = (char *)l->overflow_arg_area + 8;
-          }
-        else
-          {
-        avalue[i] = (char *)l->reg_save_area + l->gp_offset;
-        l->gp_offset += 8;
-          }
-      }
-      break;
-
-    case FFI_TYPE_STRUCT:
-      /* FIXME  */
-      FFI_ASSERT(0);
-      break;
-
-    case FFI_TYPE_DOUBLE:
-      {
-        if (l->fp_offset > 176-16)
-          {
-        avalue[i] = l->overflow_arg_area;
-        l->overflow_arg_area = (char *)l->overflow_arg_area + 8;
-          }
-        else
-          {
-        avalue[i] = (char *)l->reg_save_area + l->fp_offset;
-        l->fp_offset += 16;
-          }
-      }
-#if DEBUG_FFI
-      fprintf (stderr, "double arg %d = %g\n", i, *(double *)avalue[i]);
-#endif
-      break;
-
-    case FFI_TYPE_FLOAT:
-      {
-        if (l->fp_offset > 176-16)
-          {
-        avalue[i] = l->overflow_arg_area;
-        l->overflow_arg_area = (char *)l->overflow_arg_area + 8;
-          }
-        else
-          {
-        avalue[i] = (char *)l->reg_save_area + l->fp_offset;
-        l->fp_offset += 16;
-          }
-      }
-#if DEBUG_FFI
-      fprintf (stderr, "float arg %d = %g\n", i, *(float *)avalue[i]);
-#endif
-      break;
-
-    default:
-      FFI_ASSERT(0);
-    }
-
-      argn += ALIGN(arg_types[i]->size, SIZEOF_ARG) / SIZEOF_ARG;
-      i++;
-    }
-
-  /* Invoke the closure.  */
-  (closure->fun) (cif, rp, avalue, closure->user_data);
-
-  /* FIXME: Structs not supported.  */
-  FFI_ASSERT(cif->rtype->type != FFI_TYPE_STRUCT);
-
-  /* Tell ffi_closure_UNIX64 how to perform return type promotions.  */
-
-  return cif->rtype->type;
-}
-
-#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
index adb8acbb4771..c9f71f18078b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,5 @@ void fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64*
 } // namespace x86_64
 
 #endif // _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index d279173f30fb..c9b51856378d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/alloc.h>
 #include <osl/mutex.hxx>
@@ -198,7 +199,7 @@ static typelib_TypeClass cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if ( pUnoExc )
     {
         // destruct temporary in/inout params
@@ -217,7 +218,7 @@ static typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -291,7 +292,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
     if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex )
     {
-        throw RuntimeException( OUString::createFromAscii("illegal vtable index!"),
+        throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!")),
                                 reinterpret_cast<XInterface *>( pCppI ) );
     }
 
@@ -388,7 +389,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
         }
         default:
         {
-            throw RuntimeException( OUString::createFromAscii("no member description found!"),
+            throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("no member description found!")),
                                     reinterpret_cast<XInterface *>( pCppI ) );
             // is here for dummy
             eRet = typelib_TypeClass_VOID;
@@ -518,3 +519,5 @@ void bridges::cpp_uno::shared::VtableFactory::flushCode(
     unsigned char const *, unsigned char const * )
 {
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index 1b2c4b000de5..e841bc0c37e5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -102,7 +103,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -118,7 +119,11 @@ public:
 };
 //__________________________________________________________________________________________________
 RTTI::RTTI() SAL_THROW( () )
+#if defined(FREEBSD) && __FreeBSD_version < 702104
+    : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else
     : m_hApp( dlopen( 0, RTLD_LAZY ) )
+#endif
 {
 }
 //__________________________________________________________________________________________________
@@ -153,7 +158,11 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
         buf.append( 'E' );
 
         OString symName( buf.makeStringAndClear() );
+#if defined(FREEBSD) && __FreeBSD_version < 702104 /* #i22253# */
+        rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else
         rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
+#endif
 
         if (rtti)
         {
@@ -229,7 +238,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         OUStringToOString(
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
     void * pCppExc;
     type_info * rtti;
@@ -294,7 +303,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
         return;
     }
@@ -303,7 +312,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if OSL_DEBUG_LEVEL > 1
     OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
+    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
 #endif
     typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
     if (0 == pExcTypeDescr)
@@ -315,7 +324,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
     }
     else
@@ -328,3 +337,4 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
index 8e6200704969..dd3543233827 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
@@ -38,7 +38,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXXgcc3"
+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXXgcc3" || \
+    "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOPENBSDXgcc3" || \
+    "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDXgcc3" || \
+    "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDXgcc3"  || \
+    "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCDRAGONFLYXgcc3" \
 
 .IF "$(cppu_no_leak)" == ""
 CFLAGS += -DLEAK_STATIC_DATA
@@ -46,7 +50,7 @@ CFLAGS += -DLEAK_STATIC_DATA
 
 # In case someone enabled the non-standard -fomit-frame-pointer which does not
 # work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
 
 SLOFILES= \
     $(SLO)$/abi.obj			\
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
index 930094738b20..da2367ad172b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,3 +89,5 @@ void raiseException(
 void fillUnoException(
     __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 5bcdf8c2497a..c830f877ccf2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -410,7 +411,6 @@ static void cpp_call(
                 Reference< XInterface >());
         }
 
-        // NO exception occured...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -604,3 +604,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
index 0962aa737c70..2ceb0bba529d 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -166,7 +167,7 @@ void cpp2uno_call(
     (*pThis->getUnoI()->pDispatcher)(
         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -185,7 +186,7 @@ void cpp2uno_call(
             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
             // has to destruct the any
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -262,7 +263,7 @@ extern "C" void cpp_vtable_call(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -353,7 +354,7 @@ extern "C" void cpp_vtable_call(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
     }
     }
@@ -517,3 +518,5 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 void bridges::cpp_uno::shared::VtableFactory::flushCode(
     unsigned char const *, unsigned char const *)
 {}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
index 64591b703dc6..a14bc8b9aec0 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,7 @@
 #include <stdio.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -101,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -228,7 +229,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         OUStringToOString(
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
     void * pCppExc;
     type_info * rtti;
@@ -293,7 +294,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
         return;
     }
@@ -302,7 +303,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if OSL_DEBUG_LEVEL > 1
     OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
+    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
 #endif
     typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
     if (0 == pExcTypeDescr)
@@ -314,7 +315,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
     }
     else
@@ -327,3 +328,4 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx b/bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx
index 6d64133e9e62..8b105c0880b3 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ void raiseException(
 void fillUnoException(
     __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
index c6870af48258..9f0000587923 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,8 +31,6 @@
 
 #include <stdio.h>
 
-// #include <malloc.h>
-
 #include <com/sun/star/uno/genfunc.hxx>
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include <uno/data.h>
@@ -283,7 +282,7 @@ static void cpp_call(
             pAdjustedThisPtr, aVtableSlot.index,
             pCppReturn, pReturnTypeDescr, bSimpleReturn,
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -493,3 +492,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
index 5439be405b0c..232144c5e80d 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -242,7 +243,7 @@ static typelib_TypeClass cpp2uno_call(
     (*pThis->getUnoI()->pDispatcher)(
          pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -263,7 +264,7 @@ static typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -343,7 +344,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -435,7 +436,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
@@ -728,3 +729,4 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
     return code;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
index cd46dea6144d..274f99987cb8 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,7 @@
 #include <stdio.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -100,7 +101,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -284,3 +285,4 @@ void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * p
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx
index 6e148b489508..4ec09c29ff0a 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ void raiseException(
 void fillUnoException(
     __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
index c2547588954a..fdc30b3756b8 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -449,7 +450,7 @@ static void cpp_call(
             pAdjustedThisPtr, aVtableSlot.index,
             pCppReturn, pReturnTypeDescr->eTypeClass, pParamType,
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -632,3 +633,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_netbsd_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_netbsd_intel/cpp2uno.cxx
deleted file mode 100644
index 79cda920e7db..000000000000
--- a/bridges/source/cpp_uno/gcc3_netbsd_intel/cpp2uno.cxx
+++ /dev/null
@@ -1,563 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
-
-#include <hash_map>
-
-#include <sal/alloca.h>
-#include <rtl/alloc.h>
-#include <osl/mutex.hxx>
-
-#include <uno/data.h>
-#include <typelib/typedescription.hxx>
-
-#include <bridges/cpp_uno/bridge.hxx>
-#include <bridges/cpp_uno/type_misc.hxx>
-
-#include "share.hxx"
-
-
-using namespace ::osl;
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-
-namespace CPPU_CURRENT_NAMESPACE
-{
-
-//==================================================================================================
-rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-
-//==================================================================================================
-static typelib_TypeClass cpp2uno_call(
-    cppu_cppInterfaceProxy * pThis,
-    const typelib_TypeDescription * pMemberTypeDescr,
-    typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void ** pCallStack,
-    sal_Int64 * pRegisterReturn /* space for register return */ )
-{
-    // pCallStack: ret, [return ptr], this, params
-    char * pCppStack = (char *)(pCallStack +1);
-
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    if (pReturnTypeRef)
-        TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
-    void * pUnoReturn = 0;
-    void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
-    if (pReturnTypeDescr)
-    {
-        if (cppu_isSimpleType( pReturnTypeDescr ))
-        {
-            pUnoReturn = pRegisterReturn; // direct way for simple types
-        }
-        else // complex return via ptr (pCppReturn)
-        {
-            pCppReturn = *(void **)pCppStack;
-            pCppStack += sizeof(void *);
-
-            pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
-                          ? alloca( pReturnTypeDescr->nSize )
-                          : pCppReturn); // direct way
-        }
-    }
-    // pop this
-    pCppStack += sizeof( void* );
-
-    // stack space
-    OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-    // parameters
-    void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-    void ** pCppArgs = pUnoArgs + nParams;
-    // indizes of values this have to be converted (interface conversion cpp<=>uno)
-    sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
-    sal_Int32 nTempIndizes   = 0;
-
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-        if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value
-        {
-            pCppArgs[nPos] = pCppStack;
-            pUnoArgs[nPos] = pCppStack;
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-            case typelib_TypeClass_DOUBLE:
-                pCppStack += sizeof(sal_Int32); // extra long
-            }
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // ptr to complex value | ref
-        {
-            pCppArgs[nPos] = *(void **)pCppStack;
-
-            if (! rParam.bIn) // is pure out
-            {
-                // uno out is unconstructed mem!
-                pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-                pTempIndizes[nTempIndizes] = nPos;
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            // is in/inout
-            else if (cppu_relatesToInterface( pParamTypeDescr ))
-            {
-                uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                                        *(void **)pCppStack, pParamTypeDescr,
-                                        &pThis->pBridge->aCpp2Uno );
-                pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                pUnoArgs[nPos] = *(void **)pCppStack;
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-        }
-        pCppStack += sizeof(sal_Int32); // standard parameter length
-    }
-
-    // ExceptionHolder
-    uno_Any aUnoExc; // Any will be constructed by callee
-    uno_Any * pUnoExc = &aUnoExc;
-
-    // invoke uno dispatch call
-    (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
-    // in case an exception occured...
-    if (pUnoExc)
-    {
-        // destruct temporary in/inout params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
-            if (pParams[nIndex].bIn) // is in/inout => was constructed
-                uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-        }
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
-        raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
-        // is here for dummy
-        return typelib_TypeClass_VOID;
-    }
-    else // else no exception occured...
-    {
-        // temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
-            if (pParams[nIndex].bOut) // inout/out
-            {
-                // convert and assign
-                uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-                uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-                                        &pThis->pBridge->aUno2Cpp );
-            }
-            // destroy temp uno param
-            uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return
-        if (pCppReturn) // has complex return
-        {
-            if (pUnoReturn != pCppReturn) // needs reconversion
-            {
-                uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-                                        &pThis->pBridge->aUno2Cpp );
-                // destroy temp uno return
-                uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-            }
-            // complex return ptr is set to eax
-            *(void **)pRegisterReturn = pCppReturn;
-        }
-        if (pReturnTypeDescr)
-        {
-            typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-            return eRet;
-        }
-        else
-            return typelib_TypeClass_VOID;
-    }
-}
-
-
-//==================================================================================================
-static typelib_TypeClass cpp_mediate(
-    sal_Int32 nVtableCall,
-    void ** pCallStack,
-    sal_Int64 * pRegisterReturn /* space for register return */ )
-{
-    OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-
-    // pCallStack: ret adr, [ret *], this, params
-    // _this_ ptr is patched cppu_XInterfaceProxy object
-    cppu_cppInterfaceProxy * pCppI = NULL;
-    if( nVtableCall & 0x80000000 )
-    {
-        nVtableCall &= 0x7fffffff;
-        pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2);
-    }
-    else
-    {
-        pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1);
-    }
-
-    typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;
-
-    OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-    if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-    {
-        throw RuntimeException(
-            OUString::createFromAscii("illegal vtable index!"),
-            (XInterface *)pCppI );
-    }
-
-    // determine called method
-    OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-    sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
-    OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-
-    TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
-    typelib_TypeClass eRet;
-    switch (aMemberDescr.get()->eTypeClass)
-    {
-    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-    {
-        if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall)
-        {
-            // is GET method
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-                0, 0, // no params
-                pCallStack, pRegisterReturn );
-        }
-        else
-        {
-            // is SET method
-            typelib_MethodParameter aParam;
-            aParam.pTypeRef =
-                ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                0, // indicates void return
-                1, &aParam,
-                pCallStack, pRegisterReturn );
-        }
-        break;
-    }
-    case typelib_TypeClass_INTERFACE_METHOD:
-    {
-        // is METHOD
-        switch (nVtableCall)
-        {
-        case 1: // acquire()
-            pCppI->acquireProxy(); // non virtual call!
-            eRet = typelib_TypeClass_VOID;
-            break;
-        case 2: // release()
-            pCppI->releaseProxy(); // non virtual call!
-            eRet = typelib_TypeClass_VOID;
-            break;
-        case 0: // queryInterface() opt
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-            if (pTD)
-            {
-                XInterface * pInterface = 0;
-                (*pCppI->pBridge->pCppEnv->getRegisteredInterface)(
-                    pCppI->pBridge->pCppEnv,
-                    (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
-                if (pInterface)
-                {
-                    ::uno_any_construct(
-                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-                        &pInterface, pTD, cpp_acquire );
-                    pInterface->release();
-                    TYPELIB_DANGER_RELEASE( pTD );
-                    *(void **)pRegisterReturn = pCallStack[1];
-                    eRet = typelib_TypeClass_ANY;
-                    break;
-                }
-                TYPELIB_DANGER_RELEASE( pTD );
-            }
-        } // else perform queryInterface()
-        default:
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-                pCallStack, pRegisterReturn );
-        }
-        break;
-    }
-    default:
-    {
-        throw RuntimeException(
-            OUString::createFromAscii("no member description found!"),
-            (XInterface *)pCppI );
-        // is here for dummy
-        eRet = typelib_TypeClass_VOID;
-    }
-    }
-
-    return eRet;
-}
-
-//==================================================================================================
-/**
- * is called on incoming vtable calls
- * (called by asm snippets)
- */
-static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2)));
-
-void cpp_vtable_call( int nTableEntry, void** pCallStack )
-{
-    volatile long nRegReturn[2];
-    typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn );
-
-    switch( aType )
-    {
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-            __asm__( "movl %1, %%edx\n\t"
-                     "movl %0, %%eax\n"
-                     : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-            break;
-        case typelib_TypeClass_FLOAT:
-            __asm__( "flds %0\n\t"
-                     "fstp %%st(0)\n\t"
-                     "flds %0\n"
-                     : : "m"(*(float *)nRegReturn) );
-            break;
-        case typelib_TypeClass_DOUBLE:
-            __asm__( "fldl %0\n\t"
-                     "fstp %%st(0)\n\t"
-                     "fldl %0\n"
-                     : : "m"(*(double *)nRegReturn) );
-            break;
-//      case typelib_TypeClass_UNSIGNED_SHORT:
-//      case typelib_TypeClass_SHORT:
-//          __asm__( "movswl %0, %%eax\n"
-//                   : : "m"(nRegReturn) );
-//      break;
-        default:
-            __asm__( "movl %0, %%eax\n"
-                     : : "m"(nRegReturn[0]) );
-            break;
-    }
-}
-
-
-//==================================================================================================
-class MediateClassData
-{
-    typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map;
-    t_classdata_map m_map;
-    Mutex m_mutex;
-
-public:
-    void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () );
-
-    inline MediateClassData() SAL_THROW( () )
-        {}
-    ~MediateClassData() SAL_THROW( () );
-};
-//__________________________________________________________________________________________________
-MediateClassData::~MediateClassData() SAL_THROW( () )
-{
-    OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." );
-
-    for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos )
-    {
-        ::rtl_freeMemory( iPos->second );
-    }
-}
-//--------------------------------------------------------------------------------------------------
-static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () )
-{
-    if (! simple_ret_type)
-        vtable_pos |= 0x80000000;
-    OSL_ASSERT( sizeof (long) == 4 );
-    // mov $nPos, %eax
-    *code++ = 0xb8;
-    *(long *)code = vtable_pos;
-    code += sizeof (long);
-    // mov %esp, %edx
-    *code++ = 0x89;
-    *code++ = 0xe2;
-    // jmp cpp_vtable_call
-    *code++ = 0xe9;
-    *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long);
-}
-//__________________________________________________________________________________________________
-void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () )
-{
-    void * buffer;
-
-    // avoiding locked counts
-    OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName;
-    {
-    MutexGuard aGuard( m_mutex );
-    t_classdata_map::const_iterator iFind( m_map.find( unoName ) );
-    if (iFind == m_map.end())
-    {
-        // create new vtable
-        sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex;
-        buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) );
-
-        ::std::pair< t_classdata_map::iterator, bool > insertion(
-            m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) );
-        OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" );
-
-        void ** slots = (void **)buffer;
-        *slots++ = 0;
-        *slots++ = 0; // rtti
-        char * code = (char *)(slots + nSlots);
-
-        sal_uInt32 vtable_pos = 0;
-        sal_Int32 nAllMembers = pTD->nAllMembers;
-        typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers;
-        for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos )
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] );
-            OSL_ASSERT( pTD );
-            if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass)
-            {
-                bool simple_ret = cppu_isSimpleType(
-                    ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass );
-                // get method
-                *slots++ = code;
-                codeSnippet( code, vtable_pos++, simple_ret );
-                code += 20;
-                if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
-                {
-                    // set method
-                    *slots++ = code;
-                    codeSnippet( code, vtable_pos++, true );
-                    code += 20;
-                }
-            }
-            else
-            {
-                bool simple_ret = cppu_isSimpleType(
-                    ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
-                *slots++ = code;
-                codeSnippet( code, vtable_pos++, simple_ret );
-                code += 20;
-            }
-            TYPELIB_DANGER_RELEASE( pTD );
-        }
-        OSL_ASSERT( vtable_pos == nSlots );
-    }
-    else
-    {
-        buffer = iFind->second;
-    }
-    }
-
-    return ((void **)buffer +2);
-}
-
-//==================================================================================================
-void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
-    XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
-{
-    static MediateClassData * s_pMediateClassData = 0;
-    if (! s_pMediateClassData)
-    {
-        MutexGuard aGuard( Mutex::getGlobalMutex() );
-        if (! s_pMediateClassData)
-        {
-#ifdef LEAK_STATIC_DATA
-            s_pMediateClassData = new MediateClassData();
-#else
-            static MediateClassData s_aMediateClassData;
-            s_pMediateClassData = &s_aMediateClassData;
-#endif
-        }
-    }
-    *(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );
-}
-
-}
-
-extern "C"
-{
-//##################################################################################################
-sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
-    SAL_THROW_EXTERN_C()
-{
-    return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(
-        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
-}
-//##################################################################################################
-void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
-    SAL_THROW_EXTERN_C()
-{
-    CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(
-        pCppEnv );
-}
-//##################################################################################################
-void SAL_CALL uno_ext_getMapping(
-    uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
-    SAL_THROW_EXTERN_C()
-{
-    CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(
-        ppMapping, pFrom, pTo );
-}
-}
diff --git a/bridges/source/cpp_uno/gcc3_netbsd_intel/share.hxx b/bridges/source/cpp_uno/gcc3_netbsd_intel/share.hxx
deleted file mode 100644
index ba6ac7e974cc..000000000000
--- a/bridges/source/cpp_uno/gcc3_netbsd_intel/share.hxx
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <typeinfo>
-#include <exception>
-#include <cstddef>
-
-namespace CPPU_CURRENT_NAMESPACE
-{
-
-// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-
-struct _Unwind_Exception
-{
-    unsigned exception_class __attribute__((__mode__(__DI__)));
-    void * exception_cleanup;
-    unsigned private_1 __attribute__((__mode__(__word__)));
-    unsigned private_2 __attribute__((__mode__(__word__)));
-} __attribute__((__aligned__));
-
-struct __cxa_exception
-{
-    ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
-    ::std::unexpected_handler unexpectedHandler;
-    ::std::terminate_handler terminateHandler;
-
-    __cxa_exception *nextException;
-
-    int handlerCount;
-
-    int handlerSwitchValue;
-    const unsigned char *actionRecord;
-    const unsigned char *languageSpecificData;
-    void *catchTemp;
-    void *adjustedPtr;
-
-    _Unwind_Exception unwindHeader;
-};
-
-extern "C" void *__cxa_allocate_exception(
-    std::size_t thrown_size ) throw();
-extern "C" void __cxa_throw (
-    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-
-struct __cxa_eh_globals
-{
-    __cxa_exception *caughtExceptions;
-    unsigned int uncaughtExceptions;
-};
-extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-
-// -----
-
-//==================================================================================================
-void raiseException(
-    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-//==================================================================================================
-void fillUnoException(
-    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-}
diff --git a/bridges/source/cpp_uno/gcc3_netbsd_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_netbsd_intel/uno2cpp.cxx
deleted file mode 100644
index 873abecd7420..000000000000
--- a/bridges/source/cpp_uno/gcc3_netbsd_intel/uno2cpp.cxx
+++ /dev/null
@@ -1,433 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
-
-#include <sal/alloca.h>
-#include <rtl/alloc.h>
-
-#include <uno/data.h>
-#include <bridges/cpp_uno/bridge.hxx>
-#include <bridges/cpp_uno/type_misc.hxx>
-
-#include "share.hxx"
-
-
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-
-namespace CPPU_CURRENT_NAMESPACE
-{
-
-void dummy_can_throw_anything( char const * );
-
-//==================================================================================================
-// The call instruction within the asm section of callVirtualMethod may throw
-// exceptions.  So that the compiler handles this correctly, it is important
-// that (a) callVirtualMethod might call dummy_can_throw_anything (although this
-// never happens at runtime), which in turn can throw exceptions, and (b)
-// callVirtualMethod is not inlined at its call site (so that any exceptions are
-// caught which are thrown from the instruction calling callVirtualMethod):
-void callVirtualMethod(
-    void * pThis,
-    sal_Int32 nVtableIndex,
-    void * pRegisterReturn,
-    typelib_TypeClass eReturnType,
-    sal_Int32 * pStackLongs,
-    sal_Int32 nStackLongs ) __attribute__((noinline));
-
-void callVirtualMethod(
-    void * pThis,
-    sal_Int32 nVtableIndex,
-    void * pRegisterReturn,
-    typelib_TypeClass eReturnType,
-    sal_Int32 * pStackLongs,
-    sal_Int32 nStackLongs )
-{
-    // parameter list is mixed list of * and values
-    // reference parameters are pointers
-
-    OSL_ENSURE( pStackLongs && pThis, "### null ptr!" );
-    OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-    OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-
-    // never called
-    if (! pThis) dummy_can_throw_anything("xxx"); // address something
-
-    volatile long edx = 0, eax = 0; // for register returns
-    void * stackptr;
-    asm volatile (
-        "mov   %%esp, %6\n\t"
-        // copy values
-        "mov   %0, %%eax\n\t"
-        "mov   %%eax, %%edx\n\t"
-        "dec   %%edx\n\t"
-        "shl   $2, %%edx\n\t"
-        "add   %1, %%edx\n"
-        "Lcopy:\n\t"
-        "pushl 0(%%edx)\n\t"
-        "sub   $4, %%edx\n\t"
-        "dec   %%eax\n\t"
-        "jne   Lcopy\n\t"
-        // do the actual call
-        "mov   %2, %%edx\n\t"
-        "mov   0(%%edx), %%edx\n\t"
-        "mov   %3, %%eax\n\t"
-        "shl   $2, %%eax\n\t"
-        "add   %%eax, %%edx\n\t"
-        "mov   0(%%edx), %%edx\n\t"
-        "call  *%%edx\n\t"
-        // save return registers
-         "mov   %%eax, %4\n\t"
-         "mov   %%edx, %5\n\t"
-        // cleanup stack
-        "mov   %6, %%esp\n\t"
-        :
-        : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
-          "m"(eax), "m"(edx), "m"(stackptr)
-        : "eax", "edx" );
-    switch( eReturnType )
-    {
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-            ((long*)pRegisterReturn)[1] = edx;
-        case typelib_TypeClass_LONG:
-        case typelib_TypeClass_UNSIGNED_LONG:
-        case typelib_TypeClass_CHAR:
-        case typelib_TypeClass_ENUM:
-            ((long*)pRegisterReturn)[0] = eax;
-            break;
-        case typelib_TypeClass_SHORT:
-        case typelib_TypeClass_UNSIGNED_SHORT:
-            *(unsigned short*)pRegisterReturn = eax;
-            break;
-        case typelib_TypeClass_BOOLEAN:
-        case typelib_TypeClass_BYTE:
-            *(unsigned char*)pRegisterReturn = eax;
-            break;
-        case typelib_TypeClass_FLOAT:
-            asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-            break;
-        case typelib_TypeClass_DOUBLE:
-            asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-            break;
-    }
-}
-
-//==================================================================================================
-static void cpp_call(
-    cppu_unoInterfaceProxy * pThis,
-    sal_Int32 nVtableCall,
-    typelib_TypeDescriptionReference * pReturnTypeRef,
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-{
-      // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      =
-          (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-      char * pCppStackStart = pCppStack;
-
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-    OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
-    void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
-    if (pReturnTypeDescr)
-    {
-        if (cppu_isSimpleType( pReturnTypeDescr ))
-        {
-            pCppReturn = pUnoReturn; // direct way for simple types
-        }
-        else
-        {
-            // complex return via ptr
-            pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr )
-                                                ? alloca( pReturnTypeDescr->nSize )
-                                                : pUnoReturn); // direct way
-            pCppStack += sizeof(void *);
-        }
-    }
-    // push this
-    *(void**)pCppStack = pThis->pCppI;
-    pCppStack += sizeof( void* );
-
-    // stack space
-    OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-    // args
-    void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-    // indizes of values this have to be converted (interface conversion cpp<=>uno)
-    sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
-    sal_Int32 nTempIndizes   = 0;
-
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-        if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
-        {
-            uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-                                    &pThis->pBridge->aUno2Cpp );
-
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-            case typelib_TypeClass_DOUBLE:
-                pCppStack += sizeof(sal_Int32); // extra long
-            }
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // ptr to complex value | ref
-        {
-            if (! rParam.bIn) // is pure out
-            {
-                // cpp out is constructed mem, uno out is not!
-                uno_constructData(
-                    *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                    pParamTypeDescr );
-                pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            // is in/inout
-            else if (cppu_relatesToInterface( pParamTypeDescr ))
-            {
-                uno_copyAndConvertData(
-                    *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                    pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );
-
-                pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-        }
-        pCppStack += sizeof(sal_Int32); // standard parameter length
-    }
-
-    try
-    {
-        OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-        callVirtualMethod(
-            pThis->pCppI, nVtableCall,
-            pCppReturn, pReturnTypeDescr->eTypeClass,
-            (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-        // NO exception occured...
-        *ppUnoExc = 0;
-
-        // reconvert temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
-            if (pParams[nIndex].bIn)
-            {
-                if (pParams[nIndex].bOut) // inout
-                {
-                    uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-                    uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-                                            &pThis->pBridge->aCpp2Uno );
-                }
-            }
-            else // pure out
-            {
-                uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-                                        &pThis->pBridge->aCpp2Uno );
-            }
-            // destroy temp cpp param => cpp: every param was constructed
-            uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return value
-        if (pCppReturn && pUnoReturn != pCppReturn)
-        {
-            uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-                                    &pThis->pBridge->aCpp2Uno );
-            uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-        }
-    }
-     catch (...)
-     {
-          // fill uno exception
-        fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
-
-        // temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            // destroy temp cpp param => cpp: every param was constructed
-            uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-        }
-        // return type
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-    }
-}
-
-
-//==================================================================================================
-void SAL_CALL cppu_unoInterfaceProxy_dispatch(
-    uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-    void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
-{
-    // is my surrogate
-    cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;
-    typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-
-    switch (pMemberDescr->eTypeClass)
-    {
-    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-    {
-        // determine vtable call index
-        sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-        OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-
-        sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-        OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-
-        if (pReturn)
-        {
-            // dependent dispatch
-            cpp_call(
-                pThis, nVtableCall,
-                ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-                0, 0, // no params
-                pReturn, pArgs, ppException );
-        }
-        else
-        {
-            // is SET
-            typelib_MethodParameter aParam;
-            aParam.pTypeRef =
-                ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
-            typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-            OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-            typelib_typedescriptionreference_new(
-                &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
-            // dependent dispatch
-            cpp_call(
-                pThis, nVtableCall +1, // get, then set method
-                pReturnTypeRef,
-                1, &aParam,
-                pReturn, pArgs, ppException );
-
-            typelib_typedescriptionreference_release( pReturnTypeRef );
-        }
-
-        break;
-    }
-    case typelib_TypeClass_INTERFACE_METHOD:
-    {
-        // determine vtable call index
-        sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
-        OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-
-        sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos];
-        OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-
-        switch (nVtableCall)
-        {
-            // standard calls
-        case 1: // acquire uno interface
-            (*pUnoI->acquire)( pUnoI );
-            *ppException = 0;
-            break;
-        case 2: // release uno interface
-            (*pUnoI->release)( pUnoI );
-            *ppException = 0;
-            break;
-        case 0: // queryInterface() opt
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-            if (pTD)
-            {
-                uno_Interface * pInterface = 0;
-                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
-                    pThis->pBridge->pUnoEnv,
-                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
-                if (pInterface)
-                {
-                    ::uno_any_construct(
-                        reinterpret_cast< uno_Any * >( pReturn ),
-                        &pInterface, pTD, 0 );
-                    (*pInterface->release)( pInterface );
-                    TYPELIB_DANGER_RELEASE( pTD );
-                    *ppException = 0;
-                    break;
-                }
-                TYPELIB_DANGER_RELEASE( pTD );
-            }
-        } // else perform queryInterface()
-        default:
-            // dependent dispatch
-            cpp_call(
-                pThis, nVtableCall,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-                pReturn, pArgs, ppException );
-        }
-        break;
-    }
-    default:
-    {
-        ::com::sun::star::uno::RuntimeException aExc(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
-        Type const & rExcType = ::getCppuType( &aExc );
-        // binary identical null reference
-        ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-    }
-    }
-}
-
-}
-
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx
deleted file mode 100644
index da67b0d700bc..000000000000
--- a/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx
+++ /dev/null
@@ -1,525 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <sal/alloca.h>
-#include <stdio.h>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <uno/data.h>
-#include <typelib/typedescription.hxx>
-
-#include "bridges/cpp_uno/shared/bridge.hxx"
-#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx"
-#include "bridges/cpp_uno/shared/types.hxx"
-#include "bridges/cpp_uno/shared/vtablefactory.hxx"
-
-#include "share.hxx"
-
-using namespace ::com::sun::star::uno;
-
-namespace
-{
-
-//==================================================================================================
-static typelib_TypeClass cpp2uno_call(
-    bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
-    const typelib_TypeDescription * pMemberTypeDescr,
-    typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void ** pCallStack,
-    sal_Int64 * pRegisterReturn /* space for register return */ )
-{
-    // pCallStack: ret, [return ptr], this, params
-    char * pCppStack = (char *)(pCallStack +1);
-
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    if (pReturnTypeRef)
-        TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
-    void * pUnoReturn = 0;
-    void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
-    if (pReturnTypeDescr)
-    {
-        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-        {
-            pUnoReturn = pRegisterReturn; // direct way for simple types
-        }
-        else // complex return via ptr (pCppReturn)
-        {
-            pCppReturn = *(void **)pCppStack;
-            pCppStack += sizeof(void *);
-
-            pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType(
-                              pReturnTypeDescr )
-                          ? alloca( pReturnTypeDescr->nSize )
-                          : pCppReturn); // direct way
-        }
-    }
-    // pop this
-    pCppStack += sizeof( void* );
-
-    // stack space
-    OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-    // parameters
-    void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-    void ** pCppArgs = pUnoArgs + nParams;
-    // indizes of values this have to be converted (interface conversion cpp<=>uno)
-    sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
-    sal_Int32 nTempIndizes   = 0;
-
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-        if (!rParam.bOut
-            && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
-            // value
-        {
-            pCppArgs[nPos] = pCppStack;
-            pUnoArgs[nPos] = pCppStack;
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-            case typelib_TypeClass_DOUBLE:
-                pCppStack += sizeof(sal_Int32); // extra long
-            }
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // ptr to complex value | ref
-        {
-            pCppArgs[nPos] = *(void **)pCppStack;
-
-            if (! rParam.bIn) // is pure out
-            {
-                // uno out is unconstructed mem!
-                pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-                pTempIndizes[nTempIndizes] = nPos;
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            // is in/inout
-            else if (bridges::cpp_uno::shared::relatesToInterfaceType(
-                         pParamTypeDescr ))
-            {
-                uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                                        *(void **)pCppStack, pParamTypeDescr,
-                                        pThis->getBridge()->getCpp2Uno() );
-                pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                pUnoArgs[nPos] = *(void **)pCppStack;
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-        }
-        pCppStack += sizeof(sal_Int32); // standard parameter length
-    }
-
-    // ExceptionHolder
-    uno_Any aUnoExc = {0}; // Any will be constructed by callee
-    uno_Any * pUnoExc = &aUnoExc;
-
-    // invoke uno dispatch call
-    (*pThis->getUnoI()->pDispatcher)(
-        pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-#if OSL_DEBUG_LEVEL > 1
-    if (pUnoExc != NULL)
-        fprintf( stderr, ">cpp2uno_call pUnoExc %x\n", pUnoExc);
-#endif
-
-    // in case an exception occured...
-    if (pUnoExc)
-    {
-        // destruct temporary in/inout params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
-            if (pParams[nIndex].bIn) // is in/inout => was constructed
-                uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-        }
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
-        CPPU_CURRENT_NAMESPACE::raiseException(
-            &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-            // has to destruct the any
-        // is here for dummy
-        return typelib_TypeClass_VOID;
-    }
-    else // else no exception occured...
-    {
-        // temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
-            if (pParams[nIndex].bOut) // inout/out
-            {
-                // convert and assign
-                uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-                uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
-                                        pThis->getBridge()->getUno2Cpp() );
-            }
-            // destroy temp uno param
-            uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return
-        if (pCppReturn) // has complex return
-        {
-            if (pUnoReturn != pCppReturn) // needs reconversion
-            {
-                uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
-                                        pThis->getBridge()->getUno2Cpp() );
-                // destroy temp uno return
-                uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-            }
-            // complex return ptr is set to eax
-            *(void **)pRegisterReturn = pCppReturn;
-        }
-        if (pReturnTypeDescr)
-        {
-            typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-            return eRet;
-        }
-        else
-            return typelib_TypeClass_VOID;
-    }
-}
-
-
-//==================================================================================================
-static typelib_TypeClass cpp_mediate(
-    sal_Int32 nFunctionIndex,
-    sal_Int32 nVtableOffset,
-    void ** pCallStack,
-    sal_Int64 * pRegisterReturn /* space for register return */ )
-{
-    OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-
-    // pCallStack: ret adr, [ret *], this, params
-    void * pThis;
-    if( nFunctionIndex & 0x80000000 )
-    {
-        nFunctionIndex &= 0x7fffffff;
-        pThis = pCallStack[2];
-    }
-    else
-    {
-        pThis = pCallStack[1];
-    }
-    pThis = static_cast< char * >(pThis) - nVtableOffset;
-    bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
-        = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
-            pThis);
-
-    typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
-
-    OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
-    if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-    {
-        throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
-            (XInterface *)pThis );
-    }
-
-    // determine called method
-    sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
-    OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
-
-    TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
-    typelib_TypeClass eRet;
-    switch (aMemberDescr.get()->eTypeClass)
-    {
-    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-    {
-        if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex)
-        {
-            // is GET method
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
-                0, 0, // no params
-                pCallStack, pRegisterReturn );
-        }
-        else
-        {
-            // is SET method
-            typelib_MethodParameter aParam;
-            aParam.pTypeRef =
-                ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                0, // indicates void return
-                1, &aParam,
-                pCallStack, pRegisterReturn );
-        }
-        break;
-    }
-    case typelib_TypeClass_INTERFACE_METHOD:
-    {
-        // is METHOD
-        switch (nFunctionIndex)
-        {
-        case 1: // acquire()
-            pCppI->acquireProxy(); // non virtual call!
-            eRet = typelib_TypeClass_VOID;
-            break;
-        case 2: // release()
-            pCppI->releaseProxy(); // non virtual call!
-            eRet = typelib_TypeClass_VOID;
-            break;
-        case 0: // queryInterface() opt
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
-            if (pTD)
-            {
-                XInterface * pInterface = 0;
-                (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
-                    pCppI->getBridge()->getCppEnv(),
-                    (void **)&pInterface, pCppI->getOid().pData,
-                    (typelib_InterfaceTypeDescription *)pTD );
-
-                if (pInterface)
-                {
-                    ::uno_any_construct(
-                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-                        &pInterface, pTD, cpp_acquire );
-                    pInterface->release();
-                    TYPELIB_DANGER_RELEASE( pTD );
-                    *(void **)pRegisterReturn = pCallStack[1];
-                    eRet = typelib_TypeClass_ANY;
-                    break;
-                }
-                TYPELIB_DANGER_RELEASE( pTD );
-            }
-        } // else perform queryInterface()
-        default:
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
-                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
-                ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
-                pCallStack, pRegisterReturn );
-        }
-        break;
-    }
-    default:
-    {
-        throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
-            (XInterface *)pThis );
-        // is here for dummy
-        eRet = typelib_TypeClass_VOID;
-    }
-    }
-
-    return eRet;
-}
-
-//==================================================================================================
-/**
- * is called on incoming vtable calls
- * (called by asm snippets)
- */
-static void cpp_vtable_call(
-    int nFunctionIndex, int nVtableOffset, void** pCallStack )
-    __attribute__((regparm(3)));
-
-void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
-{
-    volatile long nRegReturn[2];
-    typelib_TypeClass aType = cpp_mediate(
-        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
-
-    switch( aType )
-    {
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-            __asm__( "movl %1, %%edx\n\t"
-                     "movl %0, %%eax\n"
-                     : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-            break;
-        case typelib_TypeClass_FLOAT:
-            __asm__( "flds %0\n\t"
-                     "fstp %%st(0)\n\t"
-                     "flds %0\n"
-                     : : "m"(*(float *)nRegReturn) );
-            break;
-        case typelib_TypeClass_DOUBLE:
-            __asm__( "fldl %0\n\t"
-                     "fstp %%st(0)\n\t"
-                     "fldl %0\n"
-                     : : "m"(*(double *)nRegReturn) );
-            break;
-//      case typelib_TypeClass_UNSIGNED_SHORT:
-//      case typelib_TypeClass_SHORT:
-//          __asm__( "movswl %0, %%eax\n"
-//                   : : "m"(nRegReturn) );
-//      break;
-        default:
-            __asm__( "movl %0, %%eax\n"
-                     : : "m"(nRegReturn[0]) );
-            break;
-    }
-}
-
-
-//==================================================================================================
-int const codeSnippetSize = 20;
-
-unsigned char * codeSnippet(
-    unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
-    bool simpleRetType)
-{
-    if (!simpleRetType) {
-        functionIndex |= 0x80000000;
-    }
-    unsigned char * p = code;
-    OSL_ASSERT(sizeof (sal_Int32) == 4);
-    // mov function_index, %eax:
-    *p++ = 0xB8;
-    *reinterpret_cast< sal_Int32 * >(p) = functionIndex;
-    p += sizeof (sal_Int32);
-    // mov vtable_offset, %edx:
-    *p++ = 0xBA;
-    *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-    p += sizeof (sal_Int32);
-    // mov %esp, %ecx:
-    *p++ = 0x89;
-    *p++ = 0xE1;
-    // jmp cpp_vtable_call:
-    *p++ = 0xE9;
-    *reinterpret_cast< sal_Int32 * >(p)
-        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-    p += sizeof (sal_Int32);
-    OSL_ASSERT(p - code <= codeSnippetSize);
-    return code + codeSnippetSize;
-}
-
-}
-
-struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; };
-
-bridges::cpp_uno::shared::VtableFactory::Slot *
-bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
-{
-    return static_cast< Slot * >(block) + 2;
-}
-
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
-    sal_Int32 slotCount)
-{
-    return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
-}
-
-bridges::cpp_uno::shared::VtableFactory::Slot *
-bridges::cpp_uno::shared::VtableFactory::initializeBlock(
-    void * block, sal_Int32 slotCount)
-{
-    Slot * slots = mapBlockToVtable(block);
-    slots[-2].fn = 0;
-    slots[-1].fn = 0;
-    return slots + slotCount;
-}
-
-unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
-    typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
-    sal_Int32 functionCount, sal_Int32 vtableOffset)
-{
-    (*slots) -= functionCount;
-    Slot * s = *slots;
-    for (sal_Int32 i = 0; i < type->nMembers; ++i) {
-        typelib_TypeDescription * member = 0;
-        TYPELIB_DANGER_GET(&member, type->ppMembers[i]);
-        OSL_ASSERT(member != 0);
-        switch (member->eTypeClass) {
-        case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-            // Getter:
-            (s++)->fn = code;
-            code = codeSnippet(
-                code, functionOffset++, vtableOffset,
-                bridges::cpp_uno::shared::isSimpleType(
-                    reinterpret_cast<
-                    typelib_InterfaceAttributeTypeDescription * >(
-                        member)->pAttributeTypeRef));
-            // Setter:
-            if (!reinterpret_cast<
-                typelib_InterfaceAttributeTypeDescription * >(
-                    member)->bReadOnly)
-            {
-                (s++)->fn = code;
-                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-            }
-            break;
-
-        case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
-            code = codeSnippet(
-                code, functionOffset++, vtableOffset,
-                bridges::cpp_uno::shared::isSimpleType(
-                    reinterpret_cast<
-                    typelib_InterfaceMethodTypeDescription * >(
-                        member)->pReturnTypeRef));
-            break;
-
-        default:
-            OSL_ASSERT(false);
-            break;
-        }
-        TYPELIB_DANGER_RELEASE(member);
-    }
-    return code;
-}
-
-void bridges::cpp_uno::shared::VtableFactory::flushCode(
-    unsigned char const *, unsigned char const *)
-{}
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/defs/gcc3_uno.def b/bridges/source/cpp_uno/gcc3_os2_intel/defs/gcc3_uno.def
deleted file mode 100644
index d6b247ec996b..000000000000
--- a/bridges/source/cpp_uno/gcc3_os2_intel/defs/gcc3_uno.def
+++ /dev/null
@@ -1,915 +0,0 @@
-LIBRARY	  gcc3_uno INITINSTANCE TERMINSTANCE
-DATA MULTIPLE
-DESCRIPTION	'StarView 3.00  680 '
-EXPORTS
-_GetVersionInfo
-_component_canUnload
-_uno_initEnvironment
-_uno_ext_getMapping
-
-;lmax=20
-;smax=_component_canUnload
-
-;__ZTIN4test19TestBridgeExceptionE
-
-__ZTIN10comphelper18OPropertyContainerE
-__ZTIN10comphelper24OPropertyContainerHelperE
-__ZTIN10comphelper25OPropertyArrayUsageHelperIN9configmgr22OConfigurationProviderEEE
-__ZTIN3com3sun4star13configuration17XTemplateInstanceE
-__ZTIN3com3sun4star13configuration18XTemplateContainerE
-__ZTIN3com3sun4star13configuration29InvalidBootstrapFileExceptionE
-__ZTIN3com3sun4star13configuration29MissingBootstrapFileExceptionE
-__ZTIN3com3sun4star13configuration31InstallationIncompleteExceptionE
-__ZTIN3com3sun4star13configuration32CannotLoadConfigurationExceptionE
-__ZTIN3com3sun4star13configuration7backend13XLayerHandlerE
-__ZTIN3com3sun4star13configuration7backend14XSchemaHandlerE
-__ZTIN3com3sun4star13configuration7backend14XUpdateHandlerE
-__ZTIN3com3sun4star13configuration7backend15XCompositeLayerE
-__ZTIN3com3sun4star13configuration7backend15XSchemaSupplierE
-__ZTIN3com3sun4star13configuration7backend15XUpdatableLayerE
-__ZTIN3com3sun4star13configuration7backend16XBackendEntitiesE
-__ZTIN3com3sun4star13configuration7backend18XMultiLayerStratumE
-__ZTIN3com3sun4star13configuration7backend21BackendSetupExceptionE
-__ZTIN3com3sun4star13configuration7backend22BackendAccessExceptionE
-__ZTIN3com3sun4star13configuration7backend22CannotConnectExceptionE
-__ZTIN3com3sun4star13configuration7backend22MalformedDataExceptionE
-__ZTIN3com3sun4star13configuration7backend23ConnectionLostExceptionE
-__ZTIN3com3sun4star13configuration7backend23XBackendChangesListenerE
-__ZTIN3com3sun4star13configuration7backend23XBackendChangesNotifierE
-__ZTIN3com3sun4star13configuration7backend24StratumCreationExceptionE
-__ZTIN3com3sun4star13configuration7backend24XVersionedSchemaSupplierE
-__ZTIN3com3sun4star13configuration7backend29AuthenticationFailedExceptionE
-__ZTIN3com3sun4star13configuration7backend33InsufficientAccessRightsExceptionE
-__ZTIN3com3sun4star13configuration7backend39InvalidAuthenticationMechanismExceptionE
-__ZTIN3com3sun4star13configuration7backend6XLayerE
-__ZTIN3com3sun4star13configuration7backend7XSchemaE
-__ZTIN3com3sun4star13configuration7backend8XBackendE
-__ZTIN3com3sun4star2io11IOExceptionE
-__ZTIN3com3sun4star2io12XInputStreamE
-__ZTIN3com3sun4star2io13XOutputStreamE
-__ZTIN3com3sun4star2io15XActiveDataSinkE
-__ZTIN3com3sun4star2io16XDataInputStreamE
-__ZTIN3com3sun4star2io17XActiveDataSourceE
-__ZTIN3com3sun4star2io20WrongFormatExceptionE
-__ZTIN3com3sun4star2io21NotConnectedExceptionE
-__ZTIN3com3sun4star2io22UnexpectedEOFExceptionE
-__ZTIN3com3sun4star2io27BufferSizeExceededExceptionE
-__ZTIN3com3sun4star3uno10XInterfaceE
-__ZTIN3com3sun4star3uno15XCurrentContextE
-__ZTIN3com3sun4star3uno16RuntimeExceptionE
-__ZTIN3com3sun4star3uno17XComponentContextE
-__ZTIN3com3sun4star3uno5XWeakE
-__ZTIN3com3sun4star3uno9ExceptionE
-__ZTIN3com3sun4star3xml3sax12SAXExceptionE
-__ZTIN3com3sun4star3xml3sax14XAttributeListE
-__ZTIN3com3sun4star3xml3sax16XDocumentHandlerE
-;__ZTIN3com3sun4star4l
-__ZTIN3com3sun4star4lang10XComponentE
-__ZTIN3com3sun4star4lang10XUnoTunnelE
-__ZTIN3com3sun4star4lang12XLocalizableE
-__ZTIN3com3sun4star4lang12XServiceInfoE
-__ZTIN3com3sun4star4lang13XTypeProviderE
-__ZTIN3com3sun4star4lang14XEventListenerE
-__ZTIN3com3sun4star4lang15XInitializationE
-__ZTIN3com3sun4star4lang17DisposedExceptionE
-__ZTIN3com3sun4star4lang18NoSupportExceptionE
-__ZTIN3com3sun4star4lang20NullPointerExceptionE
-__ZTIN3com3sun4star4lang20XMultiServiceFactoryE
-__ZTIN3com3sun4star4lang21XSingleServiceFactoryE
-__ZTIN3com3sun4star4lang22IllegalAccessExceptionE
-__ZTIN3com3sun4star4lang22WrappedTargetExceptionE
-__ZTIN3com3sun4star4lang23XSingleComponentFactoryE
-__ZTIN3com3sun4star4lang24IllegalArgumentExceptionE
-__ZTIN3com3sun4star4lang29ServiceNotRegisteredExceptionE
-__ZTIN3com3sun4star4lang29WrappedTargetRuntimeExceptionE
-__ZTIN3com3sun4star4task17XInteractionAbortE
-__ZTIN3com3sun4star4task17XInteractionRetryE
-__ZTIN3com3sun4star4task19XInteractionApproveE
-__ZTIN3com3sun4star4task19XInteractionRequestE
-__ZTIN3com3sun4star4task22XInteractionDisapproveE
-__ZTIN3com3sun4star4task24XInteractionContinuationE
-__ZTIN3com3sun4star4util10XFlushableE
-__ZTIN3com3sun4star4util12XRefreshableE
-__ZTIN3com3sun4star4util12XTimeStampedE
-__ZTIN3com3sun4star4util13XChangesBatchE
-__ZTIN3com3sun4star4util13XStringEscapeE
-__ZTIN3com3sun4star4util16XChangesNotifierE
-__ZTIN3com3sun4star5beans10XExactNameE
-__ZTIN3com3sun4star5beans12XPropertySetE
-__ZTIN3com3sun4star5beans14XPropertyStateE
-__ZTIN3com3sun4star5beans16XFastPropertySetE
-__ZTIN3com3sun4star5beans16XPropertySetInfoE
-__ZTIN3com3sun4star5beans17XMultiPropertySetE
-__ZTIN3com3sun4star5beans18XPropertyWithStateE
-__ZTIN3com3sun4star5beans20XMultiPropertyStatesE
-__ZTIN3com3sun4star5beans21PropertyVetoExceptionE
-__ZTIN3com3sun4star5beans24UnknownPropertyExceptionE
-__ZTIN3com3sun4star5beans24XHierarchicalPropertySetE
-__ZTIN3com3sun4star5beans29XMultiHierarchicalPropertySetE
-__ZTIN3com3sun4star5beans9XPropertyE
-__ZTIN3com3sun4star6script22CannotConvertExceptionE
-__ZTIN3com3sun4star8registry12XRegistryKeyE
-__ZTIN3com3sun4star8registry15XSimpleRegistryE
-__ZTIN3com3sun4star8registry21InvalidValueExceptionE
-__ZTIN3com3sun4star8registry22MergeConflictExceptionE
-__ZTIN3com3sun4star8registry24InvalidRegistryExceptionE
-__ZTIN3com3sun4star9container10XContainerE
-__ZTIN3com3sun4star9container11XNameAccessE
-__ZTIN3com3sun4star9container12XNameReplaceE
-__ZTIN3com3sun4star9container14XElementAccessE
-__ZTIN3com3sun4star9container14XNameContainerE
-__ZTIN3com3sun4star9container17XHierarchicalNameE
-__ZTIN3com3sun4star9container21ElementExistExceptionE
-__ZTIN3com3sun4star9container22NoSuchElementExceptionE
-__ZTIN3com3sun4star9container23XHierarchicalNameAccessE
-__ZTIN3com3sun4star9container6XChildE
-__ZTIN3com3sun4star9container6XNamedE
-__ZTIN3vos10IReferenceE
-__ZTIN3vos10OReferenceE
-__ZTIN3vos6OTimerE
-__ZTIN3vos7OObjectE
-__ZTIN3vos7OThreadE
-__ZTIN3vos9IRunnableE
-__ZTIN4cppu11ImplHelper2IN3com3sun4star8registry15XSimpleRegistryENS3_4util10XFlushableEEE
-__ZTIN4cppu11ImplHelper4IN3com3sun4star4lang20XMultiServiceFactoryENS4_12XLocalizableENS3_4util12XRefreshableENS7_10XFlushableEEE
-__ZTIN4cppu11ImplHelper6IN3com3sun4star5beans12XPropertySetENS4_17XMultiPropertySetENS4_24XHierarchicalPropertySetENS4_29XMultiHierarchicalPropertySetENS4_14XPropertyStateENS4_20XMultiPropertyStatesEEE
-__ZTIN4cppu11ImplHelper6IN3com3sun4star9container11XNameAccessENS4_17XHierarchicalNameENS4_23XHierarchicalNameAccessENS4_10XContainerENS3_5beans10XExactNameENS9_9XPropertyEEE
-__ZTIN4cppu11ImplHelper9IN3com3sun4star9container11XNameAccessENS4_17XHierarchicalNameENS4_23XHierarchicalNameAccessENS4_10XContainerENS3_5beans10XExactNameENS9_9XPropertyENS9_16XPropertySetInfoENS3_13configuration18XTemplateCo!_yPkJc2
-__ZTIN4cppu11OWeakObjectE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend13XLayerHandlerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend14XSchemaHandlerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend15XCompositeLayerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend23XBackendChangesListenerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io13XOutputStreamEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io16XDataInputStreamEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3uno15XCurrentContextEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3xml3sax14XAttributeListEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3xml3sax16XDocumentHandlerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4lang14XEventListenerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4lang23XSingleComponentFactoryEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task17XInteractionAbortEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task17XInteractionRetryEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task19XInteractionApproveEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task19XInteractionRequestEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task22XInteractionDisapproveEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star5beans16XPropertySetInfoEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star8registry12XRegistryKeyEEE
-__ZTIN4cppu15WeakImplHelper2IN3com3sun4star13configuration7backend13XLayerHandlerENS5_6XLayerEEE
-__ZTIN4cppu15WeakImplHelper2IN3com3sun4star3uno15XCurrentContextENS3_4lang10XUnoTunnelEEE
-__ZTIN4cppu15WeakImplHelper3IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_13configuration7backend14XUpdateHandlerEEE
-__ZTIN4cppu15WeakImplHelper3IN3com3sun4star9container6XChildENS4_6XNamedENS3_4lang12XServiceInfoEEE
-__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io15XActiveDataSinkENS3_13configuration7backend6XLayerEEE
-__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io15XActiveDataSinkENS3_13configuration7backend7XSchemaEEE
-__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io17XActiveDataSourceENS3_13configuration7backend13XLayerHandlerEEE
-__ZTIN4cppu15WeakImplHelper5IN3com3sun4star9container6XNamedENS3_4util16XChangesNotifierENS3_4lang10XComponentENS8_12XServiceInfoENS8_12XLocalizableEEE
-__ZTIN4cppu15WeakImplHelper6IN3com3sun4star9container6XChildENS4_6XNamedENS3_4lang10XComponentENS7_12XServiceInfoENS3_13configuration17XTemplateInstanceENS7_10XUnoTunnelEEE
-__ZTIN4cppu15WeakImplHelper6IN3com3sun4star9container6XNamedENS3_4util16XChangesNotifierENS3_4lang10XComponentENS8_12XServiceInfoENS8_12XLocalizableENS6_13XChangesBatchEEE
-__ZTIN4cppu18OPropertySetHelperE
-__ZTIN4cppu22ImplInheritanceHelper1IN9configmgr7localbe16LocalStratumBaseEN3com3sun4star13configuration7backend18XMultiLayerStratumEEE
-__ZTIN4cppu22ImplInheritanceHelper2IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend15XUpdatableLayerENS6_4util12XTimeStampedEEE
-__ZTIN4cppu22ImplInheritanceHelper2IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend6XLayerENS6_4util12XTimeStampedEEE
-__ZTIN4cppu22ImplInheritanceHelper3IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend15XUpdatableLayerENS8_15XCompositeLayerENS6_4util12XTimeStampedEEE
-__ZTIN4cppu24WeakComponentImplHelper1IN3com3sun4star4lang12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper2IN3com3sun4star4lang20XMultiServiceFactoryENS4_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star13configuration7backend24XVersionedSchemaSupplierENS3_4lang15XInitializationENS7_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star3uno17XComponentContextENS4_15XCurrentContextENS3_4lang12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star4lang15XInitializationENS3_13configuration7backend16XBackendEntitiesENS4_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper5IN3com3sun4star13configuration7backend15XSchemaSupplierENS5_18XMultiLayerStratumENS5_16XBackendEntitiesENS3_4lang15XInitializationENS9_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper5IN3com3sun4star13configuration7backend8XBackendENS5_16XBackendEntitiesENS5_15XSchemaSupplierENS3_4lang15XInitializationENS9_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper7IN3com3sun4star13configuration7backend8XBackendENS5_16XBackendEntitiesENS5_24XVersionedSchemaSupplierENS5_23XBackendChangesNotifierENS5_23XBackendChangesListenerENS3_4lang15XInitializationEN!_7c1rO0
-__ZTIN4cppu27WeakComponentImplHelperBaseE
-__ZTIN9configmgr10BasicGroupE
-__ZTIN9configmgr10IInterfaceE
-__ZTIN9configmgr10NodeActionE
-__ZTIN9configmgr10RefcountedE
-__ZTIN9configmgr10RemoveNodeE
-__ZTIN9configmgr10SearchNodeE
-__ZTIN9configmgr11NoncopyableE
-__ZTIN9configmgr11TreeManagerE
-__ZTIN9configmgr11TreeUpdaterE
-__ZTIN9configmgr11ValueChangeE
-__ZTIN9configmgr12CollectNamesE
-__ZTIN9configmgr12ITreeManagerE
-__ZTIN9configmgr12ONameCreatorE
-__ZTIN9configmgr12OPathCreatorINS_13configuration12AbsolutePathEEE
-__ZTIN9configmgr12OPathCreatorINS_13configuration12RelativePathEEE
-__ZTIN9configmgr13BasicValueSetE
-__ZTIN9configmgr13configuration100_GLOBAL__N__ZN9configmgr13configuration12TemplateName18makeSimpleTypeNameERKN3com3sun4star3uno4TypeE12TypeDetectorE
-__ZTIN9configmgr13configuration11InvalidNameE
-__ZTIN9configmgr13configuration11NodeVisitorE
-__ZTIN9configmgr13configuration11SetNodeImplE
-__ZTIN9configmgr13configuration12TypeMismatchE
-__ZTIN9configmgr13configuration13GroupNodeImplE
-__ZTIN9configmgr13configuration14SetNodeVisitorE
-__ZTIN9configmgr13configuration15ValueMemberNode12DeferredImplE
-__ZTIN9configmgr13configuration18GroupMemberVisitorE
-__ZTIN9configmgr13configuration19ConstraintViolationE
-__ZTIN9configmgr13configuration19DeferredSetNodeImplE
-__ZTIN9configmgr13configuration19WrappedUnoExceptionE
-__ZTIN9configmgr13configuration21DeferredGroupNodeImplE
-__ZTIN9configmgr13configuration21TemplateProvider_ImplE
-__ZTIN9configmgr13configuration28SpecialTemplateProvider_ImplE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv15CollectValueIDsE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv17SetVisitorAdapterE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv19GroupVisitorAdapterE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv21FindNonDefaultElementE
-__ZTIN9configmgr13configuration88_GLOBAL__N__ZN9configmgr13configuration17GroupUpdateHelperC2ERKNS0_4TreeERKNS0_7NodeRefE13NodeDefaulterE
-__ZTIN9configmgr13configuration8NodeImplE
-__ZTIN9configmgr13configuration8TemplateE
-__ZTIN9configmgr13configuration9ExceptionE
-__ZTIN9configmgr13INodeListenerE
-__ZTIN9configmgr13OInnerSetInfoE
-__ZTIN9configmgr13OMergeChangesE
-__ZTIN9configmgr13OProviderImplE
-__ZTIN9configmgr13PWMutexHolderE
-__ZTIN9configmgr13SubtreeChangeE
-__ZTIN9configmgr14BasicSetAccessE
-__ZTIN9configmgr14OStripDefaultsE
-__ZTIN9configmgr15BasicSetElementE
-__ZTIN9configmgr15IConfigListenerE
-__ZTIN9configmgr15OInnerGroupInfoE
-__ZTIN9configmgr15ProviderFactoryE
-__ZTIN9configmgr15ProviderWrapperE
-__ZTIN9configmgr16BasicGroupAccessE
-__ZTIN9configmgr16BasicPropertySetE
-__ZTIN9configmgr16BasicRootElementE
-__ZTIN9configmgr16BootstrapContextE
-__ZTIN9configmgr16ChangeTreeActionE
-__ZTIN9configmgr16ComponentContextE
-__ZTIN9configmgr16IDefaultProviderE
-__ZTIN9configmgr16ITemplateManagerE
-__ZTIN9configmgr16NodeModificationE
-__ZTIN9configmgr16OMergeRemoveNodeE
-__ZTIN9configmgr16OPropagateLevelsE
-__ZTIN9configmgr16UnoContextTunnel6TunnelE
-__ZTIN9configmgr17AttributeListImplE
-__ZTIN9configmgr17BasicInnerElementE
-__ZTIN9configmgr17CacheClientAccessE
-__ZTIN9configmgr17ExtendedCacheDataE
-__ZTIN9configmgr17OInnerGroupUpdateE
-__ZTIN9configmgr17OMergeValueChangeE
-__ZTIN9configmgr17TemplateCacheDataE
-__ZTIN9configmgr18BasicUpdateElementE
-__ZTIN9configmgr18CacheLoadingAccessE
-__ZTIN9configmgr18DisposingForwarderE
-__ZTIN9configmgr18IConfigBroadcasterE
-__ZTIN9configmgr18IConfigTreeManagerE
-__ZTIN9configmgr18OSetElementSetInfoE
-__ZTIN9configmgr19OInnerTreeSetUpdateE
-__ZTIN9configmgr19ORootElementSetInfoE
-__ZTIN9configmgr20OCacheWriteScheduler5TimerE
-__ZTIN9configmgr20OInnerValueSetUpdateE
-__ZTIN9configmgr20OMergeTreeChangeListE
-__ZTIN9configmgr20OSetElementGroupInfoE
-__ZTIN9configmgr20ServiceComponentImplE
-__ZTIN9configmgr21ORootElementGroupInfoE
-__ZTIN9configmgr21OTreeDisposeScheduler5TimerE
-__ZTIN9configmgr21SubtreeChangeReferrerE
-__ZTIN9configmgr22ChangeTreeModificationE
-__ZTIN9configmgr22IConfigDefaultProviderE
-__ZTIN9configmgr22IConfigTemplateManagerE
-__ZTIN9configmgr22OConfigurationProviderE
-__ZTIN9configmgr22OConfigurationRegistryE
-__ZTIN9configmgr22OSetElementGroupUpdateE
-__ZTIN9configmgr23ConfigChangeBroadcasterE
-__ZTIN9configmgr23IDefaultableTreeManagerE
-__ZTIN9configmgr23ORootElementGroupUpdateE
-__ZTIN9configmgr24OSetElementTreeSetUpdateE
-__ZTIN9configmgr25OConfigurationRegistryKeyE
-__ZTIN9configmgr25ORootElementTreeSetUpdateE
-__ZTIN9configmgr25OSetElementValueSetUpdateE
-__ZTIN9configmgr26OProviderDisposingListenerE
-__ZTIN9configmgr26ORootElementValueSetUpdateE
-__ZTIN9configmgr3xml11BasicParserE
-__ZTIN9configmgr3xml11LayerWriterE
-__ZTIN9configmgr3xml13ElementParser12BadValueTypeE
-__ZTIN9configmgr3xml13ParserServiceIN3com3sun4star13configuration7backend6XLayerEEE
-__ZTIN9configmgr3xml13ParserServiceIN3com3sun4star13configuration7backend7XSchemaEEE
-__ZTIN9configmgr3xml13WriterServiceIN3com3sun4star13configuration7backend13XLayerHandlerEEE
-__ZTIN9configmgr3xml18LayerParserServiceE
-__ZTIN9configmgr3xml19SchemaParserServiceE
-__ZTIN9configmgr4data10SetVisitorE
-__ZTIN9configmgr4data11NodeVisitorE
-__ZTIN9configmgr4data11TreeSegment4ImplE
-__ZTIN9configmgr4data15TreeNodeBuilder12LinkSetNodesE
-__ZTIN9configmgr4data20BasicDataTreeBuilderE
-__ZTIN9configmgr4data21ConvertingNodeBuilderE
-__ZTIN9configmgr4data21DataTreeDefaultMergerE
-__ZTIN9configmgr4data22CopyingDataTreeBuilder18ElementListBuilderE
-__ZTIN9configmgr4data22CopyingDataTreeBuilderE
-__ZTIN9configmgr4data24ConvertingSubnodeBuilderE
-__ZTIN9configmgr4data25ConvertingDataTreeBuilder18ElementListBuilderE
-__ZTIN9configmgr4data25ConvertingDataTreeBuilderE
-__ZTIN9configmgr4view12ViewStrategyE
-__ZTIN9configmgr4view18DirectViewStrategyE
-__ZTIN9configmgr4view20ReadOnlyViewStrategyE
-__ZTIN9configmgr5INodeE
-__ZTIN9configmgr6ChangeE
-__ZTIN9configmgr6memory11HeapManagerE
-__ZTIN9configmgr6memory14SimpleHeapLockE
-__ZTIN9configmgr6memory21SimpleHeapManagerBaseE
-__ZTIN9configmgr6memory25SimpleCheckingHeapManagerE
-__ZTIN9configmgr6memory8DataLockE
-__ZTIN9configmgr7AddNodeE
-__ZTIN9configmgr7backend10NodeUpdateE
-__ZTIN9configmgr7backend11NamedUpdateE
-__ZTIN9configmgr7backend11NodeReplaceE
-__ZTIN9configmgr7backend11PropertyAddE
-__ZTIN9configmgr7backend12ResultHolderINS0_12NodeInstanceEE10RCInstanceE
-__ZTIN9configmgr7backend12ResultHolderINS0_16TemplateInstanceEE10RCInstanceE
-__ZTIN9configmgr7backend12ResultHolderINS0_17ComponentInstanceEE10RCInstanceE
-__ZTIN9configmgr7backend13BackendAccessE
-__ZTIN9configmgr7backend13ElementUpdateE
-__ZTIN9configmgr7backend13PropertyResetE
-__ZTIN9configmgr7backend13SchemaBuilderE
-__ZTIN9configmgr7backend13UpdateServiceE
-__ZTIN9configmgr7backend14PropertyUpdateE
-__ZTIN9configmgr7backend15CacheControllerE
-__ZTIN9configmgr7backend16NodeModificationE
-__ZTIN9configmgr7backend17BasicUpdateMergerE
-__ZTIN9configmgr7backend17BinaryReader_ImplE
-__ZTIN9configmgr7backend17INodeDataListenerE
-__ZTIN9configmgr7backend17INodeDataProviderE
-__ZTIN9configmgr7backend17LayerMergeHandlerE
-__ZTIN9configmgr7backend17LayerUpdateMergerE
-__ZTIN9configmgr7backend18BasicImportHandlerE
-__ZTIN9configmgr7backend18BinaryWriteHandlerE
-__ZTIN9configmgr7backend18ImportMergeHandlerE
-__ZTIN9configmgr7backend18LayerUpdateHandlerE
-__ZTIN9configmgr7backend19ICachedDataListenerE
-__ZTIN9configmgr7backend19ICachedDataNotifierE
-__ZTIN9configmgr7backend19ICachedDataProviderE
-__ZTIN9configmgr7backend19IDirectDataProviderE
-__ZTIN9configmgr7backend19IMergedDataProviderE
-__ZTIN9configmgr7backend19INodeUpdateProviderE
-__ZTIN9configmgr7backend19LayerDefaultRemoverE
-__ZTIN9configmgr7backend19MultiStratumBackendE
-__ZTIN9configmgr7backend20IDefaultDataProviderE
-__ZTIN9configmgr7backend20SingleBackendAdapterE
-__ZTIN9configmgr7backend21BackendChangeNotifierE
-__ZTIN9configmgr7backend21IDataProviderMetaDataE
-__ZTIN9configmgr7backend21ITemplateDataProviderE
-__ZTIN9configmgr7backend21OInvalidateTreeThreadE
-__ZTIN9configmgr7backend22CacheChangeMulticasterE
-__ZTIN9configmgr7backend22IComponentDataProviderE
-__ZTIN9configmgr7backend8NodeDropE
-__ZTIN9configmgr7localbe16LocalStratumBaseE
-__ZTIN9configmgr7localbe17LocalMultiStratumE
-__ZTIN9configmgr7localbe18FlatLocalFileLayerE
-__ZTIN9configmgr7localbe18LocalSingleBackendE
-__ZTIN9configmgr7localbe19BasicLocalFileLayerE
-__ZTIN9configmgr7localbe19LayerPropertyHelperE
-__ZTIN9configmgr7localbe19LocalSchemaSupplierE
-__ZTIN9configmgr7localbe20SimpleLocalFileLayerE
-__ZTIN9configmgr7localbe23CompositeLocalFileLayerE
-__ZTIN9configmgr7localbe23LocalStratumMutexHolderE
-__ZTIN9configmgr7localbe27FullCompositeLocalFileLayerE
-__ZTIN9configmgr7localbe28BasicCompositeLocalFileLayerE
-__ZTIN9configmgr7SubtreeE
-__ZTIN9configmgr8BasicSetE
-__ZTIN9configmgr8ISubtreeE
-__ZTIN9configmgr8OOptionsE
-__ZTIN9configmgr9apihelper15BroadcasterBaseE
-__ZTIN9configmgr9apihelper17PropertySetHelperE
-__ZTIN9configmgr9apihelper18InteractionRequestE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task17XInteractionAbortEEE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task17XInteractionRetryEEE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task19XInteractionApproveEEE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task22XInteractionDisapproveEEE
-__ZTIN9configmgr9apihelper24SimpleInteractionRequestE
-__ZTIN9configmgr9apihelper31ConfigurationInteractionHandler7ContextE
-__ZTIN9configmgr9CacheDataE
-__ZTIN9configmgr9configapi10NodeAccessE
-__ZTIN9configmgr9configapi10SetElementE
-__ZTIN9configmgr9configapi11ApiTreeImpl16ComponentAdapterE
-__ZTIN9configmgr9configapi11Broadcaster4ImplE
-__ZTIN9configmgr9configapi11NodeElementE
-__ZTIN9configmgr9configapi11OSetElementINS0_15NodeGroupAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_17NodeSetInfoAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_17NodeTreeSetAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_18NodeValueSetAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_19NodeGroupInfoAccessEEE
-__ZTIN9configmgr9configapi11RootElementE
-__ZTIN9configmgr9configapi11TreeElementE
-__ZTIN9configmgr9configapi12InnerElementE
-__ZTIN9configmgr9configapi13NodeSetAccessE
-__ZTIN9configmgr9configapi13OInnerElementINS0_15NodeGroupAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_17NodeSetInfoAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_17NodeTreeSetAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_18NodeValueSetAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_19NodeGroupInfoAccessEEE
-__ZTIN9configmgr9configapi14ObjectRegistryE
-__ZTIN9configmgr9configapi15ApiRootTreeImpl12NodeListenerE
-__ZTIN9configmgr9configapi15NodeGroupAccessE
-__ZTIN9configmgr9configapi16OReadRootElementINS0_17NodeSetInfoAccessEEE
-__ZTIN9configmgr9configapi16OReadRootElementINS0_19NodeGroupInfoAccessEEE
-__ZTIN9configmgr9configapi17CollectPropertiesE
-__ZTIN9configmgr9configapi17NodeSetInfoAccessE
-__ZTIN9configmgr9configapi17NodeTreeSetAccessE
-__ZTIN9configmgr9configapi17UpdateRootElementE
-__ZTIN9configmgr9configapi18NodeValueSetAccessE
-__ZTIN9configmgr9configapi18OUpdateRootElementINS0_15NodeGroupAccessEEE
-__ZTIN9configmgr9configapi18OUpdateRootElementINS0_17NodeTreeSetAccessEEE
-__ZTIN9configmgr9configapi18OUpdateRootElementINS0_18NodeValueSetAccessEEE
-__ZTIN9configmgr9configapi19NodeGroupInfoAccessE
-__ZTIN9configmgr9configapi19NodePropertySetInfoE
-__ZTIN9configmgr9configapi19UpdateObjectFactoryE
-__ZTIN9configmgr9configapi21ReadOnlyObjectFactoryE
-__ZTIN9configmgr9configapi7FactoryE
-__ZTIN9configmgr9configapi8internal15SearchExactNameE
-__ZTIN9configmgr9OProviderE
-__ZTIN9configmgr9ValueNodeE
-__ZTIN9salhelper21SimpleReferenceObjectE
-;__ZTISt9bad_alloc
-;__ZTISt9exception
-
-
-IMPORTS
-__ZTIN10comphelper18OPropertyContainerE=configmg.__ZTIN10comphelper18OPropertyContainerE
-__ZTIN10comphelper24OPropertyContainerHelperE=configmg.__ZTIN10comphelper24OPropertyContainerHelperE
-__ZTIN10comphelper25OPropertyArrayUsageHelperIN9configmgr22OConfigurationProviderEEE=configmg.__ZTIN10comphelper25OPropertyArrayUsageHelperIN9configmgr22OConfigurationProviderEEE
-__ZTIN3com3sun4star13configuration17XTemplateInstanceE=configmg.__ZTIN3com3sun4star13configuration17XTemplateInstanceE
-__ZTIN3com3sun4star13configuration18XTemplateContainerE=configmg.__ZTIN3com3sun4star13configuration18XTemplateContainerE
-__ZTIN3com3sun4star13configuration29InvalidBootstrapFileExceptionE=configmg.__ZTIN3com3sun4star13configuration29InvalidBootstrapFileExceptionE
-__ZTIN3com3sun4star13configuration29MissingBootstrapFileExceptionE=configmg.__ZTIN3com3sun4star13configuration29MissingBootstrapFileExceptionE
-__ZTIN3com3sun4star13configuration31InstallationIncompleteExceptionE=configmg.__ZTIN3com3sun4star13configuration31InstallationIncompleteExceptionE
-__ZTIN3com3sun4star13configuration32CannotLoadConfigurationExceptionE=configmg.__ZTIN3com3sun4star13configuration32CannotLoadConfigurationExceptionE
-__ZTIN3com3sun4star13configuration7backend13XLayerHandlerE=configmg.__ZTIN3com3sun4star13configuration7backend13XLayerHandlerE
-__ZTIN3com3sun4star13configuration7backend14XLayerImporterE=configmg.__ZTIN3com3sun4star13configuration7backend14XLayerImporterE
-__ZTIN3com3sun4star13configuration7backend14XSchemaHandlerE=configmg.__ZTIN3com3sun4star13configuration7backend14XSchemaHandlerE
-__ZTIN3com3sun4star13configuration7backend14XUpdateHandlerE=configmg.__ZTIN3com3sun4star13configuration7backend14XUpdateHandlerE
-__ZTIN3com3sun4star13configuration7backend15XCompositeLayerE=configmg.__ZTIN3com3sun4star13configuration7backend15XCompositeLayerE
-__ZTIN3com3sun4star13configuration7backend15XSchemaSupplierE=configmg.__ZTIN3com3sun4star13configuration7backend15XSchemaSupplierE
-__ZTIN3com3sun4star13configuration7backend15XUpdatableLayerE=configmg.__ZTIN3com3sun4star13configuration7backend15XUpdatableLayerE
-__ZTIN3com3sun4star13configuration7backend16XBackendEntitiesE=configmg.__ZTIN3com3sun4star13configuration7backend16XBackendEntitiesE
-__ZTIN3com3sun4star13configuration7backend18XMultiLayerStratumE=configmg.__ZTIN3com3sun4star13configuration7backend18XMultiLayerStratumE
-__ZTIN3com3sun4star13configuration7backend19XSingleLayerStratumE=configmg.__ZTIN3com3sun4star13configuration7backend19XSingleLayerStratumE
-__ZTIN3com3sun4star13configuration7backend21BackendSetupExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend21BackendSetupExceptionE
-__ZTIN3com3sun4star13configuration7backend22BackendAccessExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend22BackendAccessExceptionE
-__ZTIN3com3sun4star13configuration7backend22CannotConnectExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend22CannotConnectExceptionE
-__ZTIN3com3sun4star13configuration7backend22MalformedDataExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend22MalformedDataExceptionE
-__ZTIN3com3sun4star13configuration7backend23ConnectionLostExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend23ConnectionLostExceptionE
-__ZTIN3com3sun4star13configuration7backend23XBackendChangesListenerE=configmg.__ZTIN3com3sun4star13configuration7backend23XBackendChangesListenerE
-__ZTIN3com3sun4star13configuration7backend23XBackendChangesNotifierE=configmg.__ZTIN3com3sun4star13configuration7backend23XBackendChangesNotifierE
-__ZTIN3com3sun4star13configuration7backend24StratumCreationExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend24StratumCreationExceptionE
-__ZTIN3com3sun4star13configuration7backend24XVersionedSchemaSupplierE=configmg.__ZTIN3com3sun4star13configuration7backend24XVersionedSchemaSupplierE
-__ZTIN3com3sun4star13configuration7backend29AuthenticationFailedExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend29AuthenticationFailedExceptionE
-__ZTIN3com3sun4star13configuration7backend33InsufficientAccessRightsExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend33InsufficientAccessRightsExceptionE
-__ZTIN3com3sun4star13configuration7backend39InvalidAuthenticationMechanismExceptionE=configmg.__ZTIN3com3sun4star13configuration7backend39InvalidAuthenticationMechanismExceptionE
-__ZTIN3com3sun4star13configuration7backend6XLayerE=configmg.__ZTIN3com3sun4star13configuration7backend6XLayerE
-__ZTIN3com3sun4star13configuration7backend7XSchemaE=configmg.__ZTIN3com3sun4star13configuration7backend7XSchemaE
-__ZTIN3com3sun4star13configuration7backend8XBackendE=configmg.__ZTIN3com3sun4star13configuration7backend8XBackendE
-__ZTIN3com3sun4star2io11IOExceptionE=configmg.__ZTIN3com3sun4star2io11IOExceptionE
-__ZTIN3com3sun4star2io12XInputStreamE=configmg.__ZTIN3com3sun4star2io12XInputStreamE
-__ZTIN3com3sun4star2io13XOutputStreamE=configmg.__ZTIN3com3sun4star2io13XOutputStreamE
-__ZTIN3com3sun4star2io15XActiveDataSinkE=configmg.__ZTIN3com3sun4star2io15XActiveDataSinkE
-__ZTIN3com3sun4star2io16XDataInputStreamE=configmg.__ZTIN3com3sun4star2io16XDataInputStreamE
-__ZTIN3com3sun4star2io17XActiveDataSourceE=configmg.__ZTIN3com3sun4star2io17XActiveDataSourceE
-__ZTIN3com3sun4star2io20WrongFormatExceptionE=configmg.__ZTIN3com3sun4star2io20WrongFormatExceptionE
-__ZTIN3com3sun4star2io21NotConnectedExceptionE=configmg.__ZTIN3com3sun4star2io21NotConnectedExceptionE
-__ZTIN3com3sun4star2io22UnexpectedEOFExceptionE=configmg.__ZTIN3com3sun4star2io22UnexpectedEOFExceptionE
-__ZTIN3com3sun4star2io27BufferSizeExceededExceptionE=configmg.__ZTIN3com3sun4star2io27BufferSizeExceededExceptionE
-__ZTIN3com3sun4star3uno10XInterfaceE=configmg.__ZTIN3com3sun4star3uno10XInterfaceE
-__ZTIN3com3sun4star3uno15XCurrentContextE=configmg.__ZTIN3com3sun4star3uno15XCurrentContextE
-;__ZTIN3com3sun4star3uno16RuntimeExceptionE=configmg.__ZTIN3com3sun4star3uno16RuntimeExceptionE
-__ZTIN3com3sun4star3uno17XComponentContextE=configmg.__ZTIN3com3sun4star3uno17XComponentContextE
-__ZTIN3com3sun4star3uno5XWeakE=configmg.__ZTIN3com3sun4star3uno5XWeakE
-;__ZTIN3com3sun4star3uno9ExceptionE=configmg.__ZTIN3com3sun4star3uno9ExceptionE
-__ZTIN3com3sun4star3xml3sax12SAXExceptionE=configmg.__ZTIN3com3sun4star3xml3sax12SAXExceptionE
-__ZTIN3com3sun4star3xml3sax14XAttributeListE=configmg.__ZTIN3com3sun4star3xml3sax14XAttributeListE
-__ZTIN3com3sun4star3xml3sax16XDocumentHandlerE=configmg.__ZTIN3com3sun4star3xml3sax16XDocumentHandlerE
-__ZTIN3com3sun4star4lang10XComponentE=configmg.__ZTIN3com3sun4star4lang10XComponentE
-__ZTIN3com3sun4star4lang10XUnoTunnelE=configmg.__ZTIN3com3sun4star4lang10XUnoTunnelE
-__ZTIN3com3sun4star4lang12XLocalizableE=configmg.__ZTIN3com3sun4star4lang12XLocalizableE
-__ZTIN3com3sun4star4lang12XServiceInfoE=configmg.__ZTIN3com3sun4star4lang12XServiceInfoE
-__ZTIN3com3sun4star4lang13XTypeProviderE=configmg.__ZTIN3com3sun4star4lang13XTypeProviderE
-__ZTIN3com3sun4star4lang14XEventListenerE=configmg.__ZTIN3com3sun4star4lang14XEventListenerE
-__ZTIN3com3sun4star4lang15XInitializationE=configmg.__ZTIN3com3sun4star4lang15XInitializationE
-__ZTIN3com3sun4star4lang17DisposedExceptionE=configmg.__ZTIN3com3sun4star4lang17DisposedExceptionE
-__ZTIN3com3sun4star4lang18NoSupportExceptionE=configmg.__ZTIN3com3sun4star4lang18NoSupportExceptionE
-__ZTIN3com3sun4star4lang20NullPointerExceptionE=configmg.__ZTIN3com3sun4star4lang20NullPointerExceptionE
-__ZTIN3com3sun4star4lang20XMultiServiceFactoryE=configmg.__ZTIN3com3sun4star4lang20XMultiServiceFactoryE
-__ZTIN3com3sun4star4lang21XSingleServiceFactoryE=configmg.__ZTIN3com3sun4star4lang21XSingleServiceFactoryE
-__ZTIN3com3sun4star4lang22IllegalAccessExceptionE=configmg.__ZTIN3com3sun4star4lang22IllegalAccessExceptionE
-__ZTIN3com3sun4star4lang22WrappedTargetExceptionE=configmg.__ZTIN3com3sun4star4lang22WrappedTargetExceptionE
-__ZTIN3com3sun4star4lang23XSingleComponentFactoryE=configmg.__ZTIN3com3sun4star4lang23XSingleComponentFactoryE
-__ZTIN3com3sun4star4lang24IllegalArgumentExceptionE=configmg.__ZTIN3com3sun4star4lang24IllegalArgumentExceptionE
-__ZTIN3com3sun4star4lang29ServiceNotRegisteredExceptionE=configmg.__ZTIN3com3sun4star4lang29ServiceNotRegisteredExceptionE
-__ZTIN3com3sun4star4lang29WrappedTargetRuntimeExceptionE=configmg.__ZTIN3com3sun4star4lang29WrappedTargetRuntimeExceptionE
-__ZTIN3com3sun4star4task17XInteractionAbortE=configmg.__ZTIN3com3sun4star4task17XInteractionAbortE
-__ZTIN3com3sun4star4task17XInteractionRetryE=configmg.__ZTIN3com3sun4star4task17XInteractionRetryE
-__ZTIN3com3sun4star4task19XInteractionApproveE=configmg.__ZTIN3com3sun4star4task19XInteractionApproveE
-__ZTIN3com3sun4star4task19XInteractionRequestE=configmg.__ZTIN3com3sun4star4task19XInteractionRequestE
-__ZTIN3com3sun4star4task22XInteractionDisapproveE=configmg.__ZTIN3com3sun4star4task22XInteractionDisapproveE
-__ZTIN3com3sun4star4task24XInteractionContinuationE=configmg.__ZTIN3com3sun4star4task24XInteractionContinuationE
-__ZTIN3com3sun4star4task4XJobE=configmg.__ZTIN3com3sun4star4task4XJobE
-__ZTIN3com3sun4star4util10XFlushableE=configmg.__ZTIN3com3sun4star4util10XFlushableE
-__ZTIN3com3sun4star4util12XRefreshableE=configmg.__ZTIN3com3sun4star4util12XRefreshableE
-__ZTIN3com3sun4star4util12XTimeStampedE=configmg.__ZTIN3com3sun4star4util12XTimeStampedE
-__ZTIN3com3sun4star4util13XChangesBatchE=configmg.__ZTIN3com3sun4star4util13XChangesBatchE
-__ZTIN3com3sun4star4util13XStringEscapeE=configmg.__ZTIN3com3sun4star4util13XStringEscapeE
-__ZTIN3com3sun4star4util16XChangesNotifierE=configmg.__ZTIN3com3sun4star4util16XChangesNotifierE
-__ZTIN3com3sun4star5beans10XExactNameE=configmg.__ZTIN3com3sun4star5beans10XExactNameE
-__ZTIN3com3sun4star5beans12XPropertySetE=configmg.__ZTIN3com3sun4star5beans12XPropertySetE
-__ZTIN3com3sun4star5beans14XPropertyStateE=configmg.__ZTIN3com3sun4star5beans14XPropertyStateE
-__ZTIN3com3sun4star5beans16XFastPropertySetE=configmg.__ZTIN3com3sun4star5beans16XFastPropertySetE
-__ZTIN3com3sun4star5beans16XPropertySetInfoE=configmg.__ZTIN3com3sun4star5beans16XPropertySetInfoE
-__ZTIN3com3sun4star5beans17XMultiPropertySetE=configmg.__ZTIN3com3sun4star5beans17XMultiPropertySetE
-__ZTIN3com3sun4star5beans18XPropertyWithStateE=configmg.__ZTIN3com3sun4star5beans18XPropertyWithStateE
-__ZTIN3com3sun4star5beans20XMultiPropertyStatesE=configmg.__ZTIN3com3sun4star5beans20XMultiPropertyStatesE
-__ZTIN3com3sun4star5beans21PropertyVetoExceptionE=configmg.__ZTIN3com3sun4star5beans21PropertyVetoExceptionE
-__ZTIN3com3sun4star5beans24UnknownPropertyExceptionE=configmg.__ZTIN3com3sun4star5beans24UnknownPropertyExceptionE
-__ZTIN3com3sun4star5beans24XHierarchicalPropertySetE=configmg.__ZTIN3com3sun4star5beans24XHierarchicalPropertySetE
-__ZTIN3com3sun4star5beans25XPropertiesChangeListenerE=configmg.__ZTIN3com3sun4star5beans25XPropertiesChangeListenerE
-__ZTIN3com3sun4star5beans29XMultiHierarchicalPropertySetE=configmg.__ZTIN3com3sun4star5beans29XMultiHierarchicalPropertySetE
-__ZTIN3com3sun4star5beans9XPropertyE=configmg.__ZTIN3com3sun4star5beans9XPropertyE
-__ZTIN3com3sun4star6script22CannotConvertExceptionE=configmg.__ZTIN3com3sun4star6script22CannotConvertExceptionE
-__ZTIN3com3sun4star8registry12XRegistryKeyE=configmg.__ZTIN3com3sun4star8registry12XRegistryKeyE
-__ZTIN3com3sun4star8registry15XSimpleRegistryE=configmg.__ZTIN3com3sun4star8registry15XSimpleRegistryE
-__ZTIN3com3sun4star8registry21InvalidValueExceptionE=configmg.__ZTIN3com3sun4star8registry21InvalidValueExceptionE
-__ZTIN3com3sun4star8registry22MergeConflictExceptionE=configmg.__ZTIN3com3sun4star8registry22MergeConflictExceptionE
-__ZTIN3com3sun4star8registry24InvalidRegistryExceptionE=configmg.__ZTIN3com3sun4star8registry24InvalidRegistryExceptionE
-__ZTIN3com3sun4star9container10XContainerE=configmg.__ZTIN3com3sun4star9container10XContainerE
-__ZTIN3com3sun4star9container11XNameAccessE=configmg.__ZTIN3com3sun4star9container11XNameAccessE
-__ZTIN3com3sun4star9container12XNameReplaceE=configmg.__ZTIN3com3sun4star9container12XNameReplaceE
-__ZTIN3com3sun4star9container14XElementAccessE=configmg.__ZTIN3com3sun4star9container14XElementAccessE
-__ZTIN3com3sun4star9container14XNameContainerE=configmg.__ZTIN3com3sun4star9container14XNameContainerE
-__ZTIN3com3sun4star9container17XHierarchicalNameE=configmg.__ZTIN3com3sun4star9container17XHierarchicalNameE
-__ZTIN3com3sun4star9container21ElementExistExceptionE=configmg.__ZTIN3com3sun4star9container21ElementExistExceptionE
-__ZTIN3com3sun4star9container22NoSuchElementExceptionE=configmg.__ZTIN3com3sun4star9container22NoSuchElementExceptionE
-__ZTIN3com3sun4star9container23XHierarchicalNameAccessE=configmg.__ZTIN3com3sun4star9container23XHierarchicalNameAccessE
-__ZTIN3com3sun4star9container6XChildE=configmg.__ZTIN3com3sun4star9container6XChildE
-__ZTIN3com3sun4star9container6XNamedE=configmg.__ZTIN3com3sun4star9container6XNamedE
-__ZTIN3vos10IReferenceE=configmg.__ZTIN3vos10IReferenceE
-__ZTIN3vos10OReferenceE=configmg.__ZTIN3vos10OReferenceE
-__ZTIN3vos6OTimerE=configmg.__ZTIN3vos6OTimerE
-__ZTIN3vos7OObjectE=configmg.__ZTIN3vos7OObjectE
-__ZTIN3vos7OThreadE=configmg.__ZTIN3vos7OThreadE
-__ZTIN3vos9IRunnableE=configmg.__ZTIN3vos9IRunnableE
-__ZTIN4cppu11ImplHelper2IN3com3sun4star8registry15XSimpleRegistryENS3_4util10XFlushableEEE=configmg.__ZTIN4cppu11ImplHelper2IN3com3sun4star8registry15XSimpleRegistryENS3_4util10XFlushableEEE
-__ZTIN4cppu11ImplHelper4IN3com3sun4star4lang20XMultiServiceFactoryENS4_12XLocalizableENS3_4util12XRefreshableENS7_10XFlushableEEE=configmg.__ZTIN4cppu11ImplHelper4IN3com3sun4star4lang20XMultiServiceFactoryENS4_12XLocalizableENS3_4util12XRefreshableENS7_10XFlushableEEE
-__ZTIN4cppu11ImplHelper6IN3com3sun4star5beans12XPropertySetENS4_17XMultiPropertySetENS4_24XHierarchicalPropertySetENS4_29XMultiHierarchicalPropertySetENS4_14XPropertyStateENS4_20XMultiPropertyStatesEEE=configmg.__ZTIN4cppu11ImplHelper6IN3com3sun4star5beans12XPropertySetENS4_17XMultiPropertySetENS4_24XHierarchicalPropertySetENS4_29XMultiHierarchicalPropertySetENS4_14XPropertyStateENS4_20XMultiPropertyStatesEEE
-__ZTIN4cppu11ImplHelper6IN3com3sun4star9container11XNameAccessENS4_17XHierarchicalNameENS4_23XHierarchicalNameAccessENS4_10XContainerENS3_5beans10XExactNameENS9_9XPropertyEEE=configmg.__ZTIN4cppu11ImplHelper6IN3com3sun4star9container11XNameAccessENS4_17XHierarchicalNameENS4_23XHierarchicalNameAccessENS4_10XContainerENS3_5beans10XExactNameENS9_9XPropertyEEE
-__ZTIN4cppu11ImplHelper9IN3com3sun4star9container11XNameAccessENS4_17XHierarchicalNameENS4_23XHierarchicalNameAccessENS4_10XContainerENS3_5beans10XExactNameENS9_9XPropertyENS9_16XPropertySetInfoENS3_13configuration18XTemplateCo!_yPkJc2=configmg.__ZTIN4cppu11ImplHelper9IN3com3sun4star9container11XNameAccessENS4_17XHierarchicalNameENS4_23XHierarchicalNameAccessENS4_10XContainerENS3_5beans10XExactNameENS9_9XPropertyENS9_16XPropertySetInfoENS3_13configuration18XTemplateCo!_yPkJc2
-__ZTIN4cppu11OWeakObjectE=configmg.__ZTIN4cppu11OWeakObjectE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend13XLayerHandlerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend13XLayerHandlerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend14XSchemaHandlerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend14XSchemaHandlerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend15XCompositeLayerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend15XCompositeLayerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend23XBackendChangesListenerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend23XBackendChangesListenerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend6XLayerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star13configuration7backend6XLayerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io12XInputStreamEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io12XInputStreamEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io13XOutputStreamEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io13XOutputStreamEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io16XDataInputStreamEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star2io16XDataInputStreamEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3uno15XCurrentContextEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3uno15XCurrentContextEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3xml3sax14XAttributeListEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3xml3sax14XAttributeListEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3xml3sax16XDocumentHandlerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star3xml3sax16XDocumentHandlerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4lang14XEventListenerEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4lang14XEventListenerEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4lang23XSingleComponentFactoryEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4lang23XSingleComponentFactoryEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task17XInteractionAbortEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task17XInteractionAbortEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task17XInteractionRetryEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task17XInteractionRetryEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task19XInteractionApproveEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task19XInteractionApproveEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task19XInteractionRequestEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task19XInteractionRequestEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task22XInteractionDisapproveEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star4task22XInteractionDisapproveEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star5beans16XPropertySetInfoEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star5beans16XPropertySetInfoEEE
-__ZTIN4cppu15WeakImplHelper1IN3com3sun4star8registry12XRegistryKeyEEE=configmg.__ZTIN4cppu15WeakImplHelper1IN3com3sun4star8registry12XRegistryKeyEEE
-__ZTIN4cppu15WeakImplHelper2IN3com3sun4star13configuration7backend13XLayerHandlerENS5_6XLayerEEE=configmg.__ZTIN4cppu15WeakImplHelper2IN3com3sun4star13configuration7backend13XLayerHandlerENS5_6XLayerEEE
-__ZTIN4cppu15WeakImplHelper2IN3com3sun4star3uno15XCurrentContextENS3_4lang10XUnoTunnelEEE=configmg.__ZTIN4cppu15WeakImplHelper2IN3com3sun4star3uno15XCurrentContextENS3_4lang10XUnoTunnelEEE
-__ZTIN4cppu15WeakImplHelper2IN3com3sun4star4task4XJobENS3_4lang12XServiceInfoEEE=configmg.__ZTIN4cppu15WeakImplHelper2IN3com3sun4star4task4XJobENS3_4lang12XServiceInfoEEE
-__ZTIN4cppu15WeakImplHelper3IN3com3sun4star13configuration7backend14XLayerImporterENS3_4lang15XInitializationENS7_12XServiceInfoEEE=configmg.__ZTIN4cppu15WeakImplHelper3IN3com3sun4star13configuration7backend14XLayerImporterENS3_4lang15XInitializationENS7_12XServiceInfoEEE
-__ZTIN4cppu15WeakImplHelper3IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_13configuration7backend14XUpdateHandlerEEE=configmg.__ZTIN4cppu15WeakImplHelper3IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_13configuration7backend14XUpdateHandlerEEE
-__ZTIN4cppu15WeakImplHelper3IN3com3sun4star9container6XChildENS4_6XNamedENS3_4lang12XServiceInfoEEE=configmg.__ZTIN4cppu15WeakImplHelper3IN3com3sun4star9container6XChildENS4_6XNamedENS3_4lang12XServiceInfoEEE
-__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io15XActiveDataSinkENS3_13configuration7backend6XLayerEEE=configmg.__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io15XActiveDataSinkENS3_13configuration7backend6XLayerEEE
-__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io15XActiveDataSinkENS3_13configuration7backend7XSchemaEEE=configmg.__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io15XActiveDataSinkENS3_13configuration7backend7XSchemaEEE
-__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io17XActiveDataSourceENS3_13configuration7backend13XLayerHandlerEEE=configmg.__ZTIN4cppu15WeakImplHelper4IN3com3sun4star4lang15XInitializationENS4_12XServiceInfoENS3_2io17XActiveDataSourceENS3_13configuration7backend13XLayerHandlerEEE
-__ZTIN4cppu15WeakImplHelper5IN3com3sun4star9container6XNamedENS3_4util16XChangesNotifierENS3_4lang10XComponentENS8_12XServiceInfoENS8_12XLocalizableEEE=configmg.__ZTIN4cppu15WeakImplHelper5IN3com3sun4star9container6XNamedENS3_4util16XChangesNotifierENS3_4lang10XComponentENS8_12XServiceInfoENS8_12XLocalizableEEE
-__ZTIN4cppu15WeakImplHelper6IN3com3sun4star9container6XChildENS4_6XNamedENS3_4lang10XComponentENS7_12XServiceInfoENS3_13configuration17XTemplateInstanceENS7_10XUnoTunnelEEE=configmg.__ZTIN4cppu15WeakImplHelper6IN3com3sun4star9container6XChildENS4_6XNamedENS3_4lang10XComponentENS7_12XServiceInfoENS3_13configuration17XTemplateInstanceENS7_10XUnoTunnelEEE
-__ZTIN4cppu15WeakImplHelper6IN3com3sun4star9container6XNamedENS3_4util16XChangesNotifierENS3_4lang10XComponentENS8_12XServiceInfoENS8_12XLocalizableENS6_13XChangesBatchEEE=configmg.__ZTIN4cppu15WeakImplHelper6IN3com3sun4star9container6XNamedENS3_4util16XChangesNotifierENS3_4lang10XComponentENS8_12XServiceInfoENS8_12XLocalizableENS6_13XChangesBatchEEE
-__ZTIN4cppu18OPropertySetHelperE=configmg.__ZTIN4cppu18OPropertySetHelperE
-__ZTIN4cppu22ImplInheritanceHelper1IN9configmgr7localbe16LocalStratumBaseEN3com3sun4star13configuration7backend18XMultiLayerStratumEEE=configmg.__ZTIN4cppu22ImplInheritanceHelper1IN9configmgr7localbe16LocalStratumBaseEN3com3sun4star13configuration7backend18XMultiLayerStratumEEE
-__ZTIN4cppu22ImplInheritanceHelper1IN9configmgr7localbe16LocalStratumBaseEN3com3sun4star13configuration7backend19XSingleLayerStratumEEE=configmg.__ZTIN4cppu22ImplInheritanceHelper1IN9configmgr7localbe16LocalStratumBaseEN3com3sun4star13configuration7backend19XSingleLayerStratumEEE
-__ZTIN4cppu22ImplInheritanceHelper2IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend15XUpdatableLayerENS6_4util12XTimeStampedEEE=configmg.__ZTIN4cppu22ImplInheritanceHelper2IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend15XUpdatableLayerENS6_4util12XTimeStampedEEE
-__ZTIN4cppu22ImplInheritanceHelper2IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend6XLayerENS6_4util12XTimeStampedEEE=configmg.__ZTIN4cppu22ImplInheritanceHelper2IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend6XLayerENS6_4util12XTimeStampedEEE
-__ZTIN4cppu22ImplInheritanceHelper3IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend15XUpdatableLayerENS8_15XCompositeLayerENS6_4util12XTimeStampedEEE=configmg.__ZTIN4cppu22ImplInheritanceHelper3IN9configmgr7localbe19LayerPropertyHelperEN3com3sun4star13configuration7backend15XUpdatableLayerENS8_15XCompositeLayerENS6_4util12XTimeStampedEEE
-__ZTIN4cppu24WeakComponentImplHelper1IN3com3sun4star4lang12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper1IN3com3sun4star4lang12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper2IN3com3sun4star4lang20XMultiServiceFactoryENS4_12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper2IN3com3sun4star4lang20XMultiServiceFactoryENS4_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star13configuration7backend24XVersionedSchemaSupplierENS3_4lang15XInitializationENS7_12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star13configuration7backend24XVersionedSchemaSupplierENS3_4lang15XInitializationENS7_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star3uno17XComponentContextENS4_15XCurrentContextENS3_4lang12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star3uno17XComponentContextENS4_15XCurrentContextENS3_4lang12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star4lang15XInitializationENS3_13configuration7backend16XBackendEntitiesENS4_12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper3IN3com3sun4star4lang15XInitializationENS3_13configuration7backend16XBackendEntitiesENS4_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper5IN3com3sun4star13configuration7backend15XSchemaSupplierENS5_18XMultiLayerStratumENS5_16XBackendEntitiesENS3_4lang15XInitializationENS9_12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper5IN3com3sun4star13configuration7backend15XSchemaSupplierENS5_18XMultiLayerStratumENS5_16XBackendEntitiesENS3_4lang15XInitializationENS9_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper5IN3com3sun4star13configuration7backend8XBackendENS5_16XBackendEntitiesENS5_15XSchemaSupplierENS3_4lang15XInitializationENS9_12XServiceInfoEEE=configmg.__ZTIN4cppu24WeakComponentImplHelper5IN3com3sun4star13configuration7backend8XBackendENS5_16XBackendEntitiesENS5_15XSchemaSupplierENS3_4lang15XInitializationENS9_12XServiceInfoEEE
-__ZTIN4cppu24WeakComponentImplHelper7IN3com3sun4star13configuration7backend8XBackendENS5_16XBackendEntitiesENS5_24XVersionedSchemaSupplierENS5_23XBackendChangesNotifierENS5_23XBackendChangesListenerENS3_4lang15XInitializationEN!_7c1rO0=configmg.__ZTIN4cppu24WeakComponentImplHelper7IN3com3sun4star13configuration7backend8XBackendENS5_16XBackendEntitiesENS5_24XVersionedSchemaSupplierENS5_23XBackendChangesNotifierENS5_23XBackendChangesListenerENS3_4lang15XInitializationEN!_7c1rO0
-__ZTIN4cppu27WeakComponentImplHelperBaseE=configmg.__ZTIN4cppu27WeakComponentImplHelperBaseE
-__ZTIN9configmgr10BasicGroupE=configmg.__ZTIN9configmgr10BasicGroupE
-__ZTIN9configmgr10IInterfaceE=configmg.__ZTIN9configmgr10IInterfaceE
-__ZTIN9configmgr10NodeActionE=configmg.__ZTIN9configmgr10NodeActionE
-__ZTIN9configmgr10RefcountedE=configmg.__ZTIN9configmgr10RefcountedE
-__ZTIN9configmgr10RemoveNodeE=configmg.__ZTIN9configmgr10RemoveNodeE
-__ZTIN9configmgr10SearchNodeE=configmg.__ZTIN9configmgr10SearchNodeE
-__ZTIN9configmgr11ApplyUpdateE=configmg.__ZTIN9configmgr11ApplyUpdateE
-__ZTIN9configmgr11NoncopyableE=configmg.__ZTIN9configmgr11NoncopyableE
-__ZTIN9configmgr11TreeManagerE=configmg.__ZTIN9configmgr11TreeManagerE
-__ZTIN9configmgr11TreeUpdaterE=configmg.__ZTIN9configmgr11TreeUpdaterE
-__ZTIN9configmgr11ValueChangeE=configmg.__ZTIN9configmgr11ValueChangeE
-__ZTIN9configmgr12AdjustUpdateE=configmg.__ZTIN9configmgr12AdjustUpdateE
-__ZTIN9configmgr12CollectNamesE=configmg.__ZTIN9configmgr12CollectNamesE
-__ZTIN9configmgr12ITreeManagerE=configmg.__ZTIN9configmgr12ITreeManagerE
-__ZTIN9configmgr12ONameCreatorE=configmg.__ZTIN9configmgr12ONameCreatorE
-__ZTIN9configmgr12OPathCreatorINS_13configuration12AbsolutePathEEE=configmg.__ZTIN9configmgr12OPathCreatorINS_13configuration12AbsolutePathEEE
-__ZTIN9configmgr12OPathCreatorINS_13configuration12RelativePathEEE=configmg.__ZTIN9configmgr12OPathCreatorINS_13configuration12RelativePathEEE
-__ZTIN9configmgr13BasicValueSetE=configmg.__ZTIN9configmgr13BasicValueSetE
-__ZTIN9configmgr13INodeListenerE=configmg.__ZTIN9configmgr13INodeListenerE
-__ZTIN9configmgr13OInnerSetInfoE=configmg.__ZTIN9configmgr13OInnerSetInfoE
-__ZTIN9configmgr13OMergeChangesE=configmg.__ZTIN9configmgr13OMergeChangesE
-__ZTIN9configmgr13OProviderImplE=configmg.__ZTIN9configmgr13OProviderImplE
-__ZTIN9configmgr13PWMutexHolderE=configmg.__ZTIN9configmgr13PWMutexHolderE
-__ZTIN9configmgr13SubtreeChangeE=configmg.__ZTIN9configmgr13SubtreeChangeE
-__ZTIN9configmgr13configuration100_GLOBAL__N__ZN9configmgr13configuration12TemplateName18makeSimpleTypeNameERKN3com3sun4star3uno4TypeE12TypeDetectorE=configmg.__ZTIN9configmgr13configuration100_GLOBAL__N__ZN9configmgr13configuration12TemplateName18makeSimpleTypeNameERKN3com3sun4star3uno4TypeE12TypeDetectorE
-__ZTIN9configmgr13configuration11InvalidNameE=configmg.__ZTIN9configmgr13configuration11InvalidNameE
-__ZTIN9configmgr13configuration11NodeVisitorE=configmg.__ZTIN9configmgr13configuration11NodeVisitorE
-__ZTIN9configmgr13configuration11SetNodeImplE=configmg.__ZTIN9configmgr13configuration11SetNodeImplE
-__ZTIN9configmgr13configuration12RootTreeImplE=configmg.__ZTIN9configmgr13configuration12RootTreeImplE
-__ZTIN9configmgr13configuration12SetResetImplE=configmg.__ZTIN9configmgr13configuration12SetResetImplE
-__ZTIN9configmgr13configuration12TypeMismatchE=configmg.__ZTIN9configmgr13configuration12TypeMismatchE
-__ZTIN9configmgr13configuration13GroupNodeImplE=configmg.__ZTIN9configmgr13configuration13GroupNodeImplE
-__ZTIN9configmgr13configuration13SetChangeImplE=configmg.__ZTIN9configmgr13configuration13SetChangeImplE
-__ZTIN9configmgr13configuration13SetInsertImplE=configmg.__ZTIN9configmgr13configuration13SetInsertImplE
-__ZTIN9configmgr13configuration13SetRemoveImplE=configmg.__ZTIN9configmgr13configuration13SetRemoveImplE
-__ZTIN9configmgr13configuration14CollectChangesE=configmg.__ZTIN9configmgr13configuration14CollectChangesE
-__ZTIN9configmgr13configuration14NodeChangeImplE=configmg.__ZTIN9configmgr13configuration14NodeChangeImplE
-__ZTIN9configmgr13configuration14SetNodeVisitorE=configmg.__ZTIN9configmgr13configuration14SetNodeVisitorE
-__ZTIN9configmgr13configuration14SetReplaceImplE=configmg.__ZTIN9configmgr13configuration14SetReplaceImplE
-__ZTIN9configmgr13configuration14ValueResetImplE=configmg.__ZTIN9configmgr13configuration14ValueResetImplE
-__ZTIN9configmgr13configuration15ElementTreeImplE=configmg.__ZTIN9configmgr13configuration15ElementTreeImplE
-__ZTIN9configmgr13configuration15TreeImplBuilderE=configmg.__ZTIN9configmgr13configuration15TreeImplBuilderE
-__ZTIN9configmgr13configuration15ValueChangeImplE=configmg.__ZTIN9configmgr13configuration15ValueChangeImplE
-__ZTIN9configmgr13configuration15ValueMemberNode12DeferredImplE=configmg.__ZTIN9configmgr13configuration15ValueMemberNode12DeferredImplE
-__ZTIN9configmgr13configuration16ValueReplaceImplE=configmg.__ZTIN9configmgr13configuration16ValueReplaceImplE
-__ZTIN9configmgr13configuration18GroupMemberVisitorE=configmg.__ZTIN9configmgr13configuration18GroupMemberVisitorE
-__ZTIN9configmgr13configuration19ConstraintViolationE=configmg.__ZTIN9configmgr13configuration19ConstraintViolationE
-__ZTIN9configmgr13configuration19DeferredSetNodeImplE=configmg.__ZTIN9configmgr13configuration19DeferredSetNodeImplE
-__ZTIN9configmgr13configuration19WrappedUnoExceptionE=configmg.__ZTIN9configmgr13configuration19WrappedUnoExceptionE
-__ZTIN9configmgr13configuration20DefaultProviderProxyE=configmg.__ZTIN9configmgr13configuration20DefaultProviderProxyE
-__ZTIN9configmgr13configuration20SetElementChangeImplE=configmg.__ZTIN9configmgr13configuration20SetElementChangeImplE
-__ZTIN9configmgr13configuration20ValueElementNodeImplE=configmg.__ZTIN9configmgr13configuration20ValueElementNodeImplE
-__ZTIN9configmgr13configuration21DeferredGroupNodeImplE=configmg.__ZTIN9configmgr13configuration21DeferredGroupNodeImplE
-__ZTIN9configmgr13configuration21TemplateProvider_ImplE=configmg.__ZTIN9configmgr13configuration21TemplateProvider_ImplE
-__ZTIN9configmgr13configuration28SpecialTemplateProvider_ImplE=configmg.__ZTIN9configmgr13configuration28SpecialTemplateProvider_ImplE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv15CollectValueIDsE=configmg.__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv15CollectValueIDsE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv17SetVisitorAdapterE=configmg.__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv17SetVisitorAdapterE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv19GroupVisitorAdapterE=configmg.__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv19GroupVisitorAdapterE
-__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv21FindNonDefaultElementE=configmg.__ZTIN9configmgr13configuration55_GLOBAL__N__ZNK9configmgr13configuration4Tree7getViewEv21FindNonDefaultElementE
-__ZTIN9configmgr13configuration88_GLOBAL__N__ZN9configmgr13configuration17GroupUpdateHelperC2ERKNS0_4TreeERKNS0_7NodeRefE13NodeDefaulterE=configmg.__ZTIN9configmgr13configuration88_GLOBAL__N__ZN9configmgr13configuration17GroupUpdateHelperC2ERKNS0_4TreeERKNS0_7NodeRefE13NodeDefaulterE
-__ZTIN9configmgr13configuration8NodeImplE=configmg.__ZTIN9configmgr13configuration8NodeImplE
-__ZTIN9configmgr13configuration8TemplateE=configmg.__ZTIN9configmgr13configuration8TemplateE
-__ZTIN9configmgr13configuration8TreeImplE=configmg.__ZTIN9configmgr13configuration8TreeImplE
-__ZTIN9configmgr13configuration9ExceptionE=configmg.__ZTIN9configmgr13configuration9ExceptionE
-__ZTIN9configmgr14BasicSetAccessE=configmg.__ZTIN9configmgr14BasicSetAccessE
-__ZTIN9configmgr14ONodeConverterE=configmg.__ZTIN9configmgr14ONodeConverterE
-__ZTIN9configmgr14OStripDefaultsE=configmg.__ZTIN9configmgr14OStripDefaultsE
-__ZTIN9configmgr15BasicSetElementE=configmg.__ZTIN9configmgr15BasicSetElementE
-__ZTIN9configmgr15IConfigListenerE=configmg.__ZTIN9configmgr15IConfigListenerE
-__ZTIN9configmgr15OInnerGroupInfoE=configmg.__ZTIN9configmgr15OInnerGroupInfoE
-__ZTIN9configmgr15ProviderFactoryE=configmg.__ZTIN9configmgr15ProviderFactoryE
-__ZTIN9configmgr15ProviderWrapperE=configmg.__ZTIN9configmgr15ProviderWrapperE
-__ZTIN9configmgr16BasicGroupAccessE=configmg.__ZTIN9configmgr16BasicGroupAccessE
-__ZTIN9configmgr16BasicPropertySetE=configmg.__ZTIN9configmgr16BasicPropertySetE
-__ZTIN9configmgr16BasicRootElementE=configmg.__ZTIN9configmgr16BasicRootElementE
-__ZTIN9configmgr16BootstrapContextE=configmg.__ZTIN9configmgr16BootstrapContextE
-__ZTIN9configmgr16ChangeTreeActionE=configmg.__ZTIN9configmgr16ChangeTreeActionE
-__ZTIN9configmgr16ComponentContextE=configmg.__ZTIN9configmgr16ComponentContextE
-__ZTIN9configmgr16IDefaultProviderE=configmg.__ZTIN9configmgr16IDefaultProviderE
-__ZTIN9configmgr16ITemplateManagerE=configmg.__ZTIN9configmgr16ITemplateManagerE
-__ZTIN9configmgr16NodeModificationE=configmg.__ZTIN9configmgr16NodeModificationE
-__ZTIN9configmgr16OMergeRemoveNodeE=configmg.__ZTIN9configmgr16OMergeRemoveNodeE
-__ZTIN9configmgr16OPropagateLevelsE=configmg.__ZTIN9configmgr16OPropagateLevelsE
-__ZTIN9configmgr16UnoContextTunnel6TunnelE=configmg.__ZTIN9configmgr16UnoContextTunnel6TunnelE
-__ZTIN9configmgr17AttributeListImplE=configmg.__ZTIN9configmgr17AttributeListImplE
-__ZTIN9configmgr17BasicInnerElementE=configmg.__ZTIN9configmgr17BasicInnerElementE
-__ZTIN9configmgr17CacheClientAccessE=configmg.__ZTIN9configmgr17CacheClientAccessE
-__ZTIN9configmgr17ExtendedCacheDataE=configmg.__ZTIN9configmgr17ExtendedCacheDataE
-__ZTIN9configmgr17ExtendedCacheLineE=configmg.__ZTIN9configmgr17ExtendedCacheLineE
-__ZTIN9configmgr17OInnerGroupUpdateE=configmg.__ZTIN9configmgr17OInnerGroupUpdateE
-__ZTIN9configmgr17OMergeValueChangeE=configmg.__ZTIN9configmgr17OMergeValueChangeE
-__ZTIN9configmgr17TemplateCacheDataE=configmg.__ZTIN9configmgr17TemplateCacheDataE
-__ZTIN9configmgr18BasicUpdateElementE=configmg.__ZTIN9configmgr18BasicUpdateElementE
-__ZTIN9configmgr18CacheLoadingAccessE=configmg.__ZTIN9configmgr18CacheLoadingAccessE
-__ZTIN9configmgr18DisposingForwarderE=configmg.__ZTIN9configmgr18DisposingForwarderE
-__ZTIN9configmgr18IConfigBroadcasterE=configmg.__ZTIN9configmgr18IConfigBroadcasterE
-__ZTIN9configmgr18IConfigTreeManagerE=configmg.__ZTIN9configmgr18IConfigTreeManagerE
-__ZTIN9configmgr18OSetElementSetInfoE=configmg.__ZTIN9configmgr18OSetElementSetInfoE
-__ZTIN9configmgr19OInnerTreeSetUpdateE=configmg.__ZTIN9configmgr19OInnerTreeSetUpdateE
-__ZTIN9configmgr19ORootElementSetInfoE=configmg.__ZTIN9configmgr19ORootElementSetInfoE
-__ZTIN9configmgr20OCacheWriteScheduler5TimerE=configmg.__ZTIN9configmgr20OCacheWriteScheduler5TimerE
-__ZTIN9configmgr20OChangeActionCounterE=configmg.__ZTIN9configmgr20OChangeActionCounterE
-__ZTIN9configmgr20OCreateSubtreeActionE=configmg.__ZTIN9configmgr20OCreateSubtreeActionE
-__ZTIN9configmgr20OInnerValueSetUpdateE=configmg.__ZTIN9configmgr20OInnerValueSetUpdateE
-__ZTIN9configmgr20OMergeTreeChangeListE=configmg.__ZTIN9configmgr20OMergeTreeChangeListE
-__ZTIN9configmgr20OSetElementGroupInfoE=configmg.__ZTIN9configmgr20OSetElementGroupInfoE
-__ZTIN9configmgr20ServiceComponentImplE=configmg.__ZTIN9configmgr20ServiceComponentImplE
-__ZTIN9configmgr21ORootElementGroupInfoE=configmg.__ZTIN9configmgr21ORootElementGroupInfoE
-__ZTIN9configmgr21OSLInputStreamWrapperE=configmg.__ZTIN9configmgr21OSLInputStreamWrapperE
-__ZTIN9configmgr21OTreeDisposeScheduler5TimerE=configmg.__ZTIN9configmgr21OTreeDisposeScheduler5TimerE
-__ZTIN9configmgr21SubtreeChangeReferrerE=configmg.__ZTIN9configmgr21SubtreeChangeReferrerE
-__ZTIN9configmgr22ChangeTreeModificationE=configmg.__ZTIN9configmgr22ChangeTreeModificationE
-__ZTIN9configmgr22IConfigDefaultProviderE=configmg.__ZTIN9configmgr22IConfigDefaultProviderE
-__ZTIN9configmgr22IConfigTemplateManagerE=configmg.__ZTIN9configmgr22IConfigTemplateManagerE
-__ZTIN9configmgr22OConfigurationProviderE=configmg.__ZTIN9configmgr22OConfigurationProviderE
-__ZTIN9configmgr22OConfigurationRegistryE=configmg.__ZTIN9configmgr22OConfigurationRegistryE
-__ZTIN9configmgr22OSLOutputStreamWrapperE=configmg.__ZTIN9configmgr22OSLOutputStreamWrapperE
-__ZTIN9configmgr22OSetElementGroupUpdateE=configmg.__ZTIN9configmgr22OSetElementGroupUpdateE
-__ZTIN9configmgr23ConfigChangeBroadcasterE=configmg.__ZTIN9configmgr23ConfigChangeBroadcasterE
-__ZTIN9configmgr23IDefaultableTreeManagerE=configmg.__ZTIN9configmgr23IDefaultableTreeManagerE
-__ZTIN9configmgr23ORootElementGroupUpdateE=configmg.__ZTIN9configmgr23ORootElementGroupUpdateE
-__ZTIN9configmgr24OSetElementTreeSetUpdateE=configmg.__ZTIN9configmgr24OSetElementTreeSetUpdateE
-__ZTIN9configmgr25OConfigurationRegistryKeyE=configmg.__ZTIN9configmgr25OConfigurationRegistryKeyE
-__ZTIN9configmgr25ORootElementTreeSetUpdateE=configmg.__ZTIN9configmgr25ORootElementTreeSetUpdateE
-__ZTIN9configmgr25OSetElementValueSetUpdateE=configmg.__ZTIN9configmgr25OSetElementValueSetUpdateE
-__ZTIN9configmgr26OConfigurationProviderImplE=configmg.__ZTIN9configmgr26OConfigurationProviderImplE
-__ZTIN9configmgr26OProviderDisposingListenerE=configmg.__ZTIN9configmgr26OProviderDisposingListenerE
-__ZTIN9configmgr26ORootElementValueSetUpdateE=configmg.__ZTIN9configmgr26ORootElementValueSetUpdateE
-__ZTIN9configmgr26PropertiesFilteredNotifierE=configmg.__ZTIN9configmgr26PropertiesFilteredNotifierE
-__ZTIN9configmgr28ForwardTreeDifferenceBuilderE=configmg.__ZTIN9configmgr28ForwardTreeDifferenceBuilderE
-__ZTIN9configmgr29BackwardTreeDifferenceBuilderE=configmg.__ZTIN9configmgr29BackwardTreeDifferenceBuilderE
-__ZTIN9configmgr29OSLInputBufferedStreamWrapperE=configmg.__ZTIN9configmgr29OSLInputBufferedStreamWrapperE
-__ZTIN9configmgr3xml11BasicParserE=configmg.__ZTIN9configmgr3xml11BasicParserE
-__ZTIN9configmgr3xml11LayerParserE=configmg.__ZTIN9configmgr3xml11LayerParserE
-__ZTIN9configmgr3xml11LayerWriterE=configmg.__ZTIN9configmgr3xml11LayerWriterE
-__ZTIN9configmgr3xml12SchemaParserE=configmg.__ZTIN9configmgr3xml12SchemaParserE
-__ZTIN9configmgr3xml13ElementParser12BadValueTypeE=configmg.__ZTIN9configmgr3xml13ElementParser12BadValueTypeE
-__ZTIN9configmgr3xml13ParserServiceIN3com3sun4star13configuration7backend6XLayerEEE=configmg.__ZTIN9configmgr3xml13ParserServiceIN3com3sun4star13configuration7backend6XLayerEEE
-__ZTIN9configmgr3xml13ParserServiceIN3com3sun4star13configuration7backend7XSchemaEEE=configmg.__ZTIN9configmgr3xml13ParserServiceIN3com3sun4star13configuration7backend7XSchemaEEE
-__ZTIN9configmgr3xml13WriterServiceIN3com3sun4star13configuration7backend13XLayerHandlerEEE=configmg.__ZTIN9configmgr3xml13WriterServiceIN3com3sun4star13configuration7backend13XLayerHandlerEEE
-__ZTIN9configmgr3xml18LayerParserServiceE=configmg.__ZTIN9configmgr3xml18LayerParserServiceE
-__ZTIN9configmgr3xml19SchemaParserServiceE=configmg.__ZTIN9configmgr3xml19SchemaParserServiceE
-__ZTIN9configmgr4data10SetVisitorE=configmg.__ZTIN9configmgr4data10SetVisitorE
-__ZTIN9configmgr4data11NodeVisitorE=configmg.__ZTIN9configmgr4data11NodeVisitorE
-__ZTIN9configmgr4data11TreeSegment4ImplE=configmg.__ZTIN9configmgr4data11TreeSegment4ImplE
-__ZTIN9configmgr4data15TreeNodeBuilder12LinkSetNodesE=configmg.__ZTIN9configmgr4data15TreeNodeBuilder12LinkSetNodesE
-__ZTIN9configmgr4data20BasicDataTreeBuilderE=configmg.__ZTIN9configmgr4data20BasicDataTreeBuilderE
-__ZTIN9configmgr4data21ConvertingNodeBuilderE=configmg.__ZTIN9configmgr4data21ConvertingNodeBuilderE
-__ZTIN9configmgr4data21DataTreeDefaultMergerE=configmg.__ZTIN9configmgr4data21DataTreeDefaultMergerE
-__ZTIN9configmgr4data22CopyingDataTreeBuilder18ElementListBuilderE=configmg.__ZTIN9configmgr4data22CopyingDataTreeBuilder18ElementListBuilderE
-__ZTIN9configmgr4data22CopyingDataTreeBuilderE=configmg.__ZTIN9configmgr4data22CopyingDataTreeBuilderE
-__ZTIN9configmgr4data24ConvertingSubnodeBuilderE=configmg.__ZTIN9configmgr4data24ConvertingSubnodeBuilderE
-__ZTIN9configmgr4data25ConvertingDataTreeBuilder18ElementListBuilderE=configmg.__ZTIN9configmgr4data25ConvertingDataTreeBuilder18ElementListBuilderE
-__ZTIN9configmgr4data25ConvertingDataTreeBuilderE=configmg.__ZTIN9configmgr4data25ConvertingDataTreeBuilderE
-__ZTIN9configmgr4view11NodeFactoryE=configmg.__ZTIN9configmgr4view11NodeFactoryE
-__ZTIN9configmgr4view12ViewStrategyE=configmg.__ZTIN9configmgr4view12ViewStrategyE
-__ZTIN9configmgr4view18DirectViewStrategyE=configmg.__ZTIN9configmgr4view18DirectViewStrategyE
-__ZTIN9configmgr4view20DeferredViewStrategyE=configmg.__ZTIN9configmgr4view20DeferredViewStrategyE
-__ZTIN9configmgr4view20ReadOnlyViewStrategyE=configmg.__ZTIN9configmgr4view20ReadOnlyViewStrategyE
-__ZTIN9configmgr4view72_GLOBAL__N__ZNK9configmgr4view12ViewStrategy13checkInstanceERKNS0_4TreeE19GroupMemberDispatchE=configmg.__ZTIN9configmgr4view72_GLOBAL__N__ZNK9configmgr4view12ViewStrategy13checkInstanceERKNS0_4TreeE19GroupMemberDispatchE
-__ZTIN9configmgr5INodeE=configmg.__ZTIN9configmgr5INodeE
-__ZTIN9configmgr6ChangeE=configmg.__ZTIN9configmgr6ChangeE
-__ZTIN9configmgr6memory11HeapManagerE=configmg.__ZTIN9configmgr6memory11HeapManagerE
-__ZTIN9configmgr6memory14SimpleHeapLockE=configmg.__ZTIN9configmgr6memory14SimpleHeapLockE
-__ZTIN9configmgr6memory21SimpleHeapManagerBaseE=configmg.__ZTIN9configmgr6memory21SimpleHeapManagerBaseE
-__ZTIN9configmgr6memory25SimpleCheckingHeapManagerE=configmg.__ZTIN9configmgr6memory25SimpleCheckingHeapManagerE
-__ZTIN9configmgr6memory8DataLockE=configmg.__ZTIN9configmgr6memory8DataLockE
-__ZTIN9configmgr7AddNodeE=configmg.__ZTIN9configmgr7AddNodeE
-__ZTIN9configmgr7SubtreeE=configmg.__ZTIN9configmgr7SubtreeE
-__ZTIN9configmgr7backend10EmptyLayerE=configmg.__ZTIN9configmgr7backend10EmptyLayerE
-__ZTIN9configmgr7backend10NodeUpdateE=configmg.__ZTIN9configmgr7backend10NodeUpdateE
-__ZTIN9configmgr7backend11NamedUpdateE=configmg.__ZTIN9configmgr7backend11NamedUpdateE
-__ZTIN9configmgr7backend11NodeReplaceE=configmg.__ZTIN9configmgr7backend11NodeReplaceE
-__ZTIN9configmgr7backend11PropertyAddE=configmg.__ZTIN9configmgr7backend11PropertyAddE
-__ZTIN9configmgr7backend12ResultHolderINS0_12NodeInstanceEE10RCInstanceE=configmg.__ZTIN9configmgr7backend12ResultHolderINS0_12NodeInstanceEE10RCInstanceE
-__ZTIN9configmgr7backend12ResultHolderINS0_16TemplateInstanceEE10RCInstanceE=configmg.__ZTIN9configmgr7backend12ResultHolderINS0_16TemplateInstanceEE10RCInstanceE
-__ZTIN9configmgr7backend12ResultHolderINS0_17ComponentInstanceEE10RCInstanceE=configmg.__ZTIN9configmgr7backend12ResultHolderINS0_17ComponentInstanceEE10RCInstanceE
-__ZTIN9configmgr7backend13BackendAccessE=configmg.__ZTIN9configmgr7backend13BackendAccessE
-__ZTIN9configmgr7backend13ElementUpdateE=configmg.__ZTIN9configmgr7backend13ElementUpdateE
-__ZTIN9configmgr7backend13ImportServiceE=configmg.__ZTIN9configmgr7backend13ImportServiceE
-__ZTIN9configmgr7backend13PropertyResetE=configmg.__ZTIN9configmgr7backend13PropertyResetE
-__ZTIN9configmgr7backend13SchemaBuilderE=configmg.__ZTIN9configmgr7backend13SchemaBuilderE
-__ZTIN9configmgr7backend13UpdateServiceE=configmg.__ZTIN9configmgr7backend13UpdateServiceE
-__ZTIN9configmgr7backend14PropertyUpdateE=configmg.__ZTIN9configmgr7backend14PropertyUpdateE
-__ZTIN9configmgr7backend15CacheControllerE=configmg.__ZTIN9configmgr7backend15CacheControllerE
-__ZTIN9configmgr7backend16NodeModificationE=configmg.__ZTIN9configmgr7backend16NodeModificationE
-__ZTIN9configmgr7backend16UpdateDispatcherE=configmg.__ZTIN9configmgr7backend16UpdateDispatcherE
-__ZTIN9configmgr7backend17BasicUpdateMergerE=configmg.__ZTIN9configmgr7backend17BasicUpdateMergerE
-__ZTIN9configmgr7backend17BinaryReader_ImplE=configmg.__ZTIN9configmgr7backend17BinaryReader_ImplE
-__ZTIN9configmgr7backend17CopyImportServiceE=configmg.__ZTIN9configmgr7backend17CopyImportServiceE
-__ZTIN9configmgr7backend17INodeDataListenerE=configmg.__ZTIN9configmgr7backend17INodeDataListenerE
-__ZTIN9configmgr7backend17INodeDataProviderE=configmg.__ZTIN9configmgr7backend17INodeDataProviderE
-__ZTIN9configmgr7backend17LayerMergeHandlerE=configmg.__ZTIN9configmgr7backend17LayerMergeHandlerE
-__ZTIN9configmgr7backend17LayerUpdateMergerE=configmg.__ZTIN9configmgr7backend17LayerUpdateMergerE
-__ZTIN9configmgr7backend17RequireEmptyLayerE=configmg.__ZTIN9configmgr7backend17RequireEmptyLayerE
-__ZTIN9configmgr7backend18BasicImportHandlerE=configmg.__ZTIN9configmgr7backend18BasicImportHandlerE
-__ZTIN9configmgr7backend18BinaryWriteHandlerE=configmg.__ZTIN9configmgr7backend18BinaryWriteHandlerE
-__ZTIN9configmgr7backend18ImportMergeHandlerE=configmg.__ZTIN9configmgr7backend18ImportMergeHandlerE
-__ZTIN9configmgr7backend18LayerUpdateHandlerE=configmg.__ZTIN9configmgr7backend18LayerUpdateHandlerE
-__ZTIN9configmgr7backend18MergeImportServiceE=configmg.__ZTIN9configmgr7backend18MergeImportServiceE
-__ZTIN9configmgr7backend19ICachedDataListenerE=configmg.__ZTIN9configmgr7backend19ICachedDataListenerE
-__ZTIN9configmgr7backend19ICachedDataNotifierE=configmg.__ZTIN9configmgr7backend19ICachedDataNotifierE
-__ZTIN9configmgr7backend19ICachedDataProviderE=configmg.__ZTIN9configmgr7backend19ICachedDataProviderE
-__ZTIN9configmgr7backend19IDirectDataProviderE=configmg.__ZTIN9configmgr7backend19IDirectDataProviderE
-__ZTIN9configmgr7backend19IMergedDataProviderE=configmg.__ZTIN9configmgr7backend19IMergedDataProviderE
-__ZTIN9configmgr7backend19INodeUpdateProviderE=configmg.__ZTIN9configmgr7backend19INodeUpdateProviderE
-__ZTIN9configmgr7backend19LayerDefaultRemoverE=configmg.__ZTIN9configmgr7backend19LayerDefaultRemoverE
-__ZTIN9configmgr7backend19MultiStratumBackendE=configmg.__ZTIN9configmgr7backend19MultiStratumBackendE
-__ZTIN9configmgr7backend20IDefaultDataProviderE=configmg.__ZTIN9configmgr7backend20IDefaultDataProviderE
-__ZTIN9configmgr7backend20SingleBackendAdapterE=configmg.__ZTIN9configmgr7backend20SingleBackendAdapterE
-__ZTIN9configmgr7backend21BackendChangeNotifierE=configmg.__ZTIN9configmgr7backend21BackendChangeNotifierE
-__ZTIN9configmgr7backend21BackendStrataListenerE=configmg.__ZTIN9configmgr7backend21BackendStrataListenerE
-__ZTIN9configmgr7backend21IDataProviderMetaDataE=configmg.__ZTIN9configmgr7backend21IDataProviderMetaDataE
-__ZTIN9configmgr7backend21ITemplateDataProviderE=configmg.__ZTIN9configmgr7backend21ITemplateDataProviderE
-__ZTIN9configmgr7backend21OInvalidateTreeThreadE=configmg.__ZTIN9configmgr7backend21OInvalidateTreeThreadE
-__ZTIN9configmgr7backend22CacheChangeMulticasterE=configmg.__ZTIN9configmgr7backend22CacheChangeMulticasterE
-__ZTIN9configmgr7backend22IComponentDataProviderE=configmg.__ZTIN9configmgr7backend22IComponentDataProviderE
-__ZTIN9configmgr7backend8NodeDropE=configmg.__ZTIN9configmgr7backend8NodeDropE
-__ZTIN9configmgr7localbe16LocalDataStratumE=configmg.__ZTIN9configmgr7localbe16LocalDataStratumE
-__ZTIN9configmgr7localbe16LocalStratumBaseE=configmg.__ZTIN9configmgr7localbe16LocalStratumBaseE
-__ZTIN9configmgr7localbe17LocalMultiStratumE=configmg.__ZTIN9configmgr7localbe17LocalMultiStratumE
-__ZTIN9configmgr7localbe17LocalOutputStreamE=configmg.__ZTIN9configmgr7localbe17LocalOutputStreamE
-__ZTIN9configmgr7localbe18FlatLocalFileLayerE=configmg.__ZTIN9configmgr7localbe18FlatLocalFileLayerE
-__ZTIN9configmgr7localbe18LocalSingleBackendE=configmg.__ZTIN9configmgr7localbe18LocalSingleBackendE
-__ZTIN9configmgr7localbe18LocalSingleStratumE=configmg.__ZTIN9configmgr7localbe18LocalSingleStratumE
-__ZTIN9configmgr7localbe19BasicLocalFileLayerE=configmg.__ZTIN9configmgr7localbe19BasicLocalFileLayerE
-__ZTIN9configmgr7localbe19LayerPropertyHelperE=configmg.__ZTIN9configmgr7localbe19LayerPropertyHelperE
-__ZTIN9configmgr7localbe19LocalSchemaSupplierE=configmg.__ZTIN9configmgr7localbe19LocalSchemaSupplierE
-__ZTIN9configmgr7localbe20LocalReadonlyStratumE=configmg.__ZTIN9configmgr7localbe20LocalReadonlyStratumE
-__ZTIN9configmgr7localbe20LocalResourceStratumE=configmg.__ZTIN9configmgr7localbe20LocalResourceStratumE
-__ZTIN9configmgr7localbe20SimpleLocalFileLayerE=configmg.__ZTIN9configmgr7localbe20SimpleLocalFileLayerE
-__ZTIN9configmgr7localbe22LocalDataImportServiceE=configmg.__ZTIN9configmgr7localbe22LocalDataImportServiceE
-__ZTIN9configmgr7localbe22LocalSingleStratumBaseE=configmg.__ZTIN9configmgr7localbe22LocalSingleStratumBaseE
-__ZTIN9configmgr7localbe23CompositeLocalFileLayerE=configmg.__ZTIN9configmgr7localbe23CompositeLocalFileLayerE
-__ZTIN9configmgr7localbe23LocalStratumMutexHolderE=configmg.__ZTIN9configmgr7localbe23LocalStratumMutexHolderE
-__ZTIN9configmgr7localbe27FullCompositeLocalFileLayerE=configmg.__ZTIN9configmgr7localbe27FullCompositeLocalFileLayerE
-__ZTIN9configmgr7localbe28BasicCompositeLocalFileLayerE=configmg.__ZTIN9configmgr7localbe28BasicCompositeLocalFileLayerE
-__ZTIN9configmgr7localbe28LocalHierarchyBrowserServiceE=configmg.__ZTIN9configmgr7localbe28LocalHierarchyBrowserServiceE
-__ZTIN9configmgr8BasicSetE=configmg.__ZTIN9configmgr8BasicSetE
-__ZTIN9configmgr8ISubtreeE=configmg.__ZTIN9configmgr8ISubtreeE
-__ZTIN9configmgr8OOptionsE=configmg.__ZTIN9configmgr8OOptionsE
-__ZTIN9configmgr9CacheDataE=configmg.__ZTIN9configmgr9CacheDataE
-__ZTIN9configmgr9CacheLineE=configmg.__ZTIN9configmgr9CacheLineE
-__ZTIN9configmgr9OProviderE=configmg.__ZTIN9configmgr9OProviderE
-__ZTIN9configmgr9ValueNodeE=configmg.__ZTIN9configmgr9ValueNodeE
-__ZTIN9configmgr9apihelper15BroadcasterBaseE=configmg.__ZTIN9configmgr9apihelper15BroadcasterBaseE
-__ZTIN9configmgr9apihelper17PropertySetHelperE=configmg.__ZTIN9configmgr9apihelper17PropertySetHelperE
-__ZTIN9configmgr9apihelper18InteractionRequestE=configmg.__ZTIN9configmgr9apihelper18InteractionRequestE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task17XInteractionAbortEEE=configmg.__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task17XInteractionAbortEEE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task17XInteractionRetryEEE=configmg.__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task17XInteractionRetryEEE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task19XInteractionApproveEEE=configmg.__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task19XInteractionApproveEEE
-__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task22XInteractionDisapproveEEE=configmg.__ZTIN9configmgr9apihelper23InteractionContinuationIN3com3sun4star4task22XInteractionDisapproveEEE
-__ZTIN9configmgr9apihelper24SimpleInteractionRequestE=configmg.__ZTIN9configmgr9apihelper24SimpleInteractionRequestE
-__ZTIN9configmgr9apihelper31ConfigurationInteractionHandler7ContextE=configmg.__ZTIN9configmgr9apihelper31ConfigurationInteractionHandler7ContextE
-__ZTIN9configmgr9configapi10NodeAccessE=configmg.__ZTIN9configmgr9configapi10NodeAccessE
-__ZTIN9configmgr9configapi10SetElementE=configmg.__ZTIN9configmgr9configapi10SetElementE
-__ZTIN9configmgr9configapi11ApiTreeImpl16ComponentAdapterE=configmg.__ZTIN9configmgr9configapi11ApiTreeImpl16ComponentAdapterE
-__ZTIN9configmgr9configapi11Broadcaster4ImplE=configmg.__ZTIN9configmgr9configapi11Broadcaster4ImplE
-__ZTIN9configmgr9configapi11NodeElementE=configmg.__ZTIN9configmgr9configapi11NodeElementE
-__ZTIN9configmgr9configapi11OSetElementINS0_15NodeGroupAccessEEE=configmg.__ZTIN9configmgr9configapi11OSetElementINS0_15NodeGroupAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_17NodeSetInfoAccessEEE=configmg.__ZTIN9configmgr9configapi11OSetElementINS0_17NodeSetInfoAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_17NodeTreeSetAccessEEE=configmg.__ZTIN9configmgr9configapi11OSetElementINS0_17NodeTreeSetAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_18NodeValueSetAccessEEE=configmg.__ZTIN9configmgr9configapi11OSetElementINS0_18NodeValueSetAccessEEE
-__ZTIN9configmgr9configapi11OSetElementINS0_19NodeGroupInfoAccessEEE=configmg.__ZTIN9configmgr9configapi11OSetElementINS0_19NodeGroupInfoAccessEEE
-__ZTIN9configmgr9configapi11RootElementE=configmg.__ZTIN9configmgr9configapi11RootElementE
-__ZTIN9configmgr9configapi11TreeElementE=configmg.__ZTIN9configmgr9configapi11TreeElementE
-__ZTIN9configmgr9configapi12InnerElementE=configmg.__ZTIN9configmgr9configapi12InnerElementE
-__ZTIN9configmgr9configapi12NotifierImplE=configmg.__ZTIN9configmgr9configapi12NotifierImplE
-__ZTIN9configmgr9configapi13NodeSetAccessE=configmg.__ZTIN9configmgr9configapi13NodeSetAccessE
-__ZTIN9configmgr9configapi13OInnerElementINS0_15NodeGroupAccessEEE=configmg.__ZTIN9configmgr9configapi13OInnerElementINS0_15NodeGroupAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_17NodeSetInfoAccessEEE=configmg.__ZTIN9configmgr9configapi13OInnerElementINS0_17NodeSetInfoAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_17NodeTreeSetAccessEEE=configmg.__ZTIN9configmgr9configapi13OInnerElementINS0_17NodeTreeSetAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_18NodeValueSetAccessEEE=configmg.__ZTIN9configmgr9configapi13OInnerElementINS0_18NodeValueSetAccessEEE
-__ZTIN9configmgr9configapi13OInnerElementINS0_19NodeGroupInfoAccessEEE=configmg.__ZTIN9configmgr9configapi13OInnerElementINS0_19NodeGroupInfoAccessEEE
-__ZTIN9configmgr9configapi14ObjectRegistryE=configmg.__ZTIN9configmgr9configapi14ObjectRegistryE
-__ZTIN9configmgr9configapi15ApiRootTreeImpl12NodeListenerE=configmg.__ZTIN9configmgr9configapi15ApiRootTreeImpl12NodeListenerE
-__ZTIN9configmgr9configapi15NodeGroupAccessE=configmg.__ZTIN9configmgr9configapi15NodeGroupAccessE
-__ZTIN9configmgr9configapi16CollectNodeNamesE=configmg.__ZTIN9configmgr9configapi16CollectNodeNamesE
-__ZTIN9configmgr9configapi16OReadRootElementINS0_17NodeSetInfoAccessEEE=configmg.__ZTIN9configmgr9configapi16OReadRootElementINS0_17NodeSetInfoAccessEEE
-__ZTIN9configmgr9configapi16OReadRootElementINS0_19NodeGroupInfoAccessEEE=configmg.__ZTIN9configmgr9configapi16OReadRootElementINS0_19NodeGroupInfoAccessEEE
-__ZTIN9configmgr9configapi17CollectPropertiesE=configmg.__ZTIN9configmgr9configapi17CollectPropertiesE
-__ZTIN9configmgr9configapi17NodeSetInfoAccessE=configmg.__ZTIN9configmgr9configapi17NodeSetInfoAccessE
-__ZTIN9configmgr9configapi17NodeTreeSetAccessE=configmg.__ZTIN9configmgr9configapi17NodeTreeSetAccessE
-__ZTIN9configmgr9configapi17UpdateRootElementE=configmg.__ZTIN9configmgr9configapi17UpdateRootElementE
-__ZTIN9configmgr9configapi18NodeValueSetAccessE=configmg.__ZTIN9configmgr9configapi18NodeValueSetAccessE
-__ZTIN9configmgr9configapi18OUpdateRootElementINS0_15NodeGroupAccessEEE=configmg.__ZTIN9configmgr9configapi18OUpdateRootElementINS0_15NodeGroupAccessEEE
-__ZTIN9configmgr9configapi18OUpdateRootElementINS0_17NodeTreeSetAccessEEE=configmg.__ZTIN9configmgr9configapi18OUpdateRootElementINS0_17NodeTreeSetAccessEEE
-__ZTIN9configmgr9configapi18OUpdateRootElementINS0_18NodeValueSetAccessEEE=configmg.__ZTIN9configmgr9configapi18OUpdateRootElementINS0_18NodeValueSetAccessEEE
-__ZTIN9configmgr9configapi19CollectPropertyInfoE=configmg.__ZTIN9configmgr9configapi19CollectPropertyInfoE
-__ZTIN9configmgr9configapi19NodeGroupInfoAccessE=configmg.__ZTIN9configmgr9configapi19NodeGroupInfoAccessE
-__ZTIN9configmgr9configapi19NodePropertySetInfoE=configmg.__ZTIN9configmgr9configapi19NodePropertySetInfoE
-__ZTIN9configmgr9configapi19UpdateObjectFactoryE=configmg.__ZTIN9configmgr9configapi19UpdateObjectFactoryE
-__ZTIN9configmgr9configapi21ReadOnlyObjectFactoryE=configmg.__ZTIN9configmgr9configapi21ReadOnlyObjectFactoryE
-__ZTIN9configmgr9configapi7FactoryE=configmg.__ZTIN9configmgr9configapi7FactoryE
-__ZTIN9configmgr9configapi8internal15SearchExactNameE=configmg.__ZTIN9configmgr9configapi8internal15SearchExactNameE
-__ZTIN9salhelper21SimpleReferenceObjectE=configmg.__ZTIN9salhelper21SimpleReferenceObjectE
-
-EXPORTS
-__ZTIN3com3sun4star3ucb31InteractiveAugmentedIOExceptionE
-__ZTIN3com3sun4star3ucb22InteractiveIOExceptionE
-__ZTIN3com3sun4star4task28ClassifiedInteractionRequestE
-__ZTIN3com3sun4star3ucb18NameClashExceptionE
-__ZTIN3com3sun4star3ucb27UnsupportedCommandExceptionE
-IMPORTS
-__ZTIN3com3sun4star3ucb31InteractiveAugmentedIOExceptionE=ucpfile1.__ZTIN3com3sun4star3ucb31InteractiveAugmentedIOExceptionE
-__ZTIN3com3sun4star3ucb22InteractiveIOExceptionE=ucpfile1.__ZTIN3com3sun4star3ucb22InteractiveIOExceptionE
-__ZTIN3com3sun4star4task28ClassifiedInteractionRequestE=ucpfile1.__ZTIN3com3sun4star4task28ClassifiedInteractionRequestE
-__ZTIN3com3sun4star3ucb18NameClashExceptionE=ucpfile1.__ZTIN3com3sun4star3ucb18NameClashExceptionE
-__ZTIN3com3sun4star3ucb27UnsupportedCommandExceptionE=ucpfile1.__ZTIN3com3sun4star3ucb27UnsupportedCommandExceptionE
-
-EXPORTS
-__ZTIN3com3sun4star3ucb34InteractiveBadTransferURLExceptionE
-IMPORTS
-__ZTIN3com3sun4star3ucb34InteractiveBadTransferURLExceptionE=ucb1.__ZTIN3com3sun4star3ucb34InteractiveBadTransferURLExceptionE
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
deleted file mode 100644
index 6ba8b2e319b5..000000000000
--- a/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
+++ /dev/null
@@ -1,349 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <stdio.h>
-#include <dlfcn.h>
-#include <cxxabi.h>
-#include <hash_map>
-
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/diagnose.h>
-#include <osl/mutex.hxx>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <typelib/typedescription.hxx>
-#include <uno/any2.h>
-
-#include "share.hxx"
-
-#ifdef TEST
-#include "test/TestBridgeException.hpp"
-#endif
-
-using namespace ::std;
-using namespace ::osl;
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-using namespace ::__cxxabiv1;
-
-//==================================================================================================
-//YD static handle to this dll, to allow rtti symbol lookup
-static  void*   hmod;
-
-//==================================================================================================
-//YD required to run test programs, because exe cannot export symbols!
-#ifdef TEST
-using namespace ::test;
-
-void dymmy_TestBridgeException() throw( ::test::TestBridgeException)
-{
-   throw TestBridgeException();
-}
-#endif
-
-//==================================================================================================
-namespace CPPU_CURRENT_NAMESPACE
-{
-
-void dummy_can_throw_anything( char const * )
-{
-}
-
-//==================================================================================================
-static OUString toUNOname( char const * p ) SAL_THROW( () )
-{
-#if OSL_DEBUG_LEVEL > 1
-    char const * start = p;
-#endif
-
-    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-
-    OUStringBuffer buf( 64 );
-    OSL_ASSERT( 'N' == *p );
-    ++p; // skip N
-
-    while ('E' != *p)
-    {
-        // read chars count
-        long n = (*p++ - '0');
-        while ('0' <= *p && '9' >= *p)
-        {
-            n *= 10;
-            n += (*p++ - '0');
-        }
-        buf.appendAscii( p, n );
-        p += n;
-        if ('E' != *p)
-            buf.append( (sal_Unicode)'.' );
-    }
-
-#if OSL_DEBUG_LEVEL > 1
-    OUString ret( buf.makeStringAndClear() );
-    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-    return ret;
-#else
-    return buf.makeStringAndClear();
-#endif
-}
-
-//==================================================================================================
-class RTTI
-{
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-
-    Mutex m_mutex;
-    t_rtti_map m_rttis;
-    t_rtti_map m_generatedRttis;
-
-    //void * m_hApp;
-
-public:
-    RTTI() SAL_THROW( () );
-    ~RTTI() SAL_THROW( () );
-
-    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
-};
-//__________________________________________________________________________________________________
-RTTI::RTTI() SAL_THROW( () )
-//    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-{
-}
-//__________________________________________________________________________________________________
-RTTI::~RTTI() SAL_THROW( () )
-{
-//    dlclose( m_hApp );
-}
-
-//__________________________________________________________________________________________________
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
-{
-    type_info * rtti = NULL;
-
-    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-
-    MutexGuard guard( m_mutex );
-    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-    if (iFind == m_rttis.end())
-    {
-        // RTTI symbol
-        OStringBuffer buf( 64 );
-        buf.append( RTL_CONSTASCII_STRINGPARAM("__ZTIN") );
-        sal_Int32 index = 0;
-        do
-        {
-            OUString token( unoName.getToken( 0, '.', index ) );
-            buf.append( token.getLength() );
-            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
-            buf.append( c_token );
-        }
-        while (index >= 0);
-        buf.append( 'E' );
-
-        OString symName( buf.makeStringAndClear() );
-        //rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-    if (hmod == NULL)
-        hmod = dlopen( "gcc3_uno.dll", 0);
-
-    if (hmod)
-            rtti = (type_info *)dlsym( hmod, symName.getStr() );
-
-        if (rtti)
-        {
-            pair< t_rtti_map::iterator, bool > insertion(
-                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
-        }
-        else
-        {
-            // try to lookup the symbol in the generated rtti map
-            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
-            if (iFind == m_generatedRttis.end())
-            {
-                // we must generate it !
-                // symbol and rtti-name is nearly identical,
-                // the symbol is prefixed with __ZTI
-                char const * rttiName = symName.getStr() +5;
-#if OSL_DEBUG_LEVEL > 1
-                fprintf( stderr,"generated rtti for %s\n", rttiName );
-#endif
-                if (pTypeDescr->pBaseTypeDescription)
-                {
-                    // ensure availability of base
-                    type_info * base_rtti = getRTTI(
-                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
-                    rtti = new __si_class_type_info(
-                        strdup( rttiName ), (__class_type_info *)base_rtti );
-                }
-                else
-                {
-                    // this class has no base class
-                    rtti = new __class_type_info( strdup( rttiName ) );
-                }
-
-                pair< t_rtti_map::iterator, bool > insertion(
-                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
-            }
-            else // taking already generated rtti
-            {
-                rtti = iFind->second;
-            }
-        }
-    }
-    else
-    {
-        rtti = iFind->second;
-    }
-
-    return rtti;
-}
-
-//--------------------------------------------------------------------------------------------------
-static void deleteException( void * pExc )
-{
-    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-    typelib_TypeDescription * pTD = 0;
-    OUString unoName( toUNOname( header->exceptionType->name() ) );
-    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
-    if (pTD)
-    {
-        ::uno_destructData( pExc, pTD, cpp_release );
-        ::typelib_typedescription_release( pTD );
-    }
-}
-
-//==================================================================================================
-void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-{
-#if OSL_DEBUG_LEVEL > 1
-    OString cstr(
-        OUStringToOString(
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
-#endif
-    void * pCppExc;
-    type_info * rtti;
-
-    {
-    // construct cpp exception object
-    typelib_TypeDescription * pTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-    OSL_ASSERT( pTypeDescr );
-    if (! pTypeDescr)
-    {
-        throw RuntimeException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
-    }
-
-    pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-    ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-
-    // destruct uno exception
-    ::uno_any_destruct( pUnoExc, 0 );
-    // avoiding locked counts
-    static RTTI * s_rtti = 0;
-    if (! s_rtti)
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if (! s_rtti)
-        {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
-            static RTTI rtti_data;
-            s_rtti = &rtti_data;
-#endif
-        }
-    }
-    rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
-    TYPELIB_DANGER_RELEASE( pTypeDescr );
-    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
-    if (! rtti)
-    {
-        throw RuntimeException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
-            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
-            Reference< XInterface >() );
-    }
-    }
-
-    __cxa_throw( pCppExc, rtti, deleteException );
-}
-
-//==================================================================================================
-void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
-{
-    if (! header)
-    {
-        RuntimeException aRE(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
-            Reference< XInterface >() );
-        Type const & rType = ::getCppuType( &aRE );
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
-#if OSL_DEBUG_LEVEL > 0
-        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
-#endif
-        return;
-    }
-
-    typelib_TypeDescription * pExcTypeDescr = 0;
-    OUString unoName( toUNOname( header->exceptionType->name() ) );
-#if OSL_DEBUG_LEVEL > 1
-    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
-#endif
-    typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-    if (0 == pExcTypeDescr)
-    {
-        RuntimeException aRE(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
-            Reference< XInterface >() );
-        Type const & rType = ::getCppuType( &aRE );
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
-#if OSL_DEBUG_LEVEL > 0
-        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
-#endif
-    }
-    else
-    {
-        // construct uno exception any
-        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
-        typelib_typedescription_release( pExcTypeDescr );
-    }
-}
-
-}
-
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk
deleted file mode 100644
index 641eef166cfd..000000000000
--- a/bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=bridges
-TARGET=gcc3_uno
-LIBTARGET=no
-ENABLE_EXCEPTIONS=TRUE
-NO_BSYMBOLIC=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOS2Igcc3"
-
-.IF "$(cppu_no_leak)" == ""
-CFLAGS += -DLEAK_STATIC_DATA
-.ENDIF
-
-CFLAGSNOOPT=-O0
-
-SLOFILES= \
-    $(SLO)$/except.obj		\
-    $(SLO)$/cpp2uno.obj		\
-    $(SLO)$/uno2cpp.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1DEF=defs$/gcc3_uno.def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=..$/..$/bridge_exports.map
-
-SHL1OBJS = $(SLOFILES)
-SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
-
-SHL1STDLIBS= \
-    $(CPPULIB)			\
-    $(SALLIB)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/share.hxx b/bridges/source/cpp_uno/gcc3_os2_intel/share.hxx
deleted file mode 100644
index 930094738b20..000000000000
--- a/bridges/source/cpp_uno/gcc3_os2_intel/share.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "uno/mapping.h"
-
-#include <typeinfo>
-#include <exception>
-#include <cstddef>
-
-namespace CPPU_CURRENT_NAMESPACE
-{
-
-void dummy_can_throw_anything( char const * );
-
-// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
-
-struct _Unwind_Exception
-{
-    unsigned exception_class __attribute__((__mode__(__DI__)));
-    void * exception_cleanup;
-    unsigned private_1 __attribute__((__mode__(__word__)));
-    unsigned private_2 __attribute__((__mode__(__word__)));
-} __attribute__((__aligned__));
-
-struct __cxa_exception
-{
-    ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
-    ::std::unexpected_handler unexpectedHandler;
-    ::std::terminate_handler terminateHandler;
-
-    __cxa_exception *nextException;
-
-    int handlerCount;
-
-    int handlerSwitchValue;
-    const unsigned char *actionRecord;
-    const unsigned char *languageSpecificData;
-    void *catchTemp;
-    void *adjustedPtr;
-
-    _Unwind_Exception unwindHeader;
-};
-
-extern "C" void *__cxa_allocate_exception(
-    std::size_t thrown_size ) throw();
-extern "C" void __cxa_throw (
-    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
-
-struct __cxa_eh_globals
-{
-    __cxa_exception *caughtExceptions;
-    unsigned int uncaughtExceptions;
-};
-extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-
-// -----
-
-//==================================================================================================
-void raiseException(
-    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-//==================================================================================================
-void fillUnoException(
-    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-}
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx
deleted file mode 100644
index fb0ce5ff3cf2..000000000000
--- a/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx
+++ /dev/null
@@ -1,451 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <malloc.h>
-#include <sal/alloca.h>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <uno/data.h>
-
-#include "bridges/cpp_uno/shared/bridge.hxx"
-#include "bridges/cpp_uno/shared/types.hxx"
-#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
-#include "bridges/cpp_uno/shared/vtables.hxx"
-
-#include "share.hxx"
-
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-
-namespace
-{
-
-//==================================================================================================
-// The call instruction within the asm section of callVirtualMethod may throw
-// exceptions.  So that the compiler handles this correctly, it is important
-// that (a) callVirtualMethod might call dummy_can_throw_anything (although this
-// never happens at runtime), which in turn can throw exceptions, and (b)
-// callVirtualMethod is not inlined at its call site (so that any exceptions are
-// caught which are thrown from the instruction calling callVirtualMethod):
-static void callVirtualMethod(
-    void * pAdjustedThisPtr,
-    sal_Int32 nVtableIndex,
-    void * pRegisterReturn,
-    typelib_TypeClass eReturnType,
-    sal_Int32 * pStackLongs,
-    sal_Int32 nStackLongs );
-// __attribute__((noinline));
-
-//==================================================================================================
-static void callVirtualMethod(
-    void * pAdjustedThisPtr,
-    sal_Int32 nVtableIndex,
-    void * pRegisterReturn,
-    typelib_TypeClass eReturnType,
-    sal_Int32 * pStackLongs,
-    sal_Int32 nStackLongs )
-{
-    // parameter list is mixed list of * and values
-    // reference parameters are pointers
-
-    OSL_ENSURE( pStackLongs && pAdjustedThisPtr, "### null ptr!" );
-    OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-    OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-
-    // never called
-    if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
-
-     /* figure out the address of the function we need to invoke */
-     unsigned long * mfunc;        // actual function to be invoked
-     int off;                      // offset used to find function
-     void (*ptr)();
-     off = nVtableIndex;
-     off = off * 4;                         // 4 bytes per slot
-     mfunc = *((unsigned long **)pAdjustedThisPtr);    // get the address of the vtable
-     mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset
-     mfunc = *((unsigned long **)mfunc);                 // the function is stored at the address
-     ptr = (void (*)())mfunc;
-
-    volatile long edx = 0, eax = 0; // for register returns
-    void * stackptr;
-    asm volatile (
-        "mov   %%esp, %6\n\t"
-        // copy values
-        "mov   %0, %%eax\n\t"
-        "mov   %%eax, %%edx\n\t"
-        "dec   %%edx\n\t"
-        "shl   $2, %%edx\n\t"
-        "add   %1, %%edx\n"
-        "Lcopy:\n\t"
-        "pushl 0(%%edx)\n\t"
-        "sub   $4, %%edx\n\t"
-        "dec   %%eax\n\t"
-        "jne   Lcopy\n\t"
-    :
-        : "m"(nStackLongs), "m"(pStackLongs), "m"(pAdjustedThisPtr),
-          "m"(nVtableIndex), "m"(eax), "m"(edx), "m"(stackptr)
-        : "eax", "edx" );
-
-    (*ptr)();
-
-    asm volatile (
-        // save return registers
-         "mov   %%eax, %4\n\t"
-         "mov   %%edx, %5\n\t"
-        // cleanup stack
-        "mov   %6, %%esp\n\t"
-        :
-        : "m"(nStackLongs), "m"(pStackLongs), "m"(pAdjustedThisPtr),
-          "m"(nVtableIndex), "m"(eax), "m"(edx), "m"(stackptr)
-        : "eax", "edx" );
-    switch( eReturnType )
-    {
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-            ((long*)pRegisterReturn)[1] = edx;
-        case typelib_TypeClass_LONG:
-        case typelib_TypeClass_UNSIGNED_LONG:
-        case typelib_TypeClass_CHAR:
-        case typelib_TypeClass_ENUM:
-            ((long*)pRegisterReturn)[0] = eax;
-            break;
-        case typelib_TypeClass_SHORT:
-        case typelib_TypeClass_UNSIGNED_SHORT:
-            *(unsigned short*)pRegisterReturn = eax;
-            break;
-        case typelib_TypeClass_BOOLEAN:
-        case typelib_TypeClass_BYTE:
-            *(unsigned char*)pRegisterReturn = eax;
-            break;
-        case typelib_TypeClass_FLOAT:
-            asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-            break;
-        case typelib_TypeClass_DOUBLE:
-            asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-            break;
-    }
-}
-
-//==================================================================================================
-static void cpp_call(
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
-    bridges::cpp_uno::shared::VtableSlot aVtableSlot,
-    typelib_TypeDescriptionReference * pReturnTypeRef,
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-{
-      // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      =
-          (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-      char * pCppStackStart = pCppStack;
-
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-    OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
-    void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
-    if (pReturnTypeDescr)
-    {
-        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-        {
-            pCppReturn = pUnoReturn; // direct way for simple types
-        }
-        else
-        {
-            // complex return via ptr
-            pCppReturn = *(void **)pCppStack
-                = (bridges::cpp_uno::shared::relatesToInterfaceType(
-                       pReturnTypeDescr )
-                   ? alloca( pReturnTypeDescr->nSize )
-                   : pUnoReturn); // direct way
-            pCppStack += sizeof(void *);
-        }
-    }
-    // push this
-    void * pAdjustedThisPtr = reinterpret_cast< void ** >(pThis->getCppI())
-        + aVtableSlot.offset;
-    *(void**)pCppStack = pAdjustedThisPtr;
-    pCppStack += sizeof( void* );
-
-    // stack space
-    OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
-    // args
-    void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-    // indizes of values this have to be converted (interface conversion cpp<=>uno)
-    sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
-    sal_Int32 nTempIndizes   = 0;
-
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-        if (!rParam.bOut
-            && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
-        {
-            uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
-                                    pThis->getBridge()->getUno2Cpp() );
-
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-            case typelib_TypeClass_DOUBLE:
-                pCppStack += sizeof(sal_Int32); // extra long
-            }
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // ptr to complex value | ref
-        {
-            if (! rParam.bIn) // is pure out
-            {
-                // cpp out is constructed mem, uno out is not!
-                uno_constructData(
-                    *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                    pParamTypeDescr );
-                pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            // is in/inout
-            else if (bridges::cpp_uno::shared::relatesToInterfaceType(
-                         pParamTypeDescr ))
-            {
-                uno_copyAndConvertData(
-                    *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                    pUnoArgs[nPos], pParamTypeDescr,
-                    pThis->getBridge()->getUno2Cpp() );
-
-                pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-        }
-        pCppStack += sizeof(sal_Int32); // standard parameter length
-    }
-
-    try
-    {
-        OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
-        callVirtualMethod(
-            pAdjustedThisPtr, aVtableSlot.index,
-            pCppReturn, pReturnTypeDescr->eTypeClass,
-            (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-        // NO exception occured...
-        *ppUnoExc = 0;
-
-        // reconvert temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
-            if (pParams[nIndex].bIn)
-            {
-                if (pParams[nIndex].bOut) // inout
-                {
-                    uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
-                    uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-                                            pThis->getBridge()->getCpp2Uno() );
-                }
-            }
-            else // pure out
-            {
-                uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
-                                        pThis->getBridge()->getCpp2Uno() );
-            }
-            // destroy temp cpp param => cpp: every param was constructed
-            uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return value
-        if (pCppReturn && pUnoReturn != pCppReturn)
-        {
-            uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-                                    pThis->getBridge()->getCpp2Uno() );
-            uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-        }
-    }
-     catch (...)
-     {
-          // fill uno exception
-        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
-        // temporary params
-        for ( ; nTempIndizes--; )
-        {
-            sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-            // destroy temp cpp param => cpp: every param was constructed
-            uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
-        }
-        // return type
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-    }
-}
-
-}
-
-namespace bridges { namespace cpp_uno { namespace shared {
-
-void unoInterfaceProxyDispatch(
-    uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-    void * pReturn, void * pArgs[], uno_Any ** ppException )
-{
-    // is my surrogate
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
-        = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
-    typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-
-    switch (pMemberDescr->eTypeClass)
-    {
-    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-    {
-        VtableSlot aVtableSlot(
-            getVtableSlot(
-                reinterpret_cast<
-                    typelib_InterfaceAttributeTypeDescription const * >(
-                        pMemberDescr)));
-        if (pReturn)
-        {
-            // dependent dispatch
-            cpp_call(
-                pThis, aVtableSlot,
-                ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
-                0, 0, // no params
-                pReturn, pArgs, ppException );
-        }
-        else
-        {
-            // is SET
-            typelib_MethodParameter aParam;
-            aParam.pTypeRef =
-                ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
-            typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-            OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
-            typelib_typedescriptionreference_new(
-                &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
-            // dependent dispatch
-            aVtableSlot.index += 1; // get, then set method
-            cpp_call(
-                pThis, aVtableSlot,
-                pReturnTypeRef,
-                1, &aParam,
-                pReturn, pArgs, ppException );
-
-            typelib_typedescriptionreference_release( pReturnTypeRef );
-        }
-
-        break;
-    }
-    case typelib_TypeClass_INTERFACE_METHOD:
-    {
-        VtableSlot aVtableSlot(
-            getVtableSlot(
-                reinterpret_cast<
-                    typelib_InterfaceMethodTypeDescription const * >(
-                        pMemberDescr)));
-        switch (aVtableSlot.index)
-        {
-            // standard calls
-        case 1: // acquire uno interface
-            (*pUnoI->acquire)( pUnoI );
-            *ppException = 0;
-            break;
-        case 2: // release uno interface
-            (*pUnoI->release)( pUnoI );
-            *ppException = 0;
-            break;
-        case 0: // queryInterface() opt
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
-            if (pTD)
-            {
-                uno_Interface * pInterface = 0;
-                (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
-                    pThis->pBridge->getUnoEnv(),
-                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
-                if (pInterface)
-                {
-                    ::uno_any_construct(
-                        reinterpret_cast< uno_Any * >( pReturn ),
-                        &pInterface, pTD, 0 );
-                    (*pInterface->release)( pInterface );
-                    TYPELIB_DANGER_RELEASE( pTD );
-                    *ppException = 0;
-                    break;
-                }
-                TYPELIB_DANGER_RELEASE( pTD );
-            }
-        } // else perform queryInterface()
-        default:
-            // dependent dispatch
-            cpp_call(
-                pThis, aVtableSlot,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
-                ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
-                pReturn, pArgs, ppException );
-        }
-        break;
-    }
-    default:
-    {
-        ::com::sun::star::uno::RuntimeException aExc(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
-        Type const & rExcType = ::getCppuType( &aExc );
-        // binary identical null reference
-        ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
-    }
-    }
-}
-
-} } }
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
index b7933411fd60..7b960f238508 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,7 +163,7 @@ static typelib_TypeClass cpp2uno_call(
     (*pThis->getUnoI()->pDispatcher)(
         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -183,7 +184,7 @@ static typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -259,7 +260,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -352,7 +353,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
@@ -521,3 +522,5 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 void bridges::cpp_uno::shared::VtableFactory::flushCode(
     unsigned char const *, unsigned char const *)
 {}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index 2fd9997e724b..4779b145ab06 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,7 @@
 #include <stdio.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -101,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -228,7 +229,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         OUStringToOString(
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
     void * pCppExc;
     type_info * rtti;
@@ -293,7 +294,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
         return;
     }
@@ -302,7 +303,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if OSL_DEBUG_LEVEL > 1
     OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
+    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
 #endif
     typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
     if (0 == pExcTypeDescr)
@@ -314,7 +315,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
     }
     else
@@ -327,3 +328,4 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
index 930094738b20..da2367ad172b 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,3 +89,5 @@ void raiseException(
 void fillUnoException(
     __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
index cbaa24711c34..97dfe64ee32a 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -245,7 +246,7 @@ static void cpp_call(
             pAdjustedThisPtr, aVtableSlot.index,
             pCppReturn, pReturnTypeDescr->eTypeClass,
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -425,3 +426,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index 229c1d471959..87ee5cc93ad6 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,7 +163,7 @@ static typelib_TypeClass cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)(pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -181,7 +182,7 @@ static typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -255,7 +256,7 @@ static typelib_TypeClass cpp_mediate(
                  "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
-        throw RuntimeException( rtl::OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
+        throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), (XInterface *)pCppI );
     }
 
     // determine called method
@@ -350,7 +351,7 @@ static typelib_TypeClass cpp_mediate(
     }
     default:
     {
-        throw RuntimeException(rtl::OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
+        throw RuntimeException(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), (XInterface *)pCppI );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
     }
@@ -562,3 +563,5 @@ void bridges::cpp_uno::shared::VtableFactory::flushCode(
       {
         //TODO: IZ 25819  flush the instruction cache (there probably is OS support for this)
     }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index fe79e6ac31fc..fef8c3facada 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 #include <stdio.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -99,7 +100,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -226,7 +227,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         OUStringToOString(
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
     void * pCppExc;
     type_info * rtti;
@@ -291,7 +292,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if defined _DEBUG
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
         return;
     }
@@ -300,7 +301,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if defined BRIDGES_DEBUG
     OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
+    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
 #endif
     typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
     if (0 == pExcTypeDescr)
@@ -312,7 +313,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if defined _DEBUG
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
     }
     else
@@ -325,3 +326,4 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
index b894a99832dd..3526f19082cd 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,3 +96,5 @@ inline char* adjustPointer( char* pIn, typelib_TypeDescription* pType )
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
index f6f14c17dc31..81dbb5dcea53 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,9 +41,12 @@
 
 #include <sal/alloca.h>
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+
 namespace
 {
 //==================================================================================================
@@ -407,7 +411,7 @@ static void cpp_call(
             pReturnTypeDescr->eTypeClass,
             (sal_Int32 *)pCppStackStart,
              nStackLongs);
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -593,3 +597,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
index d29cf44803a1..8bde24c63da0 100644
--- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -170,7 +171,7 @@ void cpp2uno_call(
     (*pThis->getUnoI()->pDispatcher)(
         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -189,7 +190,7 @@ void cpp2uno_call(
             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
             // has to destruct the any
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         for ( ; nTempIndizes--; )
@@ -260,7 +261,7 @@ extern "C" void cpp_vtable_call(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -349,7 +350,7 @@ extern "C" void cpp_vtable_call(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
     }
     }
@@ -516,3 +517,5 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 void bridges::cpp_uno::shared::VtableFactory::flushCode(
     unsigned char const *, unsigned char const *)
 {}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/mingw_intel/dllinit.cxx b/bridges/source/cpp_uno/mingw_intel/dllinit.cxx
index 95d051a52683..d215a3124470 100644
--- a/bridges/source/cpp_uno/mingw_intel/dllinit.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/dllinit.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,3 +55,5 @@ extern "C" BOOL WINAPI DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpvReserv
 
     return TRUE;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx
index c27f7013caf3..5997c3b1ea2a 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <cxxabi.h>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -101,7 +102,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 //==================================================================================================
 class RTTI
 {
-    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
+    typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map;
 
     Mutex m_mutex;
     t_rtti_map m_rttis;
@@ -213,7 +214,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         OUStringToOString(
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
+    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
 #endif
     void * pCppExc;
     type_info * rtti;
@@ -278,7 +279,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
         return;
     }
@@ -287,7 +288,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if OSL_DEBUG_LEVEL > 1
     OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
+    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
 #endif
     typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
     if (0 == pExcTypeDescr)
@@ -299,7 +300,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
 #if OSL_DEBUG_LEVEL > 0
         OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
     }
     else
@@ -312,3 +313,4 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/mingw_intel/share.hxx b/bridges/source/cpp_uno/mingw_intel/share.hxx
index 930094738b20..da2367ad172b 100644
--- a/bridges/source/cpp_uno/mingw_intel/share.hxx
+++ b/bridges/source/cpp_uno/mingw_intel/share.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,3 +89,5 @@ void raiseException(
 void fillUnoException(
     __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/mingw_intel/smallstruct.cxx b/bridges/source/cpp_uno/mingw_intel/smallstruct.cxx
index af124489d107..bcfb0df87902 100644
--- a/bridges/source/cpp_uno/mingw_intel/smallstruct.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/smallstruct.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,3 +78,5 @@ bool isSmallStruct(typelib_TypeDescription const * type) {
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/mingw_intel/smallstruct.hxx b/bridges/source/cpp_uno/mingw_intel/smallstruct.hxx
index 7f52ac96d2db..f1eae96e6734 100644
--- a/bridges/source/cpp_uno/mingw_intel/smallstruct.hxx
+++ b/bridges/source/cpp_uno/mingw_intel/smallstruct.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,3 +34,5 @@ namespace bridges { namespace cpp_uno { namespace shared {
 bool isSmallStruct(typelib_TypeDescription const * type);
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
index d4fa3ab93282..4dd6cdefd083 100644
--- a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -304,7 +305,7 @@ static void cpp_call(
             pAdjustedThisPtr, aVtableSlot.index,
             pCppReturn, pReturnTypeDescr,
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
-        // NO exception occured...
+        // NO exception occurred...
         *ppUnoExc = 0;
 
         // reconvert temporary params
@@ -498,3 +499,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index adce4419bcbf..106cb211b570 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -165,7 +166,7 @@ static inline typelib_TypeClass cpp2uno_call(
     (*pThis->getUnoI()->pDispatcher)(
         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
 
-    // in case an exception occured...
+    // in case an exception occurred...
     if (pUnoExc)
     {
         // destruct temporary in/inout params
@@ -190,7 +191,7 @@ static inline typelib_TypeClass cpp2uno_call(
         // is here for dummy
         return typelib_TypeClass_VOID;
     }
-    else // else no exception occured...
+    else // else no exception occurred...
     {
         // temporary params
         while (nTempIndizes--)
@@ -266,7 +267,7 @@ static typelib_TypeClass __cdecl cpp_mediate(
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
 
-    typelib_TypeClass eRet;
+    typelib_TypeClass eRet = typelib_TypeClass_VOID;
     switch (aMemberDescr.get()->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -352,8 +353,6 @@ static typelib_TypeClass __cdecl cpp_mediate(
         throw RuntimeException(
             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("no member description found!") ),
             (XInterface *)pThis );
-        // is here for dummy
-        eRet = typelib_TypeClass_VOID;
     }
     }
 
@@ -486,3 +485,5 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 void bridges::cpp_uno::shared::VtableFactory::flushCode(
     unsigned char const *, unsigned char const *)
 {}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx b/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx
index c43b4b0f47bb..cfbc58650f0d 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,5 @@ extern "C" BOOL WINAPI DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpvReserv
 
     return TRUE;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 239c36a42289..e8ac31ebf3a7 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,7 @@
 #include "precompiled_bridges.hxx"
 
 #pragma warning( disable : 4237 )
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <sal/config.h>
 #include <malloc.h>
 #include <new.h>
@@ -96,7 +97,7 @@ static inline OUString toRTTIname( OUString const & rUNOname ) throw ()
 //##################################################################################################
 
 
-typedef hash_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap;
+typedef boost::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap;
 
 //==================================================================================================
 class RTTInfos
@@ -619,7 +620,7 @@ int msci_filterCppException(
     RuntimeException exc(
         OUString( RTL_CONSTASCII_USTRINGPARAM(
                       "[msci_uno bridge error] unexpected "
-                      "C++ exception occured!") ),
+                      "C++ exception occurred!") ),
         Reference< XInterface >() );
     uno_type_any_constructAndConvert(
         pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
@@ -630,3 +631,4 @@ int msci_filterCppException(
 
 #pragma pack(pop)
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk b/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
index 194d8d6736f6..b4608cc70ac3 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
+++ b/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # --- Files --------------------------------------------------------
-.IF "$(COM)" == "MSC"
+.IF "$(COM)$(CPU)" == "MSCI"
 
 .IF "$(debug)" != ""
 CFLAGS += -Ob0
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
index 01f4b607b7cc..ecc4e22960d7 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,4 @@ void msci_raiseException(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
index e32707e84a2f..547ee4c6873f 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -290,7 +291,7 @@ static void cpp_call(
         return;
     }
 
-    // NO exception occured
+    // NO exception occurred
     *ppUnoExc = 0;
 
     // reconvert temporary params
@@ -463,3 +464,5 @@ void unoInterfaceProxyDispatch(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/call.asm b/bridges/source/cpp_uno/msvc_win32_x86-64/call.asm
new file mode 100644
index 000000000000..406e78d397a1
--- /dev/null
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/call.asm
@@ -0,0 +1,133 @@
+; -*- Mode: text; tab-width: 8; indent-tabs-mode: nil comment-column: 44; comment-start: ";; " comment-start-skip: ";; *" -*-
+
+;; Version: MPL 1.1 / GPLv3+ / LGPLv3+
+;;
+;; The contents of this file are subject to the Mozilla Public License Version
+;; 1.1 (the "License"); you may not use this file except in compliance with
+;; the License or as specified alternatively below. You may obtain a copy of
+;; the License at http://www.mozilla.org/MPL/
+;;
+;; Software distributed under the License is distributed on an "AS IS" basis,
+;; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+;; for the specific language governing rights and limitations under the
+;; License.
+;;
+;; The Initial Developer of the Original Code is
+;;       Novell, Inc.
+;; Portions created by the Initial Developer are Copyright (C) 2011
+;; Novell, Inc. All Rights Reserved.
+;;
+;; Major Contributor(s):
+;;       Tor Lillqvist <tml@iki.fi>
+;; Portions created by Tor Lillqvist are Copyright (C) 2011 Tor Lillqvist. All Rights Reserved.
+;;
+;; For minor contributions see the git repository.
+;;
+;; Alternatively, the contents of this file may be used under the terms of
+;; either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+;; the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+;; in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+;; instead of those above.
+
+;; This is the function jumped to from the trampoline generated by
+;; codeSnippet() in cpp2uno.cxx. Here we call cpp_vtable_call() which
+;; then calls the actual UNO function.
+
+;; The code snippet generated is called from "normal" C++ code which
+;; has no idea that it is calling dynamically generated code.
+
+;; The generated short code snippet is not covered by any function
+;; table and unwind info, but that doesn't matter, as the instructions
+;; in it are not really going to cause any exception. Once it jumps
+;; here it is covered by a function table, and the calls further down
+;; through cpp_vtable_call() can be unwound cleanly.
+
+;; This is in a separate file for x86-64 as MSVC doesn't have in-line
+;; assembly for x64.
+
+;; Random web links and other documentation about low-level
+;; implementation details for the C++/UNO bridge on x64 Windows kept
+;; here:
+
+;; Caolan's "Lazy Hackers Guide To Porting" is useful:
+;; http://wiki.services.openoffice.org/wiki/Lazy_Hackers_Guide_To_Porting
+
+;; As for details about the x64 Windows calling convention, register
+;; usage, stack usage, exception handling etc, the official
+;; documentation (?) on MSDN is a bit fragmented and split up into a
+;; needlessly large number of short pages. But still:
+;; http://msdn.microsoft.com/en-us/library/7kcdt6fy%28v=VS.90%29.aspx
+
+;; Also see Raymond Chen's blog post:
+;; http://blogs.msdn.com/b/oldnewthing/archive/2004/01/14/58579.aspx
+
+;; This one is actually more readable: "Improving Automated Analysis
+;; of Windows x64 Binaries": http://www.uninformed.org/?v=4&a=1
+
+;; This one has a mass of information about different architectures
+;; and compilers, and contains some details about the x64 Windows
+;; calling convention in particular that Microsoft doesn't mention
+;; above:
+;; http://www.agner.org/optimize/calling_conventions.pdf
+
+;; Random interesting discussion threads:
+;; http://social.msdn.microsoft.com/Forums/en/vcgeneral/thread/300bd6d3-9381-4d2d-8129-e48b392c05d8
+
+;; Ken Johnson's blog http://www.nynaeve.net/ has much interesting
+;; information, for instance:
+;; http://www.nynaeve.net/?p=11
+
+typelib_TypeClass_FLOAT equ 10
+typelib_TypeClass_DOUBLE equ 11
+
+extern cpp_vtable_call: proc
+
+.code
+
+privateSnippetExecutor proc frame
+
+    ;; Make stack frame. Re-align RSP at 16 bytes. We need just one
+    ;; qword of stack for our own purposes: Where cpp_vtable_call()
+    ;; will store the return value of the UNO callee. But we of course
+    ;; must also allocate space for the functions we call (i.e., just
+    ;; cpp_vtable_call()) to spill their register parameters.
+
+    sub rsp, 40
+    .allocstack (40)
+    .endprolog
+
+    ;; Call cpp_vtable_call() with 2 parameters:
+
+    ;; 1 (rcx): nOffsetAndIndex (already put there in code generated by codeSnippet)
+    ;; 2 (rdx): pointer to where to store return value, followed by our
+    ;; return address (uninteresting to cpp_vtable_call()), followed
+    ;; by our spilled register parameters, as stored above, followed
+    ;; by the rest of our parameters, if any.
+
+    lea rdx, 32[rsp]
+
+    call cpp_vtable_call
+
+    ;; cpp_vtable_call() returns the typelib_TypeClass type of the
+    ;; return value of the called UNO function
+
+    cmp rax, typelib_TypeClass_FLOAT
+    je Lfloat
+
+    cmp rax, typelib_TypeClass_DOUBLE
+    je Lfloat
+
+    mov rax, qword ptr 32[rsp]
+    jmp Lepilogue
+
+Lfloat:
+    movsd xmm0, qword ptr 32[rsp]
+
+Lepilogue:
+    add rsp, 40
+    ret
+privateSnippetExecutor endp
+
+end
+
+; vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
new file mode 100644
index 000000000000..ecfd957947c4
--- /dev/null
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -0,0 +1,582 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_bridges.hxx"
+
+#include <malloc.h>
+
+#include <com/sun/star/uno/genfunc.hxx>
+#include <uno/data.h>
+#include <typelib/typedescription.hxx>
+
+#include "bridges/cpp_uno/shared/bridge.hxx"
+#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx"
+#include "bridges/cpp_uno/shared/types.hxx"
+#include "bridges/cpp_uno/shared/vtablefactory.hxx"
+
+#include "mscx.hxx"
+
+using namespace ::com::sun::star::uno;
+
+static inline typelib_TypeClass cpp2uno_call(
+    bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
+    const typelib_TypeDescription * pMemberTD,
+    typelib_TypeDescriptionReference * pReturnTypeRef, // NULL indicates void return
+    sal_Int32 nParams,
+    typelib_MethodParameter * pParams,
+    void ** pStack )
+{
+    // Return type
+    typelib_TypeDescription * pReturnTD = NULL;
+    if ( pReturnTypeRef )
+        TYPELIB_DANGER_GET( &pReturnTD, pReturnTypeRef );
+
+    int nFirstRealParam = 3;    // Index into pStack, past return
+                                // value, return address and 'this'
+                                // pointer.
+
+    void * pUnoReturn = NULL;
+    void * pCppReturn = NULL;   // Complex return ptr: if != NULL && != pUnoReturn, reconversion need
+
+    if ( pReturnTD )
+    {
+        if ( bridges::cpp_uno::shared::isSimpleType( pReturnTD ) )
+        {
+            pUnoReturn = pStack;
+        }
+        else
+        {
+            pCppReturn = pStack[nFirstRealParam++];
+
+            pUnoReturn = ( bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTD )
+                           ? alloca( pReturnTD->nSize )
+                           : pCppReturn ); // direct way
+        }
+    }
+
+    void ** pCppIncomingParams = pStack + nFirstRealParam;
+
+    // Unlike this method for other archs, prefer clarity to
+    // micro-optimization, and allocate these array separately
+
+    // Parameters passed to the UNO function
+    void ** pUnoArgs = (void **)alloca( sizeof(void *) * nParams );
+
+    // Parameters received from C++
+    void ** pCppArgs = (void **)alloca( sizeof(void *) * nParams );
+
+    // Indexes of values this have to be converted (interface conversion C++<=>UNO)
+    int * pTempIndexes =
+        (int *)alloca( sizeof(int) * nParams );
+
+    // Type descriptions for reconversions
+    typelib_TypeDescription ** ppTempParamTD =
+        (typelib_TypeDescription **)alloca( sizeof(void *) * nParams );
+
+    int nTempIndexes = 0;
+
+    for ( int nPos = 0; nPos < nParams; ++nPos )
+    {
+        const typelib_MethodParameter & rParam = pParams[nPos];
+
+        typelib_TypeDescription * pParamTD = NULL;
+        TYPELIB_DANGER_GET( &pParamTD, rParam.pTypeRef );
+
+        if ( !rParam.bOut &&
+             bridges::cpp_uno::shared::isSimpleType( pParamTD ) )
+        {
+            pCppArgs[nPos] = pUnoArgs[nPos] = pCppIncomingParams++;
+
+            TYPELIB_DANGER_RELEASE( pParamTD );
+        }
+        else // ptr to complex value | ref
+        {
+            void * pCppStack;
+
+            pCppArgs[nPos] = pCppStack = *pCppIncomingParams++;
+
+            if ( !rParam.bIn ) // Pure out
+            {
+                // UNO out is unconstructed mem
+                pUnoArgs[nPos] = alloca( pParamTD->nSize );
+                pTempIndexes[nTempIndexes] = nPos;
+                // pParamTD will be released at reconversion
+                ppTempParamTD[nTempIndexes++] = pParamTD;
+            }
+            //
+            else if ( bridges::cpp_uno::shared::relatesToInterfaceType( pParamTD ) )
+            {
+                ::uno_copyAndConvertData(
+                    pUnoArgs[nPos] = alloca( pParamTD->nSize ),
+                    pCppStack, pParamTD,
+                    pThis->getBridge()->getCpp2Uno() );
+                pTempIndexes[nTempIndexes] = nPos; // Has to be reconverted
+                // pParamTD will be released at reconversion
+                ppTempParamTD[nTempIndexes++] = pParamTD;
+            }
+            else // direct way
+            {
+                pUnoArgs[nPos] = pCppStack;
+                // No longer needed
+                TYPELIB_DANGER_RELEASE( pParamTD );
+            }
+        }
+    }
+
+    // ExceptionHolder
+    uno_Any aUnoExc; // Any will be constructed by callee
+    uno_Any * pUnoExc = &aUnoExc;
+
+    // invoke UNO dispatch call
+    (*pThis->getUnoI()->pDispatcher)(
+        pThis->getUnoI(), pMemberTD, pUnoReturn, pUnoArgs, &pUnoExc );
+
+    // in case an exception occurred...
+    if ( pUnoExc )
+    {
+        // Destruct temporary in/inout params
+        while ( nTempIndexes-- )
+        {
+            int nIndex = pTempIndexes[nTempIndexes];
+
+            if ( pParams[nIndex].bIn ) // Is in/inout => was constructed
+            {
+                ::uno_destructData( pUnoArgs[nIndex], ppTempParamTD[nTempIndexes], 0 );
+            }
+            TYPELIB_DANGER_RELEASE( ppTempParamTD[nTempIndexes] );
+        }
+        if ( pReturnTD )
+            TYPELIB_DANGER_RELEASE( pReturnTD );
+
+        CPPU_CURRENT_NAMESPACE::mscx_raiseException(
+            &aUnoExc, pThis->getBridge()->getUno2Cpp() ); // Has to destruct the any
+
+        // Is here for dummy
+        return typelib_TypeClass_VOID;
+    }
+    else // Else, no exception occurred...
+    {
+        // Temporary params
+        while (nTempIndexes--)
+        {
+            int nIndex = pTempIndexes[nTempIndexes];
+            typelib_TypeDescription * pParamTD = ppTempParamTD[nTempIndexes];
+
+            if ( pParams[nIndex].bOut ) // inout/out
+            {
+                // Convert and assign
+                ::uno_destructData(
+                    pCppArgs[nIndex], pParamTD, cpp_release );
+                ::uno_copyAndConvertData(
+                    pCppArgs[nIndex], pUnoArgs[nIndex], pParamTD,
+                    pThis->getBridge()->getUno2Cpp() );
+            }
+            // Destroy temp UNO param
+            ::uno_destructData( pUnoArgs[nIndex], pParamTD, 0 );
+
+            TYPELIB_DANGER_RELEASE( pParamTD );
+        }
+        // Return
+        if ( pCppReturn ) // Has complex return
+        {
+            if ( pUnoReturn != pCppReturn ) // Needs reconversion
+            {
+                ::uno_copyAndConvertData(
+                    pCppReturn, pUnoReturn, pReturnTD,
+                    pThis->getBridge()->getUno2Cpp() );
+                // Destroy temp UNO return
+                ::uno_destructData( pUnoReturn, pReturnTD, 0 );
+            }
+            // Complex return ptr is set to eax
+            pStack[0] = pCppReturn;
+        }
+        if ( pReturnTD )
+        {
+            typelib_TypeClass eRet = (typelib_TypeClass)pReturnTD->eTypeClass;
+            TYPELIB_DANGER_RELEASE( pReturnTD );
+            return eRet;
+        }
+        else
+            return typelib_TypeClass_VOID;
+    }
+}
+
+extern "C" typelib_TypeClass cpp_vtable_call(
+    sal_Int64 nOffsetAndIndex,
+    void ** pStack )
+{
+    sal_Int32 nFunctionIndex = (nOffsetAndIndex & 0xFFFFFFFF);
+    sal_Int32 nVtableOffset = ((nOffsetAndIndex >> 32) & 0xFFFFFFFF);
+
+    // pStack points to space for return value allocated by
+    // privateSnippetExecutor() in call.asm, after which follows our
+    // return address (uninteresting), then the integer or
+    // floating-point register parameters (spilled by
+    // privateSnippetExecutor()) from the call to the trampoline,
+    // followed by stacked parameters. The first parameter is the
+    // 'this' pointer. If the callee returns a large value, the
+    // parameter after that is actually a pointer to where the callee
+    // should store its return value.
+
+    void * pThis = static_cast<char *>( pStack[2] ) - nVtableOffset;
+
+    bridges::cpp_uno::shared::CppInterfaceProxy * pCppI =
+        bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy( pThis );
+
+    typelib_InterfaceTypeDescription * pTD = pCppI->getTypeDescr();
+
+    OSL_ENSURE( nFunctionIndex < pTD->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
+    if ( nFunctionIndex >= pTD->nMapFunctionIndexToMemberIndex )
+        throw RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Illegal vtable index!")),
+                                reinterpret_cast<XInterface *>( pCppI ) );
+
+    // Determine called method
+    int nMemberPos = pTD->pMapFunctionIndexToMemberIndex[nFunctionIndex];
+    OSL_ENSURE( nMemberPos < pTD->nAllMembers, "### illegal member index!\n" );
+
+    TypeDescription aMemberDescr( pTD->ppAllMembers[nMemberPos] );
+
+    typelib_TypeClass eRet;
+    switch ( aMemberDescr.get()->eTypeClass )
+    {
+        case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+        {
+            typelib_TypeDescriptionReference *pAttrTypeRef =
+                reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( aMemberDescr.get() )->pAttributeTypeRef;
+
+            if ( pTD->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex )
+            {
+                // is GET method
+                eRet = cpp2uno_call( pCppI, aMemberDescr.get(), pAttrTypeRef,
+                        0, NULL, // No params
+                        pStack );
+            }
+            else
+            {
+                // is SET method
+                typelib_MethodParameter aParam;
+                aParam.pTypeRef = pAttrTypeRef;
+                aParam.bIn      = sal_True;
+                aParam.bOut     = sal_False;
+
+                eRet = cpp2uno_call( pCppI, aMemberDescr.get(),
+                        NULL, // Indicates void return
+                        1, &aParam,
+                        pStack );
+            }
+            break;
+        }
+        case typelib_TypeClass_INTERFACE_METHOD:
+        {
+            // is METHOD
+            switch ( nFunctionIndex )
+            {
+                case 1: // acquire()
+                    pCppI->acquireProxy(); // Non virtual call!
+                    eRet = typelib_TypeClass_VOID;
+                    break;
+                case 2: // release()
+                    pCppI->releaseProxy(); // non virtual call!
+                    eRet = typelib_TypeClass_VOID;
+                    break;
+                case 0: // queryInterface() opt
+                {
+                    typelib_TypeDescription * pTD = NULL;
+
+                    // the incoming C++ parameters are: The this
+                    // pointer, the hidden return value pointer, and
+                    // then the actual queryInterface() only
+                    // parameter. Thus pStack[4]..
+
+                    TYPELIB_DANGER_GET( &pTD, reinterpret_cast<Type *>( pStack[4] )->getTypeLibType() );
+
+                    if ( pTD )
+                    {
+                        XInterface * pInterface = NULL;
+                        (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)
+                            ( pCppI->getBridge()->getCppEnv(),
+                              (void **)&pInterface,
+                              pCppI->getOid().pData,
+                              reinterpret_cast<typelib_InterfaceTypeDescription *>( pTD ) );
+
+                        if ( pInterface )
+                        {
+                            // pStack[3] = hidden return value pointer
+                            ::uno_any_construct( reinterpret_cast<uno_Any *>( pStack[3] ),
+                                                 &pInterface, pTD, cpp_acquire );
+
+                            pInterface->release();
+                            TYPELIB_DANGER_RELEASE( pTD );
+
+                            eRet = typelib_TypeClass_ANY;
+                            break;
+                        }
+                        TYPELIB_DANGER_RELEASE( pTD );
+                    }
+                } // Fall through!
+                default:
+                {
+                    typelib_InterfaceMethodTypeDescription * pMethodTD =
+                        reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( aMemberDescr.get() );
+
+                    eRet = cpp2uno_call( pCppI, aMemberDescr.get(),
+                                         pMethodTD->pReturnTypeRef,
+                                         pMethodTD->nParams,
+                                         pMethodTD->pParams,
+                                         pStack );
+                }
+            }
+            break;
+        }
+        default:
+        {
+            throw RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No member description found!")),
+                                    reinterpret_cast<XInterface *>( pCppI ) );
+            // is here for dummy
+            eRet = typelib_TypeClass_VOID;
+        }
+    }
+
+    return eRet;
+}
+
+int const codeSnippetSize = 48;
+
+extern "C" char privateSnippetExecutor;
+
+// This function generates the code that acts as a proxy for the UNO function to be called.
+// The generated code does the following:
+// - Spills register parameters on stack
+// - Loads functionIndex and vtableOffset into scratch registers
+// - Jumps to privateSnippetExecutor
+
+unsigned char * codeSnippet(
+    unsigned char * code,
+    char param_kind[4],
+    sal_Int32 nFunctionIndex,
+    sal_Int32 nVtableOffset )
+{
+    sal_uInt64 nOffsetAndIndex = ( ( (sal_uInt64) nVtableOffset ) << 32 ) | ( (sal_uInt64) nFunctionIndex );
+    unsigned char *p = code;
+
+    // Spill parameters
+    if ( param_kind[0] == CPPU_CURRENT_NAMESPACE::REGPARAM_INT )
+    {
+        // mov qword ptr 8[rsp], rcx
+        *p++ = 0x48; *p++ = 0x89; *p++ = 0x4C; *p++ = 0x24; *p++ = 0x08;
+    }
+    else
+    {
+        // movsd qword ptr 8[rsp], xmm0
+        *p++ = 0xF2; *p++ = 0x0F; *p++ = 0x11; *p++ = 0x44; *p++ = 0x24; *p++ = 0x08;
+    }
+    if ( param_kind[1] == CPPU_CURRENT_NAMESPACE::REGPARAM_INT )
+    {
+        // mov qword ptr 16[rsp], rdx
+        *p++ = 0x48; *p++ = 0x89; *p++ = 0x54; *p++ = 0x24; *p++ = 0x10;
+    }
+    else
+    {
+        // movsd qword ptr 16[rsp], xmm1
+        *p++ = 0xF2; *p++ = 0x0F; *p++ = 0x11; *p++ = 0x4C; *p++ = 0x24; *p++ = 0x10;
+    }
+    if ( param_kind[2] == CPPU_CURRENT_NAMESPACE::REGPARAM_INT )
+    {
+        // mov qword ptr 24[rsp], r8
+        *p++ = 0x4C; *p++ = 0x89; *p++ = 0x44; *p++ = 0x24; *p++ = 0x18;
+    }
+    else
+    {
+        // movsd qword ptr 24[rsp], xmm2
+        *p++ = 0xF2; *p++ = 0x0F; *p++ = 0x11; *p++ = 0x54; *p++ = 0x24; *p++ = 0x18;
+    }
+    if ( param_kind[3] == CPPU_CURRENT_NAMESPACE::REGPARAM_INT )
+    {
+        // mov qword ptr 32[rsp], r9
+        *p++ = 0x4C;*p++ = 0x89; *p++ = 0x4C; *p++ = 0x24; *p++ = 0x20;
+    }
+    else
+    {
+        // movsd qword ptr 32[rsp], xmm3
+        *p++ = 0xF2; *p++ = 0x0F; *p++ = 0x11; *p++ = 0x5C; *p++ = 0x24; *p++ = 0x20;
+    }
+
+    // mov rcx, nOffsetAndIndex
+    *p++ = 0x48; *p++ = 0xB9;
+    *((sal_uInt64 *)p) = nOffsetAndIndex; p += 8;
+
+    // mov r11, privateSnippetExecutor
+    *p++ = 0x49; *p++ = 0xBB;
+    *((void **)p) = &privateSnippetExecutor; p += 8;
+
+    // jmp r11
+    *p++ = 0x41; *p++ = 0xFF; *p++ = 0xE3;
+
+    OSL_ASSERT( p < code + codeSnippetSize );
+
+    return code + codeSnippetSize;
+}
+
+struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; };
+
+bridges::cpp_uno::shared::VtableFactory::Slot *
+bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(
+    void * block )
+{
+    return static_cast< Slot * >(block) + 1;
+}
+
+sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+    sal_Int32 slotCount )
+{
+    return (slotCount + 1) * sizeof (Slot) + slotCount * codeSnippetSize;
+}
+
+bridges::cpp_uno::shared::VtableFactory::Slot *
+bridges::cpp_uno::shared::VtableFactory::initializeBlock(
+    void * block,
+    sal_Int32 slotCount )
+{
+    struct Rtti {
+        sal_Int32 n0, n1, n2;
+        type_info * rtti;
+        Rtti():
+            n0(0), n1(0), n2(0),
+            rtti(CPPU_CURRENT_NAMESPACE::mscx_getRTTI(
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                       "com.sun.star.uno.XInterface"))))
+        {}
+    };
+    static Rtti rtti;
+
+    Slot * slots = mapBlockToVtable(block);
+    slots[-1].fn = &rtti;
+    return slots + slotCount;
+}
+
+unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+    Slot ** slots,
+    unsigned char * code,
+    typelib_InterfaceTypeDescription const * type,
+    sal_Int32 nFunctionOffset,
+    sal_Int32 functionCount,
+    sal_Int32 nVtableOffset )
+{
+    (*slots) -= functionCount;
+    Slot * s = *slots;
+
+    for (int member = 0; member < type->nMembers; ++member) {
+        typelib_TypeDescription * pTD = NULL;
+
+        TYPELIB_DANGER_GET( &pTD, type->ppMembers[ member ] );
+        OSL_ASSERT( pTD );
+
+        char param_kind[4];
+        int nr = 0;
+
+        for (int i = 0; i < 4; ++i)
+            param_kind[i] = CPPU_CURRENT_NAMESPACE::REGPARAM_INT;
+
+        // 'this'
+        ++nr;
+
+        if ( pTD->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
+        {
+            typelib_InterfaceAttributeTypeDescription * pIfaceAttrTD =
+                reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( pTD );
+
+            // Getter
+
+            (s++)->fn = code;
+            code = codeSnippet( code, param_kind, nFunctionOffset++, nVtableOffset );
+            if ( ! pIfaceAttrTD->bReadOnly )
+            {
+                typelib_TypeDescription * pAttrTD = NULL;
+                TYPELIB_DANGER_GET( &pAttrTD, pIfaceAttrTD->pAttributeTypeRef );
+                OSL_ASSERT( pAttrTD );
+
+                // Setter
+                if ( pAttrTD->eTypeClass == typelib_TypeClass_FLOAT ||
+                     pAttrTD->eTypeClass == typelib_TypeClass_DOUBLE )
+                    param_kind[nr++] = CPPU_CURRENT_NAMESPACE::REGPARAM_FLT;
+
+                TYPELIB_DANGER_RELEASE( pAttrTD );
+
+                (s++)->fn = code;
+                code = codeSnippet( code, param_kind, nFunctionOffset++, nVtableOffset );
+            }
+        }
+        else if ( pTD->eTypeClass == typelib_TypeClass_INTERFACE_METHOD )
+        {
+            typelib_InterfaceMethodTypeDescription * pMethodTD =
+                reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( pTD );
+
+            typelib_TypeDescription * pReturnTD = NULL;
+            TYPELIB_DANGER_GET( &pReturnTD, pMethodTD->pReturnTypeRef );
+            OSL_ASSERT( pReturnTD );
+
+            if ( !bridges::cpp_uno::shared::isSimpleType( pReturnTD ) )
+            {
+                // Return value
+                ++nr;
+            }
+
+            for (int param = 0; nr < 4 && param < pMethodTD->nParams; ++param, ++nr)
+            {
+                typelib_TypeDescription * pParamTD = NULL;
+
+                TYPELIB_DANGER_GET( &pParamTD, pMethodTD->pParams[param].pTypeRef );
+                OSL_ASSERT( pParamTD );
+
+                if ( pParamTD->eTypeClass == typelib_TypeClass_FLOAT ||
+                     pParamTD->eTypeClass == typelib_TypeClass_DOUBLE )
+                    param_kind[nr] = CPPU_CURRENT_NAMESPACE::REGPARAM_FLT;
+
+                TYPELIB_DANGER_RELEASE( pParamTD );
+            }
+            (s++)->fn = code;
+            code = codeSnippet( code, param_kind, nFunctionOffset++, nVtableOffset );
+
+            TYPELIB_DANGER_RELEASE( pReturnTD );
+        }
+        else
+            OSL_ASSERT( false );
+
+        TYPELIB_DANGER_RELEASE( pTD );
+    }
+    return code;
+}
+
+void bridges::cpp_uno::shared::VtableFactory::flushCode(
+    unsigned char const *,
+    unsigned char const * )
+{
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/libutil.c b/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx
index e0f94a8b3235..cfbc58650f0d 100644
--- a/sal/osl/os2/libutil.c
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,28 +26,36 @@
  *
  ************************************************************************/
 
-#if 0 // YD
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_bridges.hxx"
+
+
+#pragma warning(push,1) // disable warnings within system headers
 #include <windows.h>
+#pragma warning(pop)
 
-static BOOL  g_bInit = FALSE;
-static DWORD g_dwPlatformId = VER_PLATFORM_WIN32_WINDOWS;
 
-DWORD GetPlatformId()
-{
+void dso_init(void);
+void dso_exit(void);
 
-    if (!g_bInit)
-    {
-        OSVERSIONINFO aInfo;
 
-        aInfo.dwOSVersionInfoSize = sizeof(aInfo);
-        if (GetVersionEx(&aInfo))
-            g_dwPlatformId = aInfo.dwPlatformId;
+extern "C" BOOL WINAPI DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpvReserved)
+{
+    switch(dwReason) {
+    case DLL_PROCESS_ATTACH:
+        DisableThreadLibraryCalls(hModule);
+
+        dso_init();
+        break;
 
-        g_bInit = TRUE;
+    case DLL_PROCESS_DETACH:
+        if (!lpvReserved)
+            dso_exit();
+        break;
     }
 
-    return g_dwPlatformId;
+    return TRUE;
 }
 
-#endif // 0
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
new file mode 100644
index 000000000000..2157568ad915
--- /dev/null
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -0,0 +1,850 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// Interesting info can be found in:
+
+// MSDN, obviously
+
+// http://www.osronline.com/article.cfm?article=469
+
+// ONTL, "Open NT Native Template Library", a C++ STL-like library
+// that can be used even when writing Windows drivers. This is some
+// quite badass code. The author has done impressive heavy spelunking
+// of MSVCR structures. http://code.google.com/p/ontl/
+
+// Geoff Chappell's pages:
+// http://members.ozemail.com.au/~geoffch/samples/programming/msvc/language/index.html
+
+// The below is from ONTL's ntl/nt/exception.hxx, cleaned up to keep just the _M_X64 parts:
+
+#if 0
+
+/* This information until the corresponding '#endif // 0' is covered
+ * by ONTL's license, which is said to be the "zlib/libgng license"
+ * below, which as far as I see is permissive enough to allow this
+ * information to be included here in this source file. Note that no
+ * actual code from ONTL below gets compiled into the object file.
+ */
+
+/*
+ * Copyright (c) 2011 <copyright holders> (The ONTL main
+ * developer(s) don't tell their real name(s) on the ONTL site.)
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ *     1. The origin of this software must not be misrepresented; you must not
+ *     claim that you wrote the original software. If you use this software
+ *     in a product, an acknowledgment in the product documentation would be
+ *     appreciated but is not required.
+ *
+ *     2. Altered source versions must be plainly marked as such, and must not be
+ *     misrepresented as being the original software.
+ *
+ *     3. This notice may not be removed or altered from any source
+ *     distribution.
+ *
+ */
+
+typedef uint32_t rva_t;
+
+///\note the calling convention should not matter since this has no arguments
+typedef void generic_function_t();
+
+struct ptrtomember // _PMD
+{
+  typedef __w64 int32_t  mdiff_t;
+  mdiff_t member_offset;
+  mdiff_t vbtable_offset; // -1 if not a virtual base
+  mdiff_t vdisp_offset;   // offset to the displacement value inside the vbtable
+
+  template<typename T>
+  T * operator()(T * const thisptr) const
+  {
+    uintptr_t tp = reinterpret_cast<uintptr_t>(thisptr);
+    uintptr_t ptr = tp + member_offset;
+    if ( vbtable_offset != -1 ) // !(vbtable_offset < 0)
+    {
+      ptr += *reinterpret_cast<mdiff_t*>( static_cast<intptr_t>(vdisp_offset + *reinterpret_cast<mdiff_t*>(tp + vbtable_offset)) )
+        + vbtable_offset;
+    }
+    return reinterpret_cast<T*>(ptr);
+  }
+};
+
+struct eobject
+{
+  typedef void (* dtor_ptr )(eobject*);
+  typedef void (* ctor_ptr )(eobject*, eobject*);
+  typedef void (* ctor_ptr2)(eobject*, eobject*, int);
+};
+
+struct catchabletype
+{
+  /** is simple type */
+  uint32_t    memmoveable : 1;
+  /** catchable as reference only */
+  uint32_t    refonly     : 1;
+  /** class with virtual base */
+  uint32_t    hasvirtbase : 1;
+  /** offset to the type descriptor */
+  rva_t       typeinfo;
+
+  /** catch type instance location within a thrown object  */
+  ptrtomember thiscast;
+  /** size of the simple type or offset into buffer of \c this pointer for catch object */
+  uint32_t    object_size;
+
+  union
+  {
+    rva_t               copyctor;
+    rva_t               copyctor2;
+  };
+};
+
+#pragma pack(push, 4)
+struct catchabletypearray
+{
+  uint32_t        size;
+  rva_t           type[1];
+};
+#pragma pack(pop)
+
+#pragma pack(push, 4)
+struct throwinfo
+{
+  typedef exception_disposition __cdecl forwardcompathandler_t(...);
+
+  /* 0x00 */  uint32_t  econst    : 1;
+  /* 0x00 */  uint32_t  evolatile : 1;
+  /* 0x00 */  uint32_t            : 1;
+  /* 0x00 */  uint32_t  e8        : 1;
+  /* 0x04 */  rva_t     exception_dtor;
+  /* 0x08 */  rva_t     forwardcompathandler;
+  /* 0x0C */  rva_t     catchabletypearray; ///< types able to catch the exception.
+};
+#pragma pack(pop)
+
+/// This type represents the catch clause
+struct ehandler
+{
+  //  union { uint32_t  adjectives; void * ptr; };
+  uint32_t isconst      : 1;
+  uint32_t isvolatile   : 1;
+  uint32_t isunaligned  : 1;// guess it is not used on x86
+  uint32_t isreference  : 1;
+
+  uint32_t              :27;
+  uint32_t ishz         : 1;
+
+  /** offset to the type descriptor of this catch object */
+  /*0x04*/ rva_t        typeinfo;         // dispType
+  /*0x08*/ int          eobject_bpoffset; // dispCatchObj
+  /** offset to the catch clause funclet */
+  /*0x0C*/ rva_t        handler;          // dispOfHandler
+  /*0x10*/ uint32_t     frame;            // dispFrame
+}
+
+// ___BuildCatchObject
+/// 15.3/16 When the exception-declaration specifies a class type, a copy
+///         constructor is used to initialize either the object declared
+///         in the exception-declaration or,
+///         if the exception-declaration does not specify a name,
+///         a temporary object of that type.
+///\note    This is the question may we optimize out the last case.
+///\warning If the copy constructor throws an exception, std::unexpected would be called
+void
+  constructcatchobject(
+  cxxregistration *             cxxreg,
+  const ehandler *        const catchblock,
+  catchabletype *         const convertable,
+  const dispatcher_context* const dispatch
+  )
+  const
+{
+  _EH_TRACE_ENTER();
+  // build helper
+  __try {
+    struct typeinfo_t { void* vtbl; void* spare; char name[1]; };
+    enum catchable_info { cidefault, cicomplex, civirtual } cinfo = cidefault;
+
+    const typeinfo_t* ti = catchblock->typeinfo ? dispatch->va<typeinfo_t*>(catchblock->typeinfo) : NULL;
+    if(ti && *ti->name && (catchblock->eobject_bpoffset || catchblock->ishz)){
+      eobject** objplace = catchblock->ishz
+        ? reinterpret_cast<eobject**>(cxxreg)
+        : reinterpret_cast<eobject**>(catchblock->eobject_bpoffset + cxxreg->fp.FramePointers);
+      if(catchblock->isreference){
+        // just ref/pointer
+        *objplace = adjust_pointer(get_object(), convertable);
+      }else if(convertable->memmoveable){
+        // POD
+        std::memcpy(objplace, get_object(), convertable->object_size);
+        if(convertable->object_size == sizeof(void*) && *objplace)
+          *objplace = adjust_pointer((void*)*objplace, convertable);
+      }else{
+        // if copy ctor exists, call it; binary copy otherwise
+        if(convertable->copyctor){
+          cinfo = convertable->hasvirtbase ? civirtual : cicomplex;
+        }else{
+          std::memcpy(objplace, (const void*)adjust_pointer(get_object(), convertable), convertable->object_size);
+        }
+      }
+    }
+    // end of build helper
+    if(cinfo != cidefault){
+      eobject* objthis = catchblock->ishz
+        ? reinterpret_cast<eobject*>(cxxreg)
+        : reinterpret_cast<eobject*>(catchblock->eobject_bpoffset + cxxreg->fp.FramePointers);
+      void* copyctor = thrown_va(convertable->copyctor);
+      eobject* copyarg = adjust_pointer(get_object(), convertable);
+      if(cinfo == cicomplex)
+        (eobject::ctor_ptr (copyctor))(objthis, copyarg);
+      else
+        (eobject::ctor_ptr2(copyctor))(objthis, copyarg, 1);
+    }
+  }
+  __except(cxxregistration::unwindfilter(static_cast<nt::ntstatus>(_exception_code())))
+  {
+    nt::exception::inconsistency();
+  }
+  _EH_TRACE_LEAVE();
+}
+
+#endif // 0
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_bridges.hxx"
+
+#pragma warning( disable : 4237 )
+#include <boost/unordered_map.hpp>
+#include <sal/config.h>
+#include <malloc.h>
+#include <new.h>
+#include <typeinfo.h>
+#include <signal.h>
+
+#include "rtl/alloc.h"
+#include "rtl/strbuf.hxx"
+#include "rtl/ustrbuf.hxx"
+
+#include "com/sun/star/uno/Any.hxx"
+
+#include "mscx.hxx"
+
+#pragma pack(push, 8)
+
+using namespace ::com::sun::star::uno;
+using namespace ::std;
+using namespace ::osl;
+using namespace ::rtl;
+
+namespace CPPU_CURRENT_NAMESPACE
+{
+
+static inline OUString toUNOname(
+    OUString const & rRTTIname )
+    throw ()
+{
+    OUStringBuffer aRet( 64 );
+    OUString aStr( rRTTIname.copy( 4, rRTTIname.getLength()-4-2 ) ); // filter .?AUzzz@yyy@xxx@@
+    sal_Int32 nPos = aStr.getLength();
+    while (nPos > 0)
+    {
+        sal_Int32 n = aStr.lastIndexOf( '@', nPos );
+        aRet.append( aStr.copy( n +1, nPos -n -1 ) );
+        if (n >= 0)
+        {
+            aRet.append( (sal_Unicode)'.' );
+        }
+        nPos = n;
+    }
+    return aRet.makeStringAndClear();
+}
+
+static inline OUString toRTTIname(
+    OUString const & rUNOname )
+    throw ()
+{
+    OUStringBuffer aRet( 64 );
+    aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM(".?AV") ); // class ".?AV"; struct ".?AU"
+    sal_Int32 nPos = rUNOname.getLength();
+    while (nPos > 0)
+    {
+        sal_Int32 n = rUNOname.lastIndexOf( '.', nPos );
+        aRet.append( rUNOname.copy( n +1, nPos -n -1 ) );
+        aRet.append( (sal_Unicode)'@' );
+        nPos = n;
+    }
+    aRet.append( (sal_Unicode)'@' );
+    return aRet.makeStringAndClear();
+}
+
+//RTTI simulation
+
+typedef boost::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap;
+
+class RTTInfos
+{
+    Mutex               _aMutex;
+    t_string2PtrMap     _allRTTI;
+
+    static OUString toRawName( OUString const & rUNOname ) throw ();
+public:
+    type_info * getRTTI( OUString const & rUNOname ) throw ();
+
+    RTTInfos();
+    ~RTTInfos();
+};
+
+class __type_info
+{
+    friend type_info * RTTInfos::getRTTI( OUString const & ) throw ();
+    friend int mscx_filterCppException(
+        LPEXCEPTION_POINTERS, uno_Any *, uno_Mapping * );
+
+public:
+    virtual ~__type_info() throw ();
+
+    inline __type_info( void * m_data, const char * m_d_name ) throw ()
+        : _m_data( m_data )
+        { ::strcpy( _m_d_name, m_d_name ); } // #100211# - checked
+
+private:
+    void * _m_data;
+    char _m_d_name[1];
+};
+
+__type_info::~__type_info() throw ()
+{
+}
+
+type_info * RTTInfos::getRTTI( OUString const & rUNOname ) throw ()
+{
+    // a must be
+    OSL_ENSURE( sizeof(__type_info) == sizeof(type_info), "### type info structure size differ!" );
+
+    MutexGuard aGuard( _aMutex );
+    t_string2PtrMap::const_iterator const iFind( _allRTTI.find( rUNOname ) );
+
+    // check if type is already available
+    if (iFind == _allRTTI.end())
+    {
+        // insert new type_info
+        OString aRawName( OUStringToOString( toRTTIname( rUNOname ), RTL_TEXTENCODING_ASCII_US ) );
+        __type_info * pRTTI = new( ::rtl_allocateMemory( sizeof(__type_info) + aRawName.getLength() ) )
+            __type_info( NULL, aRawName.getStr() );
+
+        // put into map
+        pair< t_string2PtrMap::iterator, bool > insertion(
+            _allRTTI.insert( t_string2PtrMap::value_type( rUNOname, pRTTI ) ) );
+        OSL_ENSURE( insertion.second, "### rtti insertion failed?!" );
+
+        return (type_info *)pRTTI;
+    }
+    else
+    {
+        return (type_info *)iFind->second;
+    }
+}
+
+RTTInfos::RTTInfos() throw ()
+{
+}
+
+RTTInfos::~RTTInfos() throw ()
+{
+#if OSL_DEBUG_LEVEL > 1
+    OSL_TRACE( "> freeing generated RTTI infos... <\n" );
+#endif
+
+    MutexGuard aGuard( _aMutex );
+    for ( t_string2PtrMap::const_iterator iPos( _allRTTI.begin() );
+          iPos != _allRTTI.end(); ++iPos )
+    {
+        __type_info * pType = (__type_info *)iPos->second;
+        pType->~__type_info(); // obsolete, but good style...
+        ::rtl_freeMemory( pType );
+    }
+}
+
+void * __cdecl copyConstruct(
+    void * pExcThis,
+    void * pSource,
+    typelib_TypeDescription * pTD ) throw ()
+{
+    ::uno_copyData( pExcThis, pSource, pTD, cpp_acquire );
+    return pExcThis;
+}
+
+void * __cdecl destruct(
+    void * pExcThis,
+    typelib_TypeDescription * pTD ) throw ()
+{
+    ::uno_destructData( pExcThis, pTD, cpp_release );
+    return pExcThis;
+}
+
+const int codeSnippetSize = 40;
+
+void GenerateConstructorTrampoline(
+    unsigned char * code,
+    typelib_TypeDescription * pTD ) throw ()
+{
+    unsigned char *p = code;
+
+    // mov r8, pTD
+    *p++ = 0x49; *p++ = 0xB8;
+    *((void **)p) = pTD; p += 8;
+
+    // mov r11, copyConstruct
+    *p++ = 0x49; *p++ = 0xBB;
+    *((void **)p) = &copyConstruct; p += 8;
+
+    // jmp r11
+    *p++ = 0x41; *p++ = 0xFF; *p++ = 0xE3;
+
+    OSL_ASSERT( p < code + codeSnippetSize );
+}
+
+void GenerateDestructorTrampoline(
+    unsigned char * code,
+    typelib_TypeDescription * pTD ) throw ()
+{
+    unsigned char *p = code;
+
+    // mov rdx, pTD
+    *p++ = 0x48; *p++ = 0xBA;
+    *((void **)p) = pTD; p += 8;
+
+    // mov r11, destruct
+    *p++ = 0x49; *p++ = 0xBB;
+    *((void **)p) = &destruct; p += 8;
+
+    // jmp r11
+    *p++ = 0x41; *p++ = 0xFF; *p++ = 0xE3;
+
+    OSL_ASSERT( p < code + codeSnippetSize );
+}
+
+// This looks like it is the struct catchabletype above
+
+struct ExceptionType
+{
+    sal_Int32   _n0;            // flags
+    sal_uInt32  _pTypeInfo;     // typeinfo
+    sal_Int32   _n1, _n2, _n3;  // thiscast
+    sal_Int32   _n4;            // object_size
+    sal_uInt32  _pCopyCtor;     // copyctor
+
+    inline ExceptionType(
+        sal_uChar * pCode,
+        sal_uInt64 pCodeBase,
+        typelib_TypeDescription * pTD ) throw ()
+        : _n0( 0 )
+        , _n1( 0 )
+        , _n2( -1 )
+        , _n3( 0 )
+        , _n4( pTD->nSize )
+        {
+            // As _n0 is always initialized to zero, that means the
+            // hasvirtbase flag (see the ONTL catchabletype struct) is
+            // off, and thus the copyctor is of the ctor_ptr kind.
+            _pTypeInfo = (sal_uInt32) ((sal_uInt64) mscx_getRTTI( pTD->pTypeName ) - pCodeBase);
+            GenerateConstructorTrampoline( pCode, pTD );
+            _pCopyCtor = (sal_uInt32) ((sal_uInt64) pCode - pCodeBase);
+        }
+    inline ~ExceptionType() throw ()
+        {
+        }
+};
+
+struct RaiseInfo;
+
+class ExceptionInfos
+{
+    Mutex           _aMutex;
+    t_string2PtrMap _allRaiseInfos;
+
+public:
+    static RaiseInfo * getRaiseInfo( typelib_TypeDescription * pTD ) throw ();
+
+    static DWORD allocationGranularity;
+
+    ExceptionInfos() throw ();
+    ~ExceptionInfos() throw ();
+};
+
+DWORD ExceptionInfos::allocationGranularity = 0;
+
+// This corresponds to the struct throwinfo described above.
+
+struct RaiseInfo
+{
+    sal_Int32           _n0;
+    sal_uInt32          _pDtor;
+    sal_Int32           _n2;
+    sal_uInt32          _types;
+
+    // Additional fields
+    typelib_TypeDescription * _pTD;
+    sal_uChar *        _code;
+    sal_uInt64         _codeBase;
+
+    RaiseInfo( typelib_TypeDescription * pTD ) throw ();
+
+    ~RaiseInfo() throw ();
+};
+
+RaiseInfo::RaiseInfo( typelib_TypeDescription * pTD )throw ()
+    : _n0( 0 )
+    , _n2( 0 )
+    , _pTD( pTD )
+{
+    typelib_CompoundTypeDescription * pCompTD;
+
+    // Count how many trampolines we need
+    int codeSize = codeSnippetSize;
+
+    // Info count
+    int nLen = 0;
+    for ( pCompTD = (typelib_CompoundTypeDescription*)pTD;
+          pCompTD; pCompTD = pCompTD->pBaseTypeDescription )
+    {
+        ++nLen;
+        codeSize += codeSnippetSize;
+    }
+
+    sal_uChar * pCode = _code = (sal_uChar *)::rtl_allocateMemory( codeSize );
+
+    _codeBase = (sal_uInt64)pCode & ~(ExceptionInfos::allocationGranularity-1);
+
+    DWORD old_protect;
+#if OSL_DEBUG_LEVEL > 0
+    BOOL success =
+#endif
+        VirtualProtect( pCode, codeSize, PAGE_EXECUTE_READWRITE, &old_protect );
+        OSL_ENSURE( success, "VirtualProtect() failed!" );
+
+    ::typelib_typedescription_acquire( pTD );
+
+    GenerateDestructorTrampoline( pCode, pTD );
+    _pDtor = (sal_Int32)((sal_uInt64)pCode - _codeBase);
+    pCode += codeSnippetSize;
+
+    // Info count accompanied by type info ptrs: type, base type, base base type, ...
+    _types = (sal_Int32)((sal_uInt64)::rtl_allocateMemory( 4 + 4* nLen) - _codeBase);
+    *(sal_Int32 *)_types = nLen;
+
+    ExceptionType ** ppTypes = (ExceptionType **)((sal_Int32 *)_types + 1);
+
+    int nPos = 0;
+    for ( pCompTD = (typelib_CompoundTypeDescription*)pTD;
+          pCompTD; pCompTD = pCompTD->pBaseTypeDescription )
+    {
+        ppTypes[nPos++] =
+            new ExceptionType( pCode, _codeBase,
+                               (typelib_TypeDescription *)pCompTD );
+        pCode += codeSnippetSize;
+    }
+}
+
+RaiseInfo::~RaiseInfo() throw ()
+{
+    sal_uInt32 * pTypes =
+        (sal_uInt32 *)(_codeBase + _types) + 1;
+
+    for ( int nTypes = *(sal_uInt32 *)(_codeBase + _types); nTypes--; )
+    {
+        delete (ExceptionType *) (_codeBase + pTypes[nTypes]);
+    }
+    ::rtl_freeMemory( (void*)(_codeBase +_types) );
+    ::rtl_freeMemory( _code );
+
+    ::typelib_typedescription_release( _pTD );
+}
+
+ExceptionInfos::ExceptionInfos() throw ()
+{
+}
+
+ExceptionInfos::~ExceptionInfos() throw ()
+{
+#if OSL_DEBUG_LEVEL > 1
+    OSL_TRACE( "> freeing exception infos... <\n" );
+#endif
+
+    MutexGuard aGuard( _aMutex );
+    for ( t_string2PtrMap::const_iterator iPos( _allRaiseInfos.begin() );
+          iPos != _allRaiseInfos.end(); ++iPos )
+    {
+        delete (RaiseInfo *)iPos->second;
+    }
+}
+
+RaiseInfo * ExceptionInfos::getRaiseInfo( typelib_TypeDescription * pTD ) throw ()
+{
+    static ExceptionInfos * s_pInfos = 0;
+    if (! s_pInfos)
+    {
+        MutexGuard aGuard( Mutex::getGlobalMutex() );
+        if (! s_pInfos)
+        {
+            SYSTEM_INFO systemInfo;
+            GetSystemInfo( &systemInfo );
+            allocationGranularity = systemInfo.dwAllocationGranularity;
+
+#ifdef LEAK_STATIC_DATA
+            s_pInfos = new ExceptionInfos();
+#else
+            static ExceptionInfos s_allExceptionInfos;
+            s_pInfos = &s_allExceptionInfos;
+#endif
+        }
+    }
+
+    OSL_ASSERT( pTD &&
+                (pTD->eTypeClass == typelib_TypeClass_STRUCT ||
+                 pTD->eTypeClass == typelib_TypeClass_EXCEPTION) );
+
+    RaiseInfo * pRaiseInfo;
+
+    OUString const & rTypeName = *reinterpret_cast< OUString * >( &pTD->pTypeName );
+    MutexGuard aGuard( s_pInfos->_aMutex );
+    t_string2PtrMap::const_iterator const iFind(
+        s_pInfos->_allRaiseInfos.find( rTypeName ) );
+    if (iFind == s_pInfos->_allRaiseInfos.end())
+    {
+        pRaiseInfo = new RaiseInfo( pTD );
+
+        // Put into map
+        pair< t_string2PtrMap::iterator, bool > insertion(
+            s_pInfos->_allRaiseInfos.insert( t_string2PtrMap::value_type( rTypeName, (void *)pRaiseInfo ) ) );
+        OSL_ENSURE( insertion.second, "### raise info insertion failed?!" );
+    }
+    else
+    {
+        // Reuse existing info
+        pRaiseInfo = (RaiseInfo *)iFind->second;
+    }
+
+    return pRaiseInfo;
+}
+
+type_info * mscx_getRTTI(
+    OUString const & rUNOname )
+{
+    static RTTInfos * s_pRTTIs = 0;
+    if (! s_pRTTIs)
+    {
+        MutexGuard aGuard( Mutex::getGlobalMutex() );
+        if (! s_pRTTIs)
+        {
+#ifdef LEAK_STATIC_DATA
+            s_pRTTIs = new RTTInfos();
+#else
+            static RTTInfos s_aRTTIs;
+            s_pRTTIs = &s_aRTTIs;
+#endif
+        }
+    }
+    return s_pRTTIs->getRTTI( rUNOname );
+}
+
+void mscx_raiseException(
+    uno_Any * pUnoExc,
+    uno_Mapping * pUno2Cpp )
+{
+    // no ctor/dtor in here: this leads to dtors called twice upon RaiseException()!
+    // thus this obj file will be compiled without opt, so no inlining of
+    // ExceptionInfos::getRaiseInfo()
+
+    // construct cpp exception object
+    typelib_TypeDescription * pTD = NULL;
+    TYPELIB_DANGER_GET( &pTD, pUnoExc->pType );
+
+    void * pCppExc = alloca( pTD->nSize );
+    ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTD, pUno2Cpp );
+
+    ULONG_PTR arFilterArgs[4];
+    arFilterArgs[0] = MSVC_magic_number;
+    arFilterArgs[1] = (ULONG_PTR)pCppExc;
+    arFilterArgs[2] = (ULONG_PTR)ExceptionInfos::getRaiseInfo( pTD );
+    arFilterArgs[3] = ((RaiseInfo *)arFilterArgs[2])->_codeBase;
+
+    // Destruct uno exception
+    ::uno_any_destruct( pUnoExc, 0 );
+    TYPELIB_DANGER_RELEASE( pTD );
+
+    // last point to release anything not affected by stack unwinding
+    RaiseException( MSVC_ExceptionCode, EXCEPTION_NONCONTINUABLE, 3, arFilterArgs );
+}
+
+int mscx_filterCppException(
+    EXCEPTION_POINTERS * pPointers,
+    uno_Any * pUnoExc,
+    uno_Mapping * pCpp2Uno )
+{
+    if (pPointers == 0)
+        return EXCEPTION_CONTINUE_SEARCH;
+
+    EXCEPTION_RECORD * pRecord = pPointers->ExceptionRecord;
+
+    // Handle only C++ exceptions:
+    if (pRecord == 0 || pRecord->ExceptionCode != MSVC_ExceptionCode)
+        return EXCEPTION_CONTINUE_SEARCH;
+
+    bool rethrow = __CxxDetectRethrow( &pRecord );
+    OSL_ASSERT( pRecord == pPointers->ExceptionRecord );
+
+    if (rethrow && pRecord == pPointers->ExceptionRecord)
+    {
+        // Hack to get msvcrt internal _curexception field:
+        pRecord = *reinterpret_cast< EXCEPTION_RECORD ** >(
+            reinterpret_cast< char * >( __pxcptinfoptrs() ) +
+            // As long as we don't demand MSVCR source as build prerequisite,
+            // we have to code those offsets here.
+            //
+            // MSVS9/crt/src/mtdll.h:
+            // offsetof (_tiddata, _curexception) -
+            // offsetof (_tiddata, _tpxcptinfoptrs):
+#if _MSC_VER < 1500
+            error, this compiler version is not supported
+#elif _MSC_VER < 1600
+            0x48 // msvcr90.dll
+#else
+            error, please find value for this compiler version
+#endif
+            );
+    }
+
+    // Rethrow: handle only C++ exceptions:
+    if (pRecord == 0 || pRecord->ExceptionCode != MSVC_ExceptionCode)
+        return EXCEPTION_CONTINUE_SEARCH;
+
+    if (pRecord->NumberParameters == 4 &&
+        pRecord->ExceptionInformation[0] == MSVC_magic_number &&
+        pRecord->ExceptionInformation[1] != 0 &&
+        pRecord->ExceptionInformation[2] != 0 &&
+        pRecord->ExceptionInformation[3] != 0)
+    {
+        // ExceptionInformation[1] is the address of the thrown object
+        // (or the address of a pointer to it, in most cases when it
+        // is a C++ class, obviously).
+
+        // [2] is the throwinfo pointer
+
+        // [3] is the image base address which is added the 32-bit
+        // rva_t fields in throwinfo to get actual 64-bit addresses
+
+        void * types =
+            (void *) (pRecord->ExceptionInformation[3] +
+                      ((RaiseInfo *)pRecord->ExceptionInformation[2])->_types);
+
+        if (types != 0 && *(DWORD *)types > 0)
+        {
+            DWORD pType = *((DWORD *)types + 1);
+            if (pType != 0 &&
+                ((ExceptionType *)(pRecord->ExceptionInformation[3]+pType))->_pTypeInfo != 0)
+            {
+                OUString aRTTIname(
+                    OStringToOUString(
+                        reinterpret_cast< __type_info * >(
+                            ((ExceptionType *)(pRecord->ExceptionInformation[3]+pType))->_pTypeInfo )->_m_d_name,
+                        RTL_TEXTENCODING_ASCII_US ) );
+                OUString aUNOname( toUNOname( aRTTIname ) );
+
+                typelib_TypeDescription * pExcTD = 0;
+                typelib_typedescription_getByName(
+                    &pExcTD, aUNOname.pData );
+                if (pExcTD == NULL)
+                {
+                    OUStringBuffer buf;
+                    buf.appendAscii(
+                        RTL_CONSTASCII_STRINGPARAM(
+                            "[mscx_uno bridge error] UNO type of "
+                            "C++ exception unknown: \"") );
+                    buf.append( aUNOname );
+                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
+                                         "\", RTTI-name=\"") );
+                    buf.append( aRTTIname );
+                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") );
+                    RuntimeException exc(
+                        buf.makeStringAndClear(), Reference< XInterface >() );
+                    uno_type_any_constructAndConvert(
+                        pUnoExc, &exc,
+                        ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
+#if _MSC_VER < 1400 // msvcr80.dll cleans up, different from former msvcrs
+                    // if (! rethrow):
+                    // though this unknown exception leaks now, no user-defined
+                    // exception is ever thrown thru the binary C-UNO dispatcher
+                    // call stack.
+#endif
+                }
+                else
+                {
+                    // construct uno exception any
+                    uno_any_constructAndConvert(
+                        pUnoExc, (void *) pRecord->ExceptionInformation[1],
+                        pExcTD, pCpp2Uno );
+#if _MSC_VER < 1400 // msvcr80.dll cleans up, different from former msvcrs
+                    if (! rethrow)
+                    {
+                        uno_destructData(
+                            (void *) pRecord->ExceptionInformation[1],
+                            pExcTD, cpp_release );
+                    }
+#endif
+                    typelib_typedescription_release( pExcTD );
+                }
+
+                return EXCEPTION_EXECUTE_HANDLER;
+            }
+        }
+    }
+    // though this unknown exception leaks now, no user-defined exception
+    // is ever thrown thru the binary C-UNO dispatcher call stack.
+    RuntimeException exc(
+        OUString( RTL_CONSTASCII_USTRINGPARAM(
+                      "[mscx_uno bridge error] unexpected "
+                      "C++ exception occurred!") ),
+        Reference< XInterface >() );
+    uno_type_any_constructAndConvert(
+        pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
+    return EXCEPTION_EXECUTE_HANDLER;
+}
+
+}
+
+#pragma pack(pop)
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk b/bridges/source/cpp_uno/msvc_win32_x86-64/makefile.mk
index 87ff690dd653..7f73ebe4bba2 100644
--- a/bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/makefile.mk
@@ -28,7 +28,7 @@
 PRJ=..$/..$/..
 
 PRJNAME=bridges
-TARGET=gcc3_uno
+TARGET=mscx_uno
 LIBTARGET=no
 ENABLE_EXCEPTIONS=TRUE
 
@@ -37,25 +37,29 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # --- Files --------------------------------------------------------
+.IF "$(COM)$(CPU)" == "MSCX"
 
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
+.IF "$(debug)" != ""
+CFLAGS += -Ob0
+.ENDIF
 
 .IF "$(cppu_no_leak)" == ""
+.IF "$(bndchk)" == ""
 CFLAGS += -DLEAK_STATIC_DATA
 .ENDIF
+.ENDIF
 
-# In case someone enabled the non-standard -fomit-frame-pointer which does not
-# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
-
-CFLAGSNOOPT=-O0
 
 SLOFILES= \
-    $(SLO)$/except.obj		\
-    $(SLO)$/cpp2uno.obj		\
+    $(SLO)$/cpp2uno.obj \
     $(SLO)$/uno2cpp.obj \
+    $(SLO)$/dllinit.obj \
+    $(SLO)$/except.obj  \
     $(SLO)$/call.obj
 
+NOOPTFILES= \
+    $(SLO)$/except.obj
+
 SHL1TARGET= $(TARGET)
 
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
@@ -67,15 +71,13 @@ SHL1OBJS = $(SLOFILES)
 SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
 
 SHL1STDLIBS= \
-    $(CPPULIB)			\
+    $(CPPULIB) \
     $(SALLIB)
 
+DEF1NAME=$(SHL1TARGET)
+
 .ENDIF
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-$(SLO)$/%.obj: %.s
-    $(CC) -c -o $(SLO)$/$(@:b).o $<
-    touch $@
diff --git a/sal/osl/os2/file_error_transl.h b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
index 59d7b1d9faec..044bd4bb1316 100644
--- a/sal/osl/os2/file_error_transl.h
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,46 +26,37 @@
  *
  ************************************************************************/
 
-#ifndef _FILE_ERROR_TRANSL_H_
-#define _FILE_ERROR_TRANSL_H_
+#pragma warning(push, 1)
+#include <windows.h>
+#pragma warning(pop)
 
-#include <osl/file.h>
-#include <sal/types.h>
+#include "rtl/ustring.hxx"
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 
-/*********************************************
-   oslTranslateFileError
-   Translate errno's to osl file errors
+class type_info;
+typedef struct _uno_Any uno_Any;
+typedef struct _uno_Mapping uno_Mapping;
 
-   @param bIsError [in] specifies if nErrno
-           should be interpreted as error,
-          some libc functions signaling an error
-           but errno is nevertheless 0 in this
-           case the function should at least
-           return osl_File_E_Unknown but in no
-           case osl_File_E_None!
+namespace CPPU_CURRENT_NAMESPACE
+{
 
-   @param nErrno [in] the errno if errno is 0
-            and bIsError is true the function
-           returns osl_File_E_Unknown
+const DWORD MSVC_ExceptionCode = 0xe06d7363;
+const long MSVC_magic_number = 0x19930520L;
 
-   @returns the osl error code appropriate to
-              the errno
+typedef enum { REGPARAM_INT, REGPARAM_FLT } RegParamKind;
 
- *********************************************/
 
-#define OSL_FET_SUCCESS sal_False
-#define OSL_FET_ERROR   sal_True
+//==============================================================================
+type_info * mscx_getRTTI( ::rtl::OUString const & rUNOname );
 
-oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno);
+//==============================================================================
+int mscx_filterCppException(
+    EXCEPTION_POINTERS * pPointers, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno );
 
+//==============================================================================
+void mscx_raiseException(
+    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
 
-#ifdef __cplusplus
 }
-#endif
 
-#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
new file mode 100644
index 000000000000..7271aa510847
--- /dev/null
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
@@ -0,0 +1,450 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_bridges.hxx"
+
+#include <malloc.h>
+
+#include <com/sun/star/uno/genfunc.hxx>
+#include <uno/data.h>
+
+#include "bridges/cpp_uno/shared/bridge.hxx"
+#include "bridges/cpp_uno/shared/types.hxx"
+#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
+#include "bridges/cpp_uno/shared/vtables.hxx"
+
+#include "mscx.hxx"
+
+#if OSL_DEBUG_LEVEL > 1
+#include <stdio.h>
+#endif
+
+using namespace ::rtl;
+using namespace ::com::sun::star::uno;
+
+namespace
+{
+
+static bool cpp_call(
+    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
+    bridges::cpp_uno::shared::VtableSlot aVtableSlot,
+    typelib_TypeDescriptionReference * pReturnTypeRef,
+    sal_Int32 nParams,
+    typelib_MethodParameter * pParams,
+    void * pUnoReturn,
+    void * pUnoArgs[],
+    uno_Any ** ppUnoExc ) throw ()
+{
+    const int MAXPARAMS = 20;
+
+    if ( nParams > MAXPARAMS )
+    {
+        // We have a hard limit on the number of parameters so that we
+        // don't need any assembler code here but can call the
+        // function using normal C++.
+
+        return false;
+    }
+
+    // Table with this pointer, optional complex return value ptr, and the parameters
+    union {
+        sal_Int64 i;
+        void *p;
+        double d;
+    } aCppParams[MAXPARAMS+2], uRetVal;
+    int nCppParamIndex = 0;
+
+    // Return type
+    typelib_TypeDescription * pReturnTD = NULL;
+    TYPELIB_DANGER_GET( &pReturnTD, pReturnTypeRef );
+    OSL_ENSURE( pReturnTD, "### expected return type description!" );
+
+    // 'this'
+    void * pAdjustedThisPtr = (void **)( pThis->getCppI() ) + aVtableSlot.offset;
+    aCppParams[nCppParamIndex++].p = pAdjustedThisPtr;
+
+    bool bSimpleReturn = true;
+    if ( pReturnTD )
+    {
+        if ( !bridges::cpp_uno::shared::isSimpleType( pReturnTD ) )
+        {
+            // Complex return via ptr
+            bSimpleReturn = false;
+            aCppParams[nCppParamIndex++].p =
+                bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTD )?
+                         alloca( pReturnTD->nSize ) : pUnoReturn;
+        }
+    }
+
+    // Indexes of values this have to be converted (interface conversion C++<=>UNO)
+    int pTempCppIndexes[MAXPARAMS];
+    int pTempIndexes[MAXPARAMS];
+    int nTempIndexes = 0;
+
+    // Type descriptions for reconversions
+    typelib_TypeDescription *pTempParamTypeDescr[MAXPARAMS];
+
+    for ( int nPos = 0; nPos < nParams; ++nPos, ++nCppParamIndex )
+    {
+        const typelib_MethodParameter & rParam = pParams[nPos];
+
+        typelib_TypeDescription * pParamTD = NULL;
+        TYPELIB_DANGER_GET( &pParamTD, rParam.pTypeRef );
+
+        if ( !rParam.bOut &&
+             bridges::cpp_uno::shared::isSimpleType( pParamTD ) )
+        {
+            ::uno_copyAndConvertData(
+                &aCppParams[nCppParamIndex], pUnoArgs[nPos], pParamTD,
+                pThis->getBridge()->getUno2Cpp() );
+
+            // No longer needed
+            TYPELIB_DANGER_RELEASE( pParamTD );
+        }
+        else // Ptr to complex value | ref
+        {
+            if ( !rParam.bIn ) // Is pure out
+            {
+                // C++ out is constructed mem, UNO out is not!
+                ::uno_constructData(
+                    aCppParams[nCppParamIndex].p = alloca( pParamTD->nSize ),
+                    pParamTD );
+
+                pTempCppIndexes[nTempIndexes] = nCppParamIndex;
+                pTempIndexes[nTempIndexes] = nPos;
+
+                // Will be released at reconversion
+                pTempParamTypeDescr[nTempIndexes++] = pParamTD;
+
+            }
+            // Is in/inout
+            else if ( bridges::cpp_uno::shared::relatesToInterfaceType( pParamTD ) )
+            {
+                ::uno_copyAndConvertData(
+                    aCppParams[nCppParamIndex].p = alloca( pParamTD->nSize ),
+                    pUnoArgs[nPos], pParamTD,
+                    pThis->getBridge()->getUno2Cpp() );
+
+                pTempCppIndexes[nTempIndexes] = nCppParamIndex;
+                pTempIndexes[nTempIndexes] = nPos;
+
+                // Will be released at reconversion
+                pTempParamTypeDescr[nTempIndexes++] = pParamTD;
+            }
+            else // direct way
+            {
+                aCppParams[nCppParamIndex].p = pUnoArgs[nPos];
+
+                // No longer needed
+                TYPELIB_DANGER_RELEASE( pParamTD );
+            }
+        }
+    }
+
+    __try
+    {
+        // The first real parameter is always 'this'.
+
+        // The Windows x64 calling convention is very regular and
+        // elegant (even if perhaps then slightly slower than the
+        // Linux x64 one): The first four parameters, never more, are
+        // passed in registers, as long as they are a qword in size
+        // or less. (If larger, a pointer to a temp copy is passed, so
+        // it's equivalent anyway.) Floating point values are passed
+        // in XMM0..3 registers, others in RCX, RDX, R8, R9.
+
+        // Now, the nice thing for us is that when calling varargs
+        // functions, floating-point parameters among the four first
+        // ones are always passed *both* in an XMM and integer
+        // register. So we don't need to bother here calling the
+        // method different ways depending on what types of parameters
+        // it actually expects. We just pretend parameters 3..4 are
+        // doubles, and they will be passed both in XMM and integer
+        // registers, and the callee will find them where it
+        // expects. (The callee is not actually varargs, of course.)
+
+        sal_Int64 (*pIMethod)(sal_Int64, ...) =
+            (sal_Int64 (*)(sal_Int64, ...))
+            (*((sal_uInt64 **)pAdjustedThisPtr))[aVtableSlot.index];
+
+        double (*pFMethod)(sal_Int64, ...) =
+            (double (*)(sal_Int64, ...))
+            (*((sal_uInt64 **)pAdjustedThisPtr))[aVtableSlot.index];
+
+        // Pass parameters 2..4 as if it was a floating-point value so
+        // that it gets put in both XMM and integer registers per the
+        // calling convention. It doesn't matter if it actually is a
+        // fp or not.
+
+        if ( pReturnTD &&
+             (pReturnTD->eTypeClass == typelib_TypeClass_FLOAT ||
+              pReturnTD->eTypeClass == typelib_TypeClass_DOUBLE) )
+            uRetVal.d =
+                pFMethod (aCppParams[0].i, aCppParams[1].d, aCppParams[2].d, aCppParams[3].d,
+                          aCppParams[4].i, aCppParams[5].i, aCppParams[6].i, aCppParams[7].i,
+                          aCppParams[8].i, aCppParams[9].i, aCppParams[10].i, aCppParams[11].i,
+                          aCppParams[12].i, aCppParams[13].i, aCppParams[14].i, aCppParams[15].i,
+                          aCppParams[16].i, aCppParams[17].i, aCppParams[18].i, aCppParams[19].i );
+        else
+            uRetVal.i =
+                pIMethod (aCppParams[0].i, aCppParams[1].d, aCppParams[2].d, aCppParams[3].d,
+                          aCppParams[4].i, aCppParams[5].i, aCppParams[6].i, aCppParams[7].i,
+                          aCppParams[8].i, aCppParams[9].i, aCppParams[10].i, aCppParams[11].i,
+                          aCppParams[12].i, aCppParams[13].i, aCppParams[14].i, aCppParams[15].i,
+                          aCppParams[16].i, aCppParams[17].i, aCppParams[18].i, aCppParams[19].i );
+    }
+    __except (CPPU_CURRENT_NAMESPACE::mscx_filterCppException(
+                  GetExceptionInformation(),
+                  *ppUnoExc, pThis->getBridge()->getCpp2Uno() ))
+   {
+        // *ppUnoExc was constructed by filter function.
+        // Temporary params
+        while ( nTempIndexes-- )
+        {
+            int nCppIndex = pTempCppIndexes[nTempIndexes];
+            // Destroy temp C++ param => C++: every param was constructed
+            ::uno_destructData(
+                aCppParams[nCppIndex].p, pTempParamTypeDescr[nTempIndexes],
+                cpp_release );
+            TYPELIB_DANGER_RELEASE( pTempParamTypeDescr[nTempIndexes] );
+        }
+        // Return type
+        if ( pReturnTD )
+            TYPELIB_DANGER_RELEASE( pReturnTD );
+
+        // End here
+        return true;
+    }
+
+    // No exception occurred
+    *ppUnoExc = NULL;
+
+    // Reconvert temporary params
+    while ( nTempIndexes-- )
+    {
+        int nCppIndex = pTempCppIndexes[nTempIndexes];
+        int nIndex = pTempIndexes[nTempIndexes];
+        typelib_TypeDescription * pParamTD =
+            pTempParamTypeDescr[nTempIndexes];
+
+        if ( pParams[nIndex].bIn )
+        {
+            if ( pParams[nIndex].bOut ) // Inout
+            {
+                ::uno_destructData(
+                    pUnoArgs[nIndex], pParamTD, 0 ); // Destroy UNO value
+                ::uno_copyAndConvertData(
+                    pUnoArgs[nIndex], aCppParams[nCppIndex].p, pParamTD,
+                    pThis->getBridge()->getCpp2Uno() );
+            }
+        }
+        else // Pure out
+        {
+            ::uno_copyAndConvertData(
+                pUnoArgs[nIndex], aCppParams[nCppIndex].p, pParamTD,
+                pThis->getBridge()->getCpp2Uno() );
+        }
+
+        // Destroy temp C++ param => C++: every param was constructed
+        ::uno_destructData(
+            aCppParams[nCppIndex].p, pParamTD, cpp_release );
+
+        TYPELIB_DANGER_RELEASE( pParamTD );
+    }
+
+    // Return value
+    if ( !bSimpleReturn )
+    {
+        ::uno_copyAndConvertData(
+            pUnoReturn, uRetVal.p, pReturnTD,
+            pThis->getBridge()->getCpp2Uno() );
+        ::uno_destructData(
+            aCppParams[1].p, pReturnTD, cpp_release );
+    }
+    else if ( pUnoReturn )
+        *(sal_Int64*)pUnoReturn = uRetVal.i;
+
+    if ( pReturnTD )
+        TYPELIB_DANGER_RELEASE( pReturnTD );
+
+    return true;
+}
+
+}
+
+namespace bridges { namespace cpp_uno { namespace shared {
+
+void unoInterfaceProxyDispatch(
+    uno_Interface * pUnoI,
+    const typelib_TypeDescription * pMemberTD,
+    void * pReturn,
+    void * pArgs[],
+    uno_Any ** ppException )
+{
+    // is my surrogate
+    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
+        = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
+#if OSL_DEBUG_LEVEL > 0
+    typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
+#endif
+
+    switch (pMemberTD->eTypeClass)
+    {
+    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+    {
+#if OSL_DEBUG_LEVEL > 0
+        // determine vtable call index
+        sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberTD)->nPosition;
+        OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
+#endif
+        VtableSlot aVtableSlot(
+            getVtableSlot(
+                reinterpret_cast<
+                    typelib_InterfaceAttributeTypeDescription const * >(
+                        pMemberTD)));
+        if ( pReturn )
+        {
+            // Is GET
+            cpp_call(
+                pThis, aVtableSlot,
+                ((typelib_InterfaceAttributeTypeDescription *)pMemberTD)->pAttributeTypeRef,
+                0, NULL, // no params
+                pReturn, pArgs, ppException );
+        }
+        else
+        {
+            // Is SET
+            typelib_MethodParameter aParam;
+            aParam.pTypeRef =
+                ((typelib_InterfaceAttributeTypeDescription *)pMemberTD)->pAttributeTypeRef;
+            aParam.bIn      = sal_True;
+            aParam.bOut     = sal_False;
+
+            typelib_TypeDescriptionReference * pReturnTypeRef = NULL;
+            OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+            typelib_typedescriptionreference_new(
+                &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
+
+            aVtableSlot.index += 1; // get, then set method
+            cpp_call(
+                pThis, aVtableSlot,
+                pReturnTypeRef,
+                1, &aParam,
+                pReturn, pArgs, ppException );
+
+            typelib_typedescriptionreference_release( pReturnTypeRef );
+        }
+
+        break;
+    }
+    case typelib_TypeClass_INTERFACE_METHOD:
+    {
+#if OSL_DEBUG_LEVEL > 0
+        // determine vtable call index
+        sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberTD)->nPosition;
+        OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
+#endif
+        VtableSlot aVtableSlot(
+            getVtableSlot(
+                reinterpret_cast<
+                    typelib_InterfaceMethodTypeDescription const * >(
+                        pMemberTD)));
+
+        switch (aVtableSlot.index)
+        {
+        // Standard calls
+        case 1: // Acquire UNO interface
+            (*pUnoI->acquire)( pUnoI );
+            *ppException = 0;
+            break;
+        case 2: // Release UNO interface
+            (*pUnoI->release)( pUnoI );
+            *ppException = 0;
+            break;
+        case 0: // queryInterface() opt
+        {
+            typelib_TypeDescription * pTD = NULL;
+            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
+
+            if ( pTD )
+            {
+                uno_Interface * pInterface = NULL;
+                (*pThis->getBridge()->getUnoEnv()->getRegisteredInterface)(
+                    pThis->getBridge()->getUnoEnv(),
+                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
+
+                if ( pInterface )
+                {
+                    ::uno_any_construct(
+                        reinterpret_cast< uno_Any * >( pReturn ),
+                        &pInterface, pTD, 0 );
+                    (*pInterface->release)( pInterface );
+
+                    TYPELIB_DANGER_RELEASE( pTD );
+
+                    *ppException = 0;
+                    break;
+                }
+                TYPELIB_DANGER_RELEASE( pTD );
+            }
+        } // Else perform queryInterface()
+        default:
+            if ( ! cpp_call(
+                     pThis, aVtableSlot,
+                     ((typelib_InterfaceMethodTypeDescription *)pMemberTD)->pReturnTypeRef,
+                     ((typelib_InterfaceMethodTypeDescription *)pMemberTD)->nParams,
+                     ((typelib_InterfaceMethodTypeDescription *)pMemberTD)->pParams,
+                     pReturn, pArgs, ppException ) )
+            {
+                RuntimeException aExc(
+                    OUString( RTL_CONSTASCII_USTRINGPARAM("Too many parameters!") ),
+                    Reference< XInterface >() );
+
+                Type const & rExcType = ::getCppuType( &aExc );
+                ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
+            }
+        }
+        break;
+    }
+    default:
+    {
+        RuntimeException aExc(
+            OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal member type description!") ),
+            Reference< XInterface >() );
+
+        Type const & rExcType = ::getCppuType( &aExc );
+        // Binary identical null reference (whatever that comment means...)
+        ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
+    }
+    }
+}
+
+} } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/bridge.cxx b/bridges/source/cpp_uno/shared/bridge.cxx
index 731eab39cc7c..0b76b0ca1a8a 100644
--- a/bridges/source/cpp_uno/shared/bridge.cxx
+++ b/bridges/source/cpp_uno/shared/bridge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -224,3 +225,5 @@ Bridge::~Bridge() SAL_THROW(())
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx
index 1f8a6eccb41f..f4f0a1988b56 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -147,8 +148,8 @@ static void s_stub_computeObjectIdentifier(va_list * pParam)
         }
         catch (::com::sun::star::uno::RuntimeException &)
         {
-            OSL_ENSURE(
-                0, "### RuntimeException occured udring queryInterface()!" );
+            OSL_FAIL(
+                "### RuntimeException occurred udring queryInterface()!" );
         }
     }
 }
@@ -270,3 +271,5 @@ void SAL_CALL uno_ext_getMapping(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/component.hxx b/bridges/source/cpp_uno/shared/component.hxx
index 31622f312304..7be6cd7a6355 100644
--- a/bridges/source/cpp_uno/shared/component.hxx
+++ b/bridges/source/cpp_uno/shared/component.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,3 +38,5 @@ extern rtl_StandardModuleCount g_moduleCount;
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index 90c53d258d10..5b3c8eeba37e 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -203,3 +204,5 @@ CppInterfaceProxy * CppInterfaceProxy::castInterfaceToProxy(void * pInterface)
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/guardedarray.hxx b/bridges/source/cpp_uno/shared/guardedarray.hxx
index b49def85ac64..9e4e0f3b0cad 100644
--- a/bridges/source/cpp_uno/shared/guardedarray.hxx
+++ b/bridges/source/cpp_uno/shared/guardedarray.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,5 @@ private:
 } } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/types.cxx b/bridges/source/cpp_uno/shared/types.cxx
index 6a08038f9902..cf442082f283 100644
--- a/bridges/source/cpp_uno/shared/types.cxx
+++ b/bridges/source/cpp_uno/shared/types.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -124,3 +125,5 @@ bool relatesToInterfaceType(typelib_TypeDescription const * type) {
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
index 1f5580eb2f30..e3159f12190d 100644
--- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -140,3 +141,5 @@ UnoInterfaceProxy::~UnoInterfaceProxy()
 {}
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 58c275a11234..5d5609825a83 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,11 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_bridges.hxx"
 
-#if defined OS2
-#define INCL_DOS
-#define INCL_DOSMISC
-#endif
-
 #include "bridges/cpp_uno/shared/vtablefactory.hxx"
 
 #include "guardedarray.hxx"
@@ -49,13 +45,14 @@
 #include "sal/types.h"
 #include "typelib/typedescription.hxx"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <new>
 #include <vector>
 
 #if defined SAL_UNX
 #include <unistd.h>
 #include <string.h>
+#include <errno.h>
 #include <sys/mman.h>
 #elif defined SAL_W32
 #define WIN32_LEAN_AND_MEAN
@@ -66,10 +63,6 @@
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
-#elif defined SAL_OS2
-#define INCL_DOS
-#define INCL_DOSMISC
-#include <os2.h>
 #else
 #error Unsupported platform
 #endif
@@ -81,7 +74,7 @@ namespace {
 extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
     sal_Size pagesize;
 #if defined SAL_UNX
-#if defined FREEBSD || defined NETBSD
+#if defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY
     pagesize = getpagesize();
 #else
     pagesize = sysconf(_SC_PAGESIZE);
@@ -90,10 +83,6 @@ extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
     SYSTEM_INFO info;
     GetSystemInfo(&info);
     pagesize = info.dwPageSize;
-#elif defined(SAL_OS2)
-    ULONG ulPageSize;
-    DosQuerySysInfo(QSV_PAGE_SIZE, QSV_PAGE_SIZE, &ulPageSize, sizeof(ULONG));
-    pagesize = (sal_Size)ulPageSize;
 #else
 #error Unsupported platform
 #endif
@@ -113,9 +102,6 @@ extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
     }
 #elif defined SAL_W32
     p = VirtualAlloc(0, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-#elif defined(SAL_OS2)
-    p = 0;
-    DosAllocMem( &p, n, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY);
 #endif
     if (p != 0) {
         *size = n;
@@ -131,8 +117,6 @@ extern "C" void SAL_CALL freeExec(
 #elif defined SAL_W32
     (void) size; // unused
     VirtualFree(address, 0, MEM_RELEASE);
-#elif defined(SAL_OS2)
-    (void) DosFreeMem( address);
 #endif
 }
 
@@ -174,7 +158,7 @@ private:
     sal_Int32 calculate(
         typelib_InterfaceTypeDescription * type, sal_Int32 offset);
 
-    typedef std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash > Map;
+    typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash > Map;
 
     Map m_map;
 };
@@ -262,14 +246,14 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
     for (int i = strDirectory.getLength() == 0 ? 1 : 0; i < 2; ++i)
     {
         if (!strDirectory.getLength())
-            strDirectory = rtl::OUString::createFromAscii("/tmp");
+            strDirectory = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/tmp" ));
 
-        strDirectory += rtl::OUString::createFromAscii("/.execoooXXXXXX");
+        strDirectory += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/.execoooXXXXXX" ));
         rtl::OString aTmpName = rtl::OUStringToOString(strDirectory, osl_getThreadTextEncoding());
         char *tmpfname = new char[aTmpName.getLength()+1];
         strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1);
         if ((block.fd = mkstemp(tmpfname)) == -1)
-            perror("creation of executable memory area failed");
+            fprintf(stderr, "mkstemp(\"%s\") failed: %s\n", tmpfname, strerror(errno));
         if (block.fd == -1)
         {
             delete[] tmpfname;
@@ -380,3 +364,5 @@ void VtableFactory::createVtables(
         createVtables(blocks, baseOffset, type->ppBaseTypes[i], i != 0);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/vtables.cxx b/bridges/source/cpp_uno/shared/vtables.cxx
index 2779d928f24e..40436d0224fb 100644
--- a/bridges/source/cpp_uno/shared/vtables.cxx
+++ b/bridges/source/cpp_uno/shared/vtables.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -152,3 +153,5 @@ VtableSlot getVtableSlot(
 }
 
 } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index 2a1ad425db12..cc23cd1b2a8f 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,7 +79,7 @@ class JNI_context
     JNI_context( JNI_context & ); // not impl
     void operator = ( JNI_context ); // not impl
 
-    void java_exc_occured() const;
+    void java_exc_occurred() const;
 public:
     inline explicit JNI_context(
         JNI_info const * jni_info, JNIEnv * env, jobject class_loader )
@@ -116,7 +117,7 @@ inline void JNI_context::ensure_no_exception() const
 {
     if (JNI_FALSE != m_env->ExceptionCheck())
     {
-        java_exc_occured();
+        java_exc_occurred();
     }
 }
 
@@ -126,7 +127,7 @@ inline bool JNI_context::assert_no_exception() const
     if (JNI_FALSE != m_env->ExceptionCheck())
     {
         m_env->ExceptionClear();
-        OSL_ENSURE( 0, "unexpected java exception occured!" );
+        OSL_FAIL( "unexpected java exception occurred!" );
         return false;
     }
     return true;
@@ -290,3 +291,5 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref )
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index e9c1270b1f9b..d15f05a814fd 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -114,15 +115,14 @@ void SAL_CALL Mapping_map_to_uno(
                 OUStringToOString(
                     OUSTR("[jni_uno bridge error] ") + err.m_message,
                     RTL_TEXTENCODING_ASCII_US ) );
-            OSL_ENSURE( 0, cstr_msg.getStr() );
+            OSL_FAIL( cstr_msg.getStr() );
 #else
             (void) err; // unused
 #endif
         }
         catch (::jvmaccess::VirtualMachine::AttachGuard::CreationException &)
         {
-            OSL_ENSURE(
-                0,
+            OSL_FAIL(
                 "[jni_uno bridge error] attaching current thread "
                 "to java failed!" );
         }
@@ -184,15 +184,14 @@ void SAL_CALL Mapping_map_to_java(
             OUStringToOString(
                 OUSTR("[jni_uno bridge error] ") + err.m_message,
                 RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr_msg.getStr() );
+        OSL_FAIL( cstr_msg.getStr() );
 #else
             (void) err; // unused
 #endif
     }
     catch (::jvmaccess::VirtualMachine::AttachGuard::CreationException &)
     {
-        OSL_ENSURE(
-            0,
+        OSL_FAIL(
             "[jni_uno bridge error] attaching current thread to java failed!" );
     }
 }
@@ -291,7 +290,7 @@ Bridge::~Bridge() SAL_THROW( () )
 
 
 //______________________________________________________________________________
-void JNI_context::java_exc_occured() const
+void JNI_context::java_exc_occurred() const
 {
     // !don't rely on JNI_info!
 
@@ -301,7 +300,7 @@ void JNI_context::java_exc_occured() const
     if (! jo_exc.is())
     {
         throw BridgeRuntimeError(
-            OUSTR("java exception occured, but not available!?") +
+            OUSTR("java exception occurred, but not available!?") +
             get_stack_trace() );
     }
 
@@ -543,15 +542,14 @@ void SAL_CALL uno_ext_getMapping(
                 OUStringToOString(
                     OUSTR("[jni_uno bridge error] ") + err.m_message,
                     RTL_TEXTENCODING_ASCII_US ) );
-            OSL_ENSURE( 0, cstr_msg.getStr() );
+            OSL_FAIL( cstr_msg.getStr() );
 #else
             (void) err; // unused
 #endif
         }
         catch (::jvmaccess::VirtualMachine::AttachGuard::CreationException &)
         {
-            OSL_ENSURE(
-                0,
+            OSL_FAIL(
                 "[jni_uno bridge error] attaching current thread "
                 "to java failed!" );
         }
@@ -567,3 +565,5 @@ sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
     return (*g_moduleCount.canUnload)( &g_moduleCount, pTime );
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_bridge.h b/bridges/source/jni_uno/jni_bridge.h
index 464d181e0a9f..f2298fbdbe46 100644
--- a/bridges/source/jni_uno/jni_bridge.h
+++ b/bridges/source/jni_uno/jni_bridge.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,5 @@ struct Bridge
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index 0b19a8d99c2d..aca455d154ed 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -560,45 +561,45 @@ void Bridge::map_to_uno(
                 pAny->pData = &pAny->pReserved;
                 break;
             case typelib_TypeClass_CHAR:
-                *(jchar *) &pAny->pReserved = jni->CallCharMethodA(
+                pAny->pData = &pAny->pReserved;
+                *(jchar *) pAny->pData = jni->CallCharMethodA(
                     java_data.l, m_jni_info->m_method_Character_charValue, 0 );
                 jni.ensure_no_exception();
-                pAny->pData = &pAny->pReserved;
                 break;
             case typelib_TypeClass_BOOLEAN:
-                *(jboolean *) &pAny->pReserved = jni->CallBooleanMethodA(
+                pAny->pData = &pAny->pReserved;
+                *(jboolean *) pAny->pData = jni->CallBooleanMethodA(
                     java_data.l, m_jni_info->m_method_Boolean_booleanValue, 0 );
                 jni.ensure_no_exception();
-                pAny->pData = &pAny->pReserved;
                 break;
             case typelib_TypeClass_BYTE:
-                *(jbyte *) &pAny->pReserved = jni->CallByteMethodA(
+                pAny->pData = &pAny->pReserved;
+                *(jbyte *) pAny->pData = jni->CallByteMethodA(
                     java_data.l, m_jni_info->m_method_Byte_byteValue, 0 );
                 jni.ensure_no_exception();
-                pAny->pData = &pAny->pReserved;
                 break;
             case typelib_TypeClass_SHORT:
             case typelib_TypeClass_UNSIGNED_SHORT:
-                *(jshort *) &pAny->pReserved = jni->CallShortMethodA(
+                pAny->pData = &pAny->pReserved;
+                *(jshort *) pAny->pData = jni->CallShortMethodA(
                     java_data.l, m_jni_info->m_method_Short_shortValue, 0 );
                 jni.ensure_no_exception();
-                pAny->pData = &pAny->pReserved;
                 break;
             case typelib_TypeClass_LONG:
             case typelib_TypeClass_UNSIGNED_LONG:
-                *(jint *) &pAny->pReserved = jni->CallIntMethodA(
+                pAny->pData = &pAny->pReserved;
+                *(jint *) pAny->pData = jni->CallIntMethodA(
                     java_data.l, m_jni_info->m_method_Integer_intValue, 0 );
                 jni.ensure_no_exception();
-                pAny->pData = &pAny->pReserved;
                 break;
             case typelib_TypeClass_HYPER:
             case typelib_TypeClass_UNSIGNED_HYPER:
                 if (sizeof (sal_Int64) <= sizeof (void *))
                 {
-                    *(jlong *) &pAny->pReserved = jni->CallLongMethodA(
+                    pAny->pData = &pAny->pReserved;
+                    *(jlong *) pAny->pData = jni->CallLongMethodA(
                         java_data.l, m_jni_info->m_method_Long_longValue, 0 );
                     jni.ensure_no_exception();
-                    pAny->pData = &pAny->pReserved;
                 }
                 else
                 {
@@ -613,10 +614,10 @@ void Bridge::map_to_uno(
             case typelib_TypeClass_FLOAT:
                 if (sizeof (float) <= sizeof (void *))
                 {
-                    *(jfloat *) &pAny->pReserved = jni->CallFloatMethodA(
+                    pAny->pData = &pAny->pReserved;
+                    *(jfloat *) pAny->pData = jni->CallFloatMethodA(
                         java_data.l, m_jni_info->m_method_Float_floatValue, 0 );
                     jni.ensure_no_exception();
-                    pAny->pData = &pAny->pReserved;
                 }
                 else
                 {
@@ -631,12 +632,12 @@ void Bridge::map_to_uno(
             case typelib_TypeClass_DOUBLE:
                 if (sizeof (double) <= sizeof (void *))
                 {
-                    *(jdouble *) &pAny->pReserved =
+                    pAny->pData = &pAny->pReserved;
+                    *(jdouble *) pAny->pData =
                         jni->CallDoubleMethodA(
                             java_data.l,
                             m_jni_info->m_method_Double_doubleValue, 0 );
                     jni.ensure_no_exception();
-                    pAny->pData = &pAny->pReserved;
                 }
                 else
                 {
@@ -653,20 +654,20 @@ void Bridge::map_to_uno(
             case typelib_TypeClass_STRING:
                 // opt: anies often contain strings; copy string directly
                 pAny->pReserved = 0;
+                pAny->pData = &pAny->pReserved;
                 jstring_to_ustring(
-                    jni, (rtl_uString **)&pAny->pReserved,
+                    jni, (rtl_uString **)pAny->pData,
                     (jstring) java_data.l );
-                pAny->pData = &pAny->pReserved;
                 break;
             case typelib_TypeClass_TYPE:
             case typelib_TypeClass_ENUM:
             case typelib_TypeClass_SEQUENCE:
             case typelib_TypeClass_INTERFACE:
+                pAny->pData = &pAny->pReserved;
                 map_to_uno(
-                    jni, &pAny->pReserved, java_data,
+                    jni, pAny->pData, java_data,
                     value_td.get()->pWeakRef, 0,
                     false /* no assign */, false /* no out param */ );
-                pAny->pData = &pAny->pReserved;
                 break;
             case typelib_TypeClass_STRUCT:
             case typelib_TypeClass_EXCEPTION:
@@ -1657,7 +1658,7 @@ void Bridge::map_to_java(
             case typelib_TypeClass_UNSIGNED_SHORT:
             {
                 jvalue args[ 2 ];
-                args[ 0 ].s = *(jshort const *) &pAny->pReserved;
+                args[ 0 ].s = *(jshort const *) pAny->pData;
                 JLocalAutoRef jo_val(
                     jni, jni->NewObjectA(
                         m_jni_info->m_class_Short,
@@ -1676,7 +1677,7 @@ void Bridge::map_to_java(
             case typelib_TypeClass_UNSIGNED_LONG:
             {
                 jvalue args[ 2 ];
-                args[ 0 ].i = *(jint const *) &pAny->pReserved;
+                args[ 0 ].i = *(jint const *) pAny->pData;
                 JLocalAutoRef jo_val(
                     jni, jni->NewObjectA(
                         m_jni_info->m_class_Integer,
@@ -2574,3 +2575,5 @@ void Bridge::map_to_java(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_helper.h b/bridges/source/jni_uno/jni_helper.h
index 8020f65c68f6..293bf82d868e 100644
--- a/bridges/source/jni_uno/jni_helper.h
+++ b/bridges/source/jni_uno/jni_helper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -160,3 +161,5 @@ inline jobject compute_oid( JNI_context const & jni, jobject jo )
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index b6cde712a882..6df598859d0a 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -994,3 +995,5 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1info_1holder_finalize__J(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index 861ab9d5a52b..a356be272e04 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
 #if ! defined INCLUDED_JNI_INFO_H
 #define INCLUDED_JNI_INFO_H
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include "jni_base.h"
 
@@ -120,7 +121,7 @@ struct JNI_type_info_holder
         {}
 };
 
-typedef ::std::hash_map<
+typedef ::boost::unordered_map<
     ::rtl::OUString, JNI_type_info_holder, ::rtl::OUStringHash > t_str2type;
 
 //==============================================================================
@@ -373,3 +374,5 @@ inline void JNI_info::append_sig(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index 0ff4872804bb..63a9c0ad02ac 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,6 @@
 #include <sal/alloca.h>
 
 #include "jni_bridge.h"
-//#include "jni_finalizer.h"
 
 #include <rtl/ustrbuf.hxx>
 
@@ -109,7 +109,7 @@ void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const
         {
         OUStringBuffer buf( 128 );
         buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("exception occured java->uno: [") );
+            RTL_CONSTASCII_STRINGPARAM("exception occurred java->uno: [") );
         buf.append( OUString::unacquired( &uno_exc->pType->pTypeName ) );
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] ") );
         buf.append(
@@ -118,7 +118,7 @@ void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const
         OString cstr_msg(
             OUStringToOString(
                 buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( cstr_msg.getStr() );
+        OSL_TRACE( "%s", cstr_msg.getStr() );
         }
 #endif
         // signal exception
@@ -360,7 +360,7 @@ jobject Bridge::call_uno(
 #endif
         return 0; // void return
     }
-    else // exception occured
+    else // exception occurred
     {
         // destruct uno in args
         for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
@@ -422,7 +422,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
         OString cstr_msg(
             OUStringToOString(
                 trace_buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( cstr_msg.getStr() );
+        OSL_TRACE( "%s", cstr_msg.getStr() );
         }
 #endif
 
@@ -630,7 +630,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
         OString cstr_msg(
             OUStringToOString(
                 buf.makeStringAndClear(), RTL_TEXTENCODING_JAVA_UTF8 ) );
-        OSL_ENSURE( 0, cstr_msg.getStr() );
+        OSL_FAIL( cstr_msg.getStr() );
         if (jni->ThrowNew(jni_info->m_class_RuntimeException, cstr_msg.getStr())
             != 0)
         {
@@ -646,7 +646,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
                 "attaching current thread to java failed!") ) +
             OUStringToOString(
                 jni.get_stack_trace(), RTL_TEXTENCODING_JAVA_UTF8 ) );
-        OSL_ENSURE( 0, cstr_msg.getStr() );
+        OSL_FAIL( cstr_msg.getStr() );
         if (jni->ThrowNew(jni_info->m_class_RuntimeException, cstr_msg.getStr())
             != 0)
         {
@@ -688,7 +688,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_finalize__J(
         OUStringToOString(
             OUSTR("freeing java uno proxy: ") + oid,
             RTL_TEXTENCODING_ASCII_US ) );
-    OSL_TRACE( cstr_msg.getStr() );
+    OSL_TRACE( "%s", cstr_msg.getStr() );
     }
 #endif
     // revoke from uno env; has already been revoked from java env
@@ -702,3 +702,5 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_finalize__J(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 81ae922ae717..5fa8fa3e01b3 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,7 +78,7 @@ void Bridge::handle_java_exc(
     if (! jo_exc.is())
     {
         throw BridgeRuntimeError(
-            OUSTR("java exception occured, but no java exception available!?") +
+            OUSTR("java exception occurred, but no java exception available!?") +
             jni.get_stack_trace() );
     }
 
@@ -125,7 +126,7 @@ void Bridge::handle_java_exc(
 #if OSL_DEBUG_LEVEL > 1
     OUStringBuffer trace_buf( 128 );
     trace_buf.appendAscii(
-        RTL_CONSTASCII_STRINGPARAM("exception occured uno->java: [") );
+        RTL_CONSTASCII_STRINGPARAM("exception occurred uno->java: [") );
     trace_buf.append( exc_name );
     trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] ") );
     trace_buf.append(
@@ -134,7 +135,7 @@ void Bridge::handle_java_exc(
     OString cstr_trace(
         OUStringToOString(
             trace_buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-    OSL_TRACE( cstr_trace.getStr() );
+    OSL_TRACE( "%s", cstr_trace.getStr() );
 #endif
 }
 
@@ -260,7 +261,7 @@ void Bridge::call_java(
     OString cstr_trace(
         OUStringToOString(
             trace_buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-    OSL_TRACE( cstr_trace.getStr() );
+    OSL_TRACE( "%s", cstr_trace.getStr() );
 #endif
 
     // complex return value
@@ -412,7 +413,7 @@ void Bridge::call_java(
             }
         } // else: already set integral uno return value
 
-        // no exception occured
+        // no exception occurred
         *uno_exc = 0;
     }
 #ifdef BROKEN_ALLOCA
@@ -557,7 +558,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
         OUStringToOString(
             OUSTR("freeing binary uno proxy: ") + that->m_oid,
             RTL_TEXTENCODING_ASCII_US ) );
-    OSL_TRACE( cstr_msg.getStr() );
+    OSL_TRACE( "%s", cstr_msg.getStr() );
 #endif
 
     try
@@ -575,15 +576,14 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
 #if OSL_DEBUG_LEVEL > 0
         OString cstr_msg2(
             OUStringToOString( err.m_message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr_msg2.getStr() );
+        OSL_FAIL( cstr_msg2.getStr() );
 #else
         (void) err; // unused
 #endif
     }
     catch (::jvmaccess::VirtualMachine::AttachGuard::CreationException &)
     {
-        OSL_ENSURE(
-            0,
+        OSL_FAIL(
             "[jni_uno bridge error] attaching current thread to java failed!" );
     }
 
@@ -628,7 +628,7 @@ void SAL_CALL UNO_proxy_dispatch(
     OString cstr_msg(
         OUStringToOString(
             trace_buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-    OSL_TRACE( cstr_msg.getStr() );
+    OSL_TRACE( "%s", cstr_msg.getStr() );
 #endif
 
     try
@@ -783,7 +783,7 @@ void SAL_CALL UNO_proxy_dispatch(
                                 reinterpret_cast< uno_Any * >( uno_ret ),
                                 0, 0, 0 );
                         }
-                        // no exception occured
+                        // no exception occurred
                         *uno_exc = 0;
                     }
                 }
@@ -864,10 +864,12 @@ void SAL_CALL UNO_proxy_dispatch(
 #if OSL_DEBUG_LEVEL > 0
         OString cstr_msg2(
             OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr_msg2.getStr() );
+        OSL_FAIL( cstr_msg2.getStr() );
 #endif
     }
 }
 
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/nativethreadpool.cxx b/bridges/source/jni_uno/nativethreadpool.cxx
index 5b30ffdafc22..9c92e89c5b07 100644
--- a/bridges/source/jni_uno/nativethreadpool.cxx
+++ b/bridges/source/jni_uno/nativethreadpool.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -228,3 +229,5 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_destroy(
     uno_threadpool_destroy(p->pool);
     delete p;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/inter_libs_exc/inter.cxx b/bridges/test/inter_libs_exc/inter.cxx
index 799b5f02fc87..56966388f09e 100644
--- a/bridges/test/inter_libs_exc/inter.cxx
+++ b/bridges/test/inter_libs_exc/inter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,5 @@ extern "C" int main( int argc, char const * argv [] )
 
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/inter_libs_exc/share.h b/bridges/test/inter_libs_exc/share.h
index 28c4dfd5bb15..be06619abf76 100644
--- a/bridges/test/inter_libs_exc/share.h
+++ b/bridges/test/inter_libs_exc/share.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/uno/DeploymentException.hpp>
@@ -5,3 +6,5 @@
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 
 typedef void (SAL_CALL * t_throws_exc)();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/inter_libs_exc/starter.cxx b/bridges/test/inter_libs_exc/starter.cxx
index 4a1207db0e91..e19e83990979 100644
--- a/bridges/test/inter_libs_exc/starter.cxx
+++ b/bridges/test/inter_libs_exc/starter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,5 @@ extern "C" void SAL_CALL start( t_throws_exc p )
         printf( "starter.cxx: caught something\n" );
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/inter_libs_exc/thrower.cxx b/bridges/test/inter_libs_exc/thrower.cxx
index e90ab6a21e84..d490e5d7b084 100644
--- a/bridges/test/inter_libs_exc/thrower.cxx
+++ b/bridges/test/inter_libs_exc/thrower.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,5 @@ extern "C" t_throws_exc SAL_CALL get_thrower()
 {
     return throws_exc;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index 897986c91aa5..6960e102a9a1 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -493,14 +494,12 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
 }
 
 rtl::OUString Service::getImplementationName_static() {
-    return rtl::OUString::createFromAscii(
-        "com.sun.star.test.bridges.testacquire.impl");
+    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testacquire.impl" ));
 }
 
 css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() {
     css::uno::Sequence< rtl::OUString > names(1);
-    names[0] = rtl::OUString::createFromAscii(
-        "com.sun.star.test.bridges.testacquire");
+    names[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testacquire" ));
     return names;
 }
 
@@ -511,7 +510,7 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
     return static_cast< cppu::OWeakObject * >(new Service(context));
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     char const ** envTypeName, uno_Environment **)
 {
     if (envTypeName != 0) {
@@ -519,7 +518,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
     }
 }
 
-extern "C" void * SAL_CALL component_getFactory(char const * implName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName,
                                                 void * serviceManager, void *) {
     void * p = 0;
     if (serviceManager != 0) {
@@ -542,9 +541,9 @@ namespace {
 
 bool writeInfo(void * registryKey, rtl::OUString const & implementationName,
                css::uno::Sequence< rtl::OUString > const & serviceNames) {
-    rtl::OUString keyName(rtl::OUString::createFromAscii("/"));
+    rtl::OUString keyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
     keyName += implementationName;
-    keyName += rtl::OUString::createFromAscii("/UNO/SERVICES");
+    keyName += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
     css::uno::Reference< css::registry::XRegistryKey > key;
     try {
         key = static_cast< css::registry::XRegistryKey * >(registryKey)->
@@ -572,3 +571,5 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(void *, void * registryKey) {
         && writeInfo(registryKey, Service::getImplementationName_static(),
                      Service::getSupportedServiceNames_static());
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx
index 9ea4d59dcfe9..4211a96f8149 100644
--- a/bridges/test/java_uno/any/transport.cxx
+++ b/bridges/test/java_uno/any/transport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -106,3 +107,5 @@ extern "C" JNIEXPORT jobject JNICALL Java_test_java_1uno_anytest_TestJni_create_
     jni_env->DeleteGlobalRef( jo_global );
     return jo_ret;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/java_uno/equals/TestEquals.java b/bridges/test/java_uno/equals/TestEquals.java
index 5f3ee34a1c1d..9d7139b11b8c 100644
--- a/bridges/test/java_uno/equals/TestEquals.java
+++ b/bridges/test/java_uno/equals/TestEquals.java
@@ -71,7 +71,7 @@ public final class TestEquals {
     }
 
     private static String toFileUrl(String path) throws MalformedURLException {
-        String url = new File(path).toURL().toString();
+        String url = new File(path).toURI().toURL().toString();
         String prefix = "file:/";
         if (url.startsWith(prefix)
             && (url.length() == prefix.length()
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index 81357e12899b..e803415eb3b6 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,7 +123,7 @@ void Service::connect(rtl::OUString const & rConnection,
         css::connection::Connector::create(m_xContext)->connect(rConnection));
     css::uno::Reference< css::bridge::XBridgeFactory > xBridgeFactory(
         m_xContext->getServiceManager()->createInstanceWithContext(
-            rtl::OUString::createFromAscii("com.sun.star.bridge.BridgeFactory"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.BridgeFactory" )),
             m_xContext),
         css::uno::UNO_QUERY);
     m_xBridge = xBridgeFactory->createBridge(rtl::OUString(), rProtocol,
@@ -138,8 +139,7 @@ Service::get(rtl::OUString const & rName) throw (css::uno::RuntimeException)
 css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static()
 {
     css::uno::Sequence< rtl::OUString > aNames(1);
-    aNames[0] = rtl::OUString::createFromAscii(
-        "com.sun.star.test.bridges.testequals");
+    aNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testequals" ));
     return aNames;
 }
 
@@ -162,13 +162,13 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
     return static_cast< cppu::OWeakObject * >(new Service(rContext));
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     sal_Char const ** pEnvTypeName, uno_Environment **)
 {
     *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-extern "C" void * SAL_CALL component_getFactory(sal_Char const * pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName,
                                                 void * pServiceManager, void *)
 {
     void * pFactory = 0;
@@ -196,9 +196,9 @@ namespace {
 bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName,
                css::uno::Sequence< rtl::OUString > const & rServiceNames)
 {
-    rtl::OUString aKeyName(rtl::OUString::createFromAscii("/"));
+    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
     aKeyName += rtl::OUString::createFromAscii(pImplementationName);
-    aKeyName += rtl::OUString::createFromAscii("/UNO/SERVICES");
+    aKeyName += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
     css::uno::Reference< css::registry::XRegistryKey > xKey;
     try
     {
@@ -230,3 +230,5 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(void *, void * pRegistryKey)
         && writeInfo(pRegistryKey, Service::getImplementationName_static(),
                      Service::getSupportedServiceNames_static());
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index 1964a73d1878..4c69a7a7b540 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,30 +88,27 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &)
         context->getServiceManager());
     if (!factory.is()) {
         throw new css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
-                "no component context service manager"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )),
             static_cast< cppu::OWeakObject * >(this));
     }
     css::uno::Reference< test::javauno::nativethreadpool::XRelay > relay;
     try {
         relay = css::uno::Reference< test::javauno::nativethreadpool::XRelay >(
             factory->createInstanceWithContext(
-                rtl::OUString::createFromAscii(
-                    "test.javauno.nativethreadpool.Relay"),
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.Relay" )),
                 context),
             css::uno::UNO_QUERY_THROW);
     } catch (css::uno::RuntimeException &) {
         throw;
     } catch (css::uno::Exception & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "creating test.javauno.nativethreadpool.Relay service"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "creating test.javauno.nativethreadpool.Relay service" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     }
     relay->start(this);
     if (!data.setData(reinterpret_cast< void * >(12345))) {
         throw new css::uno::RuntimeException(
-            rtl::OUString::createFromAscii("osl::ThreadData::setData failed"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "osl::ThreadData::setData failed" )),
             static_cast< cppu::OWeakObject * >(this));
     }
     css::uno::Reference< test::javauno::nativethreadpool::XSource > source;
@@ -118,23 +116,19 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &)
         source
             = css::uno::Reference< test::javauno::nativethreadpool::XSource >(
                 css::bridge::UnoUrlResolver::create(context)->resolve(
-                    rtl::OUString::createFromAscii(
-                        "uno:socket,host=localhost,port=3830;urp;test")),
+                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uno:socket,host=localhost,port=3830;urp;test" ))),
                 css::uno::UNO_QUERY_THROW);
     } catch (css::connection::NoConnectException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.uno.UnoUrlResolver.resolve"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::connection::ConnectionSetupException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.uno.UnoUrlResolver.resolve"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::lang::IllegalArgumentException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.uno.UnoUrlResolver.resolve"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     }
     bool success = source->get() == 12345;
@@ -154,8 +148,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
 }
 
 rtl::OUString SAL_CALL getImplementationName() {
-    return rtl::OUString::createFromAscii(
-        "test.javauno.nativethreadpool.client");
+    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.client" ));
 }
 
 css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
@@ -170,15 +163,17 @@ cppu::ImplementationEntry entries[] = {
 
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     char const ** envTypeName, uno_Environment **)
 {
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index 0e3b30effb7e..f3bf1791a839 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,8 +77,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
         context->getServiceManager());
     if (!factory.is()) {
         throw new css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
-                "no component context service manager"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )),
             static_cast< cppu::OWeakObject * >(this));
     }
     css::uno::Reference< test::javauno::nativethreadpool::XSource > source;
@@ -86,23 +86,19 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
         source
             = css::uno::Reference< test::javauno::nativethreadpool::XSource >(
                 css::bridge::UnoUrlResolver::create(context)->resolve(
-                    rtl::OUString::createFromAscii(
-                        "uno:socket,host=127.0.0.1,port=3831;urp;test")),
+                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uno:socket,host=127.0.0.1,port=3831;urp;test" ))),
                 css::uno::UNO_QUERY_THROW);
     } catch (css::connection::NoConnectException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.uno.UnoUrlResolver.resolve"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::connection::ConnectionSetupException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.uno.UnoUrlResolver.resolve"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::lang::IllegalArgumentException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.uno.UnoUrlResolver.resolve"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     }
     return source->get();
@@ -116,8 +112,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
 }
 
 rtl::OUString SAL_CALL getImplementationName() {
-    return rtl::OUString::createFromAscii(
-        "test.javauno.nativethreadpool.server");
+    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.server" ));
 }
 
 css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
@@ -132,15 +127,17 @@ cppu::ImplementationEntry entries[] = {
 
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     char const ** envTypeName, uno_Environment **)
 {
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/performance/makefile.mk b/bridges/test/performance/makefile.mk
index c987699f5bd9..44f7ae3d4414 100644
--- a/bridges/test/performance/makefile.mk
+++ b/bridges/test/performance/makefile.mk
@@ -53,7 +53,6 @@ APP1STDLIBS+= -lstdc++
 APP1STDLIBS+=	\
             $(CPPULIB)	\
             $(CPPUHELPERLIB)	\
-            $(VOSLIB)	\
             $(SALLIB)
 
 APP1DEF=	$(MISC)$/$(APP1TARGET).def
diff --git a/bridges/test/performance/testperformance.cxx b/bridges/test/performance/testperformance.cxx
index be63f093627a..d692144a3f37 100644
--- a/bridges/test/performance/testperformance.cxx
+++ b/bridges/test/performance/testperformance.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -188,3 +189,5 @@ void main()
     }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx
index df7164c844d2..be5223fb5873 100644
--- a/bridges/test/testclient.cxx
+++ b/bridges/test/testclient.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -245,3 +246,4 @@ int main( int argc, char *argv[] )
     return 0;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 9e09a5c4c52c..864279827a6b 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -684,7 +685,7 @@ void testRemote( const Reference< XInterface > &rRemote )
       //--------------------
       // Test attributes
       //----------------------
-       OUString ow = OUString::createFromAscii( "dum didel dum dideldei" );
+       OUString ow( RTL_CONSTASCII_USTRINGPARAM( "dum didel dum dideldei" ));
        rLCallMe->setsAttribute( ow );
        OSL_ASSERT( rLCallMe->getsAttribute() == ow );
 
@@ -773,7 +774,7 @@ Reference <XInterface > createComponent( const ::rtl::OUString &sService ,
         // erst registrieren
         Reference < XImplementationRegistration > rReg (
             rSMgr->createInstance(
-                OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" )),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.ImplementationRegistration" ))),
             UNO_QUERY );
 
         OSL_ASSERT( rReg.is() );
@@ -782,7 +783,7 @@ Reference <XInterface > createComponent( const ::rtl::OUString &sService ,
         try
         {
             rReg->registerImplementation(
-                OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.SharedLibrary" )),
                 aDllName,
                 Reference< XSimpleRegistry > () );
             rInterface = rSMgr->createInstance( sService );
@@ -797,3 +798,4 @@ Reference <XInterface > createComponent( const ::rtl::OUString &sService ,
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/testcomp.h b/bridges/test/testcomp.h
index 8a30a538247c..ad96c7262433 100644
--- a/bridges/test/testcomp.h
+++ b/bridges/test/testcomp.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,12 +25,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-//#include <com/sun/star/bridge/XServer.hpp>
-//#include <com/sun/star/bridge/XClient.hpp>
+
 #include <stdio.h>
 
 #include <com/sun/star/bridge/XInstanceProvider.hpp>
-//#include <com/sun/star/bridge/XConnectionAdministration.hpp>
 #include <osl/thread.hxx>
 
 
@@ -154,3 +153,5 @@ public:
 };
 
 void testRemote( const Reference< XInterface > &rRemote );
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx
index 1d0619028c3a..9e90702e036c 100644
--- a/bridges/test/testoffice.cxx
+++ b/bridges/test/testoffice.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,7 +87,7 @@ void mygetchar()
 void testPipe( const Reference < XMultiServiceFactory > & rSmgr )
 {
     Reference < XOutputStream > rOut(
-        rSmgr->createInstance( OUString::createFromAscii( "com.sun.star.io.Pipe" ) ),
+        rSmgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.Pipe" )) ),
         UNO_QUERY );
 
     OSL_ASSERT( rOut.is() );
@@ -194,7 +195,7 @@ void doSomething( const  Reference < XInterface > &r )
     {
         printf( "got the remote naming service !\n" );
         Reference < XInterface > rXsmgr = rName->getRegisteredObject(
-            OUString::createFromAscii( "StarOffice.ServiceManager" ) );
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "StarOffice.ServiceManager" )) );
 
         Reference < XMultiServiceFactory > rSmgr( rXsmgr , UNO_QUERY );
         if( rSmgr.is() )
@@ -277,3 +278,5 @@ int main( int argc, char *argv[] )
     //_getch();
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx
index 6ce2f59873a7..35003986e386 100644
--- a/bridges/test/testsameprocess.cxx
+++ b/bridges/test/testsameprocess.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -213,3 +214,5 @@ int main( int argc, char *argv[] )
     }
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/testserver.cxx b/bridges/test/testserver.cxx
index 17b40c123cc1..fe85514872dd 100644
--- a/bridges/test/testserver.cxx
+++ b/bridges/test/testserver.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -159,7 +160,7 @@ void MyThread::run()
                             OUString( RTL_CONSTASCII_USTRINGPARAM("my test string")) , 2 );
                     }
                     printf( "all oneway are send\n" );
-                    rCallMe->call( OUString::createFromAscii( "reverse call me test finished" ) , 0 );
+                    rCallMe->call( OUString( RTL_CONSTASCII_USTRINGPARAM( "reverse call me test finished" )) , 0 );
                 printf( "revers callme test finished\n" );
                 }
             }
@@ -251,3 +252,5 @@ int main( int argc, char *argv[] )
     }
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/inc/pch/precompiled_cli_ure.cxx b/cli_ure/inc/pch/precompiled_cli_ure.cxx
index 6ff2864f6e50..e11d2045be2d 100644
--- a/cli_ure/inc/pch/precompiled_cli_ure.cxx
+++ b/cli_ure/inc/pch/precompiled_cli_ure.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_cli_ure.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/inc/pch/precompiled_cli_ure.hxx b/cli_ure/inc/pch/precompiled_cli_ure.hxx
index 3fd364303cb2..59c8eb0fd6a9 100644
--- a/cli_ure/inc/pch/precompiled_cli_ure.hxx
+++ b/cli_ure/inc/pch/precompiled_cli_ure.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/prj/build.lst b/cli_ure/prj/build.lst
index 268240c4597b..c9ac99cf9790 100644
--- a/cli_ure/prj/build.lst
+++ b/cli_ure/prj/build.lst
@@ -6,8 +6,7 @@ ure	cli_ure\source				nmake   -   w,vc7   ure_source_source ure_inc NULL
 ure	cli_ure\source\basetypes	nmake	-	w,vc7	ure_source_basetypes ure_source_version ure_source_source.w ure_inc NULL
 ure	cli_ure\source\climaker		nmake	-	w,vc7	ure_source_climaker ure_source_basetypes.w ure_inc NULL
 ure	cli_ure\unotypes			nmake	-	w,vc7	ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
-ure	cli_ure\source\ure			nmake	-	w,vc7	ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL
+ure	cli_ure\source\ure			nmake	-	w,vc7	ure_source_ure ure_source_version ure_source_source.w ure_source_basetypes.w ure_unotypes.w ure_inc NULL
 ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
 ure	cli_ure\source\native		nmake	-	w,vc7	ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
-
 #ure	cli_ure\util			nmake	-	w,vc7	ure_util ure_source_ure.w ure_source_native.w NULL
diff --git a/cli_ure/prj/d.lst b/cli_ure/prj/d.lst
index 261bb2c35d57..dff5e25583d7 100644
--- a/cli_ure/prj/d.lst
+++ b/cli_ure/prj/d.lst
@@ -1,13 +1,13 @@
-..\%__SRC%\bin\climaker.exe %_DEST%\bin%_EXT%\climaker.exe
-..\%__SRC%\bin\climaker.pdb %_DEST%\bin%_EXT%\climaker.pdb
-..\%__SRC%\bin\climaker.exe.config %_DEST%\bin%_EXT%\climaker.exe.config
+..\%__SRC%\bin\climaker.exe %_DEST%\bin\climaker.exe
+..\%__SRC%\bin\climaker.pdb %_DEST%\bin\climaker.pdb
+..\%__SRC%\bin\climaker.exe.config %_DEST%\bin\climaker.exe.config
 
-..\%__SRC%\bin\cli_*.dll %_DEST%\bin%_EXT%\cli_*.dll
-..\%__SRC%\bin\cli_*.pdb %_DEST%\bin%_EXT%\cli_*.pdb
-..\%__SRC%\bin\cli_*.config %_DEST%\bin%_EXT%\cli_*.config
-..\%__SRC%\bin\policy*.dll %_DEST%\bin%_EXT%\policy*.dll
-..\%__SRC%\bin\cli_uno.* %_DEST%\bin%_EXT%\cli_uno.*
+..\%__SRC%\bin\cli_*.dll %_DEST%\bin\cli_*.dll
+..\%__SRC%\bin\cli_*.pdb %_DEST%\bin\cli_*.pdb
+..\%__SRC%\bin\cli_*.config %_DEST%\bin\cli_*.config
+..\%__SRC%\bin\policy*.dll %_DEST%\bin\policy*.dll
+..\%__SRC%\bin\cli_uno.* %_DEST%\bin\cli_uno.*
 
-..\%__SRC%\bin\cliuno.snk %_DEST%\bin%_EXT%\cliuno.snk
+..\%__SRC%\bin\cliuno.snk %_DEST%\bin\cliuno.snk
 
-..\%__SRC%\bin\cliureversion.mk %_DEST%\bin%_EXT%\cliureversion.mk
\ No newline at end of file
+..\%__SRC%\bin\cliureversion.mk %_DEST%\bin\cliureversion.mk
\ No newline at end of file
diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx
index 9c257d079682..907054c0b8bb 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -149,8 +150,8 @@ static OptionInfo const * get_option_info(
             }
         }
     }
-    OSL_ENSURE(
-        0, OUStringToOString( opt, osl_getThreadTextEncoding() ).getStr() );
+    OSL_FAIL(
+        OUStringToOString( opt, osl_getThreadTextEncoding() ).getStr() );
     return 0;
 }
 
@@ -448,7 +449,7 @@ SAL_IMPLEMENT_MAIN()
                         }
                         else
                         {
-                            OSL_ENSURE( 0, "unhandled valid option?!" );
+                            OSL_FAIL( "unhandled valid option?!" );
                             if (option_info->m_has_argument)
                                 ++nPos;
                         }
@@ -722,7 +723,7 @@ SAL_IMPLEMENT_MAIN()
                          osl_getThreadTextEncoding() ) );
         fprintf(
             stderr,
-            "\n> error: .NET exception occured: %s\n> dying abnormally...",
+            "\n> error: .NET exception occurred: %s\n> dying abnormally...",
             msg.getStr() );
         ret = 1;
     }
@@ -747,3 +748,5 @@ SAL_IMPLEMENT_MAIN()
 
     return ret;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index 24a10ce2ddbb..5415d8f3342b 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -764,7 +765,7 @@ Assembly * TypeEmitter::type_resolve(
 
             typedef std::vector<Reference<reflection::XInterfaceTypeDescription2> >::const_iterator it;
             int index = 0;
-            for (it i = vecBaseTypes.begin(); i != vecBaseTypes.end(); i++, index++)
+            for (it i = vecBaseTypes.begin(); i != vecBaseTypes.end(); ++i, ++index)
                 base_interfaces[ index ] = get_type( *i );
             type_builder = m_module_builder->DefineType(
                 cts_name, attr, 0, base_interfaces );
@@ -2321,3 +2322,5 @@ resolveInterfaceTypedef(
 
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/climaker/climaker_share.h b/cli_ure/source/climaker/climaker_share.h
index c663f007015b..da173d35dacf 100644
--- a/cli_ure/source/climaker/climaker_share.h
+++ b/cli_ure/source/climaker/climaker_share.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -266,3 +267,5 @@ public:
 };
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/native/assembly.cxx b/cli_ure/source/native/assembly.cxx
index c7a979b49f81..5efc4af891fc 100644
--- a/cli_ure/source/native/assembly.cxx
+++ b/cli_ure/source/native/assembly.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,3 +35,5 @@
 [assembly:System::Reflection::AssemblyDescription( "CLI-UNO Helper Library" )];
 [assembly:System::Reflection::AssemblyDelaySign(true)];
 [assembly:System::Reflection::AssemblyCompany( "OpenOffice.org" )];
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index 2c8be1a9b5b9..d0b87e6f6817 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -25,7 +25,6 @@
 #
 # ************************************************************************/
 
-
 PRJ = ..$/..
 PRJNAME = cli_ure
 
diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx
index 13be868dc9fd..4c6be73c3a20 100644
--- a/cli_ure/source/native/native_bootstrap.cxx
+++ b/cli_ure/source/native/native_bootstrap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,7 +57,7 @@ namespace cli_ure {
     WCHAR * resolveLink(WCHAR * path);
 }
 
-#define INSTALL_PATH L"Software\\OpenOffice.org\\UNO\\InstallPath"
+#define INSTALL_PATH L"Software\\LibreOffice\\UNO\\InstallPath"
 #define BASIS_LINK L"\\basis-link"
 #define URE_LINK L"\\ure-link"
 #define URE_BIN L"\\bin"
@@ -73,7 +74,7 @@ namespace
  * @param subKeyName  name of the subkey to open
  *
  * @return the installation path or NULL, if no installation was found or
- *         if an error occured
+ *         if an error occurred
  */
 WCHAR* getPathFromRegistryKey( HKEY hroot, LPCWSTR subKeyName )
 {
@@ -431,3 +432,5 @@ Bootstrap::defaultBootstrap_InitialComponentContext()
 
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h
index dff079b8d1db..7106f0daf820 100644
--- a/cli_ure/source/native/native_share.h
+++ b/cli_ure/source/native/native_share.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,3 +119,5 @@ inline void to_uno(
 
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/native/path.cxx b/cli_ure/source/native/path.cxx
index 56b5caf3b299..78c29cfa5d9c 100644
--- a/cli_ure/source/native/path.cxx
+++ b/cli_ure/source/native/path.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +36,6 @@
 #include <windows.h>
 
 #include "sal/types.h"
-//#include "tools/pathutils.hxx"
 
 namespace cli_ure {
 
@@ -216,3 +216,5 @@ WCHAR * resolveLink(WCHAR * path) {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h
index 0ff3f40f9762..8d70d228dc1e 100644
--- a/cli_ure/source/uno_bridge/cli_base.h
+++ b/cli_ure/source/uno_bridge/cli_base.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -178,3 +179,5 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref )
 
 } //end namespace cli_uno
  #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx
index ab78b2f9d95b..6f6f16978864 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.cxx
+++ b/cli_ure/source/uno_bridge/cli_bridge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,7 +54,9 @@ namespace  cssu= com::sun::star::uno;
 
 
 namespace sri= System::Runtime::InteropServices;
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
 
 namespace cli_uno
 {
@@ -109,7 +112,7 @@ void SAL_CALL Mapping_cli2uno(
         OString cstr_msg(
             OUStringToOString(
                 OUSTR("[cli_uno bridge error] ") + err.m_message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr_msg.getStr() );
+        OSL_FAIL( cstr_msg.getStr() );
 #else
         (void) err; // unused
 #endif
@@ -168,7 +171,7 @@ void SAL_CALL Mapping_uno2cli(
         rtl::OString cstr_msg(
             rtl::OUStringToOString(
                 OUSTR("[cli_uno bridge error] ") + err.m_message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr_msg.getStr() );
+        OSL_FAIL( cstr_msg.getStr() );
 #else
         (void) err; // unused
 #endif
@@ -349,7 +352,7 @@ void SAL_CALL uno_ext_getMapping(
         OString cstr_msg(
             OUStringToOString(
                 OUSTR("[cli_uno bridge error] ") + err.m_message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr_msg.getStr() );
+        OSL_FAIL( cstr_msg.getStr() );
 #else
         (void) err; // unused
 #endif
@@ -367,3 +370,5 @@ sal_Bool SAL_CALL component_canUnload( TimeValue * )
 
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h
index 1bc3a926519e..34d6ed294d4d 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.h
+++ b/cli_ure/source/uno_bridge/cli_bridge.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,3 +119,5 @@ struct Bridge
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index 99f4bda82563..23288d0074a6 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,9 +56,11 @@ namespace sr = System::Reflection;
 namespace st = System::Text;
 namespace ucss = unoidl::com::sun::star;
 
-using namespace rtl;
 using namespace std;
 
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
 
 namespace cli_uno
 {
@@ -2009,3 +2012,5 @@ void Bridge::map_to_cli(
     }
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/uno_bridge/cli_environment.cxx b/cli_ure/source/uno_bridge/cli_environment.cxx
index cfa0f8e57817..213cfc9ae5dd 100644
--- a/cli_ure/source/uno_bridge/cli_environment.cxx
+++ b/cli_ure/source/uno_bridge/cli_environment.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -171,3 +172,5 @@ System::String* Cli_environment::getObjectIdentifier(System::Object* obj)
     return oId;
 }
 } //namespace cli_uno
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/uno_bridge/cli_environment.h b/cli_ure/source/uno_bridge/cli_environment.h
index 486d5c169807..a10692390c7c 100644
--- a/cli_ure/source/uno_bridge/cli_environment.h
+++ b/cli_ure/source/uno_bridge/cli_environment.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -112,3 +113,5 @@ public:
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 0fd662a24fe9..eedd20d5df5f 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,7 +53,11 @@ namespace css = com::sun::star;
 namespace ucss = unoidl::com::sun::star;
 
 using namespace cli_uno;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+using ::rtl::OUStringBuffer;
 extern "C"
 {
 //------------------------------------------------------------------------------
@@ -305,8 +310,8 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType,
     catch (BridgeRuntimeError& e)
     {
         (void) e; // avoid warning
-        OSL_ENSURE(
-            0, OUStringToOString(
+        OSL_FAIL(
+            OUStringToOString(
                 e.m_message, RTL_TEXTENCODING_UTF8 ).getStr() );
     }
     catch (System::Exception* e)
@@ -316,14 +321,14 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType,
             S"UnoInterfaceProxy::CanCastTo().  Original"
             S"message: \n");
         msg= System::String::Concat(msg, e->get_Message());
-        OSL_ENSURE(
-            0, OUStringToOString(
+        OSL_FAIL(
+            OUStringToOString(
                 mapCliString(msg), RTL_TEXTENCODING_UTF8 ).getStr() );
     }
     catch (...)
     {
-        OSL_ENSURE(
-            0, "An unexpected native C++ exception occurred in "
+        OSL_FAIL(
+            "An unexpected native C++ exception occurred in "
             "UnoInterfaceProxy::CanCastTo()" );
     }
     __finally
@@ -860,7 +865,6 @@ sr::MethodInfo* CliProxy::getMethodInfo(int nUnoFunctionPos,
                                 "cli object does not implement interface method: "));
             buf.append(usMethodName);
             throw BridgeRuntimeError(buf.makeStringAndClear());
-            return 0;
         }
         m_arUnoPosToCliPos[nUnoFunctionPos] = indexCliMethod;
         ret = m_arMethodInfos[indexCliMethod];
@@ -1106,7 +1110,7 @@ void SAL_CALL cli_proxy_dispatch(
                     {
                         uno_any_construct( (uno_Any *)uno_ret, 0, 0, 0 );
                     }
-                    // no excetpion occured
+                    // no excetpion occurred
                     *uno_exc = 0;
                 }
                 else
@@ -1167,7 +1171,7 @@ void SAL_CALL cli_proxy_dispatch(
 #if OSL_DEBUG_LEVEL >= 1
         OString cstr_msg(OUStringToOString(exc.Message,
                                              RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE(0, cstr_msg.getStr());
+        OSL_FAIL(cstr_msg.getStr());
 #endif
     }
 }
@@ -1176,3 +1180,4 @@ void SAL_CALL cli_proxy_dispatch(
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/uno_bridge/cli_proxy.h b/cli_ure/source/uno_bridge/cli_proxy.h
index 2441bebf1365..c5ea831dbf70 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.h
+++ b/cli_ure/source/uno_bridge/cli_proxy.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -297,3 +298,5 @@ struct CliProxy: public uno_Interface
 };
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx
index 34fdbe0c66ef..3e5b709bd313 100644
--- a/cli_ure/source/uno_bridge/cli_uno.cxx
+++ b/cli_ure/source/uno_bridge/cli_uno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +36,8 @@
 
 namespace sr=System::Reflection;
 namespace css=com::sun::star;
-using namespace rtl;
+
+using ::rtl::OUStringBuffer;
 
 namespace cli_uno
 {
@@ -187,7 +189,7 @@ System::Object* Bridge::call_uno(uno_Interface * pUnoI,
         }
         return 0; // void return
     }
-    else // exception occured
+    else // exception occurred
     {
         // destruct uno in args
         for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
@@ -280,7 +282,7 @@ void Bridge::call_cli(
         map_to_uno(
             uno_ret, retInvoke, return_type, false /* no assign */);
     }
-    // no exception occured
+    // no exception occurred
     *uno_exc = 0;
 }
 
@@ -288,3 +290,5 @@ void Bridge::call_cli(
 
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/version/makefile.mk b/cli_ure/version/makefile.mk
index 2b5913100be4..4f84cab0e6dc 100644
--- a/cli_ure/version/makefile.mk
+++ b/cli_ure/version/makefile.mk
@@ -40,21 +40,7 @@ TARGET = cliureversion.mk
 ALLTAR : \
     $(BIN)$/cliureversion.mk 
 
-#	INCVERSION
-
 #always deliver a cliureversion.mk. It is needed for the packing process even for all other
 #platforms. Therefore BUILD_FOR_CLI is not used here 
 $(BIN)$/cliureversion.mk: version.txt 
     $(GNUCOPY) $< $@
-
-
-#disabled because of #67482
-#Create the config file that is used with the policy assembly 
-#only if new published types have been added, the cliureversion.mk is written.
-#INCVERSION .PHONY: version.txt incversions.txt  
-#	$(PERL) $(PRJ)$/source$/scripts$/increment_version.pl \
-#	$< $(BIN)$/cliureversion.mk $(SOLARBINDIR)$/unotype_statistics.txt
-
-
-
-
diff --git a/codemaker/codemaker.pmk b/codemaker/codemaker.pmk
index 976c162e71b3..cf06407ea8d8 100755
--- a/codemaker/codemaker.pmk
+++ b/codemaker/codemaker.pmk
@@ -25,11 +25,7 @@
 #
 #*************************************************************************
 
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
-
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 CODEMAKERLIBDEPN=codemaker.lib
 COMMONCPPLIBDEPN=commoncpp.lib
 COMMONJAVALIBDEPN=commonjava.lib
diff --git a/codemaker/inc/codemaker/codemaker.hxx b/codemaker/inc/codemaker/codemaker.hxx
index fee56c307b11..91cf382d39f8 100644
--- a/codemaker/inc/codemaker/codemaker.hxx
+++ b/codemaker/inc/codemaker/codemaker.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,3 +55,5 @@ codemaker::UnoType::Sort decomposeAndResolve(
 }
 
 #endif // INCLUDED_CODEMAKER_CODEMAKER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/codemaker/inc/codemaker/commoncpp.hxx
index 241336775d2b..5ccb5e30efcb 100644
--- a/codemaker/inc/codemaker/commoncpp.hxx
+++ b/codemaker/inc/codemaker/commoncpp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,5 @@ rtl::OString translateUnoToCppIdentifier(
 } }
 
 #endif // INCLUDED_CODEMAKER_COMMONCPP_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/codemaker/commonjava.hxx b/codemaker/inc/codemaker/commonjava.hxx
index ae5c8b18fc3b..9fa36efc60fd 100644
--- a/codemaker/inc/codemaker/commonjava.hxx
+++ b/codemaker/inc/codemaker/commonjava.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,3 +43,5 @@ rtl::OString translateUnoToJavaIdentifier(
 } }
 
 #endif // INCLUDED_CODEMAKER_COMMONJAVA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/codemaker/dependencies.hxx b/codemaker/inc/codemaker/dependencies.hxx
index 66aad808a130..07989f59ef01 100644
--- a/codemaker/inc/codemaker/dependencies.hxx
+++ b/codemaker/inc/codemaker/dependencies.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 #include "rtl/string.hxx"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 namespace rtl { class OUString; }
 class TypeManager;
@@ -52,7 +53,7 @@ public:
      */
     enum Kind { KIND_NO_BASE, KIND_BASE };
 
-    typedef std::hash_map< rtl::OString, Kind, rtl::OStringHash > Map;
+    typedef boost::unordered_map< rtl::OString, Kind, rtl::OStringHash > Map;
 
     /**
        Constructs the dependencies for a given type.
@@ -147,3 +148,5 @@ private:
 }
 
 #endif // INCLUDED_CODEMAKER_DEPENDENCIES_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/codemaker/exceptiontree.hxx b/codemaker/inc/codemaker/exceptiontree.hxx
index 7a8e1bb837c2..e8edb35fab57 100644
--- a/codemaker/inc/codemaker/exceptiontree.hxx
+++ b/codemaker/inc/codemaker/exceptiontree.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/codemaker/generatedtypeset.hxx b/codemaker/inc/codemaker/generatedtypeset.hxx
index c5a481893b14..6829d0cd5bd7 100644
--- a/codemaker/inc/codemaker/generatedtypeset.hxx
+++ b/codemaker/inc/codemaker/generatedtypeset.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 #include "rtl/string.hxx"
 
-#include <hash_set>
+#include <boost/unordered_set.hpp>
 
 /// @HTML
 
@@ -71,9 +72,11 @@ private:
     GeneratedTypeSet(GeneratedTypeSet &); // not implemented
     void operator =(GeneratedTypeSet); // not implemented
 
-    std::hash_set< rtl::OString, rtl::OStringHash > m_set;
+    boost::unordered_set< rtl::OString, rtl::OStringHash > m_set;
 };
 
 }
 
 #endif // INCLUDED_CODEMAKER_GENERATEDTYPESET_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/codemaker/global.hxx b/codemaker/inc/codemaker/global.hxx
index b1919d041daf..2406305db451 100644
--- a/codemaker/inc/codemaker/global.hxx
+++ b/codemaker/inc/codemaker/global.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -149,3 +150,4 @@ public:
 
 #endif // INCLUDED_CODEMAKER_GLOBAL_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/codemaker/options.hxx b/codemaker/inc/codemaker/options.hxx
index 5f440744cc2a..76c3328668f3 100644
--- a/codemaker/inc/codemaker/options.hxx
+++ b/codemaker/inc/codemaker/options.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,28 +29,17 @@
 #ifndef INCLUDED_CODEMAKER_OPTIONS_HXX
 #define INCLUDED_CODEMAKER_OPTIONS_HXX
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <codemaker/global.hxx>
 
-#if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
-typedef ::std::__hash_map__
-<
-    ::rtl::OString,
-    ::rtl::OString,
-    HashString,
-    EqualString,
-    NewAlloc
-> OptionMap;
-#else
-typedef ::std::hash_map
+typedef ::boost::unordered_map
 <
     ::rtl::OString,
     ::rtl::OString,
     HashString,
     EqualString
 > OptionMap;
-#endif
 
 class IllegalArgument
 {
@@ -96,3 +86,4 @@ protected:
 
 #endif // INCLUDED_CODEMAKER_OPTIONS_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/codemaker/typemanager.hxx b/codemaker/inc/codemaker/typemanager.hxx
index dacb97b1214b..129dbfe69898 100644
--- a/codemaker/inc/codemaker/typemanager.hxx
+++ b/codemaker/inc/codemaker/typemanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
 #include "registry/registry.hxx"
 #include "registry/types.h"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <list>
 
 namespace typereg { class Reader; }
@@ -42,24 +43,13 @@ typedef ::std::vector< Registry* >  RegistryList;
 typedef ::std::pair< RegistryKey, sal_Bool >    KeyPair;
 typedef ::std::vector< KeyPair >    RegistryKeyList;
 
-#if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
-typedef ::std::__hash_map__
-<
-    ::rtl::OString, // Typename
-    RTTypeClass,    // TypeClass
-    HashString,
-    EqualString,
-    NewAlloc
-> T2TypeClassMap;
-#else
-typedef ::std::hash_map
+typedef ::boost::unordered_map
 <
     ::rtl::OString, // Typename
     RTTypeClass,    // TypeClass
     HashString,
     EqualString
 > T2TypeClassMap;
-#endif
 
 struct TypeManagerImpl
 {
@@ -180,3 +170,5 @@ protected:
 };
 
 #endif // INCLUDED_CODEMAKER_TYPEMANAGER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/codemaker/unotype.hxx b/codemaker/inc/codemaker/unotype.hxx
index 24a3d7adcba1..e79e760530d7 100644
--- a/codemaker/inc/codemaker/unotype.hxx
+++ b/codemaker/inc/codemaker/unotype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ namespace UnoType {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/pch/precompiled_codemaker.cxx b/codemaker/inc/pch/precompiled_codemaker.cxx
index 50632d92b15c..fbe55a4f00f4 100644
--- a/codemaker/inc/pch/precompiled_codemaker.cxx
+++ b/codemaker/inc/pch/precompiled_codemaker.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_codemaker.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/pch/precompiled_codemaker.hxx b/codemaker/inc/pch/precompiled_codemaker.hxx
index 5d7cafb7573a..443b3f60ee23 100644
--- a/codemaker/inc/pch/precompiled_codemaker.hxx
+++ b/codemaker/inc/pch/precompiled_codemaker.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/prj/build.lst b/codemaker/prj/build.lst
index e0520d5cc71f..a0fa864ebd8e 100644
--- a/codemaker/prj/build.lst
+++ b/codemaker/prj/build.lst
@@ -7,5 +7,3 @@ cm	codemaker\source\commoncpp				nmake	-	all	cm_cpp cm_inc NULL
 cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker cm_cpp cm_inc NULL
 cm	codemaker\source\commonjava				nmake	-	all	cm_java cm_inc NULL
 cm	codemaker\source\javamaker				nmake	-	all	cm_javamaker cm_codemaker cm_java cm_inc NULL
-
-
diff --git a/codemaker/prj/d.lst b/codemaker/prj/d.lst
index 62b56b948e5c..6965d315e87e 100644
--- a/codemaker/prj/d.lst
+++ b/codemaker/prj/d.lst
@@ -1,14 +1,14 @@
-..\%__SRC%\bin\cppumaker.exe %_DEST%\bin%_EXT%\cppumaker.exe
-..\%__SRC%\bin\cppumaker.pdb %_DEST%\bin%_EXT%\cppumaker.pdb
-..\%__SRC%\bin\javamaker.exe %_DEST%\bin%_EXT%\javamaker.exe
-..\%__SRC%\bin\javamaker.pdb %_DEST%\bin%_EXT%\javamaker.pdb
+..\%__SRC%\bin\cppumaker.exe %_DEST%\bin\cppumaker.exe
+..\%__SRC%\bin\cppumaker.pdb %_DEST%\bin\cppumaker.pdb
+..\%__SRC%\bin\javamaker.exe %_DEST%\bin\javamaker.exe
+..\%__SRC%\bin\javamaker.pdb %_DEST%\bin\javamaker.pdb
 
-..\inc\codemaker\*.h %_DEST%\inc%_EXT%\codemaker\*.h
-..\inc\codemaker\*.hxx %_DEST%\inc%_EXT%\codemaker\*.hxx
+..\inc\codemaker\*.h %_DEST%\inc\codemaker\*.h
+..\inc\codemaker\*.hxx %_DEST%\inc\codemaker\*.hxx
 
-..\%__SRC%\bin\cppumaker %_DEST%\bin%_EXT%\cppumaker
-..\%__SRC%\bin\javamaker %_DEST%\bin%_EXT%\javamaker
+..\%__SRC%\bin\cppumaker %_DEST%\bin\cppumaker
+..\%__SRC%\bin\javamaker %_DEST%\bin\javamaker
 
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%\i*.lib
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\lib\i*.lib %_DEST%\lib\i*.lib
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
diff --git a/codemaker/source/bonobowrappermaker/corbamaker.cxx b/codemaker/source/bonobowrappermaker/corbamaker.cxx
deleted file mode 100644
index 85221b53f9ec..000000000000
--- a/codemaker/source/bonobowrappermaker/corbamaker.cxx
+++ /dev/null
@@ -1,239 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
-
-#include <stdio.h>
-
-#include "sal/main.h"
-
-#include <codemaker/typemanager.hxx>
-#include <codemaker/dependency.hxx>
-
-#include "corbaoptions.hxx"
-#include "corbatype.hxx"
-
-using namespace rtl;
-
-sal_Bool produceAllTypes(const OString& typeName,
-                        TypeManager& typeMgr,
-                        TypeDependency& typeDependencies,
-                        CorbaOptions* pOptions,
-                        sal_Bool bFullScope,
-                        FileStream& o,
-                        TypeSet* pAllreadyDumped,
-                        TypeSet* generatedConversion)
-
-    throw( CannotDumpException )
-{
-    if (!produceType(typeName, typeMgr, typeDependencies, pOptions, o, pAllreadyDumped, generatedConversion))
-    {
-        fprintf(stderr, "%s ERROR: %s\n",
-                pOptions->getProgramName().getStr(),
-                OString("cannot dump Type '" + typeName + "'").getStr());
-        exit(99);
-    }
-
-    RegistryKey typeKey = typeMgr.getTypeKey(typeName);
-    RegistryKeyNames subKeys;
-
-    if (typeKey.getKeyNames(OUString(), subKeys))
-        return sal_False;
-
-    OString tmpName;
-    for (sal_uInt32 i=0; i < subKeys.getLength(); i++)
-    {
-        tmpName = OUStringToOString(subKeys.getElement(i), RTL_TEXTENCODING_UTF8);
-
-        if (pOptions->isValid("-B"))
-            tmpName = tmpName.copy(tmpName.indexOf('/', 1) + 1);
-        else
-            tmpName = tmpName.copy(1);
-
-        if (bFullScope)
-        {
-            if (!produceAllTypes(tmpName, typeMgr, typeDependencies, pOptions, sal_True, o, pAllreadyDumped, generatedConversion))
-                return sal_False;
-        } else
-        {
-            if (!produceType(tmpName, typeMgr, typeDependencies, pOptions, o, pAllreadyDumped, generatedConversion))
-                return sal_False;
-        }
-    }
-
-    return sal_True;
-}
-
-SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-{
-    CorbaOptions options;
-
-    try
-    {
-        if (!options.initOptions(argc, argv))
-        {
-            exit(1);
-        }
-    }
-    catch( IllegalArgument& e)
-    {
-        fprintf(stderr, "Illegal option: %s\n", e.m_message.getStr());
-        exit(99);
-    }
-
-    RegistryTypeManager typeMgr;
-    TypeDependency      typeDependencies;
-
-    if (!typeMgr.init(!options.isValid("-T"), options.getInputFiles()))
-    {
-        fprintf(stderr, "%s : init registries failed, check your registry files.\n", options.getProgramName().getStr());
-        exit(99);
-    }
-
-    if (options.isValid("-B"))
-    {
-        typeMgr.setBase(options.getOption("-B"));
-    }
-
-    try
-    {
-        TypeSet generatedConversion;
-        FileStream cppFile;
-        OString outPath;
-        if (options.isValid("-O"))
-            outPath = options.getOption("-O");
-
-        cppFile.open(outPath);
-
-        if(!cppFile.isValid())
-        {
-            OString message("cannot open ");
-            message += outPath + " for writing";
-            throw CannotDumpException(message);
-        }
-
-        if (options.isValid("-H"))
-        {
-            OString corbaHeader = options.getOption("-H");
-
-            cppFile << "#include <"
-                    << corbaHeader
-                    << ">\n\n";
-
-            CorbaType::dumpDefaultHxxIncludes(cppFile);
-            cppFile << "\n";
-        }
-
-        if (options.isValid("-T"))
-        {
-            OString tOption(options.getOption("-T"));
-
-            OString typeName, tmpName;
-            sal_Bool ret = sal_False;
-            sal_Int32 nIndex = 0;
-            do
-            {
-                typeName = tOption.getToken(0, ';', nIndex);
-
-                sal_Int32 nPos = typeName.lastIndexOf( '.' );
-                tmpName = typeName.copy( nPos != -1 ? nPos+1 : 0 );
-                if (tmpName == "*")
-                {
-                    // produce this type and his scope, but the scope is not recursively  generated.
-                    if (typeName.equals("*"))
-                    {
-                        tmpName = "/";
-                    } else
-                    {
-                        tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
-                        if (tmpName.getLength() == 0)
-                            tmpName = "/";
-                        else
-                            tmpName.replace('.', '/');
-                    }
-                    ret = produceAllTypes(tmpName, typeMgr, typeDependencies, &options, sal_False, cppFile, NULL, &generatedConversion);
-                } else
-                {
-                    // produce only this type
-                    ret = produceType(typeName.replace('.', '/'), typeMgr, typeDependencies, &options, cppFile, NULL, &generatedConversion);
-                }
-
-                if (!ret)
-                {
-                    fprintf(stderr, "%s ERROR: %s\n",
-                            options.getProgramName().getStr(),
-                            OString("cannot dump Type '" + typeName + "'").getStr());
-                    exit(99);
-                }
-            } while( nIndex != -1 );
-        } else
-        {
-            // produce all types
-            if (!produceAllTypes("/", typeMgr, typeDependencies, &options, sal_True, cppFile, NULL, &generatedConversion))
-            {
-                fprintf(stderr, "%s ERROR: %s\n",
-                        options.getProgramName().getStr(),
-                        "an error occurs while dumping all types.");
-                exit(99);
-            }
-        }
-
-        cppFile << "namespace bonobobridge {\n"
-                << "const ConversionInfo* get_conversion_functions() {\n"
-                << "  static ConversionInfo allFunctions[" << generatedConversion.size()+1<< "] = {\n";
-
-        for (TypeSet::iterator iter = generatedConversion.begin(); iter != generatedConversion.end(); iter++)
-        {
-            cppFile << "    {\"" << (*iter).getStr() << "\""
-                    << ", &TC_" << (*iter).replace('/','_').getStr() << "_struct"
-                    << ", sizeof(" << (*iter).replace('/','_').getStr() << ")"
-                    << ", convert_b2u_" << (*iter).replace('/','_').getStr()
-                    << ", convert_u2b_" <<  (*iter).replace('/','_').getStr()
-                    << " },\n";
-        }
-
-        cppFile << "    {NULL, NULL, 0 , NULL, NULL} };\n"
-                << "  return allFunctions;\n"
-                << "}\n"
-                << "}; // namespace bonobobridge\n";
-
-        cppFile.close();
-    }
-    catch( CannotDumpException& e)
-    {
-        fprintf(stderr, "%s ERROR: %s\n",
-                options.getProgramName().getStr(),
-                e.m_message.getStr());
-        exit(99);
-    }
-
-    return 0;
-}
-
-
diff --git a/codemaker/source/bonobowrappermaker/corbaoptions.cxx b/codemaker/source/bonobowrappermaker/corbaoptions.cxx
deleted file mode 100644
index 1bb75810031a..000000000000
--- a/codemaker/source/bonobowrappermaker/corbaoptions.cxx
+++ /dev/null
@@ -1,255 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
-#include    <stdio.h>
-
-#include    "corbaoptions.hxx"
-
-using namespace rtl;
-
-sal_Bool CorbaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
-    throw( IllegalArgument )
-{
-    sal_Bool    ret = sal_True;
-    sal_uInt16  i=0;
-
-    if (!bCmdFile)
-    {
-        bCmdFile = sal_True;
-
-        m_program = av[0];
-
-        if (ac < 2)
-        {
-            fprintf(stderr, "%s", prepareHelp().getStr());
-            ret = sal_False;
-        }
-
-        i = 1;
-    } else
-    {
-        i = 0;
-    }
-
-    char    *s=NULL;
-    for (i; i < ac; i++)
-    {
-        if (av[i][0] == '-')
-        {
-            switch (av[i][1])
-            {
-                case 'O':
-                    if (av[i][2] == '\0')
-                    {
-                        if (i < ac - 1 && av[i+1][0] != '-')
-                        {
-                            i++;
-                            s = av[i];
-                        } else
-                        {
-                            OString tmp("'-O', please check");
-                            if (i <= ac - 1)
-                            {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
-                            }
-
-                            throw IllegalArgument(tmp);
-                        }
-                    } else
-                    {
-                        s = av[i] + 2;
-                    }
-
-                    m_options["-O"] = OString(s);
-                    break;
-                case 'H':
-                    if (av[i][2] == '\0')
-                    {
-                        if (i < ac - 1 && av[i+1][0] != '-')
-                        {
-                            i++;
-                            s = av[i];
-                        } else
-                        {
-                            OString tmp("'-H', please check");
-                            if (i <= ac - 1)
-                            {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
-                            }
-
-                            throw IllegalArgument(tmp);
-                        }
-                    } else
-                    {
-                        s = av[i] + 2;
-                    }
-
-                    m_options["-H"] = OString(s);
-                    break;
-                case 'B':
-                    if (av[i][2] == '\0')
-                    {
-                        if (i < ac - 1 && av[i+1][0] != '-')
-                        {
-                            i++;
-                            s = av[i];
-                        } else
-                        {
-                            OString tmp("'-B', please check");
-                            if (i <= ac - 1)
-                            {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
-                            }
-
-                            throw IllegalArgument(tmp);
-                        }
-                    } else
-                    {
-                        s = av[i] + 2;
-                    }
-
-                    m_options["-B"] = OString(s);
-                    break;
-                case 'T':
-                    if (av[i][2] == '\0')
-                    {
-                        if (i < ac - 1 && av[i+1][0] != '-')
-                        {
-                            i++;
-                            s = av[i];
-                        } else
-                        {
-                            OString tmp("'-T', please check");
-                            if (i <= ac - 1)
-                            {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
-                            }
-
-                            throw IllegalArgument(tmp);
-                        }
-                    } else
-                    {
-                        s = av[i] + 2;
-                    }
-
-                    if (m_options.count("-T") > 0)
-                    {
-                        OString tmp(m_options["-T"]);
-                        tmp = tmp + ";" + s;
-                        m_options["-T"] = tmp;
-                    } else
-                    {
-                        m_options["-T"] = OString(s);
-                    }
-                    break;
-                case 'G':
-                    if (av[i][2] != '\0')
-                    {
-                        OString tmp("'-G', please check");
-                        if (i <= ac - 1)
-                        {
-                            tmp += " your input '" + OString(av[i]) + "'";
-                        }
-
-                        throw IllegalArgument(tmp);
-                    }
-
-                    m_options["-G"] = OString("");
-                    break;
-                default:
-                    throw IllegalArgument("the option is unknown" + OString(av[i]));
-                    break;
-            }
-        } else
-        {
-            if (av[i][0] == '@')
-            {
-                FILE* cmdFile = fopen(av[i]+1, "r");
-                  if( cmdFile == NULL )
-                  {
-                    fprintf(stderr, "%s", prepareHelp().getStr());
-                    ret = sal_False;
-                } else
-                {
-                    int rargc=0;
-                    char* rargv[512];
-                    char  buffer[512];
-
-                    while ( fscanf(cmdFile, "%s", buffer) != EOF )
-                    {
-                        rargv[rargc]= strdup(buffer);
-                        rargc++;
-                    }
-                    fclose(cmdFile);
-
-                    ret = initOptions(rargc, rargv, bCmdFile);
-
-                    for (long i=0; i < rargc; i++)
-                    {
-                        free(rargv[i]);
-                    }
-                }
-            } else
-            {
-                m_inputFiles.push_back(av[i]);
-            }
-        }
-    }
-    printf("-T: %s\n",                      m_options["-T"].getStr());
-
-    return ret;
-}
-
-OString CorbaOptions::prepareHelp()
-{
-    OString help("\nusing: ");
-    help += m_program + " [-options] file_1 ... file_n\nOptions:\n";
-    help += "    -O<file>   = file name for the generated output.\n";
-    help += "                 The output directory tree is generated under this directory.\n";
-    help += "    -T<name>   = name specifies a type or a list of types. The output for this\n";
-    help += "      [t1;...]   type is generated. If no '-T' option is specified,\n";
-    help += "                 then output for all types is generated.\n";
-    help += "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n";
-    help += "    -B<name>   = name specifies the base node. All types are searched under this\n";
-    help += "                 node. Default is the root '/' of the registry files.\n";
-    help += "    -G         = generate only target files which does not exists.\n";
-    help += "    -H<header> = include CORBA generated <header>.\n";
-    help += prepareVersion();
-
-    return help;
-}
-
-OString CorbaOptions::prepareVersion()
-{
-    OString version(m_program);
-    version += m_program + " Version 2.0\n\n";
-    return version;
-}
-
-
diff --git a/codemaker/source/bonobowrappermaker/corbaoptions.hxx b/codemaker/source/bonobowrappermaker/corbaoptions.hxx
deleted file mode 100644
index aa08016f5ee7..000000000000
--- a/codemaker/source/bonobowrappermaker/corbaoptions.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CORBAMAKER_CPPUOPTIONS_HXX_
-#define _CORBAMAKER_CPPUOPTIONS_HXX_
-
-#include    <codemaker/options.hxx>
-
-class CorbaOptions : public Options
-{
-public:
-    CorbaOptions()
-        : Options() {}
-
-    ~CorbaOptions() {}
-
-    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
-            throw( IllegalArgument );
-
-    ::rtl::OString  prepareHelp();
-
-    ::rtl::OString  prepareVersion();
-
-protected:
-};
-
-#endif // _CORBAMAKER_CPPUOPTIONS_HXX_
diff --git a/codemaker/source/bonobowrappermaker/corbatype.cxx b/codemaker/source/bonobowrappermaker/corbatype.cxx
deleted file mode 100644
index 417af55b326e..000000000000
--- a/codemaker/source/bonobowrappermaker/corbatype.cxx
+++ /dev/null
@@ -1,2782 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
-
-#include <stdio.h>
-#include    <rtl/alloc.h>
-#include    <rtl/ustring.hxx>
-#include    <rtl/strbuf.hxx>
-
-#include    "corbatype.hxx"
-#include    "corbaoptions.hxx"
-
-#include <hash_set>
-#include <list>
-
-using namespace rtl;
-
-
-//*************************************************************************
-// CorbaType
-//*************************************************************************
-CorbaType::CorbaType(TypeReader& typeReader,
-        const OString& typeName,
-        const TypeManager& typeMgr,
-        const TypeDependency& typeDependencies,
-        TypeSet* generatedConversions)
-    : m_inheritedMemberCount(0)
-    , m_indentLength(0)
-    , m_typeName(typeName)
-    , m_reader(typeReader)
-    , m_typeMgr((TypeManager&)typeMgr)
-    , m_dependencies(typeDependencies)
-    , m_generatedConversions(generatedConversions)
-{
-    sal_Int32 i = typeName.lastIndexOf('/');
-    m_name = typeName.copy( i != -1 ? i+1 : 0 );
-}
-
-CorbaType::~CorbaType()
-{
-
-}
-
-sal_Bool CorbaType::isNestedTypeByName(const ::rtl::OString& type)
-{
-    sal_Bool ret = sal_False;
-
-    sal_Int32 i = type.lastIndexOf('/');
-
-    if (i >= 0)
-    {
-        OString outerTypeName(type.copy(0, i));
-        ret = (m_typeMgr.getTypeClass(outerTypeName) == RT_TYPE_INTERFACE);
-    }
-
-    return ret;
-}
-
-sal_Bool CorbaType::dump(CorbaOptions* pOptions, FileStream& o, TypeSet* allreadyDumped)
-    throw( CannotDumpException )
-{
-    sal_Bool ret = sal_False;
-
-    ret = dumpConversionFunctions(o, allreadyDumped);
-
-    return ret;
-}
-
-sal_Bool CorbaType::dumpDependedTypes(CorbaOptions* pOptions, FileStream& o, TypeSet* allreadyDumped)
-    throw( CannotDumpException )
-{
-    sal_Bool ret = sal_True;
-
-    TypeUsingSet usingSet(m_dependencies.getDependencies(m_typeName));
-
-    TypeUsingSet::const_iterator iter = usingSet.begin();
-    OString typeName;
-    sal_uInt32 index = 0;
-    while (iter != usingSet.end())
-    {
-        typeName = (*iter).m_type;
-        if ((index = typeName.lastIndexOf(']')) > 0)
-            typeName = typeName.copy(index + 1);
-
-        if (getUnoBaseType(typeName).getLength() == 0)
-        {
-            if (!produceType(typeName,
-                m_typeMgr,
-                m_dependencies,
-                pOptions,
-                o, allreadyDumped, m_generatedConversions))
-            {
-    fprintf(stderr, "%s ERROR: %s\n",
-            pOptions->getProgramName().getStr(),
-            OString("cannot dump Type '" + typeName + "'").getStr());
-    exit(99);
-            }
-        }
-        ++iter;
-    }
-
-    return ret;
-}
-
-sal_Bool CorbaType::dumpConversionFunctions(FileStream& o, TypeSet* allreadyDumped)
-    throw( CannotDumpException )
-{
-    if (m_typeName.lastIndexOf(']') < 0)
-    {
-        dumpInclude(o, allreadyDumped, m_typeName, "hpp", sal_False);
-        dumpDepIncludes(o, allreadyDumped, m_typeName, "hpp");
-
-        dumpFunctions(o);
-    }
-
-    return sal_True;
-}
-
-
-void CorbaType::dumpDefaultHxxIncludes(FileStream& o)
-{
-    o << "#ifndef _OSL_MUTEX_HXX_\n"
-      << "#include <osl/mutex.hxx>\n"
-      << "#endif\n\n";
-
-    o << "#ifndef _RTL_USTRING_HXX_\n"
-      << "#include <rtl/ustring.hxx>\n"
-      << "#endif\n\n";
-
-    o << "#ifndef _COM_SUN_STAR_UNO_TYPE_HXX_\n"
-      << "#include <com/sun/star/uno/Type.hxx>\n"
-      << "#endif\n";
-
-    o << "#ifndef _COM_SUN_STAR_UNO_ANY_HXX_\n"
-      << "#include <com/sun/star/uno/Any.hxx>\n"
-      << "#endif\n";
-
-    o << "#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_\n"
-      << "#include <com/sun/star/uno/Reference.hxx>\n"
-      << "#endif\n";
-
-    o << "#ifndef _COM_SUN_STAR_UNO_XINTERFACE_HPP_\n"
-      << "#include <com/sun/star/uno/XInterface.hpp>\n"
-      << "#endif\n";
-
-    o << "#ifndef _BONOBO_NULLINTERFACE_HPP_\n"
-      << "#include <Bonobo/NullInterface.hpp>\n"
-      << "#endif\n";
-
-    o << "#ifndef _COM_SUN_STAR_UNO_EXCEPTION_HPP_\n"
-      << "#include <com/sun/star/uno/Exception.hpp>\n"
-      << "#endif\n";
-
-    o << "#ifndef _COM_SUN_STAR_UNO_RUNTIMEEXCEPTION_HPP_\n"
-      << "#include <com/sun/star/uno/RuntimeException.hpp>\n"
-      << "#endif\n";
-
-    o << "#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_\n"
-      << "#include <com/sun/star/uno/Sequence.hxx>\n"
-      << "#endif\n";
-}
-
-
-void CorbaType::dumpInclude(FileStream& o, TypeSet* allreadyDumped, const OString& typeName, sal_Char* prefix, sal_Bool bExtended, sal_Bool bCaseSensitive)
-{
-    OString realTypeName = checkRealBaseType( typeName );
-
-    if (!isNestedTypeByName(typeName) &&
-        (BT_INVALID == isBaseType(realTypeName)) &&
-        !realTypeName.equals("Bonobo/NullInterface") &&
-        !realTypeName.equals("com/sun/star/uno/XInterface") &&
-        !realTypeName.equals("com/sun/star/uno/TypeClass") &&
-        !realTypeName.equals("com/sun/star/uno/Type") &&
-        !realTypeName.equals("com/sun/star/uno/Exception") &&
-        !realTypeName.equals("com/sun/star/uno/RuntimeException"))
-    {
-        TypeSet::const_iterator iter = allreadyDumped->find(realTypeName);
-
-        if (iter == allreadyDumped->end())
-        {
-            allreadyDumped->insert(realTypeName);
-
-            sal_uInt32 length = 3+ m_typeName.getLength() + strlen(prefix);
-
-            if (bExtended)
-                length += m_name.getLength() + 1;
-
-            OStringBuffer tmpBuf(length);
-
-            tmpBuf.append('_');
-            tmpBuf.append(typeName);
-            tmpBuf.append('_');
-            if (bExtended)
-            {
-                tmpBuf.append(m_name);
-                tmpBuf.append('_');
-            }
-            tmpBuf.append(prefix);
-            tmpBuf.append('_');
-
-            OString tmp(tmpBuf.makeStringAndClear().replace('/', '_').toAsciiUpperCase());
-
-            length = 1 + typeName.getLength() + strlen(prefix);
-            if (bExtended)
-                length += m_name.getLength() + 1;
-
-            tmpBuf.ensureCapacity(length);
-            tmpBuf.append(typeName);
-            if (bExtended)
-            {
-                tmpBuf.append('/');
-                tmpBuf.append(m_name);
-            }
-            tmpBuf.append('.');
-            tmpBuf.append(prefix);
-
-            o << "#ifndef " << tmp << "\n#include <";
-            if (bCaseSensitive)
-            {
-                o << tmpBuf.makeStringAndClear();
-            } else
-            {
-                o << tmpBuf.makeStringAndClear();
-            }
-
-            o << ">\n";
-            o << "#endif\n";
-
-            o << "namespace bonobobridge {\n\n";
-
-            std::list<OString> nestedTypes;
-
-            do
-            {
-                if ((realTypeName.lastIndexOf(']') < 0) &&
-                    (BT_INVALID == isBaseType(realTypeName)) &&
-                    !realTypeName.equals("Bonobo/NullInterface") &&
-                    !realTypeName.equals("com/sun/star/uno/XInterface") &&
-                    !realTypeName.equals("com/sun/star/uno/TypeClass") &&
-                    !realTypeName.equals("com/sun/star/uno/Type") &&
-                    !realTypeName.equals("com/sun/star/uno/Exception") &&
-                    !realTypeName.equals("com/sun/star/uno/RuntimeException") &&
-                    !realTypeName.equals("com/sun/star/uno/TypeClass"))
-                {
-                    o << "inline sal_Bool cpp_convert_b2u(";
-                    dumpUnoType(o, realTypeName, sal_False, sal_True);
-                    o << " u, ";
-                    dumpCorbaType(o, realTypeName, sal_True, sal_True);
-                    o << " b, const ::vos::ORef< ::bonobobridge::Bridge >& bridge);\n";
-                    o << "inline sal_Bool cpp_convert_u2b(";
-                    dumpCorbaType(o, realTypeName, sal_False, sal_True);
-                    o << " b, ";
-                    dumpUnoType(o, realTypeName, sal_True, sal_True);
-                    o << " u, const ::vos::ORef< ::bonobobridge::Bridge >& bridge);\n";
-                }
-
-                RegistryKey key = m_typeMgr.getTypeKey(realTypeName);
-                RegistryKeyNames nestedTypeNames;
-                key.getKeyNames(OUString(), nestedTypeNames);
-                for (sal_uInt32 i = 0; i < nestedTypeNames.getLength(); i++)
-                {
-                    OString nTypeName(OUStringToOString(nestedTypeNames.getElement(i), RTL_TEXTENCODING_UTF8));
-
-                    nTypeName = checkRealBaseType(nTypeName.copy(5));
-
-                    if (BT_INVALID == isBaseType(nTypeName))
-                    {
-                        allreadyDumped->insert(nTypeName);
-                        nestedTypes.push_back(nTypeName);
-                    }
-                }
-
-                if (nestedTypes.size() > 0)
-                {
-                    realTypeName = nestedTypes.front();
-                    nestedTypes.pop_front();
-                }
-                else
-                {
-                    realTypeName = "";
-                }
-            }
-            while (realTypeName.getLength() > 0);
-
-            o << "}; // namespace bonobobridge\n";
-        }
-    }
-}
-
-void CorbaType::dumpDepIncludes(FileStream& o, TypeSet* allreadyDumped, const OString& typeName, sal_Char* prefix)
-{
-    TypeUsingSet usingSet(m_dependencies.getDependencies(typeName));
-
-    TypeUsingSet::const_iterator iter = usingSet.begin();
-
-    OString     sPrefix(OString(prefix).toAsciiUpperCase());
-    sal_Bool    bSequenceDumped = sal_False;
-    sal_Bool    bInterfaceDumped = sal_False;
-    sal_uInt32  index = 0;
-    sal_uInt32  seqNum = 0;
-    OString     relType;
-    while (iter != usingSet.end())
-    {
-        index = (*iter).m_type.lastIndexOf(']');
-        seqNum = (index > 0 ? ((index+1) / 2) : 0);
-
-        relType = (*iter).m_type;
-        if (index > 0)
-            relType = relType.copy(index+1);
-
-        if (!isNestedTypeByName(relType))
-        {
-            OString defPrefix("HXX");
-            if (sPrefix.equals("HDL"))
-                defPrefix = "H";
-
-            if (seqNum > 0 && !bSequenceDumped)
-            {
-                bSequenceDumped = sal_True;
-            }
-
-            if (getUnoBaseType(relType).getLength() == 0 &&
-                m_typeName != relType)
-            {
-                if (m_typeMgr.getTypeClass(relType) == RT_TYPE_INTERFACE
-                    && sPrefix.equals("HDL"))
-                {
-                    if (!bInterfaceDumped)
-                    {
-                        bInterfaceDumped = sal_True;
-                    }
-
-                    if (!((*iter).m_use & TYPEUSE_SUPER))
-                    {
-                        o << "\n";
-                        dumpNameSpace(o, sal_True, sal_False, relType);
-                        o << "\nclass " << scopedName(m_typeName, relType, sal_True) << ";\n";
-                        dumpNameSpace(o, sal_False, sal_False, relType);
-                        o << "\n\n";
-                    } else
-                    {
-                        dumpInclude(o, allreadyDumped, relType, prefix);
-                    }
-                } else
-                {
-                    dumpInclude(o, allreadyDumped, relType, prefix);
-                }
-            }
-        }
-        ++iter;
-    }
-}
-
-void CorbaType::dumpNameSpace(FileStream& o, sal_Bool bOpen, sal_Bool bFull, const OString& type)
-{
-    OString typeName(type);
-    sal_Bool bOneLine = sal_True;
-    if (typeName.getLength() == 0)
-    {
-        typeName = m_typeName;
-        bOneLine = sal_False;
-    }
-
-    if (typeName == "/")
-        return;
-
-    if (typeName.indexOf( '/' ) == -1 && !bFull)
-        return;
-
-    if (!bFull)
-        typeName = typeName.copy( 0, typeName.lastIndexOf( '/' ) );
-
-    if (bOpen)
-    {
-        sal_Int32 nIndex = 0;
-        do
-        {
-            o << "namespace " << typeName.getToken(0, '/', nIndex);
-            if (bOneLine)
-                o << " { ";
-            else
-                 o << "\n{\n";
-        } while( nIndex != -1 );
-    } else
-    {
-        sal_Int32 nPos = 0;
-        do
-        {
-            nPos = typeName.lastIndexOf( '/' );
-            o << "}";
-            if( bOneLine )
-                o << " ";
-            else
-                o << " // " << typeName.copy( nPos+1 ) << "\n";
-            if( nPos != -1 )
-                typeName = typeName.copy( 0, nPos );
-        } while( nPos != -1 );
-    }
-}
-
-
-sal_uInt32 CorbaType::getMemberCount()
-{
-    sal_uInt32 count = m_reader.getMethodCount();
-
-    sal_uInt32 fieldCount = m_reader.getFieldCount();
-    RTFieldAccess access = RT_ACCESS_INVALID;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-            count++;
-    }
-    return count;
-}
-
-sal_uInt32 CorbaType::checkInheritedMemberCount(const TypeReader* pReader)
-{
-    sal_Bool bSelfCheck = sal_True;
-    if (!pReader)
-    {
-        bSelfCheck = sal_False;
-        pReader = &m_reader;
-    }
-
-    sal_uInt32 count = 0;
-    OString superType(pReader->getSuperTypeName());
-    if (superType.getLength() > 0)
-    {
-        TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
-        if ( aSuperReader.isValid() )
-        {
-            count = checkInheritedMemberCount(&aSuperReader);
-        }
-    }
-
-    if (bSelfCheck)
-    {
-        count += pReader->getMethodCount();
-        sal_uInt32 fieldCount = pReader->getFieldCount();
-        RTFieldAccess access = RT_ACCESS_INVALID;
-        for (sal_uInt16 i=0; i < fieldCount; i++)
-        {
-            access = pReader->getFieldAccess(i);
-
-            if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-                count++;
-        }
-    }
-
-    return count;
-}
-
-sal_uInt32 CorbaType::getInheritedMemberCount()
-{
-    if (m_inheritedMemberCount == 0)
-    {
-        m_inheritedMemberCount = checkInheritedMemberCount(0);
-    }
-
-    return m_inheritedMemberCount;
-}
-
-OString CorbaType::getTypeClass(const OString& type, sal_Bool bCStyle)
-{
-    OString     typeName = (type.getLength() > 0 ? type : m_typeName);
-    RTTypeClass rtTypeClass = RT_TYPE_INVALID;
-
-    if (type.getLength() > 0)
-    {
-        typeName = type;
-        rtTypeClass = m_typeMgr.getTypeClass(typeName);
-    } else
-    {
-        typeName = m_typeName;
-        rtTypeClass = m_reader.getTypeClass();
-    }
-
-    if (typeName.lastIndexOf(']') > 0)
-        return bCStyle ? "typelib_TypeClass_SEQUENCE" : "::com::sun::star::uno::TypeClass_SEQUENCE";
-
-    switch (rtTypeClass)
-    {
-        case RT_TYPE_INTERFACE:
-            return bCStyle ? "typelib_TypeClass_INTERFACE" : "::com::sun::star::uno::TypeClass_INTERFACE";
-            break;
-        case RT_TYPE_MODULE:
-            return bCStyle ? "typelib_TypeClass_MODULE" : "::com::sun::star::uno::TypeClass_MODULE";
-            break;
-        case RT_TYPE_STRUCT:
-            return bCStyle ? "typelib_TypeClass_STRUCT" : "::com::sun::star::uno::TypeClass_STRUCT";
-            break;
-        case RT_TYPE_ENUM:
-            return bCStyle ? "typelib_TypeClass_ENUM" : "::com::sun::star::uno::TypeClass_ENUM";
-            break;
-        case RT_TYPE_EXCEPTION:
-            return bCStyle ? "typelib_TypeClass_EXCEPTION" : "::com::sun::star::uno::TypeClass_EXCEPTION";
-            break;
-        case RT_TYPE_TYPEDEF:
-            {
-    OString realType = checkRealBaseType( typeName );
-    return getTypeClass( realType, bCStyle );
-            }
-//          return bCStyle ? "typelib_TypeClass_TYPEDEF" : "::com::sun::star::uno::TypeClass_TYPEDEF";
-            break;
-        case RT_TYPE_SERVICE:
-            return bCStyle ? "typelib_TypeClass_SERVICE" : "::com::sun::star::uno::TypeClass_SERVICE";
-            break;
-        case RT_TYPE_INVALID:
-            {
-                if (type.equals("long"))
-                    return bCStyle ? "typelib_TypeClass_LONG" : "::com::sun::star::uno::TypeClass_LONG";
-                if (type.equals("short"))
-                    return bCStyle ? "typelib_TypeClass_SHORT" : "::com::sun::star::uno::TypeClass_SHORT";
-                if (type.equals("hyper"))
-                    return bCStyle ? "typelib_TypeClass_HYPER" : "::com::sun::star::uno::TypeClass_HYPER";
-                if (type.equals("string"))
-                    return bCStyle ? "typelib_TypeClass_STRING" : "::com::sun::star::uno::TypeClass_STRING";
-                if (type.equals("boolean"))
-                    return bCStyle ? "typelib_TypeClass_BOOLEAN" : "::com::sun::star::uno::TypeClass_BOOLEAN";
-                if (type.equals("char"))
-                    return bCStyle ? "typelib_TypeClass_CHAR" : "::com::sun::star::uno::TypeClass_CHAR";
-                if (type.equals("byte"))
-                    return bCStyle ? "typelib_TypeClass_BYTE" : "::com::sun::star::uno::TypeClass_BYTE";
-                if (type.equals("any"))
-                    return bCStyle ? "typelib_TypeClass_ANY" : "::com::sun::star::uno::TypeClass_ANY";
-                if (type.equals("type"))
-                    return bCStyle ? "typelib_TypeClass_TYPE" : "::com::sun::star::uno::TypeClass_TYPE";
-                if (type.equals("float"))
-                    return bCStyle ? "typelib_TypeClass_FLOAT" : "::com::sun::star::uno::TypeClass_FLOAT";
-                if (type.equals("double"))
-                    return bCStyle ? "typelib_TypeClass_DOUBLE" : "::com::sun::star::uno::TypeClass_DOUBLE";
-                if (type.equals("void"))
-                    return bCStyle ? "typelib_TypeClass_VOID" : "::com::sun::star::uno::TypeClass_VOID";
-                if (type.equals("unsigned long"))
-                    return bCStyle ? "typelib_TypeClass_UNSIGNED_LONG" : "::com::sun::star::uno::TypeClass_UNSIGNED_LONG";
-                if (type.equals("unsigned short"))
-                    return bCStyle ? "typelib_TypeClass_UNSIGNED_SHORT" : "::com::sun::star::uno::TypeClass_UNSIGNED_SHORT";
-                if (type.equals("unsigned hyper"))
-                    return bCStyle ? "typelib_TypeClass_UNSIGNED_HYPER" : "::com::sun::star::uno::TypeClass_UNSIGNED_HYPER";
-            }
-            break;
-    }
-
-    return bCStyle ? "typelib_TypeClass_UNKNOWN" : "::com::sun::star::uno::TypeClass_UNKNOWN";
-}
-
-OString CorbaType::printUnoType(const OString& type, sal_Bool bConst, sal_Bool bRef, sal_Bool bNative)
-    throw( CannotDumpException )
-{
-    OStringBuffer ret(1024);
-    OString sType(checkRealBaseType(type, sal_True));
-    sal_uInt32 index = sType.lastIndexOf(']');
-    sal_uInt32 seqNum = (index > 0 ? ((index+1) / 2) : 0);
-
-    OString relType = (index > 0 ? (sType).copy(index+1) : type);
-
-    RTTypeClass typeClass = m_typeMgr.getTypeClass(relType);
-
-    if (bConst) ret.append("const ");
-
-    sal_uInt32 i;
-    for (i=0; i < seqNum; i++)
-    {
-        ret.append("::com::sun::star::uno::Sequence< ");
-    }
-
-    switch (typeClass)
-    {
-    case RT_TYPE_INTERFACE:
-        if (bNative)
-            ret.append(scopedName(m_typeName, relType));
-        else
-            ret.append("::com::sun::star::uno::Reference< ").append(scopedName(m_typeName, relType)).append(" >");
-        break;
-    case RT_TYPE_INVALID:
-    {
-        OString tmp(getUnoBaseType(relType));
-        if (tmp.getLength() > 0)
-        {
-            ret.append(getUnoBaseType(relType));
-        } else
-            throw CannotDumpException("Unknown type '" + relType + "', incomplete type library. ("+type+")");
-    }
-    break;
-    case RT_TYPE_STRUCT:
-    case RT_TYPE_ENUM:
-    case RT_TYPE_TYPEDEF:
-    case RT_TYPE_EXCEPTION:
-        ret.append(scopedName(m_typeName, relType));
-        break;
-    }
-
-    for (i=0; i < seqNum; i++)
-    {
-        ret.append(" >");
-    }
-
-    if (bRef) ret.append("&");
-    return ret.makeStringAndClear();
-}
-
-void CorbaType::dumpUnoType(FileStream& o, const OString& type,
-            sal_Bool bConst, sal_Bool bRef, sal_Bool bNative)
-    throw( CannotDumpException )
-{
-    OString ret = printUnoType(type, bConst, bRef, bNative);
-    o << ret;
-}
-
-OString CorbaType::printCorbaType(const OString& type, sal_Bool bConst, sal_Bool bRef)
-    throw( CannotDumpException )
-{
-    OStringBuffer ret(1024);
-
-    OString sType(type);
-
-    sal_uInt32 index = sType.lastIndexOf(']');
-    sal_uInt32 seqNum = (index > 0 ? ((index+1) / 2) : 0);
-
-    OString relType = (index > 0 ? (sType).copy(index+1) : type);
-
-    RTTypeClass typeClass = m_typeMgr.getTypeClass(relType);
-
-    if (relType.equals("com/sun/star/uno/XInterface"))
-        relType = "Bonobo/Unknown";
-
-    if (relType.equals("com/sun/star/uno/TypeClass"))
-        relType = "CORBA_TypeCode";
-
-    if (relType.equals("com/sun/star/uno/RuntimeException"))
-        relType = "CORBA_SystemException";
-
-    if (relType.equals("com/sun/star/uno/Exception"))
-        relType = "CORBA_any";
-
-    if (bConst) ret.append("const ");
-
-
-    sal_uInt32 i;
-    for (i=0; i < seqNum; i++)
-    {
-        ret.append("CORBA_sequence_");
-    }
-
-    switch (typeClass)
-    {
-    case RT_TYPE_INTERFACE:
-        ret.append(relType.replace('/', '_'));
-        break;
-    case RT_TYPE_INVALID:
-    {
-        OString tmp(getUnoBaseType(relType));
-        if (tmp.getLength() > 0)
-            ret.append(getCorbaBaseType(relType));
-        else
-            throw CannotDumpException("Unknown type '" + relType + "', incomplete type library. ("+type+")");
-    }
-    break;
-    case RT_TYPE_STRUCT:
-    case RT_TYPE_ENUM:
-    case RT_TYPE_TYPEDEF:
-    case RT_TYPE_EXCEPTION:
-        ret.append(relType.replace('/', '_'));
-        break;
-    }
-
-    if (bRef) ret.append("&");
-
-    return ret.makeStringAndClear();
-}
-
-sal_Bool CorbaType::isPassedAsPointer(const OString& type)
-{
-    sal_Bool ret = sal_False;
-
-    OString sType(checkSpecialCorbaType(type));
-
-    sal_Int32 index = sType.lastIndexOf(']');
-    sal_Int32 seqNum = (index > 0 ? ((index+1) / 2) : 0);
-
-    OString relType = (index > 0 ? (sType).copy(index+1) : type);
-
-    if (index > 0)
-    {
-        OString fakeTest;
-
-        sal_Int32 j = type.lastIndexOf('/');
-        if (j >= 0)
-            fakeTest = type.copy(0, j+1)+"_faked_array_"+type.copy(j+1);
-        else
-            fakeTest = "_faked_array_"+sType;
-
-        TypeReader fakeTestReader = m_typeMgr.getTypeReader(fakeTest);
-
-        if (fakeTestReader.isValid())
-            ret = sal_False;
-        else
-            ret = sal_True;
-    }
-    else
-    {
-        RTTypeClass typeClass = m_typeMgr.getTypeClass(sType);
-
-        switch (typeClass)
-        {
-        case RT_TYPE_STRUCT:
-        case RT_TYPE_EXCEPTION:
-            ret = sal_True;
-            break;
-
-        case RT_TYPE_INTERFACE:
-        case RT_TYPE_ENUM:
-        case RT_TYPE_INVALID:
-            if (sType.equals("any"))
-                ret = sal_True;
-            else
-                ret = sal_False;
-            break;
-        }
-    }
-
-    return ret;
-}
-
-sal_Bool CorbaType::isDerivedFromUnknown(const ::rtl::OString& typeName)
-{
-    sal_Bool ret = sal_True;
-    if (typeName.getLength() == 0)
-        ret = sal_False;
-    else if (typeName.equals("Bonobo/NullInterface"))
-        ret = sal_False;
-    else if (typeName.equals("com/sun/star/uno/XInterface"))
-        ret = sal_True;
-    else
-    {
-        TypeReader reader(m_typeMgr.getTypeReader(typeName));
-        if (reader.isValid())
-            ret = isDerivedFromUnknown(reader.getSuperTypeName());
-        else
-            ret = sal_False;
-    }
-    return ret;
-}
-
-
-sal_Bool CorbaType::isArray(const OString& type)
-{
-    sal_Bool ret = sal_False;
-
-    OString sType(checkSpecialCorbaType(type));
-
-    sal_Int32 index = sType.lastIndexOf(']');
-    sal_Int32 seqNum = (index > 0 ? ((index+1) / 2) : 0);
-
-    OString relType = (index > 0 ? (sType).copy(index+1) : type);
-
-    if (index > 0)
-    {
-        OString fakeTest;
-
-        sal_Int32 j = type.lastIndexOf('/');
-        if (j >= 0)
-            fakeTest = type.copy(0, j+1)+"_faked_array_"+type.copy(j+1);
-        else
-            fakeTest = "_faked_array_"+sType;
-
-        TypeReader fakeTestReader = m_typeMgr.getTypeReader(fakeTest);
-
-        if (fakeTestReader.isValid())
-            ret = sal_True;
-    }
-
-    return ret;
-}
-
-OString CorbaType::printCorbaParameter(const OString& type, sal_Bool bOut)
-    throw( CannotDumpException )
-{
-    OStringBuffer ret(1024);
-
-    OString sType(type);
-    sal_Int32 index = sType.lastIndexOf(']');
-    sal_Int32 seqNum = (index > 0 ? ((index+1) / 2) : 0);
-
-    OString relType = (index > 0 ? (sType).copy(index+1) : type);
-
-    RTTypeClass typeClass = m_typeMgr.getTypeClass(relType);
-
-    if (relType.equals("Bonobo/NullInterface"))
-        relType = "CORBA_Object";
-
-    if (relType.equals("com/sun/star/uno/XInterface"))
-        relType = "Bonobo/Unknown";
-
-    if (relType.equals("com/sun/star/uno/TypeClass"))
-        relType = "CORBA_TypeCode";
-
-    if (relType.equals("com/sun/star/uno/RuntimeException"))
-        relType = "CORBA_SystemException";
-
-    if (relType.equals("com/sun/star/uno/Exception"))
-        relType = "CORBA_any";
-
-    int i;
-    for (i=0; i < seqNum; i++)
-    {
-        ret.append("CORBA_sequence_");
-    }
-
-    switch (typeClass)
-    {
-    case RT_TYPE_INTERFACE:
-        ret.append(relType.replace('/', '_'));
-        break;
-    case RT_TYPE_INVALID:
-    {
-        OString tmp(getUnoBaseType(relType));
-        if (tmp.getLength() > 0)
-        {
-            ret.append(getCorbaBaseType(relType));
-        } else
-            throw CannotDumpException("Unknown type '" + relType + "', incomplete type library. ("+type+")");
-    }
-    break;
-    case RT_TYPE_STRUCT:
-    case RT_TYPE_EXCEPTION:
-    case RT_TYPE_ENUM:
-    case RT_TYPE_TYPEDEF:
-        ret.append(relType.replace('/', '_'));
-        break;
-    }
-
-    return ret.makeStringAndClear();
-}
-
-void CorbaType::dumpCorbaType(FileStream& o, const OString& type,
-            sal_Bool bConst, sal_Bool bRef)
-    throw( CannotDumpException )
-{
-    OString ret = printCorbaType(type, bConst, bRef);
-    o << ret;
-}
-
-OString CorbaType::getUnoBaseType(const OString& type)
-{
-    if (type.equals("long"))
-        return "sal_Int32";
-    if (type.equals("short"))
-        return "sal_Int16";
-    if (type.equals("hyper"))
-        return "sal_Int64";
-    if (type.equals("string"))
-        return "::rtl::OUString";
-    if (type.equals("boolean"))
-        return "sal_Bool";
-    if (type.equals("char"))
-        return "sal_Unicode";
-    if (type.equals("byte"))
-        return "sal_Int8";
-    if (type.equals("any"))
-        return "::com::sun::star::uno::Any";
-    if (type.equals("type"))
-        return "::com::sun::star::uno::Type";
-    if (type.equals("float"))
-        return "float";
-    if (type.equals("double"))
-        return "double";
-    if (type.equals("octet"))
-        return "sal_Int8";
-    if (type.equals("void"))
-        return type;
-    if (type.equals("unsigned long"))
-        return "sal_uInt32";
-    if (type.equals("unsigned short"))
-        return "sal_uInt16";
-    if (type.equals("unsigned hyper"))
-        return "sal_uInt64";
-
-    return OString();
-}
-
-OString CorbaType::getCorbaBaseType(const OString& type)
-{
-    if (type.equals("long"))
-        return "CORBA_long";
-    if (type.equals("short"))
-        return "CORBA_short";
-    if (type.equals("hyper"))
-        return "CORBA_long_long";
-    if (type.equals("string"))
-        return "CORBA_char*";
-    if (type.equals("boolean"))
-        return "CORBA_boolean";
-    if (type.equals("char"))
-        return "CORBA_char";
-    if (type.equals("byte"))
-        return "CORBA_octet";
-    if (type.equals("any"))
-        return "CORBA_any";
-    if (type.equals("type"))
-        return "CORBA_TypeCode";
-    if (type.equals("float"))
-        return "CORBA_float";
-    if (type.equals("double"))
-        return "CORBA_double";
-    if (type.equals("octet"))
-        return "CORBA_octet";
-    if (type.equals("void"))
-        return type;
-    if (type.equals("unsigned long"))
-        return "CORBA_unsigned_long";
-    if (type.equals("unsigned short"))
-        return "CORBA_unsigned_short";
-    if (type.equals("unsigned hyper"))
-        return "CORBA_unsigned_long_long";
-
-    return OString();
-}
-
-
-void CorbaType::dumpTypeInit(FileStream& o, const OString& typeName)
-{
-    OString type(checkSpecialCorbaType(typeName));
-
-    BASETYPE baseType = isBaseType(type);
-
-    switch (baseType)
-    {
-        case BT_BOOLEAN:
-            o << "(sal_False)";
-            return;
-            break;
-        case BT_ANY:
-        case BT_STRING:
-            o << "()";
-            return;
-            break;
-        case BT_INVALID:
-            break;
-        default:
-            o << "((";
-            dumpUnoType(o, type);
-            o << ")" << "0)";
-            return;
-    }
-
-    RTTypeClass typeClass = m_typeMgr.getTypeClass(type);
-
-    if (typeClass == RT_TYPE_ENUM)
-    {
-        RegistryTypeReaderLoader aReaderLoader;
-
-        if (aReaderLoader.isLoaded())
-        {
-            TypeReader reader(m_typeMgr.getTypeReader(type));
-
-            if ( reader.isValid() )
-            {
-                sal_Int32 nPos = type.lastIndexOf( '/' );
-                o << "(" << shortScopedName("", type, sal_False)
-                  << "::" << type.copy( nPos != -1 ? nPos+1 : 0 )
-                  << "_" << reader.getFieldName(0) << ")";
-                return;
-            }
-        }
-    }
-
-    o << "()";
-}
-
-BASETYPE CorbaType::isBaseType(const OString& type)
-{
-    if (type.equals("long"))
-        return BT_LONG;
-    if (type.equals("short"))
-        return BT_SHORT;
-    if (type.equals("hyper"))
-        return BT_HYPER;
-    if (type.equals("string"))
-        return BT_STRING;
-    if (type.equals("boolean"))
-        return BT_BOOLEAN;
-    if (type.equals("char"))
-        return BT_CHAR;
-    if (type.equals("byte"))
-        return BT_BYTE;
-    if (type.equals("any"))
-        return BT_ANY;
-    if (type.equals("float"))
-        return BT_FLOAT;
-    if (type.equals("double"))
-        return BT_DOUBLE;
-    if (type.equals("void"))
-        return BT_VOID;
-    if (type.equals("unsigned long"))
-        return BT_UNSIGNED_LONG;
-    if (type.equals("unsigned short"))
-        return BT_UNSIGNED_SHORT;
-    if (type.equals("unsigned hyper"))
-        return BT_UNSIGNED_HYPER;
-
-    return BT_INVALID;
-}
-
-OString CorbaType::typeToIdentifier(const OString& type)
-{
-    sal_uInt32 index = type.lastIndexOf(']');
-    sal_uInt32 seqNum = (index > 0 ? ((index+1) / 2) : 0);
-
-    OString relType = (index > 0 ? ((OString)type).copy(index+1) : type);
-    OString sIdentifier;
-
-    while( seqNum > 0 )
-    {
-        sIdentifier += OString("seq");
-
-        if ( --seqNum == 0 )
-        {
-            sIdentifier += OString("_");
-        }
-    }
-
-    if ( isBaseType(relType) )
-    {
-        sIdentifier += relType.replace(' ', '_');
-    } else
-    {
-        sIdentifier += relType.replace('/', '_');
-    }
-
-
-    return sIdentifier;
-}
-
-OString CorbaType::checkSpecialCorbaType(const OString& type)
-{
-    OString baseType(type);
-
-    RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader();
-
-    RegistryKey     key;
-    sal_uInt8*      pBuffer=NULL;
-    RTTypeClass     typeClass;
-    sal_Bool        isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
-    TypeReader      reader;
-
-    while (isTypeDef)
-    {
-        reader = m_typeMgr.getTypeReader(baseType);
-
-        if (reader.isValid())
-        {
-            typeClass = reader.getTypeClass();
-
-            if (typeClass == RT_TYPE_TYPEDEF)
-                baseType = reader.getSuperTypeName();
-            else
-                isTypeDef = sal_False;
-        } else
-            break;
-    }
-
-    return baseType;
-}
-
-OString CorbaType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly)
-{
-    sal_uInt32 index = type.lastIndexOf(']');
-    OString baseType = (index > 0 ? ((OString)type).copy(index+1) : type);
-    OString seqPrefix = (index > 0 ? ((OString)type).copy(0, index+1) : OString());
-
-    RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader();
-
-    RegistryKey     key;
-    sal_uInt8*      pBuffer=NULL;
-    RTTypeClass     typeClass;
-    sal_Bool        mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
-    TypeReader      reader;
-
-    while (mustBeChecked)
-    {
-        reader = m_typeMgr.getTypeReader(baseType);
-
-        if (reader.isValid())
-        {
-            typeClass = reader.getTypeClass();
-
-            if (typeClass == RT_TYPE_TYPEDEF)
-            {
-                baseType = reader.getSuperTypeName();
-                index = baseType.lastIndexOf(']');
-                  if (index > 0)
-                {
-                    seqPrefix += baseType.copy(0, index+1);
-                    baseType = baseType.copy(index+1);
-                }
-            } else
-                mustBeChecked = sal_False;
-        } else
-            break;
-    }
-
-    if ( bResolveTypeOnly )
-        baseType = seqPrefix + baseType;
-
-    return baseType;
-}
-
-
-void CorbaType::inc(sal_uInt32 num)
-{
-    m_indentLength += num;
-}
-
-void CorbaType::dec(sal_uInt32 num)
-{
-    if (m_indentLength - num < 0)
-        m_indentLength = 0;
-    else
-        m_indentLength -= num;
-}
-
-OString CorbaType::indent()
-{
-    OStringBuffer tmp(m_indentLength);
-
-    for (sal_uInt32 i=0; i < m_indentLength; i++)
-    {
-        tmp.append(' ');
-    }
-    return tmp.makeStringAndClear();
-}
-
-OString CorbaType::indent(sal_uInt32 num)
-{
-    OStringBuffer tmp(m_indentLength + num);
-
-    for (sal_uInt32 i=0; i < m_indentLength + num; i++)
-    {
-        tmp.append(' ');
-    }
-    return tmp.makeStringAndClear();
-}
-
-//*************************************************************************
-// InterfaceType
-//*************************************************************************
-InterfaceType::InterfaceType(TypeReader& typeReader,
-                                const OString& typeName,
-                                const TypeManager& typeMgr,
-                                const TypeDependency& typeDependencies,
-                                TypeSet* generatedConversions)
-    : CorbaType(typeReader, typeName, typeMgr, typeDependencies, generatedConversions)
-{
-    m_inheritedMemberCount = 0;
-    m_hasAttributes = sal_False;
-    m_hasMethods = sal_False;
-}
-
-InterfaceType::~InterfaceType()
-{
-
-}
-
-
-void InterfaceType::dumpUnoMethods(FileStream& o, sal_Bool bDeclOnly, sal_Bool bDelegateToSuper)
-{
-    OString superName(m_reader.getSuperTypeName());
-    if (bDeclOnly &&
-        !superName.equals("Bonobo/NullInterface") &&
-        !superName.equals("com/sun/star/uno/XInterface"))
-    {
-        TypeReader reader(m_typeMgr.getTypeReader(superName));
-        InterfaceType iType(reader, superName, m_typeMgr, TypeDependency(), m_generatedConversions);
-        iType.inc();
-        iType.dumpUnoMethods(o, bDeclOnly, sal_True);
-    }
-
-    sal_uInt32 methodCount = m_reader.getMethodCount();
-    sal_Bool first=sal_True;
-
-    OString methodName, returnType, paramType, paramName;
-    sal_uInt32 paramCount = 0;
-    sal_uInt32 excCount = 0;
-    RTMethodMode methodMode = RT_MODE_INVALID;
-    RTParamMode  paramMode = RT_PARAM_INVALID;
-
-    sal_Bool bRef = sal_False;
-    sal_Bool bConst = sal_False;
-    sal_Bool bWithRunTimeExcp = sal_True;
-
-    for (sal_uInt16 i=0; i < methodCount; i++)
-    {
-        methodName = m_reader.getMethodName(i);
-        returnType = m_reader.getMethodReturnType(i);
-        paramCount = m_reader.getMethodParamCount(i);
-        excCount = m_reader.getMethodExcCount(i);
-        methodMode = m_reader.getMethodMode(i);
-
-        if ( methodName.equals("acquire") || methodName.equals("release") )
-            bWithRunTimeExcp = sal_False;
-
-        if (first)
-        {
-            first = sal_False;
-            o << "\n" << indent() << "// Methods\n";
-        }
-
-        o << indent();
-        if (bDeclOnly)
-            o << "virtual ";
-        dumpUnoType(o, returnType);
-        o << " SAL_CALL ";
-        if (!bDeclOnly)
-        {
-            o << "bonobobridge::BonoboWrapper_";
-            dumpCorbaType(o, m_typeName, sal_False, sal_False);
-            o << "::";
-        }
-
-        o << methodName << "( ";
-
-        sal_uInt16 j;
-        for (j=0; j < paramCount; j++)
-        {
-            paramName = m_reader.getMethodParamName(i, j);
-            paramType = m_reader.getMethodParamType(i, j);
-            paramMode = m_reader.getMethodParamMode(i, j);
-
-            switch (paramMode)
-            {
-            case RT_PARAM_IN:
-            {
-                OString relType = checkSpecialCorbaType(paramType);
-                if (m_typeMgr.getTypeClass(relType) == RT_TYPE_ENUM ||
-                    (isBaseType(relType) && !relType.equals("string") && !relType.equals("any")))
-                {
-                    bConst = sal_False;
-                    bRef = sal_False;
-                } else
-                {
-                    bConst = sal_True;
-                    bRef = sal_True;
-                }
-                break;
-            }
-            case RT_PARAM_OUT:
-            case RT_PARAM_INOUT:
-                bConst = sal_False;
-                bRef = sal_True;
-                break;
-            }
-
-            dumpUnoType(o, paramType, bConst, bRef);
-            o << " " << paramName;
-
-            if (j+1 < paramCount) o << ", ";
-        }
-        o << "  )";
-
-        o << "   throw(";
-        OString excpName;
-        for (j=0; j < excCount; j++)
-        {
-            excpName = m_reader.getMethodExcType(i, j);
-            if (excpName != "com/sun/star/uno/RuntimeException")
-                o << scopedName(m_typeName, excpName);
-            if (bWithRunTimeExcp)
-                o << ", ";
-        }
-
-        if ( bWithRunTimeExcp )
-        {
-            o << "  ::com::sun::star::uno::RuntimeException";
-        }
-
-        if (bDeclOnly && bDelegateToSuper)
-        {
-            o << " ) {\n";
-            if (returnType.equals("void"))
-                o << indent() << "  ";
-            else
-                o << indent() << "  return ";
-            o << "BonoboWrapper_";
-            dumpCorbaType(o, m_typeName, sal_False, sal_False);
-            o << "::" << methodName << "( ";
-            for (j = 0; j < paramCount; j++)
-            {
-                paramName = m_reader.getMethodParamName(i, j);
-                o << paramName;
-                if (j < (paramCount-1))
-                    o << ", ";
-            }
-            o << " );\n"
-                    << indent() << "}\n";
-        }
-        else if (!bDeclOnly)
-        {
-            o << " ) {\n";
-
-            OStringBuffer preBuffer(1024);
-            OStringBuffer callBuffer(1024);
-            OStringBuffer postBuffer(1024);
-
-            callBuffer.append("    ");
-
-            if (!returnType.equals("void"))
-            {
-                preBuffer.append("    ");
-                preBuffer.append(printCorbaParameter(returnType));
-                if (isPassedAsPointer(returnType))
-                    preBuffer.append("*");
-                preBuffer.append(" _b_ret;\n");
-                preBuffer.append("    ");
-                preBuffer.append(printUnoType(returnType, sal_False, sal_False));
-                preBuffer.append(" _u_ret;\n");
-
-                callBuffer.append("_b_ret = ");
-            }
-
-            callBuffer.append(printCorbaType(m_typeName, sal_False, sal_False));
-            callBuffer.append("_");
-            if (methodName.indexOf("_reserved_identifier_") == 0)
-                callBuffer.append(methodName.copy(OString("_reserved_identifier_").getLength()));
-            else
-                callBuffer.append(methodName);
-
-            callBuffer.append("( m_corbaObject");
-
-            for (j=0; j < paramCount; j++)
-            {
-                paramName = m_reader.getMethodParamName(i, j);
-                paramType = m_reader.getMethodParamType(i, j);
-                paramMode = m_reader.getMethodParamMode(i, j);
-
-                preBuffer.append("    ");
-                preBuffer.append(printCorbaParameter(paramType));
-                if (isPassedAsPointer(paramType) && (paramMode == RT_PARAM_OUT))
-                {
-                    preBuffer.append("* _b_");
-                    preBuffer.append(paramName);
-                    preBuffer.append(";\n");
-                }
-                else
-                {
-                    preBuffer.append(" _b_");
-                    preBuffer.append(paramName);
-                    preBuffer.append(";\n");
-                }
-
-                switch (paramMode) {
-                case RT_PARAM_IN:
-
-                    if (isArray(paramType))
-                        preBuffer.append("    // fix me: conversion of array types!\n");
-                    else
-                    {
-                        preBuffer.append("    cpp_convert_u2b(");
-                        preBuffer.append("_b_");
-                        preBuffer.append(paramName);
-                        preBuffer.append(", ");
-                        preBuffer.append(paramName);
-                        preBuffer.append(", m_bridge);\n");
-                    }
-
-                    if (isPassedAsPointer(paramType))
-                        callBuffer.append(", &_b_");
-                    else
-                        callBuffer.append(", _b_");
-                    break;
-                case RT_PARAM_INOUT:
-
-                    if (isArray(paramType))
-                        preBuffer.append("    // fix me: conversion of array types!\n");
-                    else
-                    {
-                        preBuffer.append("    cpp_convert_u2b(");
-                        if (isPassedAsPointer(paramType))
-                            preBuffer.append("_b_");
-                        else
-                            preBuffer.append("_b_");
-                        preBuffer.append(paramName);
-                        preBuffer.append(", ");
-                        preBuffer.append(paramName);
-                        preBuffer.append(", m_bridge);\n");
-                    }
-
-                    callBuffer.append(", &_b_");
-
-                    if (isArray(paramType))
-                        postBuffer.append("    // fix me: conversion of array types!\n");
-                    else
-                    {
-                        postBuffer.append("    cpp_convert_b2u(");
-                        postBuffer.append(paramName);
-                        postBuffer.append(", _b_");
-                        postBuffer.append(paramName);
-                        postBuffer.append(", m_bridge);\n");
-                    }
-
-                    break;
-                case RT_PARAM_OUT:
-
-                    callBuffer.append(", &_b_");
-
-                    if (isArray(paramType))
-                        postBuffer.append("    // fix me: conversion of array types!\n");
-                    else
-                    {
-                        postBuffer.append("    cpp_convert_b2u(");
-                        postBuffer.append(paramName);
-                        if (isPassedAsPointer(paramType))
-                            postBuffer.append(", *_b_");
-                        else
-                            postBuffer.append(", _b_");
-                        postBuffer.append(paramName);
-                        postBuffer.append(", m_bridge);\n");
-                    }
-
-                    break;
-                }
-
-
-                callBuffer.append(paramName);
-            }
-
-            callBuffer.append(", &_ev );\n");
-
-            if (!returnType.equals("void"))
-            {
-                if (isArray(returnType))
-                {
-                    postBuffer.append("    // fix me: conversion of array types!\n");
-                }
-                else
-                {
-                    if (isPassedAsPointer(returnType))
-                        postBuffer.append("    cpp_convert_b2u(_u_ret, *_b_ret, m_bridge);\n");
-                    else
-                        postBuffer.append("    cpp_convert_b2u(_u_ret, _b_ret, m_bridge);\n");
-                }
-                postBuffer.append("    return _u_ret;\n");
-            }
-
-            o << "    ::osl::MutexGuard guard(m_bridge->getORBLock());\n"
-                    << "    CORBA_Environment _ev;\n"
-                    << "    CORBA_exception_init (&_ev);\n";
-
-            o << preBuffer;
-            o << callBuffer;
-
-            o << "    if (_ev._major != CORBA_NO_EXCEPTION) {\n"
-              << "        ::com::sun::star::uno::RuntimeException _ex(::rtl::OUString::createFromAscii(\"exception raised in bonobobridge\"), NULL);\n"
-              << "        CORBA_exception_free (&_ev);\n"
-              << "        throw _ex;\n"
-              << "    }\n"
-              << "    CORBA_exception_free (&_ev);\n";
-
-            o << postBuffer;
-
-            o << indent() << "}\n";
-        }
-        else
-            o << "  );\n";
-    }
-}
-
-void InterfaceType::dumpCorbaMethods(FileStream& o, sal_Bool bDeclOnly)
-{
-    OString superName(m_reader.getSuperTypeName());
-
-    sal_uInt32 methodCount = m_reader.getMethodCount();
-
-    OString methodName, returnType, paramType, paramName;
-    sal_uInt32 paramCount = 0;
-    sal_uInt32 excCount = 0;
-    RTMethodMode methodMode = RT_MODE_INVALID;
-    RTParamMode  paramMode = RT_PARAM_INVALID;
-
-    sal_Bool bRef = sal_False;
-    sal_Bool bConst = sal_False;
-    sal_Bool bWithRunTimeExcp = sal_True;
-
-    for (sal_uInt16 i=0; i < methodCount; i++)
-    {
-        methodName = m_reader.getMethodName(i);
-        returnType = m_reader.getMethodReturnType(i);
-        paramCount = m_reader.getMethodParamCount(i);
-        excCount = m_reader.getMethodExcCount(i);
-        methodMode = m_reader.getMethodMode(i);
-
-        o << indent()
-          << "extern \"C\" "
-          << printCorbaParameter(returnType);
-
-        if (isPassedAsPointer(returnType))
-            o << "*";
-
-        o << " bonobobridge_";
-        dumpCorbaType(o, m_typeName, sal_False, sal_False);
-        o << "_" << methodName << "( PortableServer_Servant _servant, ";
-
-        sal_uInt16 j;
-        for (j=0; j < paramCount; j++)
-        {
-            paramName = m_reader.getMethodParamName(i, j);
-            paramType = m_reader.getMethodParamType(i, j);
-            paramMode = m_reader.getMethodParamMode(i, j);
-
-            if ((isPassedAsPointer(paramType) || paramType.equals("string") || isArray(paramType)) &&
-                (paramMode == RT_PARAM_IN))
-                o << "const ";
-
-            o << printCorbaParameter(paramType);
-
-            if (isPassedAsPointer(paramType))
-            {
-                if (paramMode == RT_PARAM_OUT)
-                    o << "**";
-                else
-                    o << "*";
-            }
-            else
-            {
-                if (paramMode != RT_PARAM_IN)
-                    o << "*";
-            }
-
-
-            o << " " << paramName << ", ";
-        }
-
-        o << "CORBA_Environment * _ev)";
-
-        if (bDeclOnly)
-            o << ";\n";
-        else
-        {
-            o << " {\n";
-            OStringBuffer preBuffer(1024);
-            OStringBuffer callBuffer(1024);
-            OStringBuffer postBuffer(1024);
-
-            callBuffer.append("    ");
-
-            preBuffer.append("    ");
-            preBuffer.append(printUnoType(m_typeName, sal_False, sal_False));
-            preBuffer.append(" rThis((");
-            preBuffer.append(printUnoType(m_typeName, sal_False, sal_False, sal_True));
-            preBuffer.append(" *)((bonobobridge::UNO_POA_com_sun_star_uno_XInterface*)_servant)->pThis->getUnoObject());\n");
-
-            if (!returnType.equals("void"))
-            {
-                preBuffer.append("    ");
-                preBuffer.append(printCorbaParameter(returnType));
-                if (isPassedAsPointer(returnType))
-                {
-                    preBuffer.append("* _b_ret = ");
-                    preBuffer.append(printCorbaType(returnType, sal_False, sal_False));
-                    preBuffer.append("__alloc();\n");
-
-                }
-                else
-                {
-                    preBuffer.append(" _b_ret;\n");
-                }
-                preBuffer.append("    ");
-                preBuffer.append(printUnoType(returnType, sal_False, sal_False));
-                preBuffer.append(" _u_ret;\n");
-
-                callBuffer.append("_u_ret = ");
-            }
-
-            callBuffer.append("rThis->");
-            callBuffer.append(methodName);
-            callBuffer.append("( ");
-
-            for (j=0; j < paramCount; j++)
-            {
-                paramName = m_reader.getMethodParamName(i, j);
-                paramType = m_reader.getMethodParamType(i, j);
-                paramMode = m_reader.getMethodParamMode(i, j);
-
-                preBuffer.append("    ");
-                preBuffer.append(printUnoType(paramType, sal_False, sal_False));
-                preBuffer.append(" _u_");
-                preBuffer.append(paramName);
-                preBuffer.append(";\n");
-
-                callBuffer.append("_u_");
-                callBuffer.append(paramName);
-
-                if (j < (paramCount-1))
-                    callBuffer.append(", ");
-
-                switch (paramMode) {
-                case RT_PARAM_IN:
-
-                    if (isArray(paramType))
-                        preBuffer.append("    // fix me: conversion of array types!\n");
-                    else
-                    {
-                        preBuffer.append("    cpp_convert_b2u(");
-                        preBuffer.append("_u_");
-                        preBuffer.append(paramName);
-                        preBuffer.append(", ");
-                        if (isPassedAsPointer(paramType))
-                            preBuffer.append("*");
-                        preBuffer.append(paramName);
-                        preBuffer.append(", ((bonobobridge::UNO_POA_com_sun_star_uno_XInterface*)_servant)->pThis->getBridge());\n");
-                    }
-                    break;
-                case RT_PARAM_INOUT:
-
-                    if (isArray(paramType))
-                    {
-                        preBuffer.append("    // fix me: conversion of array types!\n");
-                        postBuffer.append("    // fix me: conversion of array types!\n");
-                    }
-                    else
-                    {
-                        preBuffer.append("    cpp_convert_b2u(");
-                        preBuffer.append("_u_");
-                        preBuffer.append(paramName);
-                        preBuffer.append(", ");
-                        if (isPassedAsPointer(paramType))
-                            preBuffer.append("*");
-                        preBuffer.append(paramName);
-                        preBuffer.append(", ((bonobobridge::UNO_POA_com_sun_star_uno_XInterface*)_servant)->pThis->getBridge());\n");
-
-                        postBuffer.append("    cpp_convert_u2b(");
-                        if (isPassedAsPointer(paramType))
-                            postBuffer.append("*");
-                        postBuffer.append(paramName);
-                        postBuffer.append(", _u_");
-                        postBuffer.append(paramName);
-                        postBuffer.append(", ((bonobobridge::UNO_POA_com_sun_star_uno_XInterface*)_servant)->pThis->getBridge());\n");
-                    }
-                    break;
-                case RT_PARAM_OUT:
-
-                    if (isArray(paramType))
-                        preBuffer.append("    // fix me: conversion of array types!\n");
-                    else
-                    {
-                        postBuffer.append("    cpp_convert_u2b(");
-                        if (isPassedAsPointer(paramType))
-                            postBuffer.append("**");
-                        else
-                            postBuffer.append("*");
-                        postBuffer.append(paramName);
-                        postBuffer.append(", _u_");
-                        postBuffer.append(paramName);
-                        postBuffer.append(", ((bonobobridge::UNO_POA_com_sun_star_uno_XInterface*)_servant)->pThis->getBridge());\n");
-                    }
-                    break;
-                }
-            }
-
-            callBuffer.append(" );\n");
-
-            if (!returnType.equals("void"))
-            {
-                if (isArray(returnType))
-                    postBuffer.append("    // fix me: conversion of array types!\n");
-                else
-                {
-                    if (isPassedAsPointer(returnType))
-                        postBuffer.append("    cpp_convert_u2b(*_b_ret, _u_ret, ((bonobobridge::UNO_POA_com_sun_star_uno_XInterface*)_servant)->pThis->getBridge());\n");
-                    else
-                        postBuffer.append("    cpp_convert_u2b(_b_ret, _u_ret, ((bonobobridge::UNO_POA_com_sun_star_uno_XInterface*)_servant)->pThis->getBridge());\n");
-                }
-
-                postBuffer.append("    return _b_ret;\n");
-            }
-
-            o << preBuffer;
-            o << callBuffer;
-            o << postBuffer;
-
-            o << "}\n";
-        }
-    }
-}
-
-void InterfaceType::dumpFunctions(FileStream& o)
-{
-    if (m_typeName.equals("com/sun/star/uno/XInterface") ||
-        m_typeName.equals("Bonobo/NullInterface"))
-        return;
-
-    m_generatedConversions->insert(m_typeName);
-
-    o << "namespace bonobobridge {\n\n";
-
-    /* bonobo implementation class */
-    o << "class BonoboWrapper_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-
-    OString superName(m_reader.getSuperTypeName());
-    o << " : public BonoboWrapper< BonoboWrapper_";
-    dumpCorbaType(o, superName, sal_False, sal_False);
-    o << ", ";
-    dumpUnoType(o, m_typeName, sal_False, sal_False, sal_True);
-    o << " > {\n";
-
-    o << "public:   \n"
-      << "    BonoboWrapper_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "(";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << " corbaObject,"
-      << "const vos::ORef<bonobobridge::Bridge>& bridge)\n";
-
-    o << "      : BonoboWrapper< "
-      << "BonoboWrapper_";
-    dumpCorbaType(o, superName, sal_False, sal_False);
-    o << ", ";
-    dumpUnoType(o, m_typeName, sal_False, sal_False, sal_True);
-    o << " >(corbaObject, bridge) {\n";
-
-    if (isDerivedFromUnknown(m_typeName))
-    {
-        o << "      m_bridge->registerObjectWrapper(::getCppuType((";
-        dumpUnoType(o, m_typeName, sal_False, sal_False);
-        o << "*)NULL), m_corbaObject, (";
-        dumpUnoType(o, m_typeName, sal_False, sal_False, sal_True);
-        o << "*)this);\n";
-    }
-
-    o << "    }\n";
-
-    o << "    virtual ~BonoboWrapper_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "() {\n";
-    if (isDerivedFromUnknown(m_typeName))
-    {
-        o << "      m_bridge->unregisterObjectWrapper(::getCppuType((";
-        dumpUnoType(o, m_typeName, sal_False, sal_False);
-        o << "*)NULL), m_corbaObject, (";
-        dumpUnoType(o, m_typeName, sal_False, sal_False, sal_True);
-        o << "*)this);\n";
-    }
-    o   << "    }\n";
-    inc();
-    dumpUnoMethods(o, sal_True, sal_False);
-    dec();
-
-    o  << "};\n\n";
-
-    o << "}; // namespace bonobobridge\n";
-
-    dumpUnoMethods(o, sal_False, sal_False);
-
-    /* convert function bonobo to uno */
-    o << "static sal_Bool convert_b2u_" << m_typeName.replace('/', '_')
-      << "(void* pOut, const void* pIn, const ::com::sun::star::uno::Type& type, const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  sal_Bool ret = sal_True;\n  ";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "& _u = *(";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "*) pOut;\n  const ";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "& _b = *(const ";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "*) pIn;\n\n"
-      << "  _u = new bonobobridge::BonoboWrapper_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "(_b, bridge);\n"
-      << "  return ret;\n";
-
-    o   << "}\n\n";
-
-    /* POA implementation class */
-    dumpCorbaMethods(o, sal_True);
-    o << "static POA_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "__epv bonobobridge_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "_epv = {\n";
-    sal_uInt32      methodCount = m_reader.getMethodCount();
-    OString         methodName;
-
-    o << "    NULL,\n";
-
-    for (sal_uInt16 i=0; i < methodCount; i++)
-    {
-        methodName = m_reader.getMethodName(i);
-        o << "    bonobobridge_";
-        dumpCorbaType(o, m_typeName, sal_False, sal_False);
-        o << "_" << methodName;
-
-        if (i < (methodCount-1))
-            o << ",\n";
-        else
-            o << "\n};\n";
-    }
-
-    OStringBuffer initBuffer(1024);
-
-    initBuffer.insert(0, OString("&bonobobridge_") + printCorbaType(m_typeName, sal_False, sal_False) + OString("_epv"));
-
-    while(superName.getLength() != 0)
-    {
-        if (superName.equals("Bonobo/NullInterface"))
-        {
-            superName = "";
-        }
-        else
-        {
-            if (superName.equals("com/sun/star/uno/XInterface"))
-            {
-                initBuffer.insert(0, OString("&bonobobridge_com_sun_star_uno_XInterface_epv, "));
-            }
-            else
-            {
-                initBuffer.insert(0, OString("&bonobobridge_") + printCorbaType(superName, sal_False, sal_False) + OString("_epv, "));
-            }
-            TypeReader reader(m_typeMgr.getTypeReader(superName));
-            superName = reader.getSuperTypeName();
-        }
-    }
-
-    initBuffer.insert(0, OString("NULL, "));
-
-    o << "static POA_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "__vepv bonobobridge_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "__vepv = {";
-    o << initBuffer.makeStringAndClear();
-    o << " };\n";
-
-    superName = m_reader.getSuperTypeName();
-
-    o << "namespace bonobobridge {\n\n";
-
-    o << "class UnoServant_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << " : public UnoServant_com_sun_star_uno_XInterface {\n";
-
-    o << "public:\n"
-            << " UnoServant_";
-
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "(";
-    dumpUnoType(o, m_typeName, sal_False, sal_False, sal_True);
-    o << "* unoObject,"
-      << " const ::vos::ORef<bonobobridge::Bridge>& bridge,"
-      << " CORBA_Environment *ev,"
-      << " sal_Bool bInitPoa)\n"
-      << "    : UnoServant_com_sun_star_uno_XInterface(unoObject, bridge, ev, sal_False) {\n"
-      << "    if (bInitPoa) {\n"
-      << "        memset(&m_POAUnknown, 0, sizeof(m_POAUnknown));\n"
-      << "        POA_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "__init((PortableServer_Servant) &(m_POAUnknown.poa), ev);\n"
-      << "        m_POAUnknown.pThis = (UnoServant_com_sun_star_uno_XInterface*)this;\n"
-      << "        m_POAUnknown.poa.vepv = (POA_Bonobo_Unknown__vepv*)&bonobobridge_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "__vepv;\n"
-      << "    }\n"
-      << "  }\n"
-      << "};\n"
-      << "}; // namespace bonobobridge\n";
-
-    dumpCorbaMethods(o, sal_False);
-
-    /* convert function uno to bonobo */
-    o << "static sal_Bool convert_u2b_" << m_typeName.replace('/', '_')
-            << "(void* pOut, const void* pIn,   const ::com::sun::star::uno::Type& type,    const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n";
-    o   << "  sal_Bool ret = sal_True;\n  const ";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "& _u = *(const ";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "*) pIn;\n  ";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "& _b = *(";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "*) pOut;\n\n"
-      << "  if (_u.is()) {\n"
-      << "    bonobobridge::UnoServant_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << " *uno_servant;\n"
-      << "    POA_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << " *poa;\n"
-      << "          CORBA_Environment ev;\n"
-      << "    CORBA_exception_init (&ev);\n"
-      << "          uno_servant = new bonobobridge::UnoServant_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "(_u.get(), bridge, &ev, sal_True);\n"
-      << "    poa = (POA_";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "*)uno_servant->getPOA();\n"
-      << "    if (ev._major != CORBA_NO_EXCEPTION) {\n"
-      << "      delete uno_servant;\n"
-      << "          CORBA_exception_free (&ev);\n"
-      << "          _b = CORBA_OBJECT_NIL;\n"
-      << "          ret = sal_False;\n"
-      << "    }\n"
-      << "  else {\n"
-      << "      CORBA_free(PortableServer_POA_activate_object(bridge->getPOA(), poa, &ev));\n"
-      << "          _b = PortableServer_POA_servant_to_reference (bridge->getPOA(), poa, &ev);\n"
-      << "          uno_servant->corbaObjectRegistered(_b, getCppuType((";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "*)NULL)";
-
-    if (!isDerivedFromUnknown(m_typeName))
-        o << ", sal_False";
-
-    o << ");\n"
-      << "    }\n"
-      << "  CORBA_exception_free (&ev);\n"
-      << "  }\n"
-      << "  return ret;\n"
-      << "}\n\n";
-
-    o << "inline sal_Bool bonobobridge::cpp_convert_b2u(";
-    dumpUnoType(o, m_typeName, sal_False, sal_True);
-    o << " u, ";
-    dumpCorbaType(o, m_typeName, sal_True, sal_True);
-    o << " b, const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  return bridge->convertB2U(&u, &b, ::getCppuType(&u));\n"
-      << "};\n\n";
-
-    o << "inline sal_Bool bonobobridge::cpp_convert_u2b(";
-    dumpCorbaType(o, m_typeName, sal_False, sal_True);
-    o << " b, ";
-    dumpUnoType(o, m_typeName, sal_True, sal_True);
-    o << " u, const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  return bridge->convertU2B(&b, &u, ::getCppuType(&u));\n"
-      << "};\n\n";
-
-    return;
-}
-
-
-
-
-sal_uInt32 InterfaceType::getMemberCount()
-{
-    sal_uInt32 count = m_reader.getMethodCount();
-
-    if (count)
-        m_hasMethods = sal_True;
-
-    sal_uInt32 fieldCount = m_reader.getFieldCount();
-    RTFieldAccess access = RT_ACCESS_INVALID;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-        {
-            m_hasAttributes = sal_True;
-            count++;
-        }
-    }
-    return count;
-}
-
-sal_uInt32 InterfaceType::checkInheritedMemberCount(const TypeReader* pReader)
-{
-    sal_uInt32 cout = 0;
-    sal_Bool bSelfCheck = sal_True;
-    if (!pReader)
-    {
-        bSelfCheck = sal_False;
-        pReader = &m_reader;
-    }
-
-    sal_uInt32 count = 0;
-    OString superType(pReader->getSuperTypeName());
-    if (superType.getLength() > 0)
-    {
-        TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
-        if (aSuperReader.isValid())
-        {
-            count = checkInheritedMemberCount(&aSuperReader);
-        }
-    }
-
-    if (bSelfCheck)
-    {
-        count += pReader->getMethodCount();
-        sal_uInt32 fieldCount = pReader->getFieldCount();
-        RTFieldAccess access = RT_ACCESS_INVALID;
-        for (sal_uInt16 i=0; i < fieldCount; i++)
-        {
-            access = pReader->getFieldAccess(i);
-
-            if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-                count++;
-        }
-    }
-
-    return count;
-}
-
-sal_uInt32 InterfaceType::getInheritedMemberCount()
-{
-    if (m_inheritedMemberCount == 0)
-    {
-        m_inheritedMemberCount = checkInheritedMemberCount(0);
-    }
-
-    return m_inheritedMemberCount;
-}
-
-
-
-
-//*************************************************************************
-// ModuleType
-//*************************************************************************
-ModuleType::ModuleType(TypeReader& typeReader,
-                                const OString& typeName,
-                                const TypeManager& typeMgr,
-                                const TypeDependency& typeDependencies,
-                                TypeSet* generatedConversions)
-    : CorbaType(typeReader, typeName, typeMgr, typeDependencies, generatedConversions)
-{
-}
-
-ModuleType::~ModuleType()
-{
-
-}
-
-
-sal_Bool ModuleType::hasConstants()
-{
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access == RT_ACCESS_CONST)
-            return sal_True;
-    }
-
-    return sal_False;
-}
-
-void ModuleType::dumpFunctions(FileStream& o)
-{
-};
-
-sal_Bool ModuleType::dumpConversionFunctions(FileStream& o, TypeSet* allreadyDumped)
-    throw( CannotDumpException )
-{
-    sal_Bool bSpecialDefine = sal_True;
-
-    if (m_reader.getTypeClass() == RT_TYPE_CONSTANTS)
-    {
-        bSpecialDefine = sal_False;
-    }
-
-    dumpInclude(o, allreadyDumped, m_typeName, "hpp", bSpecialDefine);
-
-    return sal_True;
-}
-
-//*************************************************************************
-// ConstantsType
-//*************************************************************************
-ConstantsType::ConstantsType(TypeReader& typeReader,
-                                const OString& typeName,
-                                const TypeManager& typeMgr,
-                                const TypeDependency& typeDependencies,
-                                TypeSet* generatedConversions)
-    : ModuleType(typeReader, typeName, typeMgr, typeDependencies, generatedConversions)
-{
-}
-
-ConstantsType::~ConstantsType()
-{
-
-}
-
-void ConstantsType::dumpFunctions(FileStream& o)
-{
-};
-
-//*************************************************************************
-// StructureType
-//*************************************************************************
-StructureType::StructureType(TypeReader& typeReader,
-                                const OString& typeName,
-                                const TypeManager& typeMgr,
-                                const TypeDependency& typeDependencies,
-                                TypeSet* generatedConversions)
-    : CorbaType(typeReader, typeName, typeMgr, typeDependencies, generatedConversions)
-{
-}
-
-StructureType::~StructureType()
-{
-
-}
-
-void StructureType::dumpFunctions(FileStream& o)
-{
-    m_generatedConversions->insert(m_typeName);
-
-    OString superType(m_reader.getSuperTypeName());
-
-    o << "static sal_Bool convert_b2u_" << m_typeName.replace('/', '_')
-      << "(void* pOut, const void* pIn, const ::com::sun::star::uno::Type& type, const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  sal_Bool ret = sal_True;\n  ";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "& _u = *(";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "*) pOut;\n  const ";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "& _b = *(const ";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "*) pIn;\n\n";
-
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    OString         fieldName;
-    OString         fieldType;
-    sal_uInt16      i=0;
-    sal_Int32       cIndex;
-    OString         corbaFieldName;
-
-    sal_Bool bIsUnion = sal_False;
-
-    for (i=0; !bIsUnion && (i < fieldCount); i++)
-        bIsUnion = OString("_union_fake_tag").equals(m_reader.getFieldName(i));
-
-    if (bIsUnion)
-    {
-        o << "  // fix me: union !!!!\n  ret = sal_False;\n";
-    }
-    else
-    {
-        if (superType.getLength() > 0)
-        {
-            o << "  ret = bonobobridge::cpp_convert_b2u((";
-            dumpUnoType(o, superType, sal_False, sal_False);
-            o << "&) _u, (const ";
-            dumpCorbaType(o, superType, sal_False, sal_False);
-            o << "&) _b, bridge);\n";
-        }
-
-        for (i=0; i < fieldCount; i++)
-        {
-            fieldName = m_reader.getFieldName(i);
-            fieldType = m_reader.getFieldType(i);
-            cIndex = fieldName.indexOf("_reserved_identifier_");
-
-            if (cIndex == 0)
-                corbaFieldName = fieldName.copy(OString("_reserved_identifier_").getLength());
-            else
-                corbaFieldName = fieldName;
-
-            if (isArray(fieldType))
-                o << "  // fix me: no conversion of array types!\n";
-            else
-                o << "  if (ret)\n"
-                  << "    ret = bonobobridge::cpp_convert_b2u("
-                  << "_u." << fieldName.getStr()
-                  << "  , _b." << corbaFieldName.getStr()
-                  << ", bridge);\n";
-        }
-    }
-    o << "  return ret;\n"
-      << "}\n\n"
-      << "static sal_Bool convert_u2b_" << m_typeName.replace('/', '_')
-      << "(void* pOut, const void* pIn, const ::com::sun::star::uno::Type& type, const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  sal_Bool ret = sal_True;\n  const ";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "& _u = *(const ";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "*) pIn;\n  ";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "& _b = *(";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "*) pOut;\n\n";
-
-    if (bIsUnion)
-        o << "  // fix me: union !!!!\n  ret = sal_False;\n";
-    else
-    {
-        if (superType.getLength() > 0)
-        {
-            o << "  ret = bonobobridge::cpp_convert_u2b((";
-            dumpCorbaType(o, superType, sal_False, sal_False);
-            o << "&) _u, (const ";
-            dumpUnoType(o, superType, sal_False, sal_False);
-            o << "&) _b, bridge);\n";
-        }
-
-        for (i=0; i < fieldCount; i++)
-        {
-            fieldName = m_reader.getFieldName(i);
-            fieldType = m_reader.getFieldType(i);
-
-            cIndex = fieldName.indexOf("_reserved_identifier_");
-
-            if (cIndex == 0)
-                corbaFieldName = fieldName.copy(OString("_reserved_identifier_").getLength());
-            else
-                corbaFieldName = fieldName;
-
-            if (isArray(fieldType))
-                o << "  // fix me: no conversion of array types!\n";
-            else
-                o << "  if (ret)\n"
-                  << "    ret = bonobobridge::cpp_convert_u2b("
-                  << "_b." << corbaFieldName.getStr()
-                  << ", _u." << fieldName.getStr()
-                  << ", bridge);\n";
-        }
-    }
-
-    o   << "  return ret;\n"
-        << "}\n\n";
-
-    o << "inline sal_Bool bonobobridge::cpp_convert_b2u(";
-    dumpUnoType(o, m_typeName, sal_False, sal_True);
-    o << " u    , ";
-    dumpCorbaType(o, m_typeName, sal_True, sal_True);
-    o << " b,   const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  return convert_b2u_" << m_typeName.replace('/', '_')
-      << "(&u, &b, ::getCppuType(&u), bridge);\n"
-      << "};\n\n";
-
-    o << "inline sal_Bool bonobobridge::cpp_convert_u2b(";
-    dumpCorbaType(o, m_typeName, sal_False, sal_True);
-    o << " b, ";
-    dumpUnoType(o, m_typeName, sal_True, sal_True);
-    o << " u,   const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  return convert_u2b_" << m_typeName.replace('/', '_')
-      << "(&b, &u, ::getCppuType(&u), bridge);\n"
-      << "};\n\n";
-}
-
-sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType, sal_Bool bWithType)
-{
-    sal_Bool hasMember = sal_False;
-
-    if (superType.getLength() > 0)
-    {
-        TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
-
-        if (aSuperReader.isValid())
-        {
-            hasMember = dumpSuperMember(o, aSuperReader.getSuperTypeName(), bWithType);
-
-            sal_uInt32      fieldCount = aSuperReader.getFieldCount();
-            RTFieldAccess   access = RT_ACCESS_INVALID;
-            OString         fieldName;
-            OString         fieldType;
-            for (sal_uInt16 i=0; i < fieldCount; i++)
-            {
-                access = aSuperReader.getFieldAccess(i);
-
-                if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-                    continue;
-
-                fieldName = aSuperReader.getFieldName(i);
-                fieldType = aSuperReader.getFieldType(i);
-
-                if (hasMember)
-                {
-                    o << ", ";
-                } else
-                {
-                    hasMember = (fieldCount > 0);
-                }
-
-                if (bWithType)
-                {
-                    dumpUnoType(o, fieldType, sal_True, sal_True);
-                    o << " ";
-                }
-                o << "__" << fieldName;
-            }
-        }
-    }
-
-    return hasMember;
-}
-
-//*************************************************************************
-// ExceptionType
-//*************************************************************************
-ExceptionType::ExceptionType(TypeReader& typeReader,
-                                const OString& typeName,
-                                const TypeManager& typeMgr,
-                                const TypeDependency& typeDependencies,
-                                TypeSet* generatedConversions)
-    : CorbaType(typeReader, typeName, typeMgr, typeDependencies, generatedConversions)
-{
-}
-
-ExceptionType::~ExceptionType()
-{
-
-}
-
-void ExceptionType::dumpFunctions(FileStream& o)
-{
-    if (m_typeName.equals("com/sun/star/uno/Exception"))
-        return;
-
-    if (m_typeName.equals("com/sun/star/uno/RuntimeException"))
-        return;
-
-    m_generatedConversions->insert(m_typeName);
-
-    OString superType(m_reader.getSuperTypeName());
-
-    o << "static sal_Bool convert_b2u_" << m_typeName.replace('/', '_')
-      << "(void* pOut, const void* pIn, const ::com::sun::star::uno::Type& type, const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  sal_Bool ret = sal_True;\n";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "& _u = *(";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "*) pOut;\n  const ";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "& _b = *(const ";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "*) pIn;\n\n";
-
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    OString         fieldName;
-    OString         fieldType;
-    sal_uInt16      i=0;
-    sal_Int32    cIndex;
-    OString      corbaFieldName;
-
-    if (superType.getLength() > 0)
-    {
-        o << "  ret = bonobobridge::cpp_convert_b2u((";
-        dumpUnoType(o, superType, sal_False, sal_False);
-        o << "&) _u, (const ";
-        dumpCorbaType(o, superType, sal_False, sal_False);
-        o << "&) _b, bridge);\n";
-    }
-
-    for (i=0; i < fieldCount; i++)
-    {
-        fieldName = m_reader.getFieldName(i);
-        fieldType = m_reader.getFieldType(i);
-        cIndex = fieldName.indexOf("_reserved_identifier_");
-
-        if (cIndex == 0)
-            corbaFieldName = fieldName.copy(OString("_reserved_identifier_").getLength());
-        else
-            corbaFieldName = fieldName;
-
-        if (isArray(fieldType))
-            o << "  // fix me: no conversion of array types!\n";
-        else
-            o << "  if (ret)\n"
-              << "    ret = bonobobridge::cpp_convert_b2u("
-              << "_u." << fieldName.getStr()
-              << ", _b." << corbaFieldName.getStr()
-              << ", bridge);\n";
-    }
-    o << "  return ret;\n"
-      << "}\n\n";
-
-
-    o << "static sal_Bool convert_u2b_" << m_typeName.replace('/', '_')
-      << "(void* pOut, const void* pIn, const ::com::sun::star::uno::Type& type, const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  sal_Bool ret = sal_True;\n  const ";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "& _u = *(const ";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "*) pIn;\n  ";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "& _b = *(";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "*) pOut;\n\n";
-
-    if (superType.getLength() > 0)
-    {
-        o << "  ret = bonobobridge::cpp_convert_u2b((";
-        dumpCorbaType(o, superType, sal_False, sal_False);
-        o << "&) _u, (const ";
-        dumpUnoType(o, superType, sal_False, sal_False);
-        o << "&) _b, bridge);\n";
-    }
-
-    for (i=0; i < fieldCount; i++)
-    {
-        fieldName = m_reader.getFieldName(i);
-        fieldType = m_reader.getFieldType(i);
-
-        cIndex = fieldName.indexOf("_reserved_identifier_");
-
-        if (cIndex == 0)
-            corbaFieldName = fieldName.copy(OString("_reserved_identifier_").getLength());
-        else
-            corbaFieldName = fieldName;
-
-        if (isArray(fieldType))
-            o << "  // fix me: no conversion of array types!\n";
-        else
-            o << "  if (ret)\n"
-              << "    ret = bonobobridge::cpp_convert_u2b("
-              << "_b." << corbaFieldName.getStr()
-              << ", _u." << fieldName.getStr()
-              << ", bridge);\n";
-    }
-
-    o   << "  return ret;\n"
-        << "}\n\n";
-
-    o << "inline sal_Bool bonobobridge::cpp_convert_b2u(";
-    dumpUnoType(o, m_typeName, sal_False, sal_True);
-    o << " u    , ";
-    dumpCorbaType(o, m_typeName, sal_True, sal_True);
-    o << " b,   const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  return convert_b2u_" << m_typeName.replace('/', '_')
-      << "(&u, &b, ::getCppuType(&u), bridge);\n"
-      << "};\n\n";
-
-    o << "inline sal_Bool bonobobridge::cpp_convert_u2b(";
-    dumpCorbaType(o, m_typeName, sal_False, sal_True);
-    o << " b, ";
-    dumpUnoType(o, m_typeName, sal_True, sal_True);
-    o << " u,   const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  return convert_u2b_" << m_typeName.replace('/', '_')
-      << "(&b, &u, ::getCppuType(&u), bridge);\n"
-      << "};\n\n";
-}
-
-
-
-sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType, sal_Bool bWithType)
-{
-    sal_Bool hasMember = sal_False;
-
-    if (superType.getLength() > 0)
-    {
-        TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
-
-        if (aSuperReader.isValid())
-        {
-            hasMember = dumpSuperMember(o, aSuperReader.getSuperTypeName(), bWithType);
-
-            sal_uInt32      fieldCount = aSuperReader.getFieldCount();
-            RTFieldAccess   access = RT_ACCESS_INVALID;
-            OString         fieldName;
-            OString         fieldType;
-            for (sal_uInt16 i=0; i < fieldCount; i++)
-            {
-                access = aSuperReader.getFieldAccess(i);
-
-                if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-                    continue;
-
-                fieldName = aSuperReader.getFieldName(i);
-                fieldType = aSuperReader.getFieldType(i);
-
-                if (hasMember)
-                {
-                    o << ", ";
-                } else
-                {
-                    hasMember = (fieldCount > 0);
-                }
-
-                if (bWithType)
-                {
-                    dumpUnoType(o, fieldType, sal_True, sal_True);
-                    o << " ";
-                }
-                o << "__" << fieldName;
-            }
-        }
-    }
-
-    return hasMember;
-}
-
-//*************************************************************************
-// EnumType
-//*************************************************************************
-EnumType::EnumType(TypeReader& typeReader,
-                            const OString& typeName,
-                            const TypeManager& typeMgr,
-                            const TypeDependency& typeDependencies,
-                            TypeSet* generatedConversions)
-    : CorbaType(typeReader, typeName, typeMgr, typeDependencies, generatedConversions)
-{
-}
-
-EnumType::~EnumType()
-{
-
-}
-
-void EnumType::dumpFunctions(FileStream& o)
-{
-    if (m_typeName.equals("com/sun/star/uno/TypeClass"))
-        return;
-
-    m_generatedConversions->insert(m_typeName);
-
-    o << "static sal_Bool convert_b2u_" << m_typeName.replace('/', '_')
-      << "(void* pOut, const void* pIn, const ::com::sun::star::uno::Type& type, const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  *(";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "*) pOut = (";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << ") *(const ";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "*) pIn;\n\n"
-      << "  return sal_True;\n"
-      << "}\n\n";
-
-    o << "static sal_Bool convert_u2b_" << m_typeName.replace('/', '_')
-      << "(void* pOut, const void* pIn, const ::com::sun::star::uno::Type& type, const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  *(";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << "*) pOut = (";
-    dumpCorbaType(o, m_typeName, sal_False, sal_False);
-    o << ") *(const ";
-    dumpUnoType(o, m_typeName, sal_False, sal_False);
-    o << "*) pIn;\n\n"
-      << "  return sal_True;\n"
-      << "}\n\n";
-
-    o << "inline sal_Bool bonobobridge::cpp_convert_b2u(";
-    dumpUnoType(o, m_typeName, sal_False, sal_True);
-    o << " u    , ";
-    dumpCorbaType(o, m_typeName, sal_True, sal_True);
-    o << " b,   const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  return convert_b2u_" << m_typeName.replace('/', '_')
-      << "(&u, &b, ::getCppuType(&u), bridge);\n"
-      << "};\n\n";
-
-    o << "inline sal_Bool bonobobridge::cpp_convert_u2b(";
-    dumpCorbaType(o, m_typeName, sal_False, sal_True);
-    o << " b, ";
-    dumpUnoType(o, m_typeName, sal_True, sal_True);
-    o << " u,   const ::vos::ORef< ::bonobobridge::Bridge >& bridge) {\n"
-      << "  return convert_u2b_" << m_typeName.replace('/', '_')
-      << "(&b, &u, ::getCppuType(&u), bridge);\n"
-      << "};\n\n";
-
-    return;
-}
-
-
-//*************************************************************************
-// TypeDefType
-//*************************************************************************
-TypeDefType::TypeDefType(TypeReader& typeReader,
-                            const OString& typeName,
-                            const TypeManager& typeMgr,
-                            const TypeDependency& typeDependencies,
-                            TypeSet* generatedConversions)
-    : CorbaType(typeReader, typeName, typeMgr, typeDependencies, generatedConversions)
-{
-}
-
-TypeDefType::~TypeDefType()
-{
-
-}
-
-void TypeDefType::dumpFunctions(FileStream& o)
-{
-}
-
-
-
-//*************************************************************************
-// produceType
-//*************************************************************************
-sal_Bool produceType(const OString& typeName,
-                        TypeManager& typeMgr,
-                        TypeDependency& typeDependencies,
-                        CorbaOptions* pOptions,
-                        FileStream& o, TypeSet* allreadyDumped,
-                        TypeSet* generatedConversions)
-    throw( CannotDumpException )
-{
-    sal_Bool bNewTypeSet = (allreadyDumped == NULL);
-    sal_Bool ret = sal_True;
-
-    if (bNewTypeSet)
-        allreadyDumped = new TypeSet();
-
-
-    if (!typeDependencies.isGenerated(typeName))
-    {
-       TypeReader reader(typeMgr.getTypeReader(typeName));
-
-        if (!reader.isValid() && !typeName.equals("/"))
-                ret = sal_False;
-
-        if( ret && !checkTypeDependencies(typeMgr, typeDependencies, typeName))
-            ret = sal_False;
-
-        if (ret)
-        {
-            RTTypeClass typeClass = reader.getTypeClass();
-
-            switch (typeClass)
-            {
-                case RT_TYPE_INTERFACE:
-                {
-                    InterfaceType iType(reader, typeName, typeMgr, typeDependencies, generatedConversions);
-                    ret = iType.dump(pOptions, o, allreadyDumped);
-                    if (ret) typeDependencies.setGenerated(typeName);
-                    ret = iType.dumpDependedTypes(pOptions, o, allreadyDumped);
-                }
-                break;
-                case RT_TYPE_MODULE:
-                {
-                    ModuleType mType(reader, typeName, typeMgr, typeDependencies, generatedConversions);
-                    if (mType.hasConstants())
-                    {
-                        ret = mType.dump(pOptions, o, allreadyDumped);
-                        if (ret) typeDependencies.setGenerated(typeName);
-                    } else
-                    {
-                        typeDependencies.setGenerated(typeName);
-                        ret = sal_True;
-                    }
-                }
-                break;
-                case RT_TYPE_STRUCT:
-                {
-                    StructureType sType(reader, typeName, typeMgr, typeDependencies, generatedConversions);
-                    ret = sType.dump(pOptions, o, allreadyDumped);
-                    if (ret) typeDependencies.setGenerated(typeName);
-                    ret = sType.dumpDependedTypes(pOptions, o, allreadyDumped);
-                }
-                break;
-                case RT_TYPE_ENUM:
-                {
-                    EnumType enType(reader, typeName, typeMgr, typeDependencies, generatedConversions);
-                    ret = enType.dump(pOptions, o, allreadyDumped);
-                    if (ret) typeDependencies.setGenerated(typeName);
-                    ret = enType.dumpDependedTypes(pOptions, o, allreadyDumped);
-                }
-                break;
-                case RT_TYPE_EXCEPTION:
-                {
-                    ExceptionType eType(reader, typeName, typeMgr, typeDependencies, generatedConversions);
-                    ret = eType.dump(pOptions, o, allreadyDumped);
-                    if (ret) typeDependencies.setGenerated(typeName);
-                    ret = eType.dumpDependedTypes(pOptions, o, allreadyDumped);
-                }
-                break;
-                case RT_TYPE_TYPEDEF:
-                {
-                    TypeDefType tdType(reader, typeName, typeMgr, typeDependencies, generatedConversions);
-                    ret = tdType.dump(pOptions, o, allreadyDumped);
-                    if (ret) typeDependencies.setGenerated(typeName);
-                    ret = tdType.dumpDependedTypes(pOptions, o, allreadyDumped);
-                }
-                break;
-                case RT_TYPE_CONSTANTS:
-                {
-                    ConstantsType cType(reader, typeName, typeMgr, typeDependencies, generatedConversions);
-                    if (cType.hasConstants())
-                    {
-                        ret = cType.dump(pOptions, o, allreadyDumped);
-                        if (ret) typeDependencies.setGenerated(typeName);
-                    } else
-                    {
-                        typeDependencies.setGenerated(typeName);
-                        ret = sal_True;
-                    }
-                }
-                break;
-                case RT_TYPE_SERVICE:
-                case RT_TYPE_OBJECT:
-                    ret = sal_True;
-                    break;
-            }
-        }
-    }
-
-    if (bNewTypeSet)
-        delete allreadyDumped;
-
-    return ret;
-}
-
-//*************************************************************************
-// scopedName
-//*************************************************************************
-OString scopedName(const OString& scope, const OString& type,
-       sal_Bool bNoNameSpace)
-{
-    sal_Int32 nPos = type.lastIndexOf( '/' );
-    if (nPos == -1)
-        return type;
-
-    if (bNoNameSpace)
-        return type.copy(nPos+1);
-
-    OStringBuffer tmpBuf(type.getLength()*2);
-    nPos = 0;
-    do
-    {
-        tmpBuf.append("::");
-        tmpBuf.append(type.getToken(0, '/', nPos));
-    } while( nPos != -1 );
-
-    return tmpBuf.makeStringAndClear();
-}
-
-//*************************************************************************
-// shortScopedName
-//*************************************************************************
-OString shortScopedName(const OString& scope, const OString& type,
-               sal_Bool bNoNameSpace)
-{
-    sal_Int32 nPos = type.lastIndexOf( '/' );
-    if( nPos == -1 )
-        return OString();
-
-    if (bNoNameSpace)
-        return OString();
-
-    // scoped name only if the namespace is not equal
-    if (scope.lastIndexOf('/') > 0)
-    {
-        OString tmpScp(scope.copy(0, scope.lastIndexOf('/')));
-        OString tmpScp2(type.copy(0, nPos));
-
-        if (tmpScp == tmpScp2)
-            return OString();
-    }
-
-    OString aScope( type.copy( 0, nPos ) );
-    OStringBuffer tmpBuf(aScope.getLength()*2);
-
-    nPos = 0;
-    do
-    {
-        tmpBuf.append("::");
-        tmpBuf.append(aScope.getToken(0, '/', nPos));
-    } while( nPos != -1 );
-
-    return tmpBuf.makeStringAndClear();
-}
-
-
diff --git a/codemaker/source/bonobowrappermaker/corbatype.hxx b/codemaker/source/bonobowrappermaker/corbatype.hxx
deleted file mode 100644
index 439aba86e68e..000000000000
--- a/codemaker/source/bonobowrappermaker/corbatype.hxx
+++ /dev/null
@@ -1,310 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CORBAMAKER_CPPUTYPE_HXX_
-#define _CORBAMAKER_CPPUTYPE_HXX_
-
-#include <codemaker/typemanager.hxx>
-#include <codemaker/dependency.hxx>
-
-#include <hash_set>
-
-enum BASETYPE
-{
-    BT_INVALID,
-    BT_VOID,
-    BT_ANY,
-    BT_TYPE,
-    BT_BOOLEAN,
-    BT_CHAR,
-    BT_STRING,
-    BT_FLOAT,
-    BT_DOUBLE,
-    BT_OCTET,
-    BT_BYTE,
-    BT_SHORT,
-    BT_LONG,
-    BT_HYPER,
-    BT_UNSIGNED_SHORT,
-    BT_UNSIGNED_LONG,
-    BT_UNSIGNED_HYPER
-};
-
-
-class CorbaOptions;
-class FileStream;
-
-struct OStringEqual
-{
-    sal_Bool operator() (const ::rtl::OString& lhs, const ::rtl::OString& rhs) const
-  { return lhs.equals( rhs );}
-};
-
-struct OStringHash : public std::unary_function< const ::rtl::OString &, size_t >
-{
-    size_t operator()( const ::rtl::OString & rStr ) const
-        { return rStr.hashCode(); }
-};
-
-typedef std::hash_set< ::rtl::OString, OStringHash, OStringEqual > TypeSet;
-
-class CorbaType
-{
-public:
-    CorbaType(TypeReader& typeReader,
-              const ::rtl::OString& typeName,
-              const TypeManager& typeMgr,
-              const TypeDependency& typeDependencies,
-              TypeSet* generatedConversion);
-
-    virtual ~CorbaType();
-
-    virtual sal_Bool dump(CorbaOptions* pOptions, FileStream& o, TypeSet* allreadyDumped) throw( CannotDumpException );
-    virtual sal_Bool dumpDependedTypes(CorbaOptions* pOptions, FileStream& o, TypeSet* allreadyDumped)  throw( CannotDumpException );
-    virtual sal_Bool dumpConversionFunctions(FileStream& o, TypeSet* allreadyDumped) throw( CannotDumpException );
-
-    static  void dumpDefaultHxxIncludes(FileStream& o);
-
-    virtual void dumpInclude(FileStream& o, TypeSet* allreadyDumped, const ::rtl::OString& typeName, sal_Char* prefix, sal_Bool bExtended=sal_False, sal_Bool bCaseSensitive=sal_False);
-    virtual void dumpDepIncludes(FileStream& o, TypeSet* allreadyDumped, const ::rtl::OString& typeName, sal_Char* prefix);
-
-    virtual void dumpNameSpace(FileStream& o, sal_Bool bOpen = sal_True, sal_Bool bFull = sal_False, const ::rtl::OString& type="");
-    virtual void dumpFunctions(FileStream& o) = 0;
-
-    virtual ::rtl::OString printUnoType( const ::rtl::OString& type,
-                                        sal_Bool bConst=sal_False,
-                                        sal_Bool bRef=sal_False,
-                                        sal_Bool bNative=sal_False)
-        throw( CannotDumpException );
-
-    virtual void dumpUnoType(FileStream& o,
-                            const ::rtl::OString& type,
-                            sal_Bool bConst=sal_False,
-                            sal_Bool bRef=sal_False,
-                            sal_Bool bNative=sal_False)
-        throw( CannotDumpException );
-
-     virtual ::rtl::OString printCorbaType(const ::rtl::OString& type,
-                                            sal_Bool bConst,
-                                            sal_Bool bRef)
-        throw( CannotDumpException );
-
-    virtual void dumpCorbaType(FileStream& o,
-                                const ::rtl::OString& type,
-                                sal_Bool bConst=sal_False,
-                                sal_Bool bRef=sal_False)
-        throw( CannotDumpException );
-
-    sal_Bool isPassedAsPointer(const ::rtl::OString& type);
-    sal_Bool isArray(const ::rtl::OString& type);
-
-    sal_Bool isDerivedFromUnknown(const ::rtl::OString& typeName);
-
-
-    ::rtl::OString printCorbaParameter(const ::rtl::OString& type,
-                                        sal_Bool bOut = sal_False)
-                                throw( CannotDumpException );
-
-    ::rtl::OString  getTypeClass(const ::rtl::OString& type="",
-                                sal_Bool bCStyle=sal_False);
-    ::rtl::OString  getUnoBaseType(const ::rtl::OString& type);
-    ::rtl::OString  getCorbaBaseType(const ::rtl::OString& type);
-
-    void    dumpTypeInit(FileStream& o, const ::rtl::OString& type);
-    BASETYPE isBaseType(const ::rtl::OString& type);
-
-    ::rtl::OString typeToIdentifier(const ::rtl::OString& type);
-
-    virtual sal_uInt32  getMemberCount();
-    virtual sal_uInt32  getInheritedMemberCount();
-
-    sal_Bool isNestedTypeByName(const ::rtl::OString& type);
-
-    void            inc(sal_uInt32 num=4);
-    void            dec(sal_uInt32 num=4);
-    ::rtl::OString  indent();
-    ::rtl::OString  indent(sal_uInt32 num);
-protected:
-    virtual sal_uInt32  checkInheritedMemberCount(const TypeReader* pReader);
-
-    ::rtl::OString  checkSpecialCorbaType(const ::rtl::OString& type);
-    ::rtl::OString  checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False);
-
-protected:
-    sal_uInt32          m_inheritedMemberCount;
-    sal_uInt32          m_indentLength;
-    ::rtl::OString      m_typeName;
-    ::rtl::OString      m_name;
-    TypeReader          m_reader;
-    TypeManager&        m_typeMgr;
-    TypeDependency      m_dependencies;
-    TypeSet* m_generatedConversions;
-};
-
-class InterfaceType : public CorbaType
-{
-public:
-    InterfaceType(TypeReader& typeReader,
-                const ::rtl::OString& typeName,
-                const TypeManager& typeMgr,
-                const TypeDependency& typeDependencies,
-                TypeSet* generatedConversion);
-
-    virtual ~InterfaceType();
-
-    void        dumpFunctions(FileStream& o);
-
-    void        dumpUnoMethods(FileStream& o, sal_Bool bDeclOnly, sal_Bool bDelegateToSuper);
-    void        dumpCorbaMethods(FileStream& o, sal_Bool bDeclOnly);
-
-    sal_uInt32  getMemberCount();
-    sal_uInt32  getInheritedMemberCount();
-
-protected:
-    sal_uInt32  checkInheritedMemberCount(const TypeReader* pReader);
-
-protected:
-    sal_uInt32  m_inheritedMemberCount;
-    sal_Bool    m_hasAttributes;
-    sal_Bool    m_hasMethods;
-};
-
-class ModuleType : public CorbaType
-{
-public:
-    ModuleType(TypeReader& typeReader,
-                const ::rtl::OString& typeName,
-                const TypeManager& typeMgr,
-                const TypeDependency& typeDependencies,
-                TypeSet* generatedConversion);
-
-    virtual ~ModuleType();
-
-    sal_Bool    dumpConversionFunctions(FileStream& o, TypeSet* allreadyDumped) throw( CannotDumpException );
-    void        dumpFunctions(FileStream& o);
-    sal_Bool    hasConstants();
-};
-
-class ConstantsType : public ModuleType
-{
-public:
-    ConstantsType(TypeReader& typeReader,
-                const ::rtl::OString& typeName,
-                const TypeManager& typeMgr,
-                const TypeDependency& typeDependencies,
-                TypeSet* generatedConversion);
-
-    virtual ~ConstantsType();
-
-    void dumpFunctions(FileStream& o);
-};
-
-class StructureType : public CorbaType
-{
-public:
-    StructureType(TypeReader& typeReader,
-                const ::rtl::OString& typeName,
-                const TypeManager& typeMgr,
-                const TypeDependency& typeDependencies,
-                TypeSet* generatedConversion);
-
-    virtual ~StructureType();
-
-    void        dumpFunctions(FileStream& o);
-
-    sal_Bool    dumpSuperMember(FileStream& o,  const ::rtl::OString& super, sal_Bool bWithType);
-};
-
-class ExceptionType : public CorbaType
-{
-public:
-    ExceptionType(TypeReader& typeReader,
-                const ::rtl::OString& typeName,
-                const TypeManager& typeMgr,
-                const TypeDependency& typeDependencies,
-                TypeSet* generatedConversions);
-
-    virtual ~ExceptionType();
-
-    void        dumpFunctions(FileStream& o);
-
-    sal_Bool    dumpSuperMember(FileStream& o, const ::rtl::OString& super, sal_Bool bWithType);
-};
-
-class EnumType : public CorbaType
-{
-public:
-    EnumType(TypeReader& typeReader,
-            const ::rtl::OString& typeName,
-            const TypeManager& typeMgr,
-            const TypeDependency& typeDependencies,
-            TypeSet* generatedConversion);
-
-    virtual ~EnumType();
-
-    void        dumpFunctions(FileStream& o);
-};
-
-class TypeDefType : public CorbaType
-{
-public:
-    TypeDefType(TypeReader& typeReader,
-                const ::rtl::OString& typeName,
-                const TypeManager& typeMgr,
-                const TypeDependency& typeDependencies,
-                TypeSet* generatedConversion);
-
-    virtual ~TypeDefType();
-
-    void dumpFunctions(FileStream& o);
-};
-
-
-sal_Bool produceType(const ::rtl::OString& typeName,
-                    TypeManager& typeMgr,
-                    TypeDependency& typeDependencies,
-                    CorbaOptions* pOptions,
-                    FileStream& o, TypeSet* allreadyDumped,
-                    TypeSet* generatedConversions)
-    throw( CannotDumpException );
-
-/**
- * This function returns a C++ scoped name, represents the namespace
- * scoping of this type, e.g. com:.sun::star::uno::XInterface. If the scope of
- * the type is equal scope, the relativ name will be used.
- */
-::rtl::OString scopedName(const ::rtl::OString& scope,
-                          const ::rtl::OString& type,
-                             sal_Bool bNoNameSpace=sal_False);
-
-::rtl::OString shortScopedName(const ::rtl::OString& scope,
-                               const ::rtl::OString& type,
-                                  sal_Bool bNoNameSpace=sal_False);
-
-
-#endif // _CORBAMAKER_CPPUTYPE_HXX_
-
diff --git a/codemaker/source/bonobowrappermaker/makefile.mk b/codemaker/source/bonobowrappermaker/makefile.mk
deleted file mode 100644
index 36889e96400f..000000000000
--- a/codemaker/source/bonobowrappermaker/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=codemaker
-TARGET=bonobowrappermaker
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-
-CXXFILES=	corbamaker.cxx	\
-        corbaoptions.cxx	\
-        corbatype.cxx
-
-
-APP1TARGET= $(TARGET)
-
-APP1OBJS= $(OBJ)$/corbamaker.obj	\
-      $(OBJ)$/corbaoptions.obj	\
-      $(OBJ)$/corbatype.obj			
-
-APP1STDLIBS= \
-            $(SALLIB) \
-            $(SALHELPERLIB) \
-            $(REGLIB)
-
-APP1LIBS= \
-    $(LB)$/codemaker.lib
-
-.INCLUDE :  target.mk
diff --git a/codemaker/source/codemaker/codemaker.cxx b/codemaker/source/codemaker/codemaker.cxx
index d31b4762f235..8ce02ab0a1d5 100644
--- a/codemaker/source/codemaker/codemaker.cxx
+++ b/codemaker/source/codemaker/codemaker.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -186,3 +187,5 @@ codemaker::UnoType::Sort decomposeAndResolve(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/codemaker/dependencies.cxx b/codemaker/source/codemaker/dependencies.cxx
index a005c07ec4fe..da8d33e1f88e 100644
--- a/codemaker/source/codemaker/dependencies.cxx
+++ b/codemaker/source/codemaker/dependencies.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -279,3 +280,5 @@ void Dependencies::insert(rtl::OString const & type, bool base) {
         break;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx
index 3fd581651ba3..e54483d39561 100644
--- a/codemaker/source/codemaker/exceptiontree.cxx
+++ b/codemaker/source/codemaker/exceptiontree.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -104,3 +105,5 @@ void ExceptionTree::add(rtl::OString const & name, TypeManager const & manager)
         }
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index a83116635afc..7d3faa98121a 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
 #include "osl/file.hxx"
 
 #include <string.h>
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 
 #include <direct.h>
@@ -151,7 +152,7 @@ OString createFileNameFromType( const OString& destination,
             continue;
         }
 
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
         if (mkdir((char*)nameBuffer.getStr(), 0777) == -1)
 #else
         if (mkdir((char*)nameBuffer.getStr()) == -1)
@@ -447,3 +448,5 @@ FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s) {
         o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes);
     return o;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/codemaker/makefile.mk b/codemaker/source/codemaker/makefile.mk
index 515d3657969e..fb458fb6f61c 100644
--- a/codemaker/source/codemaker/makefile.mk
+++ b/codemaker/source/codemaker/makefile.mk
@@ -43,9 +43,7 @@ SLOFILES = \
     $(SLO)$/codemaker.obj
 
 LIB1TARGET=$(LB)$/$(TARGET).lib
-.IF "$(GUI)" != "OS2"
 LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-.ENDIF
 LIB1OBJFILES=$(SLOFILES)
 
 .INCLUDE: target.mk
diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx
index 7bbc67056e75..8748db53c2c8 100644
--- a/codemaker/source/codemaker/options.cxx
+++ b/codemaker/source/codemaker/options.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 #include "codemaker/options.hxx"
 
-using namespace rtl;
+using ::rtl::OString;
 
 Options::Options()
 {
@@ -97,3 +98,4 @@ OString Options::getExtraInputFile(sal_uInt16 index) const
     }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx
index b1edde7f26c4..2e46ef713af8 100644
--- a/codemaker/source/codemaker/typemanager.cxx
+++ b/codemaker/source/codemaker/typemanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,10 @@
 #include "registry/reader.hxx"
 #include "registry/version.h"
 
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringToOString;
 
 TypeManager::TypeManager()
 {
@@ -58,7 +62,7 @@ sal_Int32 TypeManager::release()
     {
         delete m_pImpl;
     }
-    return refCount;;
+    return refCount;
 }
 
 sal_Bool TypeManager::isBaseType(const ::rtl::OString& name)
@@ -401,3 +405,5 @@ RegistryKeyList RegistryTypeManager::getTypeKeys(const ::rtl::OString& name_) co
 
     return keyList;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/codemaker/unotype.cxx b/codemaker/source/codemaker/unotype.cxx
index c1b00dcb9b3d..cd3ce6d83752 100644
--- a/codemaker/source/codemaker/unotype.cxx
+++ b/codemaker/source/codemaker/unotype.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -101,3 +102,5 @@ rtl::OString codemaker::UnoType::decompose(
     OSL_ASSERT(k == len - 1 && type[k] == '>');
     return type.copy(i, j - i);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx
index 4744af6df023..c8da1873846d 100644
--- a/codemaker/source/commoncpp/commoncpp.cxx
+++ b/codemaker/source/commoncpp/commoncpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -353,3 +354,5 @@ rtl::OString translateUnoToCppIdentifier(
 }
 
 } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/commonjava/commonjava.cxx b/codemaker/source/commonjava/commonjava.cxx
index 8ae254cbde84..fe2fad09eb43 100644
--- a/codemaker/source/commonjava/commonjava.cxx
+++ b/codemaker/source/commonjava/commonjava.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -165,3 +166,5 @@ rtl::OString translateUnoToJavaIdentifier(
 }
 
 } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/cppumaker.cxx b/codemaker/source/cppumaker/cppumaker.cxx
index e6d5679409e8..ae24f4291d8e 100644
--- a/codemaker/source/cppumaker/cppumaker.cxx
+++ b/codemaker/source/cppumaker/cppumaker.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,7 +39,8 @@
 #include "cppuoptions.hxx"
 #include "cpputype.hxx"
 
-using namespace rtl;
+using ::rtl::OString;
+using ::rtl::OUString;
 
 namespace {
 
@@ -242,3 +244,4 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index da8ce2089c6e..37b843b6544c 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,14 +35,16 @@
 #include "osl/thread.h"
 #include "osl/process.h"
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
 #ifdef SAL_UNX
 #define SEPARATOR '/'
 #else
 #define SEPARATOR '\\'
 #endif
 
-using namespace rtl;
-
 sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
     throw( IllegalArgument )
 {
@@ -360,3 +363,5 @@ OString CppuOptions::prepareVersion()
 }
 
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/cppuoptions.hxx b/codemaker/source/cppumaker/cppuoptions.hxx
index b291eb548e73..567372e91c5d 100644
--- a/codemaker/source/cppumaker/cppuoptions.hxx
+++ b/codemaker/source/cppumaker/cppuoptions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ protected:
 };
 
 #endif // INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_CPPUOPTIONS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index a08e0be518be..51a01f6d8059 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,9 +51,12 @@
 #include "dumputils.hxx"
 #include "includes.hxx"
 
-using namespace rtl;
 using namespace codemaker::cpp;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+
 namespace {
 
 rtl::OString translateSimpleUnoType(rtl::OString const & unoType, bool cppuUnoType=false) {
@@ -359,6 +363,7 @@ void CppuType::addDefaultHxxIncludes(codemaker::cppumaker::Includes & includes)
     const
 {
     //TODO: Only include what is really needed
+    includes.addRtlInstanceHxx();
     includes.addOslMutexHxx();
     includes.addType();
     if (m_typeMgr.getTypeClass(m_typeName) == RT_TYPE_INTERFACE) {
@@ -589,16 +594,21 @@ void CppuType::dumpNormalGetCppuType(FileStream& o)
 
 void CppuType::dumpComprehensiveGetCppuType(FileStream& o)
 {
-    dumpGetCppuTypePreamble(o);
-
-    o << indent() << "static ::com::sun::star::uno::Type * the_pType = 0;\n";
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceOpen(o, m_typeName, false);
+    else
+        o << "namespace cppu { ";
+    o << " namespace detail {\n\n";
 
-    o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
+    OString sType = m_typeName.copy(m_typeName.lastIndexOf('/') + 1);
+    OString sStaticTypeClass = "the" + sType + "Type";
+    o << indent() << "struct " << sStaticTypeClass << " : public rtl::StaticWithInit< ::com::sun::star::uno::Type, " << sStaticTypeClass << " >\n";
+    o << indent() << "{\n";
     inc();
-    o << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n";
-
-    o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
+    o << indent() << "::com::sun::star::uno::Type operator()() const\n";
+    o << indent() << "{\n";
     inc();
+
     o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\""
       << m_typeName.replace('/', '.') << "\") );\n\n";
 
@@ -675,8 +685,8 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o)
     } else {
         o << indent() << count << ",\n" << indent() << "0 );\n\n";
     }
-
     dec();
+
     o << indent()
       << ("typelib_typedescription_register( (typelib_TypeDescription**)&pTD"
           " );\n\n");
@@ -684,15 +694,24 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o)
     o << indent() << "typelib_typedescription_release( pTD );\n"
       << indent() << "// End inline typedescription generation\n\n";
 
-    o << indent() << "static ::com::sun::star::uno::Type the_staticType( "
+    o << indent() << "::com::sun::star::uno::Type the_staticType( "
       << getTypeClass(m_typeName) << ", sTypeName );\n";
-    o << indent() << "the_pType = &the_staticType;\n";
+    o << indent() << "return the_staticType;\n";
 
     dec();
     o << indent() << "}\n";
     dec();
-    o << indent() << "}\n\n";
-    o << indent() << "return *the_pType;\n";
+    o << indent() << "};\n\n";
+
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceClose(o, m_typeName, false);
+    else
+        o << " }";
+
+    o << " }\n\n";
+
+    dumpGetCppuTypePreamble(o);
+    o  << indent() << "return detail::" << sStaticTypeClass << "::get();\n";
     dumpGetCppuTypePostamble(o);
 }
 
@@ -1200,7 +1219,7 @@ void CppuType::dumpConstantValue(FileStream& o, sal_uInt16 index)
             {
                 ::rtl::OUString aUStr(constValue.m_value.aString);
                 ::rtl::OString aStr = ::rtl::OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US);
-                o << "::rtl::OUString::createFromAscii(\"" << aStr.getStr() << "\")";
+                o << "::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"" << aStr.getStr() << "\"))";
             }
             break;
     }
@@ -1515,15 +1534,20 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o)
 
 void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o)
 {
-    dumpGetCppuTypePreamble(o);
-
-    o << indent() << "static ::com::sun::star::uno::Type * the_pType = 0;\n";
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceOpen(o, m_typeName, false);
+    else
+        o << "namespace cppu { ";
+    o << " namespace detail {\n\n";
 
-    o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
+    OString sType = m_typeName.copy(m_typeName.lastIndexOf('/') + 1);
+    OString sStaticTypeClass = "the" + sType + "Type";
+    o << indent() << "struct " << sStaticTypeClass << " : public rtl::StaticWithInit< ::com::sun::star::uno::Type, " << sStaticTypeClass << " >\n";
+    o << indent() << "{\n";
     inc();
-    o << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n";
+    o << indent() << "::com::sun::star::uno::Type operator()() const\n";
+    o << indent() << "{\n";
 
-    o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
     inc();
     o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\""
       << m_typeName.replace('/', '.') << "\") );\n\n";
@@ -1595,9 +1619,38 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o)
       << ("typelib_typedescription_release( (typelib_TypeDescription*)pTD"
           " );\n\n");
 
-    o << indent() << "static ::com::sun::star::uno::Type the_staticType( "
+    o << indent() << "::com::sun::star::uno::Type the_staticType( "
       << getTypeClass(m_typeName) << ", sTypeName );\n";
-    o << indent() << "the_pType = &the_staticType;\n";
+
+    o << indent() << "return the_staticType;\n";
+
+    dec();
+
+    o << indent() << "}\n";
+    dec();
+    o << indent() << "};\n\n";
+
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceClose(o, m_typeName, false);
+    else
+        o << " }";
+    o << " }\n\n";
+
+    dumpGetCppuTypePreamble(o);
+    o  << indent() << "const ::com::sun::star::uno::Type &rRet = detail::" << sStaticTypeClass << "::get();\n";
+
+    o << indent() << "// End inline typedescription generation\n";
+
+    o  << indent() << "static bool bInitStarted = false;\n";
+    o  << indent() << "if (!bInitStarted)\n";
+    o  << indent() << "{\n";
+    inc();
+    o  << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n";
+    o  << indent() << "if (!bInitStarted)\n";
+    o  << indent() << "{\n";
+    inc();
+    o  << indent() << "OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();\n";
+    o  << indent() << "bInitStarted = true;\n";
 
     StringSet   aTypes;
     // type for RuntimeException is always needed
@@ -1615,14 +1668,18 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o)
         dumpCppuMethods(o, index);
     }
 
-    o << indent() << "// End inline typedescription generation\n";
-
     dec();
-    o << indent() << "}\n";
+    o  << indent() << "}\n";
+    dec();
+    o  << indent() << "}\n";
+    o  << indent() << "else\n";
+    o  << indent() << "{\n";
+    inc();
+    o  << indent() << "OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();\n";
     dec();
-    o << indent() << "}\n\n"
-      << indent() << "return *the_pType;\n";
+    o  << indent() << "}\n";
 
+    o  << indent() << "return rRet;\n";
     dumpGetCppuTypePostamble(o);
 }
 
@@ -1831,6 +1888,10 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index)
             inc();
             o << indent() << "::rtl::OUString sAttributeType" << i << "( RTL_CONSTASCII_USTRINGPARAM(\""
               << fieldType.replace('/', '.') << "\") );\n";
+
+            o << indent() << "::rtl::OUString sAttributeName" << i << "( RTL_CONSTASCII_USTRINGPARAM(\""
+              << scope.replace('/', '.') << "::" << fieldName << "\") );\n";
+
             sal_Int32 getExceptions = dumpAttributeExceptionTypeNames(
                 o, "get", name, RT_MODE_ATTRIBUTE_GET);
             sal_Int32 setExceptions = dumpAttributeExceptionTypeNames(
@@ -1873,6 +1934,7 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index)
     if (m_hasMethods)
     {
         o << "\n" << indent() << "typelib_InterfaceMethodTypeDescription * pMethod = 0;\n";
+        OString             scope = m_typeName.replace('/', '.');
 
         for (sal_uInt16 i=0; i < methodCount; i++)
         {
@@ -1942,6 +2004,9 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index)
 
             o << indent() << "::rtl::OUString sReturnType" << i << "( RTL_CONSTASCII_USTRINGPARAM(\""
               << returnType.replace('/', '.') << "\") );\n";
+            o << indent() << "::rtl::OUString sMethodName" << i <<
+                "( RTL_CONSTASCII_USTRINGPARAM(\""
+              << scope.replace('/', '.') << "::" << methodName << "\") );\n";
             o << indent() << "typelib_typedescription_newInterfaceMethod( &pMethod,\n";
             inc();
             o << indent() << absoluteIndex++ << ", ";
@@ -1949,6 +2014,7 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index)
                 o << "sal_True,\n";
             else
                 o << "sal_False,\n";
+
             o << indent() << "sMethodName" << i << ".pData,\n";
             o << indent() << "(typelib_TypeClass)" << getTypeClass(returnType)
               << ", sReturnType" << i << ".pData,\n";
@@ -2366,8 +2432,6 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o)
 {
     o << "\n#ifdef SAL_W32\n"
       << "#   pragma pack(push, 8)\n"
-      << "#elif defined(SAL_OS2)\n"
-      << "#   pragma pack(8)\n"
       << "#endif\n\n";
 
     OSL_ASSERT(!isPolymorphic() || m_reader.getSuperTypeCount() == 0); //TODO
@@ -2444,8 +2508,6 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o)
 
     o << "#ifdef SAL_W32\n"
       << "#   pragma pack(pop)\n"
-      << "#elif defined(SAL_OS2)\n"
-      << "#   pragma pack()\n"
       << "#endif\n\n";
 
     return sal_True;
@@ -2781,14 +2843,30 @@ void StructureType::dumpNormalGetCppuType(FileStream & out) {
     dumpGetCppuTypePostamble(out);
 }
 
-void StructureType::dumpComprehensiveGetCppuType(FileStream & out) {
-    dumpGetCppuTypePreamble(out);
-    out << indent() << "static ::com::sun::star::uno::Type * the_pType = 0;\n"
-        << indent() << "if (the_pType == 0) {\n";
+void StructureType::dumpComprehensiveGetCppuType(FileStream & out)
+{
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceOpen(out, m_typeName, false);
+    else
+        out << "namespace cppu { ";
+    out << " namespace detail {\n\n";
+
+    OString sType = m_typeName.copy(m_typeName.lastIndexOf('/') + 1);
+    OString sStaticTypeClass = "the" + sType + "Type";
+    out << indent();
+    if (isPolymorphic())
+        dumpTemplateHead(out);
+    out << "struct " << sStaticTypeClass << " : public rtl::StaticWithInit< ::com::sun::star::uno::Type, ";
+    out << sStaticTypeClass;
+    if (isPolymorphic())
+        dumpTemplateParameters(out);
+    out << " >\n";
+
+    out << indent() << "{\n";
     inc();
-    out << indent()
-        << "::osl::MutexGuard the_guard(::osl::Mutex::getGlobalMutex());\n"
-        << indent() << "if (the_pType == 0) {\n";
+    out << indent() << "::com::sun::star::uno::Type operator()() const\n";
+    out << indent() << "{\n";
+
     inc();
     if (isPolymorphic()) {
         out << indent() << "::rtl::OUStringBuffer the_buffer;\n" << indent()
@@ -2912,18 +2990,26 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) {
     out << ", " << fields << ", the_members);\n";
     out << indent() << "::typelib_typedescription_register(&the_newType);\n";
     out << indent() << "::typelib_typedescription_release(the_newType);\n";
-    out << indent() << "static ::com::sun::star::uno::Type the_staticType("
+
+    out << indent() << "::com::sun::star::uno::Type the_staticType("
         << getTypeClass(m_typeName) << ", the_name);\n";
-    out << indent() << "OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();\n";
-    out << indent() << "the_pType = &the_staticType;\n";
+    out << indent() << "return the_staticType;\n";
     dec();
     out << indent() << "}\n";
     dec();
-    out << indent() << "} else {\n";
-    inc();
-    out << indent() << "OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();\n";
-    dec();
-    out << indent() << "}\n" << indent() << "return *the_pType;\n";
+    out << indent() << "};\n";
+
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceClose(out, m_typeName, false);
+    else
+        out << " }";
+    out << " }\n\n";
+
+    dumpGetCppuTypePreamble(out);
+    out  << indent() << "return detail::" << sStaticTypeClass;
+    if (isPolymorphic())
+        dumpTemplateParameters(out);
+    out  << "::get();\n";
     dumpGetCppuTypePostamble(out);
 }
 
@@ -3017,7 +3103,7 @@ void StructureType::addComprehensiveGetCppuTypeIncludes(
 {
     includes.addType();
     includes.addCppuUnotypeHxx();
-    includes.addOslDoublecheckedlockingH();
+    includes.addRtlInstanceHxx();
     includes.addOslMutexHxx();
     includes.addRtlUstringH();
     includes.addRtlUstringHxx();
@@ -3584,15 +3670,20 @@ void EnumType::dumpNormalGetCppuType(FileStream& o)
 
 void EnumType::dumpComprehensiveGetCppuType(FileStream& o)
 {
-    dumpGetCppuTypePreamble(o);
-
-    o << indent() << "static ::com::sun::star::uno::Type * the_pType = 0;\n";
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceOpen(o, m_typeName, false);
+    else
+        o << "namespace cppu { ";
+    o << " namespace detail {\n\n";
 
-    o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
+    OString sType = m_typeName.copy(m_typeName.lastIndexOf('/') + 1);
+    OString sStaticTypeClass = "the" + sType + "Type";
+    o << indent() << "struct " << sStaticTypeClass << " : public rtl::StaticWithInit< ::com::sun::star::uno::Type, " << sStaticTypeClass << " >\n";
+    o << indent() << "{\n";
     inc();
-    o << indent() << "::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );\n";
+    o << indent() << "::com::sun::star::uno::Type operator()() const\n";
+    o << indent() << "{\n";
 
-    o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
     inc();
     o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\""
       << m_typeName.replace('/', '.') << "\") );\n\n";
@@ -3644,16 +3735,23 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o)
     o << indent() << "typelib_typedescription_release( pTD );\n"
       << indent() << "// End inline typedescription generation\n\n";
 
-    o << indent() << "static ::com::sun::star::uno::Type the_staticType( "
+    o << indent() << "::com::sun::star::uno::Type the_staticType( "
       << getTypeClass(m_typeName) << ", sTypeName );\n";
-    o << indent() << "the_pType = &the_staticType;\n";
+    o << indent() << "return the_staticType;\n";
 
     dec();
     o << indent() << "}\n";
     dec();
-    o << indent() << "}\n\n"
-      << indent() << "return *the_pType;\n";
+    o << indent() << "};\n\n";
 
+    if (!isPolymorphic())
+        codemaker::cppumaker::dumpNamespaceClose(o, m_typeName, false);
+    else
+        o << " }";
+    o << " }\n\n";
+
+    dumpGetCppuTypePreamble(o);
+    o  << indent() << "return detail::" << sStaticTypeClass << "::get();\n";
     dumpGetCppuTypePostamble(o);
 }
 
@@ -4502,3 +4600,5 @@ OString scopedName(const OString& scope, const OString& type,
     return tmpBuf.makeStringAndClear();
 }
 */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx
index 55b74ff60f94..2823e9c30159 100644
--- a/codemaker/source/cppumaker/cpputype.hxx
+++ b/codemaker/source/cppumaker/cpputype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -404,3 +405,4 @@ bool produceType(RegistryKey& typeName, bool bIsExtraType,
 
 #endif // INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_CPPUTYPE_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/dumputils.cxx b/codemaker/source/cppumaker/dumputils.cxx
index b19a98af9f0f..05f178eed2fe 100644
--- a/codemaker/source/cppumaker/dumputils.cxx
+++ b/codemaker/source/cppumaker/dumputils.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ void dumpTypeIdentifier(FileStream & out, rtl::OString const & registryType) {
 }
 
 } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/dumputils.hxx b/codemaker/source/cppumaker/dumputils.hxx
index 1f8f1e831c12..265110dedbea 100644
--- a/codemaker/source/cppumaker/dumputils.hxx
+++ b/codemaker/source/cppumaker/dumputils.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ void dumpTypeIdentifier(FileStream & out, rtl::OString const & registryType);
 } }
 
 #endif // INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_DUMPUTILS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/includes.cxx b/codemaker/source/cppumaker/includes.cxx
index e1e3f43360fb..96e8313906d3 100644
--- a/codemaker/source/cppumaker/includes.cxx
+++ b/codemaker/source/cppumaker/includes.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,6 +60,7 @@ Includes::Includes(
     m_includeRtlTextencH(false), m_includeRtlUstrbufHxx(false),
     m_includeRtlUstringH(false),
     m_includeRtlUstringHxx(dependencies.hasStringDependency()),
+    m_includeRtlInstanceHxx(false),
     m_includeSalTypesH(
         dependencies.hasBooleanDependency() || dependencies.hasByteDependency()
         || dependencies.hasShortDependency()
@@ -249,6 +251,10 @@ void Includes::dump(FileStream & out, rtl::OString const * companionHdl) {
         dumpEmptyLineBeforeFirst(out, &first);
         out << ("#include \"rtl/ustring.hxx\"\n");
     }
+    if (m_includeRtlInstanceHxx) {
+        dumpEmptyLineBeforeFirst(out, &first);
+        out << "#include \"rtl/instance.hxx\"\n";
+    }
     if (m_includeSalTypesH) {
         dumpEmptyLineBeforeFirst(out, &first);
         out << "#include \"sal/types.h\"\n";
@@ -278,3 +284,5 @@ void Includes::dumpInclude(
 bool Includes::isInterfaceType(rtl::OString const & registryType) const {
     return m_manager.getTypeClass(registryType) == RT_TYPE_INTERFACE;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/includes.hxx b/codemaker/source/cppumaker/includes.hxx
index afa2b41f09f3..c8477a19e10a 100644
--- a/codemaker/source/cppumaker/includes.hxx
+++ b/codemaker/source/cppumaker/includes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,43 +46,26 @@ public:
     ~Includes();
 
     void add(rtl::OString const & registryType);
-
     void addAny() { m_includeAny = true; }
-
     void addReference() { m_includeReference = true; }
-
     void addSequence() { m_includeSequence = true; }
-
     void addType() { m_includeType = true; }
-
     void addCppuMacrosHxx() { m_includeCppuMacrosHxx = true; }
-
     void addCppuUnotypeHxx() { m_includeCppuUnotypeHxx = true; }
-
     void addOslDoublecheckedlockingH()
-    { m_includeOslDoublecheckedlockingH = true; }
-
+        { m_includeOslDoublecheckedlockingH = true; }
     void addOslMutexHxx() { m_includeOslMutexHxx = true; }
-
     void addRtlStrbufHxx() { m_includeRtlStrbufHxx = true; }
-
     void addRtlStringH() { m_includeRtlStringH = true; }
-
     void addRtlTextencH() { m_includeRtlTextencH = true; }
-
     void addRtlUstrbufHxx() { m_includeRtlUstrbufHxx = true; }
-
     void addRtlUstringH() { m_includeRtlUstringH = true; }
-
     void addRtlUstringHxx() { m_includeRtlUstringHxx = true; }
-
+    void addRtlInstanceHxx() { m_includeRtlInstanceHxx = true; }
     void addSalTypesH() { m_includeSalTypesH = true; }
-
     void addTypelibTypeclassH() { m_includeTypelibTypeclassH = true; }
-
     void addTypelibTypedescriptionH()
-    { m_includeTypelibTypedescriptionH = true; }
-
+        { m_includeTypelibTypedescriptionH = true; }
     void dump(FileStream & out, rtl::OString const * companionHdl);
 
     static void dumpInclude(
@@ -111,6 +95,7 @@ private:
     bool m_includeRtlUstrbufHxx;
     bool m_includeRtlUstringH;
     bool m_includeRtlUstringHxx;
+    bool m_includeRtlInstanceHxx;
     bool m_includeSalTypesH;
     bool m_includeTypelibTypeclassH;
     bool m_includeTypelibTypedescriptionH;
@@ -119,3 +104,5 @@ private:
 } }
 
 #endif // INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_INCLUDES_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/makefile.mk b/codemaker/source/cppumaker/makefile.mk
index a3ff38c4c07a..c05773e416f3 100644
--- a/codemaker/source/cppumaker/makefile.mk
+++ b/codemaker/source/cppumaker/makefile.mk
@@ -36,6 +36,12 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 .INCLUDE : settings.mk
+
+.IF "$(OS)" == "IOS"
+all:
+    @echo No build-time tools for this platform
+.ENDIF
+
 .INCLUDE : $(PRJ)$/codemaker.pmk
 
 # --- Files --------------------------------------------------------
diff --git a/codemaker/source/cunomaker/cunomaker.cxx b/codemaker/source/cunomaker/cunomaker.cxx
deleted file mode 100644
index 56f20b0968c1..000000000000
--- a/codemaker/source/cunomaker/cunomaker.cxx
+++ /dev/null
@@ -1,186 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
-
-#include <stdio.h>
-
-#include "sal/main.h"
-
-#include <codemaker/typemanager.hxx>
-#include <codemaker/dependency.hxx>
-
-#include "cunooptions.hxx"
-#include "cunotype.hxx"
-
-using namespace rtl;
-
-sal_Bool produceAllTypes(const OString& typeName,
-                         TypeManager& typeMgr,
-                         TypeDependency& typeDependencies,
-                         CunoOptions* pOptions,
-                         sal_Bool bFullScope)
-    throw( CannotDumpException )
-{
-    if (!produceType(typeName, typeMgr, typeDependencies, pOptions))
-    {
-        fprintf(stderr, "%s ERROR: %s\n",
-                pOptions->getProgramName().getStr(),
-                OString("cannot dump Type '" + typeName + "'").getStr());
-        exit(99);
-    }
-
-    RegistryKey typeKey = typeMgr.getTypeKey(typeName);
-    RegistryKeyNames subKeys;
-
-    if (typeKey.getKeyNames(OUString(), subKeys))
-        return sal_False;
-
-    OString tmpName;
-    for (sal_uInt32 i=0; i < subKeys.getLength(); i++)
-    {
-        tmpName = OUStringToOString(subKeys.getElement(i), RTL_TEXTENCODING_UTF8);
-
-        if (pOptions->isValid("-B"))
-            tmpName = tmpName.copy(tmpName.indexOf('/', 1) + 1);
-        else
-            tmpName = tmpName.copy(1);
-
-        if (bFullScope)
-        {
-            if (!produceAllTypes(tmpName, typeMgr, typeDependencies, pOptions, sal_True))
-                return sal_False;
-        } else
-        {
-            if (!produceType(tmpName, typeMgr, typeDependencies, pOptions))
-                return sal_False;
-        }
-    }
-
-    return sal_True;
-}
-
-SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-{
-    CunoOptions options;
-
-    try
-    {
-        if (!options.initOptions(argc, argv))
-        {
-            exit(1);
-        }
-    }
-    catch( IllegalArgument& e)
-    {
-        fprintf(stderr, "Illegal option: %s\n", e.m_message.getStr());
-        exit(99);
-    }
-
-    RegistryTypeManager typeMgr;
-    TypeDependency      typeDependencies;
-
-    if (!typeMgr.init(!options.isValid("-T"), options.getInputFiles()))
-    {
-        fprintf(stderr, "%s : init registries failed, check your registry files.\n", options.getProgramName().getStr());
-        exit(99);
-    }
-
-    if (options.isValid("-B"))
-    {
-        typeMgr.setBase(options.getOption("-B"));
-    }
-
-    try
-    {
-        if (options.isValid("-T"))
-        {
-            OString tOption(options.getOption("-T"));
-
-            OString typeName, tmpName;
-            sal_Bool ret = sal_False;
-            sal_Int32 nIndex = 0;
-            do
-            {
-                typeName = tOption.getToken(0, ';', nIndex);
-
-                sal_Int32 nPos = typeName.lastIndexOf( '.' );
-                tmpName = typeName.copy( nPos != -1 ? nPos+1 : 0 );
-                if (tmpName == "*")
-                {
-                    // produce this type and his scope, but the scope is not recursively  generated.
-                    if (typeName.equals("*"))
-                    {
-                        tmpName = "/";
-                    } else
-                    {
-                        tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
-                        if (tmpName.getLength() == 0)
-                            tmpName = "/";
-                        else
-                            tmpName.replace('.', '/');
-                    }
-                    ret = produceAllTypes(tmpName, typeMgr, typeDependencies, &options, sal_False);
-                } else
-                {
-                    // produce only this type
-                    ret = produceType(typeName.replace('.', '/'), typeMgr, typeDependencies, &options);
-                }
-
-                if (!ret)
-                {
-                    fprintf(stderr, "%s ERROR: %s\n",
-                            options.getProgramName().getStr(),
-                            OString("cannot dump Type '" + typeName + "'").getStr());
-                    exit(99);
-                }
-            } while( nIndex != -1 );
-        } else
-        {
-            // produce all types
-            if (!produceAllTypes("/", typeMgr, typeDependencies, &options, sal_True))
-            {
-                fprintf(stderr, "%s ERROR: %s\n",
-                        options.getProgramName().getStr(),
-                        "an error occurs while dumping all types.");
-                exit(99);
-            }
-        }
-    }
-    catch( CannotDumpException& e)
-    {
-        fprintf(stderr, "%s ERROR: %s\n",
-                options.getProgramName().getStr(),
-                e.m_message.getStr());
-        exit(99);
-    }
-
-    return 0;
-}
-
-
diff --git a/codemaker/source/cunomaker/cunooptions.cxx b/codemaker/source/cunomaker/cunooptions.cxx
deleted file mode 100644
index 909ab3edc8dd..000000000000
--- a/codemaker/source/cunomaker/cunooptions.cxx
+++ /dev/null
@@ -1,329 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
-#include    <stdio.h>
-
-#include    "cunooptions.hxx"
-
-using namespace rtl;
-
-sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
-    throw( IllegalArgument )
-{
-    sal_Bool    ret = sal_True;
-    sal_uInt16  i=0;
-
-    if (!bCmdFile)
-    {
-        bCmdFile = sal_True;
-
-        m_program = av[0];
-
-        if (ac < 2)
-        {
-            fprintf(stderr, "%s", prepareHelp().getStr());
-            ret = sal_False;
-        }
-
-        i = 1;
-    } else
-    {
-        i = 0;
-    }
-
-    char    *s=NULL;
-    for (i; i < ac; i++)
-    {
-        if (av[i][0] == '-')
-        {
-            switch (av[i][1])
-            {
-                case 'O':
-                    if (av[i][2] == 'C')
-                    {
-                        if (av[i][3] == '\0')
-                        {
-                            if (i < ac - 1 && av[i+1][0] != '-')
-                            {
-                                i++;
-                                s = av[i];
-                            } else
-                            {
-                                OString tmp("'-OC', please check");
-                                if (i <= ac - 1)
-                                {
-                                    tmp += " your input '" + OString(av[i+1]) + "'";
-                                }
-
-                                throw IllegalArgument(tmp);
-                            }
-                        } else
-                        {
-                            s = av[i] + 3;
-                        }
-
-                        m_options["-OC"] = OString(s);
-                        break;
-                    } else
-                    if (av[i][2] == '\0')
-                    {
-                        if (i < ac - 1 && av[i+1][0] != '-')
-                        {
-                            i++;
-                            s = av[i];
-                        } else
-                        {
-                            OString tmp("'-O', please check");
-                            if (i <= ac - 1)
-                            {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
-                            }
-
-                            throw IllegalArgument(tmp);
-                        }
-                    } else
-                    {
-                        s = av[i] + 2;
-                    }
-
-                    m_options["-O"] = OString(s);
-                    break;
-                case 'B':
-                    if (av[i][2] == '\0')
-                    {
-                        if (i < ac - 1 && av[i+1][0] != '-')
-                        {
-                            i++;
-                            s = av[i];
-                        } else
-                        {
-                            OString tmp("'-B', please check");
-                            if (i <= ac - 1)
-                            {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
-                            }
-
-                            throw IllegalArgument(tmp);
-                        }
-                    } else
-                    {
-                        s = av[i] + 2;
-                    }
-
-                    m_options["-B"] = OString(s);
-                    break;
-                case 'T':
-                    if (av[i][2] == '\0')
-                    {
-                        if (i < ac - 1 && av[i+1][0] != '-')
-                        {
-                            i++;
-                            s = av[i];
-                        } else
-                        {
-                            OString tmp("'-T', please check");
-                            if (i <= ac - 1)
-                            {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
-                            }
-
-                            throw IllegalArgument(tmp);
-                        }
-                    } else
-                    {
-                        s = av[i] + 2;
-                    }
-
-                    if (m_options.count("-T") > 0)
-                    {
-                        OString tmp(m_options["-T"]);
-                        tmp = tmp + ";" + s;
-                        m_options["-T"] = tmp;
-                    } else
-                    {
-                        m_options["-T"] = OString(s);
-                    }
-                    break;
-                case 'U':
-                    if (av[i][2] != '\0')
-                    {
-                        OString tmp("'-U', please check");
-                        if (i <= ac - 1)
-                        {
-                            tmp += " your input '" + OString(av[i]) + "'";
-                        }
-
-                        throw IllegalArgument(tmp);
-                    }
-
-                    m_options["-U"] = OString("");
-                    break;
-/*
-                case 'L':
-                    if (av[i][2] != '\0')
-                    {
-                        OString tmp("'-L', please check");
-                        if (i <= ac - 1)
-                        {
-                            tmp += " your input '" + OString(av[i]) + "'";
-                        }
-
-                        throw IllegalArgument(tmp);
-                    }
-
-                    if (isValid("-C") || isValid("-CS"))
-                    {
-                        OString tmp("'-L' could not be combined with '-C' or '-CS' option");
-                        throw IllegalArgument(tmp);
-                    }
-                    m_options["-L"] = OString("");
-                    break;
-*/
-                case 'C':
-                    if (av[i][2] != '\0')
-                    {
-                        OString tmp("'-C', please check");
-                        if (i <= ac - 1)
-                        {
-                            tmp += " your input '" + OString(av[i]) + "'";
-                        }
-
-                        throw IllegalArgument(tmp);
-                    }
-
-                    if (isValid("-L") || isValid("-CS"))
-                    {
-                        OString tmp("'-C' could not be combined with '-L' or '-CS' option");
-                        throw IllegalArgument(tmp);
-                    }
-                    m_options["-C"] = OString("");
-                    break;
-                case 'G':
-                    if (av[i][2] == 'c')
-                    {
-                        if (av[i][3] != '\0')
-                        {
-                            OString tmp("'-Gc', please check");
-                            if (i <= ac - 1)
-                            {
-                                tmp += " your input '" + OString(av[i]) + "'";
-                            }
-
-                            throw IllegalArgument(tmp);
-                        }
-
-                        m_options["-Gc"] = OString("");
-                        break;
-                    } else
-                    if (av[i][2] != '\0')
-                    {
-                        OString tmp("'-G', please check");
-                        if (i <= ac - 1)
-                        {
-                            tmp += " your input '" + OString(av[i]) + "'";
-                        }
-
-                        throw IllegalArgument(tmp);
-                    }
-
-                    m_options["-G"] = OString("");
-                    break;
-                default:
-                    throw IllegalArgument("the option is unknown" + OString(av[i]));
-                    break;
-            }
-        } else
-        {
-            if (av[i][0] == '@')
-            {
-                FILE* cmdFile = fopen(av[i]+1, "r");
-                  if( cmdFile == NULL )
-                  {
-                    fprintf(stderr, "%s", prepareHelp().getStr());
-                    ret = sal_False;
-                } else
-                {
-                    int rargc=0;
-                    char* rargv[512];
-                    char  buffer[512];
-
-                    while ( fscanf(cmdFile, "%s", buffer) != EOF )
-                    {
-                        rargv[rargc]= strdup(buffer);
-                        rargc++;
-                    }
-                    fclose(cmdFile);
-
-                    ret = initOptions(rargc, rargv, bCmdFile);
-
-                    for (long i=0; i < rargc; i++)
-                    {
-                        free(rargv[i]);
-                    }
-                }
-            } else
-            {
-                m_inputFiles.push_back(av[i]);
-            }
-        }
-    }
-
-    return ret;
-}
-
-OString CunoOptions::prepareHelp()
-{
-    OString help("\nusing: ");
-    help += m_program + " [-options] file_1 ... file_n\nOptions:\n";
-    help += "    -O<path>   = path describes the root directory for the generated output.\n";
-    help += "                 The output directory tree is generated under this directory.\n";
-    help += "    -T<name>   = name specifies a type or a list of types. The output for this\n";
-    help += "      [t1;...]   type is generated. If no '-T' option is specified,\n";
-    help += "                 then output for all types is generated.\n";
-    help += "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n";
-    help += "    -B<name>   = name specifies the base node. All types are searched under this\n";
-    help += "                 node. Default is the root '/' of the registry files.\n";
-    help += "    -U         = activate the generating of a getCppuType_<name> function.\n";
-//  help += "    -L         = getCppuType function with a known leak.\n";
-    help += "    -C         = getCppuType_<name> function keeps comprehensive type information.\n";
-    help += "    -G         = generate only target files which does not exists.\n";
-    help += "    -Gc        = generate only target files which content will be changed.\n";
-    help += prepareVersion();
-
-    return help;
-}
-
-OString CunoOptions::prepareVersion()
-{
-    OString version(m_program);
-    version += " Version 1.0\n\n";
-    return version;
-}
-
-
diff --git a/codemaker/source/cunomaker/cunooptions.hxx b/codemaker/source/cunomaker/cunooptions.hxx
deleted file mode 100644
index ba47d6bcf1b9..000000000000
--- a/codemaker/source/cunomaker/cunooptions.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOOPTIONS_HXX
-#define INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOOPTIONS_HXX
-
-#include    <codemaker/options.hxx>
-
-class CunoOptions : public Options
-{
-public:
-    CunoOptions()
-        : Options() {}
-
-    ~CunoOptions() {}
-
-    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
-            throw( IllegalArgument );
-
-    ::rtl::OString  prepareHelp();
-
-    ::rtl::OString  prepareVersion();
-
-protected:
-};
-
-#endif // INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOOPTIONS_HXX
diff --git a/codemaker/source/cunomaker/cunotype.cxx b/codemaker/source/cunomaker/cunotype.cxx
deleted file mode 100644
index 56e87300eebe..000000000000
--- a/codemaker/source/cunomaker/cunotype.cxx
+++ /dev/null
@@ -1,3533 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
-
-#include <stdio.h>
-#include    <rtl/alloc.h>
-#include    <rtl/ustring.hxx>
-#include    <rtl/strbuf.hxx>
-
-#include    "cunotype.hxx"
-#include    "cunooptions.hxx"
-
-using namespace rtl;
-
-//*************************************************************************
-// CunoType
-//*************************************************************************
-CunoType::CunoType(TypeReader& typeReader,
-                   const OString& typeName,
-                   const TypeManager& typeMgr,
-                   const TypeDependency& typeDependencies)
-    : m_inheritedMemberCount(0)
-    , m_cunoTypeLib(sal_False)
-    , m_cunoTypeLeak(sal_False)
-    , m_cunoTypeDynamic(sal_True)
-    , m_indentLength(0)
-    , m_typeName(typeName)
-//  , m_name(typeName.getToken(typeName.getTokenCount('/') - 1, '/'))
-    , m_name(typeName.replace('/', '_'))
-    , m_reader(typeReader)
-    , m_typeMgr((TypeManager&)typeMgr)
-    , m_dependencies(typeDependencies)
-    , m_bIsNestedType(sal_False)
-{
-    // check if this type is nested
-    sal_Int32 i = typeName.lastIndexOf('/');
-
-    if (i >= 0)
-    {
-        OString outerTypeName(typeName.copy(0, i));
-        m_bIsNestedType = (m_typeMgr.getTypeClass(outerTypeName) == RT_TYPE_INTERFACE);
-    }
-
-    // check if this type has nested types
-    RegistryKey key = m_typeMgr.getTypeKey(typeName);
-
-    key.getKeyNames(OUString(), m_nestedTypeNames);
-}
-
-CunoType::~CunoType()
-{
-
-}
-
-sal_Bool CunoType::isNestedTypeByName(const ::rtl::OString& type)
-{
-    sal_Bool ret = sal_False;
-
-    sal_Int32 i = type.lastIndexOf('/');
-
-    if (i >= 0)
-    {
-        OString outerTypeName(type.copy(0, i));
-        ret = (m_typeMgr.getTypeClass(outerTypeName) == RT_TYPE_INTERFACE);
-    }
-
-    return ret;
-}
-
-sal_Bool CunoType::hasNestedType(const ::rtl::OString& type)
-{
-    sal_Bool ret = sal_False;
-
-    if (m_nestedTypeNames.getLength() > 0)
-    {
-        OUString typeName(OStringToOUString(type, RTL_TEXTENCODING_UTF8));
-
-        for (sal_uInt32 i = 0; !ret && (i < m_nestedTypeNames.getLength()); i++)
-            ret = typeName.equals(m_nestedTypeNames.getElement(i).copy(5));
-    }
-
-    return ret;
-}
-
-sal_Bool CunoType::dump(CunoOptions* pOptions)
-    throw( CannotDumpException )
-{
-    sal_Bool ret = sal_False;
-
-    if (isNestedType())
-        return sal_True;
-
-    if (pOptions->isValid("-U"))
-        m_cunoTypeLib = sal_True;
-    if (pOptions->isValid("-L"))
-        m_cunoTypeLeak = sal_True;
-    if (pOptions->isValid("-C"))
-        m_cunoTypeDynamic = sal_False;
-
-    OString outPath;
-    if (pOptions->isValid("-O"))
-        outPath = pOptions->getOption("-O");
-
-    OString tmpFileName;
-    OString hFileName = createFileNameFromType(outPath, m_typeName, ".h");
-
-    sal_Bool bFileExists = sal_False;
-    sal_Bool bFileCheck = sal_False;
-
-    if ( pOptions->isValid("-G") || pOptions->isValid("-Gc") )
-    {
-        bFileExists = fileExists( hFileName );
-        ret = sal_True;
-    }
-
-    if ( bFileExists && pOptions->isValid("-Gc") )
-    {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tmh");
-        bFileCheck = sal_True;
-    }
-
-    if ( !bFileExists || bFileCheck )
-    {
-        FileStream hFile;
-
-        if ( bFileCheck )
-            hFile.open(tmpFileName);
-        else
-            hFile.open(hFileName);
-
-        if(!hFile.isValid())
-        {
-            OString message("cannot open ");
-            message += hFileName + " for writing";
-            throw CannotDumpException(message);
-        }
-
-        ret = dumpHFile(hFile);
-
-        hFile.close();
-        if (ret && bFileCheck)
-        {
-            ret = checkFileContent(hFileName, tmpFileName);
-        }
-    }
-
-    if ( m_cunoTypeLib )
-    {
-        bFileExists = sal_False;
-        bFileCheck = sal_False;
-
-        if (pOptions->isValid("-OC"))
-            outPath = pOptions->getOption("-OC");
-        else
-            outPath = OString();
-
-        OString cFileName = createFileNameFromType(outPath, m_typeName, ".c");
-
-        if ( pOptions->isValid("-G") || pOptions->isValid("-Gc") )
-        {
-            bFileExists = fileExists( cFileName );
-            ret = sal_True;
-        }
-
-        if ( bFileExists && pOptions->isValid("-Gc") )
-        {
-            tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tmc");
-            bFileCheck = sal_True;
-        }
-
-        if ( !bFileExists || bFileCheck )
-        {
-            FileStream cFile;
-
-            if ( bFileCheck )
-                cFile.open(tmpFileName);
-            else
-                cFile.open(cFileName);
-
-            if(!cFile.isValid())
-            {
-                OString message("cannot open ");
-                message += cFileName + " for writing";
-                throw CannotDumpException(message);
-            }
-
-            ret = dumpCFile(cFile);
-
-            cFile.close();
-            if (ret && bFileCheck)
-            {
-                ret = checkFileContent(cFileName, tmpFileName);
-            }
-        }
-    }
-    return ret;
-}
-sal_Bool CunoType::dumpDependedTypes(CunoOptions* pOptions)
-    throw( CannotDumpException )
-{
-    sal_Bool ret = sal_True;
-
-    TypeUsingSet usingSet(m_dependencies.getDependencies(m_typeName));
-
-    TypeUsingSet::const_iterator iter = usingSet.begin();
-    OString typeName;
-    sal_uInt32 index = 0;
-    while (iter != usingSet.end())
-    {
-        typeName = (*iter).m_type;
-        if ((index = typeName.lastIndexOf(']')) > 0)
-            typeName = typeName.copy(index + 1);
-
-        if (getBaseType(typeName).getLength() == 0)
-        {
-            if (!produceType(typeName,
-                                m_typeMgr,
-                             m_dependencies,
-                             pOptions))
-            {
-                fprintf(stderr, "%s ERROR: %s\n",
-                        pOptions->getProgramName().getStr(),
-                        OString("cannot dump Type '" + typeName + "'").getStr());
-                exit(99);
-            }
-        }
-        ++iter;
-    }
-
-    return ret;
-}
-
-OString CunoType::dumpHeaderDefine(FileStream& o, sal_Char* prefix, sal_Bool bExtended)
-{
-    if (m_typeName.equals("/"))
-    {
-        bExtended = sal_False;
-        m_typeName = "global";
-    }
-
-    sal_uInt32 length = 3 + m_typeName.getLength() + strlen(prefix);
-
-    if (bExtended)
-        length += m_name.getLength() + 1;
-
-    OStringBuffer tmpBuf(length);
-
-    tmpBuf.append('_');
-    tmpBuf.append(m_typeName);
-    tmpBuf.append('_');
-    if (bExtended)
-    {
-        tmpBuf.append(m_name);
-        tmpBuf.append('_');
-    }
-    tmpBuf.append(prefix);
-    tmpBuf.append('_');
-
-    OString tmp(tmpBuf.makeStringAndClear().replace('/', '_').toAsciiUpperCase());
-
-    o << "#ifndef " << tmp << "\n#define " << tmp << "\n";
-
-    return tmp;
-}
-
-void CunoType::dumpDefaultHIncludes(FileStream& o)
-{
-    o << "#ifndef _UNO_CUNO_H_\n"
-      << "#include <uno/cuno.h>\n"
-      << "#endif\n";
-/*
-    if (m_typeMgr.getTypeClass(m_typeName) == RT_TYPE_INTERFACE &&
-        !m_typeName.equals("com/sun/star/uno/XInterface") )
-    {
-        o << "#ifndef _COM_SUN_STAR_UNO_XINTERFACE_H_\n"
-          << "#include <com/sun/star/uno/XInterface.h>\n"
-          << "#endif\n";
-    }
-*/
-}
-
-void CunoType::dumpDefaultCIncludes(FileStream& o)
-{
-    o << "#ifndef _OSL_MUTEX_H_\n"
-      << "#include <osl/mutex.h>\n"
-      << "#endif\n\n";
-}
-
-void CunoType::dumpInclude(FileStream& o, const OString& typeName, sal_Char* prefix, sal_Bool bExtended, sal_Bool bCaseSensitive)
-{
-    sal_uInt32 length = 3+ m_typeName.getLength() + strlen(prefix);
-
-    if (bExtended)
-        length += m_name.getLength() + 1;
-
-    OStringBuffer tmpBuf(length);
-
-    tmpBuf.append('_');
-    tmpBuf.append(typeName);
-    tmpBuf.append('_');
-    if (bExtended)
-    {
-        tmpBuf.append(m_name);
-        tmpBuf.append('_');
-    }
-    tmpBuf.append(prefix);
-    tmpBuf.append('_');
-
-    OString tmp(tmpBuf.makeStringAndClear().replace('/', '_').toAsciiUpperCase());
-
-    length = 1 + typeName.getLength() + strlen(prefix);
-    if (bExtended)
-        length += m_name.getLength() + 1;
-
-    tmpBuf.ensureCapacity(length);
-    tmpBuf.append(typeName);
-    if (bExtended)
-    {
-        tmpBuf.append('/');
-        tmpBuf.append(m_name);
-    }
-    tmpBuf.append('.');
-    tmpBuf.append(prefix);
-
-    o << "#ifndef " << tmp << "\n#include <";
-    if (bCaseSensitive)
-    {
-        o << tmpBuf.makeStringAndClear();
-    } else
-    {
-        o << tmpBuf.makeStringAndClear();
-    }
-    o << ">\n#endif\n";
-}
-
-void CunoType::dumpDepIncludes(FileStream& o, const OString& typeName, sal_Char* prefix)
-{
-    TypeUsingSet usingSet(m_dependencies.getDependencies(typeName));
-
-    TypeUsingSet::const_iterator iter = usingSet.begin();
-
-    OString     sPrefix(OString(prefix).toAsciiUpperCase());
-    sal_Bool    bSequenceDumped = sal_False;
-    sal_uInt32  index = 0;
-    sal_uInt32  seqNum = 0;
-    OString     relType;
-    while (iter != usingSet.end())
-    {
-        sal_Bool bDumpThisType = sal_True;
-        index = (*iter).m_type.lastIndexOf(']');
-        seqNum = (index > 0 ? ((index+1) / 2) : 0);
-
-        relType = (*iter).m_type;
-        if (index > 0)
-            relType = relType.copy(index+1);
-
-        if (isNestedTypeByName(relType) && hasNestedType(relType))
-            bDumpThisType = sal_False;
-
-        if (bDumpThisType)
-        {
-            OString defPrefix("H");
-            if (sPrefix.equals("H"))
-                defPrefix = "H";
-
-            if (seqNum > 0 && !bSequenceDumped)
-            {
-                bSequenceDumped = sal_True;
-                o << "#ifndef _UNO_SEQUENCE2_" << defPrefix
-                  << "_\n#include <uno/sequence2." << defPrefix.toAsciiLowerCase()
-                  << ">\n#endif\n";
-            }
-
-            if (getBaseType(relType).getLength() == 0 &&
-                m_typeName != relType)
-            {
-                if (m_typeMgr.getTypeClass(relType) == RT_TYPE_INTERFACE
-                    && sPrefix.equals("H"))
-                {
-                    if (!((*iter).m_use & TYPEUSE_SUPER))
-                    {
-                        if (isNestedTypeByName(relType))
-                        {
-                            sal_Int32 iLastS = relType.lastIndexOf('/');
-
-                            OString outerNamespace(relType.copy(0,iLastS));
-                            OString innerClass(relType.copy(iLastS+1));
-
-                            iLastS = outerNamespace.lastIndexOf('/');
-                            OString outerClass(outerNamespace.copy(iLastS+1));
-
-//                          o << "\n";
-//                          dumpNameSpace(o, sal_True, sal_False, outerNamespace);
-//                          o << "\nclass " << outerClass << "::" << innerClass << ";\n";
-//                          dumpNameSpace(o, sal_False, sal_False, outerNamespace);
-//                          o << "\n\n";
-                        }
-                        else
-                        {
-//                          dumpInclude(o, relType, prefix);
-                            OString type(relType.replace('/', '_'));
-                            o << "\n#ifndef " << type.toAsciiUpperCase() << "\n";
-                            o << "#define " << type.toAsciiUpperCase() << "\n";
-                            o << "struct _" << type << ";\n"
-                              << "typedef struct _" << type << "_ftab * " << type << ";\n";
-                            o << "#endif\n\n";
-                        }
-                    } else
-                    {
-                        if (isNestedTypeByName(relType))
-                        {
-                            sal_Int32 iLastS = relType.lastIndexOf('/');
-
-                            OString outerNamespace(relType.copy(0,iLastS));
-
-                            dumpInclude(o, outerNamespace, prefix);
-                        }
-                        else
-                            dumpInclude(o, relType, prefix);
-                    }
-                } else
-                {
-                    if (isNestedTypeByName(relType))
-                    {
-                        sal_Int32 iLastS = relType.lastIndexOf('/');
-
-                        OString outerNamespace(relType.copy(0,iLastS));
-
-                        dumpInclude(o, outerNamespace, prefix);
-                    }
-                    else
-                        dumpInclude(o, relType, prefix);
-                }
-            } else
-            if (relType == "any")
-            {
-                o << "#ifndef _UNO_ANY2_H_\n"
-                  << "#include <uno/any2.h>\n"
-                  << "#endif\n";
-            } else
-            if (relType == "type")
-            {
-                o << "#ifndef _TYPELIB_TYPEDESCRIPTION_H_\n"
-                  << "#include <typelib/typedescription.h>\n"
-                  << "#endif\n";
-            } else
-            if (relType == "string" && sPrefix.equals("H"))
-            {
-                o << "#ifndef _RTL_USTRING_H_\n"
-                  << "#include <rtl/ustring.h>\n"
-                  << "#endif\n";
-            }
-        }
-        ++iter;
-    }
-    if (m_typeName.equals(typeName) && (getNestedTypeNames().getLength() > 0))
-    {
-        o << "// includes for nested types\n\n";
-
-        for (sal_uInt32 i = 0; i < getNestedTypeNames().getLength(); i++)
-        {
-            OUString s(getNestedTypeNames().getElement(i));
-
-            OString nestedName(s.getStr(), s.getLength(), RTL_TEXTENCODING_UTF8);
-
-            dumpDepIncludes(o, nestedName, prefix);
-        }
-    }
-}
-
-void CunoType::dumpOpenExternC(FileStream& o)
-{
-    o << "#ifdef __cplusplus\n"
-      << "extern \"C\" {\n"
-      << "#endif\n\n";
-}
-
-void CunoType::dumpCloseExternC(FileStream& o)
-{
-    o << "#ifdef __cplusplus\n"
-      << "}\n"
-      << "#endif\n\n";
-}
-
-void CunoType::dumpLGetCunoType(FileStream& o)
-{
-    OString typeName(m_typeName.replace('/', '_'));
-
-    o << "#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-      << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-      << "#endif\n\n";
-
-    if (m_reader.getTypeClass() == RT_TYPE_TYPEDEF)
-    {
-        o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << typeName << "_Type( ) SAL_THROW( () )\n{\n";
-    } else
-    {
-        o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCunoType( ";
-        dumpType(o, m_typeName, sal_True, sal_False);
-        o << "* ) SAL_THROW( () )\n{\n";
-    }
-    inc();
-
-    o << indent() << "#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-      << indent() << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-      << indent() << "#endif\n\n";
-
-    o << indent() << "if ( !s_pType_" << typeName << " )\n" << indent() << "{\n";
-    inc();
-    o << indent() << "typelib_static_type_init( &s_pType_" << typeName << ", "
-      << getTypeClass(m_typeName, sal_True) << ", \"" << m_typeName.replace('/', '.') << "\" );\n";
-    dec();
-    o << indent() << "}\n";
-    o << indent() << "return * reinterpret_cast< ::com::sun::star::uno::Type * >( &s_pType_"
-      << typeName <<" );\n";
-    dec();
-    o << indent() << "}\n";
-
-    return;
-}
-
-void CunoType::dumpGetCunoType(FileStream& o)
-{
-    OString typeName(m_typeName.replace('/', '_'));
-
-    if ( m_cunoTypeLeak )
-    {
-        dumpLGetCunoType(o);
-        return;
-    }
-    if ( !m_cunoTypeDynamic )
-    {
-        dumpCGetCunoType(o);
-        return;
-    }
-
-    dumpOpenExternC(o);
-
-    if ( !m_typeName.equals("com/sun/star/uno/Exception") )
-    {
-        o << "#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-          << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-          << "#endif\n\n";
-    }
-
-    o << "typelib_TypeDescriptionReference ** SAL_CALL getCUnoType_" << m_name << "() SAL_THROW_EXTERN_C( () )\n{\n";
-    inc();
-
-    if ( m_typeName.equals("com/sun/star/uno/Exception") )
-    {
-        o << indent() << "return typelib_static_type_getByTypeClass( typelib_TypeClass_EXCEPTION );\n";
-    } else
-    {
-        o << indent() << "#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-          << indent() << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-          << indent() << "#endif\n\n";
-
-        o << indent() << "if ( !s_pType_" << typeName << " )\n" << indent() << "{\n";
-        inc();
-
-        OString superType(m_reader.getSuperTypeName());
-        sal_Bool bIsBaseException = sal_False;
-        if (superType.getLength() > 0)
-        {
-            if ( superType.equals("com/sun/star/uno/Exception") )
-            {
-                bIsBaseException = sal_True;
-            } else
-            {
-                o << indent() << "typelib_TypeDescriptionReference * pBaseType = 0;\n";
-            }
-        }
-
-        sal_uInt32 count = getMemberCount();
-        if (count)
-        {
-            o << indent() << "typelib_TypeDescriptionReference * aMemberRefs[" << count << "];\n";
-        }
-
-        if ( !bIsBaseException )
-        {
-            o << indent() << "typelib_typedescriptionreference_newByAsciiName(&pBaseType, typelib_TypeClass_INTERFACE, \""
-              << superType.replace('/', '.') << "\" );\n";
-        }
-
-        if (count)
-        {
-            sal_uInt32      fieldCount = m_reader.getFieldCount();
-            RTFieldAccess   access = RT_ACCESS_INVALID;
-            OString         fieldType, fieldName;
-            OString         scope = m_typeName.replace('/', '.');
-            sal_Bool        bWithScope = sal_True;
-            OString         modFieldType;
-            StringSet       generatedTypeSet;
-            StringSet::iterator findIter;
-
-            for (sal_uInt16 i=0; i < fieldCount; i++)
-            {
-                access = m_reader.getFieldAccess(i);
-
-                if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-                    continue;
-
-                fieldName = m_reader.getFieldName(i);
-                fieldType = checkRealBaseType(m_reader.getFieldType(i), sal_True);
-
-//              modFieldType = typeToIdentifier(fieldType);
-
-                findIter = generatedTypeSet.find(fieldType);
-                if ( findIter == generatedTypeSet.end() )
-                {
-                    generatedTypeSet.insert(fieldType);
-                    o << indent() << "typelib_typedescriptionreference_newByAsciiName(&aMemberRefs["
-                      << i << "], " << getTypeClass(fieldType, sal_True);
-                    o << "  , \"" << fieldType.replace('/', '.') << "\" );\n";
-                }
-            }
-            o << "\n";
-        }
-
-        o << indent() << "typelib_static_compound_type_init( &s_pType_" << typeName << ", "
-          << getTypeClass(m_typeName, sal_True) << ", \"" << m_typeName.replace('/', '.') << "\", ";
-        if ( superType.getLength() > 0 || bIsBaseException )
-        {
-            if ( bIsBaseException )
-            {
-                o << "* typelib_static_type_getByTypeClass( typelib_TypeClass_EXCEPTION ), "
-                  << count << ", ";
-            } else
-            {
-                o << "pBaseType, " << count << ", ";
-            }
-        } else
-        {
-            o << "0, " << count << ", ";
-        }
-
-        if (count)
-        {
-            o << " aMemberRefs );\n";
-        } else
-        {
-            o << " 0 );\n";
-        }
-        dec();
-        o << indent() << "}\n"
-          << indent() << "typelib_typedescriptionreference_acquire( s_pType_" << typeName << " );\n"
-          << indent() << "return &_pType_" << typeName <<" );\n";
-    }
-    dec();
-    o << indent() << "}\n";
-
-    dumpCloseExternC(o);
-}
-
-void CunoType::dumpCGetCunoType(FileStream& o)
-{
-    OString typeName(m_typeName.replace('/', '_'));
-
-    dumpOpenExternC(o);
-
-    o << "#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-      << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-      << "#endif\n\n";
-
-    o << "typelib_TypeDescriptionReference ** SAL_CALL getCUnoType_" << m_name << "() SAL_THROW_EXTERN_C( () )\n{\n";
-    inc();
-
-    o << "#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-      << indent() << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-      << "#endif\n\n";
-
-    o << indent() << "if ( !s_pType_" << typeName << " )\n" << indent() << "{\n";
-    inc();
-    o << indent() << "oslMutex * pMutex = osl_getGlobalMutex();\n"
-      << indent() << "osl_acquireMutex( pMutex );\n";
-
-    o << indent() << "if ( !s_pType_" << typeName << " )\n" << indent() << "{\n";
-    inc();
-    o << indent() << "rtl_uString * pTypeName = 0;\n"
-       << indent() << "typelib_TypeDescription * pTD = 0;\n";
-
-    OString superType(m_reader.getSuperTypeName());
-    if (superType.getLength() > 0)
-        o << indent() << "typelib_TypeDescriptionReference * pSuperType = 0;\n";
-
-    sal_uInt32      count = getMemberCount();
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    if (count)
-    {
-        o << indent() << "typelib_CompoundMember_Init aMembers["
-          << count << "];\n";
-
-        for (sal_uInt16 i=0; i < fieldCount; i++)
-        {
-            access = m_reader.getFieldAccess(i);
-
-            if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-                continue;
-
-            o << indent() << "rtl_uString * pMemberName" << i << " = 0;\n"
-              << indent() << "rtl_uString * pMemberType" << i << " = 0;\n";
-        }
-    }
-
-    o << indent() << "rtl_uString_newFromAscii( &pTypeName, \"" << m_typeName.replace('/', '.') << "\" );\n";
-
-    if (superType.getLength() > 0)
-    {
-        o << indent() << "typelib_typedescriptionreference_newByAsciiName(&pSuperType, typelib_TypeClass_INTERFACE, \""
-          << superType.replace('/', '.') << "\" );\n";
-    }
-
-    dumpCppuGetTypeMemberDecl(o, CUNOTYPEDECL_ALLTYPES);
-
-    if (count)
-    {
-        OString         fieldType, fieldName;
-        OString         scope = m_typeName.replace('/', '.');
-
-        for (sal_uInt16 i=0; i < fieldCount; i++)
-        {
-            access = m_reader.getFieldAccess(i);
-
-            if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-                continue;
-
-            fieldName = m_reader.getFieldName(i);
-            fieldType = checkRealBaseType(m_reader.getFieldType(i), sal_True);
-
-            o << indent() << "rtl_uString_newFromAscii( &pMemberType" << i << ", \""
-              << fieldType.replace('/', '.') << "\") );\n";
-            o << indent() << "rtl_uString_newFromAscii( &pMemberName" << i << ", \"";
-            o << fieldName << "\") );\n";
-            o << indent() << "aMembers[" << i << "].eTypeClass = "
-              << getTypeClass(fieldType, sal_True) << ";\n"
-              << indent() << "aMembers[" << i << "].pTypeName = pMemberType" << i << ";\n"
-              << indent() << "aMembers[" << i << "].pMemberName = pMemberName" << i << ";\n";
-        }
-
-        o << "\n" << indent() << "typelib_typedescription_new(\n";
-        inc();
-        o << indent() << "&pTD,\n" << indent()
-          << getTypeClass(OString(), sal_True) << ", pTypeName,\n";
-
-        if (superType.getLength() > 0)
-            o << indent() << "pSuperType,\n";
-        else
-            o << indent() << "0,\n";
-
-        if ( count )
-        {
-            o << indent() << count << ",\n" << indent() << "aMembers );\n\n";
-        } else
-        {
-            o << indent() << count << ",\n" << indent() << "0 );\n\n";
-        }
-
-        dec();
-        o << indent() << "typelib_typedescription_register( &pTD );\n\n";
-
-        o << indent() << "typelib_typedescriptionreference_new( &s_pType_ " << typeName
-          << getTypeClass(OString(), sal_True) << ", pTD);\n\n";
-
-        o << indent() << "typelib_typedescription_release( pTD );\n"
-          << indent() << "typelib_typedescriptionreference_release( pSuperType );\n"
-          << indent() << "rtl_uString_release( pTypeName );\n";
-
-        for (i=0; i < fieldCount; i++)
-        {
-            access = m_reader.getFieldAccess(i);
-
-            if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-                continue;
-
-            o << indent() << "rtl_uString_release( pMemberName" << i << " );\n"
-              << indent() << "rtl_uString_release( pMemberType" << i << " );\n";
-        }
-    }
-
-    dec();
-    o << indent() << "}\n";
-    o << indent() << "osl_releaseMutex( pMutex );\n";
-    dec();
-    o << indent() << "}\n"
-      << indent() << "typelib_typedescriptionreference_acquire( s_pType_" << typeName << " );\n"
-      << indent() << "return &s_pType_" << typeName <<" );\n";
-    dec();
-    o << "}\n";
-
-    dumpCloseExternC(o);
-}
-
-void CunoType::dumpCppuGetTypeMemberDecl(FileStream& o, CunoTypeDecl eDeclFlag)
-{
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-
-    if ( fieldCount )
-    {
-        o << indent() << "{\n" << indent() << "typelib_TypeDescriptionReference ** ppTypeRef = 0;\n";
-
-        StringSet aFinishedTypes;
-        for (sal_uInt16 i=0; i < fieldCount; i++)
-        {
-            access = m_reader.getFieldAccess(i);
-
-            if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-                continue;
-
-            if (aFinishedTypes.count(m_reader.getFieldType(i)) == 0)
-            {
-                aFinishedTypes.insert(m_reader.getFieldType(i));
-                dumpCppuGetType(o, m_reader.getFieldType(i), sal_True, eDeclFlag);
-            }
-        }
-        o << indent() << "}\n";
-    }
-}
-
-sal_uInt32 CunoType::getMemberCount()
-{
-    sal_uInt32 count = m_reader.getMethodCount();
-
-    sal_uInt32 fieldCount = m_reader.getFieldCount();
-    RTFieldAccess access = RT_ACCESS_INVALID;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-            count++;
-    }
-    return count;
-}
-
-sal_uInt32 CunoType::checkInheritedMemberCount(const TypeReader* pReader)
-{
-    sal_Bool bSelfCheck = sal_True;
-    if (!pReader)
-    {
-        bSelfCheck = sal_False;
-        pReader = &m_reader;
-    }
-
-    sal_uInt32 count = 0;
-    OString superType(pReader->getSuperTypeName());
-    if (superType.getLength() > 0)
-    {
-        TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
-        if ( aSuperReader.isValid() )
-        {
-            count = checkInheritedMemberCount(&aSuperReader);
-        }
-    }
-
-    if (bSelfCheck)
-    {
-        count += pReader->getMethodCount();
-        sal_uInt32 fieldCount = pReader->getFieldCount();
-        RTFieldAccess access = RT_ACCESS_INVALID;
-        for (sal_uInt16 i=0; i < fieldCount; i++)
-        {
-            access = pReader->getFieldAccess(i);
-
-            if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-            {
-                count++;
-            }
-        }
-    }
-
-    return count;
-}
-
-sal_uInt32 CunoType::getInheritedMemberCount()
-{
-    if (m_inheritedMemberCount == 0)
-    {
-        m_inheritedMemberCount = checkInheritedMemberCount(0);
-    }
-
-    return m_inheritedMemberCount;
-}
-
-void CunoType::dumpInheritedMembers(FileStream& o, rtl::OString& superType)
-{
-    TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
-
-    OString baseType(aSuperReader.getSuperTypeName());
-    if (baseType.getLength() > 0)
-    {
-        dumpInheritedMembers(o, baseType);
-    }
-
-    sal_uInt32 fieldCount = aSuperReader.getFieldCount();
-    RTFieldAccess access = RT_ACCESS_INVALID;
-    OString fieldName;
-    OString fieldType;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = aSuperReader.getFieldAccess(i);
-
-        if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-        {
-            fieldName = aSuperReader.getFieldName(i);
-            fieldType = aSuperReader.getFieldType(i);
-
-            o << indent();
-            dumpType(o, fieldType);
-            o << " " << fieldName << ";\n";
-        }
-    }
-}
-
-OString CunoType::getTypeClass(const OString& type, sal_Bool bCStyle)
-{
-    OString     typeName = (type.getLength() > 0 ? type : m_typeName);
-    RTTypeClass rtTypeClass = RT_TYPE_INVALID;
-
-    if (type.getLength() > 0)
-    {
-        typeName = type;
-        rtTypeClass = m_typeMgr.getTypeClass(typeName);
-    } else
-    {
-        typeName = m_typeName;
-        rtTypeClass = m_reader.getTypeClass();
-    }
-
-    if (typeName.lastIndexOf(']') > 0)
-        return bCStyle ? "typelib_TypeClass_SEQUENCE" : "::com::sun::star::uno::TypeClass_SEQUENCE";
-
-    switch (rtTypeClass)
-    {
-        case RT_TYPE_INTERFACE:
-            return bCStyle ? "typelib_TypeClass_INTERFACE" : "::com::sun::star::uno::TypeClass_INTERFACE";
-            break;
-        case RT_TYPE_MODULE:
-            return bCStyle ? "typelib_TypeClass_MODULE" : "::com::sun::star::uno::TypeClass_MODULE";
-            break;
-        case RT_TYPE_STRUCT:
-            return bCStyle ? "typelib_TypeClass_STRUCT" : "::com::sun::star::uno::TypeClass_STRUCT";
-            break;
-        case RT_TYPE_ENUM:
-            return bCStyle ? "typelib_TypeClass_ENUM" : "::com::sun::star::uno::TypeClass_ENUM";
-            break;
-        case RT_TYPE_EXCEPTION:
-            return bCStyle ? "typelib_TypeClass_EXCEPTION" : "::com::sun::star::uno::TypeClass_EXCEPTION";
-            break;
-        case RT_TYPE_TYPEDEF:
-            {
-                OString realType = checkRealBaseType( typeName );
-                return getTypeClass( realType, bCStyle );
-            }
-//          return bCStyle ? "typelib_TypeClass_TYPEDEF" : "::com::sun::star::uno::TypeClass_TYPEDEF";
-            break;
-        case RT_TYPE_SERVICE:
-            return bCStyle ? "typelib_TypeClass_SERVICE" : "::com::sun::star::uno::TypeClass_SERVICE";
-            break;
-        case RT_TYPE_INVALID:
-            {
-                if (type.equals("long"))
-                    return bCStyle ? "typelib_TypeClass_LONG" : "::com::sun::star::uno::TypeClass_LONG";
-                if (type.equals("short"))
-                    return bCStyle ? "typelib_TypeClass_SHORT" : "::com::sun::star::uno::TypeClass_SHORT";
-                if (type.equals("hyper"))
-                    return bCStyle ? "typelib_TypeClass_HYPER" : "::com::sun::star::uno::TypeClass_HYPER";
-                if (type.equals("string"))
-                    return bCStyle ? "typelib_TypeClass_STRING" : "::com::sun::star::uno::TypeClass_STRING";
-                if (type.equals("boolean"))
-                    return bCStyle ? "typelib_TypeClass_BOOLEAN" : "::com::sun::star::uno::TypeClass_BOOLEAN";
-                if (type.equals("char"))
-                    return bCStyle ? "typelib_TypeClass_CHAR" : "::com::sun::star::uno::TypeClass_CHAR";
-                if (type.equals("byte"))
-                    return bCStyle ? "typelib_TypeClass_BYTE" : "::com::sun::star::uno::TypeClass_BYTE";
-                if (type.equals("any"))
-                    return bCStyle ? "typelib_TypeClass_ANY" : "::com::sun::star::uno::TypeClass_ANY";
-                if (type.equals("type"))
-                    return bCStyle ? "typelib_TypeClass_TYPE" : "::com::sun::star::uno::TypeClass_TYPE";
-                if (type.equals("float"))
-                    return bCStyle ? "typelib_TypeClass_FLOAT" : "::com::sun::star::uno::TypeClass_FLOAT";
-                if (type.equals("double"))
-                    return bCStyle ? "typelib_TypeClass_DOUBLE" : "::com::sun::star::uno::TypeClass_DOUBLE";
-                if (type.equals("void"))
-                    return bCStyle ? "typelib_TypeClass_VOID" : "::com::sun::star::uno::TypeClass_VOID";
-                if (type.equals("unsigned long"))
-                    return bCStyle ? "typelib_TypeClass_UNSIGNED_LONG" : "::com::sun::star::uno::TypeClass_UNSIGNED_LONG";
-                if (type.equals("unsigned short"))
-                    return bCStyle ? "typelib_TypeClass_UNSIGNED_SHORT" : "::com::sun::star::uno::TypeClass_UNSIGNED_SHORT";
-                if (type.equals("unsigned hyper"))
-                    return bCStyle ? "typelib_TypeClass_UNSIGNED_HYPER" : "::com::sun::star::uno::TypeClass_UNSIGNED_HYPER";
-            }
-            break;
-    }
-
-    return bCStyle ? "typelib_TypeClass_UNKNOWN" : "::com::sun::star::uno::TypeClass_UNKNOWN";
-}
-
-void CunoType::dumpType(FileStream& o, const OString& type,
-                        sal_Bool bConst, sal_Bool bPointer, sal_Bool bParam)
-    throw( CannotDumpException )
-{
-    OString sType(checkRealBaseType(type, sal_True));
-    sal_uInt32 index = sType.lastIndexOf(']');
-    sal_uInt32 seqNum = (index > 0 ? ((index+1) / 2) : 0);
-
-    OString relType = (index > 0 ? (sType).copy(index+1) : type);
-
-    RTTypeClass typeClass = m_typeMgr.getTypeClass(relType);
-
-//  if (bConst) o << "const ";
-
-    if ( seqNum )
-    {
-        o << "/*";
-        sal_uInt32 i;
-        for (i=0; i < seqNum; i++)
-        {
-            o << "sequence< ";
-        }
-        o << relType.replace( '/', '.');
-        for (i=0; i < seqNum; i++)
-        {
-            o << " >";
-        }
-        o << "*/ uno_Sequence *";
-        if (bPointer) o << "*";
-        return;
-    }
-    switch (typeClass)
-    {
-        case RT_TYPE_INTERFACE:
-            o << relType.replace('/', '_') << " *";
-            break;
-        case RT_TYPE_INVALID:
-            {
-                OString tmp(getBaseType(relType));
-                if (tmp.getLength() > 0)
-                {
-                    o << tmp.getStr();
-                    if ( bParam && !bPointer && relType.equals("any") )
-                        o << " *";
-                } else
-                    throw CannotDumpException("Unknown type '" + relType + "', incomplete type library.");
-            }
-            break;
-        case RT_TYPE_STRUCT:
-        case RT_TYPE_EXCEPTION:
-            o << relType.replace('/', '_');
-            if ( bParam && !bPointer ) o << " *";
-            break;
-        case RT_TYPE_ENUM:
-        case RT_TYPE_TYPEDEF:
-            o << relType.replace('/', '_');
-            break;
-    }
-
-    if (bPointer) o << "*";
-}
-
-OString CunoType::getBaseType(const OString& type)
-{
-    if (type.equals("long"))
-        return "sal_Int32";
-    if (type.equals("short"))
-        return "sal_Int16";
-    if (type.equals("hyper"))
-        return "sal_Int64";
-    if (type.equals("string"))
-        return "rtl_uString *";
-    if (type.equals("boolean"))
-        return "sal_Bool";
-    if (type.equals("char"))
-        return "sal_Unicode";
-    if (type.equals("byte"))
-        return "sal_Int8";
-    if (type.equals("any"))
-        return "uno_Any";
-    if (type.equals("type"))
-        return "typelib_TypeDescriptionReference *";
-    if (type.equals("float"))
-        return "float";
-    if (type.equals("double"))
-        return "double";
-    if (type.equals("octet"))
-        return "sal_Int8";
-    if (type.equals("void"))
-        return type;
-    if (type.equals("unsigned long"))
-        return "sal_uInt32";
-    if (type.equals("unsigned short"))
-        return "sal_uInt16";
-    if (type.equals("unsigned hyper"))
-        return "sal_uInt64";
-
-    return OString();
-}
-
-void CunoType::dumpCppuGetType(FileStream& o, const OString& type, sal_Bool bDecl, CunoTypeDecl eDeclFlag)
-{
-    OString sType( checkRealBaseType(type, sal_True) );
-    sal_uInt32 index = sType.lastIndexOf(']');
-    OString relType = (index > 0 ? (sType).copy(index+1) : type);
-
-    if (eDeclFlag == CUNOTYPEDECL_ONLYINTERFACES)
-    {
-         if (m_typeMgr.getTypeClass(relType) == RT_TYPE_INTERFACE)
-        {
-            if (bDecl)
-                o << indent() << "ppTypeRef = ";
-            else
-                o << indent();
-
-            o << "getCUnoType_" << type.replace('/', '_') << "()";
-
-            if (bDecl)
-                o << ";\n" << indent() << "typelib_typedescriptionreference_release( *ppTypeRef );\n";
-        }
-    } else
-    {
-        if (isBaseType(type))
-        {
-            return;
-        } else
-        {
-            if (eDeclFlag == CUNOTYPEDECL_NOINTERFACES &&
-                m_typeMgr.getTypeClass(relType) == RT_TYPE_INTERFACE)
-                return;
-
-            if ( type.equals("type") )
-                return;
-
-            if (bDecl)
-                o << indent() << "ppTypeRef = ";
-            else
-                o << indent();
-
-            o << indent() << "getCUnoType_" << type.replace('/', '_') << "()";
-        }
-        if (bDecl)
-            o << ";\n" << indent() << "typelib_typedescriptionreference_release( *ppTypeRef );\n";
-    }
-}
-
-void CunoType::dumpTypeInit(FileStream& o, const OString& typeName)
-{
-    OString type(checkSpecialCunoType(typeName));
-
-    BASETYPE baseType = isBaseType(type);
-
-    switch (baseType)
-    {
-        case BT_BOOLEAN:
-            o << "(sal_False)";
-            return;
-            break;
-        case BT_ANY:
-        case BT_STRING:
-            o << "()";
-            return;
-            break;
-        case BT_INVALID:
-            break;
-        default:
-            o << "((";
-            dumpType(o, type);
-            o << ")" << "0)";
-            return;
-    }
-
-    RTTypeClass typeClass = m_typeMgr.getTypeClass(type);
-
-    if (typeClass == RT_TYPE_ENUM)
-    {
-        RegistryTypeReaderLoader aReaderLoader;
-
-        if (aReaderLoader.isLoaded())
-        {
-            TypeReader reader(m_typeMgr.getTypeReader(type));
-
-            if ( reader.isValid() )
-            {
-                sal_Int32 i = type.lastIndexOf('/');
-                o << "(" << shortScopedName("", type, sal_False)
-                  << "::" << type.copy( i != -1 ? i+1 :0 )
-                  << "_" << reader.getFieldName(0) << ")";
-                return;
-            }
-        }
-    }
-
-    o << "()";
-}
-
-BASETYPE CunoType::isBaseType(const OString& type)
-{
-    if (type.equals("long"))
-        return BT_LONG;
-    if (type.equals("short"))
-        return BT_SHORT;
-    if (type.equals("hyper"))
-        return BT_HYPER;
-    if (type.equals("string"))
-        return BT_STRING;
-    if (type.equals("boolean"))
-        return BT_BOOLEAN;
-    if (type.equals("char"))
-        return BT_CHAR;
-    if (type.equals("byte"))
-        return BT_BYTE;
-    if (type.equals("any"))
-        return BT_ANY;
-    if (type.equals("float"))
-        return BT_FLOAT;
-    if (type.equals("double"))
-        return BT_DOUBLE;
-    if (type.equals("void"))
-        return BT_VOID;
-    if (type.equals("unsigned long"))
-        return BT_UNSIGNED_LONG;
-    if (type.equals("unsigned short"))
-        return BT_UNSIGNED_SHORT;
-    if (type.equals("unsigned hyper"))
-        return BT_UNSIGNED_HYPER;
-
-    return BT_INVALID;
-}
-
-OString CunoType::typeToIdentifier(const OString& type)
-{
-    sal_uInt32 index = type.lastIndexOf(']');
-    sal_uInt32 seqNum = (index > 0 ? ((index+1) / 2) : 0);
-
-    OString relType = (index > 0 ? ((OString)type).copy(index+1) : type);
-    OString sIdentifier;
-
-    while( seqNum > 0 )
-    {
-        sIdentifier += OString("seq");
-
-        if ( --seqNum == 0 )
-        {
-            sIdentifier += OString("_");
-        }
-    }
-
-    if ( isBaseType(relType) )
-    {
-        sIdentifier += relType.replace(' ', '_');
-    } else
-    {
-        sIdentifier += relType.replace('/', '_');
-    }
-
-
-    return sIdentifier;
-}
-
-OString CunoType::checkSpecialCunoType(const OString& type)
-{
-    OString baseType(type);
-
-    RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader();
-
-    RegistryKey     key;
-    sal_uInt8*      pBuffer=NULL;
-    RTTypeClass     typeClass;
-    sal_Bool        isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
-    TypeReader      reader;
-
-    while (isTypeDef)
-    {
-        reader = m_typeMgr.getTypeReader(baseType);
-
-        if (reader.isValid())
-        {
-            typeClass = reader.getTypeClass();
-
-            if (typeClass == RT_TYPE_TYPEDEF)
-                baseType = reader.getSuperTypeName();
-            else
-                isTypeDef = sal_False;
-        } else
-        {
-            break;
-        }
-    }
-
-    return baseType;
-}
-
-sal_Bool CunoType::isSeqType(const OString& type, OString& baseType, OString& seqPrefix)
-{
-    if ( type.getStr()[0] == '[' )
-    {
-        sal_uInt32 index = type.lastIndexOf(']');
-        baseType = ((OString)type).copy(index+1);
-        seqPrefix = ((OString)type).copy(0, index+1);
-        return sal_True;
-    } else
-    {
-        baseType = type;
-        seqPrefix = OString();
-    }
-    return sal_False;
-}
-
-sal_Bool CunoType::isArrayType(const OString& type, OString& baseType, OString& arrayPrefix)
-{
-    if ( type.getStr()[type.getLength()-1] == ']' )
-    {
-        sal_uInt32 index = type.indexOf('[');
-        baseType = ((OString)type).copy(0, index-1);
-        arrayPrefix = ((OString)type).copy(index);
-        return sal_True;
-    } else
-    {
-        baseType = type;
-        arrayPrefix = OString();
-    }
-    return sal_False;
-}
-
-OString CunoType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly)
-{
-    OString realType;
-    OString baseType;
-    OString completePrefix;
-    OString prefix;
-    sal_Bool bSeqType = sal_True;
-
-    if ( !isSeqType(type, baseType, completePrefix) )
-        isArrayType(type, baseType, completePrefix);
-
-    RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader();
-
-    RegistryKey     key;
-    sal_uInt8*      pBuffer=NULL;
-    RTTypeClass     typeClass;
-    sal_Bool        mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
-    TypeReader      reader;
-    while (mustBeChecked)
-    {
-        reader = m_typeMgr.getTypeReader(baseType);
-
-        if (reader.isValid())
-        {
-            typeClass = reader.getTypeClass();
-
-            if (typeClass == RT_TYPE_TYPEDEF)
-            {
-                realType = reader.getSuperTypeName();
-                if ( isSeqType(realType, baseType, prefix) ||
-                     isArrayType(realType, baseType, prefix) )
-                {
-                    completePrefix += prefix;
-                }
-            } else
-                mustBeChecked = sal_False;
-        } else
-        {
-            break;
-        }
-    }
-
-    if ( bResolveTypeOnly )
-    {
-        if ( completePrefix.getLength() > 0 )
-        {
-            baseType = bSeqType ? (completePrefix + baseType) : ( baseType + completePrefix);
-        }
-    }
-    return baseType;
-}
-
-void CunoType::dumpConstantValue(FileStream& o, sal_uInt16 index)
-{
-    RTConstValue constValue = m_reader.getFieldConstValue(index);
-
-    switch (constValue.m_type)
-    {
-        case RT_TYPE_BOOL:
-            if (constValue.m_value.aBool)
-                o << "sal_True";
-            else
-                o << "sal_False";
-            break;
-        case RT_TYPE_BYTE:
-            {
-                char tmp[16];
-                snprintf(tmp, sizeof(tmp), "0x%x", (sal_Int8)constValue.m_value.aByte);
-                o << "(sal_Int8)" << tmp;
-            }
-            break;
-        case RT_TYPE_INT16:
-            o << "(sal_Int16)" << constValue.m_value.aShort;
-            break;
-        case RT_TYPE_UINT16:
-            o << "(sal_uInt16)" << constValue.m_value.aUShort;
-            break;
-        case RT_TYPE_INT32:
-            o << "(sal_Int32)" << constValue.m_value.aLong;
-            break;
-        case RT_TYPE_UINT32:
-            o << "(sal_uInt32)" << constValue.m_value.aULong;
-            break;
-        case RT_TYPE_INT64:
-            {
-                ::rtl::OString tmp( OString::valueOf(constValue.m_value.aHyper) );
-                o << "(sal_Int64)" << tmp.getStr() << "L";
-            }
-            break;
-        case RT_TYPE_UINT64:
-            {
-                ::rtl::OString tmp( OString::valueOf((sal_Int64)constValue.m_value.aUHyper) );
-                o << "(sal_uInt64)" << tmp.getStr() << "L";
-            }
-            break;
-        case RT_TYPE_FLOAT:
-            {
-                ::rtl::OString tmp( OString::valueOf(constValue.m_value.aFloat) );
-                o << "(float)" << tmp.getStr();
-            }
-            break;
-        case RT_TYPE_DOUBLE:
-            {
-                ::rtl::OString tmp( OString::valueOf(constValue.m_value.aDouble) );
-                o << "(double)" << tmp.getStr();
-            }
-            break;
-        case RT_TYPE_STRING:
-            {
-                ::rtl::OUString aUStr(constValue.m_value.aString);
-                ::rtl::OString aStr = ::rtl::OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US);
-                o << "::rtl::OUString::createFromAscii(\"" << aStr.getStr() << "\")";
-            }
-            break;
-    }
-}
-
-void CunoType::inc(sal_uInt32 num)
-{
-    m_indentLength += num;
-}
-
-void CunoType::dec(sal_uInt32 num)
-{
-    if (m_indentLength - num < 0)
-        m_indentLength = 0;
-    else
-        m_indentLength -= num;
-}
-
-OString CunoType::indent()
-{
-    OStringBuffer tmp(m_indentLength);
-
-    for (sal_uInt32 i=0; i < m_indentLength; i++)
-    {
-        tmp.append(' ');
-    }
-    return tmp.makeStringAndClear();
-}
-
-OString CunoType::indent(sal_uInt32 num)
-{
-    OStringBuffer tmp(m_indentLength + num);
-
-    for (sal_uInt32 i=0; i < m_indentLength + num; i++)
-    {
-        tmp.append(' ');
-    }
-    return tmp.makeStringAndClear();
-}
-
-//*************************************************************************
-// InterfaceType
-//*************************************************************************
-InterfaceType::InterfaceType(TypeReader& typeReader,
-                              const OString& typeName,
-                             const TypeManager& typeMgr,
-                             const TypeDependency& typeDependencies)
-    : CunoType(typeReader, typeName, typeMgr, typeDependencies)
-{
-    m_inheritedMemberCount = 0;
-    m_hasAttributes = sal_False;
-    m_hasMethods = sal_False;
-}
-
-InterfaceType::~InterfaceType()
-{
-
-}
-
-sal_Bool InterfaceType::dumpHFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    OString headerDefine(dumpHeaderDefine(o, "H"));
-    o << "\n";
-
-    dumpDefaultHIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "h");
-    o << "\n";
-    dumpOpenExternC(o);
-
-    o << "#ifndef " << m_name.toAsciiUpperCase() << "\n";
-    o << "#define " << m_name.toAsciiUpperCase() << "\n";
-    o << "struct _" << m_name << "_ftab;\n"
-      << "typedef struct _" << m_name << "_ftab * " << m_name << ";\n";
-    o << "#endif\n\n";
-
-    dumpDeclaration(o);
-
-    if ( m_cunoTypeLib )
-    {
-        o << "#ifdef CUNO_TYPELIB\n"
-          << "typelib_TypeDescriptionReference * SAL_CALL getCUnoType_" << m_name << "() SAL_THROW( () );\n"
-          << "#endif\n\n";
-    }
-
-/*
-    if (getNestedTypeNames().getLength() > 0)
-    {
-        o << indent() << "// nested types\n\n";
-        for (sal_uInt32 i = 0; i < getNestedTypeNames().getLength(); i++)
-        {
-            OUString s(getNestedTypeNames().getElement(i));
-
-            OString nestedName(s.getStr(), s.getLength(), RTL_TEXTENCODING_UTF8);
-
-            nestedName = checkRealBaseType(nestedName.copy(5));
-
-            if (nestedName.lastIndexOf(']') < 0)
-            {
-                o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCunoType( ";
-                dumpType(o, nestedName, sal_True, sal_False);
-                o << "* ) SAL_THROW( () );\n\n";
-            }
-        }
-    }
-*/
-    dumpCloseExternC(o);
-
-    o << "#endif /* "<< headerDefine << " */\n";
-    return sal_True;
-}
-
-void InterfaceType::dumpInheritedFunctions(FileStream& o, rtl::OString& superType)
-{
-    TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
-
-    OString baseType(aSuperReader.getSuperTypeName());
-    if (baseType.getLength() > 0)
-    {
-        dumpInheritedFunctions(o, baseType);
-    }
-
-    dumpAttributes(o, superType.replace('/', '_'), aSuperReader);
-    dumpMethods(o, superType.replace('/', '_'), aSuperReader);
-}
-
-sal_Bool InterfaceType::dumpDeclaration(FileStream& o)
-    throw( CannotDumpException )
-{
-    o << "typedef struct _" << m_name << "_ftab\n" << indent() << "{";
-    inc();
-
-    OString superType(m_reader.getSuperTypeName());
-    if (superType.getLength() > 0)
-        dumpInheritedFunctions(o, superType);
-/*
-    if (getNestedTypeNames().getLength() > 0)
-    {
-        inc();
-        o << indent() << "// nested types\n\n";
-        for (sal_uInt32 i = 0; i < getNestedTypeNames().getLength(); i++)
-        {
-            OUString s(getNestedTypeNames().getElement(i));
-
-            OString nestedName(s.getStr(), s.getLength(), RTL_TEXTENCODING_UTF8);
-
-            nestedName = nestedName.copy(5);
-
-            o << indent() << "// " << nestedName.getStr() << "\n";
-
-            TypeReader reader(m_typeMgr.getTypeReader(nestedName));
-
-            if (reader.isValid())
-            {
-                RTTypeClass typeClass = reader.getTypeClass();
-                switch (typeClass) {
-                    case RT_TYPE_INTERFACE:
-                        {
-                            InterfaceType iType(reader, nestedName, m_typeMgr, m_dependencies);
-                            iType.dumpDeclaration(o);
-                        }
-                        break;
-                    case RT_TYPE_STRUCT:
-                        {
-                            StructureType sType(reader, nestedName, m_typeMgr, m_dependencies);
-                            sType.dumpDeclaration(o);
-                        }
-                        break;
-                    case RT_TYPE_ENUM:
-                        {
-                            EnumType enType(reader, nestedName, m_typeMgr, m_dependencies);
-                            enType.dumpDeclaration(o);
-                        }
-                        break;
-                    case RT_TYPE_EXCEPTION:
-                        {
-                            ExceptionType eType(reader, nestedName, m_typeMgr, m_dependencies);
-                            eType.dumpDeclaration(o);
-                        }
-                        break;
-                    case RT_TYPE_TYPEDEF:
-                        {
-                            TypeDefType tdType(reader, nestedName, m_typeMgr, m_dependencies);
-                            tdType.dumpDeclaration(o);
-                        }
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-        dec();
-    }
-*/
-    dumpAttributes(o, m_name, m_reader);
-    dumpMethods(o, m_name, m_reader);
-
-    dec();
-    o << "} " << m_name << "_ftab;\n\n";
-
-    return sal_True;
-}
-
-sal_Bool InterfaceType::dumpCFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    dumpInclude(o, m_typeName, "h");
-    o << "\n";
-    dumpDefaultCIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "h");
-    o << "\n";
-    dumpGetCunoType(o);
-/*
-    if (getNestedTypeNames().getLength() > 0)
-    {
-        o << indent() << "// nested types\n\n";
-        for (sal_uInt32 i = 0; i < getNestedTypeNames().getLength(); i++)
-        {
-            OUString s(getNestedTypeNames().getElement(i));
-
-            OString nestedName(s.getStr(), s.getLength(), RTL_TEXTENCODING_UTF8);
-
-            nestedName = nestedName.copy(5);
-
-            o << indent() << "// " << nestedName.getStr() << "\n";
-
-            TypeReader reader(m_typeMgr.getTypeReader(nestedName));
-
-            if (reader.isValid())
-            {
-                RTTypeClass typeClass = reader.getTypeClass();
-                switch (typeClass) {
-                    case RT_TYPE_INTERFACE:
-                        {
-                            InterfaceType iType(reader, nestedName, m_typeMgr, m_dependencies);
-                            iType.dumpGetCunoType(o);
-                        }
-                        break;
-                    case RT_TYPE_STRUCT:
-                        {
-                            StructureType sType(reader, nestedName, m_typeMgr, m_dependencies);
-                            sType.dumpGetCunoType(o);
-                        }
-                        break;
-                    case RT_TYPE_ENUM:
-                        {
-                            EnumType enType(reader, nestedName, m_typeMgr, m_dependencies);
-                            enType.dumpGetCunoType(o);
-                        }
-                        break;
-                    case RT_TYPE_EXCEPTION:
-                        {
-                            ExceptionType eType(reader, nestedName, m_typeMgr, m_dependencies);
-                            eType.dumpGetCunoType(o);
-                        }
-                        break;
-                    case RT_TYPE_TYPEDEF:
-                        {
-                            TypeDefType tdType(reader, nestedName, m_typeMgr, m_dependencies);
-                            tdType.dumpGetCunoType(o);
-                        }
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-    }
-*/
-    return sal_True;
-}
-
-void InterfaceType::dumpAttributes(FileStream& o, const OString& interfaceType, TypeReader& reader )
-{
-    sal_uInt32 fieldCount = reader.getFieldCount();
-    sal_Bool first=sal_True;
-
-    RTFieldAccess access = RT_ACCESS_INVALID;
-    OString fieldName;
-    OString fieldType;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = reader.getFieldAccess(i);
-
-        if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-            continue;
-
-        fieldName = reader.getFieldName(i);
-        fieldType = reader.getFieldType(i);
-
-        if (first)
-        {
-            first = sal_False;
-            o << "\n" << indent() << "/* Attributes of " << interfaceType << " */\n";
-        }
-
-        o << indent() << "cuno_ErrorCode (SAL_CALL *get" << fieldName << ")( "
-          << interfaceType << " *, uno_Any *, ";
-        dumpType(o, fieldType, sal_False, sal_True);
-        o << " );\n";
-
-        if (access != RT_ACCESS_READONLY)
-        {
-            OString relType = checkSpecialCunoType(fieldType);
-            sal_Bool bParam = sal_False;
-
-            if ( m_typeMgr.getTypeClass(relType) == RT_TYPE_STRUCT ||
-                 m_typeMgr.getTypeClass(relType) == RT_TYPE_EXCEPTION ||
-                (isBaseType(relType) && relType.equals("any")))
-            {
-                bParam = sal_True;
-            } else
-            {
-                bParam = sal_False;
-            }
-
-            o << indent() << "cuno_ErrorCode (SAL_CALL *set" << fieldName << ")( "
-                << interfaceType << " *, uno_Any *, ";
-            dumpType(o, fieldType, sal_False, sal_False, bParam);
-            o << " );\n";
-        }
-    }
-}
-
-void InterfaceType::dumpMethods(FileStream& o, const OString& interfaceType, TypeReader& reader )
-{
-    sal_uInt32 methodCount = reader.getMethodCount();
-    sal_Bool first=sal_True;
-
-    OString methodName, returnType, paramType, paramName;
-    sal_uInt32 paramCount = 0;
-    sal_uInt32 excCount = 0;
-    RTMethodMode methodMode = RT_MODE_INVALID;
-    RTParamMode  paramMode = RT_PARAM_INVALID;
-
-    sal_Bool bPointer = sal_False;
-    sal_Bool bParam = sal_False;
-    sal_Bool bWithRunTimeExcp = sal_True;
-
-    for (sal_uInt16 i=0; i < methodCount; i++)
-    {
-        methodName = reader.getMethodName(i);
-        returnType = reader.getMethodReturnType(i);
-        paramCount = reader.getMethodParamCount(i);
-        excCount = reader.getMethodExcCount(i);
-        methodMode = reader.getMethodMode(i);
-
-        if ( methodName.equals("queryInterface") )
-        {
-            first = sal_False;
-            o << "\n" << indent() << "/* Methods of " << interfaceType << " */\n";
-            o << indent() << "cuno_ErrorCode (SAL_CALL *queryInterface)( com_sun_star_uno_XInterface *, "
-              << "uno_Any *, com_sun_star_uno_XInterface **, typelib_TypeDescriptionReference * );\n";
-            continue;
-        }
-
-        if ( methodName.equals("acquire") || methodName.equals("release") )
-        {
-            bWithRunTimeExcp = sal_False;
-        }
-
-        if (first)
-        {
-            first = sal_False;
-            o << "\n" << indent() << "/* Methods of " << interfaceType << " */\n";
-        }
-
-        o << indent() << "cuno_ErrorCode (SAL_CALL *" << methodName << ")( "
-          << interfaceType << " *";
-        if ( excCount || bWithRunTimeExcp )
-        {
-            o << ", uno_Any *";
-        }
-        if ( !isVoid(returnType) )
-        {
-            o << ", ";
-            dumpType(o, returnType, sal_False, sal_True);
-        }
-
-        sal_uInt16 j;
-        for (j=0; j < paramCount; j++)
-        {
-            paramName = reader.getMethodParamName(i, j);
-            paramType = reader.getMethodParamType(i, j);
-            paramMode = reader.getMethodParamMode(i, j);
-
-            if (j < (sal_uInt16)paramCount) o << ", ";
-
-            switch (paramMode)
-            {
-                case RT_PARAM_IN:
-                {
-                    OString relType = checkSpecialCunoType(paramType);
-                    if (m_typeMgr.getTypeClass(relType) == RT_TYPE_STRUCT ||
-                        m_typeMgr.getTypeClass(relType) == RT_TYPE_EXCEPTION ||
-                        (isBaseType(relType) && relType.equals("any")))
-                    {
-                        bParam = sal_True;
-                    } else
-                    {
-                        bParam = sal_False;
-                    }
-                    break;
-                }
-                case RT_PARAM_OUT:
-                case RT_PARAM_INOUT:
-                    bPointer = sal_True;
-                    break;
-            }
-
-            dumpType(o, paramType, sal_False, bPointer, bParam);
-        }
-        o << " );\n";
-    }
-}
-
-void InterfaceType::dumpGetCunoType(FileStream& o)
-{
-    OString typeName(m_typeName.replace('/', '_'));
-
-    if ( m_cunoTypeLeak )
-    {
-        dumpLGetCunoType(o);
-        return;
-    }
-    if ( !m_cunoTypeDynamic )
-    {
-        dumpCGetCunoType(o);
-        return;
-    }
-
-    dumpOpenExternC(o);
-
-    if ( !m_typeName.equals("com/sun/star/uno/XInterface") )
-    {
-        o << "#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-          << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-          << "#endif\n\n";
-    }
-
-    o << "typelib_TypeDescriptionReference ** SAL_CALL getCUnoType_" << m_name << "() SAL_THROW_EXTERN_C( () )\n{\n";
-    inc();
-
-    if ( m_typeName.equals("com/sun/star/uno/XInterface") )
-    {
-        o << indent() << "return typelib_static_type_getByTypeClass( typelib_TypeClass_INTERFACE );\n";
-    } else
-    {
-        o << indent() << "#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-          << indent() << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-          << indent() << "#endif\n\n";
-
-        o << indent() << "if ( !s_pType_" << typeName << " )\n" << indent() << "{\n";
-        inc();
-        OString superType(m_reader.getSuperTypeName());
-        sal_Bool bWithBase = sal_False;
-        if (superType.getLength() > 0 && !superType.equals("com/sun/star/uno/XInterface"))
-        {
-            bWithBase = sal_True;
-            o << indent() << "typelib_TypeDescriptionReference * pSuperType = 0;\n"
-              << indent() << "typelib_typedescriptionreference_newByAsciiName(&pSuperType, typelib_TypeClass_INTERFACE, \""
-              << superType.replace('/', '.') << "\" );\n";
-        }
-
-        o << indent() << "typelib_static_interface_type_init( &s_pType_" << typeName
-          << ", \"" << m_typeName.replace('/', '.') << "\", ";
-
-        if ( bWithBase )
-        {
-            o << "pSuperType );\n";
-        } else
-        {
-            o << "0 );\n";
-        }
-
-        dec();
-        o << indent() << "}\n"
-          << indent() << "typelib_typedescriptionreference_acquire( s_pType_" << typeName << " );\n"
-          << indent() << "return &s_pType_" << typeName <<" );\n";
-    }
-    dec();
-    o << indent() << "}\n";
-
-    dumpCloseExternC(o);
-}
-
-void InterfaceType::dumpCGetCunoType(FileStream& o)
-{
-    OString typeName(m_typeName.replace('/', '_'));
-
-    dumpOpenExternC(o);
-
-    o << "#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-      <<  "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-      << "#endif\n\n";
-
-    o << "typelib_TypeDescriptionReference ** SAL_CALL getCUnoType_" << m_name << "() SAL_THROW_EXTERN_C( () )\n{\n";
-    inc();
-
-    o << "#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-      << indent() << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-      << "#endif\n\n";
-
-    o << indent() << "if ( !s_pType_" << typeName << " )\n" << indent() << "{\n";
-    inc();
-    o << indent() << "oslMutex * pMutex = osl_getGlobalMutex();\n"
-      << indent() << "osl_acquireMutex( pMutex );\n";
-
-    o << indent() << "if ( !s_pType_" << typeName << " )\n" << indent() << "{\n";
-    inc();
-    o << indent() << "rtl_uString * pTypeName = 0;\n"
-       << indent() << "typelib_InterfaceTypeDescription * pTD = 0;\n";
-
-    OString superType(m_reader.getSuperTypeName());
-    sal_uInt32 count = getMemberCount();
-
-    if (superType.getLength() > 0)
-        o << indent() << "typelib_TypeDescriptionReference * pSuperType = 0;\n";
-
-    if (count)
-    {
-        o << indent() << "typelib_TypeDescriptionReference * pMembers[" << count << "] = { ";
-        for (sal_uInt32 i = 0; i < count; i++)
-        {
-            o << "0";
-            if (i+1 < count)
-                o << ",";
-            else
-                o << " };\n";
-        }
-
-        dumpCUnoAttributeTypeNames(o);
-        dumpCUnoMethodTypeNames(o);
-    }
-
-    o << indent() << "rtl_uString_newFromAscii( &pTypeName, \"" << m_typeName.replace('/', '.') << "\" );\n";
-
-    if (superType.getLength() > 0)
-    {
-        o << indent() << "typelib_typedescriptionreference_newByAsciiName(&pSuperType, typelib_TypeClass_INTERFACE, \""
-          << superType.replace('/', '.') << "\" );\n";
-    }
-
-    if (count)
-    {
-        sal_uInt32 index = 0;
-        dumpCUnoAttributeRefs(o, index);
-        dumpCUnoMethodRefs(o, index);
-    }
-
-    o << "\n" << indent() << "typelib_typedescription_newInterface(\n";
-    inc();
-    o << indent() << "&pTD,\n"
-      << indent() << "pTypeName, ";
-
-    RTUik uik;
-    m_reader.getUik(uik);
-    sal_Char buffer[53];
-    snprintf(buffer, sizeof(buffer), "0x%.8x, 0x%.4x, 0x%.4x, 0x%.8x, 0x%.8x,\n",
-            uik.m_Data1, uik.m_Data2, uik.m_Data3, uik.m_Data4, uik.m_Data5);
-    o << buffer;
-
-    if (superType.getLength() > 0)
-        o << indent() << "pSuperType,\n";
-    else
-        o << indent() << "0,\n";
-
-    if ( count )
-    {
-        o << indent() << count << ",\n" << indent() << "pMembers );\n\n";
-    } else
-    {
-        o << indent() << count << ",\n" << indent() << "0 );\n\n";
-    }
-    dec();
-
-    o << indent() << "typelib_typedescription_register( (typelib_TypeDescription**)&pTD );\n";
-    if ( count )
-    {
-        for (sal_uInt16 i=0; i < count; i++)
-        {
-            o << indent() << "typelib_typedescriptionreference_release( pMembers["
-              << i << "] );\n";
-        }
-    }
-    o << indent() << "typelib_typedescription_release( (typelib_TypeDescription*)pTD );\n";
-
-    if (superType.getLength() > 0)
-        o << indent() << "typelib_typedescription_release( pSuperType );\n\n";
-    else
-        o << "\n";
-
-    o << indent() << "typelib_typedescriptionreference_new( &s_pType_ " << typeName
-      << "typelib_TypeClass_INTERFACE, (typelib_TypeDescription*)pTD);\n\n";
-
-    o << indent() << "typelib_TypeDescriptionReference ** ppTypeRef = 0;\n";
-    StringSet   aTypes;
-    // type for RuntimeException is always needed
-    OString     sRunTimeExceptionType("com/sun/star/uno/RuntimeException");
-    aTypes.insert(sRunTimeExceptionType);
-    dumpCppuGetType(o, sRunTimeExceptionType, sal_True, CUNOTYPEDECL_ALLTYPES);
-
-    dumpAttributesCppuDecl(o, &aTypes, CUNOTYPEDECL_ALLTYPES);
-    dumpMethodsCppuDecl(o, &aTypes, CUNOTYPEDECL_ALLTYPES);
-
-    if (count)
-    {
-        sal_uInt32 index = getInheritedMemberCount();
-        dumpCUnoAttributes(o, index);
-        dumpCUnoMethods(o, index);
-    }
-
-    // release strings for names
-    dumpCUnoAttributeTypeNames(o, sal_True);
-    dumpCUnoMethodTypeNames(o, sal_True);
-
-    dec();
-    o << indent() << "}\n";
-    o << indent() << "osl_releaseMutex( pMutex );\n";
-    dec();
-    o << indent() << "}\n\n"
-      << indent() << "typelib_typedescriptionreference_acquire( s_pType_" << typeName << " );\n"
-      << indent() << "return &s_pType_" << typeName << ";\n";
-
-    dec();
-    o << "}\n";
-
-    dumpCloseExternC(o);
-}
-
-void InterfaceType::dumpCUnoAttributeTypeNames(FileStream&o, sal_Bool bRelease)
-{
-    sal_uInt32 fieldCount = m_reader.getFieldCount();
-    RTFieldAccess access = RT_ACCESS_INVALID;
-
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-        if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-            continue;
-        if ( bRelease )
-        {
-            o << indent() << "rtl_uString_release( pAttributeName" << i << " );\n";
-        } else
-        {
-            o << indent() << "rtl_uString * pAttributeName" << i << " = 0;\n";
-        }
-    }
-}
-
-void InterfaceType::dumpCUnoMethodTypeNames(FileStream&o, sal_Bool bRelease)
-{
-    sal_uInt32  methodCount = m_reader.getMethodCount();
-
-    for (sal_uInt16 i = 0; i < methodCount; i++)
-    {
-        if ( bRelease )
-        {
-            o << indent() << "rtl_uString_release( pMethodName" << i << " );\n";
-        } else
-        {
-            o << indent() << "rtl_uString * pMethodName" << i << " = 0;\n";
-        }
-    }
-}
-
-void InterfaceType::dumpCUnoAttributeRefs(FileStream& o, sal_uInt32& index)
-{
-    sal_uInt32 fieldCount = m_reader.getFieldCount();
-    RTFieldAccess access = RT_ACCESS_INVALID;
-    OString fieldName;
-    OString scope = m_typeName.replace('/', '.');
-
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-        if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-            continue;
-        fieldName = m_reader.getFieldName(i);
-
-        o << indent() << "rtl_uString_newFromAscii( &pAttributeName" << i << ", \""
-          << scope << "::" << fieldName << "\" );\n";
-        o << indent() << "typelib_typedescriptionreference_new( &pMembers["
-          << index << "],\n";
-        inc(38);
-        o << indent() << "typelib_TypeClass_INTERFACE_ATTRIBUTE,\n"
-          << indent() << "pAttributeName" << i << " );\n";
-        dec(38);
-        index++;
-    }
-}
-
-void InterfaceType::dumpCUnoMethodRefs(FileStream& o, sal_uInt32& index)
-{
-    sal_uInt32  methodCount = m_reader.getMethodCount();
-    OString     methodName; //, returnType, paramType, paramName;
-    OString     scope = m_typeName.replace('/', '.');
-
-    for (sal_uInt16 i = 0; i < methodCount; i++)
-    {
-        methodName = m_reader.getMethodName(i);
-
-        o << indent() << "rtl_uString_newFromAscii( &pMethodName" << i << ", \""
-          << scope.replace('/', '.') << "::" << methodName << "\" );\n";
-        o << indent() << "typelib_typedescriptionreference_new( &pMembers["
-          << index << "],\n";
-        inc(38);
-        o << indent() << "typelib_TypeClass_INTERFACE_METHOD,\n"
-          << indent() << "pMethodName" << i << " );\n";
-        dec(38);
-        index++;
-    }
-}
-
-sal_uInt32 InterfaceType::getMemberCount()
-{
-    sal_uInt32 count = m_reader.getMethodCount();
-
-    if (count)
-        m_hasMethods = sal_True;
-
-    sal_uInt32 fieldCount = m_reader.getFieldCount();
-    RTFieldAccess access = RT_ACCESS_INVALID;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-        {
-            m_hasAttributes = sal_True;
-            count++;
-        }
-    }
-    return count;
-}
-
-sal_uInt32 InterfaceType::checkInheritedMemberCount(const TypeReader* pReader)
-{
-    sal_uInt32 cout = 0;
-    sal_Bool bSelfCheck = sal_True;
-    if (!pReader)
-    {
-        bSelfCheck = sal_False;
-        pReader = &m_reader;
-    }
-
-    sal_uInt32 count = 0;
-    OString superType(pReader->getSuperTypeName());
-    if (superType.getLength() > 0)
-    {
-        TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
-        if (aSuperReader.isValid())
-        {
-            count = checkInheritedMemberCount(&aSuperReader);
-        }
-    }
-
-    if (bSelfCheck)
-    {
-        count += pReader->getMethodCount();
-        sal_uInt32 fieldCount = pReader->getFieldCount();
-        RTFieldAccess access = RT_ACCESS_INVALID;
-        for (sal_uInt16 i=0; i < fieldCount; i++)
-        {
-            access = pReader->getFieldAccess(i);
-
-            if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-            {
-                count++;
-            }
-        }
-    }
-
-    return count;
-}
-
-sal_uInt32 InterfaceType::getInheritedMemberCount()
-{
-    if (m_inheritedMemberCount == 0)
-    {
-        m_inheritedMemberCount = checkInheritedMemberCount(0);
-    }
-
-    return m_inheritedMemberCount;
-}
-
-void InterfaceType::dumpCUnoAttributes(FileStream& o, sal_uInt32& index)
-{
-    sal_uInt32 fieldCount = m_reader.getFieldCount();
-
-    RTFieldAccess access = RT_ACCESS_INVALID;
-    OString fieldType;
-
-    sal_uInt32 absoluteIndex = index;
-
-    if (m_hasAttributes)
-    {
-        o << "\n" << indent() << "{\n" << indent() << "typelib_InterfaceAttributeTypeDescription * pAttribute = 0;\n";
-
-        for (sal_uInt16 i=0; i < fieldCount; i++)
-        {
-            access = m_reader.getFieldAccess(i);
-
-            if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-                continue;
-
-            fieldType = checkRealBaseType(m_reader.getFieldType(i), sal_True);
-            o << indent() << "{\n";
-            o << indent() << "rtl_uString * pAttributeType" << i << " = 0;\n";
-            o << indent() << "rtl_uString_newFromAscii( &pAttributeType" << i << ", \""
-              << fieldType.replace('/', '.') << "\" );\n";
-            o << indent() << "typelib_typedescription_newInterfaceAttribute( &pAttribute,\n";
-            inc();
-            o << indent() << absoluteIndex++ << ", pAttributeName" << i << ",\n";
-            o << indent() << getTypeClass(fieldType, sal_True) << ", pAttributeType" << i << ",\n";
-            if (access == RT_ACCESS_READONLY)
-                o << indent() << "sal_True );\n";
-            else
-                o << indent() << "sal_False );\n";
-            dec();
-            o << indent() << "typelib_typedescription_register( (typelib_TypeDescription**)&pAttribute );\n\n";
-            o << indent() << "}\n";
-        }
-         o << indent() << "typelib_typedescription_release( (typelib_TypeDescription*)pAttribute );\n";
-        o << indent() << "}\n";
-        index = absoluteIndex;
-    }
-}
-
-void InterfaceType::dumpCUnoMethods(FileStream& o, sal_uInt32& index)
-{
-    sal_uInt32      methodCount = m_reader.getMethodCount();
-    OString         methodName, returnType, paramType, paramName;
-    sal_uInt32      paramCount = 0;
-    sal_uInt32      excCount = 0;
-    RTMethodMode    methodMode = RT_MODE_INVALID;
-    RTParamMode     paramMode = RT_PARAM_INVALID;
-    sal_Bool        bWithRuntimeException = sal_True;
-
-    sal_uInt32 absoluteIndex = index;
-
-    if (m_hasMethods)
-    {
-        o << "\n" << indent() << "{\n" << indent() << "typelib_InterfaceMethodTypeDescription * pMethod = 0;\n";
-
-        for (sal_uInt16 i=0; i < methodCount; i++)
-        {
-            methodName = m_reader.getMethodName(i);
-            returnType = checkRealBaseType(m_reader.getMethodReturnType(i), sal_True);
-            paramCount = m_reader.getMethodParamCount(i);
-            excCount = m_reader.getMethodExcCount(i);
-            methodMode = m_reader.getMethodMode(i);
-
-            if ( methodName.equals("acquire") || methodName.equals("release") )
-            {
-                bWithRuntimeException = sal_False;
-            }
-            o << indent() << "{\n";
-            inc();
-
-            if (paramCount)
-            {
-                o << indent() << "typelib_Parameter_Init pParameters[" << paramCount << "];\n";
-            }
-            if ( excCount || bWithRuntimeException )
-            {
-                o << indent() << "rtl_uString * pExceptions[" << excCount + 1 << "];\n";
-            }
-            o << indent() << "rtl_uString * pReturnType" << i << " = 0;\n";
-
-            sal_uInt16 j;
-            for (j=0; j < paramCount; j++)
-            {
-                o << indent() << "rtl_uString * pParamName" << j << " = 0;\n"
-                  << indent() << "rtl_uString * pParamType" << j << " = 0;\n";
-            }
-
-              for (j=0; j < excCount; j++)
-            {
-                o << indent() << "rtl_uString * pExceptionName" << j << " = 0;\n";
-            }
-            if ( excCount || bWithRuntimeException )
-            {
-                o << indent() << "rtl_uString * pExceptionName" << excCount << " = 0;\n";
-            }
-            for (j=0; j < paramCount; j++)
-            {
-                paramName = m_reader.getMethodParamName(i, j);
-                paramType = checkRealBaseType(m_reader.getMethodParamType(i, j), sal_True);
-                paramMode = m_reader.getMethodParamMode(i, j);
-                o << indent() << "rtl_uString_newFromAscii( &pParamName" << j << ", \""
-                  << paramName << "\" );\n";
-                o << indent() << "rtl_uString_newFromAscii( &pParamType" << j << ", \""
-                  << paramType.replace('/', '.') << "\" );\n";
-                o << indent() << "pParameters[" << j << "].pParamName = pParamName" << j << ";\n";
-                o << indent() << "pParameters[" << j << "].eTypeClass = "
-                  << getTypeClass(paramType, sal_True) << ";\n";
-                o << indent() << "pParameters[" << j << "].pTypeName = sParamType" << j << ";\n";
-
-                if (paramMode == RT_PARAM_IN || paramMode == RT_PARAM_INOUT)
-                    o << indent() << "pParameters[" << j << "].bIn = sal_True;\n";
-                else
-                    o << indent() << "pParameters[" << j << "].bIn = sal_False;\n";
-
-                if (paramMode == RT_PARAM_OUT || paramMode == RT_PARAM_INOUT)
-                    o << indent() << "pParameters[" << j << "].bOut = sal_True;\n";
-                else
-                    o << indent() << "pParameters[" << j << "].bOut = sal_False;\n";
-            }
-
-              for (j=0; j < excCount; j++)
-            {
-                if (!m_reader.getMethodExcType(i, j).equals("com/sun/star/uno/RuntimeException"))
-                {
-                    o << indent() << "rtl_uString_newFromAscii( & pExceptionName" << j << ", \""
-                      << OString(m_reader.getMethodExcType(i, j)).replace('/', '.') << "\" );\n";
-                    o << indent() << "pExceptions[" << j << "] = pExceptionName" << j << ";\n";
-                }
-            }
-            if ( excCount || bWithRuntimeException )
-            {
-                  o << indent() << "rtl_uString_newFromAscii( & pExceptionName" << excCount
-                  << ", \"com.sun.star.uno.RuntimeException\") );\n";
-                o << indent() << "pExceptions[" << excCount << "] = pExceptionName" << excCount << ";\n";
-            }
-            o << indent() << "rtl_uString_newFromAscii( &pReturnType" << i << ", \""
-              << returnType.replace('/', '.') << "\" );\n";
-            o << indent() << "typelib_typedescription_newInterfaceMethod( &pMethod,\n";
-            inc();
-            o << indent() << absoluteIndex++ << ", ";
-            if (methodMode == RT_MODE_ONEWAY || methodMode == RT_MODE_ONEWAY_CONST)
-                o << "sal_True,\n";
-            else
-                o << "sal_False,\n";
-            o << indent() << "pMethodName" << i << ",\n";
-            o << indent() << getTypeClass(returnType, sal_True) << ", pReturnType" << i << ",\n";
-            if (paramCount)
-                o << indent() << paramCount << ", pParameters,\n";
-            else
-                o << indent() << "0, 0,\n";
-
-            if ( excCount || bWithRuntimeException )
-            {
-                o << indent() << excCount + 1 << ", pExceptions );\n";
-            } else
-            {
-                o << indent() << "0, 0 );\n";
-            }
-
-            dec();
-            o << indent() << "typelib_typedescription_register( (typelib_TypeDescription**)&pMethod );\n";
-
-            o << indent() << "rtl_uString_release( pReturnType );\n";
-            for (j=0; j < paramCount; j++)
-            {
-                o << indent() << "rtl_uString_release( pParamName" << j << " );\n"
-                  << indent() << "rtl_uString_release( pParamType" << j << " );\n";
-            }
-
-              for (j=0; j < excCount; j++)
-            {
-                o << indent() << "rtl_uString_release( pExceptionName" << j << " );\n";
-            }
-            if ( excCount || bWithRuntimeException )
-            {
-                o << indent() << "rtl_uString_release( pExceptionName" << excCount << " );\n";
-            }
-            dec();
-            o << indent() << "}\n";
-        }
-        o << indent() << "typelib_typedescription_release( (typelib_TypeDescription*)pMethod );\n";
-
-        o << indent() << "}\n";
-        index = absoluteIndex;
-    }
-}
-
-void InterfaceType::dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag)
-{
-    sal_uInt32 fieldCount = m_reader.getFieldCount();
-
-    RTFieldAccess access = RT_ACCESS_INVALID;
-    OString fieldName;
-    OString fieldType;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-            continue;
-
-        fieldName = m_reader.getFieldName(i);
-        fieldType = m_reader.getFieldType(i);
-
-        if (pFinishedTypes->count(fieldType) == 0)
-        {
-            pFinishedTypes->insert(fieldType);
-            dumpCppuGetType(o, fieldType, sal_True, eDeclFlag);
-        }
-    }
-}
-
-void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag)
-{
-    sal_uInt32      methodCount = m_reader.getMethodCount();
-    OString         returnType, paramType, excType;
-    sal_uInt32      paramCount = 0;
-    sal_uInt32      excCount = 0;
-
-    for (sal_uInt16 i=0; i < methodCount; i++)
-    {
-        returnType = m_reader.getMethodReturnType(i);
-        paramCount = m_reader.getMethodParamCount(i);
-        excCount = m_reader.getMethodExcCount(i);
-
-        if (pFinishedTypes->count(returnType) == 0)
-        {
-            pFinishedTypes->insert(returnType);
-            dumpCppuGetType(o, returnType, sal_True, eDeclFlag);
-        }
-        sal_uInt16 j;
-        for (j=0; j < paramCount; j++)
-        {
-            paramType = m_reader.getMethodParamType(i, j);
-
-            if (pFinishedTypes->count(paramType) == 0)
-            {
-                pFinishedTypes->insert(paramType);
-                dumpCppuGetType(o, paramType, sal_True, eDeclFlag);
-            }
-        }
-
-        for (j=0; j < excCount; j++)
-        {
-            excType = m_reader.getMethodExcType(i, j);
-            if (pFinishedTypes->count(excType) == 0)
-            {
-                pFinishedTypes->insert(excType);
-                dumpCppuGetType(o, excType, sal_True, eDeclFlag);
-            }
-        }
-    }
-}
-
-//*************************************************************************
-// ModuleType
-//*************************************************************************
-ModuleType::ModuleType(TypeReader& typeReader,
-                        const OString& typeName,
-                       const TypeManager& typeMgr,
-                       const TypeDependency& typeDependencies)
-    : CunoType(typeReader, typeName, typeMgr, typeDependencies)
-{
-}
-
-ModuleType::~ModuleType()
-{
-
-}
-
-sal_Bool ModuleType::dump(CunoOptions* pOptions)
-    throw( CannotDumpException )
-{
-    sal_Bool ret = sal_False;
-
-    if (pOptions->isValid("-U"))
-        m_cunoTypeDynamic = sal_True;
-
-    OString outPath;
-    if (pOptions->isValid("-O"))
-        outPath = pOptions->getOption("-O");
-
-    OString tmpName(m_typeName);
-
-    if (tmpName.equals("/"))
-        tmpName = "global";
-    else
-//      tmpName += "/" + m_typeName.getToken(m_typeName.getTokenCount('/') - 1, '/');
-        tmpName += "/" + m_name;
-
-    OString tmpFileName;
-    OString hFileName = createFileNameFromType(outPath, tmpName, ".hdl");
-
-    sal_Bool bFileExists = sal_False;
-    sal_Bool bFileCheck = sal_False;
-
-    if ( pOptions->isValid("-G") || pOptions->isValid("-Gc") )
-    {
-        bFileExists = fileExists( hFileName );
-        ret = sal_True;
-    }
-
-    if ( bFileExists && pOptions->isValid("-Gc") )
-    {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tml");
-        bFileCheck = sal_True;
-    }
-
-    if ( !bFileExists || bFileCheck )
-    {
-        FileStream hFile;
-
-        if ( bFileCheck )
-            hFile.open(tmpFileName);
-        else
-            hFile.open(hFileName);
-
-        if(!hFile.isValid())
-        {
-            OString message("cannot open ");
-            message += hFileName + " for writing";
-            throw CannotDumpException(message);
-        }
-
-        ret = dumpHFile(hFile);
-
-        hFile.close();
-        if (ret && bFileCheck)
-        {
-            ret = checkFileContent(hFileName, tmpFileName);
-        }
-    }
-/*
-    bFileExists = sal_False;
-    bFileCheck = sal_False;
-    OString cFileName = createFileNameFromType(outPath, tmpName, ".c");
-
-    if ( pOptions->isValid("-G") || pOptions->isValid("-Gc") )
-    {
-        bFileExists = fileExists( cFileName );
-        ret = sal_True;
-    }
-
-    if ( bFileExists && pOptions->isValid("-Gc") )
-    {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tmc");
-        bFileCheck = sal_True;
-    }
-
-
-    if ( !bFileExists || bFileCheck )
-    {
-        FileStream hxxFile;
-
-        if ( bFileCheck )
-            cFile.open(tmpFileName);
-        else
-            cFile.open(cFileName);
-
-        if(!cFile.isValid())
-        {
-            OString message("cannot open ");
-            message += cFileName + " for writing";
-            throw CannotDumpException(message);
-        }
-
-        ret = dumpCFile(cFile);
-
-        cFile.close();
-        if (ret && bFileCheck)
-        {
-            ret = checkFileContent(cFileName, tmpFileName);
-        }
-    }
-*/
-    return ret;
-}
-
-sal_Bool ModuleType::dumpHFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    sal_Bool bSpecialDefine = sal_True;
-
-    if (m_reader.getTypeClass() == RT_TYPE_CONSTANTS)
-    {
-        bSpecialDefine = sal_False;
-    }
-
-    OString headerDefine(dumpHeaderDefine(o, "H", bSpecialDefine));
-    o << "\n";
-
-    dumpDefaultHIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "h");
-    o << "\n";
-
-    dumpOpenExternC(o);
-    dumpDeclaration(o);
-    o << "\n";
-    dumpCloseExternC(o);
-
-    o << "\n#endif /* "<< headerDefine << " */\n";
-
-    return sal_True;
-}
-
-sal_Bool ModuleType::dumpDeclaration(FileStream& o)
-    throw( CannotDumpException )
-{
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access == RT_ACCESS_CONST)
-        {
-            fieldName = m_reader.getFieldName(i);
-            fieldType = m_reader.getFieldType(i);
-
-            o << "static const ";
-            dumpType(o, fieldType);
-            o << " " << m_name << "_" << fieldName << " = ";
-            dumpConstantValue(o, i);
-            o << ";\n";
-        }
-    }
-
-    return sal_True;
-}
-
-sal_Bool ModuleType::hasConstants()
-{
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access == RT_ACCESS_CONST)
-            return sal_True;
-    }
-
-    return sal_False;
-}
-
-sal_Bool ModuleType::dumpCFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    return sal_True;
-}
-
-//*************************************************************************
-// ConstantsType
-//*************************************************************************
-ConstantsType::ConstantsType(TypeReader& typeReader,
-                              const OString& typeName,
-                             const TypeManager& typeMgr,
-                             const TypeDependency& typeDependencies)
-    : ModuleType(typeReader, typeName, typeMgr, typeDependencies)
-{
-}
-
-ConstantsType::~ConstantsType()
-{
-
-}
-
-sal_Bool ConstantsType::dump(CunoOptions* pOptions)
-    throw( CannotDumpException )
-{
-    sal_Bool ret = sal_False;
-
-    if (pOptions->isValid("-U"))
-        m_cunoTypeDynamic = sal_True;
-
-    OString outPath;
-    if (pOptions->isValid("-O"))
-        outPath = pOptions->getOption("-O");
-
-    OString tmpFileName;
-    OString hFileName = createFileNameFromType(outPath, m_typeName, ".h");
-
-    sal_Bool bFileExists = sal_False;
-    sal_Bool bFileCheck = sal_False;
-
-    if ( pOptions->isValid("-G") || pOptions->isValid("-Gc") )
-    {
-        bFileExists = fileExists( hFileName );
-        ret = sal_True;
-    }
-
-    if ( bFileExists && pOptions->isValid("-Gc") )
-    {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tmh");
-        bFileCheck = sal_True;
-    }
-
-    if ( !bFileExists || bFileCheck )
-    {
-        FileStream hFile;
-
-        if ( bFileCheck )
-            hFile.open(tmpFileName);
-        else
-            hFile.open(hFileName);
-
-        if(!hFile.isValid())
-        {
-            OString message("cannot open ");
-            message += hFileName + " for writing";
-            throw CannotDumpException(message);
-        }
-
-        ret = dumpHFile(hFile);
-
-        hFile.close();
-        if (ret && bFileCheck)
-        {
-            ret = checkFileContent(hFileName, tmpFileName);
-        }
-    }
-/*
-    bFileExists = sal_False;
-    bFileCheck = sal_False;
-    OString cFileName = createFileNameFromType(outPath, m_typeName, ".c");
-
-    if ( pOptions->isValid("-G") || pOptions->isValid("-Gc") )
-    {
-        bFileExists = fileExists( cFileName );
-        ret = sal_True;
-    }
-
-    if ( bFileExists && pOptions->isValid("-Gc") )
-    {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tmc");
-        bFileCheck = sal_True;
-    }
-
-    if ( !bFileExists || bFileCheck )
-    {
-        FileStream cFile;
-
-        if ( bFileCheck )
-            cFile.open(tmpFileName);
-        else
-            cFile.open(cFileName);
-
-        if(!cFile.isValid())
-        {
-            OString message("cannot open ");
-            message += cFileName + " for writing";
-            throw CannotDumpException(message);
-        }
-
-        ret = dumpCFile(cFile);
-
-        cFile.close();
-        if (ret && bFileCheck)
-        {
-            ret = checkFileContent(cFileName, tmpFileName);
-        }
-    }
-*/
-    return ret;
-}
-
-//*************************************************************************
-// StructureType
-//*************************************************************************
-StructureType::StructureType(TypeReader& typeReader,
-                              const OString& typeName,
-                             const TypeManager& typeMgr,
-                             const TypeDependency& typeDependencies)
-    : CunoType(typeReader, typeName, typeMgr, typeDependencies)
-{
-}
-
-StructureType::~StructureType()
-{
-
-}
-
-sal_Bool StructureType::dumpHFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    OString headerDefine(dumpHeaderDefine(o, "H"));
-    o << "\n";
-
-    dumpDefaultHIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "h");
-    o << "\n";
-
-    dumpOpenExternC(o);
-
-    dumpDeclaration(o);
-
-    if ( m_cunoTypeLib )
-    {
-        o << "#ifdef CUNO_TYPELIB\n"
-          << "typelib_TypeDescriptionReference ** SAL_CALL getCUnoType_" << m_name << "() SAL_THROW_EXTERN_C( () );\n"
-          << "#endif\n\n";
-    }
-
-    dumpCloseExternC(o);
-
-    o << "#endif /* "<< headerDefine << " */\n";
-
-    return sal_True;
-}
-
-sal_Bool StructureType::dumpDeclaration(FileStream& o)
-    throw( CannotDumpException )
-{
-    o << "#ifdef SAL_W32\n"
-      << "#   pragma pack(push, 8)\n"
-      << "#elif defined(SAL_OS2)\n"
-      << "#   pragma pack(8)\n"
-      << "#endif\n\n";
-
-    o << "typedef struct _" << m_name << "\n{\n";
-    inc();
-
-    OString superType(m_reader.getSuperTypeName());
-    if (superType.getLength() > 0)
-        o << indent() << superType.replace('/', '_').getStr() << " _Base;\n";
-        //dumpInheritedMembers(o, superType);
-
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
-    sal_uInt16      i=0;
-
-    for (i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-            continue;
-
-        fieldName = m_reader.getFieldName(i);
-        fieldType = m_reader.getFieldType(i);
-
-        o << indent();
-        dumpType(o, fieldType);
-        o << " " << fieldName << ";\n";
-    }
-
-    dec();
-    o << "} " << m_name << ";\n\n";
-
-    o << "#ifdef SAL_W32\n"
-      << "#   pragma pack(pop)\n"
-      << "#elif defined(SAL_OS2)\n"
-      << "#   pragma pack()\n"
-      << "#endif\n\n";
-
-    return sal_True;
-}
-
-sal_Bool StructureType::dumpCFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    dumpInclude(o, m_typeName, "h");
-    o << "\n";
-    dumpDefaultCIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "h");
-    o << "\n";
-
-    dumpGetCunoType(o);
-
-    return sal_True;
-}
-
-//*************************************************************************
-// ExceptionType
-//*************************************************************************
-ExceptionType::ExceptionType(TypeReader& typeReader,
-                              const OString& typeName,
-                             const TypeManager& typeMgr,
-                             const TypeDependency& typeDependencies)
-    : CunoType(typeReader, typeName, typeMgr, typeDependencies)
-{
-}
-
-ExceptionType::~ExceptionType()
-{
-
-}
-
-sal_Bool ExceptionType::dumpHFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    OString headerDefine(dumpHeaderDefine(o, "H"));
-    o << "\n";
-
-    dumpDefaultHIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "h");
-    o << "\n";
-
-    dumpOpenExternC(o);
-
-    dumpDeclaration(o);
-
-    if ( m_cunoTypeLib )
-    {
-        o << "#ifdef CUNO_TYPELIB\n"
-          << "typelib_TypeDescriptionReference ** SAL_CALL getCUnoType_" << m_name << "() SAL_THROW_EXTERN_C( () );\n"
-          << "#endif\n\n";
-    }
-
-    dumpCloseExternC(o);
-
-    o << "#endif /* "<< headerDefine << " */\n";
-
-    return sal_True;
-}
-
-sal_Bool ExceptionType::dumpDeclaration(FileStream& o)
-    throw( CannotDumpException )
-{
-    o << "#ifdef SAL_W32\n"
-      << "#   pragma pack(push, 8)\n"
-      << "#elif defined(SAL_OS2)\n"
-      << "#   pragma pack(8)\n"
-      << "#endif\n\n";
-
-    o << "\n/* Exception type */\ntypedef struct _" << m_name << "\n{\n";
-    inc();
-
-    OString superType(m_reader.getSuperTypeName());
-    if (superType.getLength() > 0)
-        o << indent() << superType.replace('/', '_').getStr() << " _Base;\n";
-        //dumpInheritedMembers(o, superType);
-
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
-    sal_uInt16      i = 0;
-
-    for (i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-            continue;
-
-        fieldName = m_reader.getFieldName(i);
-        fieldType = m_reader.getFieldType(i);
-
-        o << indent();
-        dumpType(o, fieldType);
-        o << " " << fieldName << ";\n";
-    }
-
-    dec();
-    o << "} " << m_name << ";\n\n";
-
-    o << "#ifdef SAL_W32\n"
-      << "#   pragma pack(pop)\n"
-      << "#elif defined(SAL_OS2)\n"
-      << "#   pragma pack()\n"
-      << "#endif\n\n";
-
-    return sal_True;
-}
-
-sal_Bool ExceptionType::dumpCFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    dumpInclude(o, m_typeName, "h");
-    o << "\n";
-    dumpDefaultCIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "h");
-    o << "\n";
-
-    dumpGetCunoType(o);
-
-    return sal_True;
-}
-
-
-//*************************************************************************
-// EnumType
-//*************************************************************************
-EnumType::EnumType(TypeReader& typeReader,
-                    const OString& typeName,
-                   const TypeManager& typeMgr,
-                   const TypeDependency& typeDependencies)
-    : CunoType(typeReader, typeName, typeMgr, typeDependencies)
-{
-}
-
-EnumType::~EnumType()
-{
-
-}
-
-sal_Bool EnumType::dumpHFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    OString headerDefine(dumpHeaderDefine(o, "H"));
-    o << "\n";
-
-    dumpDefaultHIncludes(o);
-    o << "\n";
-    dumpOpenExternC(o);
-
-    dumpDeclaration(o);
-
-    if ( m_cunoTypeLib )
-    {
-        o << "#ifdef CUNO_TYPELIB\n"
-          << "typelib_TypeDescriptionReference ** SAL_CALL getCUnoType_" << m_name << "() SAL_THROW_EXTERN_C( () );\n"
-          << "#endif\n\n";
-    }
-
-    dumpCloseExternC(o);
-
-    o << "#endif /* "<< headerDefine << " */\n";
-
-    return sal_True;
-}
-
-sal_Bool EnumType::dumpDeclaration(FileStream& o)
-    throw( CannotDumpException )
-{
-    o << "\ntypedef enum _" << m_name << "\n{\n";
-    inc();
-
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    RTConstValue    constValue;
-    OString         fieldName;
-    sal_Int32       value=0;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access != RT_ACCESS_CONST)
-            continue;
-
-        fieldName = m_reader.getFieldName(i);
-        constValue = m_reader.getFieldConstValue(i);
-
-        if (constValue.m_type == RT_TYPE_INT32)
-            value = constValue.m_value.aLong;
-        else
-            value++;
-
-        o << indent() << m_name << "_" << fieldName << " = " << value << ",\n";
-    }
-
-    o << indent() << m_name << "_MAKE_FIXED_SIZE = SAL_MAX_ENUM\n";
-
-    dec();
-    o << "} " << m_name << ";\n\n";
-
-    return sal_True;
-}
-
-sal_Bool EnumType::dumpCFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    dumpInclude(o, m_typeName, "h");
-    o << "\n";
-    dumpDefaultCIncludes(o);
-    o << "\n";
-    dumpGetCunoType(o);
-    return sal_True;
-}
-
-void EnumType::dumpGetCunoType(FileStream& o)
-{
-    OString typeName(m_typeName.replace('/', '_'));
-
-    if ( m_cunoTypeLeak )
-    {
-        dumpLGetCunoType(o);
-        return;
-    }
-    if ( !m_cunoTypeDynamic )
-    {
-        dumpCGetCunoType(o);
-        return;
-    }
-
-    dumpOpenExternC(o);
-
-    o << "#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-      << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-      << "#endif\n\n";
-
-    o << "typelib_TypeDescriptionReference ** SAL_CALL getCUnoType_" << m_name << "() SAL_THROW_EXTERN_C( () )\n{\n";
-    inc();
-
-    o << indent() << "#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-      << indent() << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-      << indent() << "#endif\n\n";
-
-    o << indent() << "if ( !s_pType_" << typeName << " )\n" << indent() << "{\n";
-    inc();
-
-    o << indent() << "typelib_static_enum_type_init( &s_pType_" << typeName << ",\n";
-    inc(31);
-    o << indent() << "\"" << m_typeName.replace('/', '.') << "\",\n"
-      << indent() << m_name << "_" << m_reader.getFieldName(0) << " );\n";
-    dec(31);
-    dec();
-    o << indent() << "}\n"
-      << indent() << "typelib_typedescriptionreference_acquire( s_pType_" << typeName <<" );\n"
-      << indent() << "return &s_pType_" << typeName <<" );\n";
-    dec();
-    o << indent() << "}\n";
-
-    dumpCloseExternC(o);
-}
-
-void EnumType::dumpCGetCunoType(FileStream& o)
-{
-    OString typeName(m_typeName.replace('/', '_'));
-
-    dumpOpenExternC(o);
-
-    o << "#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-      << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-      << "#endif\n\n";
-
-    o << "typelib_TypeDescriptionReference ** SAL_CALL getCUnoType_" << m_name << "() SAL_THROW_EXTERN_C( () )\n{\n";
-    inc();
-
-    o << "#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))\n"
-      << indent() << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
-      << "#endif\n\n";
-
-    o << indent() << "if ( !s_pType_" << typeName << " )\n" << indent() << "{\n";
-    inc();
-    o << indent() << "oslMutex * pMutex = osl_getGlobalMutex();\n"
-      << indent() << "osl_acquireMutex( pMutex );\n";
-
-    o << indent() << "if ( !s_pType_" << typeName << " )\n" << indent() << "{\n";
-    inc();
-    o << indent() << "rtl_uString * pTypeName = 0;\n"
-       << indent() << "_typelib_TypeDescription * pTD = 0;\n";
-
-    sal_uInt32 count = m_reader.getFieldCount();
-    o << indent() << "rtl_uString* enumValueNames[" << count << "];\n"
-      << indent() << "sal_Int32 enumValues[" << count << "];\n";
-    sal_uInt32 i;
-    for (i = 0; i < count; i++)
-    {
-        o << indent() << "rtl_uString * pEnumValue" << i << " = 0;\n";
-    }
-
-    o << indent() << "rtl_uString_newFromAscii( &pTypeName, \""
-      << m_typeName.replace('/', '.') << "\") );\n\n";
-
-    for (i = 0; i < count; i++)
-    {
-        o << indent() << "rtl_uString_newFromAscii( &pEnumValue" << i << ", \""
-            << m_reader.getFieldName((sal_uInt16)i) << "\" );\n";
-        o << indent() << "enumValueNames[" << i << "] = pEnumValue" << i << ";\n";
-    }
-
-    RTConstValue    constValue;
-    sal_Int32       value=0;
-    for (i = 0; i < count; i++)
-    {
-        o << indent() << "enumValues[" << i << "] = ";
-        constValue = m_reader.getFieldConstValue((sal_uInt16)i);
-        if (constValue.m_type == RT_TYPE_INT32)
-            value = constValue.m_value.aLong;
-        else
-            value++;
-        o << value << ";\n";
-    }
-
-    o << "\n" << indent() << "typelib_typedescription_newEnum( &pTD,\n";
-    inc();
-    o << indent() << "pTypeName,\n"
-      << indent() << "(sal_Int32)" << m_name << "_" << m_reader.getFieldName(0) << ",\n"
-      << indent() << count << ", enumValueNames, enumValues );\n\n";
-    dec();
-
-    o << indent() << "typelib_typedescription_register( &pTD );\n";
-
-    o << indent() << "typelib_typedescriptionreference_new( &s_pType_ " << typeName
-      << getTypeClass(OString(), sal_True) << ", pTD);\n\n";
-
-    o << indent() << "typelib_typedescription_release( pTD );\n"
-      << indent() << "rtl_uString_release( pTypeName );\n";
-    for (i = 0; i < count; i++)
-    {
-        o << indent() << "rtl_uString_release(  pEnumValue" << i << " );\n";
-    }
-
-    dec();
-    o << indent() << "}\n";
-    o << indent() << "osl_releaseMutex( pMutex );\n";
-    dec();
-    o << indent() << "}\n\n"
-      << indent() << "typelib_typedescriptionreference_acquire( s_pType_" << typeName <<" );\n"
-      << indent() << "return &s_pType_" << typeName <<" );\n";
-
-    dec();
-    o << "}\n";
-
-    dumpCloseExternC(o);
-}
-
-//*************************************************************************
-// TypeDefType
-//*************************************************************************
-TypeDefType::TypeDefType(TypeReader& typeReader,
-                             const OString& typeName,
-                            const TypeManager& typeMgr,
-                            const TypeDependency& typeDependencies)
-    : CunoType(typeReader, typeName, typeMgr, typeDependencies)
-{
-}
-
-TypeDefType::~TypeDefType()
-{
-
-}
-
-sal_Bool TypeDefType::dumpHFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    OString headerDefine(dumpHeaderDefine(o, "H"));
-    o << "\n";
-
-    dumpDefaultHIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "h");
-    o << "\n";
-
-    dumpOpenExternC(o);
-
-    dumpDeclaration(o);
-
-    if ( m_cunoTypeLib )
-    {
-        o << "#ifdef CUNO_TYPELIB\n"
-          << "typelib_TypeDescriptionReference ** SAL_CALL getCUnoType_" << m_name << "() SAL_THROW_EXTERN_C( () );\n"
-          << "#endif\n\n";
-    }
-
-    dumpCloseExternC(o);
-
-    o << "#endif /* "<< headerDefine << " */\n";
-
-    return sal_True;
-}
-
-sal_Bool TypeDefType::dumpDeclaration(FileStream& o)
-    throw( CannotDumpException )
-{
-    o << "\ntypedef ";
-    dumpType(o, m_reader.getSuperTypeName());
-    o << " " << m_name << ";\n\n";
-
-    return sal_True;
-}
-
-sal_Bool TypeDefType::dumpCFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    dumpInclude(o, m_typeName, "h");
-    o << "\n";
-    dumpDefaultCIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "h");
-    o << "\n";
-    dumpGetCunoType(o);
-    return sal_True;
-}
-
-void TypeDefType::dumpGetCunoType(FileStream& o)
-{
-    if ( m_cunoTypeLeak )
-    {
-        dumpLGetCunoType(o);
-        return;
-    }
-    if ( !m_cunoTypeDynamic )
-    {
-        dumpCGetCunoType(o);
-        return;
-    }
-}
-
-void TypeDefType::dumpCGetCunoType(FileStream& o)
-{
-}
-
-void TypeDefType::dumpLGetCunoType(FileStream& o)
-{
-}
-
-//*************************************************************************
-// produceType
-//*************************************************************************
-sal_Bool produceType(const OString& typeName,
-                     TypeManager& typeMgr,
-                     TypeDependency& typeDependencies,
-                     CunoOptions* pOptions)
-    throw( CannotDumpException )
-{
-    if (typeDependencies.isGenerated(typeName))
-        return sal_True;
-
-    TypeReader reader(typeMgr.getTypeReader(typeName));
-
-    if (!reader.isValid())
-    {
-        if (typeName.equals("/"))
-            return sal_True;
-        else
-            return sal_False;
-    }
-
-    if( !checkTypeDependencies(typeMgr, typeDependencies, typeName))
-        return sal_False;
-
-    RTTypeClass typeClass = reader.getTypeClass();
-    sal_Bool    ret = sal_False;
-    switch (typeClass)
-    {
-        case RT_TYPE_INTERFACE:
-            {
-                InterfaceType iType(reader, typeName, typeMgr, typeDependencies);
-                ret = iType.dump(pOptions);
-                if (ret) typeDependencies.setGenerated(typeName);
-                ret = iType.dumpDependedTypes(pOptions);
-            }
-            break;
-        case RT_TYPE_MODULE:
-            {
-                ModuleType mType(reader, typeName, typeMgr, typeDependencies);
-                if (mType.hasConstants())
-                {
-                    ret = mType.dump(pOptions);
-                    if (ret) typeDependencies.setGenerated(typeName);
-//                  ret = mType.dumpDependedTypes(pOptions);
-                } else
-                {
-                    typeDependencies.setGenerated(typeName);
-                    ret = sal_True;
-                }
-            }
-            break;
-        case RT_TYPE_STRUCT:
-            {
-                StructureType sType(reader, typeName, typeMgr, typeDependencies);
-                ret = sType.dump(pOptions);
-                if (ret) typeDependencies.setGenerated(typeName);
-                ret = sType.dumpDependedTypes(pOptions);
-            }
-            break;
-        case RT_TYPE_ENUM:
-            {
-                EnumType enType(reader, typeName, typeMgr, typeDependencies);
-                ret = enType.dump(pOptions);
-                if (ret) typeDependencies.setGenerated(typeName);
-                ret = enType.dumpDependedTypes(pOptions);
-            }
-            break;
-        case RT_TYPE_EXCEPTION:
-            {
-                ExceptionType eType(reader, typeName, typeMgr, typeDependencies);
-                ret = eType.dump(pOptions);
-                if (ret) typeDependencies.setGenerated(typeName);
-                ret = eType.dumpDependedTypes(pOptions);
-            }
-            break;
-        case RT_TYPE_TYPEDEF:
-            {
-                TypeDefType tdType(reader, typeName, typeMgr, typeDependencies);
-                ret = tdType.dump(pOptions);
-                if (ret) typeDependencies.setGenerated(typeName);
-                ret = tdType.dumpDependedTypes(pOptions);
-            }
-            break;
-        case RT_TYPE_CONSTANTS:
-            {
-                ConstantsType cType(reader, typeName, typeMgr, typeDependencies);
-                if (cType.hasConstants())
-                {
-                    ret = cType.dump(pOptions);
-                    if (ret) typeDependencies.setGenerated(typeName);
-//                  ret = cType.dumpDependedTypes(pOptions);
-                } else
-                {
-                    typeDependencies.setGenerated(typeName);
-                    ret = sal_True;
-                }
-            }
-            break;
-        case RT_TYPE_SERVICE:
-        case RT_TYPE_OBJECT:
-            ret = sal_True;
-            break;
-    }
-
-    return ret;
-}
-
-//*************************************************************************
-// scopedName
-//*************************************************************************
-OString scopedName(const OString& scope, const OString& type,
-                   sal_Bool bNoNameSpace)
-{
-    sal_Int32 nPos = type.lastIndexOf( '/' );
-    if (nPos == -1)
-        return type;
-
-    if (bNoNameSpace)
-        return type.copy(nPos+1);
-
-    OStringBuffer tmpBuf(type.getLength()*2);
-    nPos = 0;
-    do
-    {
-        tmpBuf.append("::");
-        tmpBuf.append(type.getToken(0, '/', nPos));
-    } while( nPos != -1 );
-
-    return tmpBuf.makeStringAndClear();
-}
-
-//*************************************************************************
-// shortScopedName
-//*************************************************************************
-OString shortScopedName(const OString& scope, const OString& type,
-                           sal_Bool bNoNameSpace)
-{
-    sal_Int32 nPos = type.lastIndexOf( '/' );
-    if( nPos == -1 )
-        return OString();
-
-    if (bNoNameSpace)
-        return OString();
-
-    // scoped name only if the namespace is not equal
-    if (scope.lastIndexOf('/') > 0)
-    {
-        OString tmpScp(scope.copy(0, scope.lastIndexOf('/')));
-        OString tmpScp2(type.copy(0, nPos));
-
-        if (tmpScp == tmpScp2)
-            return OString();
-    }
-
-    OString aScope( type.copy( 0, nPos ) );
-    OStringBuffer tmpBuf(aScope.getLength()*2);
-
-    nPos = 0;
-    do
-    {
-        tmpBuf.append("::");
-        tmpBuf.append(aScope.getToken(0, '/', nPos));
-    } while( nPos != -1 );
-
-    return tmpBuf.makeStringAndClear();
-}
-
-
diff --git a/codemaker/source/cunomaker/cunotype.hxx b/codemaker/source/cunomaker/cunotype.hxx
deleted file mode 100644
index 81d55270833a..000000000000
--- a/codemaker/source/cunomaker/cunotype.hxx
+++ /dev/null
@@ -1,309 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOTYPE_HXX_
-#define INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOTYPE_HXX
-
-#include    <codemaker/typemanager.hxx>
-#include    <codemaker/dependency.hxx>
-
-enum BASETYPE
-{
-    BT_INVALID,
-    BT_VOID,
-    BT_ANY,
-    BT_TYPE,
-    BT_BOOLEAN,
-    BT_CHAR,
-    BT_STRING,
-    BT_FLOAT,
-    BT_DOUBLE,
-    BT_OCTET,
-    BT_BYTE,
-    BT_SHORT,
-    BT_LONG,
-    BT_HYPER,
-    BT_UNSIGNED_SHORT,
-    BT_UNSIGNED_LONG,
-    BT_UNSIGNED_HYPER
-};
-
-
-enum CunoTypeDecl
-{
-    CUNOTYPEDECL_ALLTYPES,
-    CUNOTYPEDECL_NOINTERFACES,
-    CUNOTYPEDECL_ONLYINTERFACES
-};
-
-class CunoOptions;
-class FileStream;
-
-class CunoType
-{
-public:
-    CunoType(TypeReader& typeReader,
-             const ::rtl::OString& typeName,
-             const TypeManager& typeMgr,
-             const TypeDependency& typeDependencies);
-
-    virtual ~CunoType();
-
-    virtual sal_Bool dump(CunoOptions* pOptions) throw( CannotDumpException );
-    virtual sal_Bool dumpDependedTypes(CunoOptions* pOptions)  throw( CannotDumpException );
-    virtual sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ) = 0;
-    virtual sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ) = 0;
-
-    virtual ::rtl::OString dumpHeaderDefine(FileStream& o, sal_Char* prefix, sal_Bool bExtended=sal_False);
-    virtual void dumpDefaultHIncludes(FileStream& o);
-    virtual void dumpDefaultCIncludes(FileStream& o);
-    virtual void dumpInclude(FileStream& o, const ::rtl::OString& typeName, sal_Char* prefix, sal_Bool bExtended=sal_False, sal_Bool bCaseSensitive=sal_False);
-    virtual void dumpDepIncludes(FileStream& o, const ::rtl::OString& typeName, sal_Char* prefix);
-
-    virtual void dumpOpenExternC(FileStream& o);
-    virtual void dumpCloseExternC(FileStream& o);
-
-    virtual void dumpGetCunoType(FileStream& o);
-    virtual void dumpCGetCunoType(FileStream& o);
-    virtual void dumpLGetCunoType(FileStream& o);
-
-    virtual void dumpType(FileStream& o, const ::rtl::OString& type, sal_Bool bConst=sal_False,
-                          sal_Bool bPointer=sal_False, sal_Bool bParam=sal_False)
-                    throw( CannotDumpException );
-    ::rtl::OString  getTypeClass(const ::rtl::OString& type="", sal_Bool bCStyle=sal_False);
-    ::rtl::OString  getBaseType(const ::rtl::OString& type);
-    void    dumpCppuGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, CunoTypeDecl eDeclFlag=CUNOTYPEDECL_ALLTYPES);
-    void    dumpTypeInit(FileStream& o, const ::rtl::OString& type);
-    BASETYPE isBaseType(const ::rtl::OString& type);
-
-    ::rtl::OString typeToIdentifier(const ::rtl::OString& type);
-
-    void    dumpConstantValue(FileStream& o, sal_uInt16 index);
-
-    virtual sal_uInt32  getMemberCount();
-    virtual sal_uInt32  getInheritedMemberCount();
-    void    dumpInheritedMembers(FileStream& o, rtl::OString& superType);
-
-    sal_Bool isSeqType(const ::rtl::OString& type, ::rtl::OString& baseType, ::rtl::OString& seqPrefix);
-    sal_Bool isArrayType(const ::rtl::OString& type, ::rtl::OString& baseType, ::rtl::OString& arrayPrefix);
-    sal_Bool isVoid(const ::rtl::OString& type)
-        { return type.equals("void"); }
-    void            inc(sal_uInt32 num=4);
-    void            dec(sal_uInt32 num=4);
-    ::rtl::OString  indent();
-    ::rtl::OString  indent(sal_uInt32 num);
-protected:
-    virtual sal_uInt32  checkInheritedMemberCount(const TypeReader* pReader);
-
-    ::rtl::OString  checkSpecialCunoType(const ::rtl::OString& type);
-    ::rtl::OString  checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False);
-    void    dumpCppuGetTypeMemberDecl(FileStream& o, CunoTypeDecl eDeclFlag);
-
-     sal_Bool isNestedType()
-        { return m_bIsNestedType; };
-
-     RegistryKeyNames& getNestedTypeNames()
-        { return  m_nestedTypeNames; };
-
-     sal_Bool isNestedTypeByName(const ::rtl::OString& type);
-     sal_Bool hasNestedType(const ::rtl::OString& type);
-
-protected:
-    sal_uInt32          m_inheritedMemberCount;
-
-    sal_Bool            m_cunoTypeLib;
-    sal_Bool            m_cunoTypeLeak;
-    sal_Bool            m_cunoTypeDynamic;
-    sal_uInt32          m_indentLength;
-    ::rtl::OString      m_typeName;
-    ::rtl::OString      m_name;
-    TypeReader          m_reader;
-    TypeManager&        m_typeMgr;
-    TypeDependency      m_dependencies;
-    sal_Bool            m_bIsNestedType;
-    RegistryKeyNames    m_nestedTypeNames;
-};
-
-class InterfaceType : public CunoType
-{
-public:
-    InterfaceType(TypeReader& typeReader,
-                 const ::rtl::OString& typeName,
-                 const TypeManager& typeMgr,
-                 const TypeDependency& typeDependencies);
-
-    virtual ~InterfaceType();
-
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpCFile(FileStream& o) throw( CannotDumpException );
-
-    void        dumpInheritedFunctions(FileStream& o, rtl::OString& superType);
-    void        dumpAttributes(FileStream& o, const ::rtl::OString& interfaceType, TypeReader& reader );
-    void        dumpMethods(FileStream& o, const ::rtl::OString& interfaceType, TypeReader& reader );
-    void        dumpGetCunoType(FileStream& o);
-    void        dumpCGetCunoType(FileStream& o);
-    void        dumpCUnoAttributeTypeNames(FileStream& o, sal_Bool bRelease=sal_False);
-    void        dumpCUnoMethodTypeNames(FileStream& o, sal_Bool bRelease=sal_False);
-    void        dumpCUnoAttributeRefs(FileStream& o, sal_uInt32& index);
-    void        dumpCUnoMethodRefs(FileStream& o, sal_uInt32& index);
-    void        dumpCUnoAttributes(FileStream& o, sal_uInt32& index);
-    void        dumpCUnoMethods(FileStream& o, sal_uInt32& index);
-    void        dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag);
-    void        dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag );
-
-    sal_uInt32  getMemberCount();
-    sal_uInt32  getInheritedMemberCount();
-
-protected:
-    sal_uInt32  checkInheritedMemberCount(const TypeReader* pReader);
-
-protected:
-    sal_uInt32  m_inheritedMemberCount;
-    sal_Bool    m_hasAttributes;
-    sal_Bool    m_hasMethods;
-};
-
-class ModuleType : public CunoType
-{
-public:
-    ModuleType(TypeReader& typeReader,
-                  const ::rtl::OString& typeName,
-               const TypeManager& typeMgr,
-               const TypeDependency& typeDependencies);
-
-    virtual ~ModuleType();
-
-    virtual sal_Bool    dump(CunoOptions* pOptions) throw( CannotDumpException );
-
-    sal_Bool            dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool            dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool            dumpCFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool            hasConstants();
-};
-
-class ConstantsType : public ModuleType
-{
-public:
-    ConstantsType(TypeReader& typeReader,
-                  const ::rtl::OString& typeName,
-               const TypeManager& typeMgr,
-               const TypeDependency& typeDependencies);
-
-    virtual ~ConstantsType();
-
-    virtual sal_Bool    dump(CunoOptions* pOptions) throw( CannotDumpException );
-};
-
-class StructureType : public CunoType
-{
-public:
-    StructureType(TypeReader& typeReader,
-                  const ::rtl::OString& typeName,
-                  const TypeManager& typeMgr,
-                  const TypeDependency& typeDependencies);
-
-    virtual ~StructureType();
-
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpCFile(FileStream& o) throw( CannotDumpException );
-};
-
-class ExceptionType : public CunoType
-{
-public:
-    ExceptionType(TypeReader& typeReader,
-                  const ::rtl::OString& typeName,
-                  const TypeManager& typeMgr,
-                  const TypeDependency& typeDependencies);
-
-    virtual ~ExceptionType();
-
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpCFile(FileStream& o) throw( CannotDumpException );
-};
-
-class EnumType : public CunoType
-{
-public:
-    EnumType(TypeReader& typeReader,
-              const ::rtl::OString& typeName,
-              const TypeManager& typeMgr,
-              const TypeDependency& typeDependencies);
-
-    virtual ~EnumType();
-
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpCFile(FileStream& o) throw( CannotDumpException );
-
-    void        dumpGetCunoType(FileStream& o);
-    void        dumpCGetCunoType(FileStream& o);
-};
-
-class TypeDefType : public CunoType
-{
-public:
-    TypeDefType(TypeReader& typeReader,
-              const ::rtl::OString& typeName,
-              const TypeManager& typeMgr,
-              const TypeDependency& typeDependencies);
-
-    virtual ~TypeDefType();
-
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpCFile(FileStream& o) throw( CannotDumpException );
-
-    void        dumpGetCunoType(FileStream& o);
-    void        dumpLGetCunoType(FileStream& o);
-    void        dumpCGetCunoType(FileStream& o);
-};
-
-
-sal_Bool produceType(const ::rtl::OString& typeName,
-                     TypeManager& typeMgr,
-                     TypeDependency& typeDependencies,
-                     CunoOptions* pOptions)
-                 throw( CannotDumpException );
-
-/**
- * This function returns a C++ scoped name, represents the namespace
- * scoping of this type, e.g. com:.sun::star::uno::XInterface. If the scope of
- * the type is equal scope, the relativ name will be used.
- */
-::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type,
-                   sal_Bool bNoNameSpace=sal_False);
-
-::rtl::OString shortScopedName(const ::rtl::OString& scope, const ::rtl::OString& type,
-                           sal_Bool bNoNameSpace=sal_False);
-
-
-#endif // INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOTYPE_HXX
-
diff --git a/codemaker/source/cunomaker/makefile.mk b/codemaker/source/cunomaker/makefile.mk
deleted file mode 100644
index 5cc3bc99db8f..000000000000
--- a/codemaker/source/cunomaker/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=codemaker
-TARGET=cunomaker
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=   cunomaker.cxx	\
-            cunooptions.cxx \
-            cunotype.cxx
-
-
-APP1TARGET= $(TARGET)
-
-APP1OBJS=   $(OBJ)$/cunomaker.obj	\
-            $(OBJ)$/cunooptions.obj \
-            $(OBJ)$/cunotype.obj			
-
-APP1STDLIBS= \
-             $(SALLIB) \
-             $(SALHELPERLIB) \
-             $(REGLIB) \
-
-APP1LIBS= \
-          $(LB)$/codemaker.lib
-
-.INCLUDE :  target.mk
diff --git a/codemaker/source/idlmaker/idlmaker.cxx b/codemaker/source/idlmaker/idlmaker.cxx
deleted file mode 100644
index 278bac63e4bd..000000000000
--- a/codemaker/source/idlmaker/idlmaker.cxx
+++ /dev/null
@@ -1,186 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
-
-#include <stdio.h>
-
-#include "sal/main.h"
-
-#include <codemaker/typemanager.hxx>
-#include <codemaker/dependency.hxx>
-
-#include "idloptions.hxx"
-#include "idltype.hxx"
-
-using namespace rtl;
-
-sal_Bool produceAllTypes(const OString& typeName,
-                         TypeManager& typeMgr,
-                         TypeDependency& typeDependencies,
-                         IdlOptions* pOptions,
-                         sal_Bool bFullScope)
-    throw( CannotDumpException )
-{
-    if (!produceType(typeName, typeMgr, typeDependencies, pOptions))
-    {
-        fprintf(stderr, "%s ERROR: %s\n",
-                pOptions->getProgramName().getStr(),
-                OString("cannot dump Type '" + typeName + "'").getStr());
-        exit(99);
-    }
-
-    RegistryKey typeKey = typeMgr.getTypeKey(typeName);
-    RegistryKeyNames subKeys;
-
-    if (typeKey.getKeyNames(OUString(), subKeys))
-        return sal_False;
-
-    OString tmpName;
-    for (sal_uInt32 i=0; i < subKeys.getLength(); i++)
-    {
-        tmpName = OUStringToOString(subKeys.getElement(i), RTL_TEXTENCODING_UTF8);
-
-        if (pOptions->isValid("-B"))
-            tmpName = tmpName.copy(tmpName.indexOf('/', 1) + 1);
-        else
-            tmpName = tmpName.copy(1);
-
-        if (bFullScope)
-        {
-            if (!produceAllTypes(tmpName, typeMgr, typeDependencies, pOptions, sal_True))
-                return sal_False;
-        } else
-        {
-            if (!produceType(tmpName, typeMgr, typeDependencies, pOptions))
-                return sal_False;
-        }
-    }
-
-    return sal_True;
-}
-
-SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-{
-    IdlOptions options;
-
-    try
-    {
-        if (!options.initOptions(argc, argv))
-        {
-            exit(1);
-        }
-    }
-    catch( IllegalArgument& e)
-    {
-        fprintf(stderr, "Illegal option: %s\n", e.m_message.getStr());
-        exit(99);
-    }
-
-    RegistryTypeManager typeMgr;
-    TypeDependency      typeDependencies;
-
-    if (!typeMgr.init(!options.isValid("-T"), options.getInputFiles()))
-    {
-        fprintf(stderr, "%s : init registries failed, check your registry files.\n", options.getProgramName().getStr());
-        exit(99);
-    }
-
-    if (options.isValid("-B"))
-    {
-        typeMgr.setBase(options.getOption("-B"));
-    }
-
-    try
-    {
-        if (options.isValid("-T"))
-        {
-            OString tOption(options.getOption("-T"));
-
-            OString typeName, tmpName;
-            sal_Bool ret = sal_False;
-            sal_Int32 nIndex = 0;
-            do
-            {
-                typeName = tOption.getToken(0, ';', nIndex);
-
-                sal_Int32 nPos = typeName.lastIndexOf( '.' );
-                tmpName = typeName.copy( nPos != -1 ? nPos+1 : 0 );
-                if (tmpName == "*")
-                {
-                    // produce this type and his scope, but the scope is not recursively  generated.
-                    if (typeName.equals("*"))
-                    {
-                        tmpName = "/";
-                    } else
-                    {
-                        tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
-                        if (tmpName.getLength() == 0)
-                            tmpName = "/";
-                        else
-                            tmpName.replace('.', '/');
-                    }
-                    ret = produceAllTypes(tmpName, typeMgr, typeDependencies, &options, sal_False);
-                } else
-                {
-                    // produce only this type
-                    ret = produceType(typeName.replace('.', '/'), typeMgr, typeDependencies, &options);
-                }
-
-                if (!ret)
-                {
-                    fprintf(stderr, "%s ERROR: %s\n",
-                            options.getProgramName().getStr(),
-                            OString("cannot dump Type '" + typeName + "'").getStr());
-                    exit(99);
-                }
-            } while( nIndex != -1 );
-        } else
-        {
-            // produce all types
-            if (!produceAllTypes("/", typeMgr, typeDependencies, &options, sal_True))
-            {
-                fprintf(stderr, "%s ERROR: %s\n",
-                        options.getProgramName().getStr(),
-                        "an error occurs while dumping all types.");
-                exit(99);
-            }
-        }
-    }
-    catch( CannotDumpException& e)
-    {
-        fprintf(stderr, "%s ERROR: %s\n",
-                options.getProgramName().getStr(),
-                e.m_message.getStr());
-        exit(99);
-    }
-
-    return 0;
-}
-
-
diff --git a/codemaker/source/idlmaker/idloptions.cxx b/codemaker/source/idlmaker/idloptions.cxx
deleted file mode 100644
index e495f555e5cb..000000000000
--- a/codemaker/source/idlmaker/idloptions.cxx
+++ /dev/null
@@ -1,250 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
-#include    <stdio.h>
-
-#include    "idloptions.hxx"
-
-using namespace rtl;
-
-sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
-    throw( IllegalArgument )
-{
-    sal_Bool    ret = sal_True;
-    sal_uInt16  i=0;
-
-    if (!bCmdFile)
-    {
-        bCmdFile = sal_True;
-
-        m_program = av[0];
-
-        if (ac < 2)
-        {
-            fprintf(stderr, "%s", prepareHelp().getStr());
-            ret = sal_False;
-        }
-
-        i = 1;
-    } else
-    {
-        i = 0;
-    }
-
-    char    *s=NULL;
-    for (i; i < ac; i++)
-    {
-        if (av[i][0] == '-')
-        {
-            switch (av[i][1])
-            {
-                case 'O':
-                    if (av[i][2] == '\0')
-                    {
-                        if (i < ac - 1 && av[i+1][0] != '-')
-                        {
-                            i++;
-                            s = av[i];
-                        } else
-                        {
-                            OString tmp("'-O', please check");
-                            if (i <= ac - 1)
-                            {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
-                            }
-
-                            throw IllegalArgument(tmp);
-                        }
-                    } else
-                    {
-                        s = av[i] + 2;
-                    }
-
-                    m_options["-O"] = OString(s);
-                    break;
-                case 'B':
-                    if (av[i][2] == '\0')
-                    {
-                        if (i < ac - 1 && av[i+1][0] != '-')
-                        {
-                            i++;
-                            s = av[i];
-                        } else
-                        {
-                            OString tmp("'-B', please check");
-                            if (i <= ac - 1)
-                            {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
-                            }
-
-                            throw IllegalArgument(tmp);
-                        }
-                    } else
-                    {
-                        s = av[i] + 2;
-                    }
-
-                    m_options["-B"] = OString(s);
-                    break;
-                case 'T':
-                    if (av[i][2] == '\0')
-                    {
-                        if (i < ac - 1 && av[i+1][0] != '-')
-                        {
-                            i++;
-                            s = av[i];
-                        } else
-                        {
-                            OString tmp("'-T', please check");
-                            if (i <= ac - 1)
-                            {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
-                            }
-
-                            throw IllegalArgument(tmp);
-                        }
-                    } else
-                    {
-                        s = av[i] + 2;
-                    }
-
-                    if (m_options.count("-T") > 0)
-                    {
-                        OString tmp(m_options["-T"]);
-                        tmp = tmp + ";" + s;
-                        m_options["-T"] = tmp;
-                    } else
-                    {
-                        m_options["-T"] = OString(s);
-                    }
-                    break;
-                case 'G':
-                    if (av[i][2] == 'c')
-                    {
-                        if (av[i][3] != '\0')
-                        {
-                            OString tmp("'-Gc', please check");
-                            if (i <= ac - 1)
-                            {
-                                tmp += " your input '" + OString(av[i]) + "'";
-                            }
-
-                            throw IllegalArgument(tmp);
-                        }
-
-                        m_options["-Gc"] = OString("");
-                        break;
-                    } else
-                    if (av[i][2] != '\0')
-                    {
-                        OString tmp("'-G', please check");
-                        if (i <= ac - 1)
-                        {
-                            tmp += " your input '" + OString(av[i]) + "'";
-                        }
-
-                        throw IllegalArgument(tmp);
-                    }
-
-                    m_options["-G"] = OString("");
-                    break;
-                default:
-                    throw IllegalArgument("the option is unknown" + OString(av[i]));
-                    break;
-            }
-        } else
-        {
-            if (av[i][0] == '@')
-            {
-                FILE* cmdFile = fopen(av[i]+1, "r");
-                  if( cmdFile == NULL )
-                  {
-                    fprintf(stderr, "%s", prepareHelp().getStr());
-                    ret = sal_False;
-                } else
-                {
-                    int rargc=0;
-                    char* rargv[512];
-                    char  buffer[512];
-
-                    while ( fscanf(cmdFile, "%s", buffer) != EOF )
-                    {
-                        rargv[rargc]= strdup(buffer);
-                        rargc++;
-                    }
-                    fclose(cmdFile);
-
-                    ret = initOptions(rargc, rargv, bCmdFile);
-
-                    for (long i=0; i < rargc; i++)
-                    {
-                        free(rargv[i]);
-                    }
-                }
-            } else
-            {
-                m_inputFiles.push_back(av[i]);
-            }
-        }
-    }
-
-    return ret;
-}
-
-OString IdlOptions::prepareHelp()
-{
-    OString help("\nusing: ");
-    help += m_program + " [-options] file_1 ... file_n\nOptions:\n";
-    help += "    -O<path>   = path describes the root directory for the generated output.\n";
-    help += "                 The output directory tree is generated under this directory.\n";
-    help += "    -T<name>   = name specifies a type or a list of types. The output for this\n";
-    help += "      [t1;...]   type is generated. If no '-T' option is specified,\n";
-    help += "                 then output for all types is generated.\n";
-    help += "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n";
-    help += "    -B<name>   = name specifies the base node. All types are searched under this\n";
-    help += "                 node. Default is the root '/' of the registry files.\n";
-    help += "    -G         = generate only target files which does not exists.\n";
-    help += "    -Gc        = generate only target files which content will be changed.\n";
-    help += "IMPORTANT:       You lose enum values and struct, exception inheritance!\n";
-    help += "                 Parameter name Object is translated to _Object!\n";
-    help += "                 The type type is translated to CORBA::TypeCode!\n";
-    help += "                 Sequences are expanded to a typedef name Sequence_..._\"name\"!\n";
-    help += prepareVersion();
-
-    return help;
-}
-
-OString IdlOptions::prepareVersion()
-{
-    OString version(m_program);
-    version += " Version 2.0\n\n";
-    return version;
-}
-
-
diff --git a/codemaker/source/idlmaker/idloptions.hxx b/codemaker/source/idlmaker/idloptions.hxx
deleted file mode 100644
index 6ad5e47daa4d..000000000000
--- a/codemaker/source/idlmaker/idloptions.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLOPTIONS_HXX
-#define INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLOPTIONS_HXX
-
-#include    <codemaker/options.hxx>
-
-class IdlOptions : public Options
-{
-public:
-    IdlOptions()
-        : Options() {}
-
-    ~IdlOptions() {}
-
-    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
-            throw( IllegalArgument );
-
-    ::rtl::OString  prepareHelp();
-
-    ::rtl::OString  prepareVersion();
-
-protected:
-};
-
-#endif // INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLOPTIONS_HXX
diff --git a/codemaker/source/idlmaker/idltype.cxx b/codemaker/source/idlmaker/idltype.cxx
deleted file mode 100644
index 8ffa32543100..000000000000
--- a/codemaker/source/idlmaker/idltype.cxx
+++ /dev/null
@@ -1,1752 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
-
-#include <stdio.h>
-#include    <rtl/alloc.h>
-#include    <rtl/ustring.hxx>
-#include    <rtl/strbuf.hxx>
-
-#include    "idltype.hxx"
-#include    "idloptions.hxx"
-
-using namespace rtl;
-
-//*************************************************************************
-// IdlType
-//*************************************************************************
-IdlType::IdlType(TypeReader& typeReader,
-                   const OString& typeName,
-                   const TypeManager& typeMgr,
-                   const TypeDependency& typeDependencies)
-    : m_inheritedMemberCount(0)
-    , m_indentLength(0)
-    , m_typeName(typeName)
-    , m_reader(typeReader)
-    , m_typeMgr((TypeManager&)typeMgr)
-    , m_dependencies(typeDependencies)
-{
-    sal_Int32 i = typeName.lastIndexOf('/');
-    m_name = typeName.copy( i != -1 ? i+1 : 0 );
-}
-
-IdlType::~IdlType()
-{
-
-}
-
-sal_Bool IdlType::dump(IdlOptions* pOptions)
-    throw( CannotDumpException )
-{
-    sal_Bool ret = sal_False;
-
-    OString outPath;
-    if (pOptions->isValid("-O"))
-        outPath = pOptions->getOption("-O");
-
-    OString tmpFileName;
-    OString hFileName = createFileNameFromType(outPath, m_typeName, ".idl");
-
-    sal_Bool bFileExists = sal_False;
-    sal_Bool bFileCheck = sal_False;
-
-    if ( pOptions->isValid("-G") || pOptions->isValid("-Gc") )
-    {
-        bFileExists = fileExists( hFileName );
-        ret = sal_True;
-    }
-
-    if ( bFileExists && pOptions->isValid("-Gc") )
-    {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tml");
-        bFileCheck = sal_True;
-    }
-
-    if ( !bFileExists || bFileCheck )
-    {
-        FileStream hFile;
-
-        if ( bFileCheck )
-            hFile.open(tmpFileName);
-        else
-            hFile.open(hFileName);
-
-        if(!hFile.isValid())
-        {
-            OString message("cannot open ");
-            message += hFileName + " for writing";
-            throw CannotDumpException(message);
-        }
-
-        ret = dumpHFile(hFile);
-
-        hFile.close();
-        if (ret && bFileCheck)
-        {
-            ret = checkFileContent(hFileName, tmpFileName);
-        }
-    }
-
-    return ret;
-}
-sal_Bool IdlType::dumpDependedTypes(IdlOptions* pOptions)
-    throw( CannotDumpException )
-{
-    sal_Bool ret = sal_True;
-
-    TypeUsingSet usingSet(m_dependencies.getDependencies(m_typeName));
-
-    TypeUsingSet::const_iterator iter = usingSet.begin();
-    OString typeName;
-    sal_uInt32 index = 0;
-    while (iter != usingSet.end())
-    {
-        typeName = (*iter).m_type;
-        if ((index = typeName.lastIndexOf(']')) > 0)
-            typeName = typeName.copy(index + 1);
-
-        if (getBaseType(typeName).getLength() == 0)
-        {
-            if (!produceType(typeName,
-                                m_typeMgr,
-                             m_dependencies,
-                             pOptions))
-            {
-                fprintf(stderr, "%s ERROR: %s\n",
-                        pOptions->getProgramName().getStr(),
-                        OString("cannot dump Type '" + typeName + "'").getStr());
-                exit(99);
-            }
-        }
-        ++iter;
-    }
-
-    return ret;
-}
-
-OString IdlType::dumpHeaderDefine(FileStream& o, sal_Char* prefix )
-{
-    if (m_typeName.equals("/"))
-    {
-        m_typeName = "global";
-    }
-
-    sal_uInt32 length = 3 + m_typeName.getLength() + strlen(prefix);
-
-    OStringBuffer tmpBuf(length);
-
-    tmpBuf.append('_');
-    tmpBuf.append(m_typeName);
-    tmpBuf.append('_');
-    tmpBuf.append(prefix);
-    tmpBuf.append('_');
-
-    OString tmp(tmpBuf.makeStringAndClear().replace('/', '_').toAsciiUpperCase());
-
-    o << "#ifndef " << tmp << "\n#define " << tmp << "\n";
-
-    return tmp;
-}
-
-void IdlType::dumpDefaultHIncludes(FileStream& o)
-{
-}
-
-void IdlType::dumpInclude(FileStream& o, const OString& genTypeName, const OString& typeName, sal_Char* prefix )
-{
-    sal_uInt32 length = 3+ m_typeName.getLength() + strlen(prefix);
-
-    OStringBuffer tmpBuf(length);
-
-    tmpBuf.append('_');
-    tmpBuf.append(typeName);
-    tmpBuf.append('_');
-    tmpBuf.append(prefix);
-    tmpBuf.append('_');
-
-    OString tmp(tmpBuf.makeStringAndClear().replace('/', '_').toAsciiUpperCase());
-
-    length = 1 + typeName.getLength() + strlen(prefix);
-
-    tmpBuf.ensureCapacity(length);
-    tmpBuf.append(typeName);
-    tmpBuf.append('.');
-    tmpBuf.append(prefix);
-
-    o << "#ifndef " << tmp << "\n#include <";
-    tmp = tmpBuf.makeStringAndClear();
-
-    sal_Int32 nIndex = 0;
-    do
-    {
-        genTypeName.getToken(0, '/', nIndex);
-         o << "../";
-    } while( nIndex != -1 );
-
-//      sal_Int32 nSlashes = genTypeName.getTokenCount( '/');
-//      for( sal_Int32 i = 1; i < nSlashes; i++ )
-//          o << "../";
-    o << tmp;
-    o << ">\n#endif\n";
-}
-
-void IdlType::dumpDepIncludes(FileStream& o, const OString& typeName, sal_Char* prefix)
-{
-    TypeUsingSet usingSet(m_dependencies.getDependencies(typeName));
-
-    TypeUsingSet::const_iterator iter = usingSet.begin();
-
-    OString     sPrefix(OString(prefix).toAsciiUpperCase());
-    sal_uInt32  index = 0;
-    sal_uInt32  seqNum = 0;
-    OString     relType;
-    while (iter != usingSet.end())
-    {
-        index = (*iter).m_type.lastIndexOf(']');
-        seqNum = (index > 0 ? ((index+1) / 2) : 0);
-
-        relType = (*iter).m_type;
-        if (index > 0)
-            relType = relType.copy(index+1);
-
-
-        OString defPrefix("IDL");
-
-        if (getBaseType(relType).getLength() == 0 &&
-            m_typeName != relType)
-        {
-            if (m_typeMgr.getTypeClass(relType) == RT_TYPE_INTERFACE)
-            {
-                if (!((*iter).m_use & TYPEUSE_SUPER))
-                {
-                    o << "\n";
-                    dumpNameSpace(o, sal_True, sal_False, relType);
-                    o << "\ninterface " << scopedName(m_typeName, relType, sal_True) << ";\n";
-                    dumpNameSpace(o, sal_False, sal_False, relType);
-                    o << "\n\n";
-                }
-            }
-            dumpInclude(o, typeName, relType, prefix);
-        }
-        else if (relType == "type")
-        {
-            o << "module CORBA {\n"
-              << "\tinterface TypeCode;\n"
-              << "};\n\n";
-        }
-
-        if( seqNum != 0 )
-        {
-            // write typedef for sequences to support Rational Rose 2000 import
-            OString aST = relType;
-            OString aScope;
-            dumpNameSpace( o, sal_True, sal_False, relType );
-            for( sal_uInt32 i = 0; i < seqNum; i++ )
-            {
-                o << "typedef sequence< " << scopedName("", aST) << " > ";
-
-                if( i == 0 )
-                {
-                    aST = aST.replace( '/', '_' );
-                    aST = aST.replace( ' ', '_' );
-                }
-                aST = aST + "_Sequence" ;
-                o << aST << ";\n";
-            }
-            dumpNameSpace( o, sal_False, sal_False, relType );
-        }
-        ++iter;
-    }
-}
-
-void IdlType::dumpNameSpace(FileStream& o, sal_Bool bOpen, sal_Bool bFull, const OString& type)
-{
-    OString typeName(type);
-    sal_Bool bOneLine = sal_True;
-    if (typeName.getLength() == 0)
-    {
-        typeName = m_typeName;
-        bOneLine = sal_False;
-    }
-
-    if (typeName == "/")
-        return;
-
-    if (typeName.indexOf( '/' ) == -1 && !bFull)
-        return;
-
-    if (!bFull)
-        typeName = typeName.copy( 0, typeName.lastIndexOf( '/' ) );
-
-    if (bOpen)
-    {
-        sal_Int32 nIndex = 0;
-        do
-        {
-            o << "module " << typeName.getToken(0, '/', nIndex);
-            if (bOneLine)
-                o << " { ";
-            else
-                 o << "\n{\n";
-        } while( nIndex != -1 );
-    } else
-    {
-        sal_Int32 nPos = 0;
-        do
-        {
-            nPos = typeName.lastIndexOf( '/' );
-            o << "};";
-            if( bOneLine )
-                o << " ";
-            else
-                o << " /* " << typeName.copy( nPos+1 ) << " */\n";
-            if( nPos != -1 )
-                typeName = typeName.copy( 0, nPos );
-        } while( nPos != -1 );
-    }
-}
-
-
-sal_uInt32 IdlType::getMemberCount()
-{
-    sal_uInt32 count = m_reader.getMethodCount();
-
-    sal_uInt32 fieldCount = m_reader.getFieldCount();
-    RTFieldAccess access = RT_ACCESS_INVALID;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-            count++;
-    }
-    return count;
-}
-
-sal_uInt32 IdlType::checkInheritedMemberCount(const TypeReader* pReader)
-{
-    sal_Bool bSelfCheck = sal_True;
-    if (!pReader)
-    {
-        bSelfCheck = sal_False;
-        pReader = &m_reader;
-    }
-
-    sal_uInt32 count = 0;
-    OString superType(pReader->getSuperTypeName());
-    if (superType.getLength() > 0)
-    {
-        TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
-        if ( aSuperReader.isValid() )
-        {
-            count = checkInheritedMemberCount(&aSuperReader);
-        }
-    }
-
-    if (bSelfCheck)
-    {
-        count += pReader->getMethodCount();
-        sal_uInt32 fieldCount = pReader->getFieldCount();
-        RTFieldAccess access = RT_ACCESS_INVALID;
-        for (sal_uInt16 i=0; i < fieldCount; i++)
-        {
-            access = pReader->getFieldAccess(i);
-
-            if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-            {
-                count++;
-            }
-        }
-    }
-
-    return count;
-}
-
-sal_uInt32 IdlType::getInheritedMemberCount()
-{
-    if (m_inheritedMemberCount == 0)
-    {
-        m_inheritedMemberCount = checkInheritedMemberCount(0);
-    }
-
-    return m_inheritedMemberCount;
-}
-
-
-void IdlType::dumpType(FileStream& o, const OString& type )
-    throw( CannotDumpException )
-{
-    OString sType(checkRealBaseType(type, sal_True));
-    sal_uInt32 index = sType.lastIndexOf(']');
-    sal_uInt32 seqNum = (index > 0 ? ((index+1) / 2) : 0);
-
-    OString relType = (index > 0 ? (sType).copy(index+1) : type);
-
-    RTTypeClass typeClass = m_typeMgr.getTypeClass(relType);
-
-    sal_uInt32 i;
-/*
-    for (i=0; i < seqNum; i++)
-    {
-        //o << "sequence< ";
-    }
-*/
-    switch (typeClass)
-    {
-        case RT_TYPE_INVALID:
-            {
-                OString tmp(getBaseType(relType));
-                if (tmp.getLength() > 0)
-                {
-                    tmp = tmp.replace( ' ', '_' );
-                    o << tmp;
-                } else
-                    throw CannotDumpException("Unknown type '" + relType + "', incomplete type library.");
-            }
-            break;
-        case RT_TYPE_INTERFACE:
-        case RT_TYPE_STRUCT:
-        case RT_TYPE_ENUM:
-        case RT_TYPE_TYPEDEF:
-        case RT_TYPE_EXCEPTION:
-                if( seqNum )
-                {
-                    OString aST = relType.replace( '/', '_' );
-                    aST = aST.replace( ' ', '_' );
-                    o << aST;
-                }
-                else
-                    o << scopedName(m_typeName, relType);
-            break;
-    }
-
-    for (i=0; i < seqNum; i++)
-    {
-        //o << " >";
-        // use typedef for sequences to support Rational Rose 2000 import
-        o << "_Sequence";
-    }
-}
-
-OString IdlType::getBaseType(const OString& type)
-{
-    if (type.equals("long"))
-        return type;
-    if (type.equals("short"))
-        return type;
-    if (type.equals("hyper"))
-        return "long long";
-    if (type.equals("string"))
-        return "string";
-    if (type.equals("boolean"))
-        return type;
-    if (type.equals("char"))
-        return "char";
-    if (type.equals("byte"))
-        return "byte";
-    if (type.equals("any"))
-        return type;
-    if (type.equals("type"))
-        return "CORBA::TypeCode";
-    if (type.equals("float"))
-        return type;
-    if (type.equals("double"))
-        return type;
-    if (type.equals("octet"))
-        return type;
-    if (type.equals("void"))
-        return type;
-    if (type.equals("unsigned long"))
-        return type;
-    if (type.equals("unsigned short"))
-        return type;
-    if (type.equals("unsigned hyper"))
-        return "unsigned long long";
-
-    return OString();
-}
-
-void IdlType::dumpIdlGetType(FileStream& o, const OString& type, sal_Bool bDecl, IdlTypeDecl eDeclFlag)
-{
-    OString sType( checkRealBaseType(type, sal_True) );
-    sal_uInt32 index = sType.lastIndexOf(']');
-    OString relType = (index > 0 ? (sType).copy(index+1) : type);
-
-    if (eDeclFlag == CPPUTYPEDECL_ONLYINTERFACES)
-    {
-         if (m_typeMgr.getTypeClass(relType) == RT_TYPE_INTERFACE)
-        {
-            o << indent() << "getIdlType( (";
-            dumpType(o, type);
-            o << "*)0 )";
-
-            if (bDecl)
-                o << ";\n";
-        }
-    } else
-    {
-        if (isBaseType(type))
-        {
-            return;
-        } else
-        {
-            if (eDeclFlag == CPPUTYPEDECL_NOINTERFACES &&
-                m_typeMgr.getTypeClass(relType) == RT_TYPE_INTERFACE)
-                return;
-
-//          if (m_typeMgr.getTypeClass(type) == RT_TYPE_TYPEDEF)
-//          {
-//              o << indent() << "get_" << type.replace('/', '_') << "_Type()";
-//          } else
-//          {
-                o << indent() << "getIdlType( (";
-                dumpType(o, type);
-                o << "*)0 )";
-//          }
-        }
-        if (bDecl)
-            o << ";\n";
-    }
-}
-
-BASETYPE IdlType::isBaseType(const OString& type)
-{
-    if (type.equals("long"))
-        return BT_LONG;
-    if (type.equals("short"))
-        return BT_SHORT;
-    if (type.equals("hyper"))
-        return BT_HYPER;
-    if (type.equals("string"))
-        return BT_STRING;
-    if (type.equals("boolean"))
-        return BT_BOOLEAN;
-    if (type.equals("char"))
-        return BT_CHAR;
-    if (type.equals("byte"))
-        return BT_BYTE;
-    if (type.equals("any"))
-        return BT_ANY;
-    if (type.equals("float"))
-        return BT_FLOAT;
-    if (type.equals("double"))
-        return BT_DOUBLE;
-    if (type.equals("void"))
-        return BT_VOID;
-    if (type.equals("unsigned long"))
-        return BT_UNSIGNED_LONG;
-    if (type.equals("unsigned short"))
-        return BT_UNSIGNED_SHORT;
-    if (type.equals("unsigned hyper"))
-        return BT_UNSIGNED_HYPER;
-
-    return BT_INVALID;
-}
-
-OString IdlType::checkSpecialIdlType(const OString& type)
-{
-    OString baseType(type);
-
-    RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader();
-
-    RegistryKey     key;
-    sal_uInt8*      pBuffer=NULL;
-    RTTypeClass     typeClass;
-    sal_Bool        isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
-    TypeReader      reader;
-
-    while (isTypeDef)
-    {
-        reader = m_typeMgr.getTypeReader(baseType);
-
-        if (reader.isValid())
-        {
-            typeClass = reader.getTypeClass();
-
-            if (typeClass == RT_TYPE_TYPEDEF)
-                baseType = reader.getSuperTypeName();
-            else
-                isTypeDef = sal_False;
-        } else
-        {
-            break;
-        }
-    }
-
-    return baseType;
-}
-
-OString IdlType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly)
-{
-    sal_uInt32 index = type.lastIndexOf(']');
-    OString baseType = (index > 0 ? ((OString)type).copy(index+1) : type);
-    OString seqPrefix = (index > 0 ? ((OString)type).copy(0, index+1) : OString());
-
-    RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader();
-
-    RegistryKey     key;
-    sal_uInt8*      pBuffer=NULL;
-    RTTypeClass     typeClass;
-    sal_Bool        mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
-    TypeReader      reader;
-
-    while (mustBeChecked)
-    {
-        reader = m_typeMgr.getTypeReader(baseType);
-
-        if (reader.isValid())
-        {
-            typeClass = reader.getTypeClass();
-
-            if (typeClass == RT_TYPE_TYPEDEF)
-            {
-                baseType = reader.getSuperTypeName();
-                index = baseType.lastIndexOf(']');
-                  if (index > 0)
-                {
-                    seqPrefix += baseType.copy(0, index+1);
-                    baseType = baseType.copy(index+1);
-                }
-            } else
-                mustBeChecked = sal_False;
-        } else
-        {
-            break;
-        }
-    }
-
-    if ( bResolveTypeOnly )
-        baseType = seqPrefix + baseType;
-
-    return baseType;
-}
-
-void IdlType::dumpConstantValue(FileStream& o, sal_uInt16 index)
-{
-    RTConstValue constValue = m_reader.getFieldConstValue(index);
-
-    switch (constValue.m_type)
-    {
-        case RT_TYPE_BOOL:
-            if (constValue.m_value.aBool)
-                o << "true";
-            else
-                o << "false";
-            break;
-        case RT_TYPE_BYTE:
-            {
-                char tmp[16];
-                snprintf(tmp, sizeof(tmp), "0x%x", (sal_Int8)constValue.m_value.aByte);
-                o << tmp;
-            }
-            break;
-        case RT_TYPE_INT16:
-            o << constValue.m_value.aShort;
-            break;
-        case RT_TYPE_UINT16:
-            o << constValue.m_value.aUShort;
-            break;
-        case RT_TYPE_INT32:
-            o << constValue.m_value.aLong;
-            break;
-        case RT_TYPE_UINT32:
-            o << constValue.m_value.aULong;
-            break;
-        case RT_TYPE_INT64:
-            {
-                ::rtl::OString tmp( OString::valueOf(constValue.m_value.aHyper) );
-                o << tmp.getStr();
-            }
-            break;
-        case RT_TYPE_UINT64:
-            {
-                ::rtl::OString tmp( OString::valueOf((sal_Int64)constValue.m_value.aUHyper) );
-                o << tmp.getStr();
-            }
-            break;
-        case RT_TYPE_FLOAT:
-            {
-                ::rtl::OString tmp( OString::valueOf(constValue.m_value.aFloat) );
-                o << tmp.getStr();
-            }
-            break;
-        case RT_TYPE_DOUBLE:
-            {
-                ::rtl::OString tmp( OString::valueOf(constValue.m_value.aDouble) );
-                o << tmp.getStr();
-            }
-            break;
-        case RT_TYPE_STRING:
-            {
-                ::rtl::OUString aUStr(constValue.m_value.aString);
-                ::rtl::OString aStr = ::rtl::OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US);
-                o << "\"" << aStr.getStr() << "\")";
-            }
-            break;
-    }
-}
-
-void IdlType::inc(sal_uInt32 num)
-{
-    m_indentLength += num;
-}
-
-void IdlType::dec(sal_uInt32 num)
-{
-    if (m_indentLength - num < 0)
-        m_indentLength = 0;
-    else
-        m_indentLength -= num;
-}
-
-OString IdlType::indent()
-{
-    OStringBuffer tmp(m_indentLength);
-
-    for (sal_uInt32 i=0; i < m_indentLength; i++)
-    {
-        tmp.append(' ');
-    }
-    return tmp.makeStringAndClear();
-}
-
-OString IdlType::indent(sal_uInt32 num)
-{
-    OStringBuffer tmp(m_indentLength + num);
-
-    for (sal_uInt32 i=0; i < m_indentLength + num; i++)
-    {
-        tmp.append(' ');
-    }
-    return tmp.makeStringAndClear();
-}
-
-//*************************************************************************
-// InterfaceType
-//*************************************************************************
-InterfaceType::InterfaceType(TypeReader& typeReader,
-                              const OString& typeName,
-                             const TypeManager& typeMgr,
-                             const TypeDependency& typeDependencies)
-    : IdlType(typeReader, typeName, typeMgr, typeDependencies)
-{
-    m_inheritedMemberCount = 0;
-    m_hasAttributes = sal_False;
-    m_hasMethods = sal_False;
-}
-
-InterfaceType::~InterfaceType()
-{
-
-}
-
-sal_Bool InterfaceType::dumpHFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    OString headerDefine(dumpHeaderDefine(o, "IDL"));
-    o << "\n";
-
-    dumpDefaultHIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "idl");
-    o << "\n";
-    dumpNameSpace(o);
-
-    // write documentation
-    OString aDoc = m_reader.getDoku();
-    if( aDoc.getLength() )
-        o << "/**\n" << aDoc << "\n*/";
-    o << "\ninterface " << m_name;
-
-    OString superType(m_reader.getSuperTypeName());
-    if (superType.getLength() > 0)
-        o << " : " << scopedName(m_typeName, superType);
-
-    o << "\n{\n";
-    inc();
-
-    dumpAttributes(o);
-    dumpMethods(o);
-
-    dec();
-    o << "};\n\n";
-
-    dumpNameSpace(o, sal_False);
-
-//  o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n"
-//    << "class Type;\n} } } }\n\n";
-
-    o << "#endif /* "<< headerDefine << "*/" << "\n";
-    return sal_True;
-}
-
-void InterfaceType::dumpAttributes(FileStream& o)
-{
-    sal_uInt32 fieldCount = m_reader.getFieldCount();
-    sal_Bool first=sal_True;
-
-    RTFieldAccess access = RT_ACCESS_INVALID;
-    OString fieldName;
-    OString fieldType;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-            continue;
-
-        fieldName = m_reader.getFieldName(i);
-        fieldType = m_reader.getFieldType(i);
-
-        if (first)
-        {
-            first = sal_False;
-            o << "\n";
-        }
-
-        // write documentation
-        OString aDoc = m_reader.getFieldDoku(i);
-        if( aDoc.getLength() )
-            o << "/**\n" << aDoc << "\n*/\n";
-
-        if (access == RT_ACCESS_READONLY)
-            o << indent() << "readonly attribute ";
-        else
-            o << indent() << "attribute ";
-        dumpType(o, fieldType);
-        o << " " << fieldName << ";\n";
-    }
-}
-
-void InterfaceType::dumpMethods(FileStream& o)
-{
-    sal_uInt32 methodCount = m_reader.getMethodCount();
-
-    OString methodName, returnType, paramType, paramName;
-    sal_uInt32 paramCount = 0;
-    sal_uInt32 excCount = 0;
-    RTMethodMode methodMode = RT_MODE_INVALID;
-    RTParamMode  paramMode = RT_PARAM_INVALID;
-
-    sal_Bool bRef = sal_False;
-    sal_Bool bConst = sal_False;
-    sal_Bool bWithRunTimeExcp = sal_True;
-
-    for (sal_Int16 i=0; i < methodCount; i++)
-    {
-        methodName = m_reader.getMethodName(i);
-        returnType = m_reader.getMethodReturnType(i);
-        paramCount = m_reader.getMethodParamCount(i);
-        excCount = m_reader.getMethodExcCount(i);
-        methodMode = m_reader.getMethodMode(i);
-
-        if ( methodName.equals("acquire") || methodName.equals("release") )
-        {
-            bWithRunTimeExcp = sal_False;
-        }
-
-        // write documentation
-        OString aDoc = m_reader.getMethodDoku(i);
-        if( aDoc.getLength() )
-            o << "/**\n" << aDoc << "\n*/\n";
-
-        o << indent();
-        dumpType(o, returnType);
-        o << " " << methodName << "( ";
-        sal_uInt16 j;
-        for (j=0; j < paramCount; j++)
-        {
-            paramName = m_reader.getMethodParamName(i, j);
-            paramType = m_reader.getMethodParamType(i, j);
-            paramMode = m_reader.getMethodParamMode(i, j);
-
-            switch (paramMode)
-            {
-                case RT_PARAM_IN:
-                    o << "in ";
-                    break;
-                case RT_PARAM_OUT:
-                    o << "out ";
-                    break;
-                case RT_PARAM_INOUT:
-                    o << "inout ";
-                    break;
-                    break;
-            }
-
-            dumpType(o, paramType);
-            if( paramName == "Object" )
-                o << " _Object";
-            else
-                o << " " << paramName;
-
-            if (j+1 < paramCount) o << ", ";
-        }
-        o << " )";
-
-        if( excCount )
-        {
-            o << " raises(";
-            OString excpName;
-            sal_Bool bWriteComma = sal_False;
-            sal_Bool bRTExceptionWritten = sal_False;
-            for (j=0; j < excCount; j++)
-            {
-                excpName = m_reader.getMethodExcType(i, j);
-                if( bWriteComma )
-                    o << ", ";
-                o << scopedName(m_typeName, excpName);
-                bWriteComma = sal_True;
-
-                if(excpName == "com/sun/star/uno/RuntimeException")
-                    bRTExceptionWritten = sal_True;
-            }
-
-            if ( bWithRunTimeExcp && !bRTExceptionWritten )
-            {
-                if( bWriteComma )
-                    o << ", ";
-                o << "::com::sun::star::uno::RuntimeException";
-            }
-
-            o << ");\n";
-        }
-        else if ( bWithRunTimeExcp )
-        {
-            o << "raises( ::com::sun::star::uno::RuntimeException );\n";
-        }
-        else
-        {
-            o << ";\n";
-        }
-    }
-}
-
-
-sal_uInt32 InterfaceType::getMemberCount()
-{
-    sal_uInt32 count = m_reader.getMethodCount();
-
-    if (count)
-        m_hasMethods = sal_True;
-
-    sal_uInt32 fieldCount = m_reader.getFieldCount();
-    RTFieldAccess access = RT_ACCESS_INVALID;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-        {
-            m_hasAttributes = sal_True;
-            count++;
-        }
-    }
-    return count;
-}
-
-sal_uInt32 InterfaceType::checkInheritedMemberCount(const TypeReader* pReader)
-{
-    sal_uInt32 cout = 0;
-    sal_Bool bSelfCheck = sal_True;
-    if (!pReader)
-    {
-        bSelfCheck = sal_False;
-        pReader = &m_reader;
-    }
-
-    sal_uInt32 count = 0;
-    OString superType(pReader->getSuperTypeName());
-    if (superType.getLength() > 0)
-    {
-        TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
-        if (aSuperReader.isValid())
-        {
-            count = checkInheritedMemberCount(&aSuperReader);
-        }
-    }
-
-    if (bSelfCheck)
-    {
-        count += pReader->getMethodCount();
-        sal_uInt32 fieldCount = pReader->getFieldCount();
-        RTFieldAccess access = RT_ACCESS_INVALID;
-        for (sal_uInt16 i=0; i < fieldCount; i++)
-        {
-            access = pReader->getFieldAccess(i);
-
-            if (access != RT_ACCESS_CONST && access != RT_ACCESS_INVALID)
-            {
-                count++;
-            }
-        }
-    }
-
-    return count;
-}
-
-sal_uInt32 InterfaceType::getInheritedMemberCount()
-{
-    if (m_inheritedMemberCount == 0)
-    {
-        m_inheritedMemberCount = checkInheritedMemberCount(0);
-    }
-
-    return m_inheritedMemberCount;
-}
-
-
-
-//*************************************************************************
-// ModuleType
-//*************************************************************************
-ModuleType::ModuleType(TypeReader& typeReader,
-                        const OString& typeName,
-                       const TypeManager& typeMgr,
-                       const TypeDependency& typeDependencies)
-    : IdlType(typeReader, typeName, typeMgr, typeDependencies)
-{
-}
-
-ModuleType::~ModuleType()
-{
-
-}
-
-sal_Bool ModuleType::dump(IdlOptions* pOptions)
-    throw( CannotDumpException )
-{
-    sal_Bool ret = sal_False;
-
-    OString outPath;
-    if (pOptions->isValid("-O"))
-        outPath = pOptions->getOption("-O");
-
-    OString tmpName(m_typeName);
-
-    if (tmpName.equals("/"))
-        tmpName = "global";
-    else
-//      tmpName += "/" + m_typeName.getToken(m_typeName.getTokenCount('/') - 1, '/');
-        tmpName += "/" + m_name;
-
-    OString tmpFileName;
-    OString hFileName = createFileNameFromType(outPath, tmpName, ".idl");
-
-    sal_Bool bFileExists = sal_False;
-    sal_Bool bFileCheck = sal_False;
-
-    if ( pOptions->isValid("-G") || pOptions->isValid("-Gc") )
-    {
-        bFileExists = fileExists( hFileName );
-        ret = sal_True;
-    }
-
-    if ( bFileExists && pOptions->isValid("-Gc") )
-    {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tml");
-        bFileCheck = sal_True;
-    }
-
-    if ( !bFileExists || bFileCheck )
-    {
-        FileStream hFile;
-
-        if ( bFileCheck )
-            hFile.open(tmpFileName);
-        else
-            hFile.open(hFileName);
-
-        if(!hFile.isValid())
-        {
-            OString message("cannot open ");
-            message += hFileName + " for writing";
-            throw CannotDumpException(message);
-        }
-
-        ret = dumpHFile(hFile);
-
-        hFile.close();
-        if (ret && bFileCheck)
-        {
-            ret = checkFileContent(hFileName, tmpFileName);
-        }
-    }
-
-    return ret;
-}
-
-sal_Bool ModuleType::dumpHFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    OString headerDefine(dumpHeaderDefine(o, "IDL"));
-    o << "\n";
-
-    dumpDefaultHIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "idl");
-    o << "\n";
-
-    dumpNameSpace(o, sal_True, sal_True);
-    o << "\n";
-
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access == RT_ACCESS_CONST)
-        {
-            fieldName = m_reader.getFieldName(i);
-            fieldType = m_reader.getFieldType(i);
-
-            o << "const ";
-            dumpType(o, fieldType);
-            o << " " << fieldName << " = ";
-            dumpConstantValue(o, i);
-            o << ";\n";
-        }
-    }
-
-    o << "\n";
-    dumpNameSpace(o, sal_False, sal_True);
-    o << "\n#endif /* "<< headerDefine << "*/" << "\n";
-
-    return sal_True;
-}
-
-sal_Bool ModuleType::hasConstants()
-{
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access == RT_ACCESS_CONST)
-            return sal_True;
-    }
-
-    return sal_False;
-}
-
-//*************************************************************************
-// ConstantsType
-//*************************************************************************
-ConstantsType::ConstantsType(TypeReader& typeReader,
-                              const OString& typeName,
-                             const TypeManager& typeMgr,
-                             const TypeDependency& typeDependencies)
-    : ModuleType(typeReader, typeName, typeMgr, typeDependencies)
-{
-}
-
-ConstantsType::~ConstantsType()
-{
-
-}
-
-sal_Bool ConstantsType::dump(IdlOptions* pOptions)
-    throw( CannotDumpException )
-{
-    sal_Bool ret = sal_False;
-
-    OString outPath;
-    if (pOptions->isValid("-O"))
-        outPath = pOptions->getOption("-O");
-
-    OString tmpFileName;
-    OString hFileName = createFileNameFromType(outPath, m_typeName, ".idl");
-
-    sal_Bool bFileExists = sal_False;
-    sal_Bool bFileCheck = sal_False;
-
-    if ( pOptions->isValid("-G") || pOptions->isValid("-Gc") )
-    {
-        bFileExists = fileExists( hFileName );
-        ret = sal_True;
-    }
-
-    if ( bFileExists && pOptions->isValid("-Gc") )
-    {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tml");
-        bFileCheck = sal_True;
-    }
-
-    if ( !bFileExists || bFileCheck )
-    {
-        FileStream hFile;
-
-        if ( bFileCheck )
-            hFile.open(tmpFileName);
-        else
-            hFile.open(hFileName);
-
-        if(!hFile.isValid())
-        {
-            OString message("cannot open ");
-            message += hFileName + " for writing";
-            throw CannotDumpException(message);
-        }
-
-        ret = dumpHFile(hFile);
-
-        hFile.close();
-        if (ret && bFileCheck)
-        {
-            ret = checkFileContent(hFileName, tmpFileName);
-        }
-    }
-
-    return ret;
-}
-
-//*************************************************************************
-// StructureType
-//*************************************************************************
-StructureType::StructureType(TypeReader& typeReader,
-                              const OString& typeName,
-                             const TypeManager& typeMgr,
-                             const TypeDependency& typeDependencies)
-    : IdlType(typeReader, typeName, typeMgr, typeDependencies)
-{
-}
-
-StructureType::~StructureType()
-{
-
-}
-
-sal_Bool StructureType::dumpHFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    OString headerDefine(dumpHeaderDefine(o, "IDL"));
-    o << "\n";
-
-    dumpDefaultHIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "idl");
-    o << "\n";
-
-    dumpNameSpace(o);
-
-    // write documentation
-    OString aDoc = m_reader.getDoku();
-    if( aDoc.getLength() )
-        o << "/**\n" << aDoc << "\n*/";
-
-    o << "\nstruct " << m_name;
-    o << "\n{\n";
-    inc();
-
-    OString superType(m_reader.getSuperTypeName());
-    if (superType.getLength() > 0)
-        dumpSuperMember(o, superType);
-
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
-    sal_uInt16      i=0;
-
-    for (i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-            continue;
-
-        fieldName = m_reader.getFieldName(i);
-        fieldType = m_reader.getFieldType(i);
-
-        // write documentation
-        OString aDoc = m_reader.getFieldDoku(i);
-        if( aDoc.getLength() )
-            o << "/**\n" << aDoc << "\n*/";
-
-        o << indent();
-        dumpType(o, fieldType);
-        o << " " << fieldName << ";\n";
-    }
-
-    dec();
-    o << "};\n\n";
-
-    dumpNameSpace(o, sal_False);
-
-    o << "#endif /* "<< headerDefine << "*/" << "\n";
-
-    return sal_True;
-}
-
-void StructureType::dumpSuperMember(FileStream& o, const OString& superType)
-{
-    if (superType.getLength() > 0)
-    {
-        TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
-
-        if (aSuperReader.isValid())
-        {
-            dumpSuperMember(o, aSuperReader.getSuperTypeName());
-
-            sal_uInt32      fieldCount = aSuperReader.getFieldCount();
-            RTFieldAccess   access = RT_ACCESS_INVALID;
-            OString         fieldName;
-            OString         fieldType;
-            for (sal_uInt16 i=0; i < fieldCount; i++)
-            {
-                access = aSuperReader.getFieldAccess(i);
-
-                if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-                    continue;
-
-                fieldName = aSuperReader.getFieldName(i);
-                fieldType = aSuperReader.getFieldType(i);
-
-                // write documentation
-                OString aDoc = aSuperReader.getFieldDoku(i);
-                if( aDoc.getLength() )
-                    o << "/**\n" << aDoc << "\n*/";
-
-                o << indent();
-                dumpType(o, fieldType);
-                o << " ";
-                o << fieldName << ";\n";
-            }
-        }
-    }
-}
-
-//*************************************************************************
-// ExceptionType
-//*************************************************************************
-ExceptionType::ExceptionType(TypeReader& typeReader,
-                              const OString& typeName,
-                             const TypeManager& typeMgr,
-                             const TypeDependency& typeDependencies)
-    : IdlType(typeReader, typeName, typeMgr, typeDependencies)
-{
-}
-
-ExceptionType::~ExceptionType()
-{
-
-}
-
-sal_Bool ExceptionType::dumpHFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    OString headerDefine(dumpHeaderDefine(o, "IDL"));
-    o << "\n";
-
-    dumpDefaultHIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "idl");
-    o << "\n";
-
-    dumpNameSpace(o);
-
-    // write documentation
-    OString aDoc = m_reader.getDoku();
-    if( aDoc.getLength() )
-        o << "/**\n" << aDoc << "\n*/";
-
-    o << "\nexception " << m_name;
-    o << "\n{\n";
-    inc();
-
-    // Write extra member for derived exceptions
-    o << indent() << "/*extra member to hold a derived exception */\n";
-    o << indent() << "any _derivedException;\n";
-    OString superType(m_reader.getSuperTypeName());
-    if (superType.getLength() > 0)
-        dumpSuperMember(o, superType);
-
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
-    sal_uInt16      i = 0;
-
-    for (i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-            continue;
-
-        fieldName = m_reader.getFieldName(i);
-        fieldType = m_reader.getFieldType(i);
-
-        // write documentation
-        OString aDoc = m_reader.getFieldDoku(i);
-        if( aDoc.getLength() )
-            o << "/**\n" << aDoc << "\n*/";
-
-        o << indent();
-        dumpType(o, fieldType);
-        o << " " << fieldName << ";\n";
-    }
-
-
-    dec();
-    o << "};\n\n";
-
-    dumpNameSpace(o, sal_False);
-
-    o << "#endif /* "<< headerDefine << "*/" << "\n";
-
-    return sal_True;
-}
-
-void ExceptionType::dumpSuperMember(FileStream& o, const OString& superType)
-{
-    if (superType.getLength() > 0)
-    {
-        TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
-
-        if (aSuperReader.isValid())
-        {
-            dumpSuperMember(o, aSuperReader.getSuperTypeName());
-
-            sal_uInt32      fieldCount = aSuperReader.getFieldCount();
-            RTFieldAccess   access = RT_ACCESS_INVALID;
-            OString         fieldName;
-            OString         fieldType;
-            for (sal_uInt16 i=0; i < fieldCount; i++)
-            {
-                access = aSuperReader.getFieldAccess(i);
-
-                if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
-                    continue;
-
-                fieldName = aSuperReader.getFieldName(i);
-                fieldType = aSuperReader.getFieldType(i);
-
-                // write documentation
-                OString aDoc = aSuperReader.getFieldDoku(i);
-                if( aDoc.getLength() )
-                    o << "/**\n" << aDoc << "\n*/";
-
-                o << indent();
-                dumpType(o, fieldType);
-                o << " ";
-                o << fieldName << ";\n";
-            }
-        }
-    }
-}
-
-//*************************************************************************
-// EnumType
-//*************************************************************************
-EnumType::EnumType(TypeReader& typeReader,
-                    const OString& typeName,
-                   const TypeManager& typeMgr,
-                   const TypeDependency& typeDependencies)
-    : IdlType(typeReader, typeName, typeMgr, typeDependencies)
-{
-}
-
-EnumType::~EnumType()
-{
-
-}
-
-sal_Bool EnumType::dumpHFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    OString headerDefine(dumpHeaderDefine(o, "IDL"));
-    o << "\n";
-
-    dumpDefaultHIncludes(o);
-    o << "\n";
-
-    dumpNameSpace(o);
-
-    // write documentation
-    OString aDoc = m_reader.getDoku();
-    if( aDoc.getLength() )
-        o << "/**\n" << aDoc << "\n*/";
-
-    o << "\nenum " << m_name << "\n{\n";
-    inc();
-
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    RTConstValue    constValue;
-    OString         fieldName;
-    sal_uInt32      value=0;
-    for (sal_uInt16 i=0; i < fieldCount; i++)
-    {
-        access = m_reader.getFieldAccess(i);
-
-        if (access != RT_ACCESS_CONST)
-            continue;
-
-        fieldName = m_reader.getFieldName(i);
-        constValue = m_reader.getFieldConstValue(i);
-
-        if (constValue.m_type == RT_TYPE_INT32)
-            value = constValue.m_value.aLong;
-        else
-            value++;
-
-        /* doesn't work with rational rose 2000
-        // write documentation
-        OString aDoc = m_reader.getFieldDoku(i);
-        if( aDoc.getLength() )
-        */
-        //  o << "/**\n" << aDoc << "\n*/\n";
-        o << indent() << fieldName;
-        if( i +1 < fieldCount )
-            o << ",\n";
-    }
-
-    dec();
-    o << "\n};\n\n";
-
-    dumpNameSpace(o, sal_False);
-
-    o << "#endif /* "<< headerDefine << "*/" << "\n";
-
-    return sal_True;
-}
-
-
-//*************************************************************************
-// TypeDefType
-//*************************************************************************
-TypeDefType::TypeDefType(TypeReader& typeReader,
-                             const OString& typeName,
-                            const TypeManager& typeMgr,
-                            const TypeDependency& typeDependencies)
-    : IdlType(typeReader, typeName, typeMgr, typeDependencies)
-{
-}
-
-TypeDefType::~TypeDefType()
-{
-
-}
-
-sal_Bool TypeDefType::dumpHFile(FileStream& o)
-    throw( CannotDumpException )
-{
-    OString headerDefine(dumpHeaderDefine(o, "IDL"));
-    o << "\n";
-
-    dumpDefaultHIncludes(o);
-    o << "\n";
-    dumpDepIncludes(o, m_typeName, "idl");
-    o << "\n";
-
-    dumpNameSpace(o);
-
-    o << "\ntypedef ";
-    dumpType(o, m_reader.getSuperTypeName());
-    o << " " << m_name << ";\n\n";
-
-    dumpNameSpace(o, sal_False);
-
-    o << "#endif /* "<< headerDefine << "*/" << "\n";
-
-    return sal_True;
-}
-
-
-//*************************************************************************
-// produceType
-//*************************************************************************
-sal_Bool produceType(const OString& typeName,
-                     TypeManager& typeMgr,
-                     TypeDependency& typeDependencies,
-                     IdlOptions* pOptions)
-    throw( CannotDumpException )
-{
-    if (typeDependencies.isGenerated(typeName))
-        return sal_True;
-
-    TypeReader reader(typeMgr.getTypeReader(typeName));
-
-    if (!reader.isValid())
-    {
-        if (typeName.equals("/"))
-            return sal_True;
-        else
-            return sal_False;
-    }
-
-    if( !checkTypeDependencies(typeMgr, typeDependencies, typeName))
-        return sal_False;
-
-    RTTypeClass typeClass = reader.getTypeClass();
-    sal_Bool    ret = sal_False;
-    switch (typeClass)
-    {
-        case RT_TYPE_INTERFACE:
-            {
-                InterfaceType iType(reader, typeName, typeMgr, typeDependencies);
-                ret = iType.dump(pOptions);
-                if (ret) typeDependencies.setGenerated(typeName);
-                ret = iType.dumpDependedTypes(pOptions);
-            }
-            break;
-        case RT_TYPE_MODULE:
-            {
-                ModuleType mType(reader, typeName, typeMgr, typeDependencies);
-                if (mType.hasConstants())
-                {
-                    ret = mType.dump(pOptions);
-                    if (ret) typeDependencies.setGenerated(typeName);
-//                  ret = mType.dumpDependedTypes(pOptions);
-                } else
-                {
-                    typeDependencies.setGenerated(typeName);
-                    ret = sal_True;
-                }
-            }
-            break;
-        case RT_TYPE_STRUCT:
-            {
-                StructureType sType(reader, typeName, typeMgr, typeDependencies);
-                ret = sType.dump(pOptions);
-                if (ret) typeDependencies.setGenerated(typeName);
-                ret = sType.dumpDependedTypes(pOptions);
-            }
-            break;
-        case RT_TYPE_ENUM:
-            {
-                EnumType enType(reader, typeName, typeMgr, typeDependencies);
-                ret = enType.dump(pOptions);
-                if (ret) typeDependencies.setGenerated(typeName);
-                ret = enType.dumpDependedTypes(pOptions);
-            }
-            break;
-        case RT_TYPE_EXCEPTION:
-            {
-                ExceptionType eType(reader, typeName, typeMgr, typeDependencies);
-                ret = eType.dump(pOptions);
-                if (ret) typeDependencies.setGenerated(typeName);
-                ret = eType.dumpDependedTypes(pOptions);
-            }
-            break;
-        case RT_TYPE_TYPEDEF:
-            {
-                TypeDefType tdType(reader, typeName, typeMgr, typeDependencies);
-                ret = tdType.dump(pOptions);
-                if (ret) typeDependencies.setGenerated(typeName);
-                ret = tdType.dumpDependedTypes(pOptions);
-            }
-            break;
-        case RT_TYPE_CONSTANTS:
-            {
-                ConstantsType cType(reader, typeName, typeMgr, typeDependencies);
-                if (cType.hasConstants())
-                {
-                    ret = cType.dump(pOptions);
-                    if (ret) typeDependencies.setGenerated(typeName);
-//                  ret = cType.dumpDependedTypes(pOptions);
-                } else
-                {
-                    typeDependencies.setGenerated(typeName);
-                    ret = sal_True;
-                }
-            }
-            break;
-        case RT_TYPE_SERVICE:
-        case RT_TYPE_OBJECT:
-            ret = sal_True;
-            break;
-    }
-
-    return ret;
-}
-
-//*************************************************************************
-// scopedName
-//*************************************************************************
-OString scopedName(const OString& scope, const OString& type,
-                   sal_Bool bNoNameSpace)
-{
-    sal_Int32 nPos = type.lastIndexOf( '/' );
-    if (nPos == -1)
-        return type;
-
-    if (bNoNameSpace)
-        return type.copy(nPos+1);
-
-    OStringBuffer tmpBuf(type.getLength()*2);
-    nPos = 0;
-    do
-    {
-        tmpBuf.append("::");
-        tmpBuf.append(type.getToken(0, '/', nPos));
-    } while( nPos != -1 );
-
-    return tmpBuf.makeStringAndClear();
-}
-
-//*************************************************************************
-// shortScopedName
-//*************************************************************************
-OString scope(const OString& scope, const OString& type )
-{
-    sal_Int32 nPos = type.lastIndexOf( '/' );
-    if( nPos == -1 )
-        return OString();
-
-    // scoped name only if the namespace is not equal
-    if (scope.lastIndexOf('/') > 0)
-    {
-        OString tmpScp(scope.copy(0, scope.lastIndexOf('/')));
-        OString tmpScp2(type.copy(0, nPos));
-
-        if (tmpScp == tmpScp2)
-            return OString();
-    }
-
-    OString aScope( type.copy( 0, nPos ) );
-    OStringBuffer tmpBuf(aScope.getLength()*2);
-
-    nPos = 0;
-    do
-    {
-        tmpBuf.append("::");
-        tmpBuf.append(aScope.getToken(0, '/', nPos));
-    } while( nPos != -1 );
-
-    return tmpBuf.makeStringAndClear();
-}
-
-
diff --git a/codemaker/source/idlmaker/idltype.hxx b/codemaker/source/idlmaker/idltype.hxx
deleted file mode 100644
index 307ea4290edb..000000000000
--- a/codemaker/source/idlmaker/idltype.hxx
+++ /dev/null
@@ -1,249 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLTYPE_HXX
-#define INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLTYPE_HXX
-
-#include    <codemaker/typemanager.hxx>
-#include    <codemaker/dependency.hxx>
-
-enum BASETYPE
-{
-    BT_INVALID,
-    BT_VOID,
-    BT_ANY,
-    BT_TYPE,
-    BT_BOOLEAN,
-    BT_CHAR,
-    BT_STRING,
-    BT_FLOAT,
-    BT_DOUBLE,
-    BT_OCTET,
-    BT_BYTE,
-    BT_SHORT,
-    BT_LONG,
-    BT_HYPER,
-    BT_UNSIGNED_SHORT,
-    BT_UNSIGNED_LONG,
-    BT_UNSIGNED_HYPER
-};
-
-
-enum IdlTypeDecl
-{
-    CPPUTYPEDECL_ALLTYPES,
-    CPPUTYPEDECL_NOINTERFACES,
-    CPPUTYPEDECL_ONLYINTERFACES
-};
-
-class IdlOptions;
-class FileStream;
-
-class IdlType
-{
-public:
-    IdlType(TypeReader& typeReader,
-             const ::rtl::OString& typeName,
-             const TypeManager& typeMgr,
-             const TypeDependency& typeDependencies);
-
-    virtual ~IdlType();
-
-    virtual sal_Bool dump(IdlOptions* pOptions) throw( CannotDumpException );
-    virtual sal_Bool dumpDependedTypes(IdlOptions* pOptions)  throw( CannotDumpException );
-    virtual sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ) = 0;
-
-    virtual ::rtl::OString dumpHeaderDefine(FileStream& o, sal_Char* prefix );
-    virtual void dumpDefaultHIncludes(FileStream& o);
-    virtual void dumpInclude(FileStream& o, const ::rtl::OString& genTypeName, const ::rtl::OString& typeName, sal_Char* prefix );
-
-    virtual void dumpDepIncludes(FileStream& o, const ::rtl::OString& typeName, sal_Char* prefix);
-
-    virtual void dumpNameSpace(FileStream& o, sal_Bool bOpen = sal_True, sal_Bool bFull = sal_False, const ::rtl::OString& type="");
-
-    virtual void dumpType(FileStream& o, const ::rtl::OString& type)
-                    throw( CannotDumpException );
-    ::rtl::OString  getBaseType(const ::rtl::OString& type);
-    void    dumpIdlGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, IdlTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES);
-    BASETYPE isBaseType(const ::rtl::OString& type);
-
-    void    dumpConstantValue(FileStream& o, sal_uInt16 index);
-
-    virtual sal_uInt32  getMemberCount();
-    virtual sal_uInt32  getInheritedMemberCount();
-
-    void            inc(sal_uInt32 num=4);
-    void            dec(sal_uInt32 num=4);
-    ::rtl::OString  indent();
-    ::rtl::OString  indent(sal_uInt32 num);
-protected:
-    virtual sal_uInt32  checkInheritedMemberCount(const TypeReader* pReader);
-
-    ::rtl::OString  checkSpecialIdlType(const ::rtl::OString& type);
-    ::rtl::OString  checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False);
-
-protected:
-    sal_uInt32          m_inheritedMemberCount;
-
-    sal_uInt32          m_indentLength;
-    ::rtl::OString      m_typeName;
-    ::rtl::OString      m_name;
-    TypeReader          m_reader;
-    TypeManager&        m_typeMgr;
-    TypeDependency      m_dependencies;
-};
-
-class InterfaceType : public IdlType
-{
-public:
-    InterfaceType(TypeReader& typeReader,
-                 const ::rtl::OString& typeName,
-                 const TypeManager& typeMgr,
-                 const TypeDependency& typeDependencies);
-
-    virtual ~InterfaceType();
-
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-
-    void        dumpAttributes(FileStream& o);
-    void        dumpMethods(FileStream& o);
-
-    sal_uInt32  getMemberCount();
-    sal_uInt32  getInheritedMemberCount();
-
-protected:
-    sal_uInt32  checkInheritedMemberCount(const TypeReader* pReader);
-
-protected:
-    sal_uInt32  m_inheritedMemberCount;
-    sal_Bool    m_hasAttributes;
-    sal_Bool    m_hasMethods;
-};
-
-class ModuleType : public IdlType
-{
-public:
-    ModuleType(TypeReader& typeReader,
-                  const ::rtl::OString& typeName,
-               const TypeManager& typeMgr,
-               const TypeDependency& typeDependencies);
-
-    virtual ~ModuleType();
-
-    virtual sal_Bool    dump(IdlOptions* pOptions) throw( CannotDumpException );
-    sal_Bool            dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool            hasConstants();
-};
-
-class ConstantsType : public ModuleType
-{
-public:
-    ConstantsType(TypeReader& typeReader,
-                  const ::rtl::OString& typeName,
-               const TypeManager& typeMgr,
-               const TypeDependency& typeDependencies);
-
-    virtual ~ConstantsType();
-
-    virtual sal_Bool    dump(IdlOptions* pOptions) throw( CannotDumpException );
-};
-
-class StructureType : public IdlType
-{
-public:
-    StructureType(TypeReader& typeReader,
-                  const ::rtl::OString& typeName,
-                  const TypeManager& typeMgr,
-                  const TypeDependency& typeDependencies);
-
-    virtual ~StructureType();
-
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-
-    void        dumpSuperMember(FileStream& o, const ::rtl::OString& super);
-};
-
-class ExceptionType : public IdlType
-{
-public:
-    ExceptionType(TypeReader& typeReader,
-                  const ::rtl::OString& typeName,
-                  const TypeManager& typeMgr,
-                  const TypeDependency& typeDependencies);
-
-    virtual ~ExceptionType();
-
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-
-    void        dumpSuperMember(FileStream& o, const ::rtl::OString& super);
-};
-
-class EnumType : public IdlType
-{
-public:
-    EnumType(TypeReader& typeReader,
-              const ::rtl::OString& typeName,
-              const TypeManager& typeMgr,
-              const TypeDependency& typeDependencies);
-
-    virtual ~EnumType();
-
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-};
-
-class TypeDefType : public IdlType
-{
-public:
-    TypeDefType(TypeReader& typeReader,
-              const ::rtl::OString& typeName,
-              const TypeManager& typeMgr,
-              const TypeDependency& typeDependencies);
-
-    virtual ~TypeDefType();
-
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-};
-
-
-sal_Bool produceType(const ::rtl::OString& typeName,
-                     TypeManager& typeMgr,
-                     TypeDependency& typeDependencies,
-                     IdlOptions* pOptions)
-                 throw( CannotDumpException );
-
-/**
- * This function returns a C++ scoped name, represents the namespace
- * scoping of this type, e.g. com:.sun::star::uno::XInterface. If the scope of
- * the type is equal scope, the relativ name will be used.
- */
-::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type, sal_Bool bNoNameSpace = sal_False );
-
-::rtl::OString scope(const ::rtl::OString& scope, const ::rtl::OString& type );
-
-
-#endif // INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLTYPE_HXX
-
diff --git a/codemaker/source/idlmaker/makefile.mk b/codemaker/source/idlmaker/makefile.mk
deleted file mode 100644
index cd447262e24d..000000000000
--- a/codemaker/source/idlmaker/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=codemaker
-TARGET=idlmaker
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=	idlmaker.cxx	\
-            idloptions.cxx	\
-            idltype.cxx
-
-
-APP1TARGET= $(TARGET)
-
-APP1OBJS=   $(OBJ)$/idlmaker.obj	\
-            $(OBJ)$/idloptions.obj	\
-            $(OBJ)$/idltype.obj			
-
-APP1STDLIBS= \
-             $(SALLIB) \
-             $(SALHELPERLIB) \
-             $(REGLIB) \
-             $(STDLIBCPP)
-
-APP1LIBS= \
-          $(LB)$/codemaker.lib
-
-.INCLUDE :  target.mk
diff --git a/codemaker/source/javamaker/classfile.cxx b/codemaker/source/javamaker/classfile.cxx
index 05c473256738..9ab2e4296228 100644
--- a/codemaker/source/javamaker/classfile.cxx
+++ b/codemaker/source/javamaker/classfile.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -901,3 +902,5 @@ void ClassFile::appendSignatureAttribute(
         appendU2(stream, addUtf8Info(signature));
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/javamaker/classfile.hxx b/codemaker/source/javamaker/classfile.hxx
index 6a0018ac38d0..974a827b0c81 100644
--- a/codemaker/source/javamaker/classfile.hxx
+++ b/codemaker/source/javamaker/classfile.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,17 +64,11 @@ public:
         ~Code();
 
         void instrAastore();
-
         void instrAconstNull();
-
         void instrAnewarray(rtl::OString const & type);
-
         void instrAreturn();
-
         void instrAthrow();
-
         void instrCheckcast(rtl::OString const & type);
-
         void instrDup();
 
         void instrGetstatic(
@@ -81,9 +76,7 @@ public:
             rtl::OString const & descriptor);
 
         Branch instrIfAcmpne();
-
         Branch instrIfeq();
-
         Branch instrIfnull();
 
         void instrInstanceof(rtl::OString const & type);
@@ -109,9 +102,7 @@ public:
             std::list< std::pair< sal_Int32, Code * > > const & blocks);
 
         void instrNew(rtl::OString const & type);
-
         void instrNewarray(codemaker::UnoType::Sort sort);
-
         void instrPop();
 
         void instrPutfield(
@@ -123,7 +114,6 @@ public:
             rtl::OString const & descriptor);
 
         void instrReturn();
-
         void instrSwap();
 
         void instrTableswitch(
@@ -131,21 +121,13 @@ public:
             std::list< Code * > const & blocks);
 
         void loadIntegerConstant(sal_Int32 value);
-
         void loadStringConstant(rtl::OString const & value);
-
         void loadLocalInteger(sal_uInt16 index);
-
         void loadLocalLong(sal_uInt16 index);
-
         void loadLocalFloat(sal_uInt16 index);
-
         void loadLocalDouble(sal_uInt16 index);
-
         void loadLocalReference(sal_uInt16 index);
-
         void storeLocalReference(sal_uInt16 index);
-
         void branchHere(Branch branch);
 
         void addException(
@@ -187,11 +169,8 @@ public:
     Code * newCode();
 
     sal_uInt16 addIntegerInfo(sal_Int32 value);
-
     sal_uInt16 addFloatInfo(float value);
-
     sal_uInt16 addLongInfo(sal_Int64 value);
-
     sal_uInt16 addDoubleInfo(double value);
 
     void addInterface(rtl::OString const & interface);
@@ -216,11 +195,8 @@ private:
     void operator =(ClassFile); // not implemented
 
     sal_uInt16 nextConstantPoolIndex(sal_uInt16 width);
-
     sal_uInt16 addUtf8Info(rtl::OString const & value);
-
     sal_uInt16 addClassInfo(rtl::OString const & type);
-
     sal_uInt16 addStringInfo(rtl::OString const & value);
 
     sal_uInt16 addFieldrefInfo(
@@ -272,3 +248,5 @@ private:
 } }
 
 #endif // INCLUDED_CODEMAKER_SOURCE_JAVAMAKER_CLASSFILE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/javamaker/javamaker.cxx b/codemaker/source/javamaker/javamaker.cxx
index b4e612d55823..4deeb727a4c0 100644
--- a/codemaker/source/javamaker/javamaker.cxx
+++ b/codemaker/source/javamaker/javamaker.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,8 +38,8 @@
 #include "javaoptions.hxx"
 #include "javatype.hxx"
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
 sal_Bool produceAllTypes(RegistryKey& rTypeKey, sal_Bool bIsExtraType,
                          TypeManager const & typeMgr,
                          codemaker::GeneratedTypeSet & generated,
@@ -245,3 +246,4 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx
index 58235bd32616..e29280b211d2 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,14 +34,16 @@
 #include "osl/process.h"
 #include "osl/thread.h"
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+
 #ifdef SAL_UNX
 #define SEPARATOR '/'
 #else
 #define SEPARATOR '\\'
 #endif
 
-using namespace rtl;
-
 sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
     throw( IllegalArgument )
 {
@@ -304,3 +307,5 @@ OString JavaOptions::prepareVersion()
 }
 
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/javamaker/javaoptions.hxx b/codemaker/source/javamaker/javaoptions.hxx
index 8bcc04150370..e7f2f48b3960 100644
--- a/codemaker/source/javamaker/javaoptions.hxx
+++ b/codemaker/source/javamaker/javaoptions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ protected:
 };
 
 #endif // INCLUDED_CODEMAKER_SOURCE_JAVAMAKER_JAVAOPTIONS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index 7820a419a205..4b99ef9f116b 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -3372,3 +3373,5 @@ bool produceType(
     }
     return true;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/javamaker/javatype.hxx b/codemaker/source/javamaker/javatype.hxx
index fd08ee286fb6..e294aa6ab94f 100644
--- a/codemaker/source/javamaker/javatype.hxx
+++ b/codemaker/source/javamaker/javatype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,3 +44,5 @@ bool produceType(RegistryKey& typeName, bool bIsExtraType, TypeManager const & t
                  JavaOptions* pOptions);
 
 #endif // INCLUDED_CODEMAKER_SOURCE_JAVAMAKER_JAVATYPE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/javamaker/makefile.mk b/codemaker/source/javamaker/makefile.mk
index 297f35bd0329..cf8a29858f53 100644
--- a/codemaker/source/javamaker/makefile.mk
+++ b/codemaker/source/javamaker/makefile.mk
@@ -37,6 +37,12 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
+
+.IF "$(OS)" == "IOS"
+all:
+    @echo No build-time tools for this platform
+.ENDIF
+
 .INCLUDE : $(PRJ)$/codemaker.pmk
 
 # --- Files --------------------------------------------------------
diff --git a/cppu/inc/com/sun/star/uno/Any.h b/cppu/inc/com/sun/star/uno/Any.h
index c9e8aed205e1..eb29273c16aa 100644
--- a/cppu/inc/com/sun/star/uno/Any.h
+++ b/cppu/inc/com/sun/star/uno/Any.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -381,3 +382,5 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::su
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/com/sun/star/uno/Any.hxx b/cppu/inc/com/sun/star/uno/Any.hxx
index 44508556698c..8ea8c437dde2 100644
--- a/cppu/inc/com/sun/star/uno/Any.hxx
+++ b/cppu/inc/com/sun/star/uno/Any.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -234,7 +235,7 @@ inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny,
 {
     if (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass)
     {
-        value = (* reinterpret_cast< const sal_Bool * >( &rAny.pReserved ) != sal_False);
+        value = (* reinterpret_cast< const sal_Bool * >( rAny.pData ) != sal_False);
         return sal_True;
     }
     return sal_False;
@@ -243,7 +244,7 @@ inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny,
 inline sal_Bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW( () )
 {
     return (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass &&
-            (value != sal_False) == (* reinterpret_cast< const sal_Bool * >( &rAny.pReserved ) != sal_False));
+            (value != sal_False) == (* reinterpret_cast< const sal_Bool * >( rAny.pData ) != sal_False));
 }
 
 //______________________________________________________________________________
@@ -254,7 +255,7 @@ inline sal_Bool SAL_CALL operator >>= ( Any const & rAny, bool & value )
     if (rAny.pType->eTypeClass == typelib_TypeClass_BOOLEAN)
     {
         value = *reinterpret_cast< sal_Bool const * >(
-            &rAny.pReserved ) != sal_False;
+            rAny.pData ) != sal_False;
         return true;
     }
     return false;
@@ -267,7 +268,7 @@ inline sal_Bool SAL_CALL operator == ( Any const & rAny, bool const & value )
 {
     return (rAny.pType->eTypeClass == typelib_TypeClass_BOOLEAN &&
             (value ==
-             (*reinterpret_cast< sal_Bool const * >( &rAny.pReserved )
+             (*reinterpret_cast< sal_Bool const * >( rAny.pData )
               != sal_False)));
 }
 
@@ -277,7 +278,7 @@ inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny,
 {
     if (typelib_TypeClass_BYTE == rAny.pType->eTypeClass)
     {
-        value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
         return sal_True;
     }
     return sal_False;
@@ -289,11 +290,11 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SA
     switch (rAny.pType->eTypeClass)
     {
     case typelib_TypeClass_BYTE:
-        value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_SHORT:
     case typelib_TypeClass_UNSIGNED_SHORT:
-        value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
         return sal_True;
     default:
         return sal_False;
@@ -305,11 +306,11 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) S
     switch (rAny.pType->eTypeClass)
     {
     case typelib_TypeClass_BYTE:
-        value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_SHORT:
     case typelib_TypeClass_UNSIGNED_SHORT:
-        value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
         return sal_True;
     default:
         return sal_False;
@@ -322,17 +323,17 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SA
     switch (rAny.pType->eTypeClass)
     {
     case typelib_TypeClass_BYTE:
-        value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_SHORT:
-        value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_UNSIGNED_SHORT:
-        value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_LONG:
     case typelib_TypeClass_UNSIGNED_LONG:
-        value = * reinterpret_cast< const sal_Int32 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int32 * >( rAny.pData );
         return sal_True;
     default:
         return sal_False;
@@ -344,17 +345,17 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) S
     switch (rAny.pType->eTypeClass)
     {
     case typelib_TypeClass_BYTE:
-        value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_SHORT:
-        value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_UNSIGNED_SHORT:
-        value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_LONG:
     case typelib_TypeClass_UNSIGNED_LONG:
-        value = * reinterpret_cast< const sal_uInt32 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData );
         return sal_True;
     default:
         return sal_False;
@@ -367,26 +368,24 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SA
     switch (rAny.pType->eTypeClass)
     {
     case typelib_TypeClass_BYTE:
-        value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_SHORT:
-        value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_UNSIGNED_SHORT:
-        value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_LONG:
-        value = * reinterpret_cast< const sal_Int32 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int32 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_UNSIGNED_LONG:
-        value = * reinterpret_cast< const sal_uInt32 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_HYPER:
     case typelib_TypeClass_UNSIGNED_HYPER:
-        value = * reinterpret_cast< const sal_Int64 * >(
-            (sizeof(void *) >= sizeof(sal_Int64)) ? (void *)&rAny.pReserved : rAny.pData );
+        value = * reinterpret_cast< const sal_Int64 * >( rAny.pData );
         return sal_True;
-
     default:
         return sal_False;
     }
@@ -397,26 +396,24 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) S
     switch (rAny.pType->eTypeClass)
     {
     case typelib_TypeClass_BYTE:
-        value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_SHORT:
-        value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_UNSIGNED_SHORT:
-        value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_LONG:
-        value = * reinterpret_cast< const sal_Int32 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int32 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_UNSIGNED_LONG:
-        value = * reinterpret_cast< const sal_uInt32 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_HYPER:
     case typelib_TypeClass_UNSIGNED_HYPER:
-        value = * reinterpret_cast< const sal_uInt64 * >(
-            (sizeof(void *) >= sizeof(sal_uInt64)) ? (void *)&rAny.pReserved : rAny.pData );
+        value = * reinterpret_cast< const sal_uInt64 * >( rAny.pData );
         return sal_True;
-
     default:
         return sal_False;
     }
@@ -428,19 +425,17 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_TH
     switch (rAny.pType->eTypeClass)
     {
     case typelib_TypeClass_BYTE:
-        value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_SHORT:
-        value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_UNSIGNED_SHORT:
-        value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_FLOAT:
-        value = * reinterpret_cast< const float * >(
-            (sizeof(void *) >= sizeof(float)) ? (void *)&rAny.pReserved : rAny.pData );
+        value = * reinterpret_cast< const float * >( rAny.pData );
         return sal_True;
-
     default:
         return sal_False;
     }
@@ -452,29 +447,26 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_T
     switch (rAny.pType->eTypeClass)
     {
     case typelib_TypeClass_BYTE:
-        value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int8 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_SHORT:
-        value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int16 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_UNSIGNED_SHORT:
-        value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_LONG:
-        value = * reinterpret_cast< const sal_Int32 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_Int32 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_UNSIGNED_LONG:
-        value = * reinterpret_cast< const sal_uInt32 * >( &rAny.pReserved );
+        value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_FLOAT:
-        value = * reinterpret_cast< const float * >(
-            (sizeof(void *) >= sizeof(float)) ? (void *)&rAny.pReserved : rAny.pData );
+        value = * reinterpret_cast< const float * >( rAny.pData );
         return sal_True;
     case typelib_TypeClass_DOUBLE:
-        value = * reinterpret_cast< const double * >(
-            (sizeof(void *) >= sizeof(double)) ? (void *)&rAny.pReserved : rAny.pData );
+        value = * reinterpret_cast< const double * >( rAny.pData );
         return sal_True;
-
     default:
         return sal_False;
     }
@@ -485,7 +477,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & valu
 {
     if (typelib_TypeClass_STRING == rAny.pType->eTypeClass)
     {
-        value = * reinterpret_cast< const ::rtl::OUString * >( &rAny.pReserved );
+        value = * reinterpret_cast< const ::rtl::OUString * >( rAny.pData );
         return sal_True;
     }
     return sal_False;
@@ -494,7 +486,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & valu
 inline sal_Bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW( () )
 {
     return (typelib_TypeClass_STRING == rAny.pType->eTypeClass &&
-            value.equals( * reinterpret_cast< const ::rtl::OUString * >( &rAny.pReserved ) ));
+            value.equals( * reinterpret_cast< const ::rtl::OUString * >( rAny.pData ) ));
 }
 // type
 //__________________________________________________________________________________________________
@@ -502,7 +494,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THR
 {
     if (typelib_TypeClass_TYPE == rAny.pType->eTypeClass)
     {
-        value = * reinterpret_cast< const Type * >( &rAny.pReserved );
+        value = * reinterpret_cast< const Type * >( rAny.pData );
         return sal_True;
     }
     return sal_False;
@@ -511,7 +503,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THR
 inline sal_Bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW( () )
 {
     return (typelib_TypeClass_TYPE == rAny.pType->eTypeClass &&
-            value.equals( * reinterpret_cast< const Type * >( &rAny.pReserved ) ));
+            value.equals( * reinterpret_cast< const Type * >( rAny.pData ) ));
 }
 // any
 //__________________________________________________________________________________________________
@@ -531,7 +523,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & v
 {
     if (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass)
     {
-        return reinterpret_cast< const BaseReference * >( &rAny.pReserved )->operator == ( value );
+        return reinterpret_cast< const BaseReference * >( rAny.pData )->operator == ( value );
     }
     return sal_False;
 }
@@ -587,3 +579,5 @@ sal_uInt16 Any::get<sal_uInt16>() const;
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/cppu/inc/com/sun/star/uno/Reference.h
index f792556dcb57..071cadcfde7b 100644
--- a/cppu/inc/com/sun/star/uno/Reference.h
+++ b/cppu/inc/com/sun/star/uno/Reference.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -239,13 +240,13 @@ class Reference : public BaseReference
 public:
     // these are here to force memory de/allocation to sal lib.
     /** @internal */
-    inline static void * SAL_CALL operator new ( size_t nSize ) SAL_THROW( () )
+    inline static void * SAL_CALL operator new ( ::size_t nSize ) SAL_THROW( () )
         { return ::rtl_allocateMemory( nSize ); }
     /** @internal */
     inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () )
         { ::rtl_freeMemory( pMem ); }
     /** @internal */
-    inline static void * SAL_CALL operator new ( size_t, void * pMem ) SAL_THROW( () )
+    inline static void * SAL_CALL operator new ( ::size_t, void * pMem ) SAL_THROW( () )
         { return pMem; }
     /** @internal */
     inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
@@ -531,3 +532,5 @@ inline T * get_pointer( Reference<T> const& r )
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/cppu/inc/com/sun/star/uno/Reference.hxx
index 4223cc277c37..39e9614f20d8 100644
--- a/cppu/inc/com/sun/star/uno/Reference.hxx
+++ b/cppu/inc/com/sun/star/uno/Reference.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#ifndef _COM_SUN_STAR_UNO_XINTERFACE_HDL_
 #include <com/sun/star/uno/XInterface.hdl>
-#endif
 #include <com/sun/star/uno/genfunc.hxx>
 
 namespace com
@@ -429,3 +428,5 @@ inline sal_Bool BaseReference::operator != ( const BaseReference & rRef ) const
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/cppu/inc/com/sun/star/uno/Sequence.h
index 71bb42c7413b..68abc9d24748 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.h
+++ b/cppu/inc/com/sun/star/uno/Sequence.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,7 +70,7 @@ class Sequence
 public:
     // these are here to force memory de/allocation to sal lib.
     /** @internal */
-    inline static void * SAL_CALL operator new ( size_t nSize )
+    inline static void * SAL_CALL operator new ( ::size_t nSize )
         SAL_THROW( () )
         { return ::rtl_allocateMemory( nSize ); }
     /** @internal */
@@ -77,7 +78,7 @@ public:
         SAL_THROW( () )
         { ::rtl_freeMemory( pMem ); }
     /** @internal */
-    inline static void * SAL_CALL operator new ( size_t, void * pMem )
+    inline static void * SAL_CALL operator new ( ::size_t, void * pMem )
         SAL_THROW( () )
         { return pMem; }
     /** @internal */
@@ -286,3 +287,5 @@ inline const ::com::sun::star::uno::Type &
 SAL_CALL getCharSequenceCppuType() SAL_THROW( () );
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/cppu/inc/com/sun/star/uno/Sequence.hxx
index bca6a1c44211..8a9b43d1339e 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.hxx
+++ b/cppu/inc/com/sun/star/uno/Sequence.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -305,3 +306,5 @@ SAL_CALL getCharSequenceCppuType() SAL_THROW( () )
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/com/sun/star/uno/Type.h b/cppu/inc/com/sun/star/uno/Type.h
index 61829c2c790d..6490fa4ab7f1 100644
--- a/cppu/inc/com/sun/star/uno/Type.h
+++ b/cppu/inc/com/sun/star/uno/Type.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -456,3 +457,5 @@ template<> inline const ::com::sun::star::uno::Type & SAL_CALL
 getCppuType< sal_Unicode >() SAL_THROW(());
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/com/sun/star/uno/Type.hxx b/cppu/inc/com/sun/star/uno/Type.hxx
index 33eba298e188..46fd86329424 100644
--- a/cppu/inc/com/sun/star/uno/Type.hxx
+++ b/cppu/inc/com/sun/star/uno/Type.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -325,3 +326,5 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType< sal_Unicode >()
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/com/sun/star/uno/genfunc.h b/cppu/inc/com/sun/star/uno/genfunc.h
index 41fdebf47a31..1b0dbd2c4cce 100644
--- a/cppu/inc/com/sun/star/uno/genfunc.h
+++ b/cppu/inc/com/sun/star/uno/genfunc.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ inline void * SAL_CALL cpp_queryInterface( void * pCppI, typelib_TypeDescription
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/com/sun/star/uno/genfunc.hxx b/cppu/inc/com/sun/star/uno/genfunc.hxx
index b2299a35cd3d..88234bd81389 100644
--- a/cppu/inc/com/sun/star/uno/genfunc.hxx
+++ b/cppu/inc/com/sun/star/uno/genfunc.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,3 +87,5 @@ inline void * SAL_CALL cpp_queryInterface( void * pCppI, typelib_TypeDescription
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/cppu/Enterable.hxx b/cppu/inc/cppu/Enterable.hxx
index c8bbfb49d382..5ccfb9c4e2fb 100644
--- a/cppu/inc/cppu/Enterable.hxx
+++ b/cppu/inc/cppu/Enterable.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,16 +51,16 @@ public:
     virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) = 0;
     virtual int  v_isValid   (rtl::OUString * pReason)                   = 0;
 
-    virtual ~Enterable() {};
+    virtual ~Enterable() {}
 
 public:
     inline explicit Enterable(void);
 
-    inline void enter(void) {m_enter(this);};
-    inline void leave(void) {m_leave(this);};
+    inline void enter(void) {m_enter(this);}
+    inline void leave(void) {m_leave(this);}
 
-    inline void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);};
-    inline void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);};
+    inline void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);}
+    inline void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);}
 
     inline void callInto(uno_EnvCallee * pCallee, ...);
     inline void callOut (uno_EnvCallee * pCallee, ...);
@@ -71,12 +72,12 @@ private:
     Enterable & operator = (Enterable const &);
 };
 
-extern "C" inline void Enterable_call_enter (void * context) { ((Enterable *)context)->v_enter(); };
-extern "C" inline void Enterable_call_leave (void * context) { ((Enterable *)context)->v_leave(); };
+extern "C" inline void Enterable_call_enter (void * context) { ((Enterable *)context)->v_enter(); }
+extern "C" inline void Enterable_call_leave (void * context) { ((Enterable *)context)->v_leave(); }
 extern "C" inline void Enterable_call_callInto_v(void * context, uno_EnvCallee * pCallee, va_list * pParam)
-    { ((Enterable *)context)->v_callInto_v(pCallee, pParam); };
+    { ((Enterable *)context)->v_callInto_v(pCallee, pParam); }
 extern "C" inline void Enterable_call_callOut_v (void * context, uno_EnvCallee * pCallee, va_list * pParam)
-    { ((Enterable *)context)->v_callOut_v(pCallee, pParam); };
+    { ((Enterable *)context)->v_callOut_v(pCallee, pParam); }
 extern "C" inline int  Enterable_call_isValid   (void * context, rtl_uString ** pReason)
     {return ((Enterable *)context)->v_isValid((rtl::OUString *)pReason);}
 
@@ -112,3 +113,5 @@ void Enterable::callOut(uno_EnvCallee * pCallee, ...)
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/cppu/EnvDcp.hxx b/cppu/inc/cppu/EnvDcp.hxx
index c4e394b98460..68adf63017c3 100644
--- a/cppu/inc/cppu/EnvDcp.hxx
+++ b/cppu/inc/cppu/EnvDcp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,3 +74,5 @@ inline rtl::OUString getPurpose(rtl::OUString const & rEnvDcp)
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/cppu/EnvGuards.hxx b/cppu/inc/cppu/EnvGuards.hxx
index c7408f01cfd1..07f65b2aced9 100644
--- a/cppu/inc/cppu/EnvGuards.hxx
+++ b/cppu/inc/cppu/EnvGuards.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -111,3 +112,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/cppu/FreeReference.hxx b/cppu/inc/cppu/FreeReference.hxx
index e2d60775c0b3..5a8d22175921 100644
--- a/cppu/inc/cppu/FreeReference.hxx
+++ b/cppu/inc/cppu/FreeReference.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -164,3 +165,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/cppu/Map.hxx b/cppu/inc/cppu/Map.hxx
index 455bee6e5fbd..a5922f830b5d 100644
--- a/cppu/inc/cppu/Map.hxx
+++ b/cppu/inc/cppu/Map.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -111,3 +112,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/cppu/Shield.hxx b/cppu/inc/cppu/Shield.hxx
index 46cdaeacea06..1e7221a210d3 100644
--- a/cppu/inc/cppu/Shield.hxx
+++ b/cppu/inc/cppu/Shield.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,3 +89,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/cppu/helper/purpenv/Environment.hxx b/cppu/inc/cppu/helper/purpenv/Environment.hxx
index ba56c22e53cf..25c9de8e8a6e 100644
--- a/cppu/inc/cppu/helper/purpenv/Environment.hxx
+++ b/cppu/inc/cppu/helper/purpenv/Environment.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ void Environment_initWithEnterable(uno_Environment * pEnvironment, cppu::Enterab
 }}}
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/cppu/helper/purpenv/Mapping.hxx b/cppu/inc/cppu/helper/purpenv/Mapping.hxx
index c20309e7a180..6bdcd207987f 100644
--- a/cppu/inc/cppu/helper/purpenv/Mapping.hxx
+++ b/cppu/inc/cppu/helper/purpenv/Mapping.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,5 @@ void createMapping(uno_Mapping     ** ppMapping,
 }}}
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/cppu/macros.hxx b/cppu/inc/cppu/macros.hxx
index fd64d1c767df..5c123e7aecd9 100644
--- a/cppu/inc/cppu/macros.hxx
+++ b/cppu/inc/cppu/macros.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,4 @@
 
 #endif  // _CPPU_MACROS_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/cppu/unotype.hxx b/cppu/inc/cppu/unotype.hxx
index bef23d3cf38d..b8df4e07a1b0 100644
--- a/cppu/inc/cppu/unotype.hxx
+++ b/cppu/inc/cppu/unotype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -375,3 +376,5 @@ getTypeFavourChar(::com::sun::star::uno::Sequence< T > const *);
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/pch/precompiled_cppu.cxx b/cppu/inc/pch/precompiled_cppu.cxx
index 5148aa6b5439..2a6a6cb94ae0 100644
--- a/cppu/inc/pch/precompiled_cppu.cxx
+++ b/cppu/inc/pch/precompiled_cppu.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_cppu.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/pch/precompiled_cppu.hxx b/cppu/inc/pch/precompiled_cppu.hxx
index 38ea1cc9fbf7..c6624e57b5ca 100644
--- a/cppu/inc/pch/precompiled_cppu.hxx
+++ b/cppu/inc/pch/precompiled_cppu.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/typelib/typeclass.h b/cppu/inc/typelib/typeclass.h
index da0ea9f37093..231c9d9f5fe3 100644
--- a/cppu/inc/typelib/typeclass.h
+++ b/cppu/inc/typelib/typeclass.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,3 +103,5 @@ typedef enum _typelib_TypeClass
 } typelib_TypeClass;
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h
index cf42acac96b1..a88894c723a7 100644
--- a/cppu/inc/typelib/typedescription.h
+++ b/cppu/inc/typelib/typedescription.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,8 +42,6 @@ struct _typelib_TypeDescription;
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 8)
 #endif
 
 /** Holds a weak reference to a type description.
@@ -559,7 +558,7 @@ typedef struct _typelib_Union_Init
     typelib_TypeDescriptionReference* pTypeRef;
 } typelib_Union_Init;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
@@ -1158,3 +1157,5 @@ sal_Bool SAL_CALL typelib_typedescription_complete(
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/typelib/typedescription.hxx b/cppu/inc/typelib/typedescription.hxx
index 61a6531d3529..3997f3d9c14d 100644
--- a/cppu/inc/typelib/typedescription.hxx
+++ b/cppu/inc/typelib/typedescription.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Type.h>
-#ifndef _TYPELIB_TYPEDESCRIPTION_H
 #include <typelib/typedescription.h>
-#endif
 
 
 namespace com
@@ -224,3 +223,5 @@ inline void TypeDescription::makeComplete() const SAL_THROW( () )
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/typelib/uik.h b/cppu/inc/typelib/uik.h
index 06eead24f8bb..f201407d7aa0 100644
--- a/cppu/inc/typelib/uik.h
+++ b/cppu/inc/typelib/uik.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,8 +32,6 @@
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 8)
 #endif
 
 /** Binary typelib uik struct.  Internally not used anymore.
@@ -46,8 +45,10 @@ typedef struct _typelib_Uik
     sal_uInt32  m_Data5;
 } typelib_Uik;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #   pragma pack(pop)
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/Enterable.h b/cppu/inc/uno/Enterable.h
index d92013ec1404..a769ede987f2 100644
--- a/cppu/inc/uno/Enterable.h
+++ b/cppu/inc/uno/Enterable.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,3 +111,5 @@ uno_Enterable;
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/EnvDcp.h b/cppu/inc/uno/EnvDcp.h
index 17d65bc57d9c..a2471815c179 100644
--- a/cppu/inc/uno/EnvDcp.h
+++ b/cppu/inc/uno/EnvDcp.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,3 +62,5 @@ void uno_EnvDcp_getPurpose (rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPur
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/any2.h b/cppu/inc/uno/any2.h
index 72af895115b3..dbf64181002e 100644
--- a/cppu/inc/uno/any2.h
+++ b/cppu/inc/uno/any2.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,8 +38,6 @@ extern "C"
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 8)
 #endif
 
 struct _typelib_TypeDescriptionReference;
@@ -62,7 +61,7 @@ typedef struct _uno_Any
     void * pReserved;
 } uno_Any;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
@@ -176,3 +175,5 @@ void SAL_CALL uno_any_clear(
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/cuno.h b/cppu/inc/uno/cuno.h
index dfe5edea7144..f71c56854dd1 100644
--- a/cppu/inc/uno/cuno.h
+++ b/cppu/inc/uno/cuno.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,9 +43,10 @@
 
     @param return_code return code of call
 */
-#define CUNO_EXCEPTION_OCCURED( return_code ) (0 != ((return_code) & CUNO_ERROR_EXCEPTION))
+#define CUNO_EXCEPTION_OCCURRED( return_code ) (0 != ((return_code) & CUNO_ERROR_EXCEPTION))
 
 typedef sal_Int32 cuno_ErrorCode;
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/current_context.h b/cppu/inc/uno/current_context.h
index 64edd60a4811..7abd2771df07 100644
--- a/cppu/inc/uno/current_context.h
+++ b/cppu/inc/uno/current_context.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,5 @@ sal_Bool SAL_CALL uno_setCurrentContext(
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/current_context.hxx b/cppu/inc/uno/current_context.hxx
index 6cce6bc347a2..01d59a460eca 100644
--- a/cppu/inc/uno/current_context.hxx
+++ b/cppu/inc/uno/current_context.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -125,3 +126,5 @@ inline ContextLayer::~ContextLayer()
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/data.h b/cppu/inc/uno/data.h
index 31c3d57f3544..8a86b89841d7 100644
--- a/cppu/inc/uno/data.h
+++ b/cppu/inc/uno/data.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -255,3 +256,5 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/dispatcher.h b/cppu/inc/uno/dispatcher.h
index 55475868fd24..297dece16003 100644
--- a/cppu/inc/uno/dispatcher.h
+++ b/cppu/inc/uno/dispatcher.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,8 +64,6 @@ typedef void (SAL_CALL * uno_DispatchMethod)(
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 8)
 #endif
 
 /** The binary C uno interface description.
@@ -86,7 +85,7 @@ typedef struct _uno_Interface
     uno_DispatchMethod pDispatcher;
 } uno_Interface;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
@@ -95,3 +94,5 @@ typedef struct _uno_Interface
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/dispatcher.hxx b/cppu/inc/uno/dispatcher.hxx
index a4a845fc738f..90fdb3db6df7 100644
--- a/cppu/inc/uno/dispatcher.hxx
+++ b/cppu/inc/uno/dispatcher.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -173,3 +174,4 @@ inline void UnoInterfaceReference::dispatch(
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/environment.h b/cppu/inc/uno/environment.h
index f959aa2571f4..81c0b179ea7b 100644
--- a/cppu/inc/uno/environment.h
+++ b/cppu/inc/uno/environment.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,8 +43,6 @@ struct _typelib_InterfaceTypeDescription;
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 8)
 #endif
 
 /** The binary specification of an UNO environment.
@@ -255,7 +254,7 @@ typedef struct _uno_ExtEnvironment
 
 } uno_ExtEnvironment;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
@@ -383,3 +382,5 @@ int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pRea
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/environment.hxx b/cppu/inc/uno/environment.hxx
index c204b0a2dfa0..8fa4f3ea5063 100644
--- a/cppu/inc/uno/environment.hxx
+++ b/cppu/inc/uno/environment.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -276,3 +277,5 @@ inline Environment Environment::getCurrent(rtl::OUString const & typeName) SAL_T
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/lbnames.h b/cppu/inc/uno/lbnames.h
index 4bca6a8a9dd5..f9e32a957312 100644
--- a/cppu/inc/uno/lbnames.h
+++ b/cppu/inc/uno/lbnames.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,5 @@ provoking error here, because PP ignores #error
 #define UNO_LB_CLI "cli"
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/mapping.h b/cppu/inc/uno/mapping.h
index 3254d3c7c47d..53ea250dd31d 100644
--- a/cppu/inc/uno/mapping.h
+++ b/cppu/inc/uno/mapping.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,8 +66,6 @@ typedef void (SAL_CALL * uno_MapInterfaceFunc)(
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 8)
 #endif
 
 /** This is the binary specification of a mapping.
@@ -86,7 +85,7 @@ typedef struct _uno_Mapping
     uno_MapInterfaceFunc mapInterface;
 } uno_Mapping;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
@@ -201,3 +200,5 @@ typedef void (SAL_CALL * uno_ext_getMappingFunc)(
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/mapping.hxx b/cppu/inc/uno/mapping.hxx
index 2bd669133670..a183cf089de3 100644
--- a/cppu/inc/uno/mapping.hxx
+++ b/cppu/inc/uno/mapping.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -352,3 +353,5 @@ inline sal_Bool mapToUno( uno_Interface ** ppRet, const Reference< C > & x ) SAL
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/sequence2.h b/cppu/inc/uno/sequence2.h
index f8db769f9359..d1a50a3743f5 100644
--- a/cppu/inc/uno/sequence2.h
+++ b/cppu/inc/uno/sequence2.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -185,3 +186,5 @@ sal_Bool SAL_CALL uno_type_sequence_realloc(
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/threadpool.h b/cppu/inc/uno/threadpool.h
index 4938258a7ab9..0c647442e377 100644
--- a/cppu/inc/uno/threadpool.h
+++ b/cppu/inc/uno/threadpool.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -187,3 +188,5 @@ uno_threadpool_destroy( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C();
 #ifdef __cplusplus
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/prj/build.lst b/cppu/prj/build.lst
index a22ca9ec8b66..0af8b3019621 100644
--- a/cppu/prj/build.lst
+++ b/cppu/prj/build.lst
@@ -10,3 +10,5 @@ cu	cppu\source\UnsafeBridge	    nmake	-	all	cu_UnsafeBridge cu_inc NULL
 cu	cppu\source\AffineBridge	    nmake	-	all	cu_AffineBridge cu_inc NULL
 cu	cppu\source\LogBridge	        nmake	-	all	cu_LogBridge cu_inc NULL
 cu	cppu\util						nmake	-	all	cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL
+cu	cppu\qa							nmake	-	all cu_qa_cppunit cu_util NULL
+cu	cppu\qa\cppumaker				nmake	-	all cu_qa_cppumaker cu_util NULL
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst
index 411a51cf2518..87ff914710e8 100644
--- a/cppu/prj/d.lst
+++ b/cppu/prj/d.lst
@@ -1,74 +1,74 @@
-mkdir: %_DEST%\inc%_EXT%\cppu
-mkdir: %_DEST%\inc%_EXT%\cppu\helper\purpenv
-mkdir: %_DEST%\inc%_EXT%\com
-mkdir: %_DEST%\inc%_EXT%\com\sun
-mkdir: %_DEST%\inc%_EXT%\com\sun\star
-mkdir: %_DEST%\inc%_EXT%\com\sun\star\uno
-mkdir: %_DEST%\inc%_EXT%\typelib
-mkdir: %_DEST%\inc%_EXT%\uno
+mkdir: %_DEST%\inc\cppu
+mkdir: %_DEST%\inc\cppu\helper\purpenv
+mkdir: %_DEST%\inc\com
+mkdir: %_DEST%\inc\com\sun
+mkdir: %_DEST%\inc\com\sun\star
+mkdir: %_DEST%\inc\com\sun\star\uno
+mkdir: %_DEST%\inc\typelib
+mkdir: %_DEST%\inc\uno
 
-..\inc\cppu\macros.hxx %_DEST%\inc%_EXT%\cppu\macros.hxx
-..\inc\cppu\unotype.hxx %_DEST%\inc%_EXT%\cppu\unotype.hxx
+..\inc\cppu\macros.hxx %_DEST%\inc\cppu\macros.hxx
+..\inc\cppu\unotype.hxx %_DEST%\inc\cppu\unotype.hxx
 
-..\inc\com\sun\star\uno\Reference.h %_DEST%\inc%_EXT%\com\sun\star\uno\Reference.h
-..\inc\com\sun\star\uno\Reference.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\Reference.hxx
-..\inc\com\sun\star\uno\Type.h %_DEST%\inc%_EXT%\com\sun\star\uno\Type.h
-..\inc\com\sun\star\uno\Type.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\Type.hxx
-..\inc\com\sun\star\uno\Any.h %_DEST%\inc%_EXT%\com\sun\star\uno\Any.h
-..\inc\com\sun\star\uno\Any.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\Any.hxx
-..\inc\com\sun\star\uno\Sequence.h %_DEST%\inc%_EXT%\com\sun\star\uno\Sequence.h
-..\inc\com\sun\star\uno\Sequence.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\Sequence.hxx
-..\inc\com\sun\star\uno\genfunc.h %_DEST%\inc%_EXT%\com\sun\star\uno\genfunc.h
-..\inc\com\sun\star\uno\genfunc.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\genfunc.hxx
+..\inc\com\sun\star\uno\Reference.h %_DEST%\inc\com\sun\star\uno\Reference.h
+..\inc\com\sun\star\uno\Reference.hxx %_DEST%\inc\com\sun\star\uno\Reference.hxx
+..\inc\com\sun\star\uno\Type.h %_DEST%\inc\com\sun\star\uno\Type.h
+..\inc\com\sun\star\uno\Type.hxx %_DEST%\inc\com\sun\star\uno\Type.hxx
+..\inc\com\sun\star\uno\Any.h %_DEST%\inc\com\sun\star\uno\Any.h
+..\inc\com\sun\star\uno\Any.hxx %_DEST%\inc\com\sun\star\uno\Any.hxx
+..\inc\com\sun\star\uno\Sequence.h %_DEST%\inc\com\sun\star\uno\Sequence.h
+..\inc\com\sun\star\uno\Sequence.hxx %_DEST%\inc\com\sun\star\uno\Sequence.hxx
+..\inc\com\sun\star\uno\genfunc.h %_DEST%\inc\com\sun\star\uno\genfunc.h
+..\inc\com\sun\star\uno\genfunc.hxx %_DEST%\inc\com\sun\star\uno\genfunc.hxx
 
-..\inc\typelib\typeclass.h %_DEST%\inc%_EXT%\typelib\typeclass.h
-..\inc\typelib\typedescription.h %_DEST%\inc%_EXT%\typelib\typedescription.h
-..\inc\typelib\typedescription.hxx %_DEST%\inc%_EXT%\typelib\typedescription.hxx
-..\inc\typelib\uik.h %_DEST%\inc%_EXT%\typelib\uik.h
+..\inc\typelib\typeclass.h %_DEST%\inc\typelib\typeclass.h
+..\inc\typelib\typedescription.h %_DEST%\inc\typelib\typedescription.h
+..\inc\typelib\typedescription.hxx %_DEST%\inc\typelib\typedescription.hxx
+..\inc\typelib\uik.h %_DEST%\inc\typelib\uik.h
 
-..\inc\uno\dispatcher.h %_DEST%\inc%_EXT%\uno\dispatcher.h
-..\inc\uno\dispatcher.hxx %_DEST%\inc%_EXT%\uno\dispatcher.hxx
-..\inc\uno\any2.h %_DEST%\inc%_EXT%\uno\any2.h
-..\inc\uno\sequence2.h %_DEST%\inc%_EXT%\uno\sequence2.h
-..\inc\uno\data.h %_DEST%\inc%_EXT%\uno\data.h
-..\inc\uno\lbnames.h %_DEST%\inc%_EXT%\uno\lbnames.h
-..\inc\uno\environment.h %_DEST%\inc%_EXT%\uno\environment.h
-..\inc\uno\environment.hxx %_DEST%\inc%_EXT%\uno\environment.hxx
-..\inc\uno\mapping.h %_DEST%\inc%_EXT%\uno\mapping.h
-..\inc\uno\mapping.hxx %_DEST%\inc%_EXT%\uno\mapping.hxx
-..\inc\uno\threadpool.h %_DEST%\inc%_EXT%\uno\threadpool.h
-..\inc\uno\current_context.h %_DEST%\inc%_EXT%\uno\current_context.h
-..\inc\uno\current_context.hxx %_DEST%\inc%_EXT%\uno\current_context.hxx
-..\inc\uno\cuno.h %_DEST%\inc%_EXT%\uno\cuno.h
-..\inc\uno\EnvDcp.h              %_DEST%\inc%_EXT%\uno\EnvDcp.h
-..\inc\uno\Enterable.h           %_DEST%\inc%_EXT%\uno\Enterable.h
+..\inc\uno\dispatcher.h %_DEST%\inc\uno\dispatcher.h
+..\inc\uno\dispatcher.hxx %_DEST%\inc\uno\dispatcher.hxx
+..\inc\uno\any2.h %_DEST%\inc\uno\any2.h
+..\inc\uno\sequence2.h %_DEST%\inc\uno\sequence2.h
+..\inc\uno\data.h %_DEST%\inc\uno\data.h
+..\inc\uno\lbnames.h %_DEST%\inc\uno\lbnames.h
+..\inc\uno\environment.h %_DEST%\inc\uno\environment.h
+..\inc\uno\environment.hxx %_DEST%\inc\uno\environment.hxx
+..\inc\uno\mapping.h %_DEST%\inc\uno\mapping.h
+..\inc\uno\mapping.hxx %_DEST%\inc\uno\mapping.hxx
+..\inc\uno\threadpool.h %_DEST%\inc\uno\threadpool.h
+..\inc\uno\current_context.h %_DEST%\inc\uno\current_context.h
+..\inc\uno\current_context.hxx %_DEST%\inc\uno\current_context.hxx
+..\inc\uno\cuno.h %_DEST%\inc\uno\cuno.h
+..\inc\uno\EnvDcp.h              %_DEST%\inc\uno\EnvDcp.h
+..\inc\uno\Enterable.h           %_DEST%\inc\uno\Enterable.h
 
-..\inc\cppu\EnvDcp.hxx           %_DEST%\inc%_EXT%\cppu\EnvDcp.hxx
-..\inc\cppu\Enterable.hxx        %_DEST%\inc%_EXT%\cppu\Enterable.hxx
-..\inc\cppu\EnvGuards.hxx        %_DEST%\inc%_EXT%\cppu\EnvGuards.hxx
-..\inc\cppu\FreeReference.hxx    %_DEST%\inc%_EXT%\cppu\FreeReference.hxx
-..\inc\cppu\Map.hxx              %_DEST%\inc%_EXT%\cppu\Map.hxx
-..\inc\cppu\Shield.hxx           %_DEST%\inc%_EXT%\cppu\Shield.hxx
+..\inc\cppu\EnvDcp.hxx           %_DEST%\inc\cppu\EnvDcp.hxx
+..\inc\cppu\Enterable.hxx        %_DEST%\inc\cppu\Enterable.hxx
+..\inc\cppu\EnvGuards.hxx        %_DEST%\inc\cppu\EnvGuards.hxx
+..\inc\cppu\FreeReference.hxx    %_DEST%\inc\cppu\FreeReference.hxx
+..\inc\cppu\Map.hxx              %_DEST%\inc\cppu\Map.hxx
+..\inc\cppu\Shield.hxx           %_DEST%\inc\cppu\Shield.hxx
 
-..\inc\cppu\helper\purpenv\Environment.hxx  %_DEST%\inc%_EXT%\cppu\helper\purpenv\Environment.hxx
-..\inc\cppu\helper\purpenv\Mapping.hxx      %_DEST%\inc%_EXT%\cppu\helper\purpenv\Mapping.hxx
+..\inc\cppu\helper\purpenv\Environment.hxx  %_DEST%\inc\cppu\helper\purpenv\Environment.hxx
+..\inc\cppu\helper\purpenv\Mapping.hxx      %_DEST%\inc\cppu\helper\purpenv\Mapping.hxx
 
-..\%__SRC%\lib\icppu.lib %_DEST%\lib%_EXT%\icppu.lib
-..\%__SRC%\bin\cppu* %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\libuno_cppu.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\icppu.lib %_DEST%\lib\icppu.lib
+..\%__SRC%\bin\cppu* %_DEST%\bin\*
+..\%__SRC%\lib\libuno_cppu.* %_DEST%\lib\*
 
-..\%__SRC%\lib\ipurpenvhelper*        %_DEST%\lib%_EXT%\*
-..\%__SRC%\bin\purpe*.dll     %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\ipurpenvhelper*        %_DEST%\lib\*
+..\%__SRC%\bin\purpe*.dll     %_DEST%\bin\*
+..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib\*
 
-..\%__SRC%\bin\unsafe_u*.dll    %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\libunsafe_uno_uno.*    %_DEST%\lib%_EXT%\*
+..\%__SRC%\bin\unsafe_u*.dll    %_DEST%\bin\*
+..\%__SRC%\lib\libunsafe_uno_uno.*    %_DEST%\lib\*
 
-..\%__SRC%\bin\affine_u*.dll   %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\libaffine_uno_uno.*   %_DEST%\lib%_EXT%\*
+..\%__SRC%\bin\affine_u*.dll   %_DEST%\bin\*
+..\%__SRC%\lib\libaffine_uno_uno.*   %_DEST%\lib\*
 
-..\%__SRC%\bin\log_u*.dll   %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\liblog_uno_uno.*   %_DEST%\lib%_EXT%\*
+..\%__SRC%\bin\log_u*.dll   %_DEST%\bin\*
+..\%__SRC%\lib\liblog_uno_uno.*   %_DEST%\lib\*
 
 linklib: libuno_cppu.*.*
 linklib: libuno_purpenvhelper*.*.*
diff --git a/codemaker/test/cppumaker/makefile.mk b/cppu/qa/cppumaker/makefile.mk
index 964ae166cdf5..accda46fce3f 100644
--- a/codemaker/test/cppumaker/makefile.mk
+++ b/cppu/qa/cppumaker/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,28 @@
 #
 #*************************************************************************
 
-PRJ := ..$/..
-PRJNAME := codemaker
-TARGET := test_codemaker_cppumaker
+PRJ := ../..
+PRJNAME := cppu
+TARGET := test_cppumaker
 
 ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+	@echo Nothing done when cross-compiling
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 DLLPRE = # no leading "lib" on .so files
 
-INCPRE += $(MISC)$/$(TARGET)$/inc
+INCPRE += $(MISC)/$(TARGET)/inc
 
 SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_codemaker_cppumaker.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
+SHL1OBJS = $(SLO)/test_cppumaker.obj
+SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
@@ -52,22 +57,21 @@ SLOFILES = $(SHL1OBJS)
 
 ALLTAR: test
 
-$(SHL1OBJS): $(MISC)$/$(TARGET).cppumaker.flag
+$(SHL1OBJS): $(MISC)/$(TARGET).cppumaker.flag
 
-$(MISC)$/$(TARGET).cppumaker.flag: $(BIN)$/cppumaker$(EXECPOST)
-$(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb
-    - $(MKDIRHIER) $(MISC)$/$(TARGET)$/inc
-    $(AUGMENT_LIBRARY_PATH) $(BIN)$/cppumaker$(EXECPOST) \
-        -O$(MISC)$/$(TARGET)$/inc -BUCR -C $< $(SOLARBINDIR)$/udkapi.rdb
-    $(TOUCH) $@
+$(MISC)/$(TARGET).cppumaker.flag: $(MISC)/$(TARGET).rdb
+	- $(MKDIRHIER) $(MISC)/$(TARGET)/inc
+	$(CPPUMAKER) \
+	    -O$(MISC)/$(TARGET)/inc -BUCR -C $< $(SOLARBINDIR)/udkapi.rdb
+	$(TOUCH) $@
 
-$(MISC)$/$(TARGET).rdb: $(MISC)$/$(TARGET)$/types.urd
-    - rm $@
-    $(REGMERGE) $@ /UCR $<
+$(MISC)/$(TARGET).rdb: $(MISC)/$(TARGET)/types.urd
+	- rm -f $@
+	$(REGMERGE) $@ /UCR $<
 
-$(MISC)$/$(TARGET)$/types.urd: types.idl
-    - $(MKDIR) $(MISC)$/$(TARGET)
-    $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
+$(MISC)/$(TARGET)/types.urd: types.idl
+	- $(MKDIR) $(MISC)/$(TARGET)
+	$(IDLC) -O$(MISC)/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
 
 test .PHONY: $(SHL1TARGETN)
-    $(AUGMENT_LIBRARY_PATH) testshl2 $<
+	$(CPPUNITTESTER) $<
diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index 38ea5bb50444..8e71264209fc 100644
--- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
+#include "precompiled_cppu.hxx"
 
 #include "FILE.hpp"
 #include "lconv.hpp"
@@ -366,7 +367,9 @@
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/uno/Type.hxx"
 #include "com/sun/star/uno/TypeClass.hpp"
-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 
@@ -441,15 +444,18 @@ void Test::testBigStruct() {
     CPPUNIT_ASSERT_EQUAL(guard.p->m22.getLength(), static_cast< sal_Int32 >(0));
     CPPUNIT_ASSERT_EQUAL(guard.p->m23.getLength(), static_cast< sal_Int32 >(0));
 
+//This is a very platform specific test.
 #if defined __GNUC__ && __GNUC__ >= 3 // see CPPU_GCC3_ALIGN
+#if defined(LINUX) && (defined (X86_64) || defined(X86) || defined(PPC))
     CPPUNIT_ASSERT_EQUAL(
-#if defined X86_64
+#if defined X86_64 || defined PPC
         static_cast< std::size_t >(24),
 #else
         static_cast< std::size_t >(16),
 #endif
         sizeof (test::codemaker::cppumaker::AlignmentDerivedStruct));
 #endif
+#endif
 
     com::sun::star::uno::Type t(
         cppu::UnoType< test::codemaker::cppumaker::BigStruct >::get());
@@ -473,9 +479,13 @@ void Test::testPolyStruct() {
         (com::sun::star::uno::makeAny(
             test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
          getValueType().getTypeName()));
+
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
+        aEmptySequence;
+
     CPPUNIT_ASSERT_EQUAL(
-        (test::codemaker::cppumaker::make_Struct< sal_uInt32, sal_Bool >(5, 0).
-         member1),
+        (test::codemaker::cppumaker::make_Struct< sal_uInt32, sal_Bool >(5,
+            aEmptySequence).member1),
         static_cast< sal_uInt32 >(5));
 }
 
@@ -499,11 +509,14 @@ std::ostream & operator <<(
 }
 
 void Test::testExceptions() {
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
+        aEmptySequence;
+
     test::codemaker::cppumaker::TestException1 e11(
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
         com::sun::star::uno::makeAny(123.0),
         test::codemaker::cppumaker::HelperEnum_ONE,
-        test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, 0), 2);
+        test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
     test::codemaker::cppumaker::TestException1 e12(e11);
     CPPUNIT_ASSERT_EQUAL(e11, e12);
     test::codemaker::cppumaker::TestException1 e13;
@@ -513,7 +526,7 @@ void Test::testExceptions() {
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
         com::sun::star::uno::makeAny(123.0),
         test::codemaker::cppumaker::HelperEnum_ONE,
-        test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, 0), 2);
+        test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
     test::codemaker::cppumaker::TestException2 e22(e21);
     CPPUNIT_ASSERT_EQUAL(e21, e22);
     test::codemaker::cppumaker::TestException2 e23;
@@ -560,8 +573,10 @@ void Test::testConstants() {
         test::codemaker::cppumaker::Constants::unsignedHyperMax);
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/test/cppumaker/types.idl b/cppu/qa/cppumaker/types.idl
index 9d9c70234ae3..9d9c70234ae3 100644
--- a/codemaker/test/cppumaker/types.idl
+++ b/cppu/qa/cppumaker/types.idl
diff --git a/codemaker/test/cppumaker/version.map b/cppu/qa/cppumaker/version.map
index 7321bbca16ad..3308588ef6f8 100644
--- a/codemaker/test/cppumaker/version.map
+++ b/cppu/qa/cppumaker/version.map
@@ -27,7 +27,7 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk
index b40d3512e575..6d9d87935753 100644
--- a/cppu/qa/makefile.mk
+++ b/cppu/qa/makefile.mk
@@ -33,36 +33,41 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
 
-DLLPRE = # no leading "lib" on .so files
+CFLAGSCXX+=$(CPPUNIT_CFLAGS)
 
-INCPRE += $(MISC)$/$(TARGET)$/inc
+DLLPRE=# no leading "lib" on .so files
+
+INCPRE+=$(MISC)$/$(TARGET)$/inc
 
 SHL1TARGET = $(TARGET)_any
 SHL1OBJS = $(SLO)$/test_any.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
 
 SHL2TARGET = $(TARGET)_unotype
 SHL2OBJS = $(SLO)$/test_unotype.obj
-SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
+SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
 SHL2VERSIONMAP = version.map
 SHL2IMPLIB = i$(SHL2TARGET)
 DEF2NAME = $(SHL2TARGET)
 
 SHL3TARGET = $(TARGET)_reference
 SHL3OBJS = $(SLO)$/test_reference.obj
-SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
+SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
 SHL3VERSIONMAP = version.map
 SHL3IMPLIB = i$(SHL3TARGET)
 DEF3NAME = $(SHL3TARGET)
 
 SHL4TARGET = $(TARGET)_recursion
 SHL4OBJS = $(SLO)$/test_recursion.obj
-SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
+SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
 SHL4VERSIONMAP = version.map
 SHL4IMPLIB = i$(SHL4TARGET)
 DEF4NAME = $(SHL4TARGET)
@@ -71,10 +76,14 @@ SLOFILES = $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) $(SHL4OBJS)
 
 .INCLUDE: target.mk
 
-ALLTAR: test
-
 $(SHL1OBJS): $(MISC)$/$(TARGET).cppumaker.flag
 
+$(SHL2OBJS): $(MISC)$/$(TARGET).cppumaker.flag
+
+$(SHL3OBJS): $(MISC)$/$(TARGET).cppumaker.flag
+
+$(SHL4OBJS): $(MISC)$/$(TARGET).cppumaker.flag
+
 $(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb
     - $(MKDIRHIER) $(MISC)$/$(TARGET)$/inc
     $(CPPUMAKER) -O$(MISC)$/$(TARGET)$/inc -BUCR -C $< \
@@ -82,15 +91,11 @@ $(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb
     $(TOUCH) $@
 
 $(MISC)$/$(TARGET).rdb: $(MISC)$/$(TARGET)$/types.urd
-    - rm $@
+    - $(RM) $@
     $(REGMERGE) $@ /UCR $<
 
 $(MISC)$/$(TARGET)$/types.urd: types.idl
     - $(MKDIR) $(MISC)$/$(TARGET)
     $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
 
-test .PHONY: $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN) $(SHL4TARGETN)
-    $(TESTSHL2) $(SHL1TARGETN)
-    $(TESTSHL2) $(SHL2TARGETN)
-    $(TESTSHL2) $(SHL3TARGETN)
-    $(TESTSHL2) $(SHL4TARGETN)
+.INCLUDE : _cppunit.mk
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index 1ab601b04c46..71afe9b31a5a 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,6 +33,12 @@
 
 #include <stdlib.h> // wntmsci10 does not like <cstdlib>
 
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/extensions/HelperMacros.h>
+
 #include "Enum1.hpp"
 #include "Enum2.hpp"
 #include "Exception1.hpp"
@@ -55,7 +62,6 @@
 #include "com/sun/star/uno/Sequence.hxx"
 #include "com/sun/star/uno/Type.hxx"
 #include "com/sun/star/uno/XInterface.hpp"
-#include "testshl/simpleheader.hxx"
 #include "osl/diagnose.h"
 #include "osl/interlck.h"
 #include "rtl/string.h"
@@ -197,45 +203,25 @@ public:
 class Test: public CppUnit::TestFixture {
 public:
     void testVoid();
-
     void testBoolean();
-
     void testByte();
-
     void testShort();
-
     void testUnsignedShort();
-
     void testLong();
-
     void testUnsignedLong();
-
     void testHyper();
-
     void testUnsignedHyper();
-
     void testFloat();
-
     void testDouble();
-
     void testChar();
-
     void testString();
-
     void testType();
-
     void testSequence();
-
     void testEnum();
-
     void testStruct();
-
     void testPoly();
-
     void testException();
-
     void testInterface();
-
     void testNull();
 
     CPPUNIT_TEST_SUITE(Test);
@@ -2323,8 +2309,10 @@ void Test::testNull() {
     }
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx
index c0bab3e30b95..81ee1f0664fa 100644
--- a/cppu/qa/test_recursion.cxx
+++ b/cppu/qa/test_recursion.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,12 @@
 #include "precompiled_cppu.hxx"
 #include "sal/config.h"
 
-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/extensions/HelperMacros.h>
+
 #include "sal/types.h"
 
 #include "Rec.hpp"
@@ -50,8 +56,10 @@ void Test::testRecursion() {
     CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), Rec().x.getLength());
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "tests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index 88a24d8e361d..fbf7011deb67 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,14 @@
 
 #include "sal/config.h"
 
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/extensions/HelperMacros.h>
+
 #include "Interface1.hpp"
 
-#include "testshl/simpleheader.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 
@@ -149,8 +155,10 @@ void Test::testUnoSetThrow()
     CPPUNIT_ASSERT_EQUAL( false, bCaughtException );
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }   // namespace
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index eda5be571e7b..f85944ff1021 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,6 +31,12 @@
 
 #include "sal/config.h"
 
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/extensions/HelperMacros.h>
+
 #include <typeinfo>
 
 #include "com/sun/star/beans/Optional.hpp"
@@ -44,7 +51,6 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppu/unotype.hxx"
-#include "testshl/simpleheader.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
@@ -805,8 +811,10 @@ void Test::testGetTypeFavourChar() {
 #endif
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/qa/version.map b/cppu/qa/version.map
index 7321bbca16ad..3308588ef6f8 100644
--- a/cppu/qa/version.map
+++ b/cppu/qa/version.map
@@ -27,7 +27,7 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 59f8213274a6..89647322ad6d 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -362,3 +363,4 @@ extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping
     cppu::helper::purpenv::createMapping(ppMapping, pFrom, pTo);
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index b57cd405c82b..8eb69cc23e4e 100755..100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,7 +39,7 @@
 #include "rtl/logfile.hxx"
 #include "uno/environment.hxx"
 #include <com/sun/star/uno/Type.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <memory>
 
 namespace
@@ -246,7 +247,7 @@ void LogProbe(
         rtl_logfile_longTrace( "} LogBridge () %s",sTemp.getStr());
         if ( ppException && *ppException )
         {
-            rtl_logfile_trace( " excption occured : ");
+            rtl_logfile_trace( " excption occurred : ");
             typelib_TypeDescription * pElementTypeDescr = 0;
             TYPELIB_DANGER_GET( &pElementTypeDescr, (*ppException)->pType );
             const ::rtl::OString sValue( ::rtl::OUStringToOString(pElementTypeDescr->pTypeName,osl_getThreadTextEncoding()));
@@ -275,3 +276,5 @@ extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping
 {
     cppu::helper::purpenv::createMapping(ppMapping, pFrom, pTo,LogProbe);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 5a531de47182..17ecb4646918 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -161,3 +162,4 @@ extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping
     cppu::helper::purpenv::createMapping(ppMapping, pFrom, pTo);
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx
index a4640fd6f945..6512bd567d71 100644
--- a/cppu/source/cppu/cppu_opt.cxx
+++ b/cppu/source/cppu/cppu_opt.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,3 +80,5 @@ extern "C" rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg(
     rtl_uString_acquire( ret.pData );
     return ret.pData;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx
index 570d7291b177..9db0182c2edc 100644
--- a/cppu/source/helper/purpenv/Proxy.hxx
+++ b/cppu/source/helper/purpenv/Proxy.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,3 +88,5 @@ public:
 extern "C" SAL_DLLPRIVATE void SAL_CALL Proxy_free(uno_ExtEnvironment * pEnv, void * pProxy) SAL_THROW_EXTERN_C();
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/helper/purpenv/export.mk b/cppu/source/helper/purpenv/export.mk
index 7e5e9d04d1d2..004787e4f45c 100644
--- a/cppu/source/helper/purpenv/export.mk
+++ b/cppu/source/helper/purpenv/export.mk
@@ -4,10 +4,6 @@ NAMEpurpenv_helper := uno_purpenvhelper$(COMID)
 
 purpenv_helper_LIB := -l$(NAMEpurpenv_helper)
 
-.ELIF "$(GUI)"=="OS2"
-NAMEpurpenv_helper := purpeh$(UDK_MAJOR)
-purpenv_helper_LIB := i$(NAMEpurpenv_helper)
-
 .ELSE
 NAMEpurpenv_helper := purpenvhelper$(UDK_MAJOR)$(COMID)
 .IF "$(COM)"=="GCC"
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index 0fbed6739951..52e77785f1ea 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -535,3 +536,5 @@ void Environment_initWithEnterable(uno_Environment * pEnvironment, cppu::Enterab
 }
 
 }}}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index 0b4b3c9e0786..9c87f82cf470 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -231,3 +232,5 @@ void createMapping(uno_Mapping     ** ppMapping,
 }
 
 }}}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
index 344203e38762..1240df313f57 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -171,7 +172,7 @@ extern "C" { static void SAL_CALL s_Proxy_dispatch(
         break;
     }
     default:
-        OSL_ENSURE( sal_False, "### illegal member typeclass!" );
+        OSL_FAIL( "### illegal member typeclass!" );
         abort();
     }
 
@@ -492,7 +493,7 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef,
 
         *ppException = 0;
     }
-    else // exception occured
+    else // exception occurred
     {
         for (sal_Int32 nPos = 0; nPos < nParams; ++ nPos)
         {
@@ -528,3 +529,4 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef,
                    ppException);
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index 23bd52ca1917..2ffabcbff014 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -295,3 +296,5 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext(
 
     return sal_True;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/current.hxx b/cppu/source/threadpool/current.hxx
index fbe0531cf178..45640220116d 100644
--- a/cppu/source/threadpool/current.hxx
+++ b/cppu/source/threadpool/current.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,5 @@ struct IdContainer
 
 IdContainer * getIdContainer() SAL_THROW( () );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/jobqueue.cxx b/cppu/source/threadpool/jobqueue.cxx
index 333a350c0b23..9f629e43a457 100644
--- a/cppu/source/threadpool/jobqueue.cxx
+++ b/cppu/source/threadpool/jobqueue.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -187,10 +188,12 @@ namespace cppu_threadpool {
         return m_lstCallstack.empty();
     }
 
-    sal_Bool JobQueue::isBusy()
+    sal_Bool JobQueue::isBusy() const
     {
         return m_nToDo > 0;
     }
 
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx
index 78202573403e..6bddcc73483f 100644
--- a/cppu/source/threadpool/jobqueue.hxx
+++ b/cppu/source/threadpool/jobqueue.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,7 +70,7 @@ namespace cppu_threadpool
 
         sal_Bool isEmpty();
         sal_Bool isCallstackEmpty();
-        sal_Bool isBusy();
+        sal_Bool isBusy() const;
 
     private:
         ::osl::Mutex m_mutex;
@@ -83,3 +84,5 @@ namespace cppu_threadpool
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx
index 00c91500d1e5..c6035f0754c7 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -217,3 +218,5 @@ namespace cppu_threadpool {
         }
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/thread.hxx b/cppu/source/threadpool/thread.hxx
index 2f7791daf7e5..bbef51eabca4 100644
--- a/cppu/source/threadpool/thread.hxx
+++ b/cppu/source/threadpool/thread.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,4 @@ namespace cppu_threadpool {
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/threadident.cxx b/cppu/source/threadpool/threadident.cxx
index 0fb6c1196185..50fef43f57b4 100644
--- a/cppu/source/threadpool/threadident.cxx
+++ b/cppu/source/threadpool/threadident.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -133,3 +134,5 @@ extern "C"  sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId
     }
     return sal_True;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index b7df159a80b9..b21d0b758bc5 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cppu.hxx"
-#include <hash_set>
+#include <boost/unordered_map.hpp>
 #include <stdio.h>
 
 #include <osl/diagnose.h>
@@ -118,7 +119,7 @@ namespace cppu_threadpool
 
     ThreadPool::ThreadPool()
     {
-            m_DisposedCallerAdmin = DisposedCallerAdmin::getInstance();
+        m_DisposedCallerAdmin = DisposedCallerAdmin::getInstance();
     }
 
     ThreadPool::~ThreadPool()
@@ -302,7 +303,7 @@ namespace cppu_threadpool
 
             if( ii == m_mapQueue.end() )
             {
-                m_mapQueue[ aThreadId ] = pair < JobQueue * , JobQueue * > ( 0 , 0 );
+                m_mapQueue[ aThreadId ] = pair < JobQueue * , JobQueue * > ( (JobQueue *)0 , (JobQueue*)0 );
                 ii = m_mapQueue.find( aThreadId );
                 OSL_ASSERT( ii != m_mapQueue.end() );
             }
@@ -348,7 +349,7 @@ namespace cppu_threadpool
         if( ii == m_mapQueue.end() )
         {
             JobQueue *p = new JobQueue();
-            m_mapQueue[ aThreadId ] = pair< JobQueue * , JobQueue * > ( p , 0 );
+            m_mapQueue[ aThreadId ] = pair< JobQueue * , JobQueue * > ( p , (JobQueue*)0 );
         }
         else if( 0 == (*ii).second.first )
         {
@@ -404,7 +405,7 @@ struct uno_ThreadPool_Hash
 
 
 
-typedef ::std::hash_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet;
+typedef ::boost::unordered_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet;
 
 static ThreadpoolHashSet *g_pThreadpoolHashSet;
 
@@ -504,3 +505,5 @@ uno_threadpool_destroy( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C()
         }
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx
index e1c9a127fa55..273798c81f8a 100644
--- a/cppu/source/threadpool/threadpool.hxx
+++ b/cppu/source/threadpool/threadpool.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,7 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <osl/conditn.h>
 
@@ -59,7 +60,7 @@ namespace cppu_threadpool {
             }
     };
 
-    typedef ::std::hash_map
+    typedef ::boost::unordered_map
     <
         ByteSequence, // ThreadID
         ::std::pair < JobQueue * , JobQueue * >,
@@ -138,3 +139,5 @@ namespace cppu_threadpool {
     };
 
 } // end namespace cppu_threadpool
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index 605bc5aadbdc..bc2f67c2fefb 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,7 +43,9 @@
 
 
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
 
 extern "C"
 {
@@ -67,8 +70,6 @@ void SAL_CALL typelib_typedescriptionreference_getByName(
 
 #ifdef SAL_W32
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(8)
 #endif
 
 /**
@@ -79,14 +80,19 @@ void SAL_CALL typelib_typedescriptionreference_getByName(
  */
 struct AlignSize_Impl
 {
-    sal_Int16   nInt16;
-    double      dDouble;
+    sal_Int16 nInt16;
+#ifdef AIX
+    //double: doubleword aligned if -qalign=natural/-malign=natural
+    //which isn't the default ABI. Otherwise word aligned, While a long long int
+    //is always doubleword aligned, so use that instead.
+    sal_Int64   dDouble;
+#else
+    double dDouble;
+#endif
 };
 
 #ifdef SAL_W32
 #pragma pack(pop)
-#elif defined(SAL_OS2)
-#pragma pack()
 #endif
 
 // the value of the maximal alignment
@@ -647,3 +653,5 @@ void SAL_CALL typelib_static_array_type_init(
 } // extern "C"
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 935a64397505..672502cec457 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cppu.hxx"
 
-#include <hash_map>
+#if OSL_DEBUG_LEVEL > 1
+#include <stdio.h>
+#endif
+
+#include <boost/unordered_map.hpp>
 #include <list>
 #include <set>
 #include <vector>
@@ -48,17 +53,15 @@
 #include <typelib/typedescription.h>
 #include <uno/any2.h>
 
-using namespace rtl;
 using namespace std;
 using namespace osl;
 
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 #ifdef SAL_W32
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(8)
 #endif
 
 /**
@@ -69,14 +72,19 @@ using namespace osl;
  */
 struct AlignSize_Impl
 {
-    sal_Int16   nInt16;
-    double      dDouble;
+    sal_Int16 nInt16;
+#ifdef AIX
+    //double: doubleword aligned if -qalign=natural/-malign=natural
+    //which isn't the default ABI. Otherwise word aligned, While a long long int
+    //is always doubleword aligned, so use that instead.
+    sal_Int64 dDouble;
+#else
+    double dDouble;
+#endif
 };
 
 #ifdef SAL_W32
 #pragma pack(pop)
-#elif defined(SAL_OS2)
-#pragma pack()
 #endif
 
 // the value of the maximal alignment
@@ -183,7 +191,7 @@ struct hashStr_Impl
 
 //-----------------------------------------------------------------------------
 // Heavy hack, the const sal_Unicode * is hold by the typedescription reference
-typedef hash_map< const sal_Unicode *, typelib_TypeDescriptionReference *,
+typedef boost::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *,
                   hashStr_Impl, equalStr_Impl > WeakMap_Impl;
 
 typedef pair< void *, typelib_typedescription_Callback > CallbackEntry;
@@ -273,7 +281,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
         while( aIt != pCache->end() )
         {
             typelib_typedescription_release( (*aIt) );
-            aIt++;
+            ++aIt;
         }
         delete pCache;
         pCache = 0;
@@ -330,6 +338,21 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
         delete pWeakMap;
         pWeakMap = 0;
     }
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE( !nTypeDescriptionCount );
+    OSL_ENSURE( !nCompoundTypeDescriptionCount );
+    OSL_ENSURE( !nUnionTypeDescriptionCount );
+    OSL_ENSURE( !nIndirectTypeDescriptionCount );
+    OSL_ENSURE( !nArrayTypeDescriptionCount );
+    OSL_ENSURE( !nEnumTypeDescriptionCount );
+    OSL_ENSURE( !nInterfaceMethodTypeDescriptionCount );
+    OSL_ENSURE( !nInterfaceAttributeTypeDescriptionCount );
+    OSL_ENSURE( !nInterfaceTypeDescriptionCount );
+    OSL_ENSURE( !nTypeDescriptionReferenceCount );
+
+    OSL_ENSURE( !pCallbacks || pCallbacks->empty() );
+#endif
+
     delete pCallbacks;
     pCallbacks = 0;
 
@@ -342,10 +365,6 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
 
 namespace { struct Init : public rtl::Static< TypeDescriptor_Init_Impl, Init > {}; }
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 extern "C" void SAL_CALL typelib_typedescription_registerCallback(
     void * pContext, typelib_typedescription_Callback pCallback )
     SAL_THROW_EXTERN_C()
@@ -385,10 +404,6 @@ extern "C" void SAL_CALL typelib_typedescription_revokeCallback(
     }
 }
 
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
     const typelib_TypeDescription * pTypeDescription,
     sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize )
@@ -1276,7 +1291,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod(
     sal_Int32 nOffset = rtl_ustr_lastIndexOfChar_WithLength(
         pTypeName->buffer, pTypeName->length, ':');
     if (nOffset <= 0 || pTypeName->buffer[nOffset - 1] != ':') {
-        OSL_ENSURE(false, "Bad interface method type name");
+        OSL_FAIL("Bad interface method type name");
         return;
     }
     rtl::OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1);
@@ -1289,7 +1304,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod(
         || !complete(
             reinterpret_cast< typelib_TypeDescription ** >(&pInterface), false))
     {
-        OSL_ENSURE(false, "No interface corresponding to interface method");
+        OSL_FAIL("No interface corresponding to interface method");
         return;
     }
 
@@ -1369,7 +1384,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute(
     sal_Int32 nOffset = rtl_ustr_lastIndexOfChar_WithLength(
         pTypeName->buffer, pTypeName->length, ':');
     if (nOffset <= 0 || pTypeName->buffer[nOffset - 1] != ':') {
-        OSL_ENSURE(false, "Bad interface attribute type name");
+        OSL_FAIL("Bad interface attribute type name");
         return;
     }
     rtl::OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1);
@@ -1382,7 +1397,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute(
         || !complete(
             reinterpret_cast< typelib_TypeDescription ** >(&pInterface), false))
     {
-        OSL_ENSURE(false, "No interface corresponding to interface attribute");
+        OSL_FAIL("No interface corresponding to interface attribute");
         return;
     }
 
@@ -1927,7 +1942,13 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
                 nSize = rMaxIntegralTypeSize = (sal_Int32)(sizeof( float ));
                 break;
             case typelib_TypeClass_DOUBLE:
+#ifdef AIX
+                //See previous AIX ifdef comment for an explanation
+                nSize = (sal_Int32)(sizeof(double));
+                rMaxIntegralTypeSize = (sal_Int32)(sizeof(void*));
+#else
                 nSize = rMaxIntegralTypeSize = (sal_Int32)(sizeof( double ));
+#endif
                 break;
             case typelib_TypeClass_BYTE:
                 nSize = rMaxIntegralTypeSize = (sal_Int32)(sizeof( sal_Int8 ));
@@ -1948,7 +1969,7 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
             case typelib_TypeClass_SERVICE:
             case typelib_TypeClass_MODULE:
             default:
-                OSL_ENSURE( sal_False, "not convertable type" );
+                OSL_FAIL( "not convertable type" );
         };
     }
 
@@ -2174,7 +2195,7 @@ extern "C" void SAL_CALL typelib_typedescription_getByName(
         {
             // Check for derived interface member type:
             sal_Int32 i1 = name.lastIndexOf(
-                rtl::OUString::createFromAscii(":@"));
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":@")));
             if (i1 >= 0) {
                 sal_Int32 i2 = i1 + RTL_CONSTASCII_LENGTH(":@");
                 sal_Int32 i3 = name.indexOf(',', i2);
@@ -2254,10 +2275,6 @@ extern "C" void SAL_CALL typelib_typedescription_getByName(
     }
 }
 
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 extern "C" void SAL_CALL typelib_typedescriptionreference_newByAsciiName(
     typelib_TypeDescriptionReference ** ppTDR,
     typelib_TypeClass eTypeClass,
@@ -2644,3 +2661,5 @@ extern "C" sal_Bool SAL_CALL typelib_typedescription_complete(
 {
     return complete(ppTypeDescr, true);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/EnvDcp.c b/cppu/source/uno/EnvDcp.c
index 7fb9a0e0ee68..a9d6dc3d59c7 100644
--- a/cppu/source/uno/EnvDcp.c
+++ b/cppu/source/uno/EnvDcp.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,5 @@ void uno_EnvDcp_getPurpose(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPurp
     else
         rtl_uString_new(ppEnvPurpose);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index b7cefd42b4da..d1ff2922233a 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,10 +31,12 @@
 #include "cppu/EnvDcp.hxx"
 #include "cppu/Enterable.hxx"
 
+#include "rtl/instance.hxx"
+
 #include "osl/thread.h"
 #include "osl/mutex.hxx"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 
 using namespace com::sun::star;
@@ -62,14 +65,16 @@ size_t oslThreadIdentifier_hash::operator()(oslThreadIdentifier s1) const
     return s1;
 }
 
-typedef ::std::hash_map<oslThreadIdentifier,
+typedef ::boost::unordered_map<oslThreadIdentifier,
                         uno_Environment *,
                         oslThreadIdentifier_hash,
                         oslThreadIdentifier_equal>  ThreadMap;
 
-static osl::Mutex s_threadMap_mutex;
-static ThreadMap  s_threadMap;
-
+namespace
+{
+    struct s_threadMap_mutex : public rtl::Static< osl::Mutex, s_threadMap_mutex > {};
+    struct s_threadMap : public rtl::Static< ThreadMap, s_threadMap > {};
+}
 
 static rtl::OUString s_uno_envDcp(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO));
 
@@ -77,15 +82,13 @@ static void s_setCurrent(uno_Environment * pEnv)
 {
     oslThreadIdentifier threadId = osl_getThreadIdentifier(NULL);
 
-    osl::MutexGuard guard(s_threadMap_mutex);
+    osl::MutexGuard guard(s_threadMap_mutex::get());
+    ThreadMap &rThreadMap = s_threadMap::get();
     if (pEnv)
-        s_threadMap[threadId] = pEnv;
+        rThreadMap[threadId] = pEnv;
 
     else
-    {
-        ThreadMap::iterator iEnv = s_threadMap.find(threadId);
-        s_threadMap.erase(iEnv);
-    }
+        rThreadMap.erase(threadId);
 }
 
 static uno_Environment * s_getCurrent(void)
@@ -94,9 +97,10 @@ static uno_Environment * s_getCurrent(void)
 
     oslThreadIdentifier threadId = osl_getThreadIdentifier(NULL);
 
-    osl::MutexGuard guard(s_threadMap_mutex);
-    ThreadMap::iterator iEnv = s_threadMap.find(threadId);
-    if(iEnv != s_threadMap.end())
+    osl::MutexGuard guard(s_threadMap_mutex::get());
+    ThreadMap &rThreadMap = s_threadMap::get();
+    ThreadMap::iterator iEnv = rThreadMap.find(threadId);
+    if(iEnv != rThreadMap.end())
         pEnv = iEnv->second;
 
     return pEnv;
@@ -378,3 +382,5 @@ int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pRea
 
     return result;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx
index 64721e2993ca..868a4d7c5e3c 100644
--- a/cppu/source/uno/IdentityMapping.cxx
+++ b/cppu/source/uno/IdentityMapping.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -104,3 +105,5 @@ uno_Mapping * createIdentityMapping(uno::Environment const & rEnv) SAL_THROW(())
 {
     return new IdentityMapping(rEnv);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/IdentityMapping.hxx b/cppu/source/uno/IdentityMapping.hxx
index cf95a30b203c..cd9760640656 100644
--- a/cppu/source/uno/IdentityMapping.hxx
+++ b/cppu/source/uno/IdentityMapping.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,3 +38,5 @@ class Environment;
 uno_Mapping * createIdentityMapping(const ::com::sun::star::uno::Environment & rEnv);
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/any.cxx b/cppu/source/uno/any.cxx
index 29be833dfb86..f83373ce4d5c 100644
--- a/cppu/source/uno/any.cxx
+++ b/cppu/source/uno/any.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -148,3 +149,5 @@ void SAL_CALL uno_any_clear( uno_Any * pValue, uno_ReleaseFunc release )
     CONSTRUCT_EMPTY_ANY( pValue );
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx
index 256bb31565db..42375832ab09 100644
--- a/cppu/source/uno/assign.hxx
+++ b/cppu/source/uno/assign.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -633,3 +634,5 @@ inline sal_Bool _assignData(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index ee870a52e286..9e32c6db8bc5 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,22 +26,17 @@
  *
  ************************************************************************/
 
-#include <iostream>
-
 #include "osl/interlck.h"
 #include "rtl/ustring.hxx"
 #include "uno/environment.hxx"
 #include "uno/mapping.hxx"
 #include "uno/dispatcher.h"
 
-//#include "cascade_mappping.hxx"
 #include "cppu/EnvDcp.hxx"
 
 
-//#define LOG_CALLING_named_purpose_getMapping
-
-//#define LOG_LIFECYLE_MediatorMapping
 #ifdef LOG_LIFECYLE_MediatorMapping
+#  include <iostream>
 #  define LOG_LIFECYLE_MediatorMapping_emit(x) x
 
 #else
@@ -339,3 +335,5 @@ void getCascadeMapping(uno_Mapping     ** ppMapping,
 
     *ppMapping = pMapping;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/cascade_mapping.hxx b/cppu/source/uno/cascade_mapping.hxx
index 3b63e17198fb..9920fa05058d 100644
--- a/cppu/source/uno/cascade_mapping.hxx
+++ b/cppu/source/uno/cascade_mapping.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@ void getCascadeMapping(uno_Mapping     ** ppMapping,
                        rtl_uString      * pAddPurpose );
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx
index 8e6d35e9db64..b8eb9b5cc5ce 100644
--- a/cppu/source/uno/constr.hxx
+++ b/cppu/source/uno/constr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -265,3 +266,5 @@ inline void _defaultConstructData(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx
index 7999b5ae0d2b..eee6363e6998 100644
--- a/cppu/source/uno/copy.hxx
+++ b/cppu/source/uno/copy.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -251,7 +252,7 @@ inline void _copyConstructAnyFromData(
         *(typelib_TypeDescriptionReference **)&pDestAny->pReserved = *(typelib_TypeDescriptionReference **)pSource;
         break;
     case typelib_TypeClass_ANY:
-        OSL_ENSURE( 0, "### unexpected nested any!" );
+        OSL_FAIL( "### unexpected nested any!" );
         break;
     case typelib_TypeClass_ENUM:
         pDestAny->pData = &pDestAny->pReserved;
@@ -728,7 +729,7 @@ inline uno_Sequence * icopyConstructSequence(
                 break;
             }
             default:
-                OSL_ENSURE( 0, "### unexepcted sequence element type!" );
+                OSL_FAIL( "### unexepcted sequence element type!" );
                 pDest = 0;
                 break;
             }
@@ -884,3 +885,5 @@ inline void _copyConstructData(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index bb2869ca037f..19da7a87fbc1 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,7 +109,7 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p
 #if OSL_DEBUG_LEVEL > 1
         OUStringBuffer buf( 128 );
         buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("### exception occured querying for interface ") );
+            RTL_CONSTASCII_STRINGPARAM("### exception occurred querying for interface ") );
         buf.append( * reinterpret_cast< OUString const * >( &pDestType->pTypeName ) );
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(": [") );
         buf.append( * reinterpret_cast< OUString const * >( &pExc->pType->pTypeName ) );
@@ -117,7 +118,7 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p
         buf.append( * reinterpret_cast< OUString const * >( pExc->pData ) );
         OString cstr(
             OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, cstr.getStr() );
+        OSL_FAIL( cstr.getStr() );
 #endif
         uno_any_destruct( pExc, 0 );
     }
@@ -276,7 +277,7 @@ sal_Bool SAL_CALL uno_type_equalData(
 {
     return _equalData(
         pVal1, pVal1Type, 0,
-        pVal2, pVal2Type, 0,
+        pVal2, pVal2Type,
         queryInterface, release );
 }
 //##################################################################################################
@@ -288,7 +289,7 @@ sal_Bool SAL_CALL uno_equalData(
 {
     return _equalData(
         pVal1, pVal1TD->pWeakRef, pVal1TD,
-        pVal2, pVal2TD->pWeakRef, pVal2TD,
+        pVal2, pVal2TD->pWeakRef,
         queryInterface, release );
 }
 //##################################################################################################
@@ -355,12 +356,11 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#pragma pack(push, 4)
 #endif
 
 #if defined(INTEL) \
-    && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2)) || defined(MACOSX) \
+    && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) \
+        || defined(NETBSD) || defined(OPENBSD)) || defined(MACOSX) || defined(DRAGONFLY) \
         || defined(__SUNPRO_CC) && defined(SOLARIS))
 #define MAX_ALIGNMENT_4
 #endif
@@ -372,20 +372,8 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
 #define BINTEST_VERIFYOFFSET( s, m, n ) \
     if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", "  #m ") = %" SAL_PRI_SIZET "u instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); }
 
-#if OSL_DEBUG_LEVEL > 1
-#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC) || defined(X86_64) || defined(S390))
-#define BINTEST_VERIFYSIZE( s, n ) \
-    fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \
-    if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); }
-#else // ! GNUC
-#define BINTEST_VERIFYSIZE( s, n ) \
-    fprintf( stderr, "> sizeof(" #s ") = %d\n", sizeof(s) ); \
-    if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); }
-#endif
-#else // ! OSL_DEBUG_LEVEL
 #define BINTEST_VERIFYSIZE( s, n ) \
     if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); }
-#endif
 
 struct C1
 {
@@ -607,8 +595,6 @@ BinaryCompatible_Impl::BinaryCompatible_Impl()
 
 #ifdef SAL_W32
 #   pragma pack(pop)
-#elif defined(SAL_OS2)
-#   pragma pack()
 #endif
 
 static BinaryCompatible_Impl aTest;
@@ -616,3 +602,5 @@ static BinaryCompatible_Impl aTest;
 #endif
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx
index 8f156038ade5..92da095f1ac1 100644
--- a/cppu/source/uno/destr.hxx
+++ b/cppu/source/uno/destr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -146,12 +147,12 @@ inline void _destructAny(
             (typelib_TypeDescriptionReference *)pAny->pReserved );
         break;
     case typelib_TypeClass_ANY:
-        OSL_ENSURE( sal_False, "### unexpected nested any!" );
+        OSL_FAIL( "### unexpected nested any!" );
         ::uno_any_destruct( (uno_Any *)pAny->pData, release );
         ::rtl_freeMemory( pAny->pData );
         break;
     case typelib_TypeClass_TYPEDEF:
-        OSL_ENSURE( 0, "### unexpected typedef!" );
+        OSL_FAIL( "### unexpected typedef!" );
         break;
     case typelib_TypeClass_STRUCT:
     case typelib_TypeClass_EXCEPTION:
@@ -380,7 +381,7 @@ inline void _destructData(
         _destructAny( (uno_Any *)pValue, release );
         break;
     case typelib_TypeClass_TYPEDEF:
-        OSL_ENSURE( 0, "### unexpected typedef!" );
+        OSL_FAIL( "### unexpected typedef!" );
         break;
     case typelib_TypeClass_STRUCT:
     case typelib_TypeClass_EXCEPTION:
@@ -436,3 +437,5 @@ inline void _destructData(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/env_subst.cxx b/cppu/source/uno/env_subst.cxx
index 4465a9e1815e..6d75a35b662b 100644
--- a/cppu/source/uno/env_subst.cxx
+++ b/cppu/source/uno/env_subst.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,5 @@ void SAL_CALL uno_getEnvironment(uno_Environment ** ppEnv,
 
     uno_direct_getEnvironment(ppEnv, envDcp.pData, pContext);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/env_subst.hxx b/cppu/source/uno/env_subst.hxx
index 8ee8631ced84..b0118a532403 100644
--- a/cppu/source/uno/env_subst.hxx
+++ b/cppu/source/uno/env_subst.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@ extern "C" void SAL_CALL uno_direct_getEnvironment(uno_Environment ** ppEnv,
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx
index 45bc0e79cfaa..fef81033cfa5 100644
--- a/cppu/source/uno/eq.hxx
+++ b/cppu/source/uno/eq.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -302,7 +303,7 @@ inline sal_Bool _equalData(
     void * pDest,
     typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr,
     void * pSource,
-    typelib_TypeDescriptionReference * pSourceType, typelib_TypeDescription * pSourceTypeDescr,
+    typelib_TypeDescriptionReference * pSourceType,
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
     SAL_THROW( () )
 {
@@ -315,7 +316,6 @@ inline sal_Bool _equalData(
     }
     while (typelib_TypeClass_ANY == (eSourceTypeClass = pSourceType->eTypeClass))
     {
-        pSourceTypeDescr = 0;
         pSourceType = ((uno_Any *)pSource)->pType;
         pSource = ((uno_Any *)pSource)->pData;
     }
@@ -666,3 +666,5 @@ inline sal_Bool _equalData(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index f9e382d7e7a5..651e6862fba7 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,7 +51,7 @@
 #include "destr.hxx"
 #include "loadmodule.hxx"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <vector>
 #include <stdio.h>
 
@@ -119,16 +120,16 @@ struct FctOUStringHash :
 };
 
 // mapping from environment name to environment
-typedef ::std::hash_map<
+typedef ::boost::unordered_map<
     OUString, uno_Environment *, FctOUStringHash,
     ::std::equal_to< OUString > > OUString2EnvironmentMap;
 
 // mapping from ptr to object entry
-typedef ::std::hash_map<
+typedef ::boost::unordered_map<
     void *, ObjectEntry *, FctPtrHash,
     ::std::equal_to< void * > > Ptr2ObjectMap;
 // mapping from oid to object entry
-typedef ::std::hash_map<
+typedef ::boost::unordered_map<
     OUString, ObjectEntry *, FctOUStringHash,
     ::std::equal_to< OUString > > OId2ObjectMap;
 
@@ -269,7 +270,7 @@ static void SAL_CALL defenv_registerInterface(
 
     // try to insert dummy 0:
     std::pair<OId2ObjectMap::iterator, bool> const insertion(
-        that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, 0 ) ) );
+        that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, (ObjectEntry*)0 ) ) );
     if (insertion.second)
     {
         ObjectEntry * pOEntry = new ObjectEntry( rOId );
@@ -317,7 +318,7 @@ static void SAL_CALL defenv_registerProxyInterface(
 
     // try to insert dummy 0:
     std::pair<OId2ObjectMap::iterator, bool> const insertion(
-        that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, 0 ) ) );
+        that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, (ObjectEntry*)0 ) ) );
     if (insertion.second)
     {
         ObjectEntry * pOEntry = new ObjectEntry( rOId );
@@ -686,8 +687,7 @@ static void writeLine(
                     }
                     else
                     {
-                        OSL_TRACE( pLine );
-                        OSL_TRACE( "\n" );
+                        OSL_TRACE( "%s\n", pLine );
                     }
                 }
             }
@@ -825,14 +825,14 @@ extern "C" void SAL_CALL uno_dumpEnvironmentByName(
     }
 }
 
-//------------------------------------------------------------------------------
-inline static const OUString & unoenv_getStaticOIdPart()
+namespace
 {
-    static OUString * s_pStaticOidPart = 0;
-    if (! s_pStaticOidPart)
+    class makeOIdPart
     {
-        ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() );
-        if (! s_pStaticOidPart)
+    private:
+        OUString m_sOidPart;
+    public:
+        makeOIdPart()
         {
             ::rtl::OUStringBuffer aRet( 64 );
             aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM("];") );
@@ -856,11 +856,18 @@ inline static const OUString & unoenv_getStaticOIdPart()
             for ( sal_Int32 i = 0; i < 16; ++i )
                 aRet.append( (sal_Int32)ar[i], 16 );
 
-            static OUString s_aStaticOidPart( aRet.makeStringAndClear() );
-            s_pStaticOidPart = &s_aStaticOidPart;
+            m_sOidPart = aRet.makeStringAndClear();
         }
-    }
-    return *s_pStaticOidPart;
+        const OUString& getOIdPart() const { return m_sOidPart; }
+    };
+
+    class theStaticOIdPart : public rtl::Static<makeOIdPart, theStaticOIdPart> {};
+}
+
+//------------------------------------------------------------------------------
+inline static const OUString & unoenv_getStaticOIdPart()
+{
+    return theStaticOIdPart::get().getOIdPart();
 }
 
 extern "C"
@@ -1185,3 +1192,4 @@ void SAL_CALL uno_getRegisteredEnvironments(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index d2c4a6f60641..0d3664c1a3da 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 #include "IdentityMapping.hxx"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <set>
 #include <algorithm>
 
@@ -56,9 +57,11 @@
 
 using namespace std;
 using namespace osl;
-using namespace rtl;
 using namespace com::sun::star::uno;
-
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 
 namespace cppu
 {
@@ -68,7 +71,7 @@ class Mapping
     uno_Mapping * _pMapping;
 
 public:
-    inline Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW( () );
+    inline explicit Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW( () );
     inline Mapping( const Mapping & rMapping ) SAL_THROW( () );
     inline ~Mapping() SAL_THROW( () );
     inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping ) SAL_THROW( () );
@@ -129,21 +132,21 @@ struct MappingEntry
         {}
 };
 //--------------------------------------------------------------------------------------------------
-struct FctOUStringHash : public unary_function< const OUString &, size_t >
+struct FctOUStringHash : public std::unary_function< const OUString &, size_t >
 {
     size_t operator()( const OUString & rKey ) const SAL_THROW( () )
         { return (size_t)rKey.hashCode(); }
 };
 //--------------------------------------------------------------------------------------------------
-struct FctPtrHash : public unary_function< uno_Mapping *, size_t >
+struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t >
 {
     size_t operator()( uno_Mapping * pKey ) const SAL_THROW( () )
         { return (size_t)pKey; }
 };
 
-typedef hash_map<
+typedef boost::unordered_map<
     OUString, MappingEntry *, FctOUStringHash, equal_to< OUString > > t_OUString2Entry;
-typedef hash_map<
+typedef boost::unordered_map<
     uno_Mapping *, MappingEntry *, FctPtrHash, equal_to< uno_Mapping * > > t_Mapping2Entry;
 
 typedef set< uno_getMappingFunc > t_CallbackSet;
@@ -690,3 +693,4 @@ void SAL_CALL uno_revokeMappingCallback(
 }
 } // extern "C"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx
index e6858d247f04..ecc3ad9ce656 100644
--- a/cppu/source/uno/loadmodule.cxx
+++ b/cppu/source/uno/loadmodule.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,6 +41,9 @@
 namespace cppu { namespace detail {
 
 ::oslModule loadModule(rtl::OUString const & name) {
+#ifdef IOS
+    return NULL;
+#else
     rtl::OUStringBuffer b;
 #if defined SAL_DLLPREFIX
     b.appendAscii(RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX));
@@ -50,6 +54,9 @@ namespace cppu { namespace detail {
         reinterpret_cast< oslGenericFunction >(&loadModule),
         b.makeStringAndClear().pData,
         SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY);
+#endif
 }
 
 } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx
index 77a9bb8d6dc0..fc3ec6dbbbe3 100644
--- a/cppu/source/uno/loadmodule.hxx
+++ b/cppu/source/uno/loadmodule.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ namespace cppu { namespace detail {
 } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx
index 4acafd125d55..81f6f3148173 100644
--- a/cppu/source/uno/prim.hxx
+++ b/cppu/source/uno/prim.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,22 +29,16 @@
 #define PRIM_HXX
 
 #include "typelib/typedescription.h"
-#ifndef _typelib_TypeClass_H_
 #include "typelib/typeclass.h"
-#endif
 #include "uno/sequence2.h"
 #include "uno/any2.h"
 #include "uno/data.h"
 #include "uno/mapping.h"
 #include "uno/dispatcher.h"
 
-#ifndef _OSL_INTERLCK_H
 #include "osl/interlck.h"
-#endif
 #include "osl/diagnose.h"
-#ifndef _RTL_USTRING_HXX
 #include "rtl/ustring.hxx"
-#endif
 #include "rtl/alloc.h"
 
 #if OSL_DEBUG_LEVEL > 1
@@ -204,3 +199,5 @@ inline sal_Bool _type_equals(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 933d38fc6b4f..6374c773cb86 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -350,7 +351,7 @@ static inline bool idefaultConstructElements(
         }
         break;
     default:
-        OSL_ENSURE( 0, "### unexpected element type!" );
+        OSL_FAIL( "### unexpected element type!" );
         pSeq = 0;
         break;
     }
@@ -664,7 +665,7 @@ static inline bool icopyConstructFromElements(
         break;
     }
     default:
-        OSL_ENSURE( 0, "### unexpected element type!" );
+        OSL_FAIL( "### unexpected element type!" );
         pSeq = 0;
         break;
     }
@@ -1014,3 +1015,5 @@ void SAL_CALL uno_type_sequence_assign(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk
index f013516480fc..8c6d6944e0ad 100644
--- a/cppu/util/extra.mk
+++ b/cppu/util/extra.mk
@@ -44,13 +44,7 @@ SHL3TARGET  := unsafe_uno_uno
 SHL3IMPLIB  := i$(SHL3TARGET)
 SHL3STDLIBS := $(purpenv_helper_LIB) $(SALLIB) 
 SHL3OBJS    := $(SLO)$/UnsafeBridge.obj
-.IF "$(GUI)"=="OS2"
-SHL3VERSIONMAP=unsafe_os2.map
-SHL3DEF=$(MISC)$/$(SHL3TARGET).def
-DEF3NAME=$(SHL3TARGET)
-.ELSE
 SHL3DEF     := empty.def
-.ENDIF
 SHL3OBJS    := $(SLO)$/UnsafeBridge.obj
 SHL3RPATH   := URELIB
 
@@ -58,13 +52,7 @@ SHL4TARGET  := affine_uno_uno
 SHL4IMPLIB  := i$(SHL4TARGET)
 SHL4STDLIBS := $(purpenv_helper_LIB) $(SALLIB) 
 SHL4OBJS    := $(SLO)$/AffineBridge.obj
-.IF "$(GUI)"=="OS2"
-SHL4VERSIONMAP=unsafe_os2.map
-SHL4DEF=$(MISC)$/$(SHL4TARGET).def
-DEF4NAME=$(SHL4TARGET)
-.ELSE
 SHL4DEF     := empty.def
-.ENDIF
 SHL4OBJS    := $(SLO)$/AffineBridge.obj
 SHL4RPATH   := URELIB
 
@@ -74,13 +62,7 @@ SHL5IMPLIB  := i$(SHL5TARGET)
 SHL5STDLIBS := $(purpenv_helper_LIB) $(SALLIB) $(CPPULIB)
 SHL5OBJS    := $(SLO)$/LogBridge.obj
                 
-.IF "$(GUI)"=="OS2"
-SHL5VERSIONMAP=unsafe_os2.map
-SHL5DEF=$(MISC)$/$(SHL5TARGET).def
-DEF5NAME=LogMapping.def
-.ELSE
 SHL5DEF     := empty.def
-.ENDIF
 SHL5RPATH   := URELIB
 
 # --- Targets ------------------------------------------------------
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk
index 2e52c28b5193..f8ae76e8dd7a 100644
--- a/cppu/util/makefile.mk
+++ b/cppu/util/makefile.mk
@@ -50,7 +50,7 @@ SHL1LIBS= \
     $(SLB)$/cppu_threadpool.lib	\
     $(SLB)$/cppu_cppu.lib
 
-.IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)" == "WNT"
 SHL1TARGET=$(TARGET)$(UDK_MAJOR)
 .ELSE
 SHL1TARGET= uno_$(TARGET)
@@ -60,7 +60,7 @@ SHL1STDLIBS = $(SALLIB)
 
 SHL1DEPN=
 SHL1IMPLIB=i$(TARGET)
-.IF "$(OS)"!="FREEBSD"
+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 .ENDIF
 
@@ -74,8 +74,8 @@ SHL2TARGET  := $(NAMEpurpenv_helper)
 DEF2NAME    := $(SHL2TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
 SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map
-.ELIF "$(GUI)"=="OS2"
-SHL2VERSIONMAP:=uno_purpenvhelperwntgcc.map
+.ELIF "$(COMNAME)"=="mscx"
+SHL2VERSIONMAP:=$(SHL2TARGET)X.map
 .ELSE
 SHL2VERSIONMAP:=$(SHL2TARGET).map
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -87,19 +87,10 @@ SHL2OBJS    := \
     $(SLO)$/helper_purpenv_Environment.obj 	\
     $(SLO)$/helper_purpenv_Mapping.obj      \
     $(SLO)$/helper_purpenv_Proxy.obj
-
+SHL2DEPN=$(SHL1TARGETN)
 
 # --- Targets ------------------------------------------------------
-
-.PHONY: ALLTAR
-
-
-ALLTAR:   $(SHL2TARGETN)
-    $(MAKE) $(MAKECMDGOALS) -f extra.mk
-
-
 .INCLUDE :	target.mk
 
-
-$(SHL2TARGETN): $(SHL1TARGETN)
-
+ALLTAR:
+	$(MAKE) $(MAKECMDGOALS) -f extra.mk
diff --git a/cppu/util/makefile.pmk b/cppu/util/makefile.pmk
index c1259ddf4a10..95e83db6dc07 100644
--- a/cppu/util/makefile.pmk
+++ b/cppu/util/makefile.pmk
@@ -26,7 +26,3 @@
 #*************************************************************************
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
-
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
diff --git a/cppu/util/purpenvhelper3MSCX.map b/cppu/util/purpenvhelper3MSCX.map
new file mode 100644
index 000000000000..22485191c805
--- /dev/null
+++ b/cppu/util/purpenvhelper3MSCX.map
@@ -0,0 +1,8 @@
+UDK_3_0_0 {
+    global:
+        ?Environment_initWithEnterable@purpenv@helper@cppu@@YAXPEAU_uno_Environment@@PEAVEnterable@3@@Z;
+        ?createMapping@purpenv@helper@cppu@@YAXPEAPEAU_uno_Mapping@@PEAU_uno_Environment@@1P6AX_NPEAX3PEAU_typelib_TypeDescriptionReference@@PEAU_typelib_MethodParameter@@JPEBU_typelib_TypeDescription@@3QEAPEAXPEAPEAU_uno_Any@@@Z3@Z;
+
+    local:
+        *;
+};
diff --git a/cppu/util/target.pmk b/cppu/util/target.pmk
index 3befcb154753..a94ea7c8dafe 100644
--- a/cppu/util/target.pmk
+++ b/cppu/util/target.pmk
@@ -51,3 +51,7 @@ CFLAGS += -Ob0
 .ENDIF
 
 .ENDIF
+
+.IF "$(COM)$(CPU)" == "MSCX"
+CFLAGS += -DCPPU_LEAK_STATIC_DATA
+.ENDIF
diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/cppuhelper/inc/cppuhelper/access_control.hxx
index 92de0499e964..7b177c9e8ea4 100755..100644
--- a/cppuhelper/inc/cppuhelper/access_control.hxx
+++ b/cppuhelper/inc/cppuhelper/access_control.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,5 @@ public:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/basemutex.hxx b/cppuhelper/inc/cppuhelper/basemutex.hxx
index e07a41aa1f71..f145709095fb 100644
--- a/cppuhelper/inc/cppuhelper/basemutex.hxx
+++ b/cppuhelper/inc/cppuhelper/basemutex.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,5 @@ namespace cppu
     };
 }
 #endif // _CPPUHELPER_BASEMUTEX_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/bootstrap.hxx b/cppuhelper/inc/cppuhelper/bootstrap.hxx
index 0101214af3fc..253d3fa53b40 100644
--- a/cppuhelper/inc/cppuhelper/bootstrap.hxx
+++ b/cppuhelper/inc/cppuhelper/bootstrap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -221,3 +222,5 @@ SAL_CALL bootstrap_expandUri(::rtl::OUString const & uri);
 } // end namespace cppu
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase.hxx b/cppuhelper/inc/cppuhelper/compbase.hxx
index 91a53a7cdcf2..5827c630da23 100644
--- a/cppuhelper/inc/cppuhelper/compbase.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -113,3 +114,5 @@ __DEF_COMPIMPLHELPER_B( N ) \
 __DEF_COMPIMPLHELPER_C( N )
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase1.hxx b/cppuhelper/inc/cppuhelper/compbase1.hxx
index 24037d98d58a..ea657298d093 100644
--- a/cppuhelper/inc/cppuhelper/compbase1.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase1.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,39 @@ namespace cppu
 #pragma enable_warn
 #endif
 
+    /** Same as WeakComponentImplHelper1, except doesn't implement
+        addEventListener, removeEventListener and dispose.
+
+        This requires derived classes to implement those three methods.
+        This makes it possible to implement classes which are required to
+        implement methods from multiple bases which have different
+        addEventListener/removeEventListener signatures without triggering
+        the g++ overloaded-virtual warning
+    */
+    template< class Ifc1 >
+    class SAL_NO_VTABLE PartialWeakComponentImplHelper1
+        : public WeakComponentImplHelperBase
+        , public ::com::sun::star::lang::XTypeProvider
+        , public Ifc1
+    {
+        /** @internal */
+        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, PartialWeakComponentImplHelper1< Ifc1 > > > {};
+    public:
+        inline PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
+            : WeakComponentImplHelperBase( rMutex )
+            {}
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
+        virtual void SAL_CALL acquire() throw ()
+            { WeakComponentImplHelperBase::acquire(); }
+        virtual void SAL_CALL release() throw ()
+            { WeakComponentImplHelperBase::release(); }
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_getTypes( cd::get() ); }
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+            { return ImplHelper_getImplementationId( cd::get() ); }
+    };
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -135,3 +169,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase10.hxx b/cppuhelper/inc/cppuhelper/compbase10.hxx
index c55c7a46c12b..ea7c2733677e 100644
--- a/cppuhelper/inc/cppuhelper/compbase10.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase10.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,39 @@ namespace cppu
 #pragma enable_warn
 #endif
 
+    /** Same as WeakComponentImplHelper10, except doesn't implement
+        addEventListener, removeEventListener and dispose.
+
+        This requires derived classes to implement those three methods.
+        This makes it possible to implement classes which are required to
+        implement methods from multiple bases which have different
+        addEventListener/removeEventListener signatures without triggering
+        the g++ overloaded-virtual warning
+    */
+    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
+    class SAL_NO_VTABLE PartialWeakComponentImplHelper10
+        : public WeakComponentImplHelperBase
+        , public ::com::sun::star::lang::XTypeProvider
+        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
+    {
+        /** @internal */
+        struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, PartialWeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
+    public:
+        inline PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
+            : WeakComponentImplHelperBase( rMutex )
+            {}
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
+        virtual void SAL_CALL acquire() throw ()
+            { WeakComponentImplHelperBase::acquire(); }
+        virtual void SAL_CALL release() throw ()
+            { WeakComponentImplHelperBase::release(); }
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_getTypes( cd::get() ); }
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+            { return ImplHelper_getImplementationId( cd::get() ); }
+    };
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -135,3 +169,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase11.hxx b/cppuhelper/inc/cppuhelper/compbase11.hxx
index d2f3a7a68d63..6f7c383a3045 100644
--- a/cppuhelper/inc/cppuhelper/compbase11.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase11.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,39 @@ namespace cppu
 #pragma enable_warn
 #endif
 
+    /** Same as WeakComponentImplHelper11, except doesn't implement
+        addEventListener, removeEventListener and dispose.
+
+        This requires derived classes to implement those three methods.
+        This makes it possible to implement classes which are required to
+        implement methods from multiple bases which have different
+        addEventListener/removeEventListener signatures without triggering
+        the g++ overloaded-virtual warning
+    */
+    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
+    class SAL_NO_VTABLE PartialWeakComponentImplHelper11
+        : public WeakComponentImplHelperBase
+        , public ::com::sun::star::lang::XTypeProvider
+        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
+    {
+        /** @internal */
+        struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, PartialWeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
+    public:
+        inline PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
+            : WeakComponentImplHelperBase( rMutex )
+            {}
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
+        virtual void SAL_CALL acquire() throw ()
+            { WeakComponentImplHelperBase::acquire(); }
+        virtual void SAL_CALL release() throw ()
+            { WeakComponentImplHelperBase::release(); }
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_getTypes( cd::get() ); }
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+            { return ImplHelper_getImplementationId( cd::get() ); }
+    };
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -135,3 +169,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase12.hxx b/cppuhelper/inc/cppuhelper/compbase12.hxx
index 50b02ba748f3..c965a7ae59b9 100644
--- a/cppuhelper/inc/cppuhelper/compbase12.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase12.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,39 @@ namespace cppu
 #pragma enable_warn
 #endif
 
+    /** Same as WeakComponentImplHelper12, except doesn't implement
+        addEventListener, removeEventListener and dispose.
+
+        This requires derived classes to implement those three methods.
+        This makes it possible to implement classes which are required to
+        implement methods from multiple bases which have different
+        addEventListener/removeEventListener signatures without triggering
+        the g++ overloaded-virtual warning
+    */
+    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
+    class SAL_NO_VTABLE PartialWeakComponentImplHelper12
+        : public WeakComponentImplHelperBase
+        , public ::com::sun::star::lang::XTypeProvider
+        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
+    {
+        /** @internal */
+        struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, PartialWeakComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
+    public:
+        inline PartialWeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
+            : WeakComponentImplHelperBase( rMutex )
+            {}
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
+        virtual void SAL_CALL acquire() throw ()
+            { WeakComponentImplHelperBase::acquire(); }
+        virtual void SAL_CALL release() throw ()
+            { WeakComponentImplHelperBase::release(); }
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_getTypes( cd::get() ); }
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+            { return ImplHelper_getImplementationId( cd::get() ); }
+    };
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -135,3 +169,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase2.hxx b/cppuhelper/inc/cppuhelper/compbase2.hxx
index 2c8adf8864bf..ea755ca448ee 100644
--- a/cppuhelper/inc/cppuhelper/compbase2.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase2.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,40 @@ namespace cppu
 #pragma enable_warn
 #endif
 
+    /** Same as WeakComponentImplHelper2, except doesn't implement
+        addEventListener, removeEventListener and dispose.
+
+        This requires derived classes to implement those three methods.
+        This makes it possible to implement classes which are required to
+        implement methods from multiple bases which have different
+        addEventListener/removeEventListener signatures without triggering
+        the g++ overloaded-virtual warning
+    */
+    template< class Ifc1, class Ifc2 >
+    class SAL_NO_VTABLE PartialWeakComponentImplHelper2
+        : public WeakComponentImplHelperBase
+        , public ::com::sun::star::lang::XTypeProvider
+        , public Ifc1, public Ifc2
+    {
+        /** @internal */
+        struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, PartialWeakComponentImplHelper2<Ifc1, Ifc2> > > {};
+    public:
+        inline PartialWeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
+            : WeakComponentImplHelperBase( rMutex )
+            {}
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
+        virtual void SAL_CALL acquire() throw ()
+            { WeakComponentImplHelperBase::acquire(); }
+        virtual void SAL_CALL release() throw ()
+            { WeakComponentImplHelperBase::release(); }
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_getTypes( cd::get() ); }
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+            { return ImplHelper_getImplementationId( cd::get() ); }
+    };
+
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -135,3 +170,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase3.hxx b/cppuhelper/inc/cppuhelper/compbase3.hxx
index c9958e8d14b9..425101f1c1eb 100644
--- a/cppuhelper/inc/cppuhelper/compbase3.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase3.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,39 @@ namespace cppu
 #pragma enable_warn
 #endif
 
+    /** Same as WeakComponentImplHelper3, except doesn't implement
+        addEventListener, removeEventListener and dispose.
+
+        This requires derived classes to implement those three methods.
+        This makes it possible to implement classes which are required to
+        implement methods from multiple bases which have different
+        addEventListener/removeEventListener signatures without triggering
+        the g++ overloaded-virtual warning
+    */
+    template< class Ifc1, class Ifc2, class Ifc3 >
+    class SAL_NO_VTABLE PartialWeakComponentImplHelper3
+        : public WeakComponentImplHelperBase
+        , public ::com::sun::star::lang::XTypeProvider
+        , public Ifc1, public Ifc2, public Ifc3
+    {
+        /** @internal */
+        struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, PartialWeakComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
+    public:
+        inline PartialWeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
+            : WeakComponentImplHelperBase( rMutex )
+            {}
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
+        virtual void SAL_CALL acquire() throw ()
+            { WeakComponentImplHelperBase::acquire(); }
+        virtual void SAL_CALL release() throw ()
+            { WeakComponentImplHelperBase::release(); }
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_getTypes( cd::get() ); }
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+            { return ImplHelper_getImplementationId( cd::get() ); }
+    };
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -135,3 +169,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase4.hxx b/cppuhelper/inc/cppuhelper/compbase4.hxx
index be6257cd0823..438f041b986b 100644
--- a/cppuhelper/inc/cppuhelper/compbase4.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase4.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,39 @@ namespace cppu
 #pragma enable_warn
 #endif
 
+    /** Same as WeakComponentImplHelper4, except doesn't implement
+        addEventListener, removeEventListener and dispose.
+
+        This requires derived classes to implement those three methods.
+        This makes it possible to implement classes which are required to
+        implement methods from multiple bases which have different
+        addEventListener/removeEventListener signatures without triggering
+        the g++ overloaded-virtual warning
+    */
+    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 >
+    class SAL_NO_VTABLE PartialWeakComponentImplHelper4
+        : public WeakComponentImplHelperBase
+        , public ::com::sun::star::lang::XTypeProvider
+        , public Ifc1, public Ifc2, public Ifc3, public Ifc4
+    {
+        /** @internal */
+        struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, PartialWeakComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
+    public:
+        inline PartialWeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
+            : WeakComponentImplHelperBase( rMutex )
+            {}
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
+        virtual void SAL_CALL acquire() throw ()
+            { WeakComponentImplHelperBase::acquire(); }
+        virtual void SAL_CALL release() throw ()
+            { WeakComponentImplHelperBase::release(); }
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_getTypes( cd::get() ); }
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+            { return ImplHelper_getImplementationId( cd::get() ); }
+    };
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -135,3 +169,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase5.hxx b/cppuhelper/inc/cppuhelper/compbase5.hxx
index 26d6af679922..a010253d6811 100644
--- a/cppuhelper/inc/cppuhelper/compbase5.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase5.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,39 @@ namespace cppu
 #pragma enable_warn
 #endif
 
+    /** Same as WeakComponentImplHelper5, except doesn't implement
+        addEventListener, removeEventListener and dispose.
+
+        This requires derived classes to implement those three methods.
+        This makes it possible to implement classes which are required to
+        implement methods from multiple bases which have different
+        addEventListener/removeEventListener signatures without triggering
+        the g++ overloaded-virtual warning
+    */
+    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 >
+    class SAL_NO_VTABLE PartialWeakComponentImplHelper5
+        : public WeakComponentImplHelperBase
+        , public ::com::sun::star::lang::XTypeProvider
+        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
+    {
+        /** @internal */
+        struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, PartialWeakComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
+    public:
+        inline PartialWeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
+            : WeakComponentImplHelperBase( rMutex )
+            {}
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
+        virtual void SAL_CALL acquire() throw ()
+            { WeakComponentImplHelperBase::acquire(); }
+        virtual void SAL_CALL release() throw ()
+            { WeakComponentImplHelperBase::release(); }
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_getTypes( cd::get() ); }
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+            { return ImplHelper_getImplementationId( cd::get() ); }
+    };
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -135,3 +169,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase6.hxx b/cppuhelper/inc/cppuhelper/compbase6.hxx
index b5b709495cb0..ee168e0374eb 100644
--- a/cppuhelper/inc/cppuhelper/compbase6.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase6.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,39 @@ namespace cppu
 #pragma enable_warn
 #endif
 
+    /** Same as WeakComponentImplHelper6, except doesn't implement
+        addEventListener, removeEventListener and dispose.
+
+        This requires derived classes to implement those three methods.
+        This makes it possible to implement classes which are required to
+        implement methods from multiple bases which have different
+        addEventListener/removeEventListener signatures without triggering
+        the g++ overloaded-virtual warning
+    */
+    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 >
+    class SAL_NO_VTABLE PartialWeakComponentImplHelper6
+        : public WeakComponentImplHelperBase
+        , public ::com::sun::star::lang::XTypeProvider
+        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
+    {
+        /** @internal */
+        struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, PartialWeakComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
+    public:
+        inline PartialWeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
+            : WeakComponentImplHelperBase( rMutex )
+            {}
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
+        virtual void SAL_CALL acquire() throw ()
+            { WeakComponentImplHelperBase::acquire(); }
+        virtual void SAL_CALL release() throw ()
+            { WeakComponentImplHelperBase::release(); }
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_getTypes( cd::get() ); }
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+            { return ImplHelper_getImplementationId( cd::get() ); }
+    };
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -135,3 +169,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase7.hxx b/cppuhelper/inc/cppuhelper/compbase7.hxx
index dd9ffcdb059f..f7ef3e143a3c 100644
--- a/cppuhelper/inc/cppuhelper/compbase7.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase7.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,39 @@ namespace cppu
 #pragma enable_warn
 #endif
 
+    /** Same as WeakComponentImplHelper7, except doesn't implement
+        addEventListener, removeEventListener and dispose.
+
+        This requires derived classes to implement those three methods.
+        This makes it possible to implement classes which are required to
+        implement methods from multiple bases which have different
+        addEventListener/removeEventListener signatures without triggering
+        the g++ overloaded-virtual warning
+    */
+    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 >
+    class SAL_NO_VTABLE PartialWeakComponentImplHelper7
+        : public WeakComponentImplHelperBase
+        , public ::com::sun::star::lang::XTypeProvider
+        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
+    {
+        /** @internal */
+        struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, PartialWeakComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
+    public:
+        inline PartialWeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
+            : WeakComponentImplHelperBase( rMutex )
+            {}
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
+        virtual void SAL_CALL acquire() throw ()
+            { WeakComponentImplHelperBase::acquire(); }
+        virtual void SAL_CALL release() throw ()
+            { WeakComponentImplHelperBase::release(); }
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_getTypes( cd::get() ); }
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+            { return ImplHelper_getImplementationId( cd::get() ); }
+    };
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -135,3 +169,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase8.hxx b/cppuhelper/inc/cppuhelper/compbase8.hxx
index c5e49796d9bf..aa7e6837c44b 100644
--- a/cppuhelper/inc/cppuhelper/compbase8.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase8.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,39 @@ namespace cppu
 #pragma enable_warn
 #endif
 
+    /** Same as WeakComponentImplHelper8, except doesn't implement
+        addEventListener, removeEventListener and dispose.
+
+        This requires derived classes to implement those three methods.
+        This makes it possible to implement classes which are required to
+        implement methods from multiple bases which have different
+        addEventListener/removeEventListener signatures without triggering
+        the g++ overloaded-virtual warning
+    */
+    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 >
+    class SAL_NO_VTABLE PartialWeakComponentImplHelper8
+        : public WeakComponentImplHelperBase
+        , public ::com::sun::star::lang::XTypeProvider
+        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
+    {
+        /** @internal */
+        struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, PartialWeakComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
+    public:
+        inline PartialWeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
+            : WeakComponentImplHelperBase( rMutex )
+            {}
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
+        virtual void SAL_CALL acquire() throw ()
+            { WeakComponentImplHelperBase::acquire(); }
+        virtual void SAL_CALL release() throw ()
+            { WeakComponentImplHelperBase::release(); }
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_getTypes( cd::get() ); }
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+            { return ImplHelper_getImplementationId( cd::get() ); }
+    };
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
 
@@ -135,3 +169,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase9.hxx b/cppuhelper/inc/cppuhelper/compbase9.hxx
index c943241f27e9..1e1660f33625 100644
--- a/cppuhelper/inc/cppuhelper/compbase9.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase9.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,39 @@ namespace cppu
 #pragma enable_warn
 #endif
 
+    /** Same as WeakComponentImplHelper9, except doesn't implement
+        addEventListener, removeEventListener and dispose.
+
+        This requires derived classes to implement those three methods.
+        This makes it possible to implement classes which are required to
+        implement methods from multiple bases which have different
+        addEventListener/removeEventListener signatures without triggering
+        the g++ overloaded-virtual warning
+    */
+    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 >
+    class SAL_NO_VTABLE PartialWeakComponentImplHelper9
+        : public WeakComponentImplHelperBase
+        , public ::com::sun::star::lang::XTypeProvider
+        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
+    {
+        /** @internal */
+        struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, PartialWeakComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
+    public:
+        inline PartialWeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
+            : WeakComponentImplHelperBase( rMutex )
+            {}
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
+        virtual void SAL_CALL acquire() throw ()
+            { WeakComponentImplHelperBase::acquire(); }
+        virtual void SAL_CALL release() throw ()
+            { WeakComponentImplHelperBase::release(); }
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
+            { return WeakComponentImplHelper_getTypes( cd::get() ); }
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
+            { return ImplHelper_getImplementationId( cd::get() ); }
+    };
+
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
         Upon disposing objects of this class, sub-classes receive a disposing()
@@ -134,3 +168,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase_ex.hxx b/cppuhelper/inc/cppuhelper/compbase_ex.hxx
index 130cd7fb5489..121927b3320c 100644
--- a/cppuhelper/inc/cppuhelper/compbase_ex.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase_ex.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,7 +46,7 @@ class SAL_NO_VTABLE WeakComponentImplHelperBase
     , public ::com::sun::star::lang::XComponent
 {
 protected:
-    /** boradcast helper for disposing events
+    /** broadcast helper for disposing events
     */
     ::cppu::OBroadcastHelper rBHelper;
 
@@ -174,3 +175,5 @@ public:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/cppuhelper/inc/cppuhelper/component.hxx
index 244e111510c5..76f74d402ab5 100644
--- a/cppuhelper/inc/cppuhelper/component.hxx
+++ b/cppuhelper/inc/cppuhelper/component.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
 #include <cppuhelper/weakagg.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
 #include <cppuhelper/implbase1.hxx>
-#endif
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
@@ -118,3 +117,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/component_context.hxx b/cppuhelper/inc/cppuhelper/component_context.hxx
index 34c26fe3dfeb..10ecc2a885c4 100644
--- a/cppuhelper/inc/cppuhelper/component_context.hxx
+++ b/cppuhelper/inc/cppuhelper/component_context.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ SAL_CALL createComponentContext(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/exc_hlp.hxx b/cppuhelper/inc/cppuhelper/exc_hlp.hxx
index 3de6c3bf64ef..5b07c05d9edc 100644
--- a/cppuhelper/inc/cppuhelper/exc_hlp.hxx
+++ b/cppuhelper/inc/cppuhelper/exc_hlp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,3 +97,4 @@ void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc )
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx
index 2f1afcab1726..9348fa0a52ba 100644
--- a/cppuhelper/inc/cppuhelper/factory.hxx
+++ b/cppuhelper/inc/cppuhelper/factory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -276,3 +277,5 @@ createOneInstanceFactory(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/findsofficepath.h b/cppuhelper/inc/cppuhelper/findsofficepath.h
index 1624762341d8..b1bbc50e3340 100644
--- a/cppuhelper/inc/cppuhelper/findsofficepath.h
+++ b/cppuhelper/inc/cppuhelper/findsofficepath.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,3 +44,5 @@ char const* cppuhelper_detail_findSofficePath(void);
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase.hxx b/cppuhelper/inc/cppuhelper/implbase.hxx
index 1620b1d1efdb..a6ba29d7d3e0 100644
--- a/cppuhelper/inc/cppuhelper/implbase.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,7 +44,7 @@ namespace cppu
 {
 
 /** Struct used for inline template implementation helpers: type entries.
-    Not for plublic use.
+    Not for public use.
     @internal
 */
 struct Type_Offset
@@ -56,7 +57,7 @@ struct Type_Offset
     typelib_InterfaceTypeDescription * pTD;
 };
 /** Struct used for inline template implementation helpers: class data of implementation.
-    Not for plublic use.
+    Not for public use.
     @internal
 */
 struct ClassDataBase
@@ -101,7 +102,7 @@ struct ClassDataBase
     There will be versions of this struct with varying arType2Offset[] array sizes, each of which
     is binary compatible with this one to be casted and used uniform. The size of the varying array
     is set in ClassDataBase::nType2Offset (base class).
-    Not for plublic use.
+    Not for public use.
     @internal
 */
 struct ClassData : public ClassDataBase
@@ -136,7 +137,7 @@ struct ClassData : public ClassDataBase
     */
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
         SAL_THROW( () );
-    /** Gets the class id of implemtation supporting com.sun.star.lang.XTypeProvider
+    /** Gets the class id of implementation supporting com.sun.star.lang.XTypeProvider
 
         @return class identifier (sequence< byte >)
     */
@@ -178,8 +179,8 @@ namespace cppu \
 struct ClassData##N : public ClassDataBase \
 { \
     Type_Offset arType2Offset[ N ]; \
-    ClassData##N( sal_Int32 nClassCode ) SAL_THROW( () ) \
-        : ClassDataBase( nClassCode ) \
+    ClassData##N( sal_Int32 nInClassCode ) SAL_THROW( () ) \
+        : ClassDataBase( nInClassCode ) \
         {} \
 }; \
 template< __CLASS_IFC##N > \
@@ -296,3 +297,4 @@ __DEF_IMPLHELPER_POST_B( N ) \
 __DEF_IMPLHELPER_POST_C( N )
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase1.hxx b/cppuhelper/inc/cppuhelper/implbase1.hxx
index bf42186f061e..6974c4c57507 100644
--- a/cppuhelper/inc/cppuhelper/implbase1.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase1.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,6 +91,10 @@ namespace cppu
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
+
+        These classes are used when you implement your UNO component.
+        WeakImplHelper1 till WeakImplHelper12 can be used when you want
+        to implement 1 till 12 interfaces in your component.
     */
     template< class Ifc1 >
     class SAL_NO_VTABLE WeakImplHelper1
@@ -293,3 +298,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase10.hxx b/cppuhelper/inc/cppuhelper/implbase10.hxx
index 2f060bcc63e4..972de4544fe9 100644
--- a/cppuhelper/inc/cppuhelper/implbase10.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase10.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -298,3 +299,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase11.hxx b/cppuhelper/inc/cppuhelper/implbase11.hxx
index b27c668194b6..49a1149b68fa 100644
--- a/cppuhelper/inc/cppuhelper/implbase11.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase11.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -299,3 +300,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase12.hxx b/cppuhelper/inc/cppuhelper/implbase12.hxx
index 8abf410dca62..0005abf07f3d 100644
--- a/cppuhelper/inc/cppuhelper/implbase12.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase12.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -300,3 +301,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase2.hxx b/cppuhelper/inc/cppuhelper/implbase2.hxx
index 9fbf2261d261..99282f6a0a16 100644
--- a/cppuhelper/inc/cppuhelper/implbase2.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase2.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -289,3 +290,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase3.hxx b/cppuhelper/inc/cppuhelper/implbase3.hxx
index 9748832ec258..1aad6ce7b940 100644
--- a/cppuhelper/inc/cppuhelper/implbase3.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase3.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -291,3 +292,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase4.hxx b/cppuhelper/inc/cppuhelper/implbase4.hxx
index 1952ccd31b1c..ad00b829ee88 100644
--- a/cppuhelper/inc/cppuhelper/implbase4.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase4.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -292,3 +293,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase5.hxx b/cppuhelper/inc/cppuhelper/implbase5.hxx
index 3d41b1b5a81c..8d4e216e0b00 100644
--- a/cppuhelper/inc/cppuhelper/implbase5.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase5.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -293,3 +294,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase6.hxx b/cppuhelper/inc/cppuhelper/implbase6.hxx
index 67295a4a6dc7..c545284145e6 100644
--- a/cppuhelper/inc/cppuhelper/implbase6.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase6.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -294,3 +295,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase7.hxx b/cppuhelper/inc/cppuhelper/implbase7.hxx
index bc82debf8e7c..9a254f40f731 100644
--- a/cppuhelper/inc/cppuhelper/implbase7.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase7.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -296,3 +297,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase8.hxx b/cppuhelper/inc/cppuhelper/implbase8.hxx
index 6e4800d1c08a..e817dc388e8a 100644
--- a/cppuhelper/inc/cppuhelper/implbase8.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase8.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -296,3 +297,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase9.hxx b/cppuhelper/inc/cppuhelper/implbase9.hxx
index cf8af96873f2..a070c71cab3e 100644
--- a/cppuhelper/inc/cppuhelper/implbase9.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase9.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -298,3 +299,5 @@ namespace cppu
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex.hxx b/cppuhelper/inc/cppuhelper/implbase_ex.hxx
index cf4b064e130c..267bdf6b04cc 100644
--- a/cppuhelper/inc/cppuhelper/implbase_ex.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase_ex.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -172,3 +173,5 @@ struct class_data
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx
index 70cc9c677b40..83849e5e6cab 100644
--- a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -229,3 +230,5 @@ __DEF_CLASS_DATA_INIT_EX( N, (WeakAggComponentImplHelper##N< __IFC##N > *) ); \
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx
index 49a188f4b68f..337fa1ecdc9a 100644
--- a/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,3 +35,5 @@
 #define __IFC_EX_TYPE_INIT( class_cast, N ) __IFC_EX_TYPE_INIT_NAME( class_cast, Ifc##N )
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implementationentry.hxx b/cppuhelper/inc/cppuhelper/implementationentry.hxx
index e432a6186482..2561811fba1b 100644
--- a/cppuhelper/inc/cppuhelper/implementationentry.hxx
+++ b/cppuhelper/inc/cppuhelper/implementationentry.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,8 +25,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _CPPUHELPER_IMPLEMENATIONENTRY_HXX_
-#define _CPPUHELPER_IMPLEMENATIONENTRY_HXX_
+#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
+#define _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 
 #include <cppuhelper/factory.hxx>
 
@@ -36,21 +37,21 @@ namespace cppu
  */
 struct ImplementationEntry
 {
-    /** Function, that creates an instance of the implemenation
+    /** Function that creates an instance of the implementation
      */
        ComponentFactoryFunc create;
 
-    /** Function, that returns the implemenation-name of the implemenation
+    /** Function that returns the implementation-name of the implementation
        (same as XServiceInfo.getImplementationName() ).
      */
      rtl::OUString ( SAL_CALL * getImplementationName )();
 
-    /** Function, that returns all supported servicenames of the implemenation
+    /** Function that returns all supported servicenames of the implementation
        ( same as XServiceInfo.getSupportedServiceNames() ).
     */
      com::sun::star::uno::Sequence< rtl::OUString > ( SAL_CALL * getSupportedServiceNames ) ();
 
-    /** Function, that creates a SingleComponentFactory.
+    /** Function that creates a SingleComponentFactory.
     */
      ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >
      ( SAL_CALL * createFactory )(
@@ -59,7 +60,7 @@ struct ImplementationEntry
          ::com::sun::star::uno::Sequence< ::rtl::OUString > const & rServiceNames,
          rtl_ModuleCount * pModCount );
 
-    /** The shared-library module-counter of the implemenation. Maybe 0. The module-counter
+    /** The shared-library module-counter of the implementation. Maybe 0. The module-counter
         is used during by the createFactory()-function.
     */
      rtl_ModuleCount * moduleCounter;
@@ -80,7 +81,7 @@ struct ImplementationEntry
                            This is a reference to the registry key, into which the implementation
                            data shall be written to.
     @param entries         Each element of the entries-array must contains a function pointer
-                           table for registering an implemenation. The end of the array
+                           table for registering an implementation. The end of the array
                            must be marked with a 0 entry in the create-function.
     @return sal_True, if all implementations could be registered, otherwise sal_False.
  */
@@ -111,3 +112,5 @@ void *component_getFactoryHelper(
 
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h
index ee57127a4fca..ae3c2adf1457 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.h
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -615,3 +616,4 @@ typedef OBroadcastHelperVar< OMultiTypeInterfaceContainerHelper , OMultiTypeInte
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
index 15f93640dc51..d9c347ecc0cf 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -157,7 +158,6 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::dispos
         {
             typedef OInterfaceContainerHelper* ppp;
             ppListenerContainers = new ppp[nSize];
-            //ppListenerContainers = new (ListenerContainer*)[nSize];
 
             typename InterfaceMap::iterator iter = m_pMap->begin();
             typename InterfaceMap::iterator end = m_pMap->end();
@@ -201,3 +201,4 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::clear(
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
index 743ea384a693..6ab242f111a0 100644
--- a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
+++ b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -486,3 +487,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx
index 82bbd2bdcdbe..89a2fa7dc72f 100644
--- a/cppuhelper/inc/cppuhelper/propshlp.hxx
+++ b/cppuhelper/inc/cppuhelper/propshlp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -202,7 +203,7 @@ protected:
 private:
     void init( sal_Bool bSorted ) SAL_THROW( () );
 
-    /** The sequence generstet from the pProperties array. */
+    /** The sequence generated from the pProperties array. */
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aInfos;
 
     /**
@@ -293,8 +294,8 @@ public:
         SAL_THROW( () );
 
     /**
-      Call disposing on all object in the container that
-      support XEventListener. Than clear the container.
+      Call disposing on all objects in the container that
+      support XEventListener. Then clear the container.
      */
     void    SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () );
     /**
@@ -671,3 +672,4 @@ public:
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/proptypehlp.h b/cppuhelper/inc/cppuhelper/proptypehlp.h
index 60cb7908a7b2..e36e9d897dee 100644
--- a/cppuhelper/inc/cppuhelper/proptypehlp.h
+++ b/cppuhelper/inc/cppuhelper/proptypehlp.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,3 +75,5 @@ inline void SAL_CALL convertPropertyValue( ::rtl::OUString &target  , const ::co
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/proptypehlp.hxx b/cppuhelper/inc/cppuhelper/proptypehlp.hxx
index 87fa8600a863..b1c50389dc83 100644
--- a/cppuhelper/inc/cppuhelper/proptypehlp.hxx
+++ b/cppuhelper/inc/cppuhelper/proptypehlp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -528,3 +529,4 @@ inline void SAL_CALL convertPropertyValue( ::rtl::OUString &ow , const ::com::su
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/queryinterface.hxx b/cppuhelper/inc/cppuhelper/queryinterface.hxx
index 2eb5e171e965..e67e9f9b9342 100644
--- a/cppuhelper/inc/cppuhelper/queryinterface.hxx
+++ b/cppuhelper/inc/cppuhelper/queryinterface.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -539,3 +540,4 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/servicefactory.hxx b/cppuhelper/inc/cppuhelper/servicefactory.hxx
index 03c52363fb4c..366b7dd35e06 100644
--- a/cppuhelper/inc/cppuhelper/servicefactory.hxx
+++ b/cppuhelper/inc/cppuhelper/servicefactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -120,3 +121,4 @@ createServiceFactory(
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/shlib.hxx b/cppuhelper/inc/cppuhelper/shlib.hxx
index ee7ae8ff4fda..7bfdc97ea75e 100644
--- a/cppuhelper/inc/cppuhelper/shlib.hxx
+++ b/cppuhelper/inc/cppuhelper/shlib.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,3 +83,5 @@ SAL_CALL writeSharedLibComponentInfo(
 } // end namespace cppu
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/stdidlclass.hxx b/cppuhelper/inc/cppuhelper/stdidlclass.hxx
index f4147bb86ca3..e7c8443ef0f3 100644
--- a/cppuhelper/inc/cppuhelper/stdidlclass.hxx
+++ b/cppuhelper/inc/cppuhelper/stdidlclass.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,10 +47,10 @@ namespace cppu {
 
 
 /**
-   Standardfunction to create an XIdlClass for a component.
+   Standard function to create an XIdlClass for a component.
    There is a function for each number of supported interfaces up to 10.
 
-   Since the switch to the final component model, there are no use cases anymore, where
+   Since the switch to the final component model, there are no use cases anymore where
    these functions should be used. Instead use the implementation helpers directly
    (see cppuhelper/implbase1.hxx).
 
@@ -387,3 +388,5 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
 } // end namespace cppu
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/typeprovider.hxx b/cppuhelper/inc/cppuhelper/typeprovider.hxx
index 355f7edc1071..c434d54a7071 100644
--- a/cppuhelper/inc/cppuhelper/typeprovider.hxx
+++ b/cppuhelper/inc/cppuhelper/typeprovider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -240,3 +241,5 @@ public:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/cppuhelper/inc/cppuhelper/unourl.hxx
index 95633e87e59b..c0d70dee8e9b 100644
--- a/cppuhelper/inc/cppuhelper/unourl.hxx
+++ b/cppuhelper/inc/cppuhelper/unourl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -190,3 +191,5 @@ private:
 }
 
 #endif // INCLUDED_RTL_UNOURL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx
index 701b8f102f91..14236d992310 100644
--- a/cppuhelper/inc/cppuhelper/weak.hxx
+++ b/cppuhelper/inc/cppuhelper/weak.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
 #include <rtl/alloc.h>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#ifndef _COM_SUN_STAR_UNO_WEAK_HPP_
 #include <com/sun/star/uno/XWeak.hpp>
-#endif
 
 
 namespace cppu
@@ -170,3 +169,4 @@ public:
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/weakagg.hxx b/cppuhelper/inc/cppuhelper/weakagg.hxx
index 51d0341f9b99..adc3b7987d04 100644
--- a/cppuhelper/inc/cppuhelper/weakagg.hxx
+++ b/cppuhelper/inc/cppuhelper/weakagg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,3 +110,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/weakref.hxx b/cppuhelper/inc/cppuhelper/weakref.hxx
index b459024b8c27..f138a8aeaf10 100644
--- a/cppuhelper/inc/cppuhelper/weakref.hxx
+++ b/cppuhelper/inc/cppuhelper/weakref.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -167,3 +168,5 @@ public:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/pch/precompiled_cppuhelper.cxx b/cppuhelper/inc/pch/precompiled_cppuhelper.cxx
index f194f77cd13f..28a0019ac80e 100644
--- a/cppuhelper/inc/pch/precompiled_cppuhelper.cxx
+++ b/cppuhelper/inc/pch/precompiled_cppuhelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_cppuhelper.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
index 69ec5293407c..9a601079de5b 100644
--- a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
+++ b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/prj/build.lst b/cppuhelper/prj/build.lst
index ff837f90dd1a..4ff92edfaadb 100644
--- a/cppuhelper/prj/build.lst
+++ b/cppuhelper/prj/build.lst
@@ -4,3 +4,5 @@ ch	cppuhelper\inc							nmake	-	all	ch_include NULL
 ch	cppuhelper\source						nmake	-	all	ch_source ch_unotypes ch_include NULL
 ch	cppuhelper\unotypes						nmake	-	all	ch_unotypes NULL
 ch cppuhelper\qa\propertysetmixin nmake - all ch_qa_propertysetmixin ch_source NULL
+ch  cppuhelper\qa\ifcontainer               nmake   -   all ch_qa_ifcontainer ch_source NULL
+ch  cppuhelper\qa\unourl                    nmake   -   all ch_qa_unourl ch_source NULL
diff --git a/cppuhelper/prj/d.lst b/cppuhelper/prj/d.lst
index 0707a7609b56..c26529d071e8 100644
--- a/cppuhelper/prj/d.lst
+++ b/cppuhelper/prj/d.lst
@@ -1,74 +1,74 @@
-mkdir: %_DEST%\inc%_EXT%\cppuhelper
+mkdir: %_DEST%\inc\cppuhelper
 
-..\inc\cppuhelper\implbase.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase.hxx
-..\inc\cppuhelper\implbase_ex.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase_ex.hxx
-..\inc\cppuhelper\implbase_ex_pre.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase_ex_pre.hxx
-..\inc\cppuhelper\implbase_ex_post.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase_ex_post.hxx
-..\inc\cppuhelper\implbase1.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase1.hxx
-..\inc\cppuhelper\implbase2.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase2.hxx
-..\inc\cppuhelper\implbase3.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase3.hxx
-..\inc\cppuhelper\implbase4.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase4.hxx
-..\inc\cppuhelper\implbase5.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase5.hxx
-..\inc\cppuhelper\implbase6.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase6.hxx
-..\inc\cppuhelper\implbase7.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase7.hxx
-..\inc\cppuhelper\implbase8.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase8.hxx
-..\inc\cppuhelper\implbase9.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase9.hxx
-..\inc\cppuhelper\implbase10.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase10.hxx
-..\inc\cppuhelper\implbase11.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase11.hxx
-..\inc\cppuhelper\implbase12.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase12.hxx
+..\inc\cppuhelper\implbase.hxx %_DEST%\inc\cppuhelper\implbase.hxx
+..\inc\cppuhelper\implbase_ex.hxx %_DEST%\inc\cppuhelper\implbase_ex.hxx
+..\inc\cppuhelper\implbase_ex_pre.hxx %_DEST%\inc\cppuhelper\implbase_ex_pre.hxx
+..\inc\cppuhelper\implbase_ex_post.hxx %_DEST%\inc\cppuhelper\implbase_ex_post.hxx
+..\inc\cppuhelper\implbase1.hxx %_DEST%\inc\cppuhelper\implbase1.hxx
+..\inc\cppuhelper\implbase2.hxx %_DEST%\inc\cppuhelper\implbase2.hxx
+..\inc\cppuhelper\implbase3.hxx %_DEST%\inc\cppuhelper\implbase3.hxx
+..\inc\cppuhelper\implbase4.hxx %_DEST%\inc\cppuhelper\implbase4.hxx
+..\inc\cppuhelper\implbase5.hxx %_DEST%\inc\cppuhelper\implbase5.hxx
+..\inc\cppuhelper\implbase6.hxx %_DEST%\inc\cppuhelper\implbase6.hxx
+..\inc\cppuhelper\implbase7.hxx %_DEST%\inc\cppuhelper\implbase7.hxx
+..\inc\cppuhelper\implbase8.hxx %_DEST%\inc\cppuhelper\implbase8.hxx
+..\inc\cppuhelper\implbase9.hxx %_DEST%\inc\cppuhelper\implbase9.hxx
+..\inc\cppuhelper\implbase10.hxx %_DEST%\inc\cppuhelper\implbase10.hxx
+..\inc\cppuhelper\implbase11.hxx %_DEST%\inc\cppuhelper\implbase11.hxx
+..\inc\cppuhelper\implbase12.hxx %_DEST%\inc\cppuhelper\implbase12.hxx
 
-..\inc\cppuhelper\compbase.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase.hxx
-..\inc\cppuhelper\compbase_ex.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase_ex.hxx
-..\inc\cppuhelper\compbase1.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase1.hxx
-..\inc\cppuhelper\compbase2.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase2.hxx
-..\inc\cppuhelper\compbase3.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase3.hxx
-..\inc\cppuhelper\compbase4.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase4.hxx
-..\inc\cppuhelper\compbase5.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase5.hxx
-..\inc\cppuhelper\compbase6.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase6.hxx
-..\inc\cppuhelper\compbase7.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase7.hxx
-..\inc\cppuhelper\compbase8.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase8.hxx
-..\inc\cppuhelper\compbase9.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase9.hxx
-..\inc\cppuhelper\compbase10.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase10.hxx
-..\inc\cppuhelper\compbase11.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase11.hxx
-..\inc\cppuhelper\compbase12.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase12.hxx
+..\inc\cppuhelper\compbase.hxx %_DEST%\inc\cppuhelper\compbase.hxx
+..\inc\cppuhelper\compbase_ex.hxx %_DEST%\inc\cppuhelper\compbase_ex.hxx
+..\inc\cppuhelper\compbase1.hxx %_DEST%\inc\cppuhelper\compbase1.hxx
+..\inc\cppuhelper\compbase2.hxx %_DEST%\inc\cppuhelper\compbase2.hxx
+..\inc\cppuhelper\compbase3.hxx %_DEST%\inc\cppuhelper\compbase3.hxx
+..\inc\cppuhelper\compbase4.hxx %_DEST%\inc\cppuhelper\compbase4.hxx
+..\inc\cppuhelper\compbase5.hxx %_DEST%\inc\cppuhelper\compbase5.hxx
+..\inc\cppuhelper\compbase6.hxx %_DEST%\inc\cppuhelper\compbase6.hxx
+..\inc\cppuhelper\compbase7.hxx %_DEST%\inc\cppuhelper\compbase7.hxx
+..\inc\cppuhelper\compbase8.hxx %_DEST%\inc\cppuhelper\compbase8.hxx
+..\inc\cppuhelper\compbase9.hxx %_DEST%\inc\cppuhelper\compbase9.hxx
+..\inc\cppuhelper\compbase10.hxx %_DEST%\inc\cppuhelper\compbase10.hxx
+..\inc\cppuhelper\compbase11.hxx %_DEST%\inc\cppuhelper\compbase11.hxx
+..\inc\cppuhelper\compbase12.hxx %_DEST%\inc\cppuhelper\compbase12.hxx
 
-..\inc\cppuhelper\shlib.hxx %_DEST%\inc%_EXT%\cppuhelper\shlib.hxx
-..\inc\cppuhelper\basemutex.hxx %_DEST%\inc%_EXT%\cppuhelper\basemutex.hxx
-..\inc\cppuhelper\bootstrap.hxx %_DEST%\inc%_EXT%\cppuhelper\bootstrap.hxx
-..\inc\cppuhelper\exc_hlp.hxx %_DEST%\inc%_EXT%\cppuhelper\exc_hlp.hxx
-..\inc\cppuhelper\typeprovider.hxx %_DEST%\inc%_EXT%\cppuhelper\typeprovider.hxx
-..\inc\cppuhelper\factory.hxx %_DEST%\inc%_EXT%\cppuhelper\factory.hxx
-..\inc\cppuhelper\component_context.hxx %_DEST%\inc%_EXT%\cppuhelper\component_context.hxx
-..\inc\cppuhelper\interfacecontainer.hxx %_DEST%\inc%_EXT%\cppuhelper\interfacecontainer.hxx
-..\inc\cppuhelper\interfacecontainer.h %_DEST%\inc%_EXT%\cppuhelper\interfacecontainer.h
-..\inc\cppuhelper\component.hxx %_DEST%\inc%_EXT%\cppuhelper\component.hxx
-..\inc\cppuhelper\propshlp.hxx %_DEST%\inc%_EXT%\cppuhelper\propshlp.hxx
-..\inc\cppuhelper\proptypehlp.hxx %_DEST%\inc%_EXT%\cppuhelper\proptypehlp.hxx
-..\inc\cppuhelper\propertysetmixin.hxx %_DEST%\inc%_EXT%\cppuhelper\propertysetmixin.hxx
-..\inc\cppuhelper\proptypehlp.h %_DEST%\inc%_EXT%\cppuhelper\proptypehlp.h
-..\inc\cppuhelper\stdidlclass.hxx %_DEST%\inc%_EXT%\cppuhelper\stdidlclass.hxx
-..\inc\cppuhelper\weak.hxx %_DEST%\inc%_EXT%\cppuhelper\weak.hxx
-..\inc\cppuhelper\weakagg.hxx %_DEST%\inc%_EXT%\cppuhelper\weakagg.hxx
-..\inc\cppuhelper\queryinterface.hxx %_DEST%\inc%_EXT%\cppuhelper\queryinterface.hxx
-..\inc\cppuhelper\weakref.hxx %_DEST%\inc%_EXT%\cppuhelper\weakref.hxx
-..\inc\cppuhelper\servicefactory.hxx %_DEST%\inc%_EXT%\cppuhelper\servicefactory.hxx
-..\inc\cppuhelper\implementationentry.hxx %_DEST%\inc%_EXT%\cppuhelper\implementationentry.hxx
-..\inc\cppuhelper\access_control.hxx %_DEST%\inc%_EXT%\cppuhelper\access_control.hxx
-..\inc\cppuhelper\unourl.hxx %_DEST%\inc%_EXT%\cppuhelper\unourl.hxx
+..\inc\cppuhelper\shlib.hxx %_DEST%\inc\cppuhelper\shlib.hxx
+..\inc\cppuhelper\basemutex.hxx %_DEST%\inc\cppuhelper\basemutex.hxx
+..\inc\cppuhelper\bootstrap.hxx %_DEST%\inc\cppuhelper\bootstrap.hxx
+..\inc\cppuhelper\exc_hlp.hxx %_DEST%\inc\cppuhelper\exc_hlp.hxx
+..\inc\cppuhelper\typeprovider.hxx %_DEST%\inc\cppuhelper\typeprovider.hxx
+..\inc\cppuhelper\factory.hxx %_DEST%\inc\cppuhelper\factory.hxx
+..\inc\cppuhelper\component_context.hxx %_DEST%\inc\cppuhelper\component_context.hxx
+..\inc\cppuhelper\interfacecontainer.hxx %_DEST%\inc\cppuhelper\interfacecontainer.hxx
+..\inc\cppuhelper\interfacecontainer.h %_DEST%\inc\cppuhelper\interfacecontainer.h
+..\inc\cppuhelper\component.hxx %_DEST%\inc\cppuhelper\component.hxx
+..\inc\cppuhelper\propshlp.hxx %_DEST%\inc\cppuhelper\propshlp.hxx
+..\inc\cppuhelper\proptypehlp.hxx %_DEST%\inc\cppuhelper\proptypehlp.hxx
+..\inc\cppuhelper\propertysetmixin.hxx %_DEST%\inc\cppuhelper\propertysetmixin.hxx
+..\inc\cppuhelper\proptypehlp.h %_DEST%\inc\cppuhelper\proptypehlp.h
+..\inc\cppuhelper\stdidlclass.hxx %_DEST%\inc\cppuhelper\stdidlclass.hxx
+..\inc\cppuhelper\weak.hxx %_DEST%\inc\cppuhelper\weak.hxx
+..\inc\cppuhelper\weakagg.hxx %_DEST%\inc\cppuhelper\weakagg.hxx
+..\inc\cppuhelper\queryinterface.hxx %_DEST%\inc\cppuhelper\queryinterface.hxx
+..\inc\cppuhelper\weakref.hxx %_DEST%\inc\cppuhelper\weakref.hxx
+..\inc\cppuhelper\servicefactory.hxx %_DEST%\inc\cppuhelper\servicefactory.hxx
+..\inc\cppuhelper\implementationentry.hxx %_DEST%\inc\cppuhelper\implementationentry.hxx
+..\inc\cppuhelper\access_control.hxx %_DEST%\inc\cppuhelper\access_control.hxx
+..\inc\cppuhelper\unourl.hxx %_DEST%\inc\cppuhelper\unourl.hxx
 
-..\%__SRC%\bin\cppuh*.dll %_DEST%\bin%_EXT%\cppuh*.dll
-..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib%_EXT%\*
+..\%__SRC%\bin\cppuh*.dll %_DEST%\bin\cppuh*.dll
+..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib\*
 
-..\%__SRC%\lib\libuno_cppuhelper*.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libuno_cppuhelper*.* %_DEST%\lib\*
 
-..\%__SRC%\lib\libcppuhelper*.a %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\cppuhelper*.lib %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libcppuhelper*.a %_DEST%\lib\*
+..\%__SRC%\lib\cppuhelper*.lib %_DEST%\lib\*
 
-..\source\unorc %_DEST%\bin%_EXT%\uno.ini
-..\source\unorc %_DEST%\lib%_EXT%\unorc
+..\source\unorc %_DEST%\bin\uno.ini
+..\source\unorc %_DEST%\lib\unorc
 
-..\inc\cppuhelper\findsofficepath.h %_DEST%\inc%_EXT%\cppuhelper\findsofficepath.h
-..\%__SRC%\obj\findsofficepath.o %_DEST%\lib%_EXT%\findsofficepath.o
-..\%__SRC%\obj\findsofficepath.obj %_DEST%\lib%_EXT%\findsofficepath.obj
+..\inc\cppuhelper\findsofficepath.h %_DEST%\inc\cppuhelper\findsofficepath.h
+..\%__SRC%\obj\findsofficepath.o %_DEST%\lib\findsofficepath.o
+..\%__SRC%\obj\findsofficepath.obj %_DEST%\lib\findsofficepath.obj
 
 linklib: libuno_cppuhelper*.*.*
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 2e87e80452c5..09ec884d46c2 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,7 +26,10 @@
  *
  ************************************************************************/
 
-#include <testshl/simpleheader.hxx>
+#include <string.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
 #include "com/sun/star/lang/XEventListener.hpp"
 #include "cppuhelper/interfacecontainer.hxx"
@@ -128,7 +132,7 @@ namespace cppu_ifcontainer
             for (i = 0; i < nTests; i++)
             {
                 Reference<XEventListener> xRef = new ContainerListener(&aStats);
-                int nNewLen = pContainer->addInterface(xRef);
+                pContainer->addInterface(xRef);
                 aListeners.push_back(xRef);
             }
             Sequence< Reference< XInterface > > aElements;
@@ -277,7 +281,8 @@ namespace cppu_ifcontainer
     };
 } // namespace cppu_ifcontainer
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(cppu_ifcontainer::IfTest,
-                                      "cppu_ifcontainer");
+CPPUNIT_TEST_SUITE_REGISTRATION(cppu_ifcontainer::IfTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
 
-NOADDITIONAL;
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/qa/ifcontainer/export.map b/cppuhelper/qa/ifcontainer/export.map
index 879fa8953788..117caf43a63e 100644
--- a/cppuhelper/qa/ifcontainer/export.map
+++ b/cppuhelper/qa/ifcontainer/export.map
@@ -1,6 +1,6 @@
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk
index 3277b4c204ea..5284f4b082aa 100644
--- a/cppuhelper/qa/ifcontainer/makefile.mk
+++ b/cppuhelper/qa/ifcontainer/makefile.mk
@@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
@@ -46,7 +51,6 @@ SHL1STDLIBS=\
     $(CPPUHELPERLIB) \
     $(SALLIB) \
     $(CPPULIB) \
-    $(TESTSHL2LIB)\
     $(CPPUNITLIB)
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index 1ed996617ce5..2fd0d494c99d 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -415,15 +416,18 @@ cppu::ImplementationEntry entries[] = {
 
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     char const ** envTypeName, uno_Environment **)
 {
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index 04aa2479c3b8..be4cfc380947 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -41,6 +41,11 @@ my_components = $(TARGET).cpp $(TARGET).java
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 .IF "$(OS)" == "WNT"
 my_file = file:///
 .ELSE
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index e4f1a4a78c3b..49b8cd07a6fd 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -650,3 +651,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx
index e5eb359e3485..df6c63e15d2c 100644
--- a/cppuhelper/qa/unourl/cppu_unourl.cxx
+++ b/cppuhelper/qa/unourl/cppu_unourl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,7 +26,9 @@
  *
  ************************************************************************/
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
 #include "cppuhelper/unourl.hxx"
 #include "rtl/malformeduriexception.hxx"
@@ -76,7 +79,7 @@ namespace cppu_unourl
                     { "abc,def=%22", true },
                     { "abc,def=\"", true },
                     { "abc,def=%ed%a0%80", true } };
-            for (int i = 0; i < sizeof aTests / sizeof (Test); ++i)
+            for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
                 try
@@ -125,8 +128,7 @@ namespace cppu_unourl
                    { "abc,def=%22", "abc,def=%22" },
                    { "abc,def=\"", "abc,def=\"" },
                    { "abc,def=%ed%a0%80", "abc,def=%ed%a0%80" } };
-            bool bResult = true;
-            for (int i = 0; i < sizeof aTests / sizeof (Test); ++i)
+            for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
                 rtl::OUString aDescriptor;
@@ -174,7 +176,7 @@ namespace cppu_unourl
                     { "abc,def=%22", "abc" },
                     { "abc,def=\"", "abc" },
                     { "abc,def=%ed%a0%80", "abc" } };
-            for (int i = 0; i < sizeof aTests / sizeof (Test); ++i)
+            for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
                 rtl::OUString aName;
@@ -219,7 +221,7 @@ namespace cppu_unourl
                     { "abc,def=xxx,ghi=xxx", "def", true },
                     { "abc,def=xxx,ghi=xxx", "ghi", true },
                     { "abc,def=xxx,ghi=xxx", "jkl", false } };
-            for (int i = 0; i < sizeof aTests / sizeof (Test); ++i)
+            for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
                 bool bPresent = false;
@@ -289,7 +291,7 @@ namespace cppu_unourl
                     { "abc,abc=,def=Abc", "def", "Abc" },
                     { "abc,abc=,def=aBC", "def", "aBC" },
                     { "abc,abc=,def=ABC", "def", "ABC" } };
-            for (int i = 0; i < sizeof aTests / sizeof (Test); ++i)
+            for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
                 rtl::OUString aValue;
@@ -332,7 +334,7 @@ namespace cppu_unourl
                     { "uno:abc;def;1", true },
                     { "uno:abc;def;$&+,/:=?@", true },
                     { "uno:abc;def;%24&+,/:=?@", false } };
-            for (int i = 0; i < sizeof aTests / sizeof (Test); ++i)
+            for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
                 try
@@ -369,7 +371,7 @@ namespace cppu_unourl
                     { "uno:ABC;def;ghi", "ABC" },
                     { "uno:abc,def=xxx,ghi=xxx;def,ghi=xxx,jkl=xxx;ghi",
                       "abc,def=xxx,ghi=xxx" } };
-            for (int i = 0; i < sizeof aTests / sizeof (Test); ++i)
+            for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
                 rtl::OUString aConnection;
@@ -403,7 +405,7 @@ namespace cppu_unourl
                     { "uno:abc;DEF;ghi", "DEF" },
                     { "uno:abc,def=xxx,ghi=xxx;def,ghi=xxx,jkl=xxx;ghi",
                       "def,ghi=xxx,jkl=xxx" } };
-            for (int i = 0; i < sizeof aTests / sizeof (Test); ++i)
+            for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
                 rtl::OUString aProtocol;
@@ -440,7 +442,7 @@ namespace cppu_unourl
                     { "uno:abc;def;A", "A" },
                     { "uno:abc;def;1", "1" },
                     { "uno:abc;def;$&+,/:=?@", "$&+,/:=?@" } };
-            for (int i = 0; i < sizeof aTests / sizeof (Test); ++i)
+            for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
             {
                 bool bValid = false;
                 rtl::OUString aObjectName;
@@ -474,8 +476,8 @@ namespace cppu_unourl
     };
 } // namespace cppu_ifcontainer
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(cppu_unourl::UrlTest,
-                                      "cppu_unourl");
+CPPUNIT_TEST_SUITE_REGISTRATION(cppu_unourl::UrlTest);
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/qa/unourl/export.map b/cppuhelper/qa/unourl/export.map
index 879fa8953788..117caf43a63e 100644
--- a/cppuhelper/qa/unourl/export.map
+++ b/cppuhelper/qa/unourl/export.map
@@ -1,6 +1,6 @@
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk
index de2c05d40bc1..f48b724ee24b 100644
--- a/cppuhelper/qa/unourl/makefile.mk
+++ b/cppuhelper/qa/unourl/makefile.mk
@@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
@@ -46,7 +51,6 @@ SHL1STDLIBS=\
     $(CPPUHELPERLIB) \
     $(SALLIB) \
     $(CPPULIB) \
-    $(TESTSHL2LIB)\
     $(CPPUNITLIB)
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk
index 543e87118a75..7895504970bc 100644
--- a/cppuhelper/qa/weak/makefile.mk
+++ b/cppuhelper/qa/weak/makefile.mk
@@ -33,12 +33,17 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_weak.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index dffca9d97d97..0a0cae46a8fb 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cppuhelper.hxx"
 
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
 #include "sal/config.h"
 
 #include "com/sun/star/lang/DisposedException.hpp"
@@ -38,7 +43,6 @@
 #include "com/sun/star/uno/XWeak.hpp"
 #include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/weak.hxx"
-#include "testshl/simpleheader.hxx"
 #include "rtl/ref.hxx"
 #include "sal/types.h"
 
@@ -102,8 +106,10 @@ void Test::testReferenceDispose() {
     CPPUNIT_ASSERT(r3->isDisposed());
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/qa/weak/version.map b/cppuhelper/qa/weak/version.map
index 7321bbca16ad..3308588ef6f8 100644
--- a/cppuhelper/qa/weak/version.map
+++ b/cppuhelper/qa/weak/version.map
@@ -27,7 +27,7 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx
index f3ef9f81fc0d..b3c8e0c0b16d 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/cppuhelper/source/access_control.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -147,3 +148,5 @@ void AccessControl::checkSocketPermission(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index f892cdcab0f3..5b4a58dc1c25 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -172,7 +173,7 @@ void addFactories(
             buf.append( ppNames[ -2 ] );
             buf.append( "\"!!!" );
             OString str( buf.makeStringAndClear() );
-            OSL_ENSURE( 0, str.getStr() );
+            OSL_FAIL( str.getStr() );
         }
 #endif
     }
@@ -272,7 +273,7 @@ OUString findBoostrapArgument(
 }
 
 Reference< registry::XSimpleRegistry > nestRegistries(
-    const OUString baseDir,
+    const OUString &baseDir,
     const Reference< lang::XSingleServiceFactory > & xSimRegFac,
     const Reference< lang::XSingleServiceFactory > & xNesRegFac,
     OUString csl_rdbs,
@@ -351,14 +352,6 @@ Reference< registry::XSimpleRegistry > nestRegistries(
         }
         catch(registry::InvalidRegistryException & invalidRegistryException)
         {
-            if (! optional)
-            {
-                // if a registry was explicitly given, the exception shall fly
-                if( ! bFallenBack )
-                    throw;
-            }
-
-            (void) invalidRegistryException;
 #if OSL_DEBUG_LEVEL > 1
             OString rdb_name_tmp = OUStringToOString(
                 rdb_name, RTL_TEXTENCODING_ASCII_US );
@@ -368,6 +361,14 @@ Reference< registry::XSimpleRegistry > nestRegistries(
                 "warning: couldn't open %s cause of %s",
                 rdb_name_tmp.getStr(), message_dbg.getStr() );
 #endif
+            if (! optional)
+            {
+                // if a registry was explicitly given, the exception shall fly
+                if( ! bFallenBack )
+                    throw;
+            }
+
+            (void) invalidRegistryException;
         }
     }
     while(index != -1 && csl_rdbs.getLength()); // are there more rdbs in list?
@@ -608,7 +609,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
             case osl_Process_E_NotFound:
                 throw BootstrapException( OUSTR( "image not found!" ) );
             case osl_Process_E_TimedOut:
-                throw BootstrapException( OUSTR( "timout occured!" ) );
+                throw BootstrapException( OUSTR( "timout occurred!" ) );
             case osl_Process_E_NoPermission:
                 throw BootstrapException( OUSTR( "permission denied!" ) );
             case osl_Process_E_Unknown:
@@ -668,3 +669,5 @@ OUString bootstrap_expandUri(OUString const & uri) {
 }
 
 } // namespace cppu
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index b152a8f13f49..c74d3894e642 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,11 +36,14 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 
 using namespace osl;
-using namespace rtl;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+
 namespace cppu
 {
 
@@ -102,7 +106,7 @@ void OComponentHelper::release() throw()
                     // release should not throw exceptions
 #if OSL_DEBUG_LEVEL > 0
                     OString msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
-                    OSL_ENSURE( 0, msg.getStr() );
+                    OSL_FAIL( msg.getStr() );
 #else
                     (void) exc; // avoid warning about unused variable
 #endif
@@ -211,7 +215,7 @@ void OComponentHelper::dispose()
     }
     else
     {
-        // in a multithreaded environment, it can't be avoided,
+        // in a multithreaded environment, it can't be avoided
         // that dispose is called twice.
         // However this condition is traced, because it MAY indicate an error.
         OSL_TRACE( "OComponentHelper::dispose() - dispose called twice" );
@@ -246,3 +250,4 @@ void OComponentHelper::removeEventListener(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 05b4f30205ef..95927c26d089 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,7 +38,7 @@
 #endif
 
 #include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #ifdef CONTEXT_DIAG
 #include <map>
 #endif
@@ -63,7 +64,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "com/sun/star/uno/RuntimeException.hpp"
 
-#include <hash_map>
 #include <memory>
 
 #define SMGR_SINGLETON "/singletons/com.sun.star.lang.theServiceManager"
@@ -362,7 +362,7 @@ protected:
             , lateInit( lateInit_ )
             {}
     };
-    typedef ::std::hash_map< OUString, ContextEntry * , OUStringHash > t_map;
+    typedef ::boost::unordered_map< OUString, ContextEntry * , OUStringHash > t_map;
     t_map m_map;
 
     Reference< lang::XMultiComponentFactory > m_xSMgr;
@@ -615,7 +615,7 @@ Any ComponentContext::lookupMap( OUString const & rName )
         Any caught( getCaughtException() );
         OUStringBuffer buf;
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-                             "exception occured raising singleton \"") );
+                             "exception occurred raising singleton \"") );
         buf.append( rName );
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\": ") );
         buf.append( exc.Message );
@@ -851,7 +851,7 @@ extern "C" { static void s_createComponentContext_v(va_list * pParam)
         catch (Exception & exc)
         {
             (void) exc; // avoid warning about unused variable
-            OSL_ENSURE( 0, OUStringToOString(
+            OSL_FAIL( OUStringToOString(
                             exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
             xContext.clear();
         }
@@ -861,8 +861,6 @@ extern "C" { static void s_createComponentContext_v(va_list * pParam)
         xContext = xDelegate;
     }
 
-    delete[] pEntries;
-
     *ppContext = pTarget2curr->mapInterface(xContext.get(), ::getCppuType(&xContext));
 }}
 
@@ -892,8 +890,11 @@ Reference< XComponentContext > SAL_CALL createComponentContext(
     void * mapped_delegate = curr2source.mapInterface(xDelegate.get(), ::getCppuType(&xDelegate));
     XComponentContext * pXComponentContext = NULL;
     source_env.invoke(s_createComponentContext_v, mapped_entries, nEntries, mapped_delegate, &pXComponentContext, &source2curr);
+    delete[] mapped_entries;
 
     return Reference<XComponentContext>(pXComponentContext, SAL_NO_ACQUIRE);
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index c23873bda831..e497e3714a4f 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cppuhelper.hxx"
 
+#include "rtl/instance.hxx"
 #include "osl/diagnose.h"
 #include "osl/doublecheckedlocking.h"
 #include "osl/mutex.hxx"
@@ -57,8 +59,6 @@ struct ExceptionThrower : public uno_Interface, XExceptionThrower
 {
     inline ExceptionThrower();
 
-public:
-    static ExceptionThrower * get();
     static inline Type const & getCppuType()
     {
         return ::getCppuType(
@@ -169,7 +169,7 @@ void ExceptionThrower::release() throw ()
 //______________________________________________________________________________
 void ExceptionThrower::throwException( Any const & exc ) throw (Exception)
 {
-    OSL_ENSURE( 0, "unexpected!" );
+    OSL_FAIL( "unexpected!" );
     throwException( exc );
 }
 
@@ -187,23 +187,7 @@ inline ExceptionThrower::ExceptionThrower()
     uno_Interface::pDispatcher = ExceptionThrower_dispatch;
 }
 
-//______________________________________________________________________________
-ExceptionThrower * ExceptionThrower::get()
-{
-    ExceptionThrower * s_pThrower = 0;
-    if (s_pThrower == 0)
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        static ExceptionThrower s_thrower;
-        OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
-        s_pThrower = &s_thrower;
-    }
-    else
-    {
-        OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
-    }
-    return s_pThrower;
-}
+class theExceptionThrower : public rtl::Static<ExceptionThrower, theExceptionThrower> {};
 
 } // anonymous namespace
 
@@ -233,7 +217,7 @@ void SAL_CALL throwException( Any const & exc ) SAL_THROW( (Exception) )
     Reference< XExceptionThrower > xThrower;
     uno2cpp.mapInterface(
         reinterpret_cast< void ** >( &xThrower ),
-        static_cast< uno_Interface * >( ExceptionThrower::get() ),
+        static_cast< uno_Interface * >( &theExceptionThrower::get() ),
         ExceptionThrower::getCppuType() );
     OSL_ASSERT( xThrower.is() );
     xThrower->throwException( exc );
@@ -264,7 +248,7 @@ Any SAL_CALL getCaughtException()
     UnoInterfaceReference unoI;
     cpp2uno.mapInterface(
         reinterpret_cast< void ** >( &unoI.m_pUnoI ),
-        static_cast< XExceptionThrower * >( ExceptionThrower::get() ), pTD );
+        static_cast< XExceptionThrower * >( &theExceptionThrower::get() ), pTD );
     OSL_ASSERT( unoI.is() );
 
     typelib_TypeDescription * pMemberTD = 0;
@@ -296,3 +280,5 @@ Any SAL_CALL getCaughtException()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 20adf05391b9..2958e1505f5f 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,10 +33,9 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/factory.hxx>
-#ifndef _CPPUHELPER_IMPLBASE3_HXX
 #include <cppuhelper/implbase3.hxx>
-#endif
 #include <cppuhelper/typeprovider.hxx>
+#include <rtl/instance.hxx>
 #include <rtl/unload.h>
 
 #include "cppuhelper/propshlp.hxx"
@@ -56,19 +56,17 @@
 
 
 using namespace osl;
-using namespace rtl;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::loader;
 using namespace com::sun::star::registry;
 
+using ::rtl::OUString;
+
 namespace cppu
 {
 
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 class OSingleFactoryHelper
     : public XServiceInfo
     , public XSingleServiceFactory
@@ -276,10 +274,6 @@ Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames(void)
     return aServiceNames;
 }
 
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
 struct OFactoryComponentHelper_Mutex
 {
     Mutex   aMutex;
@@ -428,20 +422,16 @@ Sequence< Type > OFactoryComponentHelper::getTypes()
     return Sequence< Type >( ar, m_fptr ? 4 : 3 );
 }
 
+namespace
+{
+    class theOFactoryComponentHelperImplementationId :
+        public rtl::Static<OImplementationId, theOFactoryComponentHelperImplementationId>{};
+}
+
 Sequence< sal_Int8 > OFactoryComponentHelper::getImplementationId()
     throw (::com::sun::star::uno::RuntimeException)
 {
-    static OImplementationId * pId = 0;
-    if (! pId)
-    {
-        MutexGuard aGuard( Mutex::getGlobalMutex() );
-        if (! pId)
-        {
-            static OImplementationId aId;
-            pId = &aId;
-        }
-    }
-    return pId->getImplementationId();
+    return theOFactoryComponentHelperImplementationId::get().getImplementationId();
 }
 
 // XSingleServiceFactory
@@ -552,10 +542,6 @@ sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification() throw(::com::
     return sal_True;
 }
 
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 class ORegistryFactoryHelper : public OFactoryComponentHelper,
                                public OPropertySetHelper
 
@@ -710,7 +696,7 @@ sal_Bool ORegistryFactoryHelper::convertFastPropertyValue(
     Any &, Any &, sal_Int32, Any const & )
     throw (lang::IllegalArgumentException)
 {
-    OSL_ENSURE( 0, "unexpected!" );
+    OSL_FAIL( "unexpected!" );
     return false;
 }
 
@@ -874,7 +860,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
             // one implementation found -> try to activate
             aLocation = xLocationKey->getAsciiValue();
 
-            // search protocol delemitter
+            // search protocol delimiter
             sal_Int32 nPos = aLocation.indexOf(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("://") ) );
             if( nPos != -1 )
@@ -963,10 +949,6 @@ sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(::com::s
     return retVal;
 }
 
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 class OFactoryProxyHelper : public WeakImplHelper3< XServiceInfo, XSingleServiceFactory,
                                                     XUnloadingPreference >
 {
@@ -1056,10 +1038,6 @@ sal_Bool SAL_CALL OFactoryProxyHelper::releaseOnNotification() throw(::com::sun:
     return sal_True;
 }
 
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 // global function
 Reference<XSingleServiceFactory > SAL_CALL createSingleFactory(
     const Reference<XMultiServiceFactory > & rServiceManager,
@@ -1094,8 +1072,6 @@ Reference<XSingleServiceFactory > SAL_CALL createOneInstanceFactory(
 {
     return new OFactoryComponentHelper(
         rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, pModCount, sal_True );
-//  return new OFactoryUnloadableComponentHelper(
-//      rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, pModCount, sal_True );
 }
 
 // global function
@@ -1146,3 +1122,4 @@ Reference< lang::XSingleComponentFactory > SAL_CALL createOneInstanceComponentFa
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c
index e325f077711b..0d97de89304b 100644
--- a/cppuhelper/source/findsofficepath.c
+++ b/cppuhelper/source/findsofficepath.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,7 +45,7 @@
  * @param subKeyName  name of the subkey to open
  *
  * @return the installation path or NULL, if no installation was found or
- *         if an error occured
+ *         if an error occurred
  */
 static char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName )
 {
@@ -86,11 +87,11 @@ static char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName )
  * Gets the installation path from the Windows Registry.
  *
  * @return the installation path or NULL, if no installation was found or
- *         if an error occured
+ *         if an error occurred
  */
 static char* platformSpecific()
 {
-    const char* SUBKEYNAME = "Software\\OpenOffice.org\\UNO\\InstallPath";
+    const char* SUBKEYNAME = "Software\\LibreOffice\\UNO\\InstallPath";
 
     char* path = NULL;
 
@@ -118,14 +119,14 @@ static char* platformSpecific()
  * is in one of the directories listed in the PATH environment variable.</p>
  *
  * @return the installation path or NULL, if no installation was found or
- *         if an error occured
+ *         if an error occurred
  */
 static char* platformSpecific()
 {
     const int SEPARATOR = '/';
     const char* PATHSEPARATOR = ":";
     const char* PATHVARNAME = "PATH";
-    const char* APPENDIX = "/soffice";
+    const char* APPENDIX = "/libreoffice";
 
     char* path = NULL;
     char* env = NULL;
@@ -196,10 +197,10 @@ char const* cppuhelper_detail_findSofficePath()
     /* get the installation path from the UNO_PATH environment variable */
     path = getenv( UNOPATHVARNAME );
 
-    if ( path == NULL || strlen( path ) == 0 )
-    {
+    if (!path || !path[0])
         path = platformSpecific();
-    }
 
     return path;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index 0c25a082cb27..a8a3fee844f9 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,6 +31,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <osl/diagnose.h>
+#include <rtl/instance.hxx>
 #include <rtl/uuid.h>
 
 #include <com/sun/star/lang/XComponent.hpp>
@@ -40,22 +42,17 @@ using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+namespace
+{
+    class theImplHelperInitMutex : public rtl::Static<Mutex, theImplHelperInitMutex>{};
+}
+
 namespace cppu
 {
 //==================================================================================================
 Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () )
 {
-    static Mutex * s_pMutex = 0;
-    if (! s_pMutex)
-    {
-        MutexGuard aGuard( Mutex::getGlobalMutex() );
-        if (! s_pMutex)
-        {
-            static Mutex s_aMutex;
-            s_pMutex = & s_aMutex;
-        }
-    }
-    return * s_pMutex;
+    return theImplHelperInitMutex::get();
 }
 
 // ClassDataBase
@@ -107,7 +104,7 @@ void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset ) SAL_THR
     {
         OString msg( "### cannot get type description for " );
         msg += OUStringToOString( rType.getTypeName(), RTL_TEXTENCODING_ASCII_US );
-        OSL_ENSURE( sal_False, msg.getStr() );
+        OSL_FAIL( msg.getStr() );
     }
 #endif
 }
@@ -253,8 +250,8 @@ void WeakComponentImplHelperBase::release()
                 dispose();
             }
             catch (RuntimeException const& exc) { // don't break throw ()
-                OSL_ENSURE(
-                    false, OUStringToOString(
+                OSL_FAIL(
+                    OUStringToOString(
                         exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
                 static_cast<void>(exc);
             }
@@ -389,8 +386,8 @@ void WeakAggComponentImplHelperBase::release()
                 dispose();
             }
             catch (RuntimeException const& exc) { // don't break throw ()
-                OSL_ENSURE(
-                    false, OUStringToOString(
+                OSL_FAIL(
+                    OUStringToOString(
                         exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
                 static_cast<void>(exc);
             }
@@ -469,3 +466,5 @@ void WeakAggComponentImplHelperBase::removeEventListener(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index 6d89bca96d6e..0e2c12bd4d51 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,7 +66,7 @@ static inline void checkInterface( Type const & rType )
         OUString msg( buf.makeStringAndClear() );
 #if OSL_DEBUG_LEVEL > 0
         OString str( OUStringToOString( msg, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( 0, str.getStr() );
+        OSL_FAIL( str.getStr() );
 #endif
         throw RuntimeException( msg, Reference< XInterface >() );
     }
@@ -115,7 +116,7 @@ static inline type_entry * __getTypeEntries( class_data * cd )
                     OUString msg( buf.makeStringAndClear() );
 #if OSL_DEBUG_LEVEL > 0
                     OString str( OUStringToOString( msg, RTL_TEXTENCODING_ASCII_US ) );
-                    OSL_ENSURE( 0, str.getStr() );
+                    OSL_FAIL( str.getStr() );
 #endif
                     throw RuntimeException( msg, Reference< XInterface >() );
                 }
@@ -228,7 +229,7 @@ static inline void * __queryDeepNoXInterface(
             OUString msg( buf.makeStringAndClear() );
 #if OSL_DEBUG_LEVEL > 0
             OString str( OUStringToOString( msg, RTL_TEXTENCODING_ASCII_US ) );
-            OSL_ENSURE( 0, str.getStr() );
+            OSL_FAIL( str.getStr() );
 #endif
             throw RuntimeException( msg, Reference< XInterface >() );
         }
@@ -467,3 +468,5 @@ Sequence< Type > SAL_CALL WeakAggComponentImplHelper_getTypes(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx
index 967a1095fce4..8689f24f51ec 100644
--- a/cppuhelper/source/implementationentry.cxx
+++ b/cppuhelper/source/implementationentry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,7 +65,7 @@ sal_Bool component_writeInfoHelper(
     }
     catch ( InvalidRegistryException & )
     {
-        OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+        OSL_FAIL( "### InvalidRegistryException!" );
     }
     return bRet;
 }
@@ -100,3 +101,5 @@ void * component_getFactoryHelper(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index b0c8d687a0a8..07458833c8f0 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +36,7 @@
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <com/sun/star/lang/XEventListener.hpp>
 
@@ -46,10 +47,6 @@ using namespace com::sun::star::lang;
 
 namespace cppu
 {
-
-//===================================================================
-//===================================================================
-//===================================================================
 /**
  * Reallocate the sequence.
  */
@@ -79,17 +76,10 @@ static void sequenceRemoveElementAt( Sequence< Reference< XInterface > > & rSeq,
     rSeq = aDestSeq;
 }
 
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 #ifdef _MSC_VER
 #pragma warning( disable: 4786 )
 #endif
 
-//===================================================================
-//===================================================================
-//===================================================================
 OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont_ )
     SAL_THROW( () )
     : rCont( rCont_ )
@@ -170,11 +160,6 @@ void OInterfaceIteratorHelper::remove() SAL_THROW( () )
     }
 }
 
-//===================================================================
-//===================================================================
-//===================================================================
-
-
 OInterfaceContainerHelper::OInterfaceContainerHelper( Mutex & rMutex_ ) SAL_THROW( () )
     : rMutex( rMutex_ )
     , bInUse( sal_False )
@@ -324,11 +309,11 @@ void OInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) SAL_
 {
     ClearableMutexGuard aGuard( rMutex );
     OInterfaceIteratorHelper aIt( *this );
-    // Container freigeben, falls im disposing neue Eintr�ge kommen
+    // Release container, in case new entries come while disposing
     OSL_ENSURE( !bIsList || bInUse, "OInterfaceContainerHelper not in use" );
     if( !bIsList && aData.pAsInterface )
         aData.pAsInterface->release();
-    // set the member to null, the iterator delete the values
+    // set the member to null, use the iterator to delete the values
     aData.pAsInterface = NULL;
     bIsList = sal_False;
     bInUse = sal_False;
@@ -344,7 +329,7 @@ void OInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) SAL_
         catch ( RuntimeException & )
         {
             // be robust, if e.g. a remote bridge has disposed already.
-            // there is no way, to delegate the error to the caller :o(.
+            // there is no way to delegate the error to the caller :o(.
         }
     }
 }
@@ -354,11 +339,11 @@ void OInterfaceContainerHelper::clear() SAL_THROW( () )
 {
     ClearableMutexGuard aGuard( rMutex );
     OInterfaceIteratorHelper aIt( *this );
-    // Container freigeben, falls im disposing neue Eintr�ge kommen
+    // Release container, in case new entries come while disposing
     OSL_ENSURE( !bIsList || bInUse, "OInterfaceContainerHelper not in use" );
     if( !bIsList && aData.pAsInterface )
         aData.pAsInterface->release();
-    // set the member to null, the iterator delete the values
+    // set the member to null, use the iterator to delete the values
     aData.pAsInterface = 0;
     bIsList = sal_False;
     bInUse = sal_False;
@@ -366,10 +351,6 @@ void OInterfaceContainerHelper::clear() SAL_THROW( () )
     aGuard.clear();
 }
 
-//##################################################################################################
-//##################################################################################################
-//##################################################################################################
-
 // specialized class for type
 
 typedef ::std::vector< std::pair < Type , void* > > t_type2ptr;
@@ -438,7 +419,7 @@ static t_type2ptr::iterator findType(t_type2ptr *pMap, const Type & rKey )
     {
         if (iter->first == rKey)
             break;
-        iter++;
+        ++iter;
     }
     return iter;
 }
@@ -538,11 +519,6 @@ void OMultiTypeInterfaceContainerHelper::clear()
     }
 }
 
-
-//##################################################################################################
-//##################################################################################################
-//##################################################################################################
-
 // specialized class for long
 
 typedef ::std::vector< std::pair < sal_Int32 , void* > > t_long2ptr;
@@ -556,7 +532,7 @@ static t_long2ptr::iterator findLong(t_long2ptr *pMap, sal_Int32 nKey )
     {
         if (iter->first == nKey)
             break;
-        iter++;
+        ++iter;
     }
     return iter;
 }
@@ -684,7 +660,6 @@ void OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject
         {
             typedef OInterfaceContainerHelper* ppp;
             ppListenerContainers = new ppp[nSize];
-            //ppListenerContainers = new (ListenerContainer*)[nSize];
 
             t_long2ptr::iterator iter = pMap->begin();
             t_long2ptr::iterator end = pMap->end();
@@ -727,3 +702,4 @@ void OMultiTypeInterfaceContainerHelperInt32::clear()
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 936487618ace..3265431c6174 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,22 +73,30 @@ rtl::OUString expandMacros(rtl::OUString const & text) {
 
 namespace
 {
-inline OUString s_impl_name() { return OUSTR(IMPL_NAME); }
-static Sequence< OUString > const & s_get_service_names()
+
+class ImplNames
 {
-    static Sequence< OUString > const * s_pnames = 0;
-    if (! s_pnames)
+private:
+    Sequence<OUString> m_aNames;
+public:
+    ImplNames() : m_aNames(2)
     {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if (! s_pnames)
-        {
-            static Sequence< OUString > s_names( 2 );
-            s_names[ 0 ] = OUSTR(SERVICE_NAME_A);
-            s_names[ 1 ] = OUSTR(SERVICE_NAME_B);
-            s_pnames = &s_names;
-        }
+        m_aNames[0] = OUSTR(SERVICE_NAME_A);
+        m_aNames[1] = OUSTR(SERVICE_NAME_B);
     }
-    return *s_pnames;
+    const Sequence<OUString>& getNames() const { return m_aNames; }
+};
+
+class theImplNames : public rtl::Static<ImplNames, theImplNames> {};
+
+inline OUString s_impl_name()
+{
+    return OUSTR(IMPL_NAME);
+}
+
+inline Sequence< OUString > const & s_get_service_names()
+{
+    return theImplNames::get().getNames();
 }
 
 typedef ::cppu::WeakComponentImplHelper2<
@@ -97,6 +106,7 @@ struct mutex_holder
 {
     Mutex m_mutex;
 };
+
 class Bootstrap_MacroExpander : public mutex_holder, public t_uno_impl
 {
 protected:
@@ -196,3 +206,5 @@ Reference< lang::XSingleComponentFactory > create_boostrap_macro_expander_factor
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/macro_expander.hxx b/cppuhelper/source/macro_expander.hxx
index a692f63abc39..24e3ffcd5b80 100644
--- a/cppuhelper/source/macro_expander.hxx
+++ b/cppuhelper/source/macro_expander.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,5 @@ namespace detail {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk
index 5755ed77631c..a7fd2241344a 100644..100755
--- a/cppuhelper/source/makefile.mk
+++ b/cppuhelper/source/makefile.mk
@@ -37,7 +37,7 @@ USE_DEFFILE=TRUE
 # without "-L" (light) switch
 BOOTSTRAP_SERVICE=TRUE
 
-.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2"
+.IF "$(OS)" != "WNT"
 UNIXVERSIONNAMES=UDK
 .ENDIF # WNT
 
@@ -149,9 +149,6 @@ OBJFILES = $(OBJ)$/findsofficepath.obj
 
 .IF "$(GUI)" == "WNT"
 SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
-.ELIF "$(GUI)" == "OS2"
-SHL1TARGET=cppuh
-SHL1TARGET=cppuh$(UDK_MAJOR)
 .ELSE
 SHL1TARGET=uno_$(TARGET)$(COMID)
 .ENDIF
@@ -175,10 +172,10 @@ DEF1NAME=$(SHL1TARGET)
 
 .IF "$(COMNAME)"=="msci"
 SHL1VERSIONMAP=msvc_win32_intel.map
+.ELIF "$(COMNAME)"=="mscx"
+SHL1VERSIONMAP=msvc_win32_x86_64.map
 .ELIF "$(COMNAME)"=="sunpro5"
 SHL1VERSIONMAP=cc5_solaris_sparc.map
-.ELIF "$(GUI)$(COMNAME)"=="OS2gcc3"
-SHL1VERSIONMAP=gcc3os2.map
 .ELIF "$(COMNAME)"=="gcc3"
 SHL1VERSIONMAP=gcc3.map
 .ENDIF
diff --git a/cppuhelper/source/msvc_win32_x86_64.map b/cppuhelper/source/msvc_win32_x86_64.map
new file mode 100644
index 000000000000..40a6c0d314f8
--- /dev/null
+++ b/cppuhelper/source/msvc_win32_x86_64.map
@@ -0,0 +1,280 @@
+UDK_3_0_0 {
+    global:
+GetVersionInfo;
+??0OComponentHelper@cppu@@QEAA@AEAVMutex@osl@@@Z;
+??1OComponentHelper@cppu@@UEAA@XZ;
+??BOWeakObject@cppu@@QEAA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+??BWeakReferenceHelper@uno@star@sun@com@@QEBA?AV?$Reference@VXInterface@uno@star@sun@com@@@1234@XZ;
+??_7OComponentHelper@cppu@@6BOWeakObject@1@@;
+??_7OComponentHelper@cppu@@6BXAggregation@uno@star@sun@com@@@;
+??_7OComponentHelper@cppu@@6BXComponent@lang@star@sun@com@@@;
+??_7OComponentHelper@cppu@@6BXTypeProvider@lang@star@sun@com@@@;
+??_7OWeakAggObject@cppu@@6BOWeakObject@1@@;
+??_7OWeakAggObject@cppu@@6BXAggregation@uno@star@sun@com@@@;
+??_7OWeakObject@cppu@@6B@;
+??_GOComponentHelper@cppu@@UEAAPEAXI@Z;
+??_GOWeakAggObject@cppu@@MEAAPEAXI@Z;
+??_GOWeakObject@cppu@@MEAAPEAXI@Z;
+?addEventListener@OComponentHelper@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
+?dispose@OComponentHelper@cppu@@UEAAXXZ;
+?disposing@OComponentHelper@cppu@@MEAAXXZ;
+?release@OComponentHelper@cppu@@UEAAXXZ;
+?removeEventListener@OComponentHelper@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
+??1OTypeCollection@cppu@@QEAA@XZ;
+?createFactoryProxy@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBV23456@@Z;
+?createOneInstanceRegistryFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBVOUString@rtl@@AEBV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
+?createSingleRegistryFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBVOUString@rtl@@AEBV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
+?getTypes@OTypeCollection@cppu@@QEAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+?createStandardClassWithSequence@cppu@@YAPEAVXIdlClass@reflection@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@456@AEBVOUString@rtl@@AEBV?$Reference@VXIdlClass@reflection@star@sun@com@@@8456@AEBV?$Sequence@VOUString@rtl@@@8456@@Z;
+??0OInterfaceContainerHelper@cppu@@QEAA@AEAVMutex@osl@@@Z;
+??0OInterfaceIteratorHelper@cppu@@QEAA@AEAVOInterfaceContainerHelper@1@@Z;
+??1OInterfaceContainerHelper@cppu@@QEAA@XZ;
+??1OInterfaceIteratorHelper@cppu@@QEAA@XZ;
+?addInterface@OInterfaceContainerHelper@cppu@@QEAAJAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
+?clear@OInterfaceContainerHelper@cppu@@QEAAXXZ;
+?copyAndResetInUse@OInterfaceContainerHelper@cppu@@AEAAXXZ;
+?disposeAndClear@OInterfaceContainerHelper@cppu@@QEAAXAEBUEventObject@lang@star@sun@com@@@Z;
+?getElements@OInterfaceContainerHelper@cppu@@QEBA?AV?$Sequence@V?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+?getLength@OInterfaceContainerHelper@cppu@@QEBAJXZ;
+?next@OInterfaceIteratorHelper@cppu@@QEAAPEAVXInterface@uno@star@sun@com@@XZ;
+?removeInterface@OInterfaceContainerHelper@cppu@@QEAAJAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
+??0WeakReferenceHelper@uno@star@sun@com@@QEAA@AEBV01234@@Z;
+??0WeakReferenceHelper@uno@star@sun@com@@QEAA@AEBV?$Reference@VXInterface@uno@star@sun@com@@@1234@@Z;
+??1OWeakAggObject@cppu@@MEAA@XZ;
+??1OWeakObject@cppu@@MEAA@XZ;
+??1WeakReferenceHelper@uno@star@sun@com@@QEAA@XZ;
+??4WeakReferenceHelper@uno@star@sun@com@@QEAAAEAV01234@AEBV01234@@Z;
+??4WeakReferenceHelper@uno@star@sun@com@@QEAAAEAV01234@AEBV?$Reference@VXInterface@uno@star@sun@com@@@1234@@Z;
+?acquire@OWeakAggObject@cppu@@UEAAXXZ;
+?acquire@OWeakObject@cppu@@UEAAXXZ;
+?get@WeakReferenceHelper@uno@star@sun@com@@QEBA?AV?$Reference@VXInterface@uno@star@sun@com@@@2345@XZ;
+?queryAdapter@OWeakObject@cppu@@UEAA?AV?$Reference@VXAdapter@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+?queryAggregation@OWeakAggObject@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
+?queryInterface@OWeakAggObject@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
+?queryInterface@OWeakObject@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
+?release@OWeakAggObject@cppu@@UEAAXXZ;
+?release@OWeakObject@cppu@@UEAAXXZ;
+?setDelegator@OWeakAggObject@cppu@@UEAAXAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
+??0OPropertyArrayHelper@cppu@@QEAA@AEBV?$Sequence@UProperty@beans@star@sun@com@@@uno@star@sun@com@@E@Z;
+??0OPropertyArrayHelper@cppu@@QEAA@PEAUProperty@beans@star@sun@com@@JE@Z;
+??1IPropertyArrayHelper@cppu@@UEAA@XZ;
+??1OPropertyArrayHelper@cppu@@UEAA@XZ;
+??1OPropertySetHelper@cppu@@QEAA@XZ;
+??_7IPropertyArrayHelper@cppu@@6B@;
+??_7OPropertyArrayHelper@cppu@@6B@;
+??_7OPropertySetHelper@cppu@@6BXFastPropertySet@beans@star@sun@com@@@;
+??_7OPropertySetHelper@cppu@@6BXMultiPropertySet@beans@star@sun@com@@@;
+??_7OPropertySetHelper@cppu@@6BXPropertySet@beans@star@sun@com@@@;
+??_GIPropertyArrayHelper@cppu@@UEAAPEAXI@Z;
+??_GOPropertyArrayHelper@cppu@@UEAAPEAXI@Z;
+?addPropertiesChangeListener@OPropertySetHelper@cppu@@UEAAXAEBV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@AEBV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@4567@@Z;
+?addPropertyChangeListener@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+?addVetoableChangeListener@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+?createPropertySetInfo@OPropertySetHelper@cppu@@SA?AV?$Reference@VXPropertySetInfo@beans@star@sun@com@@@uno@star@sun@com@@AEAVIPropertyArrayHelper@2@@Z;
+?disposing@OPropertySetHelper@cppu@@QEAAXXZ;
+?fillHandles@OPropertyArrayHelper@cppu@@UEAAJPEAJAEBV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@@Z;
+?fillPropertyMembersByHandle@OPropertyArrayHelper@cppu@@UEAAEPEAVOUString@rtl@@PEAFJ@Z;
+?fire@OPropertySetHelper@cppu@@IEAAXPEAJPEBVAny@uno@star@sun@com@@1JE@Z;
+?firePropertiesChangeEvent@OPropertySetHelper@cppu@@UEAAXAEBV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@AEBV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@4567@@Z;
+?getCount@OPropertyArrayHelper@cppu@@QEBAJXZ;
+?getFastPropertyValue@OPropertySetHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@J@Z;
+?getHandleByName@OPropertyArrayHelper@cppu@@UEAAJAEBVOUString@rtl@@@Z;
+?getProperties@OPropertyArrayHelper@cppu@@UEAA?AV?$Sequence@UProperty@beans@star@sun@com@@@uno@star@sun@com@@XZ;
+?getPropertyByName@OPropertyArrayHelper@cppu@@UEAA?AUProperty@beans@star@sun@com@@AEBVOUString@rtl@@@Z;
+?getPropertyValue@OPropertySetHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVOUString@rtl@@@Z;
+?getPropertyValues@OPropertySetHelper@cppu@@UEAA?AV?$Sequence@VAny@uno@star@sun@com@@@uno@star@sun@com@@AEBV?$Sequence@VOUString@rtl@@@4567@@Z;
+?hasPropertyByName@OPropertyArrayHelper@cppu@@UEAAEAEBVOUString@rtl@@@Z;
+?init@OPropertyArrayHelper@cppu@@AEAAXE@Z;
+?queryInterface@OPropertySetHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
+?queryInterface@OPropertySetHelper@cppu@@W7EAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
+?queryInterface@OPropertySetHelper@cppu@@WBA@EAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
+?removePropertiesChangeListener@OPropertySetHelper@cppu@@UEAAXAEBV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+?removePropertyChangeListener@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+?removeVetoableChangeListener@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+?setFastPropertyValue@OPropertySetHelper@cppu@@UEAAXJAEBVAny@uno@star@sun@com@@@Z;
+?setFastPropertyValues@OPropertySetHelper@cppu@@IEAAXJPEAJPEBVAny@uno@star@sun@com@@J@Z;
+?setPropertyValue@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBVAny@uno@star@sun@com@@@Z;
+?setPropertyValues@OPropertySetHelper@cppu@@UEAAXAEBV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@AEBV?$Sequence@VAny@uno@star@sun@com@@@4567@@Z;
+??0ClassDataBase@cppu@@QEAA@J@Z;
+??0ClassDataBase@cppu@@QEAA@XZ;
+??1ClassDataBase@cppu@@QEAA@XZ;
+?getImplHelperInitMutex@cppu@@YAAEAVMutex@osl@@XZ;
+?getImplementationId@ClassData@cppu@@QEAA?AV?$Sequence@C@uno@star@sun@com@@XZ;
+?getTypes@ClassData@cppu@@QEAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+?initTypeProvider@ClassData@cppu@@QEAAXXZ;
+?query@ClassData@cppu@@QEAA?AVAny@uno@star@sun@com@@AEBVType@4567@PEAVXTypeProvider@lang@567@@Z;
+?writeTypeOffset@ClassData@cppu@@QEAAXAEBVType@uno@star@sun@com@@J@Z;
+?createRegistryServiceFactory@cppu@@YA?AV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@0E0@Z;
+?throwException@cppu@@YAXAEBVAny@uno@star@sun@com@@@Z;
+??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@00000000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@0000000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@000000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@00000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@0000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@00000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@0000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@00AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@0AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??1OImplementationId@cppu@@QEAA@XZ;
+?getImplementationId@OImplementationId@cppu@@QEBA?AV?$Sequence@C@uno@star@sun@com@@XZ;
+?writeSharedLibComponentInfo@cppu@@YAXAEBVOUString@rtl@@0AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXRegistryKey@registry@star@sun@com@@@5678@@Z;
+?remove@OInterfaceIteratorHelper@cppu@@QEAAXXZ;
+??0OWeakObject@cppu@@QEAA@XZ;
+?installTypeDescriptionManager@cppu@@YAEAEBV?$Reference@VXHierarchicalNameAccess@container@star@sun@com@@@uno@star@sun@com@@@Z;
+?loadSharedLibComponentFactory@cppu@@YA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@00AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
+?createComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PEBUContextEntry_Init@1@JAEBV23456@@Z;
+?bootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@3456@AEBVOUString@rtl@@@Z;
+?createNestedRegistry@cppu@@YA?AV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@@Z;
+?createSimpleRegistry@cppu@@YA?AV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@@Z;
+??0WeakAggComponentImplHelperBase@cppu@@IEAA@AEAVMutex@osl@@@Z;
+??0WeakComponentImplHelperBase@cppu@@IEAA@AEAVMutex@osl@@@Z;
+?acquire@WeakAggComponentImplHelperBase@cppu@@UEAAXXZ;
+?acquire@WeakComponentImplHelperBase@cppu@@UEAAXXZ;
+?addEventListener@WeakAggComponentImplHelperBase@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
+?addEventListener@WeakComponentImplHelperBase@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
+?dispose@WeakAggComponentImplHelperBase@cppu@@UEAAXXZ;
+?dispose@WeakComponentImplHelperBase@cppu@@UEAAXXZ;
+?queryAggregation@WeakAggComponentImplHelperBase@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
+?queryInterface@WeakAggComponentImplHelperBase@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
+?queryInterface@WeakComponentImplHelperBase@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
+?release@WeakAggComponentImplHelperBase@cppu@@UEAAXXZ;
+?release@WeakComponentImplHelperBase@cppu@@UEAAXXZ;
+?removeEventListener@WeakAggComponentImplHelperBase@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
+?removeEventListener@WeakComponentImplHelperBase@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
+??1WeakAggComponentImplHelperBase@cppu@@UEAA@XZ;
+??1WeakComponentImplHelperBase@cppu@@UEAA@XZ;
+?disposing@WeakAggComponentImplHelperBase@cppu@@MEAAXXZ;
+?disposing@WeakComponentImplHelperBase@cppu@@MEAAXXZ;
+?createOneInstanceFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBVOUString@rtl@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@0@ZAEBV?$Sequence@VOUString@rtl@@@3456@PEAU_rtl_ModuleCount@@@Z;
+?createSingleComponentFactory@cppu@@YA?AV?$Reference@VXSingleComponentFactory@lang@star@sun@com@@@uno@star@sun@com@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@AEBV?$Reference@VXComponentContext@uno@star@sun@com@@@3456@@ZAEBVOUString@rtl@@AEBV?$Sequence@VOUString@rtl@@@3456@PEAU_rtl_ModuleCount@@@Z;
+?createSingleFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBVOUString@rtl@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@0@ZAEBV?$Sequence@VOUString@rtl@@@3456@PEAU_rtl_ModuleCount@@@Z;
+?defaultBootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+?acquire@OComponentHelper@cppu@@UEAAXXZ;
+?getTypes@OComponentHelper@cppu@@UEAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+?queryAggregation@OComponentHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
+?queryInterface@OComponentHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
+?removeListener@?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@cppu@@QEAAXAEBVType@uno@star@sun@com@@AEBV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
+??0OMultiTypeInterfaceContainerHelper@cppu@@QEAA@AEAVMutex@osl@@@Z;
+??0OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAA@AEAVMutex@osl@@@Z;
+??1OMultiTypeInterfaceContainerHelper@cppu@@QEAA@XZ;
+??1OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAA@XZ;
+?addInterface@OMultiTypeInterfaceContainerHelper@cppu@@QEAAJAEBVType@uno@star@sun@com@@AEBV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
+?addInterface@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAAJAEBJAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
+?clear@OMultiTypeInterfaceContainerHelper@cppu@@QEAAXXZ;
+?clear@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAAXXZ;
+?disposeAndClear@OMultiTypeInterfaceContainerHelper@cppu@@QEAAXAEBUEventObject@lang@star@sun@com@@@Z;
+?disposeAndClear@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAAXAEBUEventObject@lang@star@sun@com@@@Z;
+?getContainedTypes@OMultiTypeInterfaceContainerHelper@cppu@@QEBA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+?getContainedTypes@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEBA?AV?$Sequence@J@uno@star@sun@com@@XZ;
+?getContainer@OMultiTypeInterfaceContainerHelper@cppu@@QEBAPEAVOInterfaceContainerHelper@2@AEBVType@uno@star@sun@com@@@Z;
+?getContainer@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEBAPEAVOInterfaceContainerHelper@2@AEBJ@Z;
+?removeInterface@OMultiTypeInterfaceContainerHelper@cppu@@QEAAJAEBVType@uno@star@sun@com@@AEBV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
+?removeInterface@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAAJAEBJAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
+??0OPropertySetHelper@cppu@@QEAA@AEAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@@Z;
+?addListener@?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@cppu@@QEAAXAEBVType@uno@star@sun@com@@AEBV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
+?component_writeInfoHelper@cppu@@YAEPEAX0QEBUImplementationEntry@1@@Z;
+?component_getFactoryHelper@cppu@@YAPEAXPEBDPEAX1QEBUImplementationEntry@1@@Z;
+?ImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAX@Z;
+?ImplHelper_queryNoXInterface@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAX@Z;
+?ImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z;
+?ImplInhHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@AEBV23456@@Z;
+?ImplHelper_getImplementationId@cppu@@YA?AV?$Sequence@C@uno@star@sun@com@@PEAUclass_data@1@@Z;
+?WeakImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAXPEAVOWeakObject@1@@Z;
+?WeakImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z;
+?WeakAggImplHelper_queryAgg@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAXPEAVOWeakAggObject@1@@Z;
+?WeakAggComponentImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z;
+?WeakComponentImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAXPEAVWeakComponentImplHelperBase@1@@Z;
+?WeakAggImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z;
+?WeakAggComponentImplHelper_queryAgg@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAXPEAVWeakAggComponentImplHelperBase@1@@Z;
+?WeakComponentImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z;
+?defaultBootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@@Z;
+
+??0AccessControl@cppu@@QEAA@AEBV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@@Z;
+??0AccessControl@cppu@@QEAA@AEBV?$Reference@VXAccessController@security@star@sun@com@@@uno@star@sun@com@@@Z;
+??0AccessControl@cppu@@QEAA@AEBV01@@Z;
+?checkRuntimePermission@AccessControl@cppu@@QEAAXAEBVOUString@rtl@@@Z;
+?checkFilePermission@AccessControl@cppu@@QEAAXAEBVOUString@rtl@@0@Z;
+?checkSocketPermission@AccessControl@cppu@@QEAAXAEBVOUString@rtl@@0@Z;
+
+??0UnoUrl@cppu@@QEAA@AEBV01@@Z;
+??0UnoUrl@cppu@@QEAA@AEBVOUString@rtl@@@Z;
+??0UnoUrlDescriptor@cppu@@QEAA@AEBV01@@Z;
+??0UnoUrlDescriptor@cppu@@QEAA@AEBVOUString@rtl@@@Z;
+??1UnoUrl@cppu@@QEAA@XZ;
+??1UnoUrlDescriptor@cppu@@QEAA@XZ;
+??4UnoUrl@cppu@@QEAAAEAV01@AEBV01@@Z;
+??4UnoUrlDescriptor@cppu@@QEAAAEAV01@AEBV01@@Z;
+?getConnection@UnoUrl@cppu@@QEBAAEBVUnoUrlDescriptor@2@XZ;
+?getDescriptor@UnoUrlDescriptor@cppu@@QEBAAEBVOUString@rtl@@XZ;
+?getName@UnoUrlDescriptor@cppu@@QEBAAEBVOUString@rtl@@XZ;
+?getObjectName@UnoUrl@cppu@@QEBAAEBVOUString@rtl@@XZ;
+?getParameter@UnoUrlDescriptor@cppu@@QEBA?AVOUString@rtl@@AEBV34@@Z;
+?getProtocol@UnoUrl@cppu@@QEBAAEBVUnoUrlDescriptor@2@XZ;
+?hasParameter@UnoUrlDescriptor@cppu@@QEBA_NAEBVOUString@rtl@@@Z;
+
+    local:
+        *;
+};
+
+UDK_3.1 {
+    global:
+        ?getCaughtException@cppu@@YA?AVAny@uno@star@sun@com@@XZ;
+
+        ??0OPropertySetHelper@cppu@@QEAA@AEAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@_N@Z;
+
+        ?bootstrap@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+        ??0BootstrapException@cppu@@QEAA@XZ;
+        ??0BootstrapException@cppu@@QEAA@AEBVOUString@rtl@@@Z;
+        ??0BootstrapException@cppu@@QEAA@AEBV01@@Z;
+        ??1BootstrapException@cppu@@UEAA@XZ;
+        ??4BootstrapException@cppu@@QEAAAEAV01@AEBV01@@Z;
+        ?getMessage@BootstrapException@cppu@@QEBAAEBVOUString@rtl@@XZ;
+} UDK_3_0_0;
+
+UDK_3.2 {
+    global:
+        ??1PropertySetMixinImpl@cppu@@AEAA@XZ;
+        ?queryInterface@PropertySetMixinImpl@cppu@@MEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
+        ?getPropertySetInfo@PropertySetMixinImpl@cppu@@MEAA?AV?$Reference@VXPropertySetInfo@beans@star@sun@com@@@uno@star@sun@com@@XZ;
+        ?notify@BoundListeners@PropertySetMixinImpl@cppu@@QEBAXXZ;
+        ?setPropertyValue@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBVAny@uno@star@sun@com@@@Z;
+        ?getPropertyValue@PropertySetMixinImpl@cppu@@MEAA?AVAny@uno@star@sun@com@@AEBVOUString@rtl@@@Z;
+        ?removePropertyChangeListener@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+        ?removeVetoableChangeListener@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+        ?setFastPropertyValue@PropertySetMixinImpl@cppu@@MEAAXJAEBVAny@uno@star@sun@com@@@Z;
+        ?getFastPropertyValue@PropertySetMixinImpl@cppu@@MEAA?AVAny@uno@star@sun@com@@J@Z;
+        ?getPropertyValues@PropertySetMixinImpl@cppu@@MEAA?AV?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@XZ;
+        ?setPropertyValues@PropertySetMixinImpl@cppu@@MEAAXAEBV?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+        ?prepareSet@PropertySetMixinImpl@cppu@@IEAAXAEBVOUString@rtl@@AEBVAny@uno@star@sun@com@@1PEAVBoundListeners@12@@Z;
+        ??0BoundListeners@PropertySetMixinImpl@cppu@@QEAA@XZ;
+        ??1BoundListeners@PropertySetMixinImpl@cppu@@QEAA@XZ;
+        ??0PropertySetMixinImpl@cppu@@AEAA@AEBV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@W4Implements@01@AEBV?$Sequence@VOUString@rtl@@@3456@AEBVType@3456@@Z;
+        ?dispose@PropertySetMixinImpl@cppu@@IEAAXXZ;
+        ?addPropertyChangeListener@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+        ?addVetoableChangeListener@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+} UDK_3.1;
+
+UDK_3.3 {
+    global:
+        ?getTypes@OPropertySetHelper@cppu@@QEAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+} UDK_3.2;
+
+UDK_3.4 { # OOo 2.4
+    global:
+        ?bootstrap_expandUri@cppu@@YA?AVOUString@rtl@@AEBV23@@Z; # rtl::OUString cppu::bootstrap_expandUri(rtl::OUString const &)
+} UDK_3.3;
+
+UDK_3.5 { # OOo 3.0
+    global:
+        ??0OPropertySetHelper@cppu@@QEAA@AEAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@PEAVIEventNotificationHook@1@_N@Z;
+} UDK_3.4;
+
+UDK_3.6 { # OOo 3.3
+    global:
+        ?disposeWeakConnectionPoint@OWeakObject@cppu@@IEAAXXZ;
+        ?clear@WeakReferenceHelper@uno@star@sun@com@@QEAAXXZ;
+        ?createOneInstanceComponentFactory@cppu@@YA?AV?$Reference@VXSingleComponentFactory@lang@star@sun@com@@@uno@star@sun@com@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@AEBV?$Reference@VXComponentContext@uno@star@sun@com@@@3456@@ZAEBVOUString@rtl@@AEBV?$Sequence@VOUString@rtl@@@3456@PEAU_rtl_ModuleCount@@@Z;
+} UDK_3.5;
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index d12fd408f035..ec7125b448d8 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1426,3 +1427,5 @@ void PropertySetMixinImpl::setPropertyValues(
             rtl::OUString(), static_cast< css::beans::XPropertySet * >(this));
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index e43f93272e16..27d18ad26075 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,9 +42,11 @@ using namespace osl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
-using namespace rtl;
 using namespace cppu;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
 namespace cppu {
 
 IPropertyArrayHelper::~IPropertyArrayHelper()
@@ -237,8 +240,8 @@ void OPropertySetHelper::disposing() SAL_THROW( () )
     EventObject aEvt;
     aEvt.Source = rSource;
 
-    // inform all listeners to reelease this object
-    // The listener container are automaticly cleared
+    // inform all listeners to release this object
+    // The listener containers are automatically cleared
     aBoundLC.disposeAndClear( aEvt );
     aVetoableLC.disposeAndClear( aEvt );
 }
@@ -305,7 +308,7 @@ void OPropertySetHelper::addPropertyChangeListener(
             rPH.fillPropertyMembersByHandle( NULL, &nAttributes, nHandle );
             if( !(nAttributes & ::com::sun::star::beans::PropertyAttribute::BOUND) )
             {
-                OSL_ENSURE( sal_False, "add listener to an unbound property" );
+                OSL_FAIL( "add listener to an unbound property" );
                 // silent ignore this
                 return;
             }
@@ -387,7 +390,7 @@ void OPropertySetHelper::addVetoableChangeListener(
             rPH.fillPropertyMembersByHandle( NULL, &nAttributes, nHandle );
             if( !(nAttributes & PropertyAttribute::CONSTRAINED) )
             {
-                OSL_ENSURE( sal_False, "addVetoableChangeListener, and property is not constrained" );
+                OSL_FAIL( "addVetoableChangeListener, and property is not constrained" );
                 // silent ignore this
                 return;
             }
@@ -1001,11 +1004,11 @@ void OPropertySetHelper::firePropertiesChangeEvent(
     Sequence<PropertyChangeEvent> aChanges( nFireLen );
     PropertyChangeEvent* pChanges = aChanges.getArray();
 
-    sal_Int32 nFirePos = 0;
     {
     // must lock the mutex outside the loop. So all values are consistent.
     MutexGuard aGuard( rBHelper.rMutex );
     Reference < XInterface > xSource( (XPropertySet *)this, UNO_QUERY );
+    sal_Int32 nFirePos = 0;
     for( i = 0; i < nLen; i++ )
     {
         if( pHandles[i] != -1 )
@@ -1038,7 +1041,6 @@ PropertyState OPropertySetHelper::getPropertyState( const OUString& PropertyName
 Sequence< PropertyState > OPropertySetHelper::getPropertyStates( const Sequence< OUString >& PropertyNames )
 {
     ULONG nNames = PropertyNames.getLength();
-    const OUString* pNames = PropertyNames.getConstArray();
 
     Sequence< PropertyState > aStates( nNames );
     return aStates;
@@ -1105,11 +1107,9 @@ void OPropertyArrayHelper::init( sal_Bool bSorted ) SAL_THROW( () )
     {
         if(  pProperties[i-1].Name >= pProperties[i].Name )
         {
-#ifndef OS2 // YD disabled, too many troubles with debug builds!
             if (bSorted) {
-                OSL_ENSURE( false, "Property array is not sorted" );
+                OSL_FAIL( "Property array is not sorted" );
             }
-#endif
             // not sorted
             qsort( aInfos.getArray(), nElements, sizeof( Property ),
                     compare_Property_Impl );
@@ -1261,7 +1261,7 @@ sal_Int32 OPropertyArrayHelper::fillHandles( sal_Int32 * pHandles, const Sequenc
 
     for( sal_Int32 i = 0; i < nReqLen; i++ )
     {
-        // Logarithmus ermitteln
+        // Calculate logarithm
         sal_Int32 n = (sal_Int32)(pEnd - pCur);
         sal_Int32 nLog = 0;
         while( n )
@@ -1270,8 +1270,8 @@ sal_Int32 OPropertyArrayHelper::fillHandles( sal_Int32 * pHandles, const Sequenc
             n = n >> 1;
         }
 
-        // Anzahl der noch zu suchenden Properties * dem Log2 der verbleibenden
-        // zu dursuchenden Properties.
+        // Number of properties to search for * Log2 of the number of remaining
+        // properties to search in.
         if( (nReqLen - i) * nLog >= pEnd - pCur )
         {
             // linear search is better
@@ -1332,3 +1332,4 @@ sal_Int32 OPropertyArrayHelper::fillHandles( sal_Int32 * pHandles, const Sequenc
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index bcc58b74af59..742f94ac5f97 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -129,7 +130,7 @@ Reference< registry::XSimpleRegistry > SAL_CALL createSimpleRegistry(
 #if OSL_DEBUG_LEVEL > 0
         OString cstr_msg(
             OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( !"### exception occured:", cstr_msg.getStr() );
+        OSL_ENSURE( !"### exception occurred:", cstr_msg.getStr() );
 #else
         (void) exc; // avoid warning about unused variable
 #endif
@@ -160,7 +161,7 @@ Reference< registry::XSimpleRegistry > SAL_CALL createNestedRegistry(
 #if OSL_DEBUG_LEVEL > 0
         OString cstr_msg(
             OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( !"### exception occured:", cstr_msg.getStr() );
+        OSL_ENSURE( !"### exception occurred:", cstr_msg.getStr() );
 #else
         (void) exc; // avoid warning about unused variable
 #endif
@@ -659,3 +660,5 @@ Reference< XComponentContext > SAL_CALL bootstrap_InitialComponentContext(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index d9cf79396090..544ba8c5d6fc 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,6 +35,7 @@
 #include "osl/module.hxx"
 #include "rtl/unload.h"
 #include "rtl/ustrbuf.hxx"
+#include "rtl/instance.hxx"
 #include "uno/environment.h"
 #include "uno/mapping.hxx"
 #include "cppuhelper/factory.hxx"
@@ -61,7 +63,7 @@ namespace cppu
 //------------------------------------------------------------------------------
 static inline void out( const char * p ) SAL_THROW( () )
 {
-    printf( p );
+    printf( "%s\n", p );
 }
 static inline void out( const OUString & r ) throw ()
 {
@@ -70,21 +72,20 @@ static inline void out( const OUString & r ) throw ()
 }
 #endif
 
-//------------------------------------------------------------------------------
-static const ::std::vector< OUString > * getAccessDPath() SAL_THROW( () )
+namespace
 {
-    static ::std::vector< OUString > * s_p = 0;
-    static bool s_bInit = false;
-
-    if (! s_bInit)
+    class buildAccessDPath
     {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-        if (! s_bInit)
+    private:
+        ::std::vector< OUString > m_aAccessDPath;
+        bool m_bCPLD_ACCESSPATHSet;
+    public:
+        buildAccessDPath() : m_bCPLD_ACCESSPATHSet(false)
         {
             const char * pEnv = ::getenv( "CPLD_ACCESSPATH" );
             if (pEnv)
             {
-                static ::std::vector< OUString > s_v;
+                m_bCPLD_ACCESSPATHSet = true;
 
                 OString aEnv( pEnv );
                 sal_Int32 nIndex = 0;
@@ -99,34 +100,39 @@ static const ::std::vector< OUString > * getAccessDPath() SAL_THROW( () )
                     {
                         OSL_ASSERT(false);
                     }
-                    s_v.push_back( aFileUrl );
+                    m_aAccessDPath.push_back( aFileUrl );
                 } while( nIndex != -1 );
-#if OSL_DEBUG_LEVEL > 1
+    #if OSL_G_LEVEL > 1
                 out( "> cpld: acknowledged following access path(s): \"" );
-                ::std::vector< OUString >::const_iterator iPos( s_v.begin() );
-                while (iPos != s_v.end())
+                ::std::vector< OUString >::const_iterator iPos( m_aAccessDPath.begin() );
+                while (iPos != m_aAccessDPath.end())
                 {
                     out( *iPos );
                     ++iPos;
-                    if (iPos != s_v.end())
+                    if (iPos != m_aAccessDPath.end())
                         out( ";" );
                 }
                 out( "\"\n" );
-#endif
-                s_p = & s_v;
+    #endif
             }
             else
             {
                 // no access path env set
-#if OSL_DEBUG_LEVEL > 1
+    #if OSL_G_LEVEL > 1
                 out( "=> no CPLD_ACCESSPATH set.\n" );
-#endif
+    #endif
             }
-            s_bInit = true;
         }
-    }
+        ::std::vector< OUString >* getAccessDPath() { return m_bCPLD_ACCESSPATHSet ? &m_aAccessDPath : NULL; }
+    };
 
-    return s_p;
+    class theAccessDPath : public rtl::Static<buildAccessDPath, theAccessDPath> {};
+}
+
+//------------------------------------------------------------------------------
+static const ::std::vector< OUString > * getAccessDPath() SAL_THROW( () )
+{
+    return theAccessDPath::get().getAccessDPath();
 }
 
 //------------------------------------------------------------------------------
@@ -241,15 +247,6 @@ static OUString makeComponentPath(
     sal_Int32 nEnd = endsWith( rLibName, OUSTR(SAL_DLLEXTENSION) );
     if (nEnd < 0) // !endsWith
     {
-#ifndef OS2
-//this is always triggered with .uno components
-#if (OSL_DEBUG_LEVEL >= 2)
-        OSL_ENSURE(
-            !"### library name has no proper extension!",
-            OUStringToOString( rLibName, RTL_TEXTENCODING_ASCII_US ).getStr() );
-#endif
-#endif // OS2
-
 #if defined SAL_DLLPREFIX
         nEnd = endsWith( rLibName, OUSTR(".uno") );
         if (nEnd < 0) // !endsWith
@@ -607,3 +604,5 @@ void SAL_CALL writeSharedLibComponentInfo(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/stdidlclass.cxx b/cppuhelper/source/stdidlclass.cxx
index fdfc9bc34a65..1c617da22f24 100644
--- a/cppuhelper/source/stdidlclass.cxx
+++ b/cppuhelper/source/stdidlclass.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,7 +45,8 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::reflection;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 namespace cppu {
 
@@ -257,3 +259,5 @@ XIdlClass *  SAL_CALL createStandardClassWithSequence(
 }
 
 } //end namespace cppu
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 4a8a88f2093a..7090adbe90d3 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -523,8 +524,7 @@ inline static typelib_TypeDescription * createCTD(
             0, 0 );
 
         // cleanup
-        if (pRefType)
-            typelib_typedescription_release( pRefType );
+        typelib_typedescription_release( pRefType );
     }
     return pRet;
 }
@@ -782,3 +782,4 @@ sal_Bool SAL_CALL installTypeDescriptionManager(
 
 } // end namespace cppu
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/typeprovider.cxx b/cppuhelper/source/typeprovider.cxx
index 1df32079b052..fd403f9d2beb 100644
--- a/cppuhelper/source/typeprovider.cxx
+++ b/cppuhelper/source/typeprovider.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -324,3 +325,4 @@ OTypeCollection::OTypeCollection(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx
index 6abf86d29845..eff9f8a0be2a 100644
--- a/cppuhelper/source/unourl.cxx
+++ b/cppuhelper/source/unourl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -296,3 +297,5 @@ rtl::OUString const & UnoUrl::getObjectName() const
 {
     return m_xImpl->m_aObjectName;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 27b94f6a4c34..11b99fc45076 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,12 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cppuhelper.hxx"
 #include <osl/mutex.hxx>
-#ifndef _CPPU_WEAKAGG_HXX_
 #include <cppuhelper/weakagg.hxx>
-#endif
-#ifndef _CPPU_HELPER_INTERFACECONTAINER_HXX_
 #include <cppuhelper/interfacecontainer.hxx>
-#endif
 #include "cppuhelper/exc_hlp.hxx"
 
 using namespace osl;
@@ -229,8 +226,8 @@ void OWeakObject::disposeWeakConnectionPoint()
             p->dispose();
         }
         catch (RuntimeException const& exc) {
-            OSL_ENSURE(
-                false, OUStringToOString(
+            OSL_FAIL(
+                OUStringToOString(
                     exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
             static_cast<void>(exc);
         }
@@ -293,16 +290,6 @@ Any OWeakAggObject::queryInterface( const Type & rType ) throw(::com::sun::star:
 {
     Reference< XInterface > x( xDelegator ); // harden ref
     return (x.is() ? x->queryInterface( rType ) : queryAggregation( rType ));
-
-//      // set rOut to zero, if failed
-//      if( !xDelegator.queryHardRef( aUik, rOut ) )
-//      {
-//          XInterfaceRef x;
-//          if( !xDelegator.queryHardRef( ((XInterface*)0)->getSmartUik(), x ) )
-//              // reference is not valid
-//              queryAggregation( aUik, rOut );
-//      }
-//      return rOut.is();
 }
 
 // XAggregation
@@ -551,3 +538,4 @@ Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW( () )
 }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/bootstrap/TestEnv.cxx b/cppuhelper/test/bootstrap/TestEnv.cxx
index 3bf3533b619e..578378ee2898 100644
--- a/cppuhelper/test/bootstrap/TestEnv.cxx
+++ b/cppuhelper/test/bootstrap/TestEnv.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -126,3 +127,4 @@ extern "C" void uno_ext_getMapping(uno_Mapping     ** ppMapping,
     cppu::helper::purpenv::createMapping(ppMapping, pFrom, pTo);
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/bootstrap/bootstrap.test.cxx b/cppuhelper/test/bootstrap/bootstrap.test.cxx
index 07b0d6a50c70..b0eadb6946a1 100644
--- a/cppuhelper/test/bootstrap/bootstrap.test.cxx
+++ b/cppuhelper/test/bootstrap/bootstrap.test.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -318,3 +319,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv)
 
     return ret;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/cfg_data/template/uno/components.xml b/cppuhelper/test/cfg_data/template/uno/components.xml
index 6ff26a5b9cec..5ab04d030fb3 100644
--- a/cppuhelper/test/cfg_data/template/uno/components.xml
+++ b/cppuhelper/test/cfg_data/template/uno/components.xml
@@ -5,7 +5,7 @@
             xmlns:cfg="http://openoffice.org/2000/registry/instance">
 
 <service>
- <available-implementations cfg:type="string" cfg:derivedBy=="list"/>
+ <available-implementations cfg:type="string" cfg:derivedBy="list"/>
  <context-properties cfg:type="set" cfg:element-type="cfg:any"/>
 </service>
 
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index 9141b8373090..95640a69447f 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -226,7 +227,7 @@ static struct ImplementationEntry g_entries[] =
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -239,7 +240,7 @@ sal_Bool SAL_CALL component_writeInfo(
         pServiceManager, pRegistryKey, g_entries );
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper(
@@ -262,7 +263,7 @@ SAL_IMPLEMENT_MAIN()
         // show what is in context
         xContext->getValueByName( OUSTR("dump_maps") );
 
-        sal_Int32 n;
+        sal_Int32 n(0);
         OSL_VERIFY( xContext->getValueByName( OUSTR("/global-context-properties/TestValue") ) >>= n );
         ::fprintf( stderr, "> n=%d\n", n );
 
@@ -271,8 +272,8 @@ SAL_IMPLEMENT_MAIN()
         OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.script.theConverter") ) >>= x );
         OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.bootstrap.theTestComponent0") ) >>= x );
 
-        ::fprintf( stderr, "> registering service...\n", n );
-#if defined(SAL_W32) || defined(SAL_OS2)
+        ::fprintf( stderr, "> registering service...\n");
+#if defined(SAL_W32)
         OUString libName( OUSTR("cfg_test.dll") );
 #elif defined(SAL_UNX)
         OUString libName( OUSTR("libcfg_test.so") );
@@ -301,3 +302,5 @@ SAL_IMPLEMENT_MAIN()
         return 1;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/loader/loader.test.cxx b/cppuhelper/test/loader/loader.test.cxx
index dcd6b34ced68..53d5d96ac175 100644
--- a/cppuhelper/test/loader/loader.test.cxx
+++ b/cppuhelper/test/loader/loader.test.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -203,3 +204,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv)
 
     return result;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/loader/makefile.mk b/cppuhelper/test/loader/makefile.mk
index dc1b5662bd43..4816dcb47e36 100644
--- a/cppuhelper/test/loader/makefile.mk
+++ b/cppuhelper/test/loader/makefile.mk
@@ -34,15 +34,8 @@ ENABLE_EXCEPTIONS  := TRUE
 NO_BSYMBOLIC       := TRUE
 USE_DEFFILE        := TRUE
 
-
 .INCLUDE :  settings.mk
 
-
-.IF "$(COM)" == "GCC"
-#LINKFLAGS += -rdynamic
-.ENDIF
-
-
 ENVINCPRE  := -I$(OUT)$/inc$/$(TARGET)
 
 APP1TARGET  := $(TARGET)
diff --git a/cppuhelper/test/makefile.mk b/cppuhelper/test/makefile.mk
index 26e1cb394d3e..7a67d6690c8b 100644
--- a/cppuhelper/test/makefile.mk
+++ b/cppuhelper/test/makefile.mk
@@ -127,7 +127,7 @@ TYPES:=test.A;test.BA;test.CA;test.DBA;test.E;test.FE;test.G;test.H;test.I
 HELPERTYPES:=com.sun.star.uno.XReference;com.sun.star.uno.XAdapter;com.sun.star.uno.XAggregation;com.sun.star.uno.XWeak;com.sun.star.lang.XComponent;com.sun.star.lang.XTypeProvider;com.sun.star.lang.XEventListener;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.registry.XRegistryKey;com.sun.star.lang.XInitialization;com.sun.star.lang.XServiceInfo;com.sun.star.loader.XImplementationLoader;com.sun.star.lang.IllegalAccessException;com.sun.star.beans.XVetoableChangeListener;com.sun.star.beans.XPropertySet;com.sun.star.uno.XComponentContext
 FACTORYTYPES:=com.sun.star.lang.XComponent;com.sun.star.registry.XSimpleRegistry;com.sun.star.lang.XInitialization;com.sun.star.lang.XMultiServiceFactory;com.sun.star.loader.XImplementationLoader;com.sun.star.registry.XImplementationRegistration;com.sun.star.container.XSet;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XMultiComponentFactory
 
-.IF "$(OS)" == "WNT" || "$(OS)" == "OS2"
+.IF "$(OS)" == "WNT"
 UNO_PATH := $(SOLARBINDIR)
 UNO_OUT := $(OUT)$/bin
 EXT_SO  := .dll
@@ -141,15 +141,15 @@ $(UNO_OUT)$/%$(EXT_SO): $(UNO_PATH)$/%$(EXT_SO)
     $(COPY) $^ $@
 
 $(BIN)$/cpputest.rdb: $(ALLIDLFILES) $(UNO_OUT)$/invocadapt.uno$(EXT_SO) $(UNO_OUT)$/bootstrap.uno$(EXT_SO)
-    idlc -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $(ALLIDLFILES)
-    regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)}
-    regmerge $@ / $(UNOUCRRDB)
-    regcomp -register -r $@ -c reflection.uno$(DLLPOST)
-    touch $@
+    $(IDLC) -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $(ALLIDLFILES)
+    $(REGMERGE) $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)}
+    $(REGMERGE) $@ / $(UNOUCRRDB)
+    $(REGCOMP) -register -r $@ -c reflection.uno$(DLLPOST)
+    $(TOUCH) $@
 
 unoheader: $(BIN)$/cpputest.rdb
-    cppumaker $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(TYPES);$(HELPERTYPES)" $(BIN)$/cpputest.rdb
-    cppumaker $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(FACTORYTYPES)" $(BIN)$/cpputest.rdb
+    $(CPPUMAKER) $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(TYPES);$(HELPERTYPES)" $(BIN)$/cpputest.rdb
+    $(CPPUMAKER) $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(FACTORYTYPES)" $(BIN)$/cpputest.rdb
 
 
 $(BIN)$/testdefaultbootstrapping.pl: testdefaultbootstrapping.pl
diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx
index 4a47e503cb9e..83bdac1a47a2 100644
--- a/cppuhelper/test/testcmp/TestComponent.cxx
+++ b/cppuhelper/test/testcmp/TestComponent.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -245,3 +246,5 @@ extern "C" SAL_DLLPUBLIC_EXPORT  void SAL_CALL component_getImplementationEnviro
         *envTypeName = strdup(buff);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/testcmp/TestComponent.hxx b/cppuhelper/test/testcmp/TestComponent.hxx
index b73ee6300072..7499628148f4 100644
--- a/cppuhelper/test/testcmp/TestComponent.hxx
+++ b/cppuhelper/test/testcmp/TestComponent.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,3 +55,5 @@ CPPUHELPER_TEST_COMPONENT_EXPORT rtl::OUString g_envDcp;
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/testcontainer.cxx b/cppuhelper/test/testcontainer.cxx
index d15dbd18c159..5665a762eaa0 100644
--- a/cppuhelper/test/testcontainer.cxx
+++ b/cppuhelper/test/testcontainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,6 +44,7 @@ using namespace ::com::sun::star::uno;
 
 class TestListener : public WeakImplHelper1< XVetoableChangeListener >
 {
+public:
     // Methods
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw(::com::sun::star::uno::RuntimeException)
         {
@@ -54,7 +56,6 @@ class TestListener : public WeakImplHelper1< XVetoableChangeListener >
         {
 
         }
-
 };
 
 void test_interfacecontainer()
@@ -151,3 +152,5 @@ void test_interfacecontainer()
         helper.disposeAndClear( EventObject() );
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/testdefaultbootstrapping.cxx b/cppuhelper/test/testdefaultbootstrapping.cxx
index 664ff6dc422a..82172c26d838 100644
--- a/cppuhelper/test/testdefaultbootstrapping.cxx
+++ b/cppuhelper/test/testdefaultbootstrapping.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,6 +39,7 @@
 #include <cppuhelper/bootstrap.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 using namespace ::cppu;
 using namespace ::com::sun::star::lang;
@@ -82,3 +84,5 @@ SAL_IMPLEMENT_MAIN()
 
     return result;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/testhelper.cxx b/cppuhelper/test/testhelper.cxx
index a50d78aed18a..431c3cb16251 100644
--- a/cppuhelper/test/testhelper.cxx
+++ b/cppuhelper/test/testhelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,13 +50,16 @@
 
 #include "testhelper.hxx"
 
-using namespace rtl;
 using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+
 SAL_IMPLEMENT_MAIN()
 {
     try
@@ -96,9 +100,11 @@ SAL_IMPLEMENT_MAIN()
     catch (Exception & exc)
     {
         OString cstr_msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( ! "exception occured: ", cstr_msg.getStr() );
+        OSL_ENSURE( ! "exception occurred: ", cstr_msg.getStr() );
     }
 
     printf( "Test finished\n" );
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/testhelper.hxx b/cppuhelper/test/testhelper.hxx
index 77119c05f0f4..a164c1c6b9f4 100644
--- a/cppuhelper/test/testhelper.hxx
+++ b/cppuhelper/test/testhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,3 +30,5 @@ void testPropertyTypeHelper();
 void test_PropertySetHelper();
 void test_ImplHelper( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > & xSF );
 void test_interfacecontainer();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/testidlclass.cxx b/cppuhelper/test/testidlclass.cxx
index 6ae238e47319..48ee84ed9101 100644
--- a/cppuhelper/test/testidlclass.cxx
+++ b/cppuhelper/test/testidlclass.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -225,3 +226,5 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr)
                                 (XServiceInfo * ) 0
                                             );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/testimplhelper.cxx b/cppuhelper/test/testimplhelper.cxx
index 0a79158ff705..db45093f3e8b 100644
--- a/cppuhelper/test/testimplhelper.cxx
+++ b/cppuhelper/test/testimplhelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,12 +81,15 @@
 #include <com/sun/star/lang/IllegalAccessException.hpp>
 
 using namespace test;
-using namespace rtl;
 using namespace osl;
 using namespace cppu;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
 //==================================================================================================
 struct TestImpl : public ImplHelper4< CA, DBA, FE, G >
 {
@@ -554,7 +558,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
         }
         catch (lang::IllegalAccessException &)
         {
-            OSL_ENSURE( sal_False, "### unexpected IllegalAccessException exception caught!" );
+            OSL_FAIL( "### unexpected IllegalAccessException exception caught!" );
         }
         catch (Exception & rExc2)
         {
@@ -576,6 +580,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
     catch (...)
     {
     }
-    OSL_ENSURE( sal_False, "### exception test failed!" );
+    OSL_FAIL( "### exception test failed!" );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/testlib/defbootstrap_lib.cxx b/cppuhelper/test/testlib/defbootstrap_lib.cxx
index c9656924e9cf..64c28766a5f3 100644
--- a/cppuhelper/test/testlib/defbootstrap_lib.cxx
+++ b/cppuhelper/test/testlib/defbootstrap_lib.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -115,3 +116,5 @@ XS(boot_UNO)
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/testlib/makefile.mk b/cppuhelper/test/testlib/makefile.mk
index edaba0c6532c..b53f6ebab71b 100755
--- a/cppuhelper/test/testlib/makefile.mk
+++ b/cppuhelper/test/testlib/makefile.mk
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+
 LINKFLAGSDEFS=""
 
 PRJ=..$/..
@@ -56,9 +57,6 @@ LIB!:=$(LIB);$(PERLLIBS)
 
 # --- Files --------------------------------------------------------
 
-#CFLAGS +=   -DVERSION=\"0.01\" -DXS_VERSION=\"0.01\" -fPIC -I/develop6/update/dev/solenv/unxlngi3/lib/perl5/5.6.0/i686-linux/CORE/
-#CFLAGS += -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DVERSION=\"0.01\" -DXS_VERSION=\"0.01\" -KPIC -I/develop6/update/dev/solenv/unxsols2/lib/perl5/5.6.0/sun4-solaris/CORE  
-
 SLOFILES= $(SLO)$/defbootstrap_lib.obj
 
 SHL1TARGET=$(TARGET)
diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx
index 37c8613bb6b3..965159ffc637 100644
--- a/cppuhelper/test/testpropshlp.cxx
+++ b/cppuhelper/test/testpropshlp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -239,7 +240,7 @@ void test_PropertyArrayHelper()
         try
         {
             a1.getPropertyByName( OUString( RTL_CONSTASCII_USTRINGPARAM("never exist") ) );
-            OSL_ENSURE( sal_False, "exeption not thrown" );
+            OSL_FAIL( "exeption not thrown" );
         }
         catch( UnknownPropertyException & )
         {
@@ -460,7 +461,7 @@ public:
                     {
                     }
 
-    sal_Int32   getRefCount()
+    sal_Int32   getRefCount() const
         { return m_refCount; }
 
     // XEventListener
@@ -482,7 +483,7 @@ public:
         {
             case PROPERTY_BOOL:
                 {
-                OSL_ENSURE( sal_False           , "PropertySetHelper: BOOL cannot change" );
+                OSL_FAIL( "PropertySetHelper: BOOL cannot change" );
                 OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" );
                 }
             break;
@@ -494,7 +495,7 @@ public:
                 OSL_ENSURE( pExceptedListenerValues[nCurrent].getValueType().getTypeClass() == TypeClass_SHORT ,
                             "PropertySetHelper: wrong data type" );
 
-                sal_Int16 nInt16, nOldInt16;
+                sal_Int16 nInt16(0), nOldInt16(0);
                 pExceptedListenerValues[nCurrent]   >>= nInt16;
                 evt.OldValue                        >>= nOldInt16;
                 OSL_ENSURE( nInt16 == nOldInt16, "PropertySetHelper: wrong old value" );
@@ -510,7 +511,7 @@ public:
                 {
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" );
 
-                    sal_Int32 nInt32,nOldInt32;
+                    sal_Int32 nInt32(0),nOldInt32(0);
 
                     pExceptedListenerValues[nCurrent] >>= nInt32;
                     evt.OldValue >>= nOldInt32;
@@ -523,7 +524,7 @@ public:
             break;
 
             default:
-                OSL_ENSURE( sal_False, "XPropeSetHelper: invalid property handle" );
+                OSL_FAIL( "XPropeSetHelper: invalid property handle" );
         }
         nCurrent += 2;
     }
@@ -540,7 +541,7 @@ public:
         {
             case PROPERTY_BOOL:
                 {
-                    OSL_ENSURE( sal_False   , "PropertySetHelper: BOOL cannot change" );
+                    OSL_FAIL( "PropertySetHelper: BOOL cannot change" );
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" );
                 }
             break;
@@ -549,7 +550,7 @@ public:
                 {
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" );
 
-                    sal_Int16 nInt16, nOldInt16;
+                    sal_Int16 nInt16(0), nOldInt16(0);
                     pExceptedListenerValues[nCurrent]   >>= nInt16;
                     evt.OldValue                        >>= nOldInt16;
 
@@ -571,7 +572,7 @@ public:
                 {
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" );
 
-                    sal_Int32 nInt32,nOldInt32;
+                    sal_Int32 nInt32(0),nOldInt32(0);
                     pExceptedListenerValues[nCurrent] >>= nInt32;
                     evt.OldValue >>= nOldInt32;
                     OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong old value" );
@@ -583,7 +584,7 @@ public:
             break;
 
             default:
-                OSL_ENSURE( sal_False, "XPropeSetHelper: invalid property handle" );
+                OSL_FAIL( "XPropeSetHelper: invalid property handle" );
         }
         nCurrent += 2;
     }
@@ -603,7 +604,7 @@ public:
             {
                 case PROPERTY_BOOL:
                     {
-                    OSL_ENSURE( sal_False, "PropertySetHelper: BOOL cannot change" );
+                    OSL_FAIL( "PropertySetHelper: BOOL cannot change" );
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" );
                     }
                 break;
@@ -612,7 +613,7 @@ public:
                     {
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" );
 
-                    sal_Int16 nInt16, nOldInt16;
+                    sal_Int16 nInt16(0), nOldInt16(0);
                     pExceptedListenerValues[nCurrent]   >>= nInt16;
                     evt.OldValue                        >>= nOldInt16;
                     OSL_ENSURE( nInt16 == nOldInt16 , "PropertySetHelper: wrong old value" );
@@ -629,7 +630,7 @@ public:
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" );
 
 
-                    sal_Int32 nInt32,nOldInt32;
+                    sal_Int32 nInt32(0),nOldInt32(0);
                     pExceptedListenerValues[nCurrent] >>= nInt32;
                     evt.OldValue >>= nOldInt32;
                     OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong old value" );
@@ -641,7 +642,7 @@ public:
                 break;
 
                 default:
-                    OSL_ENSURE( sal_False, "XPropeSetHelper: invalid property handle" );
+                    OSL_FAIL( "XPropeSetHelper: invalid property handle" );
             }
             nCurrent += 2;
         }
@@ -839,7 +840,7 @@ void test_PropertySetHelper()
             try
             {
                 xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ), xPS_L );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( UnknownPropertyException & /*e*/ )
             {
@@ -849,7 +850,7 @@ void test_PropertySetHelper()
             try
             {
                 xPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ), x2 );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( UnknownPropertyException & /*e*/ )
             {
@@ -889,7 +890,7 @@ void test_PropertySetHelper()
                 Any aBool;
                 aBool.setValue( &b , getCppuBooleanType() );
                 xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), aBool );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( PropertyVetoException & /*e*/ )
             {
@@ -903,7 +904,7 @@ void test_PropertySetHelper()
                 aBool.setValue( &b , getCppuBooleanType() );
                 // BOOL i s0
                 pPS->setFastPropertyValue( PROPERTY_BOOL, aBool );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( PropertyVetoException & /*e*/ )
             {
@@ -916,7 +917,7 @@ void test_PropertySetHelper()
                 Any aBool;
                 aBool.setValue( &b , getCppuBooleanType() );
                 xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ), aBool );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( UnknownPropertyException & /*e*/ )
             {
@@ -928,7 +929,7 @@ void test_PropertySetHelper()
                 Any aBool;
                 aBool.setValue( &b , getCppuBooleanType() );
                 pPS->setFastPropertyValue( 3, aBool );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( UnknownPropertyException & /*e*/ )
             {
@@ -939,7 +940,7 @@ void test_PropertySetHelper()
             {
                 Any aBool;
                 aBool = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ) );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( UnknownPropertyException & /*e*/ )
             {
@@ -949,7 +950,7 @@ void test_PropertySetHelper()
             {
                 Any aBool;
                 aBool = ((XFastPropertySet *)pPS)->getFastPropertyValue( 3 );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( UnknownPropertyException & /*e*/ )
             {
@@ -960,7 +961,7 @@ void test_PropertySetHelper()
             {
                 Any aBool;
                 xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), aBool );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( IllegalArgumentException & /*e*/ )
             {
@@ -970,7 +971,7 @@ void test_PropertySetHelper()
             {
                 Any aBool;
                 pPS->setFastPropertyValue( PROPERTY_INT32, aBool );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( IllegalArgumentException & /*e*/ )
             {
@@ -982,7 +983,7 @@ void test_PropertySetHelper()
                 Any aINT32;
                 aINT32 <<= (sal_Int32 ) 16;
                 xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aINT32 );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( IllegalArgumentException & /*e*/ )
             {
@@ -994,7 +995,7 @@ void test_PropertySetHelper()
                 Any aINT32;
                 aINT32 <<= (sal_Int32) 16;
                 pPS->setFastPropertyValue( PROPERTY_INT16, aINT32 );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( IllegalArgumentException & /*e*/ )
             {
@@ -1010,7 +1011,7 @@ void test_PropertySetHelper()
             b = *((sal_Bool*)aValue.getValue());
             OSL_ENSURE( !b, "PropertySetHelper: wrong BOOL value" );
 
-            sal_Int16 n16;
+            sal_Int16 n16(0);
             aValue <<=(sal_Int16)22;
             xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aValue );
             aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) );
@@ -1027,7 +1028,7 @@ void test_PropertySetHelper()
             aValue <<= (sal_Int16)55;
             xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), aValue );
             aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ) );
-            sal_Int32 n32;
+            sal_Int32 n32(0);
             aValue >>= n32;
             OSL_ENSURE( 55 == n32 , "PropertySetHelper: wrong INT32 value" );
             aValue <<= (sal_Int16)66;
@@ -1087,7 +1088,7 @@ void test_PropertySetHelper()
             try
             {
                 ((XFastPropertySet *)pPS)->setFastPropertyValue( PROPERTY_INT16, aValue );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch( PropertyVetoException & /*e*/ )
             {
@@ -1167,7 +1168,7 @@ void test_PropertySetHelper()
                 aValues.getArray()[0] <<= (sal_Int16)44;
                 aValues.getArray()[1] <<= (sal_Int16)100;
                 pPS->setPropertyValues( szPN, aValues );
-                OSL_ENSURE( sal_False, "PropertySetHelper: exeption not thrown" );
+                OSL_FAIL( "PropertySetHelper: exeption not thrown" );
             }
             catch ( PropertyVetoException & /*e*/ )
             {
@@ -1179,3 +1180,5 @@ void test_PropertySetHelper()
         }
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/testproptyphlp.cxx b/cppuhelper/test/testproptyphlp.cxx
index 70dae1a93a49..d913c7879b60 100644
--- a/cppuhelper/test/testproptyphlp.cxx
+++ b/cppuhelper/test/testproptyphlp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,3 +83,5 @@ void testPropertyTypeHelper()
     convertPropertyValue( ow , a );
     OSL_ASSERT( ow == prop.Name );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cpputools/prj/d.lst b/cpputools/prj/d.lst
index 14de5e78af75..de4f3e560965 100644
--- a/cpputools/prj/d.lst
+++ b/cpputools/prj/d.lst
@@ -1,10 +1,10 @@
-..\%__SRC%\bin\regcomp.exe %_DEST%\bin%_EXT%\regcomp.exe
-..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp
-..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp.bin
-..\%__SRC%\bin\uno.exe %_DEST%\bin%_EXT%\uno.exe
-..\%__SRC%\bin\uno %_DEST%\bin%_EXT%\uno
-..\%__SRC%\bin\uno %_DEST%\bin%_EXT%\uno.bin
-..\%__SRC%\bin\regsingleton.exe %_DEST%\bin%_EXT%\regsingleton.exe
-..\%__SRC%\bin\regsingleton %_DEST%\bin%_EXT%\regsingleton
-..\%__SRC%\bin\sp2bv.exe %_DEST%\bin%_EXT%\sp2bv.exe
-..\%__SRC%\bin\sp2bv %_DEST%\bin%_EXT%\sp2bv
+..\%__SRC%\bin\regcomp.exe %_DEST%\bin\regcomp.exe
+..\%__SRC%\bin\regcomp %_DEST%\bin\regcomp
+..\%__SRC%\bin\regcomp %_DEST%\bin\regcomp.bin
+..\%__SRC%\bin\uno.exe %_DEST%\bin\uno.exe
+..\%__SRC%\bin\uno %_DEST%\bin\uno
+..\%__SRC%\bin\uno %_DEST%\bin\uno.bin
+..\%__SRC%\bin\regsingleton.exe %_DEST%\bin\regsingleton.exe
+..\%__SRC%\bin\regsingleton %_DEST%\bin\regsingleton
+..\%__SRC%\bin\sp2bv.exe %_DEST%\bin\sp2bv.exe
+..\%__SRC%\bin\sp2bv %_DEST%\bin\sp2bv
diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx
index f13fae54c508..cc9d22e42a96 100644
--- a/cpputools/source/registercomponent/registercomponent.cxx
+++ b/cpputools/source/registercomponent/registercomponent.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,7 +83,7 @@ OUString replacePrefix(OUString const & url, OUString const & prefix) {
 
 sal_Bool isFileUrl(const OUString& fileName)
 {
-    if (fileName.indexOf(OUString::createFromAscii("file://")) == 0 )
+    if (fileName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("file://"))) == 0 )
         return sal_True;
     return sal_False;
 }
@@ -693,7 +694,7 @@ static void bootstrap(
         }
         reg = Reference< XSimpleRegistry >(
             xSMgr->createInstance(
-                rtl::OUString::createFromAscii("com.sun.star.registry.SimpleRegistry")), UNO_QUERY);
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.SimpleRegistry"))), UNO_QUERY);
 
         if (reg.is())
         {
@@ -726,15 +727,15 @@ static void bootstrap(
         // we know our java loader, so we check, whether a java-loader is
         // registered
         Reference< XInterface > r = loadSharedLibComponentFactory(
-            OUString::createFromAscii( "javavm.uno" SAL_DLLEXTENSION ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("javavm.uno" SAL_DLLEXTENSION)),
             OUString(),
-            OUString::createFromAscii( "com.sun.star.comp.stoc.JavaVirtualMachine" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaVirtualMachine")),
             xSMgr,
             Reference< XRegistryKey > () );
         Reference< XInterface > r2 = loadSharedLibComponentFactory(
-            OUString::createFromAscii( "javaloader.uno" SAL_DLLEXTENSION ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("javaloader.uno" SAL_DLLEXTENSION)),
             OUString(),
-            OUString::createFromAscii(( "com.sun.star.comp.stoc.JavaComponentLoader" ) ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaComponentLoader")),
             xSMgr,
             Reference< XRegistryKey > () );
         Reference <XSet> xSet( xSMgr, UNO_QUERY );
@@ -844,3 +845,4 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cpputools/source/regsingleton/regsingleton.cxx b/cpputools/source/regsingleton/regsingleton.cxx
index 688bdc6d40b8..05fc7dafe67a 100644
--- a/cpputools/source/regsingleton/regsingleton.cxx
+++ b/cpputools/source/regsingleton/regsingleton.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -171,3 +172,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         return 1;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx
index afacab909545..27231080b3a3 100644
--- a/cpputools/source/sp2bv/sp2bv.cxx
+++ b/cpputools/source/sp2bv/sp2bv.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,10 +33,6 @@
 #include "rtl/ustring.hxx"
 #include  "rtl/ustrbuf.h"
 
-
-
-using namespace rtl;
-
 static sal_Bool hasOption(char const * szOption, int argc, char** argv);
 
 
@@ -139,3 +136,4 @@ static sal_Bool hasOption(char const * szOption, int argc, char** argv)
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk
index c17fe9001cde..5869f180163e 100644..100755
--- a/cpputools/source/unoexe/makefile.mk
+++ b/cpputools/source/unoexe/makefile.mk
@@ -83,9 +83,6 @@ APP1STDLIBS= \
     $(CPPULIB)		\
     $(CPPUHELPERLIB)\
     $(LIBXML2LIB)
-.IF "$(OS)" == "WNT"
-APP1STDLIBS += $(UNICOWSLIB)
-.ENDIF
 
 .INCLUDE :  target.mk
 
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index c546cdadedfc..684bc39934e1 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,7 +74,6 @@
 #endif
 
 using namespace std;
-using namespace rtl;
 using namespace osl;
 using namespace cppu;
 using namespace com::sun::star::uno;
@@ -84,12 +84,17 @@ using namespace com::sun::star::connection;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::container;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+using ::rtl::OUStringBuffer;
+
 namespace unoexe
 {
 
 static sal_Bool isFileUrl(const OUString& fileName)
 {
-    if (fileName.indexOf(OUString::createFromAscii("file://")) == 0 )
+    if (fileName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("file://"))) == 0 )
         return sal_True;
     return sal_False;
 }
@@ -131,7 +136,7 @@ static sal_Bool s_quiet = false;
 static inline void out( const sal_Char * pText )
 {
     if (! s_quiet)
-        fprintf( stderr, pText );
+        fprintf( stderr, "%s", pText );
 }
 //--------------------------------------------------------------------------------------------------
 static inline void out( const OUString & rText )
@@ -139,7 +144,7 @@ static inline void out( const OUString & rText )
     if (! s_quiet)
     {
         OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) );
-        fprintf( stderr, aText.getStr() );
+        fprintf( stderr, "%s", aText.getStr() );
     }
 }
 
@@ -158,7 +163,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
                             sal_Int32 * pnIndex, const OUString & aArg)
     throw (RuntimeException)
 {
-    const OUString dash = OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
+    const OUString dash(RTL_CONSTASCII_USTRINGPARAM("-"));
     if(aArg.indexOf(dash) != 0)
         return sal_False;
 
@@ -640,7 +645,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
 
             rtl_getAppCommandArg(nPos, &arg.pData);
 
-            const OUString dashdash = OUString(RTL_CONSTASCII_USTRINGPARAM("--"));
+            const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--"));
             if (dashdash == arg)
             {
                 ++nPos;
@@ -733,7 +738,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
             }
         }
 
-        if (aReadOnlyRegistries.size() > 0 ||
+        if ((!aReadOnlyRegistries.empty()) ||
             aReadWriteRegistry.getLength() > 0)
         {
             //#### create registry #############################################
@@ -888,3 +893,4 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astarray.hxx b/idlc/inc/idlc/astarray.hxx
index 22ceccfce4a3..bb711823e869 100644
--- a/idlc/inc/idlc/astarray.hxx
+++ b/idlc/inc/idlc/astarray.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,3 +61,4 @@ private:
 
 #endif // _IDLC_ASTARRAY_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx
index fe87c3779d7f..9b55069b6609 100644
--- a/idlc/inc/idlc/astattribute.hxx
+++ b/idlc/inc/idlc/astattribute.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -119,3 +120,4 @@ private:
 
 #endif // _IDLC_ASTATTRIBUTE_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astbasetype.hxx b/idlc/inc/idlc/astbasetype.hxx
index 93f8eb8ba3b1..4d0793ef66fb 100644
--- a/idlc/inc/idlc/astbasetype.hxx
+++ b/idlc/inc/idlc/astbasetype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,3 +61,4 @@ private:
 
 #endif // _IDLC_ASTBASETYPE_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astconstant.hxx b/idlc/inc/idlc/astconstant.hxx
index f116ef813825..b9c87ad42f03 100644
--- a/idlc/inc/idlc/astconstant.hxx
+++ b/idlc/inc/idlc/astconstant.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,4 @@ private:
 
 #endif // _IDLC_ASTCONSTANT_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astconstants.hxx b/idlc/inc/idlc/astconstants.hxx
index 283dbbefd981..f132a978b31d 100644
--- a/idlc/inc/idlc/astconstants.hxx
+++ b/idlc/inc/idlc/astconstants.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,3 +41,4 @@ public:
 
 #endif // _IDLC_ASTCONSTANTS_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx
index ecbe7e307f4f..f0f6d29b0953 100644
--- a/idlc/inc/idlc/astdeclaration.hxx
+++ b/idlc/inc/idlc/astdeclaration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -146,3 +147,4 @@ protected:
 
 #endif // _IDLC_ASTDECLARATION_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astenum.hxx b/idlc/inc/idlc/astenum.hxx
index e125a907a68a..6a3380a22250 100644
--- a/idlc/inc/idlc/astenum.hxx
+++ b/idlc/inc/idlc/astenum.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,4 @@ private:
 
 #endif // _IDLC_ASTENUM_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astexception.hxx b/idlc/inc/idlc/astexception.hxx
index 915479461d8a..2f4c73ac7d07 100644
--- a/idlc/inc/idlc/astexception.hxx
+++ b/idlc/inc/idlc/astexception.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,3 +42,4 @@ public:
 
 #endif // _IDLC_ASTEXCEPTION_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx
index c5815ce5a252..74dfb91b7c8c 100644
--- a/idlc/inc/idlc/astexpression.hxx
+++ b/idlc/inc/idlc/astexpression.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -184,3 +185,4 @@ private:
 
 #endif // _IDLC_ASTEXPRESSION_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astinterface.hxx b/idlc/inc/idlc/astinterface.hxx
index f14fc640a2ee..5b4f3ae6fee7 100644
--- a/idlc/inc/idlc/astinterface.hxx
+++ b/idlc/inc/idlc/astinterface.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -141,3 +142,5 @@ private:
 };
 
 #endif // _IDLC_ASTINTERFACE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astinterfacemember.hxx b/idlc/inc/idlc/astinterfacemember.hxx
index 65c6eb309299..12eb19cf678e 100644
--- a/idlc/inc/idlc/astinterfacemember.hxx
+++ b/idlc/inc/idlc/astinterfacemember.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,4 @@ private:
 
 #endif // _IDLC_ASTINTERFACEMEMBER_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astmember.hxx b/idlc/inc/idlc/astmember.hxx
index 27a0b900fd7c..4100bffd3826 100644
--- a/idlc/inc/idlc/astmember.hxx
+++ b/idlc/inc/idlc/astmember.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,5 @@ private:
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astmodule.hxx b/idlc/inc/idlc/astmodule.hxx
index e9b18971f2a9..54c95c2d1305 100644
--- a/idlc/inc/idlc/astmodule.hxx
+++ b/idlc/inc/idlc/astmodule.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,4 @@ public:
 
 #endif // _IDLC_ASTMODULE_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astneeds.hxx b/idlc/inc/idlc/astneeds.hxx
index 3e5194f7ae0a..c4084dfef5a5 100644
--- a/idlc/inc/idlc/astneeds.hxx
+++ b/idlc/inc/idlc/astneeds.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,4 @@ private:
 
 #endif // _IDLC_ASTNEEDS_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astobserves.hxx b/idlc/inc/idlc/astobserves.hxx
index 58ca38b9d25a..0faec0b8a949 100644
--- a/idlc/inc/idlc/astobserves.hxx
+++ b/idlc/inc/idlc/astobserves.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,4 @@ private:
 
 #endif // _IDLC_ASTOBSERVES_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astoperation.hxx b/idlc/inc/idlc/astoperation.hxx
index 456d25e91c92..397e1c3396c0 100644
--- a/idlc/inc/idlc/astoperation.hxx
+++ b/idlc/inc/idlc/astoperation.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,3 +75,4 @@ private:
 
 #endif // _IDLC_ASTOPERATION_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astparameter.hxx b/idlc/inc/idlc/astparameter.hxx
index c2178a613d9f..3d97e72d14b8 100644
--- a/idlc/inc/idlc/astparameter.hxx
+++ b/idlc/inc/idlc/astparameter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,5 @@ private:
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astscope.hxx b/idlc/inc/idlc/astscope.hxx
index 97b44787b80c..e7f6a3962928 100644
--- a/idlc/inc/idlc/astscope.hxx
+++ b/idlc/inc/idlc/astscope.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,4 @@ private:
 
 #endif // _IDLC_ASTSCOPE_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astsequence.hxx b/idlc/inc/idlc/astsequence.hxx
index 120528f1d419..d7e3cec03b9d 100644
--- a/idlc/inc/idlc/astsequence.hxx
+++ b/idlc/inc/idlc/astsequence.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,4 @@ private:
 
 #endif // _IDLC_ASTSEQUENCE_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astservice.hxx b/idlc/inc/idlc/astservice.hxx
index f327a0dfbba8..862c33ce17c4 100644
--- a/idlc/inc/idlc/astservice.hxx
+++ b/idlc/inc/idlc/astservice.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,4 @@ private:
 
 #endif // _IDLC_ASTSERVICE_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astservicemember.hxx b/idlc/inc/idlc/astservicemember.hxx
index 5a45fe2555ff..f8b7932a647f 100644
--- a/idlc/inc/idlc/astservicemember.hxx
+++ b/idlc/inc/idlc/astservicemember.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,4 @@ private:
 
 #endif // _IDLC_ASTSERVICEMEMBER_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/aststack.hxx b/idlc/inc/idlc/aststack.hxx
index 8d4c3dba58b1..6604996c9bb2 100644
--- a/idlc/inc/idlc/aststack.hxx
+++ b/idlc/inc/idlc/aststack.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,3 +55,4 @@ private:
 
 #endif // _IDLC_ASTSTACK_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/aststruct.hxx b/idlc/inc/idlc/aststruct.hxx
index 062865199a29..98cadcc4899c 100644
--- a/idlc/inc/idlc/aststruct.hxx
+++ b/idlc/inc/idlc/aststruct.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,4 @@ private:
 
 #endif // _IDLC_ASTSTRUCT_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/aststructinstance.hxx b/idlc/inc/idlc/aststructinstance.hxx
index 32b64c10026b..3428bc2be0b2 100644
--- a/idlc/inc/idlc/aststructinstance.hxx
+++ b/idlc/inc/idlc/aststructinstance.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,3 +55,5 @@ private:
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/asttype.hxx b/idlc/inc/idlc/asttype.hxx
index 2e0274436c04..32a18ab671f5 100644
--- a/idlc/inc/idlc/asttype.hxx
+++ b/idlc/inc/idlc/asttype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,3 +44,4 @@ public:
 
 #endif // _IDLC_ASTTYPE_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/asttypedef.hxx b/idlc/inc/idlc/asttypedef.hxx
index e8f9ddedbfbe..2b1839dcadd9 100644
--- a/idlc/inc/idlc/asttypedef.hxx
+++ b/idlc/inc/idlc/asttypedef.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,4 @@ private:
 
 #endif // _IDLC_ASTTYPEDEF_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astunion.hxx b/idlc/inc/idlc/astunion.hxx
index 4976f02b117f..4435317bee37 100644
--- a/idlc/inc/idlc/astunion.hxx
+++ b/idlc/inc/idlc/astunion.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,4 @@ private:
 
 #endif // _IDLC_ASTUNION_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astunionbranch.hxx b/idlc/inc/idlc/astunionbranch.hxx
index b1811983bd2f..20df92b90552 100644
--- a/idlc/inc/idlc/astunionbranch.hxx
+++ b/idlc/inc/idlc/astunionbranch.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,4 @@ private:
 
 #endif // _IDLC_ASTUNIONBRANCH_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/astunionlabel.hxx b/idlc/inc/idlc/astunionlabel.hxx
index 90bc263b7fd6..d468884d5a01 100644
--- a/idlc/inc/idlc/astunionlabel.hxx
+++ b/idlc/inc/idlc/astunionlabel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,4 @@ private:
 
 #endif // _IDLC_ASTUNIONLABEL_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/errorhandler.hxx b/idlc/inc/idlc/errorhandler.hxx
index f651172459ae..44d2a8a5a704 100644
--- a/idlc/inc/idlc/errorhandler.hxx
+++ b/idlc/inc/idlc/errorhandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -155,3 +156,4 @@ public:
 
 #endif // _IDLC_ERRORHANDLER_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/fehelper.hxx b/idlc/inc/idlc/fehelper.hxx
index 2cd20e6bce0e..9c716da3edfd 100644
--- a/idlc/inc/idlc/fehelper.hxx
+++ b/idlc/inc/idlc/fehelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,3 +97,4 @@ private:
 
 #endif // _IDLC_FEHELPER_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/idlc.hxx b/idlc/inc/idlc/idlc.hxx
index cec8e58900fb..8262b26fc095 100644
--- a/idlc/inc/idlc/idlc.hxx
+++ b/idlc/inc/idlc/idlc.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,6 +103,12 @@ public:
         { m_warningCount++; }
     sal_uInt32 getLineNumber()
         { return m_lineNumber; }
+    sal_uInt32 getOffsetStart()
+        { return m_offsetStart; }
+    sal_uInt32 getOffsetEnd()
+        { return m_offsetEnd; }
+    void setOffset( sal_uInt32 start, sal_uInt32 end)
+        { m_offsetStart = start; m_offsetEnd = end; }
     void setLineNumber(sal_uInt32 lineNumber)
         { m_lineNumber = lineNumber; }
     void incLineNumber()
@@ -136,6 +143,8 @@ private:
     sal_uInt32          m_errorCount;
     sal_uInt32          m_warningCount;
     sal_uInt32          m_lineNumber;
+    sal_uInt32          m_offsetStart;
+    sal_uInt32          m_offsetEnd;
     ParseState          m_parseState;
     StringSet           m_includes;
 };
@@ -166,3 +175,4 @@ AstInterface const * resolveInterfaceTypedefs(AstType const * type);
 
 #endif // _IDLC_IDLC_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlc/idlctypes.hxx
index 41451ee9060f..45154163c846 100644
--- a/idlc/inc/idlc/idlctypes.hxx
+++ b/idlc/inc/idlc/idlctypes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,7 @@
 
 #include <stdio.h>
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <list>
 #include <vector>
 #include <string>
@@ -74,7 +75,7 @@ typedef ::std::list< AstUnionLabel* >   LabelList;
 
 class AstDeclaration;
 
-typedef ::std::hash_map< ::rtl::OString, AstDeclaration*, HashString, EqualString > DeclMap;
+typedef ::boost::unordered_map< ::rtl::OString, AstDeclaration*, HashString, EqualString > DeclMap;
 typedef ::std::list< AstDeclaration* > DeclList;
 
 class AstScope;
@@ -266,3 +267,4 @@ enum ParseState
 
 #endif // _IDLC_IDLCTYPES_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/inheritedinterface.hxx b/idlc/inc/idlc/inheritedinterface.hxx
index 1d0ea6bf46b5..e983c751acd2 100644
--- a/idlc/inc/idlc/inheritedinterface.hxx
+++ b/idlc/inc/idlc/inheritedinterface.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,5 @@ private:
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/idlc/options.hxx
index 383150bd4b40..945ebb0bdddf 100644
--- a/idlc/inc/idlc/options.hxx
+++ b/idlc/inc/idlc/options.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,11 +29,9 @@
 #ifndef _IDLC_OPTIONS_HXX_
 #define _IDLC_OPTIONS_HXX_
 
-#ifndef _IDLC_IDLCTYPEs_HXX_
 #include <idlc/idlctypes.hxx>
-#endif
 
-typedef ::std::hash_map< ::rtl::OString,
+typedef ::boost::unordered_map< ::rtl::OString,
                          ::rtl::OString,
                          HashString,
                          EqualString > OptionMap;
@@ -91,3 +90,4 @@ protected:
 
 #endif // _IDLC_OPTIONS_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/pch/precompiled_idlc.cxx b/idlc/inc/pch/precompiled_idlc.cxx
index 6ff8144f4231..50db39b8b090 100644
--- a/idlc/inc/pch/precompiled_idlc.cxx
+++ b/idlc/inc/pch/precompiled_idlc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_idlc.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/pch/precompiled_idlc.hxx b/idlc/inc/pch/precompiled_idlc.hxx
index 6a0ca40d1033..1702e1a05c0b 100644
--- a/idlc/inc/pch/precompiled_idlc.hxx
+++ b/idlc/inc/pch/precompiled_idlc.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/prj/d.lst b/idlc/prj/d.lst
index edd0ecb33a35..8f617ceb2594 100644
--- a/idlc/prj/d.lst
+++ b/idlc/prj/d.lst
@@ -1,7 +1,7 @@
-..\%__SRC%\bin\idlc.exe %_DEST%\bin%_EXT%\idlc.exe
-..\%__SRC%\bin\idlc.pdb %_DEST%\bin%_EXT%\idlc.pdb
-..\%__SRC%\bin\idlcpp.exe %_DEST%\bin%_EXT%\idlcpp.exe
-..\%__SRC%\bin\idlcpp.pdb %_DEST%\bin%_EXT%\idlcpp.pdb
+..\%__SRC%\bin\idlc.exe %_DEST%\bin\idlc.exe
+..\%__SRC%\bin\idlc.pdb %_DEST%\bin\idlc.pdb
+..\%__SRC%\bin\idlcpp.exe %_DEST%\bin\idlcpp.exe
+..\%__SRC%\bin\idlcpp.pdb %_DEST%\bin\idlcpp.pdb
 
-..\%__SRC%\bin\idlc %_DEST%\bin%_EXT%\idlc
-..\%__SRC%\bin\idlcpp %_DEST%\bin%_EXT%\idlcpp
+..\%__SRC%\bin\idlc %_DEST%\bin\idlc
+..\%__SRC%\bin\idlcpp %_DEST%\bin\idlcpp
diff --git a/idlc/source/astarray.cxx b/idlc/source/astarray.cxx
index 0277b5a04e76..1d3052b577e5 100644
--- a/idlc/source/astarray.cxx
+++ b/idlc/source/astarray.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,5 @@ OString AstArray::makeName()
     }
     return OString();
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astconstant.cxx b/idlc/source/astconstant.cxx
index 2f920508bd75..7f9a1de0425d 100644
--- a/idlc/source/astconstant.cxx
+++ b/idlc/source/astconstant.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -134,3 +135,5 @@ sal_Bool AstConstant::dumpBlob(
 
     return sal_True;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astdeclaration.cxx b/idlc/source/astdeclaration.cxx
index 16e153e696e1..f767bb7991bb 100644
--- a/idlc/source/astdeclaration.cxx
+++ b/idlc/source/astdeclaration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -209,3 +210,4 @@ sal_Bool AstDeclaration::dump(RegistryKey& rKey)
     return bRet;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index 3934cfb67e19..cf8f33edbc9a 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
 #include <idlc/astconstant.hxx>
 #include <idlc/astattribute.hxx>
 #include <idlc/astinterfacemember.hxx>
-#ifndef _IDLC_ASTSERVICEEMEMBER_HXX_
 #include <idlc/astservicemember.hxx>
-#endif
 #include <idlc/astobserves.hxx>
 #include <idlc/astneeds.hxx>
 #include <idlc/astsequence.hxx>
@@ -452,3 +451,5 @@ const sal_Char* AstSequence::getRelativName() const
 
     return m_pRelativName->getStr();
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astenum.cxx b/idlc/source/astenum.cxx
index 365b166be568..5d5a8597b850 100644
--- a/idlc/source/astenum.cxx
+++ b/idlc/source/astenum.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -123,3 +124,5 @@ AstDeclaration* AstEnum::addDeclaration(AstDeclaration* pDecl)
 {
     return AstScope::addDeclaration(pDecl);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index 357da1ab362e..7b5a0ca390c4 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -784,13 +785,14 @@ AstExprValue* AstExpression::coerce(ExprType t, sal_Bool bAssign)
             break;
     }
 
+    AstExprValue* const coerced(coerce_value(copy, t));
+    if (!coerced)
+        delete copy;
+
     if (bAssign)
-    {
-        m_exprValue = coerce_value(copy, t);
-        return m_exprValue;
-    }
+        m_exprValue = coerced;
 
-    return coerce_value(copy, t);
+    return coerced;
 }
 
 void AstExpression::evaluate(EvalKind ek)
@@ -801,82 +803,105 @@ void AstExpression::evaluate(EvalKind ek)
 
 sal_Bool AstExpression::operator==(AstExpression *pExpr)
 {
+    sal_Bool bRet = sal_False;
     if (m_combOperator != pExpr->getCombOperator())
-        return sal_False;
+        return bRet;
     evaluate(EK_const);
     pExpr->evaluate(EK_const);
     if (m_exprValue == NULL || pExpr->getExprValue() == NULL)
-        return sal_False;
+        return bRet;
     if (m_exprValue->et != pExpr->getExprValue()->et)
-        return sal_False;
+        return bRet;
     switch (m_exprValue->et)
     {
         case ET_short:
-            return (m_exprValue->u.sval == pExpr->getExprValue()->u.sval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.sval == pExpr->getExprValue()->u.sval) ? sal_True : sal_False;
+            break;
         case ET_ushort:
-            return (m_exprValue->u.usval == pExpr->getExprValue()->u.usval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.usval == pExpr->getExprValue()->u.usval) ? sal_True : sal_False;
+            break;
         case ET_long:
-            return (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False;
+            break;
         case ET_ulong:
-            return (m_exprValue->u.ulval == pExpr->getExprValue()->u.ulval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.ulval == pExpr->getExprValue()->u.ulval) ? sal_True : sal_False;
+            break;
         case ET_hyper:
-            return (m_exprValue->u.hval == pExpr->getExprValue()->u.hval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.hval == pExpr->getExprValue()->u.hval) ? sal_True : sal_False;
+            break;
         case ET_uhyper:
-            return (m_exprValue->u.uhval == pExpr->getExprValue()->u.uhval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.uhval == pExpr->getExprValue()->u.uhval) ? sal_True : sal_False;
+            break;
         case ET_float:
-            return (m_exprValue->u.fval == pExpr->getExprValue()->u.fval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.fval == pExpr->getExprValue()->u.fval) ? sal_True : sal_False;
+            break;
         case ET_double:
-            return (m_exprValue->u.dval == pExpr->getExprValue()->u.dval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.dval == pExpr->getExprValue()->u.dval) ? sal_True : sal_False;
+            break;
         case ET_byte:
-            return (m_exprValue->u.byval == pExpr->getExprValue()->u.byval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.byval == pExpr->getExprValue()->u.byval) ? sal_True : sal_False;
+            break;
         case ET_boolean:
-            return (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False;
+            break;
         default:
             OSL_ASSERT(false);
-            return sal_False;
+            bRet = sal_False;
+            break;
     }
 
-    return sal_False;
+    return bRet;
 }
 
 sal_Bool AstExpression::compare(AstExpression *pExpr)
 {
+    bool bRet = sal_False;
     if (m_combOperator != pExpr->getCombOperator())
-        return sal_False;
+        return bRet;
     evaluate(EK_const);
     pExpr->evaluate(EK_const);
     if (m_exprValue == NULL || pExpr->getExprValue() == NULL)
-        return sal_False;
+        return bRet;
     if (m_exprValue->et != pExpr->getExprValue()->et)
-        return sal_False;
+        return bRet;
     switch (m_exprValue->et)
     {
         case ET_short:
-            return (m_exprValue->u.sval == pExpr->getExprValue()->u.sval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.sval == pExpr->getExprValue()->u.sval) ? sal_True : sal_False;
+            break;
         case ET_ushort:
-            return (m_exprValue->u.usval == pExpr->getExprValue()->u.usval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.usval == pExpr->getExprValue()->u.usval) ? sal_True : sal_False;
+            break;
         case ET_long:
-            return (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False;
+            break;
         case ET_ulong:
-            return (m_exprValue->u.ulval == pExpr->getExprValue()->u.ulval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.ulval == pExpr->getExprValue()->u.ulval) ? sal_True : sal_False;
+            break;
         case ET_hyper:
-            return (m_exprValue->u.hval == pExpr->getExprValue()->u.hval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.hval == pExpr->getExprValue()->u.hval) ? sal_True : sal_False;
+            break;
         case ET_uhyper:
-            return (m_exprValue->u.uhval == pExpr->getExprValue()->u.uhval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.uhval == pExpr->getExprValue()->u.uhval) ? sal_True : sal_False;
+            break;
         case ET_float:
-            return (m_exprValue->u.fval == pExpr->getExprValue()->u.fval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.fval == pExpr->getExprValue()->u.fval) ? sal_True : sal_False;
+            break;
         case ET_double:
-            return (m_exprValue->u.dval == pExpr->getExprValue()->u.dval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.dval == pExpr->getExprValue()->u.dval) ? sal_True : sal_False;
+            break;
         case ET_byte:
-            return (m_exprValue->u.byval == pExpr->getExprValue()->u.byval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.byval == pExpr->getExprValue()->u.byval) ? sal_True : sal_False;
+            break;
         case ET_boolean:
-            return (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False;
+            bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False;
+            break;
         default:
             OSL_ASSERT(false);
-            return sal_False;
+            bRet = sal_False;
+            break;
     }
-
-    return sal_False;
+    return bRet;
 }
 
 void AstExpression::fillDefinitionDetails()
@@ -1261,3 +1286,5 @@ const sal_Char* SAL_CALL exprTypeToString(ExprType t)
 
     return ("unkown");
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx
index 97bea094c53c..5400036185c4 100644
--- a/idlc/source/astinterface.cxx
+++ b/idlc/source/astinterface.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -425,3 +426,5 @@ bool AstInterface::increment(sal_uInt16 * counter, char const * sort) const {
     ++*counter;
     return true;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx
index 5fff08ee7404..2cc90da3ad9c 100644
--- a/idlc/source/astoperation.cxx
+++ b/idlc/source/astoperation.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -151,3 +152,5 @@ AstDeclaration* AstOperation::addDeclaration(AstDeclaration* pDecl)
     }
     return AstScope::addDeclaration(pDecl);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx
index 4d1e182320e0..0b1a750f5a8b 100644
--- a/idlc/source/astscope.cxx
+++ b/idlc/source/astscope.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
 #include "precompiled_idlc.hxx"
 #include <idlc/astscope.hxx>
 #include <idlc/astbasetype.hxx>
-#ifndef _IDLC_ASTINERFACE_HXX_
 #include <idlc/astinterface.hxx>
-#endif
 #include <idlc/errorhandler.hxx>
 
 
@@ -354,3 +353,5 @@ AstDeclaration* AstScope::lookupForAdd(AstDeclaration* pDecl)
 
    return pRetDecl;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astservice.cxx b/idlc/source/astservice.cxx
index 11f638cc0f66..b26997cc3ab9 100644
--- a/idlc/source/astservice.cxx
+++ b/idlc/source/astservice.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ bool AstService::checkLastConstructor() const {
     }
     return false;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/aststack.cxx b/idlc/source/aststack.cxx
index 9697727ac861..d3db212e18fb 100644
--- a/idlc/source/aststack.cxx
+++ b/idlc/source/aststack.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -123,11 +124,9 @@ AstStack* AstStack::push(AstScope* pScope)
 
 void AstStack::pop()
 {
-    AstScope *pScope;
-
     if (m_top < 1)
         return;
-    pScope = m_stack[--m_top];
+    --m_top;
 }
 
 void AstStack::clear()
@@ -135,3 +134,4 @@ void AstStack::clear()
     m_top = 0;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx
index 913ebaed42c4..3a8a959062ed 100644
--- a/idlc/source/aststruct.cxx
+++ b/idlc/source/aststruct.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_idlc.hxx"
 #include <idlc/aststruct.hxx>
-#ifndef _IDLC_ASTMember_HXX_
 #include <idlc/astmember.hxx>
-#endif
 
 #include "registry/version.h"
 #include "registry/writer.hxx"
@@ -189,3 +188,4 @@ sal_Bool AstStruct::dump(RegistryKey& rKey)
     return sal_True;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/aststructinstance.cxx b/idlc/source/aststructinstance.cxx
index 457c48ad00a7..e2292d016912 100644
--- a/idlc/source/aststructinstance.cxx
+++ b/idlc/source/aststructinstance.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ AstStructInstance::AstStructInstance(
         NT_instantiated_struct, createName(typeTemplate, typeArguments), scope),
     m_typeTemplate(typeTemplate), m_typeArguments(*typeArguments)
 {}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astunion.cxx b/idlc/source/astunion.cxx
index f4b1ede57bd4..e0a8bf84b01e 100644
--- a/idlc/source/astunion.cxx
+++ b/idlc/source/astunion.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -304,7 +305,6 @@ sal_Bool AstUnion::dump(RegistryKey& rKey)
         AstUnionLabel*  pLabel = NULL;
         AstExprValue*   pExprValue = NULL;
         RTConstValue    aConst;
-        RTFieldAccess   access = RT_ACCESS_READWRITE;
         OUString    docu;
         sal_uInt16  index = 0;
         if ( pDefault )
@@ -344,7 +344,6 @@ sal_Bool AstUnion::dump(RegistryKey& rKey)
 
         if ( pDefault )
         {
-            access = RT_ACCESS_DEFAULT;
             aConst.m_type = RT_TYPE_INT64;
             aConst.m_value.aHyper = disc + 1;
             aBlob.setFieldData(
@@ -399,3 +398,5 @@ AstUnionLabel::~AstUnionLabel()
         delete m_pLabelValue;
 }
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/attributeexceptions.hxx b/idlc/source/attributeexceptions.hxx
index 2981c09220f6..080a009bbbcc 100644
--- a/idlc/source/attributeexceptions.hxx
+++ b/idlc/source/attributeexceptions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,3 +41,5 @@ struct AttributeExceptions {
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx
index 4ab4844eeca7..30ecd1ef7ca4 100644
--- a/idlc/source/errorhandler.cxx
+++ b/idlc/source/errorhandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -488,7 +489,7 @@ static OString flagToString(sal_uInt32 flag)
     return flagStr;
 }
 
-static void errorHeader(ErrorCode eCode, sal_Int32 lineNumber)
+static void errorHeader(ErrorCode eCode, sal_Int32 lineNumber, sal_uInt32 start, sal_uInt32 end)
 {
     OString file;
     if ( idlc()->getFileName() == idlc()->getRealFileName() )
@@ -496,14 +497,23 @@ static void errorHeader(ErrorCode eCode, sal_Int32 lineNumber)
     else
         file = idlc()->getFileName();
 
-    fprintf(stderr, "%s(%lu) : %s", file.getStr(),
+    fprintf(stderr, "%s:%lu [%lu:%lu] : %s", file.getStr(),
             sal::static_int_cast< unsigned long >(lineNumber),
+            sal::static_int_cast< unsigned long >(start),
+            sal::static_int_cast< unsigned long >(end),
             errorCodeToMessage(eCode));
 }
 
+static void errorHeader(ErrorCode eCode, sal_uInt32 lineNumber)
+{
+    errorHeader(eCode, lineNumber,
+            idlc()->getOffsetStart(), idlc()->getOffsetEnd());
+}
+
 static void errorHeader(ErrorCode eCode)
 {
-    errorHeader(eCode, idlc()->getLineNumber());
+    errorHeader(eCode, idlc()->getLineNumber(),
+            idlc()->getOffsetStart(), idlc()->getOffsetEnd());
 }
 
 static void warningHeader(WarningCode wCode)
@@ -693,3 +703,5 @@ bool ErrorHandler::checkPublished(AstDeclaration const * decl, bool bOptional) {
         return true;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/fehelper.cxx b/idlc/source/fehelper.cxx
index cd96c4c2a20a..306d4f16306a 100644
--- a/idlc/source/fehelper.cxx
+++ b/idlc/source/fehelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -142,3 +143,5 @@ void FeInheritanceHeader::initializeInherits(::rtl::OString* pInherits)
         }
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx
index 1477739cd531..d1b3b9587d5b 100644
--- a/idlc/source/idlc.cxx
+++ b/idlc/source/idlc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -219,6 +220,8 @@ Idlc::Idlc(Options* pOptions)
     , m_errorCount(0)
     , m_warningCount(0)
     , m_lineNumber(0)
+    , m_offsetStart(0)
+    , m_offsetEnd(0)
     , m_parseState(PS_NoState)
 {
     m_pScopes = new AstStack();
@@ -339,3 +342,5 @@ AstInterface const * resolveInterfaceTypedefs(AstType const * type) {
     OSL_ASSERT(decl->getNodeType() == NT_interface);
     return static_cast< AstInterface const * >(decl);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 26bf288e2ad0..e660a0087972 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,13 +36,15 @@
 #include <osl/thread.h>
 #include <osl/file.hxx>
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 #endif
 
 #ifdef  SAL_UNX
+#include <errno.h>
 #include <unistd.h>
-#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD)
+#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || \
+    defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY)
 #include <sys/wait.h>
 #else
 #include <wait.h>
@@ -147,7 +150,7 @@ OString makeTempName(const OString& prefix)
     if ( uTmpPath.getLength() )
         tmpPath = OUStringToOString(uTmpPath, RTL_TEXTENCODING_UTF8);
 
-#if defined(SAL_W32) || defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_W32) || defined(SAL_UNX)
 
     OSL_ASSERT( sizeof(tmpFilePattern) > ( strlen(tmpPath)
                                            + RTL_CONSTASCII_LENGTH(
@@ -166,7 +169,7 @@ OString makeTempName(const OString& prefix)
     int nDescriptor = mkstemp(tmpFilePattern);
     if( -1 == nDescriptor )
     {
-        fprintf( stderr,"idlc: couldn't create temporary file\n" );
+        fprintf(stderr, "idlc: mkstemp(\"%s\") failed: %s\n", tmpFilePattern, strerror(errno));
         exit( 1 );
     }
     // the file shall later be reopened by stdio functions
@@ -297,22 +300,7 @@ sal_Int32 compileFile(const OString * pathname)
             idlc()->getOptions()->getProgramName().getStr(), cmdFileName.getStr());
           exit(99);
     }
-#ifdef SAL_OS2_00
-      char* tok = strtok( (char*)cppArgs.getStr(), " \t\n\r");
-      while( tok) {
-         if (tok[strlen(tok)-1] == '\"')
-            tok[strlen(tok)-1] = '\0';
-         if (*tok == '\"')
-            memcpy( tok, tok+1, strlen(tok));
-         if (strlen(tok)>0) {
-            fputs(tok, pCmdFile);
-            fputc('\n', pCmdFile);
-         }
-         tok = strtok( NULL, " \t\n\r");
-      }
-#else
     fprintf(pCmdFile, "%s", cppArgs.getStr());
-#endif
     fclose(pCmdFile);
 
     OUString cmdArg(RTL_CONSTASCII_USTRINGPARAM("@"));
@@ -327,7 +315,7 @@ sal_Int32 compileFile(const OString * pathname)
     sal_Int32 idx= cpp.lastIndexOf(OUString( RTL_CONSTASCII_USTRINGPARAM("idlc")) );
      cpp = cpp.copy(0, idx);
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
      cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("idlcpp.exe"));
 #else
     cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("idlcpp"));
@@ -416,3 +404,5 @@ sal_Int32 compileFile(const OString * pathname)
 
     return nErrors;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx
index cc2963f5f446..2df142fdbf91 100644
--- a/idlc/source/idlcmain.cxx
+++ b/idlc/source/idlcmain.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -155,3 +156,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
     return nErrors;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx
index e20b7da1c42b..a65f3317487a 100644
--- a/idlc/source/idlcproduce.cxx
+++ b/idlc/source/idlcproduce.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
 #include <osl/file.hxx>
 #include <osl/thread.h>
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 #include <direct.h>
 #include <errno.h>
@@ -79,7 +80,7 @@ static sal_Bool checkOutputPath(const OString& completeName)
 
         if ( buffer.getLength() > 0 && nIndex != -1 )
         {
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
             if (mkdir((char*)buffer.getStr(), 0777) == -1)
 #else
             if (mkdir((char*)buffer.getStr()) == -1)
@@ -208,3 +209,5 @@ sal_Int32 SAL_CALL produceFile(const OString& regFileName)
 
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/makefile.mk b/idlc/source/makefile.mk
index 879090d15b54..7b85efddd58b 100644
--- a/idlc/source/makefile.mk
+++ b/idlc/source/makefile.mk
@@ -35,13 +35,14 @@ LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 INCPRE=$(MISC)
 
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
-
 # --- Settings -----------------------------------------------------
 
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 .INCLUDE :  settings.mk
 
 # --- Files --------------------------------------------------------
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index 310afa2a4d60..a56852dc778e 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,9 +38,8 @@
 #include <stdio.h>
 #include <string.h>
 
-using rtl::OString;
-using rtl::OStringBuffer;
-
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
 #ifdef SAL_UNX
 #define SEPARATOR '/'
 #else
@@ -389,4 +389,5 @@ const OString& Options::getOption(const OString& option)
     }
     return m_options[option];
 }
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index 8da9c7ad63b5..38e54382c15d 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -103,12 +103,16 @@
 
 #include <algorithm>
 #include <vector>
-    
-using namespace ::rtl;
+
 
 #define YYDEBUG 1
 #define YYERROR_VERBOSE 1
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OStringBuffer;
+
 extern int yylex(void);
 void yyerror(char const *);
 
diff --git a/idlc/source/preproc/cpp.c b/idlc/source/preproc/cpp.c
index 59e0b615cae9..e56ae306ac11 100644
--- a/idlc/source/preproc/cpp.c
+++ b/idlc/source/preproc/cpp.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -496,3 +497,5 @@ void
         nerrs += 1;
     fflush(stderr);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/preproc/cpp.h b/idlc/source/preproc/cpp.h
index 4b8645b2d34e..b40647cd38b7 100644
--- a/idlc/source/preproc/cpp.h
+++ b/idlc/source/preproc/cpp.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -211,3 +212,4 @@ extern Includelist includelist[NINCLUDE];
 extern Wraplist wraplist[NINCLUDE];
 extern char wd[];
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/preproc/eval.c b/idlc/source/preproc/eval.c
index bed61eb95f00..9a1a62063c1b 100644
--- a/idlc/source/preproc/eval.c
+++ b/idlc/source/preproc/eval.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -789,3 +790,5 @@ int
                 i = -1;
     return i;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/preproc/include.c b/idlc/source/preproc/include.c
index 88a619905b64..87c879afa9e4 100644
--- a/idlc/source/preproc/include.c
+++ b/idlc/source/preproc/include.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,7 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
+#if (defined(_WIN32) || defined(__IBMC__))
 #   include <io.h>
 #else
 #   include <unistd.h>
@@ -36,13 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
-
-#ifdef __hpux
-#   define _HPUX_SOURCE
-#endif
-#ifdef SCO
-#define _IBCS2
-#endif
 #include <limits.h>
 
 #include "cpp.h"
@@ -53,11 +47,7 @@ Wraplist wraplist[NINCLUDE];
 void
     doinclude(Tokenrow * trp, int depth, int import)
 {
-#ifdef OS2
-    char fname[_MAX_PATH], iname[_MAX_PATH];
-#else
     char fname[PATH_MAX], iname[PATH_MAX];
-#endif
     Includelist *ip;
     int angled, len, fd, i;
 
@@ -254,3 +244,4 @@ void
     }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/preproc/lex.c b/idlc/source/preproc/lex.c
index 856ee72bfc53..61929f1af8aa 100644
--- a/idlc/source/preproc/lex.c
+++ b/idlc/source/preproc/lex.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
+#if (defined(_WIN32) || defined(__IBMC__))
 #include <io.h>
 #else
 #include <unistd.h>
@@ -697,3 +698,5 @@ void
     cursource = s->next;
     dofree(s);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/preproc/macro.c b/idlc/source/preproc/macro.c
index 7f0697994c4c..5258fa23b2a1 100644
--- a/idlc/source/preproc/macro.c
+++ b/idlc/source/preproc/macro.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,13 +31,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#ifdef __hpux
-#   define _HPUX_SOURCE
-#endif
-#ifdef SCO
-#   define _IBCS2
-#endif
 #include <limits.h>
 
 #include "cpp.h"
@@ -53,11 +47,7 @@ void
     Nlist *np;
     Source *s;
     Tokenrow *def, *args;
-#ifdef OS2
-    static uchar location[(_MAX_PATH + 8) * NINC], *cp;
-#else
     static uchar location[(PATH_MAX + 8) * NINC], *cp;
-#endif
     tp = trp->tp + 1;
     if (tp >= trp->lp || tp->type != NAME)
     {
@@ -75,14 +65,14 @@ void
     args = NULL;
     if (tp < trp->lp && tp->type == LP && tp->wslen == 0)
     {
-        /* macro with args */
-        int narg = 0;
-
         tp += 1;
         args = new(Tokenrow);
         maketokenrow(2, args);
         if (tp->type != RP)
         {
+            /* macro with args */
+            int narg = 0;
+
             int err = 0;
 
             for (;;)
@@ -232,7 +222,7 @@ void
     expandrow(Tokenrow * trp, char *flag)
 {
     Token *tp;
-    Nlist *np;
+    Nlist *np=NULL;
 
     if (flag)
         setsource(flag, -1, -1, "", 0);
@@ -300,7 +290,7 @@ void
     expand(Tokenrow * trp, Nlist * np)
 {
     Tokenrow ntr;
-    int ntokc, narg, i;
+    int ntokc, narg;
     Tokenrow *atr[NARG + 1];
 
     if (Mflag == 2)
@@ -316,6 +306,8 @@ void
         ntokc = 1;
     else
     {
+        int i;
+
         ntokc = gatherargs(trp, atr, &narg);
         if (narg < 0)
         {                               /* not actually a call (no '(') */
@@ -329,7 +321,7 @@ void
             return;
         }
         substargs(np, &ntr, atr);       /* put args into replacement */
-        for (i = 0; i < narg; i++)
+        for (i = 0; i < narg; ++i)
         {
             dofree(atr[i]->bp);
             dofree(atr[i]);
@@ -698,3 +690,5 @@ void
     tp->len = op - outptr;
     outptr = op;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/preproc/makefile.mk b/idlc/source/preproc/makefile.mk
index e6aa457e8b3d..6afe98f5cb42 100644
--- a/idlc/source/preproc/makefile.mk
+++ b/idlc/source/preproc/makefile.mk
@@ -38,6 +38,11 @@ LIBSALCPPRT=$(0)
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 OBJFILES=   \
diff --git a/idlc/source/preproc/nlist.c b/idlc/source/preproc/nlist.c
index f41313c22aac..d3256fa0fce8 100644
--- a/idlc/source/preproc/nlist.c
+++ b/idlc/source/preproc/nlist.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -141,3 +142,5 @@ Nlist *
     }
     return NULL;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/preproc/tokens.c b/idlc/source/preproc/tokens.c
index 23ab88a5a9e3..b554226f9cf4 100644
--- a/idlc/source/preproc/tokens.c
+++ b/idlc/source/preproc/tokens.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
+#if (defined(_WIN32) || defined(__IBMC__))
 #include <io.h>
 #else
 #include <unistd.h>
@@ -477,7 +478,7 @@ void
             if (write(1, wbuf, OBS) != OBS)
                 error(ERROR, "short write!");
             if (wbp > &wbuf[OBS])
-                memcpy(wbuf, wbuf + OBS, wbp - &wbuf[OBS]);
+                memmove(wbuf, wbuf + OBS, wbp - &wbuf[OBS]);
             wbp -= OBS;
         }
     }
@@ -532,3 +533,5 @@ uchar *
     ns[l + o] = '\0';
     return (uchar *) strncpy((char *) ns + o, (char *) s, l) - o;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/preproc/unix.c b/idlc/source/preproc/unix.c
index 808b1d90dbd3..b0a8f478ace3 100644
--- a/idlc/source/preproc/unix.c
+++ b/idlc/source/preproc/unix.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
-#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
+#if (defined(_WIN32) || defined(__IBMC__))
 #include <io.h>
 #include <sys/stat.h>
 #include <external/glibc/getopt.h>
@@ -246,3 +247,5 @@ void *
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/scanner.ll b/idlc/source/scanner.ll
index 4125195f5916..2206297a0ffd 100644
--- a/idlc/source/scanner.ll
+++ b/idlc/source/scanner.ll
@@ -25,6 +25,8 @@
  *
  ************************************************************************/
 
+%option yylineno
+
 %{
 /*
  * scanner.ll - Lexical scanner for IDLC 1.0
@@ -46,12 +48,19 @@
 
 #include "attributeexceptions.hxx"
 
+
 class AstExpression;
 class AstArray;
 class AstMember;
 
 #include <parser.hxx>
 
+/* handle locations */
+int yycolumn = 1;
+
+#define YY_USER_ACTION idlc()->setOffset(yycolumn, yycolumn+yyleng-1); \
+    yycolumn += yyleng;
+
 sal_Int32		beginLine = 0;
 ::rtl::OString	docu;
 
@@ -225,6 +234,7 @@ static void parseLineAndFile(sal_Char* pBuf)
 	for (; *r != '\0' && *r != ' ' && *r != '\t'; r++) ;
 	*r++ = 0;
 	idlc()->setLineNumber((sal_uInt32)atol(h));
+    yylineno = atol(h);
 
 	/* Find file name, if present */
 	for (; *r != '"'; r++)
@@ -281,8 +291,10 @@ IDENTIFIER      ("_"?({ALPHA}|{DIGIT})+)*
 %%
 
 [ \t\r]+	; /* eat up whitespace */
-[\n] 		{
-	idlc()->incLineNumber();
+[\n]           {
+       idlc()->incLineNumber();
+       yycolumn = 1;
+       yylineno++;
 }
 
 attribute       return IDL_ATTRIBUTE;
@@ -347,21 +359,21 @@ published       return IDL_PUBLISHED;
 "..."           return IDL_ELLIPSIS;
 
 ("-")?{INT_LITERAL}+(l|L|u|U)?    {
-            	return asciiToInteger(yytext, &yylval.ival, &yylval.uval);
+                return asciiToInteger(yytext, &yylval.ival, &yylval.uval);
             }
 
 ("-")?{OCT_LITERAL}+(l|L|u|U)?    {
-            	return asciiToInteger(yytext, &yylval.ival, &yylval.uval);
+                return asciiToInteger(yytext, &yylval.ival, &yylval.uval);
             }
 
 ("-")?{HEX_LITERAL}+(l|L|u|U)?    {
-            	return asciiToInteger(yytext, &yylval.ival, &yylval.uval);
+                return asciiToInteger(yytext, &yylval.ival, &yylval.uval);
             }
 
 ("-")?{DIGIT}+(e|E){1}(("+"|"-")?{DIGIT}+)+(f|F)?	|
 ("-")?"."{DIGIT}+((e|E)("+"|"-")?{DIGIT}+)?(f|F)?	|
 ("-")?{DIGIT}*"."{DIGIT}+((e|E)("+"|"-")?{DIGIT}+)?(f|F)?        {
-            	yylval.dval = asciiToFloat( yytext );
+                yylval.dval = asciiToFloat( yytext );
 				return IDL_FLOATING_PT_LITERAL;
             }
 
diff --git a/idlc/source/wrap_parser.cxx b/idlc/source/wrap_parser.cxx
index 5b9abfbf417a..f03b3cc7f173 100644
--- a/idlc/source/wrap_parser.cxx
+++ b/idlc/source/wrap_parser.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,3 +30,5 @@
 #include "precompiled_idlc.hxx"
 
 #include "parser.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/wrap_scanner.cxx b/idlc/source/wrap_scanner.cxx
index f87bc4591c7b..6ea04c00e96e 100644
--- a/idlc/source/wrap_scanner.cxx
+++ b/idlc/source/wrap_scanner.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,3 +30,5 @@
 #include "precompiled_idlc.hxx"
 
 #include "scanner.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/inc/pch/precompiled_io.cxx b/io/inc/pch/precompiled_io.cxx
index ba022a3d4a14..aebb139d4ebd 100644
--- a/io/inc/pch/precompiled_io.cxx
+++ b/io/inc/pch/precompiled_io.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_io.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/inc/pch/precompiled_io.hxx b/io/inc/pch/precompiled_io.hxx
index 1ea7913e3d44..0c959b5c8712 100644
--- a/io/inc/pch/precompiled_io.hxx
+++ b/io/inc/pch/precompiled_io.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/prj/d.lst b/io/prj/d.lst
index eaadf64dba11..40eb9ab138de 100644
--- a/io/prj/d.lst
+++ b/io/prj/d.lst
@@ -1,12 +1,12 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\*
-..\source\acceptor\acceptor.xml %_DEST%\xml%_EXT%\acceptor.uno.xml
-..\source\connector\connectr.xml %_DEST%\xml%_EXT%\connector.uno.xml
-..\source\stm\stm.xml %_DEST%\xml%_EXT%\streams.uno.xml
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
-..\%__SRC%\misc\acceptor.component %_DEST%\xml%_EXT%\acceptor.component
-..\%__SRC%\misc\connector.component %_DEST%\xml%_EXT%\connector.component
-..\%__SRC%\misc\streams.component %_DEST%\xml%_EXT%\streams.component
-..\%__SRC%\misc\textinstream.component %_DEST%\xml%_EXT%\textinstream.component
-..\%__SRC%\misc\textoutstream.component %_DEST%\xml%_EXT%\textoutstream.component
+..\%__SRC%\bin\*.dll %_DEST%\bin\*
+..\%__SRC%\bin\*.rdb %_DEST%\rdb\*
+..\source\acceptor\acceptor.xml %_DEST%\xml\acceptor.uno.xml
+..\source\connector\connectr.xml %_DEST%\xml\connector.uno.xml
+..\source\stm\stm.xml %_DEST%\xml\streams.uno.xml
+..\%__SRC%\lib\*.so %_DEST%\lib\*
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*
+..\%__SRC%\misc\acceptor.component %_DEST%\xml\acceptor.component
+..\%__SRC%\misc\connector.component %_DEST%\xml\connector.component
+..\%__SRC%\misc\streams.component %_DEST%\xml\streams.component
+..\%__SRC%\misc\textinstream.component %_DEST%\xml\textinstream.component
+..\%__SRC%\misc\textoutstream.component %_DEST%\xml\textoutstream.component
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index 5829fe43cce3..9b2cbfeda57b 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -457,18 +458,9 @@ OUString TextInputStream_getImplementationName()
 
 Sequence< OUString > TextInputStream_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+    return seqNames;
 }
 
 OUString OTextInputStream::getImplementationName() throw()
@@ -515,13 +507,13 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
@@ -529,3 +521,4 @@ void * SAL_CALL component_getFactory(
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index b504941afea7..1f54a64d0633 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -254,18 +255,9 @@ OUString TextOutputStream_getImplementationName() SAL_THROW(  () )
 
 Sequence< OUString > TextOutputStream_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+    return seqNames;
 }
 
 OUString OTextOutputStream::getImplementationName() throw()
@@ -313,13 +305,13 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
@@ -327,3 +319,4 @@ void * SAL_CALL component_getFactory(
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 63f688d32dca..199a7baf1591 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,7 +84,7 @@ namespace io_acceptor
         g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
 
         // make it unique
-        m_sDescription += OUString::createFromAscii( ",uniqueValue=" );
+        m_sDescription += OUString(RTL_CONSTASCII_USTRINGPARAM(",uniqueValue="));
         m_sDescription += OUString::valueOf(
             sal::static_int_cast<sal_Int64 >(
                 reinterpret_cast< sal_IntPtr >(&m_pipe)),
@@ -172,7 +173,7 @@ namespace io_acceptor
         m_pipe = Pipe( m_sPipeName.pData , osl_Pipe_CREATE , osl::Security() );
         if( ! m_pipe.is() )
         {
-            OUString error = OUString::createFromAscii( "io.acceptor: Couldn't setup pipe " );
+            OUString error = OUString(RTL_CONSTASCII_USTRINGPARAM("io.acceptor: Couldn't setup pipe "));
             error += m_sPipeName;
             throw ConnectionSetupException( error, Reference< XInterface > () );
         }
@@ -187,7 +188,7 @@ namespace io_acceptor
         }
         if( ! pipe.is() )
         {
-            OUString error = OUString::createFromAscii( "io.acceptor: pipe already closed" );
+            OUString error = OUString(RTL_CONSTASCII_USTRINGPARAM("io.acceptor: pipe already closed"));
             error += m_sPipeName;
             throw ConnectionSetupException( error, Reference< XInterface > () );
         }
@@ -207,7 +208,7 @@ namespace io_acceptor
         }
         else
         {
-            OUString error = OUString::createFromAscii( "io.acceptor: Couldn't setup pipe " );
+            OUString error = OUString(RTL_CONSTASCII_USTRINGPARAM("io.acceptor: Couldn't setup pipe "));
             error += m_sPipeName;
             throw ConnectionSetupException( error, Reference< XInterface > ());
         }
@@ -228,3 +229,5 @@ namespace io_acceptor
         }
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index ecdf59495f3d..c3ae4a775e4c 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,7 @@
 #include "precompiled_io.hxx"
 #include "acceptor.hxx"
 
-#include <hash_set>
+#include <boost/unordered_set.hpp>
 #include <algorithm>
 
 #include <rtl/ustrbuf.hxx>
@@ -67,7 +68,7 @@ namespace io_acceptor {
     };
 
 
-    typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
+    typedef ::boost::unordered_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
                              ReferenceHash< ::com::sun::star::io::XStreamListener>,
                              ReferenceEqual< ::com::sun::star::io::XStreamListener> >
             XStreamListener_hash_set;
@@ -414,3 +415,4 @@ namespace io_acceptor {
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index 2d15aa340694..f68ffe07d634 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -300,18 +301,9 @@ namespace io_acceptor
 
     Sequence< OUString > acceptor_getSupportedServiceNames()
     {
-        static Sequence < OUString > *pNames = 0;
-        if( ! pNames )
-        {
-            MutexGuard guard( Mutex::getGlobalMutex() );
-            if( !pNames )
-            {
-                static Sequence< OUString > seqNames(1);
-                seqNames.getArray()[0] = OUString::createFromAscii( SERVICE_NAME );
-                pNames = &seqNames;
-            }
-        }
-        return *pNames;
+        Sequence< OUString > seqNames(1);
+        seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
+        return seqNames;
     }
 
         OUString OAcceptor::getImplementationName() throw()
@@ -360,13 +352,13 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
@@ -375,3 +367,4 @@ void * SAL_CALL component_getFactory(
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/acceptor/acceptor.hxx b/io/source/acceptor/acceptor.hxx
index 11b01e6dac7d..963adc1f1460 100644
--- a/io/source/acceptor/acceptor.hxx
+++ b/io/source/acceptor/acceptor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,4 @@ namespace io_acceptor {
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/acceptor/acceptor.xml b/io/source/acceptor/acceptor.xml
index 82a25d3d5926..2a2d3a76afb2 100644
--- a/io/source/acceptor/acceptor.xml
+++ b/io/source/acceptor/acceptor.xml
@@ -35,10 +35,8 @@
     </component-description>
     <project-build-dependency>  cppuhelper  </project-build-dependency>
     <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  vos         </project-build-dependency>
     <project-build-dependency>  sal         </project-build-dependency>
     <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
     <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> vos2MSC     </runtime-module-dependency>
     <runtime-module-dependency> sal2        </runtime-module-dependency>
 </module-description>
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index 2b0e8d66ad34..192b97075fad 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,11 +119,11 @@ namespace stoc_connector
                 }
                 else
                 {
-                    OUString sMessage = OUString::createFromAscii( "Connector : couldn't connect to pipe " );
+                    OUString sMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("Connector : couldn't connect to pipe "));
                     sMessage += aName;
-                    sMessage += OUString::createFromAscii( "(" );
+                    sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM("("));
                     sMessage += OUString::valueOf( (sal_Int32 ) pConn->m_pipe.getError() );
-                    sMessage += OUString::createFromAscii( ")" );
+                    sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
                     delete pConn;
                     throw NoConnectException( sMessage ,Reference< XInterface > () );
                 }
@@ -152,10 +153,10 @@ namespace stoc_connector
                 SocketAddr AddrTarget( aHost.pData, nPort );
                 if(pConn->m_socket.connect(AddrTarget) != osl_Socket_Ok)
                 {
-                    OUString sMessage = OUString::createFromAscii( "Connector : couldn't connect to socket (" );
+                    OUString sMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("Connector : couldn't connect to socket ("));
                     OUString sError = pConn->m_socket.getErrorAsString();
                     sMessage += sError;
-                    sMessage += OUString::createFromAscii( ")" );
+                    sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
                     delete pConn;
                     throw NoConnectException( sMessage, Reference < XInterface > () );
                 }
@@ -203,18 +204,9 @@ namespace stoc_connector
 
     Sequence< OUString > connector_getSupportedServiceNames()
     {
-        static Sequence < OUString > *pNames = 0;
-        if( ! pNames )
-        {
-            MutexGuard guard( Mutex::getGlobalMutex() );
-            if( !pNames )
-            {
-                static Sequence< OUString > seqNames(1);
-                seqNames.getArray()[0] = OUString::createFromAscii( SERVICE_NAME );
-                pNames = &seqNames;
-            }
-        }
-        return *pNames;
+        Sequence< OUString > seqNames(1);
+        seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
+        return seqNames;
     }
 
     OUString connector_getImplementationName()
@@ -272,13 +264,13 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
@@ -287,3 +279,4 @@ void * SAL_CALL component_getFactory(
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx
index a68206b61b9f..6ed0e91619c8 100644
--- a/io/source/connector/connector.hxx
+++ b/io/source/connector/connector.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
 #include <com/sun/star/connection/XConnection.hpp>
 #include <com/sun/star/connection/XConnectionBroadcaster.hpp>
 
-#include <hash_set>
+#include <boost/unordered_set.hpp>
 #       include <osl/socket.hxx>
 #       include <osl/pipe.hxx>
 
@@ -59,7 +60,7 @@ namespace stoc_connector
         }
     };
 
-    typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
+    typedef ::boost::unordered_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
                              ReferenceHash< ::com::sun::star::io::XStreamListener>,
                              ReferenceEqual< ::com::sun::star::io::XStreamListener> >
             XStreamListener_hash_set;
@@ -142,3 +143,4 @@ namespace stoc_connector
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/connector/connectr.xml b/io/source/connector/connectr.xml
index bffd94566841..cdeb0df7edec 100644
--- a/io/source/connector/connectr.xml
+++ b/io/source/connector/connectr.xml
@@ -35,10 +35,8 @@
     </component-description>
     <project-build-dependency>  cppuhelper  </project-build-dependency>
     <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  vos         </project-build-dependency>
     <project-build-dependency>  sal         </project-build-dependency>
     <runtime-module-dependency> cppuhelper2 </runtime-module-dependency>
     <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> vos2            </runtime-module-dependency>
     <runtime-module-dependency> sal2        </runtime-module-dependency>
 </module-description>
diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx
index 913ff5700971..3069d0523794 100644
--- a/io/source/connector/ctr_pipe.cxx
+++ b/io/source/connector/ctr_pipe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,7 +46,7 @@ namespace stoc_connector {
     {
         g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
         // make it unique
-        m_sDescription += OUString::createFromAscii( ",uniqueValue=" );
+        m_sDescription += OUString(RTL_CONSTASCII_USTRINGPARAM(",uniqueValue="));
         m_sDescription += OUString::valueOf(
             sal::static_int_cast< sal_Int64 >(
                 reinterpret_cast< sal_IntPtr >(&m_pipe)),
@@ -116,3 +117,4 @@ namespace stoc_connector {
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx
index dd532a9b5984..1fdd69429190 100644
--- a/io/source/connector/ctr_socket.cxx
+++ b/io/source/connector/ctr_socket.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -253,3 +254,4 @@ namespace stoc_connector {
     }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx
index 364374dc6726..10e2c80e020f 100644
--- a/io/source/stm/factreg.cxx
+++ b/io/source/stm/factreg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -104,16 +105,18 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/factreg.hxx b/io/source/stm/factreg.hxx
index c8b88895846e..56c097671c89 100644
--- a/io/source/stm/factreg.hxx
+++ b/io/source/stm/factreg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,5 @@ OUString OPumpImpl_getImplementationName();
 Sequence<OUString> OPumpImpl_getSupportedServiceNames(void);
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 9388ba368b0e..338df98b7e7b 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 
 // streams
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <vector>
 
 #include <com/sun/star/io/XObjectInputStream.hpp>
@@ -807,16 +808,13 @@ void ODataOutputStream::writeUTF(const OUString& Value)
             writeByte(sal_Int8(0xE0 | ((c >> 12) & 0x0F)));
             writeByte(sal_Int8(0x80 | ((c >>  6) & 0x3F)));
             writeByte(sal_Int8(0x80 | ((c >>  0) & 0x3F)));
-            //written += 2;
         }
         else
         {
             writeByte(sal_Int8(0xC0 | ((c >>  6) & 0x1F)));
             writeByte(sal_Int8(0x80 | ((c >>  0) & 0x3F)));
-            //written += 1;
         }
     }
-    //written += strlen + 2;
 }
 
 // XActiveDataSource
@@ -950,7 +948,7 @@ struct hashObjectContainer_Impl
     }
 };
 
-typedef hash_map
+typedef boost::unordered_map
 <
     Reference< XInterface >,
     sal_Int32,
@@ -1662,3 +1660,5 @@ Sequence<OUString> OObjectInputStream_getSupportedServiceNames(void)
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 67d4023387a3..a8317d3918a0 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -405,7 +406,7 @@ void OMarkableOutputStream::checkMarksAndFlush() throw(     NotConnectedExceptio
 
     // find the smallest mark
     sal_Int32 nNextFound = m_nCurrentPos;
-    for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ii ++ ) {
+    for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ++ii ) {
         if( (*ii).second <= nNextFound )  {
             nNextFound = (*ii).second;
         }
@@ -414,7 +415,7 @@ void OMarkableOutputStream::checkMarksAndFlush() throw(     NotConnectedExceptio
     if( nNextFound ) {
         // some data must be released !
         m_nCurrentPos -= nNextFound;
-        for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ii ++ ) {
+        for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ++ii ) {
             (*ii).second -= nNextFound;
         }
 
@@ -729,15 +730,13 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip)
 {
     if ( nBytesToSkip < 0 )
         throw BufferSizeExceededException(
-            ::rtl::OUString::createFromAscii( "precondition not met: XInputStream::skipBytes: non-negative integer required!" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("precondition not met: XInputStream::skipBytes: non-negative integer required!")),
             *this
         );
 
     // this method is blocking
-    sal_Int32 nRead;
     Sequence<sal_Int8> seqDummy( nBytesToSkip );
-
-    nRead = readBytes( seqDummy , nBytesToSkip );
+    readBytes( seqDummy , nBytesToSkip );
 }
 
 sal_Int32 OMarkableInputStream::available(void) throw (NotConnectedException, RuntimeException)
@@ -938,7 +937,7 @@ void OMarkableInputStream::checkMarksAndFlush()
 
     // find the smallest mark
     sal_Int32 nNextFound = m_nCurrentPos;
-    for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ii ++ ) {
+    for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ++ii ) {
         if( (*ii).second <= nNextFound )  {
             nNextFound = (*ii).second;
         }
@@ -947,7 +946,7 @@ void OMarkableInputStream::checkMarksAndFlush()
     if( nNextFound ) {
         // some data must be released !
         m_nCurrentPos -= nNextFound;
-        for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ii ++ ) {
+        for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ++ii ) {
             (*ii).second -= nNextFound;
         }
 
@@ -1013,3 +1012,5 @@ Sequence<OUString> OMarkableInputStream_getSupportedServiceNames(void)
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index 63afcf8766c4..79c3da328eaa 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -119,9 +120,6 @@ public: // XServiceInfo
 
 private:
 
-    // DEBUG
-    inline void checkInvariant();
-
     Reference < XConnectable >  m_succ;
     Reference < XConnectable >  m_pred;
 
@@ -134,7 +132,7 @@ private:
 
     oslCondition m_conditionBytesAvail;
     Mutex     m_mutexAccess;
-    IFIFO       *m_pFIFO;
+    I_FIFO      *m_pFIFO;
 };
 
 
@@ -159,12 +157,6 @@ OPipeImpl::~OPipeImpl()
 }
 
 
-// These invariants must hold when entering a guarded method or leaving a guarded method.
-void OPipeImpl::checkInvariant()
-{
-
-}
-
 sal_Int32 OPipeImpl::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
     throw( NotConnectedException, BufferSizeExceededException,RuntimeException )
 {
@@ -277,7 +269,6 @@ sal_Int32 OPipeImpl::available(void)
             OUString( RTL_CONSTASCII_USTRINGPARAM( "Pipe::available NotConnectedException" ) ),
             *this );
     }
-    checkInvariant();
     return m_pFIFO->getSize();
 }
 
@@ -306,7 +297,6 @@ void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData)
            RuntimeException)
 {
     MutexGuard guard( m_mutexAccess );
-    checkInvariant();
 
     if( m_bOutputStreamClosed )
     {
@@ -346,13 +336,13 @@ void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData)
         }
         m_nBytesToSkip = 0;
     }
-    catch ( IFIFO_OutOfBoundsException & )
+    catch ( I_FIFO_OutOfBoundsException & )
     {
         throw BufferSizeExceededException(
             OUString( RTL_CONSTASCII_USTRINGPARAM( "Pipe::writeBytes BufferSizeExceededException" )),
             *this );
     }
-    catch ( IFIFO_OutOfMemoryException & )
+    catch ( I_FIFO_OutOfMemoryException & )
     {
         throw BufferSizeExceededException(
             OUString( RTL_CONSTASCII_USTRINGPARAM( "Pipe::writeBytes BufferSizeExceededException" )),
@@ -361,8 +351,6 @@ void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData)
 
     // readBytes may check again if enough bytes are available
     osl_setCondition( m_conditionBytesAvail );
-
-    checkInvariant();
 }
 
 
@@ -490,3 +478,4 @@ Sequence<OUString> OPipeImpl_getSupportedServiceNames(void)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index 384c080ca52a..21f03b6169b5 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,13 +53,16 @@
 
 using namespace osl;
 using namespace std;
-using namespace rtl;
 using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace com::sun::star::io;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
 #include "factreg.hxx"
 
 namespace io_stm {
@@ -279,7 +283,7 @@ void Pump::run()
             if( ! rInput.is() )
             {
                 NotConnectedException exception(
-                    OUString::createFromAscii( "no input stream set" ) , Reference<XInterface>((OWeakObject*)this) );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("no input stream set")) , Reference<XInterface>((OWeakObject*)this) );
                 throw exception;
             }
             Sequence< sal_Int8 > aData;
@@ -288,7 +292,7 @@ void Pump::run()
                 if( ! rOutput.is() )
                 {
                     NotConnectedException exception(
-                        OUString::createFromAscii( "no output stream set" ) , Reference<XInterface>( (OWeakObject*)this) );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("no output stream set")) , Reference<XInterface>( (OWeakObject*)this) );
                     throw exception;
                 }
                 rOutput->writeBytes( aData );
@@ -502,3 +506,4 @@ Sequence<OUString> OPumpImpl_getSupportedServiceNames(void)
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/stm.xml b/io/source/stm/stm.xml
index 6909ee93236e..64e76dc8d2c7 100644
--- a/io/source/stm/stm.xml
+++ b/io/source/stm/stm.xml
@@ -269,12 +269,10 @@
 
     <project-build-dependency>  cppuhelper  </project-build-dependency>
     <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  vos         </project-build-dependency>
     <project-build-dependency>  sal         </project-build-dependency>
 
     <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
     <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> vos2MSC     </runtime-module-dependency>
     <runtime-module-dependency> sal2        </runtime-module-dependency>
 </module-description>
 
diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx
index 408581f6667d..8791c016db7d 100644
--- a/io/source/stm/streamhelper.cxx
+++ b/io/source/stm/streamhelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,8 +44,8 @@ using namespace ::com::sun::star::uno;
 namespace io_stm {
 
 void MemFIFO::write( const Sequence< sal_Int8 > &seq )
-    throw ( IFIFO_OutOfMemoryException,
-            IFIFO_OutOfBoundsException )
+    throw ( I_FIFO_OutOfMemoryException,
+            I_FIFO_OutOfBoundsException )
 {
     try
     {
@@ -52,15 +53,15 @@ void MemFIFO::write( const Sequence< sal_Int8 > &seq )
     }
     catch( IRingBuffer_OutOfMemoryException & )
     {
-        throw IFIFO_OutOfMemoryException();
+        throw I_FIFO_OutOfMemoryException();
     }
     catch( IRingBuffer_OutOfBoundsException & )
     {
-        throw IFIFO_OutOfBoundsException();
+        throw I_FIFO_OutOfBoundsException();
     }
 }
 
-void MemFIFO::read( Sequence<sal_Int8> &seq , sal_Int32 nBufferLen ) throw (IFIFO_OutOfBoundsException)
+void MemFIFO::read( Sequence<sal_Int8> &seq , sal_Int32 nBufferLen ) throw (I_FIFO_OutOfBoundsException)
 {
     try
     {
@@ -69,11 +70,11 @@ void MemFIFO::read( Sequence<sal_Int8> &seq , sal_Int32 nBufferLen ) throw (IFIF
     }
     catch ( IRingBuffer_OutOfBoundsException & )
     {
-        throw IFIFO_OutOfBoundsException();
+        throw I_FIFO_OutOfBoundsException();
     }
 }
 
-void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( IFIFO_OutOfBoundsException )
+void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( I_FIFO_OutOfBoundsException )
 {
     try
     {
@@ -81,7 +82,7 @@ void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( IFIFO_OutOfBoundsException
     }
     catch( IRingBuffer_OutOfBoundsException & )
     {
-        throw IFIFO_OutOfBoundsException();
+        throw I_FIFO_OutOfBoundsException();
     }
 }
 
@@ -242,3 +243,5 @@ void MemRingBuffer::shrink() throw ()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx
index 6143c30f9eae..6a792732d4ef 100644
--- a/io/source/stm/streamhelper.hxx
+++ b/io/source/stm/streamhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,30 +42,30 @@
 
 namespace io_stm {
 
-class IFIFO_OutOfBoundsException :
+class I_FIFO_OutOfBoundsException :
                 public Exception
 {};
 
-class IFIFO_OutOfMemoryException :
+class I_FIFO_OutOfMemoryException :
                 public Exception
 {};
 
-class IFIFO
+class I_FIFO
 {
 public:
 
 
-    virtual void    write( const Sequence<sal_Int8> &) throw( IFIFO_OutOfMemoryException,
-                                                              IFIFO_OutOfBoundsException )=0;
+    virtual void    write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException,
+                                                              I_FIFO_OutOfBoundsException )=0;
 
     virtual void    read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead )
-                                                    throw( IFIFO_OutOfBoundsException )=0;
+                                                       throw( I_FIFO_OutOfBoundsException )=0;
     virtual void    skip( sal_Int32 nBytesToSkip )
-                                        throw( IFIFO_OutOfBoundsException )=0;
+                                                       throw( I_FIFO_OutOfBoundsException )=0;
     virtual sal_Int32   getSize() const throw(  )  =0;
     virtual void    shrink() throw() = 0;
 
-    virtual ~IFIFO() {};
+    virtual ~I_FIFO() {};
 };
 
 
@@ -136,15 +137,15 @@ private:
 
 
 class MemFIFO :
-        public  IFIFO,
-        private MemRingBuffer
+    public  I_FIFO,
+    private MemRingBuffer
 {
 public:
-    virtual void    write( const Sequence<sal_Int8> &) throw( IFIFO_OutOfMemoryException,
-                                                              IFIFO_OutOfBoundsException );
+    virtual void    write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException,
+                                                              I_FIFO_OutOfBoundsException );
     virtual void    read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead )
-                                                    throw( IFIFO_OutOfBoundsException );
-    virtual void    skip( sal_Int32 nBytesToSkip ) throw( IFIFO_OutOfBoundsException );
+                                                       throw( I_FIFO_OutOfBoundsException );
+    virtual void    skip( sal_Int32 nBytesToSkip ) throw( I_FIFO_OutOfBoundsException );
     virtual sal_Int32   getSize()  const throw(  )
                         { return MemRingBuffer::getSize(); }
     virtual void    shrink() throw()
@@ -160,3 +161,5 @@ public:
 #endif
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 16fa914e6b80..d865288d6de3 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,7 +58,6 @@
 using namespace ::rtl;
 using namespace ::osl;
 using namespace ::cppu;
-//using namespace ::vos;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
@@ -122,7 +122,7 @@ void ODataStreamTest::testInvariant(
     throw ( IllegalArgumentException,
             RuntimeException)
 {
-    if( OUString::createFromAscii("com.sun.star.io.DataInputStream") == TestName ) {
+    if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) == TestName ) {
         Reference < XConnectable > connect( TestObject , UNO_QUERY );
         Reference < XActiveDataSink > active( TestObject , UNO_QUERY );
         Reference < XInputStream >  input( TestObject , UNO_QUERY );
@@ -135,7 +135,7 @@ void ODataStreamTest::testInvariant(
 
 
     }
-    else if( OUString::createFromAscii("com.sun.star.io.DataInputStream") == TestName ) {
+    else if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) == TestName ) {
         Reference < XConnectable >  connect( TestObject , UNO_QUERY );
         Reference < XActiveDataSource > active( TestObject , UNO_QUERY );
         Reference < XOutputStream > output( TestObject , UNO_QUERY );
@@ -153,7 +153,7 @@ void ODataStreamTest::testInvariant(
     if( info.is() )
     {
         ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" );
-        ERROR_ASSERT( ! info->supportsService( OUString::createFromAscii("bla bluzb") ) , "XServiceInfo test failed" );
+        ERROR_ASSERT( ! info->supportsService( OUString(RTL_CONSTASCII_USTRINGPARAM("bla bluzb")) ) , "XServiceInfo test failed" );
     }
 
 }
@@ -166,8 +166,8 @@ sal_Int32 ODataStreamTest::test(
     throw ( IllegalArgumentException,
             RuntimeException)
 {
-    if( OUString::createFromAscii("com.sun.star.io.DataInputStream") == TestName ||
-        OUString::createFromAscii("com.sun.star.io.DataOutputStream") == TestName )  {
+    if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) == TestName ||
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream")) == TestName )  {
 
         try
         {
@@ -292,8 +292,8 @@ void ODataStreamTest::testSimple(   const Reference < XDataInputStream > &rInput
     rOutput->writeHyper( 0x123456789abcdefLL );
     ERROR_ASSERT( rInput->readHyper() == 0x123456789abcdefLL , "int64 read/write mismatch" );
 
-    rOutput->writeUTF( OUString::createFromAscii("Live long and prosper !") );
-    ERROR_ASSERT( rInput->readUTF() == OUString::createFromAscii("Live long and prosper !") ,
+    rOutput->writeUTF( OUString(RTL_CONSTASCII_USTRINGPARAM("Live long and prosper !")) );
+    ERROR_ASSERT( rInput->readUTF() == OUString(RTL_CONSTASCII_USTRINGPARAM("Live long and prosper !")) ,
                     "UTF read/write mismatch" );
 
     Sequence<sal_Unicode> wc(0x10001);
@@ -386,14 +386,6 @@ OUString    ODataStreamTest_getImplementationName( int i) throw ()
     }
 }
 
-
-/**------------------------------------------------------
-*
-*
-*
-*
-*
-*------------------------------------------------------*/
 class MyPersistObject : public WeakImplHelper2< XPersistObject , XPropertySet >
 {
 public:
@@ -657,9 +649,6 @@ OUString    OMyPersistObject_getImplementationName( ) throw ()
     return OUString( RTL_CONSTASCII_USTRINGPARAM( "test.com.sun.star.io.PersistTest" ) );
 }
 
-
-// ---------------------------------------------
-// -----------------------------------------------
 class OObjectStreamTest :
         public ODataStreamTest
 {
@@ -717,7 +706,7 @@ void OObjectStreamTest::testInvariant( const OUString& TestName,
     if( info.is() )
     {
         ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" );
-        ERROR_ASSERT( ! info->supportsService( OUString::createFromAscii("bla bluzb") ) , "XServiceInfo test failed" );
+        ERROR_ASSERT( ! info->supportsService( OUString(RTL_CONSTASCII_USTRINGPARAM("bla bluzb")) ) , "XServiceInfo test failed" );
     }
 
 }
@@ -835,8 +824,8 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp
 {
     sal_Bool b = sal_True;
 
-    if( r1->getPropertyValue( OUString::createFromAscii("long") ).getValueType() == getCppuVoidType() ||
-        r2->getPropertyValue( OUString::createFromAscii("long") ).getValueType() == getCppuVoidType() ) {
+    if( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ).getValueType() == getCppuVoidType() ||
+        r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ).getValueType() == getCppuVoidType() ) {
 
         // one of the objects is not the correct propertyset !
         fprintf( stderr, "compareMyPropertySet: 1\n" );
@@ -1004,8 +993,8 @@ void OObjectStreamTest::testObject(     const Reference<  XObjectOutputStream >
         ERROR_ASSERT( compareMyPropertySet( rProp , rPropRead ) , "objects has not been read properly !" );
 
         // destroy selfreferences
-        rProp->setPropertyValue( OUString::createFromAscii("object"), Any() );
-        rPropRead->setPropertyValue( OUString::createFromAscii("object"), Any() );
+        rProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")), Any() );
+        rPropRead->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")), Any() );
     }
 
     {
@@ -1016,7 +1005,7 @@ void OObjectStreamTest::testObject(     const Reference<  XObjectOutputStream >
         // buffering and marks work correctly
         for( int i = 0 ; i < 2000 ; i ++ ) {
 
-            Reference < XInterface > x = m_rFactory->createInstance(OUString::createFromAscii("test.com.sun.star.io.PersistTest"));
+            Reference < XInterface > x = m_rFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest")));
             Reference< XPersistObject >  persistRef( x , UNO_QUERY );
 
             Reference < XPropertySet >  rProp( persistRef , UNO_QUERY );
@@ -1051,13 +1040,13 @@ void OObjectStreamTest::testObject(     const Reference<  XObjectOutputStream >
             any <<= str;
             rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("string")) , any );
 
-            x = m_rFactory->createInstance(OUString::createFromAscii("test.com.sun.star.io.PersistTest"));
+            x = m_rFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest")));
             Reference <XPersistObject > persist2ndRef( x , UNO_QUERY );
 
             // Note : persist2ndRef contains coincident values, but also coincident values must be
             // saved properly !
             any <<= persist2ndRef;
-            rProp->setPropertyValue( OUString::createFromAscii("object") , any );
+            rProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")) , any );
 
             // simply test, if markable operations and object operations do not interfere
             sal_Int32 nMark = markableOut->createMark();
@@ -1121,3 +1110,4 @@ OUString    OObjectStreamTest_getImplementationName( int i) throw ()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx
index 46ab1c864647..dca626a797ba 100644
--- a/io/test/stm/marktest.cxx
+++ b/io/test/stm/marktest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -141,7 +142,7 @@ sal_Int32 OMarkableOutputStreamTest::test(
             }
             else
             {
-                Reference < XInterface > x = m_rFactory->createInstance( OUString::createFromAscii("com.sun.star.io.Pipe"));
+                Reference < XInterface > x = m_rFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe")));
                 Reference< XOutputStream >  rPipeOutput( x , UNO_QUERY );
                 Reference < XInputStream >  rPipeInput( x , UNO_QUERY );
 
@@ -508,7 +509,7 @@ sal_Int32 OMarkableInputStreamTest::test(
                 testInvariant( TestName , TestObject );
             }
             else  {
-                Reference < XInterface > x = m_rFactory->createInstance( OUString::createFromAscii("com.sun.star.io.Pipe"));
+                Reference < XInterface > x = m_rFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe")));
                 Reference< XOutputStream >  rPipeOutput( x , UNO_QUERY );
                 Reference < XInputStream >  rPipeInput( x , UNO_QUERY );
 
@@ -675,3 +676,5 @@ OUString    OMarkableInputStreamTest_getImplementationName() throw ()
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.extensions.stm.MarkableInputStream" ));
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx
index e53272acccf4..b4f6208f7e53 100644
--- a/io/test/stm/pipetest.cxx
+++ b/io/test/stm/pipetest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -437,3 +438,5 @@ OUString    OPipeTest_getImplementationName() throw()
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx
index 35c8cf4af64e..012df7bec5b2 100644
--- a/io/test/stm/pumptest.cxx
+++ b/io/test/stm/pumptest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -322,7 +323,7 @@ private:
     Reference< XOutputStream > createPipe()
     {
         Reference< XOutputStream > rOut( m_rSmgr->createInstance(
-             OUString::createFromAscii( "com.sun.star.io.Pipe" )),UNO_QUERY);
+             OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe"))),UNO_QUERY);
         return rOut;
     }
 };
@@ -414,9 +415,9 @@ void OPumpTest::testWrongUsage( const Reference< XInterface > &r )
     Reference< XActiveDataControl > rControl( r, UNO_QUERY );
 
     Reference< XInputStream > rIn( m_rSmgr->createInstance(
-        OUString::createFromAscii( "com.sun.star.io.DataInputStream" )),UNO_QUERY);
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream"))),UNO_QUERY);
     Reference< XOutputStream > rOut( m_rSmgr->createInstance(
-        OUString::createFromAscii( "com.sun.star.io.DataOutputStream" )),UNO_QUERY);
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream"))),UNO_QUERY);
 
     rSink->setInputStream( rIn );
     rSource->setOutputStream( rOut );
@@ -447,3 +448,5 @@ OUString    OPumpTest_getImplementationName() throw()
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM( "test.com.sun.star.comp.io.Pump") );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx
index e4d4efafb612..213c10a1f610 100644
--- a/io/test/stm/testfactreg.cxx
+++ b/io/test/stm/testfactreg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,7 +47,7 @@ using namespace ::com::sun::star::lang;
 extern "C"
 {
 
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -121,13 +122,13 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+            OSL_FAIL( "### InvalidRegistryException!" );
         }
     }
     return sal_False;
 }
 
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     void * pRet = 0;
@@ -214,3 +215,4 @@ Sequence<sal_Int8> createIntSeq( sal_Int32 i )
     return createSeq( pcCount );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/test/stm/testfactreg.hxx b/io/test/stm/testfactreg.hxx
index f2e14b0cf91d..374a63bcff7d 100644
--- a/io/test/stm/testfactreg.hxx
+++ b/io/test/stm/testfactreg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,3 +118,5 @@ Sequence<sal_Int8> createIntSeq( sal_Int32 i );
         return; \
     } \
     ((void)0)
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx
index 7facc0d76f7c..839f250d73ea 100644
--- a/io/test/testcomponent.cxx
+++ b/io/test/testcomponent.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,7 +73,7 @@ int main (int argc, char **argv)
     {
         // Create registration service
         Reference < XInterface > x = xSMgr->createInstance(
-            OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) );
         xReg = Reference<  XImplementationRegistration > ( x , UNO_QUERY );
     }
     catch( Exception & ) {
@@ -89,7 +90,7 @@ int main (int argc, char **argv)
         for( int n = 2 ; n <argc ; n ++ ) {
             OUString aDllName = OStringToOUString( argv[n] , RTL_TEXTENCODING_ASCII_US );
             xReg->registerImplementation(
-                OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
                 aDllName,
                 xSimpleReg );
         }
@@ -107,16 +108,16 @@ int main (int argc, char **argv)
         sTestName = "test";
         sTestName += argv[2];
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
         OUString aDllName = OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US );
 #else
-        OUString aDllName = OUString::createFromAscii("lib");
+        OUString aDllName(RTL_CONSTASCII_USTRINGPARAM("lib"));
         aDllName += OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US );
-        aDllName += OUString::createFromAscii(".so");
+        aDllName += OUString(RTL_CONSTASCII_USTRINGPARAM(".so"));
 #endif
 
         xReg->registerImplementation(
-            OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ) ,
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")) ,
             aDllName,
             xSimpleReg );
     }
@@ -215,3 +216,5 @@ int main (int argc, char **argv)
     rComp->dispose();
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx
index 4f1443f5a236..b61b2b0236e2 100644
--- a/io/test/testconnection.cxx
+++ b/io/test/testconnection.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,7 +163,7 @@ void testConnection( const OUString &sConnectionDescription  ,
         {
             Sequence < sal_Int8 > seq(10);
             r->write( seq );
-            OSL_ENSURE( 0 , "expected exception not thrown" );
+            OSL_FAIL( "expected exception not thrown" );
         }
         catch ( IOException & )
         {
@@ -170,7 +171,7 @@ void testConnection( const OUString &sConnectionDescription  ,
         }
         catch ( ... )
         {
-            OSL_ENSURE( 0 , "wrong exception was thrown" );
+            OSL_FAIL( "wrong exception was thrown" );
         }
 
         thread.join();
@@ -178,59 +179,55 @@ void testConnection( const OUString &sConnectionDescription  ,
 }
 
 
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-int __cdecl main( int argc, char * argv[] )
-#endif
+int SAL_CALL main( int argc, char * argv[] )
 {
     Reference< XMultiServiceFactory > xMgr(
         createRegistryServiceFactory( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")) ) );
 
     Reference< XImplementationRegistration > xImplReg(
-        xMgr->createInstance( OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration") ), UNO_QUERY );
+        xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) ), UNO_QUERY );
     OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
 
     OUString aLibName =
-        OUString::createFromAscii( "connector.uno" SAL_DLLEXTENSION );
+        OUString(RTL_CONSTASCII_USTRINGPARAM( "connector.uno" SAL_DLLEXTENSION ));
     xImplReg->registerImplementation(
-        OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), aLibName, Reference< XSimpleRegistry >() );
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), aLibName, Reference< XSimpleRegistry >() );
 
-    aLibName = OUString::createFromAscii( "acceptor.uno" SAL_DLLEXTENSION );
+    aLibName = OUString(RTL_CONSTASCII_USTRINGPARAM( "acceptor.uno" SAL_DLLEXTENSION ));
     xImplReg->registerImplementation(
-        OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), aLibName, Reference< XSimpleRegistry >() );
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), aLibName, Reference< XSimpleRegistry >() );
 
     Reference < XAcceptor >  rAcceptor(
         xMgr->createInstance(
-            OUString::createFromAscii("com.sun.star.connection.Acceptor" ) ) , UNO_QUERY );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")) ) , UNO_QUERY );
 
     Reference < XAcceptor >  rAcceptorPipe(
         xMgr->createInstance(
-            OUString::createFromAscii("com.sun.star.connection.Acceptor" ) ) , UNO_QUERY );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")) ) , UNO_QUERY );
 
     Reference < XConnector >  rConnector(
-        xMgr->createInstance( OUString::createFromAscii("com.sun.star.connection.Connector") ) , UNO_QUERY );
+        xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector")) ) , UNO_QUERY );
 
 
     printf( "Testing sockets" );
     fflush( stdout );
-    testConnection( OUString::createFromAscii("socket,host=localhost,port=2001"), rAcceptor , rConnector );
+    testConnection( OUString(RTL_CONSTASCII_USTRINGPARAM("socket,host=localhost,port=2001")), rAcceptor , rConnector );
     printf( " Done\n" );
 
     printf( "Testing pipe" );
     fflush( stdout );
-    testConnection( OUString::createFromAscii("pipe,name=bla") , rAcceptorPipe , rConnector );
+    testConnection( OUString(RTL_CONSTASCII_USTRINGPARAM("pipe,name=bla")) , rAcceptorPipe , rConnector );
     printf( " Done\n" );
 
     // check, if errornous strings make any problem
     rAcceptor = Reference< XAcceptor > (
-        xMgr->createInstance( OUString::createFromAscii( "com.sun.star.connection.Acceptor" ) ),
+        xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")) ),
         UNO_QUERY );
 
     try
     {
         rAcceptor->accept( OUString() );
-        OSL_ENSURE( 0 , "empty connection string" );
+        OSL_FAIL( "empty connection string" );
     }
     catch( IllegalArgumentException & )
     {
@@ -238,13 +235,13 @@ int __cdecl main( int argc, char * argv[] )
     }
     catch( ... )
     {
-        OSL_ENSURE( 0, "unexpected akexception with empty connection string" );
+        OSL_FAIL( "unexpected akexception with empty connection string" );
     }
 
     try
     {
         rConnector->connect( OUString() );
-        OSL_ENSURE( 0 , "empty connection string" );
+        OSL_FAIL( "empty connection string" );
     }
     catch( ConnectionSetupException & )
     {
@@ -252,19 +249,19 @@ int __cdecl main( int argc, char * argv[] )
     }
     catch( ... )
     {
-        OSL_ENSURE( 0, "unexpected exception with empty connection string" );
+        OSL_FAIL( "unexpected exception with empty connection string" );
     }
 
 
-    MyThread thread( rAcceptor , OUString::createFromAscii("socket,host=localhost,port=2001") );
+    MyThread thread( rAcceptor , OUString(RTL_CONSTASCII_USTRINGPARAM("socket,host=localhost,port=2001")) );
     thread.create();
 
     TimeValue value = {0,1};
     osl_waitThread( &value );
     try
     {
-        rAcceptor->accept( OUString::createFromAscii("socket,host=localhost,port=2001") );
-        OSL_ENSURE( 0 , "already existing exception expected" );
+        rAcceptor->accept( OUString(RTL_CONSTASCII_USTRINGPARAM("socket,host=localhost,port=2001")) );
+        OSL_FAIL( "already existing exception expected" );
     }
     catch( AlreadyAcceptingException & e)
     {
@@ -272,7 +269,7 @@ int __cdecl main( int argc, char * argv[] )
     }
     catch( ... )
     {
-        OSL_ENSURE( 0, "unknown exception, already existing existing expected" );
+        OSL_FAIL( "unknown exception, already existing existing expected" );
     }
 
     rAcceptor->stopAccepting();
@@ -284,3 +281,5 @@ int __cdecl main( int argc, char * argv[] )
         rComp->dispose();
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index fe3336c1dbfb..25cce2236c9a 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -167,7 +167,7 @@ public class ComponentContext implements XComponentContext, XComponent
                     catch (com.sun.star.uno.Exception exc)
                     {
                         if (DEBUG)
-                            System.err.println( "### exception occured on late init of singleton instance \"" + rName + "\": " + exc.getMessage() );
+                            System.err.println( "### exception occurred on late init of singleton instance \"" + rName + "\": " + exc.getMessage() );
                     }
 
                     if (xInstance != null)
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index 404c5a5e3f3a..a0a72b5cf616 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -354,7 +354,7 @@ public class InterfaceContainer implements Cloneable
     }
 
     /**
-     * Searches for the first occurence of the given argument, testing
+     * Searches for the first occurrence of the given argument, testing
      * for equality using the <tt>equals</tt> method.
      *
      * @param   elem   an object.
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index ad2c8c7bcf88..a6db617bfe4f 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -617,7 +617,7 @@ XMultiPropertySet
      *  @return true - Conversion was successful. <em>newVal</em> contains a valid value for the property. false -
      *  conversion failed for some reason.
      *  @throws com.sun.star.lang.IllegalArgumentException The value provided is unfit for the property.
-     *  @throws com.sun.star.lang.WrappedTargetException - An exception occured during the conversion, that is to be made known
+     *  @throws com.sun.star.lang.WrappedTargetException - An exception occurred during the conversion, that is to be made known
      *  to the caller.
      */
     protected boolean convertPropertyValue(Property property, Object[] newVal, Object[]curVal,  Object setVal)
@@ -799,7 +799,7 @@ XMultiPropertySet
      *  @param property the property for which the new value is set
      *  @param value the new value for the property.
      *  @throws com.sun.star.lang.WrappedTargetException An exception, which has to be made known to the caller,
-     *  occured during the setting of the value.
+     *  occurred during the setting of the value.
      */
     protected void setPropertyValueNoBroadcast(Property property, Object newVal)
     throws WrappedTargetException
diff --git a/javaunohelper/inc/pch/precompiled_javaunohelper.cxx b/javaunohelper/inc/pch/precompiled_javaunohelper.cxx
index a42d94c61f68..78f04ceafd7a 100644
--- a/javaunohelper/inc/pch/precompiled_javaunohelper.cxx
+++ b/javaunohelper/inc/pch/precompiled_javaunohelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_javaunohelper.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/javaunohelper/inc/pch/precompiled_javaunohelper.hxx b/javaunohelper/inc/pch/precompiled_javaunohelper.hxx
index 68cf575c740b..0f1ce4290d16 100644
--- a/javaunohelper/inc/pch/precompiled_javaunohelper.hxx
+++ b/javaunohelper/inc/pch/precompiled_javaunohelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/javaunohelper/prj/d.lst b/javaunohelper/prj/d.lst
index d58290843f48..15e14f6c4601 100644
--- a/javaunohelper/prj/d.lst
+++ b/javaunohelper/prj/d.lst
@@ -1,7 +1,7 @@
-..\%__SRC%\class\juh.jar %_DEST%\bin%_EXT%\juh.jar
-..\%__SRC%\bin\juh*.dll %_DEST%\bin%_EXT%\juh*.dll
-..\%__SRC%\lib\libjuh*.so %_DEST%\lib%_EXT%\libjuh*.so
-..\%__SRC%\lib\libjuh*.dylib %_DEST%\lib%_EXT%\libjuh*.dylib
-..\%__SRC%\misc\juh.component %_DEST%\xml%_EXT%\juh.component
+..\%__SRC%\class\juh.jar %_DEST%\bin\juh.jar
+..\%__SRC%\bin\juh*.dll %_DEST%\bin\juh*.dll
+..\%__SRC%\lib\libjuh*.so %_DEST%\lib\libjuh*.so
+..\%__SRC%\lib\libjuh*.dylib %_DEST%\lib\libjuh*.dylib
+..\%__SRC%\misc\juh.component %_DEST%\xml\juh.component
 
-..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin%_EXT%\juh_src.zip
+..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin\juh_src.zip
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx
index 43c7818fa4e3..d29f7bef71eb 100644
--- a/javaunohelper/source/bootstrap.cxx
+++ b/javaunohelper/source/bootstrap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -187,3 +188,4 @@ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cpp
     return 0;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index ba0da10fba5f..e64fd7e97db9 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -321,3 +322,5 @@ Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactor
 
     return joRegServiceFac;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx
index 847597d0eea2..18ed40c16598 100644
--- a/javaunohelper/source/preload.cxx
+++ b/javaunohelper/source/preload.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -156,3 +157,5 @@ Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
     return 0;
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx
index 56c73f86fcc2..f9c82383b9da 100644
--- a/javaunohelper/source/vm.cxx
+++ b/javaunohelper/source/vm.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -145,3 +146,5 @@ css::uno::Reference< css::uno::XComponentContext > install_vm_singleton(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/javaunohelper/source/vm.hxx b/javaunohelper/source/vm.hxx
index ec51839357c5..913d447aa26a 100644
--- a/javaunohelper/source/vm.hxx
+++ b/javaunohelper/source/vm.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,3 +54,5 @@ install_vm_singleton(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
index 86358d53cb85..412d114ab72c 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
@@ -143,7 +143,7 @@ public class ComponentBase_Test
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
         if (bOk == false)
-            System.out.println("Errors occured!");
+            System.out.println("Errors occurred!");
         else
             System.out.println("No errors.");
 
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
index c40b4c410286..111b2582f8f6 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
@@ -198,7 +198,7 @@ public class Factory_Test
         }
         catch (Exception exc)
         {
-            System.err.println( ">>>>>>>>>> exc occured: " + exc.toString() );
+            System.err.println( ">>>>>>>>>> exc occurred: " + exc.toString() );
             exc.printStackTrace();
         }
         System.exit( 0 );
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
index ba6df3038e0d..d74d2f91432e 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
@@ -983,7 +983,7 @@ public class InterfaceContainer_Test
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
         if ( ! bOk )
-            System.out.println("Test finished.\nErrors occured!!!");
+            System.out.println("Test finished.\nErrors occurred!!!");
         else
             System.out.println("Test finished. \nNo errors.");
 
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
index 9a855db6ddb5..1b3dc45e1c39 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
@@ -361,7 +361,7 @@ public class MultiTypeInterfaceContainer_Test
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
         if ( ! bOk )
-            System.out.println("Test finished.\nErrors occured!!!");
+            System.out.println("Test finished.\nErrors occurred!!!");
         else
             System.out.println("Test finished. \nNo errors.");
 
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
index 1a00899cbcf1..8c8c6a067852 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
@@ -1079,7 +1079,7 @@ public class PropertySet_Test
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
         if (bOk == false)
-            System.out.println("Errors occured!");
+            System.out.println("Errors occurred!");
         else
             System.out.println("No errors.");
         return bOk;
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
index ad2869c239b1..6f5c61bbbeb1 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
@@ -199,7 +199,7 @@ public class WeakBase_Test
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
         if (bOk == false)
-            System.out.println("Errors occured!");
+            System.out.println("Errors occurred!");
         else
             System.out.println("No errors.");
 
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index 026f198a2f02..ab15529fc16b 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -162,7 +162,7 @@ public class ServiceManager implements XMultiServiceFactory,
      * Registers a list of components given by their class names.
      * <p>
      * @param   newImpls    list of the components that should be registered, given by their class names.
-     *                      If any exception occured during the registration, the process will be canceled.
+     *                      If any exception occurred during the registration, the process will be canceled.
      * @see     com.sun.star.container.XSet
      */
     private void xaddFactories( String[] newImpls )
diff --git a/jurt/demo/com/sun/star/demo/makefile.mk b/jurt/demo/com/sun/star/demo/makefile.mk
index 6bc3e1ae9da7..c009a2afa183 100644
--- a/jurt/demo/com/sun/star/demo/makefile.mk
+++ b/jurt/demo/com/sun/star/demo/makefile.mk
@@ -34,6 +34,7 @@ TARGET  := com_sun_star_demo
 RDB=$(SOLARBINDIR)$/applicat.rdb
 
 # --- Settings -----------------------------------------------------
+
 .INCLUDE :  settings.mk
 
 #Files --------------------------------------------------------
@@ -53,5 +54,4 @@ JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFI
 
 # --- Targets ------------------------------------------------------
 
-
 .INCLUDE :  target.mk
diff --git a/jurt/prj/d.lst b/jurt/prj/d.lst
index 74f5b60d7748..3459df62ba16 100644
--- a/jurt/prj/d.lst
+++ b/jurt/prj/d.lst
@@ -1,8 +1,8 @@
-..\%__SRC%\class\jurt.jar %_DEST%\bin%_EXT%\jurt.jar
-..\%__SRC%\bin\jpipe.dll %_DEST%\bin%_EXT%\jpipe.dll
-..\%__SRC%\bin\jpipx.dll %_DEST%\bin%_EXT%\jpipx.dll
-..\%__SRC%\lib\libjpipe*.so %_DEST%\lib%_EXT%\libjpipe*.so
-..\%__SRC%\lib\libjpipe*.dylib %_DEST%\lib%_EXT%\libjpipe*.dylib
-..\%__SRC%\lib\libjpipe*.jnilib %_DEST%\lib%_EXT%\libjpipe*.jnilib
+..\%__SRC%\class\jurt.jar %_DEST%\bin\jurt.jar
+..\%__SRC%\bin\jpipe.dll %_DEST%\bin\jpipe.dll
+..\%__SRC%\bin\jpipx.dll %_DEST%\bin\jpipx.dll
+..\%__SRC%\lib\libjpipe*.so %_DEST%\lib\libjpipe*.so
+..\%__SRC%\lib\libjpipe.jnilib %_DEST%\lib\libjpipe.jnilib
+..\%__SRC%\lib\libjpipe*.jnilib %_DEST%\lib\libjpipe*.jnilib
 
-..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip
+..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin\jurt_src.zip
diff --git a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
index 4d0a5b357604..0866e452424e 100644
--- a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
+++ b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -564,3 +565,5 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_flushJNI
     (void) obj_this; /* not used */
     return;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jurt/source/pipe/wrapper/wrapper.c b/jurt/source/pipe/wrapper/wrapper.c
index 5ef40f009191..0db29e492338 100644
--- a/jurt/source/pipe/wrapper/wrapper.c
+++ b/jurt/source/pipe/wrapper/wrapper.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,3 +98,5 @@ Java_com_sun_star_lib_connections_pipe_PipeConnection_flushJNI(
     (*(void (*)(JNIEnv *, jobject))
      getFunction("PipeConnection_flush"))(env, obj_this);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java b/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java
index fbb92f9b88ee..5afd769390fd 100644
--- a/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java
+++ b/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java
@@ -42,7 +42,7 @@ public final class NativeLibraryLoader_Test extends ComplexTestCase {
         File subdir = new File(dir, "with space");
         File file1 = new File(subdir, "file");
 
-        String fileUrl = dir.toURL().toString();
+        String fileUrl = dir.toURI().toURL().toString();
         if (!fileUrl.endsWith("/")) {
             fileUrl += "/";
         }
@@ -64,7 +64,7 @@ public final class NativeLibraryLoader_Test extends ComplexTestCase {
         File subdir = new File(dir, "with space");
         File file1 = new File(subdir, "file");
 
-        String fileUrl = dir.toURL().toString();
+        String fileUrl = dir.toURI().toURL().toString();
         if (!fileUrl.endsWith("/")) {
             fileUrl += "/";
         }
diff --git a/jvmaccess/inc/jvmaccess/classpath.hxx b/jvmaccess/inc/jvmaccess/classpath.hxx
index a6c1343efb2f..917bfbd9f00e 100644
--- a/jvmaccess/inc/jvmaccess/classpath.hxx
+++ b/jvmaccess/inc/jvmaccess/classpath.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -149,3 +150,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
index aba06ddbffb0..b14aeda2978c 100644
--- a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -107,3 +108,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
index eef43e5013aa..3bffbc834f90 100644
--- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,8 +35,10 @@
 #ifdef SOLAR_JAVA
 #include "jni.h"
 #else
-struct JNIEnv;
-struct JavaVM;
+struct JNIEnv_;
+typedef JNIEnv_ JNIEnv;
+struct JavaVM_;
+typedef JavaVM_ JavaVM;
 typedef int jint;
 typedef void * jobject;
 #endif
@@ -161,3 +164,5 @@ private:
 }
 
 #endif // INCLUDED_JVMACCESS_VIRTUALMACHINE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmaccess/prj/d.lst b/jvmaccess/prj/d.lst
index 303e1e92ad26..42f019d625a2 100644
--- a/jvmaccess/prj/d.lst
+++ b/jvmaccess/prj/d.lst
@@ -1,8 +1,8 @@
-mkdir: %_DEST%\inc%_EXT%\jvmaccess
-..\inc\jvmaccess\classpath.hxx %_DEST%\inc%_EXT%\jvmaccess\classpath.hxx
-..\inc\jvmaccess\unovirtualmachine.hxx %_DEST%\inc%_EXT%\jvmaccess\unovirtualmachine.hxx
-..\inc\jvmaccess\virtualmachine.hxx %_DEST%\inc%_EXT%\jvmaccess\virtualmachine.hxx
-..\%__SRC%\bin\jvmacces*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib
-..\%__SRC%\lib\libjvmaccess*.*.* %_DEST%\lib%_EXT%\*
+mkdir: %_DEST%\inc\jvmaccess
+..\inc\jvmaccess\classpath.hxx %_DEST%\inc\jvmaccess\classpath.hxx
+..\inc\jvmaccess\unovirtualmachine.hxx %_DEST%\inc\jvmaccess\unovirtualmachine.hxx
+..\inc\jvmaccess\virtualmachine.hxx %_DEST%\inc\jvmaccess\virtualmachine.hxx
+..\%__SRC%\bin\jvmacces*.dll %_DEST%\bin\*
+..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib\ijvmaccess.lib
+..\%__SRC%\lib\libjvmaccess*.*.* %_DEST%\lib\*
 linklib: libjvmaccess*.*.*
diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx
index 0520c8bf8926..102ed1d0325c 100644
--- a/jvmaccess/source/classpath.cxx
+++ b/jvmaccess/source/classpath.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -172,3 +173,5 @@ void * ::jvmaccess::ClassPath::doLoadClass(
     return 0;
 #endif
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmaccess/source/unovirtualmachine.cxx b/jvmaccess/source/unovirtualmachine.cxx
index 48a19aeec1e8..436575c95a83 100644
--- a/jvmaccess/source/unovirtualmachine.cxx
+++ b/jvmaccess/source/unovirtualmachine.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ UnoVirtualMachine::~UnoVirtualMachine() {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmaccess/source/virtualmachine.cxx b/jvmaccess/source/virtualmachine.cxx
index db6a596e1b56..a257f55224cd 100644
--- a/jvmaccess/source/virtualmachine.cxx
+++ b/jvmaccess/source/virtualmachine.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,7 +100,7 @@ JNIEnv * VirtualMachine::attachThread(bool * pAttached) const
     JNIEnv * pEnv;
     jint n = m_pVm->GetEnv(reinterpret_cast< void ** >(&pEnv), m_nVersion);
     if (n != JNI_OK && n != JNI_EDETACHED) {
-        OSL_ENSURE(false, "JNI: GetEnv failed");
+        OSL_FAIL("JNI: GetEnv failed");
     }
     if (pEnv == 0)
     {
@@ -118,7 +119,9 @@ void VirtualMachine::detachThread() const
 {
 #ifdef SOLAR_JAVA
     if (m_pVm->DetachCurrentThread() != JNI_OK) {
-        OSL_ENSURE(false, "JNI: DetachCurrentThread failed");
+        OSL_FAIL("JNI: DetachCurrentThread failed");
     }
 #endif
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk
index 1dc327c8c884..048a80469ffa 100644
--- a/jvmaccess/util/makefile.mk
+++ b/jvmaccess/util/makefile.mk
@@ -31,7 +31,7 @@ TARGET = $(PRJNAME)
 
 ENABLE_EXCEPTIONS = TRUE
 
-.IF "$(OS)" != "WNT" && "$(OS)" != "OS2"
+.IF "$(OS)" != "WNT"
 UNIXVERSIONNAMES = UDK
 .ENDIF # WNT
 
@@ -53,6 +53,8 @@ SHL1RPATH = URELIB
 
 .IF "$(COMNAME)" == "msci"
 SHL1VERSIONMAP = msvc_win32_intel.map
+.ELIF "$(COMNAME)" == "mscx"
+SHL1VERSIONMAP = msvc_win32_x86-64.map
 .ELIF "$(COMNAME)" == "sunpro5"
 SHL1VERSIONMAP = cc5_solaris_sparc.map
 .ELIF "$(GUI)$(COM)" == "WNTGCC"
diff --git a/jvmaccess/util/msvc_win32_x86-64.map b/jvmaccess/util/msvc_win32_x86-64.map
new file mode 100644
index 000000000000..d75ab1c4a8e2
--- /dev/null
+++ b/jvmaccess/util/msvc_win32_x86-64.map
@@ -0,0 +1,37 @@
+UDK_3.1 {
+    global:
+        # jvmaccess/virtualmachine.hxx:
+        ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QEAA@XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
+        ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QEAA@AEBV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
+        ??1CreationException@AttachGuard@VirtualMachine@jvmaccess@@UEAA@XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
+        ??4CreationException@AttachGuard@VirtualMachine@jvmaccess@@QEAAAEAV0123@AEBV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &)
+        ??0AttachGuard@VirtualMachine@jvmaccess@@QEAA@AEBV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@@Z; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
+        ??1AttachGuard@VirtualMachine@jvmaccess@@QEAA@XZ; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
+    ??0VirtualMachine@jvmaccess@@QEAA@PEAUJavaVM_@@H_NPEAUJNIEnv_@@@Z; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
+
+    local:
+        *;
+};
+
+UDK_3.2 {
+    global:
+} UDK_3.1;
+
+UDK_3.3 {
+    global:
+        # jvmaccess/unovirtualmachine.hxx:
+        ??0CreationException@UnoVirtualMachine@jvmaccess@@QEAA@AEBV012@@Z; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &)
+        ??0CreationException@UnoVirtualMachine@jvmaccess@@QEAA@XZ; # jvmaccess::UnoVirtualMachine::CreationException::CreationException()
+        ??1CreationException@UnoVirtualMachine@jvmaccess@@UEAA@XZ; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
+        ??4CreationException@UnoVirtualMachine@jvmaccess@@QEAAAEAV012@AEBV012@@Z; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &)
+        ??0UnoVirtualMachine@jvmaccess@@QEAA@AEBV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@PEAX@Z; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
+        ?getVirtualMachine@UnoVirtualMachine@jvmaccess@@QEBA?AV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@XZ; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const
+        ?getClassLoader@UnoVirtualMachine@jvmaccess@@QEBAPEAXXZ; # jvmaccess::UnoVirtualMachine::getClassLoader() const
+} UDK_3.2;
+
+UDK_3.4 { # OOo 2.3
+    global:
+        # jvmaccess/classpath.hxx:
+        ?doLoadClass@ClassPath@jvmaccess@@CAPEAXAEBV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PEAXAEBVOUString@rtl@@2@Z; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &)
+        ?doTranslateToUrls@ClassPath@jvmaccess@@CAPEAXAEBV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PEAXAEBVOUString@rtl@@@Z; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &)
+} UDK_3.3;
diff --git a/jvmaccess/workbench/exceptiontest1.cxx b/jvmaccess/workbench/exceptiontest1.cxx
index 1eec1cd6a137..4a721a91f507 100644
--- a/jvmaccess/workbench/exceptiontest1.cxx
+++ b/jvmaccess/workbench/exceptiontest1.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ int main()
         std::cout << "Exception caught" << std::endl;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmaccess/workbench/exceptiontest2.cxx b/jvmaccess/workbench/exceptiontest2.cxx
index 6a2718f6bb81..d4008fe58c23 100644
--- a/jvmaccess/workbench/exceptiontest2.cxx
+++ b/jvmaccess/workbench/exceptiontest2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ int main()
         std::cout << "Exception caught" << std::endl;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmaccess/workbench/javainfo/javainfotest.cxx b/jvmaccess/workbench/javainfo/javainfotest.cxx
index 30bd9bbfd318..bb7c9875825d 100644
--- a/jvmaccess/workbench/javainfo/javainfotest.cxx
+++ b/jvmaccess/workbench/javainfo/javainfotest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,12 +35,15 @@
 #include <stdio.h>
 #include <vector>
 
-using namespace rtl;
 using namespace std;
 using namespace osl;
 
 using jvmaccess::JavaInfo;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
 #define OUSTR( x )  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
 
 #define JAVA_VERSION "1.4.1_01"
@@ -370,3 +374,5 @@ void printInfo(const JavaInfo& info)
     printf("\tLibDir: %s \n", sLibLocation.getStr());
     printf("\t%s\n", baccess ? "accessible" : "not accessible");
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk
index a6ba7a23725a..88afdb33f81c 100755
--- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk
+++ b/jvmfwk/distributions/OpenOfficeorg/makefile.mk
@@ -43,15 +43,13 @@ $(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_mac
     -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml
 .ELIF "$(OS)"=="MACOSX"
     -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml
-.ELIF "$(OS)"=="LINUX"
+.ELIF "$(OS)"=="LINUX" || "$(OS)"=="AIX"
     -$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml
 .ELSE
     -$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml
 .ENDIF
 .ELIF "$(GUI)"=="WNT"
     -$(COPY) javavendors_wnt.xml $(BIN)$/javavendors.xml	
-.ELIF "$(GUI)"=="OS2"
-    -$(COPY) javavendors_os2.xml $(BIN)$/javavendors.xml	
 .ELSE
     @echo Unsupported platform.
 .ENDIF
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index 7c3551f70116..11cca539cb05 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -866,3 +867,5 @@ void SAL_CALL jfw_unlock();
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h
index 15707b1bbe88..3ccbb0e487f4 100644
--- a/jvmfwk/inc/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/jvmfwk/vendorplugin.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -263,3 +264,5 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/inc/pch/precompiled_jvmfwk.cxx b/jvmfwk/inc/pch/precompiled_jvmfwk.cxx
index ec7c6af9d6b4..80c3bb3ee344 100644
--- a/jvmfwk/inc/pch/precompiled_jvmfwk.cxx
+++ b/jvmfwk/inc/pch/precompiled_jvmfwk.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_jvmfwk.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/inc/pch/precompiled_jvmfwk.hxx b/jvmfwk/inc/pch/precompiled_jvmfwk.hxx
index 460710679af4..8b4018782e42 100644
--- a/jvmfwk/inc/pch/precompiled_jvmfwk.hxx
+++ b/jvmfwk/inc/pch/precompiled_jvmfwk.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 3b73f88f7963..8567d79f9b0e 100755..100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,14 +39,14 @@
 #include "rtl/byteseq.hxx"
 #include "jvmfwk/framework.h"
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 #define OUSTR(x) OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
 
 static sal_Bool hasOption(char const * szOption, int argc, char** argv);
 static rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData);
 static bool findAndSelect(JavaInfo**);
-//static sal_Bool printPaths(const OUString& sPathFile);
 
 #define HELP_TEXT    \
 "\njavaldx is necessary to make Java work on some UNIX platforms." \
@@ -81,12 +82,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     JavaInfo * pInfo = NULL;
     errcode = jfw_getSelectedJRE( & pInfo);
 
-    if (errcode == JFW_E_INVALID_SETTINGS)
-    {
-        fprintf(stderr,"javaldx failed. User must select a JRE from options dialog!");
-        return -1;
-    }
-    else if (errcode != JFW_E_NONE)
+    if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS)
     {
         fprintf(stderr,"javaldx failed! \n");
         return -1;
@@ -186,3 +182,4 @@ static bool findAndSelect(JavaInfo ** ppInfo)
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
index 47b6504ee6e2..6a8ef3232bc4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
+++ b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,3 +119,5 @@ inline void jfw_trace(const rtl::OString& message)
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 41ba8b2e27a8..32f2792fbb93 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,10 @@
 #include "gnujre.hxx"
 #include "util.hxx"
 
-using namespace rtl;
 using namespace std;
 using namespace osl;
+using ::rtl::OUString;
+using ::rtl::Reference;
 
 namespace jfw_plugin
 {
@@ -50,6 +52,12 @@ char const* const* GnuInfo::getJavaExePaths(int * size)
     static char const * ar[] = {
         "gij",
         "bin/gij",
+        "gij-4.3",
+        "bin/gij-4.3",
+        "gij-4.2",
+        "bin/gij-4.2",
+        "gij-4.1",
+        "bin/gij-4.1"
     };
     *size = sizeof (ar) / sizeof (char*);
     return ar;
@@ -67,6 +75,20 @@ char const* const* GnuInfo::getRuntimePaths(int * size)
         "/libjvm.so",
         "/lib/" GCJ_JFW_PLUGIN_ARCH "/client/libjvm.so",
         "/gcj-4.1.1/libjvm.so",
+        "/gcj-4.3-90/libjvm.so",
+        "/gcj-4.2-81/libjvm.so",
+        "/gcj-4.2/libjvm.so",
+        "/gcj-4.2.1/libjvm.so",
+        "/gcj-4.2.2/libjvm.so",
+        "/gcj-4.2.3/libjvm.so",
+        "/gcj-4.1-71/libjvm.so",
+        "/gcj-4_1/libjvm.so",
+        "/gcj-4.1/libjvm.so",
+        "/libgcj.so.81",
+        "/libgcj.so.80",
+        "/libgcj.so.8",
+        "/libgcj.so.71",
+        "/libgcj.so.70",
         "/libgcj.so.7",
         "/libgcj.so.6"
     };
@@ -103,7 +125,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     bool bAccess = false;
 
     typedef vector<pair<OUString, OUString> >::const_iterator it_prop;
-    for (it_prop i = props.begin(); i != props.end(); i++)
+    for (it_prop i = props.begin(); i != props.end(); ++i)
     {
         if(! bVendor && sVendorProperty.equals(i->first))
         {
@@ -170,7 +192,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
 
     bool bRt = false;
     typedef vector<OUString>::const_iterator i_path;
-    for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
+    for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
     {
         //Construct an absolute path to the possible runtime
         OUString usRt= m_sHome + *ip;
@@ -187,7 +209,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     if (!bRt)
     {
         m_sHome = m_sJavaHome;
-        for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
+        for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
         {
             //Construct an absolute path to the possible runtime
             OUString usRt= m_sHome + *ip;
@@ -206,7 +228,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     if (!bRt && m_sJavaHome != sJavaLibraryPath)
     {
         m_sHome = sJavaLibraryPath;
-        for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
+        for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
         {
             //Construct an absolute path to the possible runtime
             OUString usRt= m_sHome + *ip;
@@ -226,7 +248,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     if (!bRt && m_sJavaHome != rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib")))
     {
         m_sHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib64"));
-        for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
+        for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
         {
             //Construct an absolute path to the possible runtime
             OUString usRt= m_sHome + *ip;
@@ -255,7 +277,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     OUString sPathSep= OUString::createFromAscii(arSep);
     bool bLdPath = true;
     int c = 0;
-    for(i_path il = ld_paths.begin(); il != ld_paths.end(); il ++, c++)
+    for(i_path il = ld_paths.begin(); il != ld_paths.end(); ++il, ++c)
     {
         OUString usAbsUrl= m_sHome + *il;
         // convert to system path
@@ -285,3 +307,5 @@ int GnuInfo::compareVersions(const rtl::OUString&) const
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
index 687be19d771f..413ff4bd1c38 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,3 +54,5 @@ public:
 
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
index 25ff106973ec..5b09a67952c5 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
@@ -27,13 +27,9 @@
 PRJ=..$/..$/..
 
 PRJNAME= jvmfwk
-
 TARGET = plugin
-
 ENABLE_EXCEPTIONS=TRUE
-
 LIBTARGET=NO
-
 UNOCOMPONENT1=sunjavaplugin
 
 # --- Settings -----------------------------------------------------
@@ -43,7 +39,6 @@ DLLPRE =
 
 # ------------------------------------------------------------------
 
-#.INCLUDE :  ..$/cppumaker.mk
 .IF "$(SOLAR_JAVA)"!=""
 
 SLOFILES= \
@@ -58,18 +53,16 @@ SLOFILES= \
 
 LIB1OBJFILES= $(SLOFILES)
 
-
-
 LIB1TARGET=$(SLB)$/$(UNOCOMPONENT1).lib
 
 SHL1TARGET=	$(UNOCOMPONENT1)  
 
 
 SHL1STDLIBS= \
-        $(CPPULIB) \
         $(CPPUHELPER) \
-        $(SALLIB) \
-        $(SALHELPERLIB)
+        $(CPPULIB) \
+        $(SALHELPERLIB) \
+        $(SALLIB)
         
 
 .IF "$(GUI)" == "WNT"
@@ -80,6 +73,10 @@ SHL1STDLIBS += -luwinapi -ladvapi32
 .ENDIF # GCC
 .ENDIF #WNT
 
+.IF "$(JVM_ONE_PATH_CHECK)" != ""
+CFLAGS += -DJVM_ONE_PATH_CHECK=\"$(JVM_ONE_PATH_CHECK)\"
+.ENDIF
+
 SHL1VERSIONMAP = sunjavaplugin.map
 SHL1DEPN=
 SHL1IMPLIB=	i$(UNOCOMPONENT1)
@@ -95,8 +92,6 @@ JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES)))
 
 .ENDIF # SOLAR_JAVA
 
-
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 3ae1c0f16b92..63cec34316f8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,10 +32,10 @@
 #include "osl/thread.h"
 #include "otherjre.hxx"
 
-using namespace rtl;
 using namespace std;
 
-
+using ::rtl::OUString;
+using ::rtl::Reference;
 namespace jfw_plugin
 {
 
@@ -47,7 +48,7 @@ Reference<VendorBase> OtherInfo::createInstance()
 char const* const* OtherInfo::getJavaExePaths(int * size)
 {
     static char const * ar[] = {
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
         "bin/java.exe",
         "jre/bin/java.exe"
 #elif UNX
@@ -67,10 +68,6 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
         "/bin/hotspot/jvm.dll",
         "/bin/classic/jvm.dll",
     "/bin/jrockit/jvm.dll"
-#elif defined(OS2)
-        "/bin/classic/jvm.dll",
-        "/bin/client/jvm.dll",
-        "/bin/hotspot/jvm.dll"
 #elif UNX
 #ifdef MACOSX
         "/../../../../../Frameworks/JavaVM.framework/JavaVM"  //as of  1.6.0_22
@@ -128,3 +125,5 @@ int OtherInfo::compareVersions(const rtl::OUString& /*sSecond*/) const
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
index 2a09681eb63c..9f54cf0ea5eb 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,5 @@ public:
 
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index b43edf53b3bc..eaaaf3a35aff 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,6 +28,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_jvmfwk.hxx"
+
+#ifdef WNT
+# include <stdio.h>
+# include <sys/stat.h>
+# include <windows.h>
+#endif
+
 #if OSL_DEBUG_LEVEL > 0
 #include <stdio.h>
 #endif
@@ -58,10 +66,13 @@
 #define SUN_MICRO "Sun Microsystems Inc."
 
 using namespace osl;
-using namespace rtl;
 using namespace std;
 using namespace jfw_plugin;
 
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
+
 namespace {
 
 struct PluginMutex: public ::rtl::Static<osl::Mutex, PluginMutex> {};
@@ -228,7 +239,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
     vector<rtl::Reference<VendorBase> > vecVerifiedInfos;
 
     typedef vector<rtl::Reference<VendorBase> >::iterator it;
-    for (it i= vecInfos.begin(); i != vecInfos.end(); i++)
+    for (it i= vecInfos.begin(); i != vecInfos.end(); ++i)
     {
         const rtl::Reference<VendorBase>& cur = *i;
 
@@ -305,7 +316,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
     arInfo = (JavaInfo**) rtl_allocateMemory(vecVerifiedInfos.size() * sizeof (JavaInfo*));
     int j = 0;
     typedef vector<rtl::Reference<VendorBase> >::const_iterator cit;
-    for (cit ii = vecVerifiedInfos.begin(); ii != vecVerifiedInfos.end(); ii++, j++)
+    for (cit ii = vecVerifiedInfos.begin(); ii != vecVerifiedInfos.end(); ++ii, ++j)
     {
         arInfo[j] = createJavaInfo(*ii);
     }
@@ -429,6 +440,113 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
     return errcode;
 }
 
+#if defined(WNT)
+
+// Load msvcr71.dll using an explicit full path from where it is
+// present as bundled with the JRE. In case it is not found where we
+// think it should be, do nothing, and just let the implicit loading
+// that happens when loading the JVM take care of it.
+
+static void load_msvcr71(LPCWSTR jvm_dll)
+{
+    wchar_t msvcr71_dll[MAX_PATH];
+    wchar_t *slash;
+
+    if (wcslen(jvm_dll) > MAX_PATH - 15)
+        return;
+
+    wcscpy(msvcr71_dll, jvm_dll);
+
+    // First check if msvcr71.dll is in the same folder as jvm.dll. It
+    // normally isn't, at least up to 1.6.0_22, but who knows if it
+    // might be in the future.
+    slash = wcsrchr(msvcr71_dll, L'\\');
+
+    if (!slash)
+    {
+        // Huh, weird path to jvm.dll. Oh well.
+        return;
+    }
+
+    wcscpy(slash+1, L"msvcr71.dll");
+    if (LoadLibraryW(msvcr71_dll))
+        return;
+
+    // Then check if msvcr71.dll is in the parent folder of where
+    // jvm.dll is. That is currently (1.6.0_22) as far as I know the
+    // normal case.
+    *slash = 0;
+    slash = wcsrchr(msvcr71_dll, L'\\');
+
+    if (!slash)
+        return;
+
+    wcscpy(slash+1, L"msvcr71.dll");
+    LoadLibraryW(msvcr71_dll);
+}
+
+// Check if the jvm DLL imports msvcr71.dll, and in that case try
+// loading it explicitly. In case something goes wrong, do nothing,
+// and just let the implicit loading try to take care of it.
+static void do_msvcr71_magic(rtl_uString *jvm_dll)
+{
+    FILE *f;
+    rtl_uString* Module;
+    oslFileError nError;
+    struct stat st;
+    PIMAGE_DOS_HEADER dos_hdr;
+    IMAGE_NT_HEADERS *nt_hdr;
+    IMAGE_IMPORT_DESCRIPTOR *imports;
+
+    nError = osl_getSystemPathFromFileURL(jvm_dll, &Module);
+
+    if ( osl_File_E_None != nError )
+        rtl_uString_assign(&Module, jvm_dll);
+
+    f = _wfopen(reinterpret_cast<LPCWSTR>(Module->buffer), L"rb");
+
+    if (fstat(fileno(f), &st) == -1)
+    {
+        fclose(f);
+        return;
+    }
+
+    dos_hdr = (PIMAGE_DOS_HEADER) malloc(st.st_size);
+
+    if (fread(dos_hdr, st.st_size, 1, f) != 1 ||
+        memcmp(dos_hdr, "MZ", 2) != 0 ||
+        dos_hdr->e_lfanew < 0 ||
+        dos_hdr->e_lfanew > (LONG) (st.st_size - sizeof(IMAGE_NT_HEADERS)))
+    {
+        free(dos_hdr);
+        fclose(f);
+        return;
+    }
+
+    fclose(f);
+
+    nt_hdr = (IMAGE_NT_HEADERS *) ((char *)dos_hdr + dos_hdr->e_lfanew);
+
+    imports = (IMAGE_IMPORT_DESCRIPTOR *) ((char *) dos_hdr + nt_hdr->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress);
+
+    while (imports <= (IMAGE_IMPORT_DESCRIPTOR *) ((char *) dos_hdr + st.st_size - sizeof (IMAGE_IMPORT_DESCRIPTOR)) &&
+           imports->Name != 0 &&
+           imports->Name < (DWORD) st.st_size)
+    {
+        // Intentional use of sizeof("msvcr71.dll") here to include the terminating zero byte
+        if (strnicmp((char *) dos_hdr + imports->Name, "msvcr71.dll", sizeof("msvcr71.dll")) == 0)
+        {
+            load_msvcr71(reinterpret_cast<LPCWSTR>(Module->buffer));
+            break;
+        }
+        imports++;
+    }
+
+    free(dos_hdr);
+}
+
+#endif
+
 /** starts a Java Virtual Machine.
     <p>
     The function shall ensure, that the VM does not abort the process
@@ -465,6 +583,9 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     if ((moduleRt = osl_loadModule(sRuntimeLib.pData,
                                    SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_NOW)) == 0 )
 #else
+#if defined(WNT)
+    do_msvcr71_magic(sRuntimeLib.pData);
+#endif
     if ((moduleRt = osl_loadModule(sRuntimeLib.pData, SAL_LOADMODULE_DEFAULT)) == 0)
 #endif
      {
@@ -674,3 +795,4 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 4fd74df90723..975a4c2522c4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,11 @@
 #include "sunversion.hxx"
 #include "diagnostics.h"
 
-using namespace rtl;
 using namespace std;
 
+using ::rtl::OUString;
+using ::rtl::Reference;
+
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 namespace jfw_plugin
 {
@@ -48,7 +51,7 @@ Reference<VendorBase> SunInfo::createInstance()
 char const* const* SunInfo::getJavaExePaths(int * size)
 {
     static char const * ar[] = {
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
         "java.exe",
         "bin/java.exe",
         "jre/bin/java.exe"
@@ -68,9 +71,9 @@ char const* const* SunInfo::getRuntimePaths(int * size)
 #if defined(WNT)
         "/bin/client/jvm.dll",
         "/bin/hotspot/jvm.dll",
-        "/bin/classic/jvm.dll"
-#elif defined(OS2)
         "/bin/classic/jvm.dll",
+        // The 64-bit JRE has the jvm in bin/server
+        "/bin/server/jvm.dll"
 #elif UNX
         "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
@@ -88,6 +91,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
     static char const * ar[] = {
 
         "/lib/" JFW_PLUGIN_ARCH "/client",
+        "/lib/" JFW_PLUGIN_ARCH "/server",
         "/lib/" JFW_PLUGIN_ARCH "/native_threads",
         "/lib/" JFW_PLUGIN_ARCH
 
@@ -122,3 +126,5 @@ int SunInfo::compareVersions(const rtl::OUString& sSecond) const
 
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
index 54c1d5b8829a..5851b16c8143 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,5 @@ public:
 
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 5d52046c705e..bb3e1765a030 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,12 +36,14 @@
 #include <string.h>
 #include <ctype.h>
 #include "diagnostics.h"
-using namespace rtl;
 using namespace osl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 namespace jfw_plugin  { //stoc_javadetect
 
 
-//extern OUString ::Impl::usPathDelim();
 #define OUSTR( x )  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
 
 #if OSL_DEBUG_LEVEL >= 2
@@ -125,7 +128,7 @@ bool SunVersion::init(const char *szVersion)
 
             //check next character
             if (! ( (pCur < pEnd)
-                    && ( (nPart < 3) && isdigit(*pCur)))) //(*pCur >= 48 && *pCur <=57))))
+                    && ( (nPart < 3) && isdigit(*pCur))))
                 return false;
         }
         else
@@ -425,3 +428,5 @@ SelfTest::SelfTest()
 #endif
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index 61d5da488a7e..4e51f7a0a7a6 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -125,3 +126,5 @@ protected:
 }
 
 #endif // INCLUDED_JVMACCESS_SUNVERSION_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index fc2a5b98215a..00843ec8f03a 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,6 +39,7 @@
 #include "rtl/byteseq.hxx"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/instance.hxx"
+#include <salhelper/linkhelper.hxx>
 #include "boost/scoped_array.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
 #include <utility>
@@ -58,10 +60,16 @@
 #include "sunjre.hxx"
 #include "vendorlist.hxx"
 #include "diagnostics.h"
-using namespace rtl;
+
 using namespace osl;
 using namespace std;
 
+using ::rtl::OUString;
+using ::rtl::Reference;
+using ::rtl::OString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OUStringToOString;
+
 #define CHAR_POINTER(oustr) ::rtl::OUStringToOString(oustr,RTL_TEXTENCODING_UTF8).pData->buffer
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 #ifdef WNT
@@ -86,12 +94,14 @@ char const *g_arJavaNames[] = {
  */
 char const *g_arCollectDirs[] = {
     "",
+#ifndef JVM_ONE_PATH_CHECK
     "j2re/",
     "j2se/",
     "j2sdk/",
     "jdk/",
     "jre/",
     "java/",
+#endif
     "jvm/"
 };
 
@@ -103,6 +113,7 @@ char const *g_arSearchPaths[] = {
     "",
     "System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/"
 #else
+#ifndef JVM_ONE_PATH_CHECK
     "",
     "usr/",
     "usr/local/",
@@ -113,6 +124,9 @@ char const *g_arSearchPaths[] = {
 #endif
     "usr/lib/",
     "usr/bin/"
+#else
+    JVM_ONE_PATH_CHECK
+#endif
 #endif
 };
 }
@@ -151,7 +165,6 @@ namespace
    {
        OUString const & operator()()
        {
-           //  osl::Guard<osl::Mutex> g(osl::GetGlobalMutex());
            static OUString sIni;
             rtl::OUStringBuffer buf( 255);
             buf.append( getLibraryLocation());
@@ -198,7 +211,7 @@ inline FileHandleGuard::~FileHandleGuard() SAL_THROW(())
     {
         if (osl_closeFile(m_rHandle) != osl_File_E_None)
         {
-            OSL_ENSURE(false, "unexpected situation");
+            OSL_FAIL("unexpected situation");
         }
     }
 }
@@ -363,6 +376,9 @@ void AsynchReader::run()
 
 
 bool getJavaProps(const OUString & exePath,
+#ifdef JVM_ONE_PATH_CHECK
+                  const OUString & homePath,
+#endif
                   std::vector<std::pair<rtl::OUString, rtl::OUString> >& props,
                   bool * bProcessRun)
 {
@@ -450,8 +466,6 @@ bool getJavaProps(const OUString & exePath,
         rs = stdoutReader.readLine( & aLine);
         if (rs != FileHandleReader::RESULT_OK)
             break;
-//         JFW_TRACE2(OString("[Java framework] line:\" ")
-//                + aLine + OString(" \".\n"));
         OUString sLine;
         if (!decodeOutput(aLine, &sLine))
             continue;
@@ -466,10 +480,19 @@ bool getJavaProps(const OUString & exePath,
         OUString sKey = sLine.copy(0, index);
         OUString sVal = sLine.copy(index + 1);
 
+#ifdef JVM_ONE_PATH_CHECK
+        //replace absolute path by linux distro link
+        OUString sHomeProperty(RTL_CONSTASCII_USTRINGPARAM("java.home"));
+        if(sHomeProperty.equals(sKey))
+        {
+            sVal = homePath + OUString::createFromAscii("/jre");
+        }
+#endif
+
         props.push_back(std::make_pair(sKey, sVal));
     }
 
-    if (rs != FileHandleReader::RESULT_ERROR && props.size()>0)
+    if (rs != FileHandleReader::RESULT_ERROR && !props.empty())
         ret = true;
 
     //process error stream data
@@ -509,7 +532,6 @@ bool decodeOutput(const rtl::OString& s, rtl::OUString* out)
     } while (nIndex >= 0);
 
     *out = buff.makeStringAndClear();
-//    JFW_TRACE2(*out);
     return true;
 }
 
@@ -553,7 +575,6 @@ bool getJavaInfoFromRegistry(const wchar_t* szRegKey,
         DWORD dwIndex = 0;
         const DWORD BUFFSIZE = 1024;
         wchar_t bufVersion[BUFFSIZE];
-//      char bufVersion[BUFFSIZE];
         DWORD nNameLen = BUFFSIZE;
         FILETIME fileTime;
         nNameLen = sizeof(bufVersion);
@@ -630,7 +651,7 @@ bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome)
 
 void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
 {
-    if(vec.size() == 0)
+    if(vec.empty())
         return;
     int size= vec.size() - 1;
     int cIter= 0;
@@ -675,7 +696,7 @@ void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
                 vec.at(j)= less;
             }
         }
-        cIter++;
+        ++cIter;
     }
 }
 
@@ -704,7 +725,7 @@ bool getJREInfoFromBinPath(
             sBinPath = path.copy(0, path.getLength() - 1);
 
         typedef vector<OUString>::const_iterator c_it;
-        for (c_it i = vecPaths.begin(); i != vecPaths.end(); i++)
+        for (c_it i = vecPaths.begin(); i != vecPaths.end(); ++i)
         {
             //the map contains e.g. jre/bin/java.exe
             //get the directory where the executable is contained
@@ -750,10 +771,12 @@ vector<Reference<VendorBase> > getAllJREInfos()
     createJavaInfoFromWinReg(vecInfos);
 #endif // WNT
 
+#ifndef JVM_ONE_PATH_CHECK
     createJavaInfoFromJavaHome(vecInfos);
     //this function should be called after createJavaInfoDirScan.
     //Otherwise in SDKs Java may be started twice
      createJavaInfoFromPath(vecInfos);
+#endif
 
 #ifdef UNX
     createJavaInfoDirScan(vecInfos);
@@ -800,28 +823,20 @@ bool getJREInfoByPath(const rtl::OUString& path,
 OUString resolveDirPath(const OUString & path)
 {
     OUString ret;
-    OUString sResolved;
-    //getAbsoluteFileURL also resolves links
-    if (File::getAbsoluteFileURL(
-            OUSTR("file:///"), path, sResolved) != File::E_None)
-        return OUString();
-
-    //check if this is a valid path and if it is a directory
-    DirectoryItem item;
-    if (DirectoryItem::get(sResolved, item) == File::E_None)
+    salhelper::LinkResolver aResolver(osl_FileStatus_Mask_Type |
+                                       osl_FileStatus_Mask_FileURL);
+    if (aResolver.fetchFileStatus(path) == osl::FileBase::E_None)
     {
-        FileStatus status(FileStatusMask_Type |
-                          FileStatusMask_LinkTargetURL |
-                          FileStatusMask_FileURL);
-
-        if (item.getFileStatus(status) == File::E_None
-            && status.getFileType() == FileStatus::Directory)
+        //check if this is a directory
+        if (aResolver.m_aStatus.getFileType() == FileStatus::Directory)
         {
-            ret = sResolved;
+#ifndef JVM_ONE_PATH_CHECK
+            ret = aResolver.m_aStatus.getFileURL();
+#else
+            ret = path;
+#endif
         }
     }
-    else
-        return OUString();
     return ret;
 }
 /** Checks if the path is a file. If it is a link to a file than
@@ -830,28 +845,20 @@ OUString resolveDirPath(const OUString & path)
 OUString resolveFilePath(const OUString & path)
 {
     OUString ret;
-    OUString sResolved;
-
-    if (File::getAbsoluteFileURL(
-            OUSTR("file:///"), path, sResolved) != File::E_None)
-        return OUString();
-
-    //check if this is a valid path to a file or and if it is a link
-    DirectoryItem item;
-    if (DirectoryItem::get(sResolved, item) == File::E_None)
+    salhelper::LinkResolver aResolver(osl_FileStatus_Mask_Type |
+                                       osl_FileStatus_Mask_FileURL);
+    if (aResolver.fetchFileStatus(path) == osl::FileBase::E_None)
     {
-        FileStatus status(FileStatusMask_Type |
-                          FileStatusMask_LinkTargetURL |
-                          FileStatusMask_FileURL);
-        if (item.getFileStatus(status) == File::E_None
-            && status.getFileType() == FileStatus::Regular)
+        //check if this is a file
+        if (aResolver.m_aStatus.getFileType() == FileStatus::Regular)
         {
-            ret = sResolved;
+#ifndef JVM_ONE_PATH_CHECK
+            ret = aResolver.m_aStatus.getFileURL();
+#else
+            ret = path;
+#endif
         }
     }
-    else
-        return OUString();
-
     return ret;
 }
 
@@ -900,7 +907,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
 
         bool bBreak = false;
         typedef vector<OUString>::const_iterator c_it;
-        for (c_it i = vecPaths.begin(); i != vecPaths.end(); i++)
+        for (c_it i = vecPaths.begin(); i != vecPaths.end(); ++i)
         {
             //if the path is a link, then resolve it
             //check if the executable exists at all
@@ -941,7 +948,11 @@ rtl::Reference<VendorBase> getJREInfoByPath(
             }
 
             bool bProcessRun= false;
-            if (getJavaProps(sFilePath, props, & bProcessRun) == false)
+            if (getJavaProps(sFilePath,
+#ifdef JVM_ONE_PATH_CHECK
+                             sResolvedDir,
+#endif
+                             props, & bProcessRun) == false)
             {
                 //The java executable could not be run or the system properties
                 //could not be retrieved. We can assume that this java is corrupt.
@@ -960,7 +971,11 @@ rtl::Reference<VendorBase> getJREInfoByPath(
                     //invoked to build the path to the executable. It we start the script directy as .java_wrapper
                     //then it tries to start a jdk/.../native_threads/.java_wrapper. Therefore the link, which
                     //is named java, must be used to start the script.
-                    getJavaProps(sFullPath, props, & bProcessRun);
+                    getJavaProps(sFullPath,
+#ifdef JVM_ONE_PATH_CHECK
+                                 sResolvedDir,
+#endif
+                                 props, & bProcessRun);
                     // Either we found a working 1.3.1
                     //Or the java is broken. In both cases we stop searchin under this "root" directory
                     bBreak = true;
@@ -985,7 +1000,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
             break;
     }
 
-    if (props.size() == 0)
+    if (props.empty())
         return rtl::Reference<VendorBase>();
 
     //find java.vendor property
@@ -993,7 +1008,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
     OUString sVendor(RTL_CONSTASCII_USTRINGPARAM("java.vendor"));
     OUString sVendorName;
 
-    for (c_ip i = props.begin(); i != props.end(); i++)
+    for (c_ip i = props.begin(); i != props.end(); ++i)
     {
         if (sVendor.equals(i->first))
         {
@@ -1120,7 +1135,7 @@ bool makeDriveLetterSame(OUString * fileURL)
     DirectoryItem item;
     if (DirectoryItem::get(*fileURL, item) == File::E_None)
     {
-        FileStatus status(FileStatusMask_FileURL);
+        FileStatus status(osl_FileStatus_Mask_FileURL);
         if (item.getFileStatus(status) == File::E_None)
         {
             *fileURL = status.getFileURL();
@@ -1209,7 +1224,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
                     File::RC errNext = File::E_None;
                     while( (errNext = aCollectionDir.getNextItem(curIt)) == File::E_None)
                     {
-                        FileStatus aStatus(FileStatusMask_FileURL);
+                        FileStatus aStatus(osl_FileStatus_Mask_FileURL);
                         File::RC errStatus = File::E_None;
                         if ((errStatus = curIt.getFileStatus(aStatus)) != File::E_None)
                         {
@@ -1265,3 +1280,5 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
 #endif // ifdef SOLARIS
 #endif // ifdef UNX
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index c312372e5fa2..891ad63a58bc 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,6 +118,9 @@ std::vector<rtl::Reference<VendorBase> > getAllJREInfos();
 
 bool getJavaProps(
     const rtl::OUString & exePath,
+#ifdef JVM_ONE_PATH_CHECK
+    const rtl::OUString & homePath,
+#endif
     std::vector<std::pair<rtl::OUString, rtl::OUString> >& props,
     bool * bProcessRun);
 
@@ -128,3 +132,5 @@ rtl::Bootstrap* getBootstrap();
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 0106981a0a32..fa7210854aa4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,9 +36,10 @@
 #include "sunjre.hxx"
 
 using namespace std;
-using namespace rtl;
 using namespace osl;
 
+using ::rtl::OUString;
+
 namespace jfw_plugin
 {
 rtl::Reference<VendorBase> createInstance(createInstance_func pFunc,
@@ -74,7 +76,7 @@ VendorBase::VendorBase(): m_bAccessibility(false)
 char const* const * VendorBase::getJavaExePaths(int* size)
 {
     static char const * ar[] = {
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
         "java.exe",
         "bin/java.exe"
 #elif UNX
@@ -115,7 +117,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
     bool bAccess = false;
 
     typedef vector<pair<OUString, OUString> >::const_iterator it_prop;
-    for (it_prop i = props.begin(); i != props.end(); i++)
+    for (it_prop i = props.begin(); i != props.end(); ++i)
     {
         if(! bVendor && sVendorProperty.equals(i->first))
         {
@@ -129,6 +131,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
         }
         else if (!bHome && sHomeProperty.equals(i->first))
         {
+#ifndef JVM_ONE_PATH_CHECK
            OUString fileURL;
            if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
                osl_File_E_None)
@@ -142,6 +145,10 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
                    bHome = true;
                }
            }
+#else
+           m_sHome = i->second;
+           bHome = true;
+#endif
         }
         else if (!bAccess && sAccessProperty.equals(i->first))
         {
@@ -168,7 +175,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
 
     bool bRt = false;
     typedef vector<OUString>::const_iterator i_path;
-    for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
+    for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
     {
         //Construct an absolute path to the possible runtime
         OUString usRt= m_sHome + *ip;
@@ -194,7 +201,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
     OUString sPathSep= OUString::createFromAscii(arSep);
     bool bLdPath = true;
     int c = 0;
-    for(i_path il = ld_paths.begin(); il != ld_paths.end(); il ++, c++)
+    for(i_path il = ld_paths.begin(); il != ld_paths.end(); ++il, ++c)
     {
         OUString usAbsUrl= m_sHome + *il;
         // convert to system path
@@ -265,7 +272,7 @@ bool VendorBase::needsRestart() const
 
 int VendorBase::compareVersions(const rtl::OUString& /*sSecond*/) const
 {
-    OSL_ENSURE(0, "[Java framework] VendorBase::compareVersions must be "
+    OSL_FAIL("[Java framework] VendorBase::compareVersions must be "
                "overridden in derived class.");
     return 0;
 }
@@ -274,3 +281,5 @@ int VendorBase::compareVersions(const rtl::OUString& /*sSecond*/) const
 
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
index 3302fe42e90c..37b12b9ab6c5 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,7 +93,7 @@ class VendorBase: public salhelper::SimpleReferenceObject
 {
 public:
     VendorBase();
-    /* returns relativ paths to the java executable as
+    /* returns relative paths to the java executable as
        file URLs.
 
        For example "bin/java.exe". You need
@@ -183,3 +184,5 @@ protected:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 1ff82db205d4..f24b6ff166e4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,7 +37,11 @@
 #include <stdio.h>
 
 using namespace com::sun::star::uno;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+using ::rtl::OString;
 
 namespace jfw_plugin
 {
@@ -89,3 +94,5 @@ bool isVendorSupported(const rtl::OUString& sVendor)
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index 7cc00fd1787b..7edc5fa00735 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,18 +35,9 @@
 namespace jfw_plugin
 {
 
-//extern VendorSupportMapEntry gVendorMap[];
-
 typedef char  const * const * (* getJavaExePaths_func)(int*);
 typedef rtl::Reference<VendorBase> (* createInstance_func) ();
 
-// struct Blas
-// {
-//         char const * sVendorName;
-//     getJavaExePaths_func getJavaFunc;
-//     createInstance_func  createFunc;
-// };
-
 struct VendorSupportMapEntry
 {
     char const * sVendorName;
@@ -73,3 +65,5 @@ bool isVendorSupported(const rtl::OUString & sVendor);
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/prj/build.lst b/jvmfwk/prj/build.lst
index bd09aae41774..1a8d67401648 100644
--- a/jvmfwk/prj/build.lst
+++ b/jvmfwk/prj/build.lst
@@ -1,4 +1,4 @@
-jvmf jvmfwk : cppu cppuhelper sal LIBXML2:libxml2 NULL
+jvmf jvmfwk : cppu cppuhelper sal comphelper LIBXML2:libxml2 NULL
 jvmf jvmfwk\inc nmake - all jvmf_inc NULL
 jvmf jvmfwk\source nmake - all jvmf_framework jvmf_inc NULL
 jvmf jvmfwk\plugins\sunmajor\pluginlib nmake - all jvmf_sunmajorlib jvmf_inc NULL
diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst
index 77052384123a..779ede709cae 100644
--- a/jvmfwk/prj/d.lst
+++ b/jvmfwk/prj/d.lst
@@ -1,22 +1,22 @@
-mkdir: %_DEST%\inc%_EXT%\jvmfwk
-..\inc\jvmfwk\framework.h %_DEST%\inc%_EXT%\jvmfwk\framework.h
-..\inc\jvmfwk\vendorplugin.h %_DEST%\inc%_EXT%\jvmfwk\vendorplugin.h
-..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib%_EXT%\ijvmfwk.lib
-..\%__SRC%\lib\libjvmfwk.*.* %_DEST%\lib%_EXT%\*
-..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib%_EXT%\*
-..\%__SRC%\class\JREProperties.class  %_DEST%\bin%_EXT%\JREProperties.class
-..\%__SRC%\class\JREProperties.class  %_DEST%\lib%_EXT%\JREProperties.class
-..\%__SRC%\bin\javaldx %_DEST%\bin%_EXT%\javaldx
-..\source\javasettingsunopkginstall.xml %_DEST%\bin%_EXT%\javasettingsunopkginstall.xml
-..\%__SRC%\bin\javavendors.xml %_DEST%\bin%_EXT%\javavendors.xml
-..\%__SRC%\bin\javavendors.xml %_DEST%\lib%_EXT%\javavendors.xml
-..\%__SRC%\bin\jvmfwk3rc %_DEST%\lib%_EXT%\jvmfwk3rc
-..\%__SRC%\bin\jvmfwk3.ini %_DEST%\bin%_EXT%\jvmfwk3.ini
-..\%__SRC%\bin\sunjavapluginrc %_DEST%\lib%_EXT%\sunjavapluginrc
-..\%__SRC%\bin\sunjavaplugin.ini %_DEST%\bin%_EXT%\sunjavaplugin.ini
+mkdir: %_DEST%\inc\jvmfwk
+..\inc\jvmfwk\framework.h %_DEST%\inc\jvmfwk\framework.h
+..\inc\jvmfwk\vendorplugin.h %_DEST%\inc\jvmfwk\vendorplugin.h
+..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib\ijvmfwk.lib
+..\%__SRC%\lib\libjvmfwk.*.* %_DEST%\lib\*
+..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin\*
+..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin\*
+..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib\*
+..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib\*
+..\%__SRC%\class\JREProperties.class  %_DEST%\bin\JREProperties.class
+..\%__SRC%\class\JREProperties.class  %_DEST%\lib\JREProperties.class
+..\%__SRC%\bin\javaldx %_DEST%\bin\javaldx
+..\source\javasettingsunopkginstall.xml %_DEST%\bin\javasettingsunopkginstall.xml
+..\%__SRC%\bin\javavendors.xml %_DEST%\bin\javavendors.xml
+..\%__SRC%\bin\javavendors.xml %_DEST%\lib\javavendors.xml
+..\%__SRC%\bin\jvmfwk3rc %_DEST%\lib\jvmfwk3rc
+..\%__SRC%\bin\jvmfwk3.ini %_DEST%\bin\jvmfwk3.ini
+..\%__SRC%\bin\sunjavapluginrc %_DEST%\lib\sunjavapluginrc
+..\%__SRC%\bin\sunjavaplugin.ini %_DEST%\bin\sunjavaplugin.ini
 
 linklib: libjvmfwk.*.*
 linklib: libjvmfwk*.dylib.*.*.*
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 8ed982f34523..bb5cf62ba952 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,8 +44,6 @@
 #include "rtl/bootstrap.hxx"
 #include "boost/optional.hpp"
 #include <string.h>
-// #define NS_JAVA_FRAMEWORK "http://openoffice.org/2004/java/framework/1.0"
-// #define NS_SCHEMA_INSTANCE "http://www.w3.org/2001/XMLSchema-instance"
 
 
 using namespace osl;
@@ -175,13 +174,12 @@ void createSettingsStructure(xmlDoc * document, bool * bNeedsSave)
     nodeCrLf = xmlNewText((xmlChar*) "\n");
     xmlAddChild(root, nodeCrLf);
 
-    //<javaInfo xsi:nil="true"  autoSelect="true">
+    //<javaInfo xsi:nil="true">
     xmlNode  * nodeJava = xmlNewTextChild(
         root,NULL, (xmlChar*) "javaInfo", (xmlChar*) "");
     if (nodeJava == NULL)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
     xmlSetNsProp(nodeJava,nsXsi,(xmlChar*) "nil",(xmlChar*) "true");
-//    xmlSetProp(nodeJava,(xmlChar*) "autoSelect",(xmlChar*) "true");
     //add a new line
     nodeCrLf = xmlNewText((xmlChar*) "\n");
     xmlAddChild(root, nodeCrLf);
@@ -213,7 +211,7 @@ rtl_uString** VersionInfo::getExcludeVersions()
     int j=0;
     typedef std::vector<rtl::OUString>::const_iterator it;
     for (it i = vecExcludeVersions.begin(); i != vecExcludeVersions.end();
-         i++, j++)
+         ++i, ++j)
     {
         arVersions[j] = vecExcludeVersions[j].pData;
     }
@@ -274,7 +272,7 @@ void NodeJava::load()
     }
     else
     {
-        OSL_ASSERT("[Java framework] Unknown enum used.");
+        OSL_FAIL("[Java framework] Unknown enum used.");
     }
 
 
@@ -402,7 +400,7 @@ void NodeJava::load()
     case INSTALL: ret = getInstallSettingsPath(); break;
     case SHARED: ret = getSharedSettingsPath(); break;
     default:
-        OSL_ASSERT("[Java framework] NodeJava::getSettingsPath()");
+        OSL_FAIL("[Java framework] NodeJava::getSettingsPath()");
     }
     return ret;
 }
@@ -416,7 +414,7 @@ void NodeJava::load()
     case INSTALL: ret = BootParams::getInstallData(); break;
     case SHARED: ret = BootParams::getSharedData(); break;
     default:
-        OSL_ASSERT("[Java framework] NodeJava::getSettingsURL()");
+        OSL_FAIL("[Java framework] NodeJava::getSettingsURL()");
     }
     return ret;
 }
@@ -551,7 +549,7 @@ void NodeJava::write() const
         }
 
         typedef std::vector<rtl::OUString>::const_iterator cit;
-        for (cit i = m_vmParameters->begin(); i != m_vmParameters->end(); i++)
+        for (cit i = m_vmParameters->begin(); i != m_vmParameters->end(); ++i)
         {
             xmlNewTextChild(vmParameters, NULL, (xmlChar*) "param",
                             CXmlCharPtr(*i));
@@ -592,7 +590,7 @@ void NodeJava::write() const
         }
 
         typedef std::vector<rtl::OUString>::const_iterator cit;
-        for (cit i = m_JRELocations->begin(); i != m_JRELocations->end(); i++)
+        for (cit i = m_JRELocations->begin(); i != m_JRELocations->end(); ++i)
         {
             xmlNewTextChild(jreLocationsNode, NULL, (xmlChar*) "location",
                             CXmlCharPtr(*i));
@@ -752,9 +750,9 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus() const
     if (File::E_None == rc)
     {
         ::osl::FileStatus stat(
-            FileStatusMask_Validate
-            | FileStatusMask_CreationTime
-            | FileStatusMask_ModifyTime);
+            osl_FileStatus_Mask_Validate
+            | osl_FileStatus_Mask_CreationTime
+            | osl_FileStatus_Mask_ModifyTime);
         File::RC rc_stat = item.getFileStatus(stat);
         if (File::E_None == rc_stat)
         {
@@ -769,7 +767,6 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus() const
                 //that after removing the file and shortly later creating it again
                 //did not change the creation time. That is the newly created file
                 //had the creation time of the former file.
-                // ::TimeValue modTime = stat.getModifyTime();
                 ::TimeValue curTime = {0,0};
                 ret = FILE_OK;
                 if (sal_True == ::osl_getSystemTime(& curTime))
@@ -791,7 +788,7 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus() const
 #endif
                         //delete file
                         File f(sURL);
-                        if (File::E_None == f.open(OpenFlag_Write | OpenFlag_Read)
+                        if (File::E_None == f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Read)
                             && File::E_None == f.setPos(0, 0)
                             && File::E_None == f.setSize(0))
                                     ret = FILE_DOES_NOT_EXIST;
@@ -1139,11 +1136,10 @@ JavaInfo * CNodeJavaInfo::makeJavaInfo() const
 
 sal_uInt32 NodeJava::getModifiedTime() const
 {
-    sal_uInt32 ret = 0;
     if (m_layer != INSTALL)
     {
         OSL_ASSERT(0);
-        return ret;
+        return 0;
     }
     rtl::OString modTimeSeconds = getElementModified();
     return (sal_uInt32) modTimeSeconds.toInt64();
@@ -1260,7 +1256,7 @@ void MergedSettings::getVmParametersArray(
     int j=0;
     typedef std::vector<rtl::OUString>::const_iterator it;
     for (it i = m_vmParams.begin(); i != m_vmParams.end();
-         i++, j++)
+         ++i, ++j)
     {
         (*parParams)[j] = i->pData;
         rtl_uString_acquire(i->pData);
@@ -1282,7 +1278,7 @@ void MergedSettings::getJRELocations(
     int j=0;
     typedef std::vector<rtl::OUString>::const_iterator it;
     for (it i = m_JRELocations.begin(); i != m_JRELocations.end();
-         i++, j++)
+         ++i, ++j)
     {
         (*parLocations)[j] = i->pData;
         rtl_uString_acquire(i->pData);
@@ -1294,3 +1290,5 @@ const std::vector<rtl::OUString> & MergedSettings::getJRELocations() const
     return m_JRELocations;
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index ec0e06dc5bab..6efedbf96647 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -417,3 +418,5 @@ struct PluginLibrary
 
 } //end namespace
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 1194e73402dd..9cf2c4985932 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,7 +101,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
         //Use every plug-in library to get Java installations.
         typedef std::vector<jfw::PluginLibrary>::const_iterator ci_pl;
         int cModule = 0;
-         for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); i++, cModule++)
+         for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); ++i, ++cModule)
          {
             const jfw::PluginLibrary & library = *i;
             jfw::VersionInfo versionInfo =
@@ -159,10 +160,8 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
             typedef std::vector<rtl::OUString>::const_iterator citLoc;
             //Check every manually added location
             for (citLoc ii = vecJRELocations.begin();
-                ii != vecJRELocations.end(); ii++)
+                ii != vecJRELocations.end(); ++ii)
             {
-//              rtl::OUString sLocation =
-//                  rtl::OStringToOUString(*ii, RTL_TEXTENCODING_UTF8);
                 jfw::CJavaInfo aInfo;
                 plerr = (*jfw_plugin_getJavaInfoByPathFunc)(
                     ii->pData,
@@ -196,9 +195,9 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
         //To obtain the JavaInfos for the manually added JRE locations the function
         //jfw_getJavaInfoByPath is called which can return a JavaInfo of any vendor.
         std::vector<jfw::CJavaInfo> vecInfoManual2;
-        for (it_info ivm = vecInfoManual.begin(); ivm != vecInfoManual.end(); ivm++)
+        for (it_info ivm = vecInfoManual.begin(); ivm != vecInfoManual.end(); ++ivm)
         {
-            for (ci_pl ii = vecPlugins.begin(); ii != vecPlugins.end(); ii++)
+            for (ci_pl ii = vecPlugins.begin(); ii != vecPlugins.end(); ++ii)
             {
                 if ( ii->sVendor.equals((*ivm)->sVendor))
                 {
@@ -210,7 +209,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
         //Check which JavaInfo from vector vecInfoManual2 is already
         //contained in vecInfo. If it already exists then remove it from
         //vecInfoManual2
-        for (it_info j = vecInfo.begin(); j != vecInfo.end(); j++)
+        for (it_info j = vecInfo.begin(); j != vecInfo.end(); ++j)
         {
             it_info it_duplicate =
                 std::find_if(vecInfoManual2.begin(), vecInfoManual2.end(),
@@ -228,10 +227,10 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
         typedef std::vector<jfw::CJavaInfo>::iterator it;
         int index = 0;
         //Add the automatically detected JREs
-        for (it k = vecInfo.begin(); k != vecInfo.end(); k++)
+        for (it k = vecInfo.begin(); k != vecInfo.end(); ++k)
             (*pparInfo)[index++] = k->detach();
         //Add the manually detected JREs
-        for (it l = vecInfoManual2.begin(); l != vecInfoManual2.end(); l++)
+        for (it l = vecInfoManual2.begin(); l != vecInfoManual2.end(); ++l)
             (*pparInfo)[index++] = l->detach();
 
         *pSize = nSize;
@@ -241,7 +240,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
     {
         retVal = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
     return retVal;
 }
@@ -383,7 +382,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
         //add the options set by options dialog
         int index = 2;
         typedef std::vector<rtl::OString>::const_iterator cit;
-        for (cit i = vmParams.begin(); i != vmParams.end(); i ++)
+        for (cit i = vmParams.begin(); i != vmParams.end(); ++i)
         {
             arOpt[index].optionString = const_cast<sal_Char*>(i->getStr());
             arOpt[index].extraInfo = 0;
@@ -419,7 +418,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
 
     return errcode;
@@ -461,7 +460,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
         //Java the loop will break
         typedef std::vector<jfw::PluginLibrary>::const_iterator ci_pl;
         int cModule = 0;
-        for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); i++, cModule++)
+        for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); ++i, ++cModule)
         {
             const jfw::PluginLibrary & library = *i;
             jfw::VersionInfo versionInfo =
@@ -543,7 +542,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
                 settings.getJRELocations();
             //use every plug-in to determine the JavaInfo objects
             bool bInfoFound = false;
-            for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); i++)
+            for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); ++i)
             {
                 const jfw::PluginLibrary & library = *i;
                 jfw::VersionInfo versionInfo =
@@ -565,7 +564,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
 
                 typedef std::vector<rtl::OUString>::const_iterator citLoc;
                 for (citLoc it = vecJRELocations.begin();
-                    it != vecJRELocations.end(); it++)
+                    it != vecJRELocations.end(); ++it)
                 {
                     jfw::CJavaInfo aInfo;
                     javaPluginError err = (*jfw_plugin_getJavaInfoByPathFunc)(
@@ -628,7 +627,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
 
     return errcode;
@@ -717,7 +716,7 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo)
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
     return errcode;
 }
@@ -763,7 +762,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
         typedef std::vector<jfw::PluginLibrary>::const_iterator ci_pl;
         int cModule = 0;
         for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end();
-             i++, cModule++)
+             ++i, ++cModule)
         {
             const jfw::PluginLibrary & library = *i;
             jfw::VersionInfo versionInfo =
@@ -803,7 +802,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
             if (plerr == JFW_PLUGIN_E_NONE)
             {
                 //check if the vendor of the found JRE is supported
-                if (vecVendors.size() == 0)
+                if (vecVendors.empty())
                 {
                     //vendor does not matter
                     *ppInfo = pInfo;
@@ -845,7 +844,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
 
     return errcode;
@@ -879,7 +878,7 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo)
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
     return errcode;
 }
@@ -912,7 +911,7 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled)
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
     return errcode;
 }
@@ -934,7 +933,7 @@ javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled)
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
     return errcode;
 }
@@ -959,7 +958,7 @@ javaFrameworkError SAL_CALL jfw_setVMParameters(
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
 
     return errcode;
@@ -984,7 +983,7 @@ javaFrameworkError SAL_CALL jfw_getVMParameters(
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
     return errcode;
 }
@@ -1007,7 +1006,7 @@ javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCp)
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
     return errcode;
 }
@@ -1030,7 +1029,7 @@ javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP)
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
     return errcode;
 }
@@ -1054,7 +1053,7 @@ javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation)
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
 
     return errcode;
@@ -1080,7 +1079,7 @@ javaFrameworkError SAL_CALL jfw_setJRELocations(
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
     return errcode;
 
@@ -1105,7 +1104,7 @@ javaFrameworkError SAL_CALL jfw_getJRELocations(
     {
         errcode = e.errorCode;
         fprintf(stderr, "%s\n", e.message.getStr());
-        OSL_ENSURE(0, e.message.getStr());
+        OSL_FAIL(e.message.getStr());
     }
 
     return errcode;
@@ -1255,10 +1254,6 @@ CJavaInfo::operator JavaInfo const * () const
 {
     return pInfo;
 }
-// ::JavaInfo** CJavaInfo::operator & ()
-// {
-//     return & pInfo;
-// }
 
 rtl::OUString CJavaInfo::getVendor() const
 {
@@ -1285,3 +1280,5 @@ sal_uInt64 CJavaInfo::getFeatures() const
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 163d12e85938..0ba8c6b29583 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,7 +104,6 @@ public:
     void attach(::JavaInfo* pInfo);
     ::JavaInfo * detach();
     const ::JavaInfo* operator ->() const;
-//    ::JavaInfo** operator & ();
     operator ::JavaInfo* ();
     operator ::JavaInfo const * () const;
     ::JavaInfo* cloneJavaInfo() const;
@@ -126,3 +126,5 @@ public:
 };
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 88579765442a..3b3f4087e610 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,7 +42,12 @@
 #include "fwkbase.hxx"
 
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
 #define JAVASETTINGS "javasettings"
 #define JAVASETTINGS_XML "javasettings.xml"
 #define VENDORSETTINGS "javavendors.xml"
@@ -76,7 +82,7 @@ rtl::OString getVendorSettingsPath(rtl::OUString const & sURL)
         throw FrameworkException(
             JFW_E_ERROR,
             rtl::OString("[Java framework] Error in function "
-                         "getVendorSettingsPath (fwkutil.cxx) "));
+                         "getVendorSettingsPath (fwkbase.cxx) "));
     rtl::OString osSystemPathSettings =
         rtl::OUStringToOString(sSystemPathSettings,osl_getThreadTextEncoding());
     return osSystemPathSettings;
@@ -119,7 +125,7 @@ VendorSettings::VendorSettings():
     {
         OString sMsg("[Java framework] A vendor settings file was not specified."
                "Check the bootstrap parameter " UNO_JAVA_JFW_VENDOR_SETTINGS ".");
-        OSL_ENSURE(0, sMsg.getStr());
+        OSL_FAIL(sMsg.getStr());
         throw FrameworkException(JFW_E_CONFIGURATION, sMsg);
     }
     if (sSettingsPath.getLength() > 0)
@@ -280,7 +286,7 @@ std::vector<OUString> VendorSettings::getSupportedVendors()
     if (xmlXPathNodeSetIsEmpty(result->nodesetval))
         throw FrameworkException(
             JFW_E_ERROR,
-            rtl::OString("[Java framework] Error in function getSupportedVendors (fwkutil.cxx)."));
+            rtl::OString("[Java framework] Error in function getSupportedVendors (fwkbase.cxx)."));
 
     //get the values of the library elements + vendor attribute
     xmlNode* cur = result->nodesetval->nodeTab[0];
@@ -301,7 +307,7 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
 {
     OSL_ASSERT(sVendor.getLength() > 0);
 
-    OString sExcMsg("[Java framework] Error in function getPluginLibrary (fwkutil.cxx).");
+    OString sExcMsg("[Java framework] Error in function getPluginLibrary (fwkbase.cxx).");
     OString sVendorsPath = getVendorSettingsPath(m_xmlDocVendorSettingsFileUrl);
     OUStringBuffer usBuffer(256);
     usBuffer.appendAscii("/jf:javaSelection/jf:plugins/jf:library[@vendor=\"");
@@ -321,7 +327,7 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
         xmlNodeListGetString(
             m_xmlDocVendorSettings,pathObjVendor->nodesetval->nodeTab[0], 1);
 
-    //make an absolute file url from the relativ plugin URL
+    //make an absolute file url from the relative plugin URL
     OUString sUrl = findPlugin(m_xmlDocVendorSettingsFileUrl, xmlCharPlugin);
     if (sUrl.getLength() == 0)
     {
@@ -716,3 +722,5 @@ bool wasJavaSelectedInSameProcess()
 
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx
index 27a0cb6941ec..0a15f7628e8e 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/source/fwkbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -156,3 +157,5 @@ bool wasJavaSelectedInSameProcess();
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index a2c56310b550..8b700922d3aa 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,9 +58,12 @@
 #include "framework.hxx"
 #include "fwkutil.hxx"
 
-using namespace rtl;
 using namespace osl;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
 namespace jfw
 {
 
@@ -270,10 +274,12 @@ rtl::OUString findPlugin(
         {
             rtl::OUString url;
 #ifdef UNX
-#ifdef MACOSX
-            rtl::OUString path = rtl::OUString::createFromAscii("DYLD_LIBRARY_PATH");
+#if defined(MACOSX)
+            rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DYLD_LIBRARY_PATH"));
+#elif defined(AIX)
+            rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LIBPATH"));
 #else
-            rtl::OUString path = rtl::OUString::createFromAscii("LD_LIBRARY_PATH");
+            rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LD_LIBRARY_PATH"));
 #endif
             rtl::OUString env_path;
             oslProcessError err = osl_getEnvironment(path.pData, &env_path.pData);
@@ -324,7 +330,7 @@ jfw::FileStatus checkFileURL(const rtl::OUString & sURL)
     File::RC rc_item = DirectoryItem::get(sURL, item);
     if (File::E_None == rc_item)
     {
-        osl::FileStatus status(FileStatusMask_Validate);
+        osl::FileStatus status(osl_FileStatus_Mask_Validate);
 
         File::RC rc_stat = item.getFileStatus(status);
         if (File::E_None == rc_stat)
@@ -352,3 +358,5 @@ jfw::FileStatus checkFileURL(const rtl::OUString & sURL)
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index 6098f9d6b58e..9e241cf92efe 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,15 +69,11 @@ struct Bootstrap :
 
 struct FwkMutex: public ::rtl::Static<osl::Mutex, FwkMutex> {};
 
-//osl::Mutex * getFwkMutex();
-
 rtl::ByteSequence encodeBase16(const rtl::ByteSequence& rawData);
 rtl::ByteSequence decodeBase16(const rtl::ByteSequence& data);
 
 rtl::OUString getPlatform();
 
-//const rtl::Bootstrap& getBootstrap();
-
 
 rtl::OUString getDirFromFile(const rtl::OUString& usFilePath);
 
@@ -120,7 +117,7 @@ enum FileStatus
     one of the values of FileStatus.
 
     @exception
-    Errors occured during determining if the file exists
+    Errors occurred during determining if the file exists
  */
 FileStatus checkFileURL(const rtl::OUString & path);
 
@@ -136,3 +133,5 @@ rtl::OUString buildClassPathFromDirectory(const rtl::OUString & relPath);
 rtl::OUString retrieveClassPath( ::rtl::OUString const & macro );
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx
index a5170e4b0e40..43d90d686dfd 100644
--- a/jvmfwk/source/libxmlutil.cxx
+++ b/jvmfwk/source/libxmlutil.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,7 +60,7 @@ xmlXPathObject* CXPathObjectPtr::operator ->()
 {
     return _object;
 }
-CXPathObjectPtr::operator xmlXPathObject*()
+CXPathObjectPtr::operator xmlXPathObject*() const
 {
     return _object;
 }
@@ -91,7 +92,7 @@ xmlXPathContext* CXPathContextPtr::operator ->()
     return _object;
 }
 
-CXPathContextPtr::operator xmlXPathContext*()
+CXPathContextPtr::operator xmlXPathContext*() const
 {
     return _object;
 }
@@ -123,7 +124,7 @@ xmlDoc* CXmlDocPtr::operator ->()
     return _object;
 }
 
-CXmlDocPtr::operator xmlDoc*()
+CXmlDocPtr::operator xmlDoc*() const
 {
     return _object;
 }
@@ -158,7 +159,7 @@ CXmlCharPtr & CXmlCharPtr::operator = (xmlChar* pObj)
     return *this;
 }
 
-CXmlCharPtr::operator xmlChar*()
+CXmlCharPtr::operator xmlChar*() const
 {
     return _object;
 }
@@ -182,3 +183,5 @@ CXmlCharPtr::operator ::rtl::OString()
 
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index 8abd7b82ef8d..ccc20a233773 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,6 @@
 
 #include "libxml/parser.h"
 #include "libxml/xpath.h"
-//#include "libxml/xpathinternals.h"
 #include "rtl/ustring.hxx"
 namespace jfw
 {
@@ -49,7 +49,7 @@ public:
      */
     CXPathObjectPtr & operator = (xmlXPathObject* pObj);
     xmlXPathObject* operator -> ();
-    operator xmlXPathObject* ();
+    operator xmlXPathObject* () const;
 };
 
 //===========================================================
@@ -65,7 +65,7 @@ public:
     CXPathContextPtr & operator = (xmlXPathContextPtr pObj);
     ~CXPathContextPtr();
     xmlXPathContext* operator -> ();
-    operator xmlXPathContext* ();
+    operator xmlXPathContext* () const;
 };
 
 //===========================================================
@@ -84,28 +84,10 @@ public:
     CXmlDocPtr & operator = (xmlDoc* pObj);
     ~CXmlDocPtr();
     xmlDoc* operator -> ();
-    operator xmlDoc* ();
+    operator xmlDoc* () const;
 };
 
 //===========================================================
-// class CXmlNsPtr
-// {
-//     xmlNs* _object;
-
-//     CXmlNsPtr(const CXmlNsPtr&);
-//     CXmlNsPtr & operator = (const CXmlNsPtr&);
-// public:
-//     CXmlNsPtr();
-//     CXmlNsPtr(xmlNs* aDoc);
-//     /** Takes ownership of xmlDoc
-//      */
-//     CXmlNsPtr & operator = (xmlNs* pObj);
-//     ~CXmlNsPtr();
-//     xmlNs* operator -> ();
-//     operator xmlNs* ();
-// };
-
-//===========================================================
 class CXmlCharPtr
 {
     xmlChar* _object;
@@ -118,8 +100,7 @@ public:
     CXmlCharPtr(const ::rtl::OUString &);
     ~CXmlCharPtr();
     CXmlCharPtr & operator = (xmlChar* pObj);
-//    xmlChar* operator -> ();
-    operator xmlChar* ();
+    operator xmlChar* () const;
     operator ::rtl::OUString ();
     operator ::rtl::OString ();
 };
@@ -127,3 +108,5 @@ public:
 
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk
index 22056983dd1d..bc067a1202c6 100644
--- a/jvmfwk/source/makefile.mk
+++ b/jvmfwk/source/makefile.mk
@@ -31,7 +31,7 @@ FRAMEWORKLIB=jvmfwk
 TARGET = $(FRAMEWORKLIB)
 ENABLE_EXCEPTIONS = TRUE
 
-.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2"
+.IF "$(OS)" != "WNT"
 UNIXVERSIONNAMES = UDK
 .ENDIF # WNT
 
@@ -51,15 +51,12 @@ SLOFILES = \
     $(SLO)$/fwkbase.obj
 
 
-#LIB1TARGET=$(SLB)$/$(FRAMEWORKLIB).lib
-
 .IF "$(UNIXVERSIONNAMES)" == ""
 SHL1TARGET = $(FRAMEWORKLIB)$(UDK_MAJOR)
 .ELSE # UNIXVERSIONNAMES
 SHL1TARGET = $(FRAMEWORKLIB)
 .ENDIF # UNIXVERSIONNAMES
 
-#SHL1TARGET=$(FRAMEWORKLIB)
 SHL1DEPN=
 SHL1IMPLIB = i$(FRAMEWORKLIB)
 SHL1LIBS = $(SLB)$/$(TARGET).lib
@@ -76,7 +73,7 @@ DEF1NAME = $(SHL1TARGET)
 
 .IF "$(GUI)"=="UNX"
 RCFILE=$(BIN)$/jvmfwk3rc
-.ELIF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.ELIF "$(GUI)"=="WNT"
 RCFILE=$(BIN)$/jvmfwk3.ini
 .END
 
diff --git a/offapi/com/sun/star/accessibility/Accessible.idl b/offapi/com/sun/star/accessibility/Accessible.idl
index ebc35965e8e1..2b8395dea192 100644
--- a/offapi/com/sun/star/accessibility/Accessible.idl
+++ b/offapi/com/sun/star/accessibility/Accessible.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module accessibility {
     actual information that is needed to make it accessible.</p>
 
     <p>Service <code>Accessible</code> is just a wrapper for the interface
-    <code>XAccessible</code>.  See the interface's documention for more
+    <code>XAccessible</code>.  See the interface's documentation for more
     information.</p>
 
     @see XAccessible
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
index e341cdb101d1..960a4c5d425c 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
@@ -154,7 +154,7 @@ published constants AccessibleEventId
     */
     const short SELECTION_CHANGED = 9;
 
-    /** A visibile data event indicates the change of the visual appearance
+    /** A visible data event indicates the change of the visual appearance
         of an accessible object.  This includes for example most of the
         attributes available over the <type>XAccessibleComponent</type> and
         <type>XAccessibleExtendedComponent</type> interfaces.  The
@@ -168,7 +168,7 @@ published constants AccessibleEventId
         <member>AccessibleEventObject::OldValue</member> and
         <member>AccessibleEventObject::NewValue</member> field contain the
         old and new value as a number.  Its exact type is implementation
-        dependant but has to be the same as is returned by the
+        dependent but has to be the same as is returned by the
         <member>XAccessibleValue::getCurrentValue</member> function.
     */
 
@@ -179,7 +179,7 @@ published constants AccessibleEventId
 
         <p>Not used: The <member>AccessibleEventObject::OldValue</member> and
         <member>AccessibleEventObject::NewValue</member> fields contain
-        refrences to the old and new predecessor.  Note that both references
+        references to the old and new predecessor.  Note that both references
         my be <NULL/> to indicate that a flow to the sending object has not
         existed or does not exist anymore.</p>
     */
@@ -190,7 +190,7 @@ published constants AccessibleEventId
 
         <p>Not used: The <member>AccessibleEventObject::OldValue</member> and
         <member>AccessibleEventObject::NewValue</member> fields contain
-        refrences to the old and new successor.  Note that both references
+        references to the old and new successor.  Note that both references
         my be <NULL/> to indicate that a flow from the sending object has not
         existed or does not exist anymore.</p>
     */
@@ -287,14 +287,14 @@ published constants AccessibleEventId
         fields remain empty.  In this case the whole text may have changed
         and the listener should refetch the text completely.</li> </ol>
 
-        <p>When broadcasting an event allways prefer the first three cases
+        <p>When broadcasting an event always prefer the first three cases
         to the last one.  Use it only as a last resort.</p>
 
         <p> Text ranges should be as small as possible but, of course,
         include all the text that is involved in a modification.  That means
-        that when two or more discontiguous text ranges are inserted,
+        that when two or more discontinuous text ranges are inserted,
         deleted, or otherwise modified the two fields of the event have to
-        cover all the effected text ranges as well as the text in
+        cover all the affected text ranges as well as the text in
         between.</p>
     */
     const short TEXT_CHANGED = 22;
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
index c1a4e5c39d07..5d850b36f9f8 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_accessibility_AccessibleEventObject_idl__
 #define __com_sun_star_accessibility_AccessibleEventObject_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -37,7 +35,7 @@ module com { module sun { module star { module accessibility {
     the <type>XAccessibleEventBroadcaster</type> and notified to
     <type>XAccessibleEventListener</type>.
 
-    <p>It is usualy implemented by <type>AccessibleContext</type>.
+    <p>It is usually implemented by <type>AccessibleContext</type>.
 
     @since OOo 1.1.2
 */
diff --git a/offapi/com/sun/star/accessibility/AccessibleRelation.idl b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
index 8df475e9fa0e..602361ba892b 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRelation.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_accessibility_AccessibleRelation_idl__
 #define __com_sun_star_accessibility_AccessibleRelation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -48,7 +46,7 @@ published struct AccessibleRelation
         <p>Its value has to be one of the constants defined by
         <type>AccessibleRelationType</type>.  If that value is INVALID then
         the whole relation is regarded as invalid.  The content of the
-        targetSet is then undefined.</p>
+        TargetSet is then undefined.</p>
 
         @see AccessibleRelationType
     */
diff --git a/offapi/com/sun/star/accessibility/AccessibleRelationType.idl b/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
index 5fec84f6ed8f..ead836dcec36 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module accessibility {
 
 /** Collection of relation types.
 
-    <p>This list of constants defines the availabe types of relations that
+    <p>This list of constants defines the available types of relations that
     are usable by <type>AccessibleRelation</type>.</p>
 
     <p>We are using constants instead of a more typesafe enum.  The reason
@@ -76,7 +76,7 @@ published constants AccessibleRelationType
     */
     const short CONTROLLER_FOR = 4;
 
-    /** Lable-for relation type.
+    /** Label-for relation type.
 
         <p>Indicates an object is a label for one or more target
         objects.</p>
@@ -107,7 +107,7 @@ published constants AccessibleRelationType
 
     /** Node-Child-of relation type.
 
-        <p>Indicates an object is a cell in a tree or treetable which is
+        <p>Indicates an object is a cell in a tree or tree table which is
         displayed because a cell in the same column is expanded and
         identifies that cell.</p>
 
diff --git a/offapi/com/sun/star/accessibility/AccessibleRole.idl b/offapi/com/sun/star/accessibility/AccessibleRole.idl
index 5fe65d04ec42..f393428bc061 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRole.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRole.idl
@@ -32,10 +32,10 @@ module com { module sun { module star { module accessibility {
 
 /** Collection of roles.
 
-    <p>This collection of constans defines the set of possible roles of
+    <p>This collection of constants defines the set of possible roles of
     classes implementing the <type>XAccessible</type> interface according to
-    the java class javax.accessibility.AccessibleRole.  The role of an
-    object describes its generic function like 'button', 'menu', or 'text'.
+    the Java class javax.accessibility.AccessibleRole.  The role of an
+    object describes its generic function like "button", "menu", or "text".
     You can obtain an object's role by calling the
     <member>getAccessibleRole</member> method of the
     <type>XAccessibleContext</type> interface.</p>
@@ -46,7 +46,7 @@ module com { module sun { module star { module accessibility {
     here.</p>
 
     <p>For some roles there exist two labels with the same value.  Please
-    use the one with the underscrores.  The other ones are somewhat
+    use the one with the underscores.  The other ones are somewhat
     deprecated and will be removed in the future. </p>
 
     @see XAccessibleContext
@@ -73,7 +73,7 @@ published constants AccessibleRole
 
     /** Object that can be drawn into and is used to trap events.
 
-        <p>See alse <const>FRAME</const>, <const>GLASS_PANE</const>, and
+        <p>See also <const>FRAME</const>, <const>GLASS_PANE</const>, and
         <const>LAYERED_PANE</const>.</p>
     */
     const short CANVAS = 3;
@@ -148,11 +148,11 @@ published constants AccessibleRole
     /** View of a document.
 
         <p>The view of an actual document.  Its content depends on the
-        documen type.</p>
+        document type.</p>
     */
     const short DOCUMENT = 13;
 
-    /** Embeded (OLE) object.
+    /** Embedded (OLE) object.
     */
     const short EMBEDDED_OBJECT = 14;
 
@@ -372,7 +372,7 @@ published constants AccessibleRole
     */
     const short PASSWORD_TEXT = 42;
 
-    /** Popup menu role.
+    /** Pop-up menu role.
 
         <p>A temporary window that is usually used to offer the user a list
         of choices, and then hides when the user selects one of those
@@ -431,7 +431,7 @@ published constants AccessibleRole
         <p>An object usually used to allow a user to incrementally view a
         large amount of data. Usually used only by a scroll pane.</p>
 
-        <p>Ssee also <const>SCROLL_PANE</const>.</p>
+        <p>See also <const>SCROLL_PANE</const>.</p>
     */
     const short SCROLL_BAR = 50;
 
@@ -539,7 +539,7 @@ published constants AccessibleRole
     /** Tool tip role.
 
         <p>An object that provides information about another object. The
-        accessibleDescription property of the tool tip is often displayed to
+        accessible Description property of the tool tip is often displayed to
         the user in a small "help bubble" when the user causes the mouse to
         hover over the object associated with the tool tip.</p>
     */
@@ -663,7 +663,7 @@ published constants AccessibleRole
     /** Section role
 
         <p>The object is a containing instance of document content which constitutes a particular
-        'logical' section of the document.</p>
+        "logical" section of the document.</p>
 
         @since OOo 3.0
     */
diff --git a/offapi/com/sun/star/accessibility/AccessibleStateType.idl b/offapi/com/sun/star/accessibility/AccessibleStateType.idl
index a43fb42a6397..1d83932d0344 100644
--- a/offapi/com/sun/star/accessibility/AccessibleStateType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleStateType.idl
@@ -123,7 +123,7 @@ published constants AccessibleStateType
         (given by the event) should be not transient to make it possible
         to add listener to this object and recognize changes in this object.
 
-        The state is added to make a performance improvment. Now it is no
+        The state is added to make a performance improvement. Now it is no
         longer necessary to iterate over all children to find out whether
         they are transient or not to decide whether to add listener or not.
         If there is a object with this state no one should iterate over the
@@ -189,7 +189,7 @@ published constants AccessibleStateType
         all of its parents have set the <const>VISIBLE</const> state and it
         lies at least partly inside the visible area of its parent.  It is,
         though, not necessarily visible on the screen because it may be
-        ocluded by other objects.</p>
+        occluded by other objects.</p>
     */
     const short SHOWING = 25;
 
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
index f38bbf9e17ac..cb14fefa5f07 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_AccessibleTableModelChange_idl__
 #define __com_sun_star_accessibility_AccessibleTableModelChange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
index 77e2db6eab96..068ac2eef8ba 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
@@ -28,23 +28,21 @@
 #ifndef __com_sun_star_accessibility_XAccessibleTableModelChange_idl__
 #define __com_sun_star_accessibility_XAccessibleTableModelChange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
 /** Type of a change made to a table model.
 
         <p>The value of this constants group are used by the
-        <type>AccessibleTableModelChange</type> structure to specifiy the
+        <type>AccessibleTableModelChange</type> structure to specify the
         type of change that has been made to a table model.</p>
 
         <p>Two of the constants,
         <const>AccessibleTableModelChangeType::INSERT</const> and
         <const>AccessibleTableModelChangeType::DELETE</const> describe
         changes to the table's geometry.  One or more rows and/or columns have
-        been inserted or deleted.  In constrast, the remaining constant
+        been inserted or deleted.  In contrast, the remaining constant
         <const>AccessibleTabelModelChangeType::UPDATE</const> specifies a
         change of the table's content.</p>
 
diff --git a/offapi/com/sun/star/accessibility/AccessibleTextType.idl b/offapi/com/sun/star/accessibility/AccessibleTextType.idl
index 597f2ecb5349..33dfd5d7beb3 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTextType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTextType.idl
@@ -51,7 +51,7 @@ published constants AccessibleTextType
 
         <p>Indicates that single words are used.  The definition of what a
         word is is implementation and language/locale dependent.  While in
-        english a word is ended by a space or a special character like a
+        English a word is ended by a space or a special character like a
         comma or a period, this is not necessarily true in other
         languages.</p>
     */
@@ -61,7 +61,7 @@ published constants AccessibleTextType
 
         <p>Indicates that single sentences are used.  The definition of what
         a sentence is is implementation and language/locale dependent.
-        While in english a sentence is ended by a period, this is not
+        While in English a sentence is ended by a period, this is not
         necessarily true in other languages.</p>
     */
     const short SENTENCE = 3;
diff --git a/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl b/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
index 529bac18e3c5..ddae52849b99 100644
--- a/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
+++ b/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
@@ -28,15 +28,13 @@
 #ifndef __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__
 #define __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com {  module sun {  module star {  module accessibility {
 
 /** Indicates invalid or unavailable state information.
 
-    <p>This exception is thrown to indicate the an accessibilty component
+    <p>This exception is thrown to indicate the an accessibility component
     has been queried for state information that it can not provide.  Used by
     <member>XAccessibleContext::getLocale</member>.</p>
 
diff --git a/offapi/com/sun/star/accessibility/XAccessible.idl b/offapi/com/sun/star/accessibility/XAccessible.idl
index 2899c960dc96..813af543ef19 100644
--- a/offapi/com/sun/star/accessibility/XAccessible.idl
+++ b/offapi/com/sun/star/accessibility/XAccessible.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_XAccessible_idl__
 #define __com_sun_star_accessibility_XAccessible_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -47,10 +45,10 @@ module com { module sun { module star { module accessibility {
     <type>XAccessibleContext</type> makes it possible to split up the
     implementation of the
     class that is made accessible and the actual accessibility code into two
-    (mostly) independant parts.  The only necessary dependance is the
+    (mostly) independent parts.  The only necessary dependence is the
     <member scope="XAccessible">getAccessibleContext()</member> function
     that returns the accessible context.  This one-way link has to be
-    persistant in some sense: As long as there is at least one reference to
+    persistent in some sense: As long as there is at least one reference to
     a specific <type>XAccessibleContext</type> object the
     <type>XAccessible</type> object has to return the same context for every
     call to <member scope="XAccessible">getAccessibleContext()</member>.
@@ -67,7 +65,7 @@ published interface XAccessible : ::com::sun::star::uno::XInterface
 
         <p>The idea to let this interface only return an
         <type>XAccessibleContext</type> instead of directly supporting its
-        functions is to allow the seperation of the implementation of the
+        functions is to allow the separation of the implementation of the
         functions that make a class accessible from the implementation of
         that class.  You may, of course, implement <type>XAccessible</type>
         and <type>XAccessibleContext</type> in one class.</p>
diff --git a/offapi/com/sun/star/accessibility/XAccessibleAction.idl b/offapi/com/sun/star/accessibility/XAccessibleAction.idl
index 4d25f9a71ea2..b883b9eccaea 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleAction.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleAction.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #define __com_sun_star_accessibility_XAccessibleAction_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
index cb07b5aebb3a..cb3dd99f5657 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
@@ -28,30 +28,14 @@
 #ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #define __com_sun_star_accessibility_XAccessibleComponent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XFocusListener_idl__
 #include <com/sun/star/awt/XFocusListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XFont_idl__
 #include <com/sun/star/awt/XFont.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -72,7 +56,7 @@ module com { module sun { module star { module accessibility {
 
     <p>Coordinates used by the functions of this interface are specified in
     different coordinate systems.  Their scale is the same and is equal to
-    that of the screen coordiante system.  In other words all coordinates
+    that of the screen coordinate system.  In other words all coordinates
     are measured in pixel.  They differ in their respective origin:
     <ul><li>The screen coordinate system has its origin in the upper left
     corner of the current screen.  Used by the
@@ -113,7 +97,7 @@ published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
             Coordinates of the point to test.  The origin of the coordinate
             system is the upper left corner of the object's bounding box as
             returned by the <method>getBounds</method>.  The scale of the
-            coordinate system is identical to that of the screen coordiante
+            coordinate system is identical to that of the screen coordinate
             system.
 
         @return
@@ -134,7 +118,7 @@ published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
             child.  The origin of the coordinate system is the upper left
             corner of the object's bounding box as returned by the
             <method>getBounds</method>.  The scale of the coordinate
-            system is identical to that of the screen coordiante system.
+            system is identical to that of the screen coordinate system.
 
         @return
             If there is one child which is rendered so that its bounding box
@@ -159,7 +143,7 @@ published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
             The coordinates of the returned rectangle are relative to this
             object's parent or relative to the screen on which this object
             is rendered if it has no parent.  If the object is not on any
-            screen the returnred rectangle is empty and located at position
+            screen the returned rectangle is empty and located at position
             (0,0).
     */
     ::com::sun::star::awt::Rectangle getBounds ();
@@ -174,7 +158,7 @@ published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
             The coordinates of the returned position are relative to this
             object's parent or relative to the screen on which this object
             is rendered if it has no parent.  If the object is not on any
-            screen the returnred position is (0,0).
+            screen the returned position is (0,0).
     */
     ::com::sun::star::awt::Point getLocation ();
 
@@ -190,7 +174,7 @@ published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
         @return
             The coordinates of the returned position are relative to the
             screen on which this object is rendered.  If the object is not
-            on any screen the returnred position is (0,0).
+            on any screen the returned position is (0,0).
     */
     ::com::sun::star::awt::Point getLocationOnScreen ();
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleContext.idl b/offapi/com/sun/star/accessibility/XAccessibleContext.idl
index 4b85964cb3d9..6ae6a3f9ffc9 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleContext.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleContext.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #define __com_sun_star_accessibility_XAccessibleContext_idl__
 
-#ifndef __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__
 #include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
 #include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -51,7 +40,7 @@ module com { module sun { module star { module accessibility {
  published interface XAccessibleSelection;
  published interface XAccessibleStateSet;
 
-/** Implement this interface for exposing various aspects of a class'
+/** Implement this interface for exposing various aspects of a class's
     content.
 
     <p>This interface serves two purposes: On the one hand it gives access
@@ -60,8 +49,8 @@ module com { module sun { module star { module accessibility {
     hand it gives access to objects that expose the represented content.
     That are role, state, name, description, and relations to other objects.
     Take an OK button of a dialog as an example.  Its role is
-    <const>AccessibleRole::BUTTON</const>, its name is 'OK', and its description
-    is something like 'Accepts all changes made in the dialog'.</p>
+    <const>AccessibleRole::BUTTON</const>, its name is "OK", and its description
+    is something like "Accepts all changes made in the dialog".</p>
 
     @since OOo 1.1.2
 */
@@ -79,7 +68,7 @@ published interface XAccessibleContext : ::com::sun::star::uno::XInterface
     /** Returns the i-th child of this object.
 
         <p>The order in which the children are enumerated is implementation
-        dependend.</p>
+        dependent.</p>
 
         @param i
             The index may have any value.  If it is outside the range from 0
@@ -162,16 +151,16 @@ published interface XAccessibleContext : ::com::sun::star::uno::XInterface
 
     /** Returns the set of relations defined for this object.
 
-        <p>The returned set of relations is a copy of this objects relation
-        set: changing the returned object does not change this objects
+        <p>The returned set of relations is a copy of this object's relation
+        set: changing the returned object does not change this object's
         relations.</p>
 
-        <p>aThere are two ways to represent an empty list of relations:
+        <p>There are two ways to represent an empty list of relations:
         Return an empty reference or return a valid object that contains an
         empty list.
 
         @return
-           The returned value is either an empty referece or a reference to
+           The returned value is either an empty reference or a reference to
            a valid object that represents a copy of the objects list of
            relations.
     */
@@ -181,7 +170,7 @@ published interface XAccessibleContext : ::com::sun::star::uno::XInterface
         object.
 
         <p>The returned state set is a copy: Changing the returned state set
-        will not be refelected by changing the object's set of states.  See
+        will not be reflected by changing the object's set of states.  See
         the documentation of <type>XAccessibleStateSet</type> for a
         description of the individual states.</p>
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl b/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
index 1dc673f4a024..a5ed252c1c70 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
 #define __com_sun_star_accessibility_XAccessibleEditableText_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl b/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
index 0635ad906da4..c769781016ea 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #define __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl b/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
index d673d71557b4..29762e0afe5d 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_accessibility_XAccessibleEventListener_idl__
 #define __com_sun_star_accessibility_XAccessibleEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_AccessibleEventObject_idl__
 #include <com/sun/star/accessibility/AccessibleEventObject.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
index ce28b9e7994b..28a6c69c637f 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
@@ -28,30 +28,14 @@
 #ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #define __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XFocusListener_idl__
 #include <com/sun/star/awt/XFocusListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XFont_idl__
 #include <com/sun/star/awt/XFont.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -76,7 +60,7 @@ published interface XAccessibleExtendedComponent : XAccessibleComponent
     /** Returns the font of this object.
 
         @return
-            The returend reference to a font object is empty if a font is not
+            The returned reference to a font object is empty if a font is not
             supported by this object.
     */
     ::com::sun::star::awt::XFont getFont ();
diff --git a/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl b/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
index f2174b802260..cde96014532e 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_accessibility_XAccessibleHyperlink_idl__
 #define __com_sun_star_accessibility_XAccessibleHyperlink_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -50,8 +46,8 @@ module com { module sun { module star { module accessibility {
     <member>XAccessibleHyperlink::getAccessibleActionObject</member>
     methods.</p>
 
-    <p>Furhtermore, the object that implements this interface has to be
-    connected implicitely or explicitely with an object that implements the
+    <p>Furthermore, the object that implements this interface has to be
+    connected implicitly or explicitly with an object that implements the
     the <type>XAccessibleText</type> interface.  The
     <member>XAccessibleHyperlink::getStartIndex</member> and
     <member>XAccessibleHyperlink::getEndIndex</member> methods return
@@ -71,7 +67,7 @@ published interface XAccessibleHyperlink :
         @param nIndex
             This index identifies the anchor when, as in the case of an
             image map, there is more than one link represented by this
-            object.  The valid maximal index can be determinded by calling
+            object.  The valid maximal index can be determined by calling
             the <member>XAccessibleAction::getActionCount</member> method.
 
         @return
@@ -90,7 +86,7 @@ published interface XAccessibleHyperlink :
         @param nIndex
             This index identifies the action object when, as in the case of
             an image map, there is more than one link represented by this
-            object.  The valid maximal index can be determinded by calling
+            object.  The valid maximal index can be determined by calling
             the <member>XAccessibleAction::getActionCount</member> method.
 
         @return
@@ -104,7 +100,7 @@ published interface XAccessibleHyperlink :
         hyperlink (group) starts.
 
         <p>The returned value relates to the <type>XAccessibleText</type>
-        interface that ownes this hyperlink.</p>
+        interface that owns this hyperlink.</p>
 
         @return
             The index relates to the text exposed by the
@@ -112,11 +108,11 @@ published interface XAccessibleHyperlink :
     */
     long getStartIndex ();
 
-    /** Returns the index at which the textual rerpesentation of the
+    /** Returns the index at which the textual representation of the
         hyperlink (group) ends.
 
         <p>The returned value relates to the <type>XAccessibleText</type>
-        interface that ownes this hyperlink.</p>
+        interface that owns this hyperlink.</p>
 
         @return
             The index relates to the text exposed by the
diff --git a/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl b/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
index 253b7d93c41a..b27feecd2903 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleHypertext_idl__
 #define __com_sun_star_accessibility_XAccessibleHypertext_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -79,7 +73,7 @@ published interface XAccessibleHypertext
             This index specifies the hyperlink to return.
 
         @return
-            If the given index is valid, i.e. lies in the intervall from 0
+            If the given index is valid, i.e. lies in the interval from 0
             to the number of links minus one, a reference to the specified
             hyperlink object is returned.  If the index is invalid then an
             empty reference is returned.
@@ -97,7 +91,7 @@ published interface XAccessibleHypertext
         @param nCharIndex
             Index of the character for which to return the link index.  If
             the <type>XAccessibleText</type> interface is used to represent
-            the text containting the link, then the character index is only
+            the text containing the link, then the character index is only
             valid if it is greater than or equal to zero and lower then the
             number of characters in the text.  See that interface's
             documentation for more details.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleImage.idl b/offapi/com/sun/star/accessibility/XAccessibleImage.idl
index f6b3b3f5878a..dcda5cc47a3c 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleImage.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleImage.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
 #define __com_sun_star_accessibility_XAccessibleImage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -53,7 +51,7 @@ published interface XAccessibleImage : ::com::sun::star::uno::XInterface
         embedded into a document.)</p>
 
         @return
-            Returns a localized string that describes the images's function
+            Returns a localized string that describes the image's function
             or content.
     */
     string getAccessibleImageDescription ();
diff --git a/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl b/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
index c131d9c19815..ebc87e34fb03 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleKeyBinding_idl__
 #define __com_sun_star_accessibility_XAccessibleKeyBinding_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_KeyStroke_idl__
 #include <com/sun/star/awt/KeyStroke.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -75,7 +69,7 @@ published interface XAccessibleKeyBinding : ::com::sun::star::uno::XInterface
         @param nIndex
             The index selects one of alternative key bindings.  It has to
             non-negative and smaller then the number of key bindings as
-            returned by the <member>geetAccessibleKeyBindingCount()</member>
+            returned by the <member>getAccessibleKeyBindingCount()</member>
             method.
         @return
            The returned sequence of key strokes specifies one way to invoke
diff --git a/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl b/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
index 645925c312f6..cfeae5315f82 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleMultiLineText_idl__
 #define __com_sun_star_accessibility_XAccessibleMultiLineText_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -73,7 +67,7 @@ interface XAccessibleMultiLineText
     long getLineNumberAtIndex([in] long nIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
-    /** Retuns the text of the specified line.
+    /** Returns the text of the specified line.
 
         <p>Returns the substring of text that makes up the specified line
         number.</p>
diff --git a/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl b/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
index a5af46d8588c..d0a7f78dc5db 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
@@ -28,16 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleRelationSet_idl__
 #define __com_sun_star_accessibility_XAccessibleRelationSet_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleRelation_idl__
 #include <com/sun/star/accessibility/AccessibleRelation.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -51,7 +44,7 @@ module com { module sun { module star { module accessibility {
     clean it up.  These methods are <member>add</member>,
     <member>addAll</member>, <member>clear</member>, and
     <member>remove</member>.  The other methods have been renamed to achieve
-    a geater conformance with the other accessibility interfaces.</p>
+    a greater conformance with the other accessibility interfaces.</p>
 
     @since OOo 1.1.2
 */
@@ -68,7 +61,7 @@ published interface XAccessibleRelationSet : ::com::sun::star::uno::XInterface
         the given index.
 
         @param nIndex
-            This index specifies the relatio to return.
+            This index specifies the relation to return.
 
         @return
             For a valid index, i.e. inside the range 0 to the number of
diff --git a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
index 15f5f8c920e7..53e5ad8f0c59 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #define __com_sun_star_accessibility_XAccessibleSelection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -65,7 +61,7 @@ published interface XAccessibleSelection : ::com::sun::star::uno::XInterface
 
         @param nChildIndex
             Index of the child which is to add to the selection.  This index
-            referes to all the children of this object.
+            refers to all the children of this object.
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if the given index does not lie in the valid range of 0 up to
             the result of
@@ -78,7 +74,7 @@ published interface XAccessibleSelection : ::com::sun::star::uno::XInterface
 
         @param nChildIndex
             Index of the child for which to detect whether it is selected.
-            This index referes to all the children of this object.
+            This index refers to all the children of this object.
 
         @return
             Returns <TRUE/> if the specified child is selected and <FALSE/>
diff --git a/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl b/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
index 21f339587281..18b43d0ec852 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_accessibility_XAccessibleStateSet_idl__
 #define __com_sun_star_accessibility_XAccessibleStateSet_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleStateType_idl__
 #include <com/sun/star/accessibility/AccessibleStateType.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -67,7 +62,7 @@ published interface XAccessibleStateSet : ::com::sun::star::uno::XInterface
             the constants of <type>AccessibleStateType</type>.
 
         @return
-            Returns <TRUE/> if the given state is a memeber of this object's
+            Returns <TRUE/> if the given state is a member of this object's
             state set and <FALSE/> otherwise.
     */
     boolean contains ([in] short aState);
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTable.idl b/offapi/com/sun/star/accessibility/XAccessibleTable.idl
index c6e0ba9f18f9..7c1cdc90bbb6 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTable.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTable.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
 #define __com_sun_star_accessibility_XAccessibleTable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -102,7 +98,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
             returned.
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if the specified row index is not valid, i.e. lies not inside
-            the valide range of 0 up to
+            the valid range of 0 up to
             <member>XAccessibleTable::getAccessibleRowCount()</member> - 1.
 
     */
@@ -121,7 +117,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
             returned.
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if the specified column index is not valid, i.e. lies not inside
-            the valide range of 0 up to
+            the valid range of 0 up to
             <member>XAccessibleTable::getAccessibleColumnCount()</member> - 1.
     */
     string getAccessibleColumnDescription ([in] long nColumn)
@@ -146,7 +142,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if the specified row index is not valid, i.e. lies not inside
-            the valide range of 0 up to
+            the valid range of 0 up to
             <member>XAccessibleTable::getAccessibleRowCount()</member> - 1.
     */
     long getAccessibleRowExtentAt ([in] long nRow, [in] long nColumn)
@@ -171,7 +167,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if the specified column index is not valid, i.e. lies not inside
-            the valide range of 0 up to
+            the valid range of 0 up to
             <member>XAccessibleTable::getAccessibleColumnCount()</member> - 1.
     */
     long getAccessibleColumnExtentAt ([in] long nRow, [in] long nColumn)
@@ -184,7 +180,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
         dependent.</p>
 
         @return
-            Returns allways a valid reference to an
+            Returns always a valid reference to an
             <type>XAccessibleTable</type> object.
     */
     XAccessibleTable getAccessibleRowHeaders ();
@@ -196,7 +192,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
         dependent.</p>
 
         @return
-            Returns allways a valid reference to an
+            Returns always a valid reference to an
             <type>XAccessibleTable</type> object.
     */
     XAccessibleTable getAccessibleColumnHeaders ();
@@ -233,7 +229,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if the specified row index is not valid, i.e. lies not inside
-            the valide range of 0 up to
+            the valid range of 0 up to
             <member>XAccessibleTable::getAccessibleRowCount()</member> - 1.
     */
     boolean isAccessibleRowSelected ([in] long nRow)
@@ -252,7 +248,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if the specified column index is not valid, i.e. lies not inside
-            the valide range of 0 up to
+            the valid range of 0 up to
             <member>XAccessibleTable::getAccessibleColumnCount()</member> - 1.
     */
     boolean isAccessibleColumnSelected ([in] long nColumn)
@@ -282,7 +278,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if the specified column and/or row index is not valid, i.e. lies not inside
-            the valide range of 0 up to
+            the valid range of 0 up to
             <member>XAccessibleTable::getAccessibleColumnCount()</member> - 1.
     */
     XAccessible getAccessibleCellAt ([in] long nRow, [in] long nColumn)
diff --git a/offapi/com/sun/star/accessibility/XAccessibleText.idl b/offapi/com/sun/star/accessibility/XAccessibleText.idl
index 7b1cf40ae837..788358b9aee5 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleText.idl
@@ -28,31 +28,14 @@
 #ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #define __com_sun_star_accessibility_XAccessibleText_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleTextType_idl__
 #include <com/sun/star/accessibility/AccessibleTextType.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_accessibility_TextSegment_idl__
 #include <com/sun/star/accessibility/TextSegment.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -169,7 +152,7 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
             character then they are ignored, too.
 
             <p>An empty sequence signals the callers interest in all the
-            attributes.  This is usefull in two cases: a) Simply as a way to
+            attributes.  This is useful in two cases: a) Simply as a way to
             avoid passing a potentially large array to the called object or
             b) when the caller does not know what attributes the called
             objects supports but is interested in all of them
@@ -204,13 +187,13 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
         represents the current input position and will therefore typically
         be queried by AT more often than other positions.  Because it does
         not represent an existing character its bounding box is defined in
-        relation to preceding characters.  It should be rougly equivalent to
+        relation to preceding characters.  It should be roughly equivalent to
         the bounding box of some character when inserted at the end of the
         text.  Its height typically being the maximal height of all the
         characters in the text or the height of the preceding character, its
         width being at least one pixel so that the bounding box is not
         degenerate.<br>
-        Note that the index 'length' is not always valid.  Whether it is
+        Note that the index "length" is not always valid.  Whether it is
         or not is implementation dependent.  It typically is when text is
         editable or otherwise when on the screen the caret can be placed
         behind the text.  You can be sure that the index is valid after you
@@ -316,7 +299,7 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
             The first character of the new selection.
             The valid range is 0..length.
 
-        @parm nEndIndex
+        @param nEndIndex
             The position after the last character of the new selection.
             The valid range is 0..length.
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
index 5bb632b0cbc2..ebef4465b2c3 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_accessibility_XAccessibleTextAttributes_idl__
 #define __com_sun_star_accessibility_XAccessibleTextAttributes_idl__
 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl b/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl
index c89cac41ef31..b5efb67be9d1 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_accessibility_XAccessibleTextMarkup_idl__
 #define __com_sun_star_accessibility_XAccessibleTextMarkup_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_TextSegment_idl__
 #include <com/sun/star/accessibility/TextSegment.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
@@ -125,7 +115,7 @@ interface XAccessibleTextMarkup
 
         @return
             If character index is in range [0..number of characters in the text-1],
-            a seguence of <type>TextSegment</type>s of the text markups at
+            a sequence of <type>TextSegment</type>s of the text markups at
             given character index of the given text markup type are returned.
             The sequence is empty, if no such text markup is found.
     */
diff --git a/offapi/com/sun/star/accessibility/XAccessibleValue.idl b/offapi/com/sun/star/accessibility/XAccessibleValue.idl
index b5d8cb8482ff..c33562f0da75 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleValue.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleValue.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #define __com_sun_star_accessibility_XAccessibleValue_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/animations/AnimationColorSpace.idl b/offapi/com/sun/star/animations/AnimationColorSpace.idl
index a29c40139f5a..58c00ea52d59 100644
--- a/offapi/com/sun/star/animations/AnimationColorSpace.idl
+++ b/offapi/com/sun/star/animations/AnimationColorSpace.idl
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-/** defines the colorspace that is used for interpolation.
+/** defines the color space that is used for interpolation.
     <br>
     This does not change how colors are interpreted but how to
     interpolate from one color to another.
@@ -42,11 +42,11 @@
 */
 constants AnimationColorSpace
 {
-    /** defines that the RGB colorspace is used for interpolation .
+    /** defines that the RGB color space is used for interpolation.
     */
     const short RGB = 0;
 
-    /** defines that the HSL colorspace is used for interpolation .
+    /** defines that the HSL color space is used for interpolation.
     */
     const short HSL = 1;
 };
diff --git a/offapi/com/sun/star/animations/AnimationFill.idl b/offapi/com/sun/star/animations/AnimationFill.idl
index cc9796cdffe9..32b3b77fb992 100644
--- a/offapi/com/sun/star/animations/AnimationFill.idl
+++ b/offapi/com/sun/star/animations/AnimationFill.idl
@@ -59,19 +59,35 @@ constants AnimationFill
     /** Specifies that the element will not extend past the end of the last instance of the simple duration.  */
     const short REMOVE = 1;
 
-    /** Specifies that the element will extend past the end of the last instance of the simple duration by "freezing" the element state at that point. The parent time container of the element determines how long the element is frozen (as described immediately below). */
+    /** Specifies that the element will extend past the end of the last instance of the simple duration by
+        "freezing" the element state at that point. The parent time container of the element determines how
+        long the element is frozen (as described immediately below).
+    */
     const short FREEZE = 2;
 
-    /** Setting this to "hold" has the same effect as setting to "freeze", except that the element is always frozen to extend to the end of the simple duration of the parent time container of theelement (independent of the type of time container). For profiles that support a layered layout model (e.g., SMIL 2.0 Language Profile), held elements (elements with fill="hold") will refresh their display area when a layer is added on top then later removed. */
+    /** Setting this to "hold" has the same effect as setting to "freeze", except that the element is always
+        frozen to extend to the end of the simple duration of the parent time container of the element
+        (independent of the type of time container). For profiles that support a layered layout model
+        (e.g., SMIL 2.0 Language Profile), held elements (elements with fill="hold") will refresh their display
+        area when a layer is added on top then later removed.
+    */
     const short HOLD = 3;
 
-    /** Setting this to "transition" has the same effect as setting to "freeze", except that the element is removed at the end of the transition. This value is only allowed on elements with media directly associated with them. If specified on any other element (e.g. a time container element in the SMIL language profile), the attribute is ignored. See the SMIL Transitions module. */
+    /** Setting this to "transition" has the same effect as setting to "freeze", except that the element is
+        removed at the end of the transition. This value is only allowed on elements with media directly
+        associated with them. If specified on any other element (e.g. a time container element in the SMIL
+        language profile), the attribute is ignored. See the SMIL Transitions module.
+    */
     const short TRANSITION = 4;
 
-    /** The fill behavior for this element depends on whether the element specifies any of the attributes that define the simple or active duration:
+    /** The fill behavior for this element depends on whether the element specifies any of the attributes
+        that define the simple or active duration:
         <ul>
-        <li>If none of the attributes duration, end, repeatCount or repeatDuration are specified on the element, then the element will have a fill behavior identical to that if it were specified as <const>AnimationFill::FREEZE</const>.</li>
-        <li>Otherwise, the element will have a fill behavior identical to that if it were specified as <const>AnimationFill::REMOVE</const.</li>
+        <li>If none of the attributes duration, end, repeatCount or repeatDuration are specified on
+        the element, then the element will have a fill behavior identical to that if it were specified
+        as <const>AnimationFill::FREEZE</const>.</li>
+        <li>Otherwise, the element will have a fill behavior identical to that if it were specified as
+        <const>AnimationFill::REMOVE</const.</li>
         </ul>
     */
     const short AUTO = 5;
diff --git a/offapi/com/sun/star/animations/AnimationNodeType.idl b/offapi/com/sun/star/animations/AnimationNodeType.idl
index 3d290520a774..01834c8de1fb 100644
--- a/offapi/com/sun/star/animations/AnimationNodeType.idl
+++ b/offapi/com/sun/star/animations/AnimationNodeType.idl
@@ -35,7 +35,7 @@
 
 /** This constants defines a type for an animation node.
     <br>
-    It can be used to quickly identify semantic blocks inside an animation hierachy.
+    It can be used to quickly identify semantic blocks inside an animation hierarchy.
 
     @see AnimationNode
 */
diff --git a/offapi/com/sun/star/animations/AnimationRestart.idl b/offapi/com/sun/star/animations/AnimationRestart.idl
index 4185bb594764..ec4d22ab7c4a 100644
--- a/offapi/com/sun/star/animations/AnimationRestart.idl
+++ b/offapi/com/sun/star/animations/AnimationRestart.idl
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-/** defines the restart behaviour
+/** defines the restart behavior
 
     @see <member>XTiming::Restart</member>
     @see <member>XTiming::RestartDefault</member>
diff --git a/offapi/com/sun/star/animations/Event.idl b/offapi/com/sun/star/animations/Event.idl
index be5e2e1c9872..f0d72d97803f 100644
--- a/offapi/com/sun/star/animations/Event.idl
+++ b/offapi/com/sun/star/animations/Event.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_Event_idl__
 #define __com_sun_star_animations_Event_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -57,7 +55,7 @@ struct Event
 
     /** an option repeat value. If the <member>Trigger</member> is
         <const>EventTrigger</const>, this is the number of repeats
-        after wich the event is initially raised.
+        after which the event is initially raised.
     */
     unsigned short Repeat;
 };
diff --git a/offapi/com/sun/star/animations/EventTrigger.idl b/offapi/com/sun/star/animations/EventTrigger.idl
index e4e56f771bf1..4ded278b44db 100644
--- a/offapi/com/sun/star/animations/EventTrigger.idl
+++ b/offapi/com/sun/star/animations/EventTrigger.idl
@@ -65,7 +65,7 @@ constants EventTrigger
     const short ON_MOUSE_ENTER = 7;
     const short ON_MOUSE_LEAVE = 8;
 
-    /** This event is raised when the user wants the presentation to go one step foreward.
+    /** This event is raised when the user wants the presentation to go one step forward.
     */
     const short ON_NEXT = 9;
 
diff --git a/offapi/com/sun/star/animations/TargetProperties.idl b/offapi/com/sun/star/animations/TargetProperties.idl
index 3e2133f1c2ae..6bf00285703f 100644
--- a/offapi/com/sun/star/animations/TargetProperties.idl
+++ b/offapi/com/sun/star/animations/TargetProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_TargetProperties_idl__
 #define __com_sun_star_animations_TargetProperties_idl__
 
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/animations/XAnimate.idl b/offapi/com/sun/star/animations/XAnimate.idl
index 1a1c02b59bcc..c7fe1f614762 100644
--- a/offapi/com/sun/star/animations/XAnimate.idl
+++ b/offapi/com/sun/star/animations/XAnimate.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_animations_XAnimate_idl__
 #define __com_sun_star_animations_XAnimate_idl__
 
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
-
-#ifndef __com_sun_star_animations_TimeFilterPair_idl__
 #include <com/sun/star/animations/TimeFilterPair.idl>
-#endif
 
 //=============================================================================
 
@@ -141,7 +136,7 @@ interface XAnimate : XAnimationNode
     [attribute] sequence< TimeFilterPair > TimeFilter;
 
     /** if this string is set, its contents will be parsed as a formula.
-        All values are used as a parameter for this formula and the computet
+        All values are used as a parameter for this formula and the computed
         result will be used.
     */
     [attribute] string Formula;
diff --git a/offapi/com/sun/star/animations/XAnimateColor.idl b/offapi/com/sun/star/animations/XAnimateColor.idl
index fc5e37a4df49..cbeb2b5e217e 100644
--- a/offapi/com/sun/star/animations/XAnimateColor.idl
+++ b/offapi/com/sun/star/animations/XAnimateColor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XAnimateColor_idl__
 #define __com_sun_star_animations_XAnimateColor_idl__
 
-#ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
-#endif
 
 //=============================================================================
 
@@ -52,7 +50,7 @@ interface XAnimateColor : XAnimate
 {
     /** defines the color space which is used to perform the interpolation.
         <br>
-        @see <const>AnimateColorSpace</const>
+        @see <const>AnimationColorSpace</const>
     */
     [attribute] short ColorInterpolation;
 
diff --git a/offapi/com/sun/star/animations/XAnimateMotion.idl b/offapi/com/sun/star/animations/XAnimateMotion.idl
index ea9a71a7a469..e50dc934512f 100644
--- a/offapi/com/sun/star/animations/XAnimateMotion.idl
+++ b/offapi/com/sun/star/animations/XAnimateMotion.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XAnimateMotion_idl__
 #define __com_sun_star_animations_XAnimateMotion_idl__
 
-#ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/animations/XAnimateSet.idl b/offapi/com/sun/star/animations/XAnimateSet.idl
index 54782cbf1563..a0a8d05b4e49 100644
--- a/offapi/com/sun/star/animations/XAnimateSet.idl
+++ b/offapi/com/sun/star/animations/XAnimateSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XAnimateSet_idl__
 #define __com_sun_star_animations_XAnimateSet_idl__
 
-#ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
-#endif
 
 //=============================================================================
 
@@ -41,7 +39,7 @@
     This interface provides a simple means of just setting the value of an attribute for
     a specified duration.
 
-    When using XAnimateSet, the following memebers are ignored
+    When using XAnimateSet, the following members are ignored
     <ul>
     <li><member>XAnimate::Values</member></li>
     <li><member>XAnimate::KeyTimes</member></li>
diff --git a/offapi/com/sun/star/animations/XAnimateTransform.idl b/offapi/com/sun/star/animations/XAnimateTransform.idl
index 2bdd61cc8cdb..4791460f0a62 100644
--- a/offapi/com/sun/star/animations/XAnimateTransform.idl
+++ b/offapi/com/sun/star/animations/XAnimateTransform.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XAnimateTransform_idl__
 #define __com_sun_star_animations_XAnimateTransform_idl__
 
-#ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/animations/XAnimationListener.idl b/offapi/com/sun/star/animations/XAnimationListener.idl
index c0582d229f8f..ba00e4db684b 100644
--- a/offapi/com/sun/star/animations/XAnimationListener.idl
+++ b/offapi/com/sun/star/animations/XAnimationListener.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_animations_XAnimationListener_idl__
 #define __com_sun_star_animations_XAnimationListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/animations/XAnimationNode.idl b/offapi/com/sun/star/animations/XAnimationNode.idl
index 218bf7cd748a..a0f3357b2f97 100644
--- a/offapi/com/sun/star/animations/XAnimationNode.idl
+++ b/offapi/com/sun/star/animations/XAnimationNode.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_animations_XAnimationNode_idl__
 #define __com_sun_star_animations_XAnimationNode_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
@@ -51,7 +46,7 @@ published interface XAnimationNode : ::com::sun::star::container::XChild
     */
     [readonly, attribute] short Type;
 
-    /** a sequnece of values that define the begining of this element
+    /** a sequence of values that define the beginning of this element
         <br>
         <member>Begin</member> is
             <ul>
@@ -65,7 +60,7 @@ published interface XAnimationNode : ::com::sun::star::container::XChild
                 external event to the element.</li>
             <li><type>sequence&lt;any&gt;</type> a sequence of values described above if more than
                 one begin value is defined for this element.</li>
-            <li><void/> if no begin behaviour is defined for this element.</li>
+            <li><void/> if no begin behavior is defined for this element.</li>
             </ul>
 
         @see http://www.w3.org/TR/smil20/smil-timing.html#adef-begin
@@ -86,7 +81,7 @@ published interface XAnimationNode : ::com::sun::star::container::XChild
     */
     [attribute] any Duration;
 
-    /** a sequnece of values that define the ending of this element
+    /** a sequence of values that define the ending of this element
         <br>
         <member>End</member> is
             <ul>
@@ -100,7 +95,7 @@ published interface XAnimationNode : ::com::sun::star::container::XChild
                 external event to the element.</li>
             <li><type>sequence&lt;any&gt;</type> a sequence of values described above if more than
                 one begin value is defined for this element.</li>
-            <li><void/> if no end behaviour is defined for this element.</li>
+            <li><void/> if no end behavior is defined for this element.</li>
             </ul>
 
         @see http://www.w3.org/TR/smil20/smil-timing.html#adef-end
@@ -110,12 +105,12 @@ published interface XAnimationNode : ::com::sun::star::container::XChild
     /** controls the implicit duration of time containers,
         as a function of the children.
         <br>
-        The endsync attribute is only valid for
+        The EndSync attribute is only valid for
         par and excl time container elements, and media elements with timed
         children (e.g. animate or area elements).
 
         <member>EndSync</member> is
-            eiter a <atom>short</atom> constant from <const>EndSync</const>,
+            either a <atom>short</atom> constant from <const>EndSync</const>,
             an interface reference to a child <type>XTimeContainer</type>
             or <void/>.
 
@@ -160,7 +155,7 @@ published interface XAnimationNode : ::com::sun::star::container::XChild
     */
     [attribute] any RepeatDuration;
 
-    /** the attribute that specify the behaviour how an element
+    /** the attribute that specify the behavior how an element
         should be extended beyond the active duration by freezing the final
         state of the element.
         <br>
@@ -173,7 +168,7 @@ published interface XAnimationNode : ::com::sun::star::container::XChild
     [attribute] short Fill;
 
     /** the default value for the fill behavior for this element and all
-        descendents.
+        descendants.
         <br>
         <member>FillDefault</member> is
             <ul>
@@ -190,7 +185,7 @@ published interface XAnimationNode : ::com::sun::star::container::XChild
     */
     [attribute] short FillDefault;
 
-    /** defines the restart behaviour of this element.
+    /** defines the restart behavior of this element.
         <br>
         <member>Restart</member> is
             a <atom>short</atom> value from <const>AnimationRestart</const>.
@@ -200,7 +195,7 @@ published interface XAnimationNode : ::com::sun::star::container::XChild
     */
     [attribute] short Restart;
 
-    /** defines the default restart behaviour for this element and all descendents.
+    /** defines the default restart behavior for this element and all descendants.
 
         @returns
             a value from <const>Restart</const>.
diff --git a/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl b/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl
index d7be5b71b05d..d633155829d0 100644
--- a/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl
+++ b/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XAnimationNodeSupplier_idl__
 #define __com_sun_star_animations_XAnimationNodeSupplier_idl__
 
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/animations/XAudio.idl b/offapi/com/sun/star/animations/XAudio.idl
index 9a5c253132da..3098f4ce3454 100644
--- a/offapi/com/sun/star/animations/XAudio.idl
+++ b/offapi/com/sun/star/animations/XAudio.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XAudio_idl__
 #define __com_sun_star_animations_XAudio_idl__
 
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/animations/XCommand.idl b/offapi/com/sun/star/animations/XCommand.idl
index 5a24477ac5b6..83f667b66634 100644
--- a/offapi/com/sun/star/animations/XCommand.idl
+++ b/offapi/com/sun/star/animations/XCommand.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XCommand_idl__
 #define __com_sun_star_animations_XCommand_idl__
 
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
 
 //=============================================================================
 
@@ -37,7 +35,7 @@
 
 //=============================================================================
 
-/** Execution of the XCommand animation node causes the slideshow component
+/** Execution of the XCommand animation node causes the slide show component
     to call back the application to perform the command.
 */
 interface XCommand : XAnimationNode
diff --git a/offapi/com/sun/star/animations/XIterateContainer.idl b/offapi/com/sun/star/animations/XIterateContainer.idl
index f22c5df4f0db..6a75e5babf17 100644
--- a/offapi/com/sun/star/animations/XIterateContainer.idl
+++ b/offapi/com/sun/star/animations/XIterateContainer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XIterateContainer_idl__
 #define __com_sun_star_animations_XIterateContainer_idl__
 
-#ifndef __com_sun_star_animations_XTimeContainer_idl__
 #include <com/sun/star/animations/XTimeContainer.idl>
-#endif
 
 //=============================================================================
 
@@ -45,7 +43,7 @@
 */
 interface XIterateContainer : XTimeContainer
 {
-    /** a target that contains iterateable contents, f.e. a paragraph.
+    /** a target that contains iterable contents, f.e. a paragraph.
         <br>
         See documentation of used animation engine for supported targets.
     */
diff --git a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
index 13d726833b63..016bf2b94d8a 100644
--- a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
+++ b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_animations_XTargetPropertiesCreator_idl__
 #define __com_sun_star_animations_XTargetPropertiesCreator_idl__
 
-#ifndef __com_sun_star_animations_TargetProperties_idl__
 #include <com/sun/star/animations/TargetProperties.idl>
-#endif
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/animations/XTimeContainer.idl b/offapi/com/sun/star/animations/XTimeContainer.idl
index 2fa1681706f7..897af862b10a 100644
--- a/offapi/com/sun/star/animations/XTimeContainer.idl
+++ b/offapi/com/sun/star/animations/XTimeContainer.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_animations_XTimeContainer_idl__
 #define __com_sun_star_animations_XTimeContainer_idl__
 
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/animations/XTransitionFilter.idl b/offapi/com/sun/star/animations/XTransitionFilter.idl
index 1a6eec80f382..651bb4ad7c7a 100644
--- a/offapi/com/sun/star/animations/XTransitionFilter.idl
+++ b/offapi/com/sun/star/animations/XTransitionFilter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_animations_XTransitionFilter_idl__
 #define __com_sun_star_animations_XTransitionFilter_idl__
 
-#ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/auth/AuthenticationFailedException.idl b/offapi/com/sun/star/auth/AuthenticationFailedException.idl
index 6d0abbaa97d1..64afa3aaf03b 100644
--- a/offapi/com/sun/star/auth/AuthenticationFailedException.idl
+++ b/offapi/com/sun/star/auth/AuthenticationFailedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_AuthenticationFailedException_idl__
 #define __com_sun_star_auth_AuthenticationFailedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/InvalidArgumentException.idl b/offapi/com/sun/star/auth/InvalidArgumentException.idl
index 115eab5b6337..28e63a7c42ea 100644
--- a/offapi/com/sun/star/auth/InvalidArgumentException.idl
+++ b/offapi/com/sun/star/auth/InvalidArgumentException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_InvalidArgumentException_idl__
 #define __com_sun_star_auth_InvalidArgumentException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/InvalidContextException.idl b/offapi/com/sun/star/auth/InvalidContextException.idl
index 28e9bba9b0dd..fad19432f408 100644
--- a/offapi/com/sun/star/auth/InvalidContextException.idl
+++ b/offapi/com/sun/star/auth/InvalidContextException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_InvalidContextException_idl__
 #define __com_sun_star_auth_InvalidContextException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/InvalidCredentialException.idl b/offapi/com/sun/star/auth/InvalidCredentialException.idl
index 3caed7fd1dec..b09c79114eaf 100644
--- a/offapi/com/sun/star/auth/InvalidCredentialException.idl
+++ b/offapi/com/sun/star/auth/InvalidCredentialException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_InvalidCredentialException_idl__
 #define __com_sun_star_auth_InvalidCredentialException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/InvalidPrincipalException.idl b/offapi/com/sun/star/auth/InvalidPrincipalException.idl
index 6b98b9b86e47..00f7ea81b1c5 100644
--- a/offapi/com/sun/star/auth/InvalidPrincipalException.idl
+++ b/offapi/com/sun/star/auth/InvalidPrincipalException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_InvalidPrincipalException_idl__
 #define __com_sun_star_auth_InvalidPrincipalException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/PersistenceFailureException.idl b/offapi/com/sun/star/auth/PersistenceFailureException.idl
index 7ef1864327d1..9bf5288c844b 100644
--- a/offapi/com/sun/star/auth/PersistenceFailureException.idl
+++ b/offapi/com/sun/star/auth/PersistenceFailureException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_PersistenceFailureException_idl__
 #define __com_sun_star_auth_PersistenceFailureException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/SSOExceptions.idl b/offapi/com/sun/star/auth/SSOExceptions.idl
index 4e4bbe293ecb..90bfc258844a 100644
--- a/offapi/com/sun/star/auth/SSOExceptions.idl
+++ b/offapi/com/sun/star/auth/SSOExceptions.idl
@@ -28,26 +28,12 @@
 #ifndef __com_sun_star_auth_SSOExceptions_idl__
 #define __com_sun_star_auth_SSOExceptions_idl__
 
-#ifndef __com_sun_star_auth_AuthenticationFailedException_idl__
 #include <com/sun/star/auth/AuthenticationFailedException.idl>
-#endif
-#ifndef __com_sun_star_auth_InvalidArgumentException_idl__
 #include <com/sun/star/auth/InvalidArgumentException.idl>
-#endif
-#ifndef __com_sun_star_auth_InvalidContextException_idl__
 #include <com/sun/star/auth/InvalidContextException.idl>
-#endif
-#ifndef __com_sun_star_auth_InvalidCredentialException_idl__
 #include <com/sun/star/auth/InvalidCredentialException.idl>
-#endif
-#ifndef __com_sun_star_auth_InvalidPrincipalException_idl__
 #include <com/sun/star/auth/InvalidPrincipalException.idl>
-#endif
-#ifndef __com_sun_star_auth_PersistenceFailureException_idl__
 #include <com/sun/star/auth/PersistenceFailureException.idl>
-#endif
-#ifndef __com_sun_star_auth_UnsupportedException_idl__
 #include <com/sun/star/auth/UnsupportedException.idl>
-#endif
 
 #endif
diff --git a/offapi/com/sun/star/auth/SSOManagerFactory.idl b/offapi/com/sun/star/auth/SSOManagerFactory.idl
index f550adca68da..89d3cb2193f7 100644
--- a/offapi/com/sun/star/auth/SSOManagerFactory.idl
+++ b/offapi/com/sun/star/auth/SSOManagerFactory.idl
@@ -28,20 +28,18 @@
 #ifndef __com_sun_star_auth_SSOManagerFactory_idl__
 #define __com_sun_star_auth_SSOManagerFactory_idl__
 
-#ifndef __com_sun_star_auth_XSSOManagerFactory_idl_
 #include <com/sun/star/auth/XSSOManagerFactory.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
-/** represents a starting point for Single Signon interactions.
-    <P>The Single Signon ( SSO ) apis provide UNO based access to underlying
-       SSO implementations ( e.g. Kerberos ). The aim of the SSO apis is to
+/** represents a starting point for Single Sign-on interactions.
+    <P>The Single Sign-on ( SSO ) APIs provide UNO based access to underlying
+       SSO implementations ( e.g. Kerberos ). The aim of the SSO APIs is to
        enable authentication ( possibly mutual ) between a client ( source or
        initiator ) and a network service ( target or acceptor ). This is
        achieved via. the creation and processing of security tokens sent
        between the two parties. The steps which should be followed to
-       successfully use the SSO apis are as follows:
+       successfully use the SSO APIs are as follows:
     <UL>
         <LI>Create an <type>XSSOManagerFactory</type> instance</LI>
         <LI>Use this factory to create/retrieve an <type>XSSOManager</type>
diff --git a/offapi/com/sun/star/auth/SSOPasswordCache.idl b/offapi/com/sun/star/auth/SSOPasswordCache.idl
index 30f959c452ad..3ccee3623550 100644
--- a/offapi/com/sun/star/auth/SSOPasswordCache.idl
+++ b/offapi/com/sun/star/auth/SSOPasswordCache.idl
@@ -28,13 +28,11 @@
 #ifndef __com_sun_star_auth_SSOPasswordCache_idl__
 #define __com_sun_star_auth_SSOPasswordCache_idl__
 
-#ifndef __com_sun_star_auth_XSSOPasswordCache_idl_
 #include <com/sun/star/auth/XSSOPasswordCache.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
-/** provided as a convenience for simple username/password based Single Signon
+/** provided as a convenience for simple username/password based Single Sign-on
     implementations which don't provide some sort of authentication information
     repository.
 
diff --git a/offapi/com/sun/star/auth/UnsupportedException.idl b/offapi/com/sun/star/auth/UnsupportedException.idl
index a2c14079714d..3e6c30d51adb 100644
--- a/offapi/com/sun/star/auth/UnsupportedException.idl
+++ b/offapi/com/sun/star/auth/UnsupportedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_UnsupportedException_idl__
 #define __com_sun_star_auth_UnsupportedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/XSSOAcceptorContext.idl b/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
index ec50053f054d..8c6a1c4043e3 100644
--- a/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
+++ b/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
@@ -28,19 +28,14 @@
 #ifndef __com_sun_star_auth_XSSOAcceptorContext_idl__
 #define __com_sun_star_auth_XSSOAcceptorContext_idl__
 
-#ifndef __com_sun_star_auth_XSSOContext_idl__
 #include <com/sun/star/auth/XSSOContext.idl>
-#endif
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
 #include <com/sun/star/auth/SSOExceptions.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
 /** represents an acceptor side security context.
-    <P>This context may be used to authenticate a Single Signon initiator based
-       on a security token sent by the intiator and to generate a token to be
+    <P>This context may be used to authenticate a Single Sign-on initiator based
+       on a security token sent by the initiator and to generate a token to be
        sent back to the initiator so that it can authenticate the acceptor.
 
     @since OOo 1.1.2
diff --git a/offapi/com/sun/star/auth/XSSOContext.idl b/offapi/com/sun/star/auth/XSSOContext.idl
index ce47d6cd1a6f..fe42e843c1ca 100644
--- a/offapi/com/sun/star/auth/XSSOContext.idl
+++ b/offapi/com/sun/star/auth/XSSOContext.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_auth_XSSOContext_idl__
 #define __com_sun_star_auth_XSSOContext_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/XSSOInitiatorContext.idl b/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
index 3c40b045d224..3b03ade0578c 100644
--- a/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
+++ b/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
@@ -28,25 +28,20 @@
 #ifndef __com_sun_star_auth_XSSOInitiatorContext_idl__
 #define __com_sun_star_auth_XSSOInitiatorContext_idl__
 
-#ifndef __com_sun_star_auth_XSSOContext_idl__
 #include <com/sun/star/auth/XSSOContext.idl>
-#endif
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
 #include <com/sun/star/auth/SSOExceptions.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
 /** represents an initiator side security context.
-    <P>This context may be used to initialise authetication tokens to send to
+    <P>This context may be used to initialize authentication tokens to send to
     an acceptor and to authenticate any token sent back in response.
 
     @since OOo 1.1.2
  */
 published interface XSSOInitiatorContext : ::com::sun::star::auth::XSSOContext
 {
-    /** initialises an SSO Token to send to the acceptor side and
+    /** initializes an SSO Token to send to the acceptor side and
         authenticates an SSO Token returned by the acceptor if the
         context supports mutual authentication.
         <P>
diff --git a/offapi/com/sun/star/auth/XSSOManager.idl b/offapi/com/sun/star/auth/XSSOManager.idl
index e28b40c50093..8db6933eb24b 100644
--- a/offapi/com/sun/star/auth/XSSOManager.idl
+++ b/offapi/com/sun/star/auth/XSSOManager.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_auth_XSSOManager_idl__
 #define __com_sun_star_auth_XSSOManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_auth_InvalidArgumentException_idl__
 #include <com/sun/star/auth/InvalidArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
 #include <com/sun/star/auth/SSOExceptions.idl>
-#endif
-
-#ifndef __com_sun_star_auth_XSSOAcceptorContext_idl__
 #include <com/sun/star/auth/XSSOAcceptorContext.idl>
-#endif
-
-#ifndef __com_sun_star_auth_XSSOInitiatorContext_idl__
 #include <com/sun/star/auth/XSSOInitiatorContext.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
@@ -76,7 +62,7 @@ published interface XSSOManager : ::com::sun::star::uno::XInterface
         the name of the target/acceptor side principal to which the source
         principal intends to authenticate.
 
-        @paran TargetHost
+        @param TargetHost
         the host name associated with the target principal.
 
         @returns
diff --git a/offapi/com/sun/star/auth/XSSOManagerFactory.idl b/offapi/com/sun/star/auth/XSSOManagerFactory.idl
index 400bc1c075a6..e8746b868ebc 100644
--- a/offapi/com/sun/star/auth/XSSOManagerFactory.idl
+++ b/offapi/com/sun/star/auth/XSSOManagerFactory.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_auth_XSSOManagerFactory_idl__
 #define __com_sun_star_auth_XSSOManagerFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_auth_XSSOManager_idl__
 #include <com/sun/star/auth/XSSOManager.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/auth/XSSOPasswordCache.idl b/offapi/com/sun/star/auth/XSSOPasswordCache.idl
index f06718923dbd..81edf48a9b0d 100644
--- a/offapi/com/sun/star/auth/XSSOPasswordCache.idl
+++ b/offapi/com/sun/star/auth/XSSOPasswordCache.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_auth_XSSOPasswordCache_idl__
 #define __com_sun_star_auth_XSSOPasswordCache_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
 #include <com/sun/star/auth/SSOExceptions.idl>
-#endif
 
 module com { module sun { module star { module auth {
 
diff --git a/offapi/com/sun/star/awt/AccessibleButton.idl b/offapi/com/sun/star/awt/AccessibleButton.idl
index 16e35e2018ec..42a421305055 100644
--- a/offapi/com/sun/star/awt/AccessibleButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleButton.idl
@@ -28,27 +28,13 @@
 #ifndef __com_sun_star_awt_AccessibleButton_idl__
 #define __com_sun_star_awt_AccessibleButton_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleCheckBox.idl b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
index 1781f6543a77..50789d7868d7 100644
--- a/offapi/com/sun/star/awt/AccessibleCheckBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
@@ -28,27 +28,13 @@
 #ifndef __com_sun_star_awt_AccessibleCheckBox_idl__
 #define __com_sun_star_awt_AccessibleCheckBox_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleComboBox.idl b/offapi/com/sun/star/awt/AccessibleComboBox.idl
index 5e492724c10b..afefab3aeab1 100644
--- a/offapi/com/sun/star/awt/AccessibleComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleComboBox.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleComboBox_idl__
 #define __com_sun_star_awt_AccessibleComboBox_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
index 01d8b7cb1c80..cf53bf03e4d6 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleDropDownComboBox_idl__
 #define __com_sun_star_awt_AccessibleDropDownComboBox_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
index 2f3ca4989083..8984a0ad0d16 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleDropDownListBox_idl__
 #define __com_sun_star_awt_AccessibleDropDownListBox_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleEdit.idl b/offapi/com/sun/star/awt/AccessibleEdit.idl
index 720b9204e14e..7b7b888e969b 100644
--- a/offapi/com/sun/star/awt/AccessibleEdit.idl
+++ b/offapi/com/sun/star/awt/AccessibleEdit.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_awt_AccessibleEdit_idl__
 #define __com_sun_star_awt_AccessibleEdit_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
 #include <com/sun/star/accessibility/XAccessibleEditableText.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleFixedText.idl b/offapi/com/sun/star/awt/AccessibleFixedText.idl
index bef95c95bfea..510d4c60c70f 100644
--- a/offapi/com/sun/star/awt/AccessibleFixedText.idl
+++ b/offapi/com/sun/star/awt/AccessibleFixedText.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessibleFixedText_idl__
 #define __com_sun_star_awt_AccessibleFixedText_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
index 20f447fdf592..0aecfb252cfa 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleIconChoiceControl_idl__
 #define __com_sun_star_awt_AccessibleIconChoiceControl_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
@@ -94,7 +92,7 @@ published service AccessibleIconChoiceControl
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::MANAGES_DESCENDANTS</const> is always set. Children are transient.</li>
            <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MULTI_SELECTABLE</const> is set when mutli selection is enabled.</li>
+               >AccessibleStateType::MULTI_SELECTABLE</const> is set when multi selection is enabled.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
index 0b8cf1ef973d..eee2146e3cbb 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleIconChoiceControlEntry_idl__
 #define __com_sun_star_awt_AccessibleIconChoiceControlEntry_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleList.idl b/offapi/com/sun/star/awt/AccessibleList.idl
index 5e86d6102de1..31d9eded499f 100644
--- a/offapi/com/sun/star/awt/AccessibleList.idl
+++ b/offapi/com/sun/star/awt/AccessibleList.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleList_idl__
 #define __com_sun_star_awt_AccessibleList_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/awt/AccessibleListBox.idl b/offapi/com/sun/star/awt/AccessibleListBox.idl
index 282306d7c70f..0ad23576ed74 100644
--- a/offapi/com/sun/star/awt/AccessibleListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBox.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleListBox_idl__
 #define __com_sun_star_awt_AccessibleListBox_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 module com { module sun { module star { module accessibility {
 
diff --git a/offapi/com/sun/star/awt/AccessibleListBoxList.idl b/offapi/com/sun/star/awt/AccessibleListBoxList.idl
index f7bf3e55a4e4..3d2111f6e9ea 100644
--- a/offapi/com/sun/star/awt/AccessibleListBoxList.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBoxList.idl
@@ -28,15 +28,13 @@
 #ifndef __com_sun_star_awt_AccessibleListBoxList_idl__
 #define __com_sun_star_awt_AccessibleListBoxList_idl__
 
-#ifndef __com_sun_star_awt_AccessibleList_idl__
 #include <com/sun/star/awt/AccessibleList.idl>
-#endif
 
 
 module com { module sun { module star { module awt {
 
 /** Accessible list box lists are used by list boxes as container for
-    the list items. In addtion of the simple container functionality of the
+    the list items. In addition of the simple container functionality of the
     <type>AccessibleList</type> service the
     <type scope="com::sun::star::accessibility">XAccessibleSelection</type> interface is supported.
 
diff --git a/offapi/com/sun/star/awt/AccessibleListItem.idl b/offapi/com/sun/star/awt/AccessibleListItem.idl
index 70020f0c2056..134e8ea2878a 100644
--- a/offapi/com/sun/star/awt/AccessibleListItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleListItem.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleListItem_idl__
 #define __com_sun_star_awt_AccessibleListItem_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleMenu.idl b/offapi/com/sun/star/awt/AccessibleMenu.idl
index 440d49543787..777819fdd177 100644
--- a/offapi/com/sun/star/awt/AccessibleMenu.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenu.idl
@@ -28,30 +28,14 @@
 #ifndef __com_sun_star_awt_AccessibleMenu_idl__
 #define __com_sun_star_awt_AccessibleMenu_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
@@ -74,7 +58,7 @@ published service AccessibleMenu
             menu separators, whose accessible context supports the services
             <type>AccessibleMenu</type>, <type>AccessibleMenuItem</type> or
             <type>AccessibleMenuSeparator</type>.</li>
-        <li>Parent: The parent of a menu is a menu bar, a popup menu or
+        <li>Parent: The parent of a menu is a menu bar, a pop-up menu or
             a menu, whose accessible context supports the services
             <type>AccessibleMenuBar</type>, <type>AccessiblePopupMenu</type>
             or <type>AccessibleMenu</type>.</li>
diff --git a/offapi/com/sun/star/awt/AccessibleMenuBar.idl b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
index e001471b9149..b793bbf29ae1 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessibleMenuBar_idl__
 #define __com_sun_star_awt_AccessibleMenuBar_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleMenuItem.idl b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
index 05ad03a88ca3..5423afcbd2c1 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
@@ -28,27 +28,13 @@
 #ifndef __com_sun_star_awt_AccessibleMenuItem_idl__
 #define __com_sun_star_awt_AccessibleMenuItem_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
@@ -69,7 +55,7 @@ published service AccessibleMenuItem
         <li>Description: The description of a menu item is its localized
             help text.</li>
         <li>Children: There are no children.</li>
-        <li>Parent: The parent of a menu item is a menu bar, a popup menu or
+        <li>Parent: The parent of a menu item is a menu bar, a pop-up menu or
             a menu, whose accessible context supports the services
             <type>AccessibleMenuBar</type>, <type>AccessiblePopupMenu</type>
             or <type>AccessibleMenu</type>.</li>
diff --git a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
index 47f3a62124ac..07bbff08db22 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_awt_AccessibleMenuSeparator_idl__
 #define __com_sun_star_awt_AccessibleMenuSeparator_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
@@ -60,7 +52,7 @@ published service AccessibleMenuSeparator
         <li>Description: There is no description.</li>
         <li>Children: There are no children.</li>
         <li>Parent: The parent of a menu separator is a menu bar,
-            a popup menu or a menu, whose accessible context supports the
+            a pop-up menu or a menu, whose accessible context supports the
             services <type>AccessibleMenuBar</type>,
             <type>AccessiblePopupMenu</type> or
             <type>AccessibleMenu</type>.</li>
diff --git a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
index f7d3d2162087..8849166ee32e 100644
--- a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
+++ b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
@@ -28,45 +28,35 @@
 #ifndef __com_sun_star_awt_AccessiblePopupMenu_idl__
 #define __com_sun_star_awt_AccessiblePopupMenu_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
-/** specifies accessibility support for a popup menu.
+/** specifies accessibility support for a pop-up menu.
 
     @since OOo 1.1.2
  */
 published service AccessiblePopupMenu
 {
     /** This interface gives access to the structural information of a
-        popup menu:
+        pop-up menu:
 
         <ul>
-        <li>Role: The role of a popup menu is <const
+        <li>Role: The role of a pop-up menu is <const
             scope="com::sun::star::accessibility"
             >AccessibleRole::POPUP_MENU</const>.</li>
         <li>Name: There is no name.</li>
-        <li>Description: The description of a popup menu is its localized
+        <li>Description: The description of a pop-up menu is its localized
             help text.</li>
-        <li>Children: The children of a popup menu are menus, menu items or
+        <li>Children: The children of a pop-up menu are menus, menu items or
             menu separators, whose accessible context supports the services
             <type>AccessibleMenu</type>, <type>AccessibleMenuItem</type> or
             <type>AccessibleMenuSeparator</type>.</li>
-        <li>Parent: The parent is the window that contains the popup menu.</li>
+        <li>Parent: The parent is the window that contains the pop-up menu.</li>
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
             <ul>
@@ -104,7 +94,7 @@ published service AccessiblePopupMenu
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
 
     /** This interface gives access to the selectable children of a
-        popup menu.
+        pop-up menu.
      */
     interface ::com::sun::star::accessibility::XAccessibleSelection;
 
diff --git a/offapi/com/sun/star/awt/AccessibleRadioButton.idl b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
index 94744ecc5301..cf1034606cb4 100644
--- a/offapi/com/sun/star/awt/AccessibleRadioButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
@@ -28,27 +28,13 @@
 #ifndef __com_sun_star_awt_AccessibleRadioButton_idl__
 #define __com_sun_star_awt_AccessibleRadioButton_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleScrollBar.idl b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
index d3337c737563..2ad2523e23eb 100644
--- a/offapi/com/sun/star/awt/AccessibleScrollBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_awt_AccessibleScrollBar_idl__
 #define __com_sun_star_awt_AccessibleScrollBar_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBar.idl b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
index b3618150235e..270246a3b256 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_awt_AccessibleStatusBar_idl__
 #define __com_sun_star_awt_AccessibleStatusBar_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
index ceea05097428..e9b1258c9308 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessibleStatusBarItem_idl__
 #define __com_sun_star_awt_AccessibleStatusBarItem_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleTabBar.idl b/offapi/com/sun/star/awt/AccessibleTabBar.idl
index 4e2bdceadb1c..5515178a9e7a 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBar.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_awt_AccessibleTabBar_idl__
 #define __com_sun_star_awt_AccessibleTabBar_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
index 3937066b6897..aa4bd88f1041 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_awt_AccessibleTabBarPage_idl__
 #define __com_sun_star_awt_AccessibleTabBarPage_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
index 80bceb661f9c..fbd1017d3612 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessibleTabBarPageList_idl__
 #define __com_sun_star_awt_AccessibleTabBarPageList_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleTabControl.idl b/offapi/com/sun/star/awt/AccessibleTabControl.idl
index 09b1f6b91efa..7d1e6c820996 100644
--- a/offapi/com/sun/star/awt/AccessibleTabControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabControl.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessibleTabControl_idl__
 #define __com_sun_star_awt_AccessibleTabControl_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleTabPage.idl b/offapi/com/sun/star/awt/AccessibleTabPage.idl
index 061024b62fc8..62116f3f38a9 100644
--- a/offapi/com/sun/star/awt/AccessibleTabPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabPage.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_awt_AccessibleTabPage_idl__
 #define __com_sun_star_awt_AccessibleTabPage_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/AccessibleTextField.idl b/offapi/com/sun/star/awt/AccessibleTextField.idl
index 65c422e7e604..4a4d4428aa6b 100644
--- a/offapi/com/sun/star/awt/AccessibleTextField.idl
+++ b/offapi/com/sun/star/awt/AccessibleTextField.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_AccessibleTextField_idl__
 #define __com_sun_star_accessibility_AccessibleTextField_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleToolBox.idl b/offapi/com/sun/star/awt/AccessibleToolBox.idl
index b86003badf17..613e7ddfbb10 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBox.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_accessibility_AccessibleToolBox_idl__
 #define __com_sun_star_accessibility_AccessibleToolBox_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
index b2aafcd4be47..3289f6b6dea0 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleToolBoxItem_idl__
 #define __com_sun_star_awt_AccessibleToolBoxItem_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
index f6e521f689e7..38f5c795e785 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleTreeListBox_idl__
 #define __com_sun_star_awt_AccessibleTreeListBox_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
@@ -94,7 +92,7 @@ published service AccessibleTreeListBox
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::VISIBLE</const> is always set.</li>
            <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MULTI_SELECTABLE</const> is set when mutli selection is enabled.</li>
+               >AccessibleStateType::MULTI_SELECTABLE</const> is set when multi selection is enabled.</li>
            </ul>
            </li>
        </ul>
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
index cec5b4d3819d..df418cd1cfe4 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AccessibleTreeListBoxEntry_idl__
 #define __com_sun_star_awt_AccessibleTreeListBoxEntry_idl__
 
-#ifndef __com_sun_star_accessibility_AccessibleContext_idl__
 #include <com/sun/star/accessibility/AccessibleContext.idl>
-#endif
 
 
 module com { module sun { module star { module accessibility {
diff --git a/offapi/com/sun/star/awt/AccessibleWindow.idl b/offapi/com/sun/star/awt/AccessibleWindow.idl
index 59ae5bf25c28..28020aaf033b 100644
--- a/offapi/com/sun/star/awt/AccessibleWindow.idl
+++ b/offapi/com/sun/star/awt/AccessibleWindow.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_awt_AccessibleWindow_idl__
 #define __com_sun_star_awt_AccessibleWindow_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/ActionEvent.idl b/offapi/com/sun/star/awt/ActionEvent.idl
index 29cf1ab2e65b..30bcf8a3db8b 100644
--- a/offapi/com/sun/star/awt/ActionEvent.idl
+++ b/offapi/com/sun/star/awt/ActionEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_ActionEvent_idl__
 #define __com_sun_star_awt_ActionEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/AdjustmentEvent.idl b/offapi/com/sun/star/awt/AdjustmentEvent.idl
index e2835a239529..6ee16453d68c 100644
--- a/offapi/com/sun/star/awt/AdjustmentEvent.idl
+++ b/offapi/com/sun/star/awt/AdjustmentEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_AdjustmentEvent_idl__
 #define __com_sun_star_awt_AdjustmentEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_awt_AdjustmentType_idl__
 #include <com/sun/star/awt/AdjustmentType.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/AnimatedImagesControl.idl b/offapi/com/sun/star/awt/AnimatedImagesControl.idl
index 90f8b3a356e8..90f8b3a356e8 100755..100644
--- a/offapi/com/sun/star/awt/AnimatedImagesControl.idl
+++ b/offapi/com/sun/star/awt/AnimatedImagesControl.idl
diff --git a/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl b/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl
index 5d8aecdc07d8..5d8aecdc07d8 100755..100644
--- a/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl
+++ b/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl
diff --git a/offapi/com/sun/star/awt/AsyncCallback.idl b/offapi/com/sun/star/awt/AsyncCallback.idl
index 4d7c3048ba1a..d5d0c763e25e 100644
--- a/offapi/com/sun/star/awt/AsyncCallback.idl
+++ b/offapi/com/sun/star/awt/AsyncCallback.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_AsyncCallback_idl__
 #define __com_sun_star_awt_AsyncCallback_idl__
 
-#ifndef __com_sun_star_awt_XRequestCallback_idl__
 #include <com/sun/star/awt/XRequestCallback.idl>
-#endif
 
 module com { module sun { module star { module awt {
 
diff --git a/offapi/com/sun/star/awt/Command.idl b/offapi/com/sun/star/awt/Command.idl
index cce6ed126092..5a38e8972ea6 100644
--- a/offapi/com/sun/star/awt/Command.idl
+++ b/offapi/com/sun/star/awt/Command.idl
@@ -58,7 +58,7 @@ published constants Command
 
     //-------------------------------------------------------------------------
 
-    /** specifies the begining of an auto scroll operation.
+    /** specifies the beginning of an auto scroll operation.
     */
     const short STARTAUTOSCROLL = 4;
 
@@ -118,7 +118,7 @@ published constants Command
 
     //-------------------------------------------------------------------------
 
-    /** specifies a hangual hanja conversion command.
+    /** specifies a Hangul hanja conversion command.
     */
     const short HANGUL_HANJA_CONVERSION = 14;
 
diff --git a/offapi/com/sun/star/awt/ContainerWindowProvider.idl b/offapi/com/sun/star/awt/ContainerWindowProvider.idl
index f19d08a8e1bd..ff41a302c075 100644
--- a/offapi/com/sun/star/awt/ContainerWindowProvider.idl
+++ b/offapi/com/sun/star/awt/ContainerWindowProvider.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_awt_ContainerWindowProvider_idl__
 #define __com_sun_star_awt_ContainerWindowProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XContainerWindowProvider_idl__
 #include <com/sun/star/awt/XContainerWindowProvider.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/DialogProvider.idl b/offapi/com/sun/star/awt/DialogProvider.idl
index 06768493d680..af1d3cc0e4c6 100644
--- a/offapi/com/sun/star/awt/DialogProvider.idl
+++ b/offapi/com/sun/star/awt/DialogProvider.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_awt_DialogProvider_idl__
 #define __com_sun_star_awt_DialogProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDialogProvider_idl__
 #include <com/sun/star/awt/XDialogProvider.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/DialogProvider2.idl b/offapi/com/sun/star/awt/DialogProvider2.idl
index 8299db6ae7e4..bd81dd89860e 100644
--- a/offapi/com/sun/star/awt/DialogProvider2.idl
+++ b/offapi/com/sun/star/awt/DialogProvider2.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_awt_DialogProvider2_idl__
 #define __com_sun_star_awt_DialogProvider2_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDialogProvider2_idl__
 #include <com/sun/star/awt/XDialogProvider2.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/DockingData.idl b/offapi/com/sun/star/awt/DockingData.idl
index ec470b193063..469e41148156 100644
--- a/offapi/com/sun/star/awt/DockingData.idl
+++ b/offapi/com/sun/star/awt/DockingData.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_DockingData_idl__
 #define __com_sun_star_awt_DockingData_idl__
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/DockingEvent.idl b/offapi/com/sun/star/awt/DockingEvent.idl
index b6182c48ee2e..210e867b28db 100644
--- a/offapi/com/sun/star/awt/DockingEvent.idl
+++ b/offapi/com/sun/star/awt/DockingEvent.idl
@@ -27,16 +27,10 @@
 #ifndef __com_sun_star_awt_DockingEvent_idl__
 #define __com_sun_star_awt_DockingEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/EndDockingEvent.idl b/offapi/com/sun/star/awt/EndDockingEvent.idl
index f1563bd240dd..4099dbc9d2b6 100644
--- a/offapi/com/sun/star/awt/EndDockingEvent.idl
+++ b/offapi/com/sun/star/awt/EndDockingEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_EndDockingEvent_idl__
 #define __com_sun_star_awt_EndDockingEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 //=============================================================================
 
@@ -59,7 +54,7 @@ struct EndDockingEvent: com::sun::star::lang::EventObject
 
     //-------------------------------------------------------------------------
 
-    /** specifies that the docking procedure was cancelled
+    /** specifies that the docking procedure was canceled
      */
     boolean bCancelled;
 
diff --git a/offapi/com/sun/star/awt/EndPopupModeEvent.idl b/offapi/com/sun/star/awt/EndPopupModeEvent.idl
index 637f70c56d05..8ce795183afa 100644
--- a/offapi/com/sun/star/awt/EndPopupModeEvent.idl
+++ b/offapi/com/sun/star/awt/EndPopupModeEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_EndPopupModeEvent_idl__
 #define __com_sun_star_awt_EndPopupModeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 //=============================================================================
 
@@ -41,13 +36,13 @@
 
 //=============================================================================
 
-/** specifies an end popup mode event.
+/** specifies an end pop-up mode event.
  */
 struct EndPopupModeEvent: com::sun::star::lang::EventObject
 {
     //-------------------------------------------------------------------------
 
-    /** specifies how the popup mode was ended
+    /** specifies how the pop-up mode was ended
         <TRUE/> means the window should be teared-off and positioned at FloatingPosition
         <FALSE/> means the window was closed
      */
diff --git a/offapi/com/sun/star/awt/EnhancedMouseEvent.idl b/offapi/com/sun/star/awt/EnhancedMouseEvent.idl
index 99f0ee3c8b01..4eb2a9de1795 100644
--- a/offapi/com/sun/star/awt/EnhancedMouseEvent.idl
+++ b/offapi/com/sun/star/awt/EnhancedMouseEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_EnhancedMouseEvent_idl__
 #define __com_sun_star_awt_EnhancedMouseEvent_idl__
 
-#ifndef __com_sun_star_awt_MouseEvent_idl__
 #include <com/sun/star/awt/MouseEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/FieldUnit.idl b/offapi/com/sun/star/awt/FieldUnit.idl
index b7a775401d4d..14c593b5a107 100644
--- a/offapi/com/sun/star/awt/FieldUnit.idl
+++ b/offapi/com/sun/star/awt/FieldUnit.idl
@@ -35,7 +35,7 @@
 
 /** specifies attributes for the MetricField map units.
 
-    <p><b>IMPORTANT:</b> These constands have to be disjunct with
+    <p><b>IMPORTANT:</b> These constants have to be disjunct with
     constants in <type>util/MeasureUnit</type>.</p>
  */
 constants FieldUnit
diff --git a/offapi/com/sun/star/awt/FocusChangeReason.idl b/offapi/com/sun/star/awt/FocusChangeReason.idl
index 32d4380b79cc..60ce5ae85a4a 100644
--- a/offapi/com/sun/star/awt/FocusChangeReason.idl
+++ b/offapi/com/sun/star/awt/FocusChangeReason.idl
@@ -47,7 +47,7 @@ published constants FocusChangeReason
 
     //-------------------------------------------------------------------------
 
-    /** Focus changed because KeyLeft/Right/Up/Down was pressed.
+    /** Focus changed because Key Left/Right/Up/Down was pressed.
      */
     const long CURSOR = 2;
 
diff --git a/offapi/com/sun/star/awt/FocusEvent.idl b/offapi/com/sun/star/awt/FocusEvent.idl
index 09ba8697e885..1f803a2d2cb6 100644
--- a/offapi/com/sun/star/awt/FocusEvent.idl
+++ b/offapi/com/sun/star/awt/FocusEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_FocusEvent_idl__
 #define __com_sun_star_awt_FocusEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -62,7 +58,7 @@ published struct FocusEvent: com::sun::star::lang::EventObject
 {
     //-------------------------------------------------------------------------
 
-    /** specifies the reason for the focus change as an arithmentic-or
+    /** specifies the reason for the focus change as an arithmetic-or
         combination of <type>FocusChangeReason</type>.
 
         @see FocusChangeReason
diff --git a/offapi/com/sun/star/awt/FontDescriptor.idl b/offapi/com/sun/star/awt/FontDescriptor.idl
index 54107d6466d4..5133acd918f1 100644
--- a/offapi/com/sun/star/awt/FontDescriptor.idl
+++ b/offapi/com/sun/star/awt/FontDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_FontDescriptor_idl__
 #define __com_sun_star_awt_FontDescriptor_idl__
 
-#ifndef __com_sun_star_awt_FontSlant_idl__
 #include <com/sun/star/awt/FontSlant.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/FontFamily.idl b/offapi/com/sun/star/awt/FontFamily.idl
index 6b375c002d52..2f16e8fe08a7 100644
--- a/offapi/com/sun/star/awt/FontFamily.idl
+++ b/offapi/com/sun/star/awt/FontFamily.idl
@@ -60,7 +60,7 @@ published constants FontFamily
 
     //-------------------------------------------------------------------------
 
-    /** specifies the family roman fonts (with serifes).
+    /** specifies the family roman fonts (with serifs).
      */
     const short ROMAN = 3;
 
@@ -72,7 +72,7 @@ published constants FontFamily
 
     //-------------------------------------------------------------------------
 
-    /** specifies the family roman fonts (without serifes).
+    /** specifies the family roman fonts (without serifs).
      */
     const short SWISS = 5;
 
diff --git a/offapi/com/sun/star/awt/Gradient.idl b/offapi/com/sun/star/awt/Gradient.idl
index 9774bc655d2a..71ccea76924c 100644
--- a/offapi/com/sun/star/awt/Gradient.idl
+++ b/offapi/com/sun/star/awt/Gradient.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_Gradient_idl__
 #define __com_sun_star_awt_Gradient_idl__
 
-#ifndef __com_sun_star_awt_GradientStyle_idl__
 #include <com/sun/star/awt/GradientStyle.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/ImageScaleMode.idl b/offapi/com/sun/star/awt/ImageScaleMode.idl
index 9494bef96814..aeefc4f61c91 100644
--- a/offapi/com/sun/star/awt/ImageScaleMode.idl
+++ b/offapi/com/sun/star/awt/ImageScaleMode.idl
@@ -41,12 +41,12 @@ constants ImageScaleMode
     */
     const short None = 0;
 
-    /** specifies that the image should be scaled up or down to the size of the surrounding area isotropicly,
+    /** specifies that the image should be scaled up or down to the size of the surrounding area isotropically,
         i.e. by keeping its aspect ratio.
     */
     const short Isotropic = 1;
 
-    /** specifies that the image should be scaled up or down to the size of the surrounding area anisotropicly.
+    /** specifies that the image should be scaled up or down to the size of the surrounding area anisotropically.
 
         <p>The image will finally cover all of the surrounding area, but its dimensions might be distorted.</p>
     */
diff --git a/offapi/com/sun/star/awt/InputEvent.idl b/offapi/com/sun/star/awt/InputEvent.idl
index 478dc622fcb2..a33efc6e2d96 100644
--- a/offapi/com/sun/star/awt/InputEvent.idl
+++ b/offapi/com/sun/star/awt/InputEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_InputEvent_idl__
 #define __com_sun_star_awt_InputEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/ItemEvent.idl b/offapi/com/sun/star/awt/ItemEvent.idl
index 3b5a07765d81..8bfd9dfbe114 100644
--- a/offapi/com/sun/star/awt/ItemEvent.idl
+++ b/offapi/com/sun/star/awt/ItemEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_ItemEvent_idl__
 #define __com_sun_star_awt_ItemEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/Key.idl b/offapi/com/sun/star/awt/Key.idl
index 5987bc3fbbed..e8b8962444d5 100644
--- a/offapi/com/sun/star/awt/Key.idl
+++ b/offapi/com/sun/star/awt/Key.idl
@@ -448,6 +448,18 @@ published constants Key
 
     //-------------------------------------------------------------------------
 
+    const short CAPSLOCK = 1312;
+
+    //-------------------------------------------------------------------------
+
+    const short NUMLOCK = 1313;
+
+    //-------------------------------------------------------------------------
+
+    const short SCROLLLOCK = 1314;
+
+    //-------------------------------------------------------------------------
+
     const short DELETE_TO_BEGIN_OF_LINE = 1536;
 
     //-------------------------------------------------------------------------
@@ -460,6 +472,18 @@ published constants Key
 
     //-------------------------------------------------------------------------
 
+    const short BRACKETLEFT = 1315;
+
+    //-------------------------------------------------------------------------
+
+    const short BRACKETRIGHT = 1316;
+
+    //-------------------------------------------------------------------------
+
+    const short SEMICOLON = 1317;
+
+    //-------------------------------------------------------------------------
+
     const short DELETE_TO_END_OF_PARAGRAPH = 1539;
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/awt/KeyEvent.idl b/offapi/com/sun/star/awt/KeyEvent.idl
index 6d185b9ba26e..607215c85859 100644
--- a/offapi/com/sun/star/awt/KeyEvent.idl
+++ b/offapi/com/sun/star/awt/KeyEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_KeyEvent_idl__
 #define __com_sun_star_awt_KeyEvent_idl__
 
-#ifndef __com_sun_star_awt_InputEvent_idl__
 #include <com/sun/star/awt/InputEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/KeyModifier.idl b/offapi/com/sun/star/awt/KeyModifier.idl
index 89b79a928db3..e5639f24a43d 100644
--- a/offapi/com/sun/star/awt/KeyModifier.idl
+++ b/offapi/com/sun/star/awt/KeyModifier.idl
@@ -46,17 +46,17 @@ published constants KeyModifier
 
     //-------------------------------------------------------------------------
 
-    /** refers in the most cases to the 'Ctrl' key (Cmd on Mac OS X).
+    /** refers in the most cases to the "Ctrl" key (Cmd on Mac OS X).
      */
     const short MOD1 = 2;
 
     //-------------------------------------------------------------------------
 
-    /** refers in the most cases to the 'Alt' key.
+    /** refers in the most cases to the "Alt" key.
      */
     const short MOD2 = 4;
 
-    /** refers in the most cases to the 'Ctrl' key (Mac OS X)
+    /** refers in the most cases to the "Ctrl" key (Mac OS X)
          */
     const short MOD3 = 8;
 };
diff --git a/offapi/com/sun/star/awt/MaxChildrenException.idl b/offapi/com/sun/star/awt/MaxChildrenException.idl
index a73ddb2f5233..54bedbfb27a1 100644
--- a/offapi/com/sun/star/awt/MaxChildrenException.idl
+++ b/offapi/com/sun/star/awt/MaxChildrenException.idl
@@ -1,9 +1,7 @@
 #ifndef __com_sun_star_awt_MaxChildrenException_idl__
 #define __com_sun_star_awt_MaxChildrenException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/MenuBar.idl b/offapi/com/sun/star/awt/MenuBar.idl
index 4f95cd74f9bc..8a241cc372c4 100644
--- a/offapi/com/sun/star/awt/MenuBar.idl
+++ b/offapi/com/sun/star/awt/MenuBar.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_MenuBar_idl__
 #define __com_sun_star_awt_MenuBar_idl__
 
-#ifndef __com_sun_star_awt_XMenuBar_idl__
 #include <com/sun/star/awt/XMenuBar.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/MenuEvent.idl b/offapi/com/sun/star/awt/MenuEvent.idl
index 48f326f5f7cc..fd8a17115d1a 100644
--- a/offapi/com/sun/star/awt/MenuEvent.idl
+++ b/offapi/com/sun/star/awt/MenuEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_MenuEvent_idl__
 #define __com_sun_star_awt_MenuEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/MenuItemStyle.idl b/offapi/com/sun/star/awt/MenuItemStyle.idl
index f4a4edf40304..6e0ce79a7cfa 100644
--- a/offapi/com/sun/star/awt/MenuItemStyle.idl
+++ b/offapi/com/sun/star/awt/MenuItemStyle.idl
@@ -48,7 +48,7 @@ published constants MenuItemStyle
 
     //-------------------------------------------------------------------------
 
-    /** specifies an item which can be checked dependent on the neighbouring
+    /** specifies an item which can be checked dependent on the neighboring
         items.
      */
     const short RADIOCHECK = 2;
diff --git a/offapi/com/sun/star/awt/MenuItemType.idl b/offapi/com/sun/star/awt/MenuItemType.idl
index 426563b2eb56..8f4606aa14cc 100644
--- a/offapi/com/sun/star/awt/MenuItemType.idl
+++ b/offapi/com/sun/star/awt/MenuItemType.idl
@@ -39,7 +39,7 @@
  */
 published enum MenuItemType
 {
-    /** specifies that the menu item type is unkown.
+    /** specifies that the menu item type is unknown.
     */
     DONTKNOW,
 
diff --git a/offapi/com/sun/star/awt/MenuLogo.idl b/offapi/com/sun/star/awt/MenuLogo.idl
index 4e558a5364c3..b0a4ad39b1f2 100755..100644
--- a/offapi/com/sun/star/awt/MenuLogo.idl
+++ b/offapi/com/sun/star/awt/MenuLogo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_MenuLogo_idl__
 #define __com_sun_star_awt_MenuLogo_idl__
 
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-
-#ifndef __com_sun_star_util_color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/MouseEvent.idl b/offapi/com/sun/star/awt/MouseEvent.idl
index 02f7ec08bceb..17574db373d4 100644
--- a/offapi/com/sun/star/awt/MouseEvent.idl
+++ b/offapi/com/sun/star/awt/MouseEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_MouseEvent_idl__
 #define __com_sun_star_awt_MouseEvent_idl__
 
-#ifndef __com_sun_star_awt_InputEvent_idl__
 #include <com/sun/star/awt/InputEvent.idl>
-#endif
 
 
 //=============================================================================
@@ -40,7 +38,7 @@
 
 /** specifies an event from the mouse.
 
-    <p>This event is also used for popup menu requests on objects.
+    <p>This event is also used for pop-up menu requests on objects.
     See <member>PopupTrigger</member> for details.</p>
 
     @see XMouseListener
@@ -78,9 +76,9 @@ published struct MouseEvent: com::sun::star::awt::InputEvent
 
     //-------------------------------------------------------------------------
 
-    /** specifies if this event is a popup-menu trigger event.
+    /** specifies if this event is a pop-up menu trigger event.
 
-        <p>If this member is <TRUE/>, the event describes a request for a popup menu,
+        <p>If this member is <TRUE/>, the event describes a request for a pop-up menu,
         also known as context menu, on an object.</p>
 
         <p>In this case, <member>X</member> and <member>Y</member> describe the position
diff --git a/offapi/com/sun/star/awt/MouseWheelBehavior.idl b/offapi/com/sun/star/awt/MouseWheelBehavior.idl
index 94efb8abc160..94efb8abc160 100755..100644
--- a/offapi/com/sun/star/awt/MouseWheelBehavior.idl
+++ b/offapi/com/sun/star/awt/MouseWheelBehavior.idl
diff --git a/offapi/com/sun/star/awt/PaintEvent.idl b/offapi/com/sun/star/awt/PaintEvent.idl
index f3ba266b3a0a..b3477b076ce1 100644
--- a/offapi/com/sun/star/awt/PaintEvent.idl
+++ b/offapi/com/sun/star/awt/PaintEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_PaintEvent_idl__
 #define __com_sun_star_awt_PaintEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/PopupMenu.idl b/offapi/com/sun/star/awt/PopupMenu.idl
index e8a5f913c2cb..9a4f81cc40e4 100644
--- a/offapi/com/sun/star/awt/PopupMenu.idl
+++ b/offapi/com/sun/star/awt/PopupMenu.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_PopupMenu_idl__
 #define __com_sun_star_awt_PopupMenu_idl__
 
-#ifndef __com_sun_star_awt_XPopupMenu_idl__
 #include <com/sun/star/awt/XPopupMenu.idl>
-#endif
 
 //=============================================================================
 
@@ -37,10 +35,10 @@ module com {  module sun {  module star {  module awt {
 
 //=============================================================================
 
-/** describes a popup menu which is a recursive container for commands
+/** describes a pop-up menu which is a recursive container for commands
 
-    <p>A popup menu can be used as a standalone object to display a context
-       menu. It's also possible to use a popup menu to integrate it into
+    <p>A pop-up menu can be used as a standalone object to display a context
+       menu. It's also possible to use a pop-up menu to integrate it into
        another menu.</p>
  */
 published service PopupMenu
diff --git a/offapi/com/sun/star/awt/PopupMenuDirection.idl b/offapi/com/sun/star/awt/PopupMenuDirection.idl
index 0e676d3e91fe..3e2a87a55995 100644
--- a/offapi/com/sun/star/awt/PopupMenuDirection.idl
+++ b/offapi/com/sun/star/awt/PopupMenuDirection.idl
@@ -35,7 +35,7 @@
 //=============================================================================
 
 /** These values are used to specify the direction in which
-    a popup menu will grow.
+    a pop-up menu will grow.
 
     <p>They may be expanded in future versions.</p>
  */
diff --git a/offapi/com/sun/star/awt/PrinterException.idl b/offapi/com/sun/star/awt/PrinterException.idl
index 805b52e86b98..9493780b41c0 100644
--- a/offapi/com/sun/star/awt/PrinterException.idl
+++ b/offapi/com/sun/star/awt/PrinterException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_PrinterException_idl__
 #define __com_sun_star_awt_PrinterException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/RoadmapItem.idl b/offapi/com/sun/star/awt/RoadmapItem.idl
index 7fa197bc391a..69f386641ab3 100644
--- a/offapi/com/sun/star/awt/RoadmapItem.idl
+++ b/offapi/com/sun/star/awt/RoadmapItem.idl
@@ -48,8 +48,8 @@ service RoadmapItem
     */
      [property] short ID;
 
-    /** The Label of the RoadmapItem does not include its Prefix that is auto
-     * matically set after the following algorithm:
+    /** The Label of the RoadmapItem does not include its Prefix that is automatically
+     * set after the following algorithm:
      * (Index + 1) + ". " + Label
      */
     [property] string Label;
@@ -57,9 +57,9 @@ service RoadmapItem
 
     /** When "Interactive" is true the RoadmapItem supports a certain "HyperLabel
      *  functionality":
-     *  Moving the Mousepointer over the RoadmapItem will change it to a Refhand and
-     *  underline the Label for the time the mousepointer resides over the RoadmapItem.
-     *  Clicking the mousepointer will then notify the Roadmap Container.
+     *  Moving the mouse pointer over the RoadmapItem will change it to a Refhand and
+     *  underline the Label for the time the mouse pointer resides over the RoadmapItem.
+     *  Clicking with mouse pointer will then notify the Roadmap Container.
      *  The property Interactive" is readonly because it is adapted from the container of the
      *  RoadmapItem.
      */
diff --git a/offapi/com/sun/star/awt/SimpleFontMetric.idl b/offapi/com/sun/star/awt/SimpleFontMetric.idl
index 51c44ad67b4d..1862120a85da 100644
--- a/offapi/com/sun/star/awt/SimpleFontMetric.idl
+++ b/offapi/com/sun/star/awt/SimpleFontMetric.idl
@@ -41,7 +41,7 @@ published struct SimpleFontMetric
     /** specifies the portion of a lower case character that
         rises above the height of the character "x" of the font.
 
-        <p>For example, the letters 'b', 'd', 'h', 'k' and 'l'
+        <p>For example, the letters "b", "d", "h", "k" and "l"
         have an ascent unequal to 0.</p>
 
         <p>The ascent is measured in pixels, thus the font metric is
@@ -53,7 +53,7 @@ published struct SimpleFontMetric
 
     /** specifies the portion of a letter falling below the baseline.
 
-        <p>For example, the letters 'g', 'p', and 'y'
+        <p>For example, the letters "g", "p", and "y"
         have a descent unequal to 0.</p>
 
         <p>The descent is measured in pixels, thus the font metric is
@@ -64,7 +64,7 @@ published struct SimpleFontMetric
     //-------------------------------------------------------------------------
 
     /** specifies the vertical space between lines of this font;
-        it is also called internal linespacing.
+        it is also called internal line spacing.
 
         <p>The leading is measured in pixels, thus the font metric is
         device dependent.</p>
diff --git a/offapi/com/sun/star/awt/SpinEvent.idl b/offapi/com/sun/star/awt/SpinEvent.idl
index bcba2b554aad..de3aa7c7ad29 100644
--- a/offapi/com/sun/star/awt/SpinEvent.idl
+++ b/offapi/com/sun/star/awt/SpinEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_SpinEvent_idl__
 #define __com_sun_star_awt_SpinEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/SpinningProgressControlModel.idl b/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
index c6c273bce26d..c6c273bce26d 100755..100644
--- a/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
+++ b/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
diff --git a/offapi/com/sun/star/awt/SystemPointer.idl b/offapi/com/sun/star/awt/SystemPointer.idl
index c32397abe986..031e132d72d1 100644
--- a/offapi/com/sun/star/awt/SystemPointer.idl
+++ b/offapi/com/sun/star/awt/SystemPointer.idl
@@ -52,7 +52,7 @@ published constants SystemPointer
 
     //-------------------------------------------------------------------------
 
-    /** specifies a waiting symbol as a mouse pointer (for example hourglas).
+    /** specifies a waiting symbol as a mouse pointer (for example hourglass).
      */
     const long WAIT = 2;
 
@@ -64,7 +64,7 @@ published constants SystemPointer
 
     //-------------------------------------------------------------------------
 
-    /** specifies a mouse pointer for online help.
+    /** specifies a mouse pointer for on-line help.
      */
     const long HELP = 4;
 
@@ -191,7 +191,7 @@ published constants SystemPointer
 
     //-------------------------------------------------------------------------
 
-    /** specifies a mouse pointer which symbolizes horzizontal splitting.
+    /** specifies a mouse pointer which symbolizes horizontal splitting.
      */
     const long HSPLIT = 23;
 
@@ -287,7 +287,7 @@ published constants SystemPointer
 
     //-------------------------------------------------------------------------
 
-    /** specifies a mouse pointer which symbolizes moving a bezier weight.
+    /** specifies a mouse pointer which symbolizes moving a Bezier weight.
      */
     const long MOVEBEZIERWEIGHT = 39;
 
@@ -389,7 +389,7 @@ published constants SystemPointer
 
     //-------------------------------------------------------------------------
 
-    /** specifies a mouse pointer which symbolizes drawing a bezier.
+    /** specifies a mouse pointer which symbolizes drawing a Bezier.
      */
     const long DRAW_BEZIER = 56;
 
diff --git a/offapi/com/sun/star/awt/TabController.idl b/offapi/com/sun/star/awt/TabController.idl
index 7b9ded82d233..42578cec7dfc 100644
--- a/offapi/com/sun/star/awt/TabController.idl
+++ b/offapi/com/sun/star/awt/TabController.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_TabController_idl__
 #define __com_sun_star_awt_TabController_idl__
 
-#ifndef __com_sun_star_awt_XTabController_idl__
 #include <com/sun/star/awt/XTabController.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/TabControllerModel.idl b/offapi/com/sun/star/awt/TabControllerModel.idl
index c85e6336c6f9..e63d054e2a34 100644
--- a/offapi/com/sun/star/awt/TabControllerModel.idl
+++ b/offapi/com/sun/star/awt/TabControllerModel.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_TabControllerModel_idl__
 #define __com_sun_star_awt_TabControllerModel_idl__
 
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
 #include <com/sun/star/awt/XTabControllerModel.idl>
-#endif
-
-#ifndef __com_sun_star_io_XPersistObject_idl__
 #include <com/sun/star/io/XPersistObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/TextEvent.idl b/offapi/com/sun/star/awt/TextEvent.idl
index 537fa2d1016b..d4624ac2a302 100644
--- a/offapi/com/sun/star/awt/TextEvent.idl
+++ b/offapi/com/sun/star/awt/TextEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_TextEvent_idl__
 #define __com_sun_star_awt_TextEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/Toolkit.idl b/offapi/com/sun/star/awt/Toolkit.idl
index a065776a535b..c97a096a4a2b 100644
--- a/offapi/com/sun/star/awt/Toolkit.idl
+++ b/offapi/com/sun/star/awt/Toolkit.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_Toolkit_idl__
 #define __com_sun_star_awt_Toolkit_idl__
 
-#ifndef __com_sun_star_awt_XToolkit_idl__
 #include <com/sun/star/awt/XToolkit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDataTransferProviderAccess_idl__
 #include <com/sun/star/awt/XDataTransferProviderAccess.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSystemChildFactory_idl__
 #include <com/sun/star/awt/XSystemChildFactory.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMessageBoxFactory_idl__
 #include <com/sun/star/awt/XMessageBoxFactory.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControl.idl b/offapi/com/sun/star/awt/UnoControl.idl
index 38acae5635e3..0abc21ccde01 100644
--- a/offapi/com/sun/star/awt/UnoControl.idl
+++ b/offapi/com/sun/star/awt/UnoControl.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControl_idl__
 #define __com_sun_star_awt_UnoControl_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControl_idl__
 #include <com/sun/star/awt/XControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XView_idl__
 #include <com/sun/star/awt/XView.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlButton.idl b/offapi/com/sun/star/awt/UnoControlButton.idl
index 96e2ac272e57..83837a71129a 100644
--- a/offapi/com/sun/star/awt/UnoControlButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlButton.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_UnoButtonControl_idl__
 #define __com_sun_star_awt_UnoButtonControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XButton_idl__
 #include <com/sun/star/awt/XButton.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
 #include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlButtonModel.idl b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
index 8b1b7bee2052..2ddec93c4c99 100644
--- a/offapi/com/sun/star/awt/UnoControlButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControlButtonModel_idl__
 #define __com_sun_star_awt_UnoControlButtonModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
@@ -201,7 +191,7 @@ published service UnoControlButtonModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies whether the control should show repeating behaviour.
+    /** specifies whether the control should show repeating behavior.
 
         <p>Normally, when you click a button with the mouse, you need to
         release the mouse button, and press it again. With this property
diff --git a/offapi/com/sun/star/awt/UnoControlCheckBox.idl b/offapi/com/sun/star/awt/UnoControlCheckBox.idl
index f9f286e5b8fb..669550451af5 100644
--- a/offapi/com/sun/star/awt/UnoControlCheckBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlCheckBox.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_UnoCheckBoxControl_idl__
 #define __com_sun_star_awt_UnoCheckBoxControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XCheckBox_idl__
 #include <com/sun/star/awt/XCheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
 #include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
index e6eb9754175d..b94ed361c7db 100644
--- a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControlCheckBoxModel_idl__
 #define __com_sun_star_awt_UnoControlCheckBoxModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/UnoControlComboBox.idl b/offapi/com/sun/star/awt/UnoControlComboBox.idl
index 0392f571cd33..6867c95d9b76 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBox.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_UnoComboBoxControl_idl__
 #define __com_sun_star_awt_UnoComboBoxControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
 #include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XComboBox_idl__
 #include <com/sun/star/awt/XComboBox.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
index c332d19c989a..c09ed83a2cdc 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__
 #define __com_sun_star_awt_UnoControlComboBoxModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 #include <com/sun/star/awt/XItemList.idl>
 
@@ -221,13 +214,13 @@ published service UnoControlComboBoxModel
 
     /** defines how the mouse wheel can be used to scroll through the control's content.
 
-        <p>Usually, the mouse wheel scrool through the control's entry list. Using this property,
+        <p>Usually, the mouse wheel scroll through the control's entry list. Using this property,
         and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances
         this is possible.</p>
     */
     [optional, property] short MouseWheelBehavior;
 
-    /** allows mmanipulating the list of items in the combo box more fine-grained than the
+    /** allows manipulating the list of items in the combo box more fine-grained than the
         <member>StringItemList</member> property.
     */
     [optional] interface XItemList;
diff --git a/offapi/com/sun/star/awt/UnoControlContainer.idl b/offapi/com/sun/star/awt/UnoControlContainer.idl
index 1b63521680a2..2fd6e38cc841 100644
--- a/offapi/com/sun/star/awt/UnoControlContainer.idl
+++ b/offapi/com/sun/star/awt/UnoControlContainer.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_UnoControlContainer_idl__
 #define __com_sun_star_awt_UnoControlContainer_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XUnoControlContainer_idl__
 #include <com/sun/star/awt/XUnoControlContainer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControlContainer_idl__
 #include <com/sun/star/awt/XControlContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlContainerModel.idl b/offapi/com/sun/star/awt/UnoControlContainerModel.idl
index 1fa71bcf1b7c..05f3487e32b1 100644
--- a/offapi/com/sun/star/awt/UnoControlContainerModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlContainerModel.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlContainerModel_idl__
 #define __com_sun_star_awt_UnoControlContainerModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyField.idl b/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
index 06159fb54ed2..eb2d7a771960 100644
--- a/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
+++ b/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoCurrencyFieldControl_idl__
 #define __com_sun_star_awt_UnoCurrencyFieldControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
 #include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
 #include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XCurrencyField_idl__
 #include <com/sun/star/awt/XCurrencyField.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
index b9ee632dad73..76b3f5e82c09 100644
--- a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__
 #define __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
 
 //=============================================================================
 
@@ -164,7 +155,7 @@ published service UnoControlCurrencyFieldModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies whether the mouse should show repeating behaviour, i.e.
+    /** specifies whether the mouse should show repeating behavior, i.e.
         repeatedly trigger an action when keeping pressed.
 
         @since OOo 2.0
diff --git a/offapi/com/sun/star/awt/UnoControlDateField.idl b/offapi/com/sun/star/awt/UnoControlDateField.idl
index 77f7f677a28e..34eb19dc9f0b 100644
--- a/offapi/com/sun/star/awt/UnoControlDateField.idl
+++ b/offapi/com/sun/star/awt/UnoControlDateField.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoDateFieldControl_idl__
 #define __com_sun_star_awt_UnoDateFieldControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
 #include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
 #include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDateField_idl__
 #include <com/sun/star/awt/XDateField.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
index d134d0fc450c..07f576cc35e6 100644
--- a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__
 #define __com_sun_star_awt_UnoControlDateFieldModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
 
 //=============================================================================
 
@@ -198,7 +189,7 @@ published service UnoControlDateFieldModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies whether the mouse should show repeating behaviour, i.e.
+    /** specifies whether the mouse should show repeating behavior, i.e.
         repeatedly trigger an action when keeping pressed.
 
         @since OOo 2.0
diff --git a/offapi/com/sun/star/awt/UnoControlDialog.idl b/offapi/com/sun/star/awt/UnoControlDialog.idl
index f2f1be2dc49c..e159ba29c95b 100644
--- a/offapi/com/sun/star/awt/UnoControlDialog.idl
+++ b/offapi/com/sun/star/awt/UnoControlDialog.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControlDialog_idl__
 #define __com_sun_star_awt_UnoControlDialog_idl__
 
-#ifndef __com_sun_star_awt_UnoControlContainer_idl__
 #include <com/sun/star/awt/UnoControlContainer.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XTopWindow_idl__
 #include <com/sun/star/awt/XTopWindow.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XDialog2_idl__
 #include <com/sun/star/awt/XDialog2.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlDialogModel.idl b/offapi/com/sun/star/awt/UnoControlDialogModel.idl
index f8970413cdd3..46eb7d6f0c81 100644
--- a/offapi/com/sun/star/awt/UnoControlDialogModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlDialogModel.idl
@@ -27,33 +27,14 @@
 #ifndef __com_sun_star_awt_UnoControlDialogModel_idl__
 #define __com_sun_star_awt_UnoControlDialogModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/UnoControlEdit.idl b/offapi/com/sun/star/awt/UnoControlEdit.idl
index e603aa3ee29b..a688107ebe36 100644
--- a/offapi/com/sun/star/awt/UnoControlEdit.idl
+++ b/offapi/com/sun/star/awt/UnoControlEdit.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlEdit_idl__
 #define __com_sun_star_awt_UnoControlEdit_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XTextComponent_idl__
 #include <com/sun/star/awt/XTextComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
 #include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__
 #include <com/sun/star/awt/XTextLayoutConstrains.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlEditModel.idl b/offapi/com/sun/star/awt/UnoControlEditModel.idl
index dffbae58da48..c6df7615e902 100644
--- a/offapi/com/sun/star/awt/UnoControlEditModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlEditModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlEditModel_idl__
 #define __com_sun_star_awt_UnoControlEditModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
 
 //=============================================================================
 
@@ -69,7 +60,7 @@ published service UnoControlEditModel
 
     //-------------------------------------------------------------------------
 
-    /** If set to true an horizontal scrollbar will be added automaticly
+    /** If set to true an horizontal scrollbar will be added automatically
         when needed.
 
         @since OOo 2.3
@@ -78,7 +69,7 @@ published service UnoControlEditModel
 
     //-------------------------------------------------------------------------
 
-    /** If set to true an vertical scrollbar will be added automaticly
+    /** If set to true an vertical scrollbar will be added automatically
         when needed.
 
         @since OOo 2.3
diff --git a/offapi/com/sun/star/awt/UnoControlFileControl.idl b/offapi/com/sun/star/awt/UnoControlFileControl.idl
index da2eceb5fef5..ffa3d2a50f00 100644
--- a/offapi/com/sun/star/awt/UnoControlFileControl.idl
+++ b/offapi/com/sun/star/awt/UnoControlFileControl.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_UnoFileControl_idl__
 #define __com_sun_star_awt_UnoFileControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
 #include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFileControlModel.idl b/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
index cec080c3fcb2..7a82e4e05024 100644
--- a/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__
 #define __com_sun_star_awt_UnoControlFileControlModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl b/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
index fa0e96885304..de1051bc96f3 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoFixedHyperlinkControl_idl__
 #define __com_sun_star_awt_UnoFixedHyperlinkControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XFixedHyperlink_idl__
 #include <com/sun/star/awt/XFixedHyperlink.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
 #include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl b/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
index e4a6bd3dbd58..e7e200211e3f 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_UnoControlFixedHyperlinkModel_idl__
 #define __com_sun_star_awt_UnoControlFixedHyperlinkModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedLine.idl b/offapi/com/sun/star/awt/UnoControlFixedLine.idl
index 6dd1b1e36e0e..858278ea3c3b 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedLine.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedLine.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_UnoFixedLineControl_idl__
 #define __com_sun_star_awt_UnoFixedLineControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl b/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
index b49b6e94d19a..f6a8ba301906 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlFixedLineModel_idl__
 #define __com_sun_star_awt_UnoControlFixedLineModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedText.idl b/offapi/com/sun/star/awt/UnoControlFixedText.idl
index e4dd759f19d2..40cd90b47e33 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedText.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedText.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_UnoFixedTextControl_idl__
 #define __com_sun_star_awt_UnoFixedTextControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XFixedText_idl__
 #include <com/sun/star/awt/XFixedText.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
 #include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
index 84e8311fbc32..63223af6ce45 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__
 #define __com_sun_star_awt_UnoControlFixedTextModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
@@ -58,7 +47,7 @@ published service UnoControlFixedTextModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies the horiztonal alignment of the text in the control.
+    /** specifies the horizontal alignment of the text in the control.
 
         <pre>
         0: left
diff --git a/offapi/com/sun/star/awt/UnoControlFormattedField.idl b/offapi/com/sun/star/awt/UnoControlFormattedField.idl
index 9d66a3e319a1..b40c5e1c223c 100644
--- a/offapi/com/sun/star/awt/UnoControlFormattedField.idl
+++ b/offapi/com/sun/star/awt/UnoControlFormattedField.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoControlFormattedField_idl__
 #define __com_sun_star_awt_UnoControlFormattedField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
 #include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
 #include <com/sun/star/awt/XSpinField.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
index 0f61b6910b7d..420daa6fb26a 100644
--- a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControlFormattedFieldModel_idl__
 #define __com_sun_star_awt_UnoControlFormattedFieldModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
 
 //=============================================================================
 
@@ -61,7 +47,7 @@ published service UnoControlFormattedFieldModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies the horiztonal alignment of the text in the control.
+    /** specifies the horizontal alignment of the text in the control.
 
         <pre>
         0: left
@@ -223,7 +209,7 @@ published service UnoControlFormattedFieldModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies whether the mouse should show repeating behaviour, i.e.
+    /** specifies whether the mouse should show repeating behavior, i.e.
         repeatedly trigger an action when keeping pressed.
 
         @since OOo 2.0
diff --git a/offapi/com/sun/star/awt/UnoControlGroupBox.idl b/offapi/com/sun/star/awt/UnoControlGroupBox.idl
index cc1aaff14985..ff7026f8f227 100644
--- a/offapi/com/sun/star/awt/UnoControlGroupBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlGroupBox.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_UnoGroupBoxControl_idl__
 #define __com_sun_star_awt_UnoGroupBoxControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl b/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
index c0a5d97afc06..f61e770dd57f 100644
--- a/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__
 #define __com_sun_star_awt_UnoControlGroupBoxModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlImageControl.idl b/offapi/com/sun/star/awt/UnoControlImageControl.idl
index 8b7d3bc9d12b..fbe2f0257ce2 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControl.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControl.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoImageControl_idl__
 #define __com_sun_star_awt_UnoImageControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
 #include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
index 7e6dfa8641be..edb98608be2b 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
 #define __com_sun_star_awt_UnoControlImageControlModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlListBox.idl b/offapi/com/sun/star/awt/UnoControlListBox.idl
index edc34550242e..3c6086a898ed 100644
--- a/offapi/com/sun/star/awt/UnoControlListBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBox.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoListBoxControl_idl__
 #define __com_sun_star_awt_UnoListBoxControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XListBox_idl__
 #include <com/sun/star/awt/XListBox.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
 #include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__
 #include <com/sun/star/awt/XTextLayoutConstrains.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
index 3a9ea516c257..d542eeaea8ab 100644
--- a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__
 #define __com_sun_star_awt_UnoControlListBoxModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
 #include <com/sun/star/awt/XItemList.idl>
 
-
 //=============================================================================
 
  module com {  module sun {  module star {  module awt {
@@ -56,7 +46,7 @@ published service UnoControlListBoxModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies the horiztontal alignment of the text in the control.
+    /** specifies the horizontal alignment of the text in the control.
 
         <pre>
         0: left
@@ -165,7 +155,7 @@ published service UnoControlListBoxModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies the sequence of selected items, identfied by the position.
+    /** specifies the sequence of selected items, identified by the position.
      */
     [property] sequence<short> SelectedItems;
 
@@ -205,13 +195,13 @@ published service UnoControlListBoxModel
 
     /** defines how the mouse wheel can be used to scroll through the control's content.
 
-        <p>Usually, the mouse wheel scrool through the control's entry list. Using this property,
+        <p>Usually, the mouse wheel scroll through the control's entry list. Using this property,
         and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances
         this is possible.</p>
     */
     [optional, property] short MouseWheelBehavior;
 
-    /** allows mmanipulating the list of items in the list box more fine-grained than the
+    /** allows manipulating the list of items in the list box more fine-grained than the
         <member>StringItemList</member> property.
 
         @since OOo 3.3
diff --git a/offapi/com/sun/star/awt/UnoControlModel.idl b/offapi/com/sun/star/awt/UnoControlModel.idl
index 22fba6dce0b2..949191528886 100644
--- a/offapi/com/sun/star/awt/UnoControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlModel.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_awt_UnoControlModel_idl__
 #define __com_sun_star_awt_UnoControlModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlDialogElement_idl__
 #include <com/sun/star/awt/UnoControlDialogElement.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControlModel_idl__
 #include <com/sun/star/awt/XControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_io_XPersistObject_idl__
 #include <com/sun/star/io/XPersistObject.idl>
-#endif
 
-#ifndef __com_sun_star_util_XCloneable_idl__
 #include <com/sun/star/util/XCloneable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlNumericField.idl b/offapi/com/sun/star/awt/UnoControlNumericField.idl
index f09d7739bb98..05c23692f954 100644
--- a/offapi/com/sun/star/awt/UnoControlNumericField.idl
+++ b/offapi/com/sun/star/awt/UnoControlNumericField.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlNumericField_idl__
 #define __com_sun_star_awt_UnoControlNumericField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
 #include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
 #include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XNumericField_idl__
 #include <com/sun/star/awt/XNumericField.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
index 5b019d7f82c5..b8ee00156495 100644
--- a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__
 #define __com_sun_star_awt_UnoControlNumericFieldModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
 
 //=============================================================================
 
@@ -152,7 +143,7 @@ published service UnoControlNumericFieldModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies whether the mouse should show repeating behaviour, i.e.
+    /** specifies whether the mouse should show repeating behavior, i.e.
         repeatedly trigger an action when keeping pressed.
 
         @since OOo 2.0
diff --git a/offapi/com/sun/star/awt/UnoControlPatternField.idl b/offapi/com/sun/star/awt/UnoControlPatternField.idl
index 415265eeb690..a2d41622d320 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternField.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternField.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoPatternFieldControl_idl__
 #define __com_sun_star_awt_UnoPatternFieldControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
 #include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
 #include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XPatternField_idl__
 #include <com/sun/star/awt/XPatternField.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
index 2f9f09fd5b3f..11a9bbbfe85e 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__
 #define __com_sun_star_awt_UnoControlPatternFieldModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/UnoControlProgressBar.idl b/offapi/com/sun/star/awt/UnoControlProgressBar.idl
index 72240452a324..bed87fd0d861 100644
--- a/offapi/com/sun/star/awt/UnoControlProgressBar.idl
+++ b/offapi/com/sun/star/awt/UnoControlProgressBar.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_UnoProgressBarControl_idl__
 #define __com_sun_star_awt_UnoProgressBarControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XProgressBar_idl__
 #include <com/sun/star/awt/XProgressBar.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl b/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
index 3d54d391e3db..a1c3b32a25df 100644
--- a/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlProgressBarModel_idl__
 #define __com_sun_star_awt_UnoControlProgressBarModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlRadioButton.idl b/offapi/com/sun/star/awt/UnoControlRadioButton.idl
index 72c88df107bd..ff05ab488136 100644
--- a/offapi/com/sun/star/awt/UnoControlRadioButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlRadioButton.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_UnoButtonControl_idl__
 #define __com_sun_star_awt_UnoButtonControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XRadioButton_idl__
 #include <com/sun/star/awt/XRadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
 #include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl b/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
index cd8568f956ea..198f4006999a 100644
--- a/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_awt_UnoControlRadioButtonModel_idl__
 #define __com_sun_star_awt_UnoControlRadioButtonModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlRoadmap.idl b/offapi/com/sun/star/awt/UnoControlRoadmap.idl
index f68e1b2cba7e..3fe0fcedfcbe 100644
--- a/offapi/com/sun/star/awt/UnoControlRoadmap.idl
+++ b/offapi/com/sun/star/awt/UnoControlRoadmap.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlRoadmap_idl__
 #define __com_sun_star_awt_UnoControlRoadmap_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XItemEventBroadcaster_idl__
 #include <com/sun/star/awt/XItemEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
 #include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
 
 
 
@@ -68,8 +60,8 @@ service UnoControlRoadmap
 
     /** This interface allows to add an Itemlistener to the roadmap.
         If the property "Interactive" at the com::sun::star::awt::UnoControlRoadmapModel
-        is set to 'true' the listener is triggered each time the user selects a RoadmapItem
-        by Mouseclick or pressing space bar at the currently focussed RoadmapItem.
+        is set to "true" the listener is triggered each time the user selects a RoadmapItem
+        by Mouse click or pressing space bar at the currently focused RoadmapItem.
         The property ItemID of the com::sun::star::awt::ItemEvent:: is assigned
         the value of the property "ID" of the activated RoadmapItem.
      */
diff --git a/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl b/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
index 65f5380c6e1f..772c6ea1006b 100644
--- a/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
@@ -28,18 +28,10 @@
 #define __com_sun_star_awt_UnoControlRoadmapModel_idl__
 
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
 #include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
@@ -58,7 +50,7 @@ service UnoControlRoadmapModel
         held in a sequence.
         When inserting such items their ID is set equal to the Index of their
         insertion by default.
-        After removing items the CurrentItem property is - when beyound the upper sequence
+        After removing items the CurrentItem property is - when beyond the upper sequence
         boundaries - set equal to last index of the RoadmapItem Array.
      */
     interface com::sun::star::container::XIndexContainer;
@@ -139,10 +131,10 @@ service UnoControlRoadmapModel
 
     //-------------------------------------------------------------------------
 
-    /** refers to the  ID of the currently selected item. Initially this property is set to '-1'
-        which is equal to 'undefined"
+    /** refers to the  ID of the currently selected item. Initially this property is set to "-1"
+        which is equal to "undefined"
         If the Roadmap Item that the CurrentItemID refers to is removed the property
-        'CurrentItemID' is set to -1
+        "CurrentItemID" is set to -1
      */
     [property] short CurrentItemID;
 
diff --git a/offapi/com/sun/star/awt/UnoControlScrollBar.idl b/offapi/com/sun/star/awt/UnoControlScrollBar.idl
index 403df8459d46..c4b0003a23a2 100644
--- a/offapi/com/sun/star/awt/UnoControlScrollBar.idl
+++ b/offapi/com/sun/star/awt/UnoControlScrollBar.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoScrollBarControl_idl__
 #define __com_sun_star_awt_UnoScrollBarControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XScrollBar_idl__
 #include <com/sun/star/awt/XScrollBar.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl b/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
index d81e25e369f7..def0b0c61b9f 100644
--- a/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoControlScrollBarModel_idl__
 #define __com_sun_star_awt_UnoControlScrollBarModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
@@ -111,7 +106,7 @@ published service UnoControlScrollBarModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies the scrolling behaviour of the control.
+    /** specifies the scrolling behavior of the control.
 
         <p><TRUE/> means, that when the user moves the slider in the scroll bar,
         the content of the window is updated immediately.
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
index b00ec8740521..7a74aa9746e3 100755..100644
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
+++ b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoControlSimpleAnimation_idl__
 #define __com_sun_star_awt_UnoControlSimpleAnimation_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSimpleAnimation_idl__
 #include <com/sun/star/awt/XSimpleAnimation.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
index 1f96099fee63..3454eb9cf6ed 100755..100644
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_UnoControlSimpleAnimationModel_idl__
 #define __com_sun_star_awt_UnoControlSimpleAnimationModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButton.idl b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
index db8386c4304f..ee2b82db755a 100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoSpinButtonControl_idl__
 #define __com_sun_star_awt_UnoSpinButtonControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinValue_idl__
 #include <com/sun/star/awt/XSpinValue.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
index c2e4eca935e1..b5bb0791fed6 100755..100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoControlSpinButtonModel_idl__
 #define __com_sun_star_awt_UnoControlSpinButtonModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
@@ -150,7 +145,7 @@ service UnoControlSpinButtonModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies whether the mouse should show repeating behaviour, i.e.
+    /** specifies whether the mouse should show repeating behavior, i.e.
         repeatedly trigger an action when keeping pressed.
     */
     [property] boolean Repeat;
diff --git a/offapi/com/sun/star/awt/UnoControlThrobber.idl b/offapi/com/sun/star/awt/UnoControlThrobber.idl
index 85b5d8b850f7..2eb8f780780f 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobber.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobber.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_UnoControlThrobber_idl__
 #define __com_sun_star_awt_UnoControlThrobber_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XThrobber_idl__
 #include <com/sun/star/awt/XThrobber.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
index 060ff105c119..e65a825963d4 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_UnoControlThrobberModel_idl__
 #define __com_sun_star_awt_UnoControlThrobberModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlTimeField.idl b/offapi/com/sun/star/awt/UnoControlTimeField.idl
index 310f0b9b9539..7389b6385e1d 100644
--- a/offapi/com/sun/star/awt/UnoControlTimeField.idl
+++ b/offapi/com/sun/star/awt/UnoControlTimeField.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_UnoTimeFieldControl_idl__
 #define __com_sun_star_awt_UnoTimeFieldControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
 #include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
 #include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTimeField_idl__
 #include <com/sun/star/awt/XTimeField.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
index ba62cca41c7f..d10e34a2534a 100644
--- a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__
 #define __com_sun_star_awt_UnoControlTimeFieldModel_idl__
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
 
 //=============================================================================
 
@@ -145,7 +136,7 @@ published service UnoControlTimeFieldModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies whether the mouse should show repeating behaviour, i.e.
+    /** specifies whether the mouse should show repeating behavior, i.e.
         repeatedly trigger an action when keeping pressed.
 
         @since OOo 2.0
diff --git a/offapi/com/sun/star/awt/VclContainerEvent.idl b/offapi/com/sun/star/awt/VclContainerEvent.idl
index 2f4595e984e9..27c99cc71f7f 100644
--- a/offapi/com/sun/star/awt/VclContainerEvent.idl
+++ b/offapi/com/sun/star/awt/VclContainerEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_VclContainerEvent_idl__
 #define __com_sun_star_awt_VclContainerEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/VclWindowPeerAttribute.idl b/offapi/com/sun/star/awt/VclWindowPeerAttribute.idl
index db26e2811178..10585f52f035 100644
--- a/offapi/com/sun/star/awt/VclWindowPeerAttribute.idl
+++ b/offapi/com/sun/star/awt/VclWindowPeerAttribute.idl
@@ -36,7 +36,7 @@
 
 /** specifies attributes for the VCL window implementation.
 
-    <p><b>IMPORTANT:</b> These constands have to be disjunct with
+    <p><b>IMPORTANT:</b> These constants have to be disjunct with
     constants in <type>WindowAttribute</type>.</p>
 
     @deprecated
diff --git a/offapi/com/sun/star/awt/WindowAttribute.idl b/offapi/com/sun/star/awt/WindowAttribute.idl
index c8e7a29247b1..68f9feb3fd42 100644
--- a/offapi/com/sun/star/awt/WindowAttribute.idl
+++ b/offapi/com/sun/star/awt/WindowAttribute.idl
@@ -36,7 +36,7 @@
 
 /** These values are used to specify the decorations of a window.
 
-    <p><b>IMPORTANT:</b> These constands have to be disjunct with
+    <p><b>IMPORTANT:</b> These constants have to be disjunct with
     constants in <type>VclWindowPeerAttribute</type>.</p>
  */
 published constants WindowAttribute
diff --git a/offapi/com/sun/star/awt/WindowDescriptor.idl b/offapi/com/sun/star/awt/WindowDescriptor.idl
index 3ab2b89299c7..b62e4f6f8fbe 100644
--- a/offapi/com/sun/star/awt/WindowDescriptor.idl
+++ b/offapi/com/sun/star/awt/WindowDescriptor.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_WindowDescriptor_idl__
 #define __com_sun_star_awt_WindowDescriptor_idl__
 
-#ifndef __com_sun_star_awt_WindowClass_idl__
 #include <com/sun/star/awt/WindowClass.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
 #include <com/sun/star/awt/XWindowPeer.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 
 //=============================================================================
@@ -60,7 +54,7 @@ published struct WindowDescriptor
 
     /** specifies the name of the component service.
 
-        <p>A zero length name means that the vcl creates a blank top,
+        <p>A zero length name means that the VCL creates a blank top,
         a container, or a simple window.
         The following service names are defined:<br/>
         <ul>
diff --git a/offapi/com/sun/star/awt/WindowEvent.idl b/offapi/com/sun/star/awt/WindowEvent.idl
index 3b2ff710d8b4..a99dad684ec1 100644
--- a/offapi/com/sun/star/awt/WindowEvent.idl
+++ b/offapi/com/sun/star/awt/WindowEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_WindowEvent_idl__
 #define __com_sun_star_awt_WindowEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -80,7 +78,7 @@ published struct WindowEvent: com::sun::star::lang::EventObject
     /** specifies the inset from the top.
 
         <p>The inset is the distance between the outer and the inner window,
-        that means the top inset is the heigt of the top border.</p>
+        that means the top inset is the height of the top border.</p>
      */
     long TopInset;
 
@@ -98,7 +96,7 @@ published struct WindowEvent: com::sun::star::lang::EventObject
     /** specifies the inset from the bottom.
 
         <p>The inset is the distance between the outer and the inner window,
-        that means the bottom inset is the heigt of the bottom border.</p>
+        that means the bottom inset is the height of the bottom border.</p>
      */
     long BottomInset;
 
diff --git a/offapi/com/sun/star/awt/XActionListener.idl b/offapi/com/sun/star/awt/XActionListener.idl
index 15dbc6110320..32671a9eb4ed 100644
--- a/offapi/com/sun/star/awt/XActionListener.idl
+++ b/offapi/com/sun/star/awt/XActionListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XActionListener_idl__
 #define __com_sun_star_awt_XActionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_ActionEvent_idl__
 #include <com/sun/star/awt/ActionEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XActivateListener.idl b/offapi/com/sun/star/awt/XActivateListener.idl
index 19a2a8f8ac71..b0d9d88d4592 100644
--- a/offapi/com/sun/star/awt/XActivateListener.idl
+++ b/offapi/com/sun/star/awt/XActivateListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XActivateListener_idl__
 #define __com_sun_star_awt_XActivateListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -53,7 +49,7 @@ published interface XActivateListener: com::sun::star::lang::XEventListener
 
     /** is invoked when a window is activated.
 
-        <p>A window is avtivated if a child or itself got the focus.</p>
+        <p>A window is activated if a child or itself got the focus.</p>
 
         @see XFocusListener::focusGained
      */
@@ -61,9 +57,9 @@ published interface XActivateListener: com::sun::star::lang::XEventListener
 
     //-------------------------------------------------------------------------
 
-    /** is invoked when a window is de-activated.
+    /** is invoked when a window is deactivated.
 
-        <p>A window is deavtivated if a child or itself lost the focus.</p>
+        <p>A window is deactivated if a child or itself lost the focus.</p>
 
         @see XFocusListener::focusLost
      */
diff --git a/offapi/com/sun/star/awt/XAdjustmentListener.idl b/offapi/com/sun/star/awt/XAdjustmentListener.idl
index 4e56f96170cf..e0408fc8e059 100644
--- a/offapi/com/sun/star/awt/XAdjustmentListener.idl
+++ b/offapi/com/sun/star/awt/XAdjustmentListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XAdjustmentListener_idl__
 #define __com_sun_star_awt_XAdjustmentListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_AdjustmentEvent_idl__
 #include <com/sun/star/awt/AdjustmentEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XAnimatedImages.idl b/offapi/com/sun/star/awt/XAnimatedImages.idl
index 6a470882ed44..6a470882ed44 100755..100644
--- a/offapi/com/sun/star/awt/XAnimatedImages.idl
+++ b/offapi/com/sun/star/awt/XAnimatedImages.idl
diff --git a/offapi/com/sun/star/awt/XAnimation.idl b/offapi/com/sun/star/awt/XAnimation.idl
index 28947b87d5a4..28947b87d5a4 100755..100644
--- a/offapi/com/sun/star/awt/XAnimation.idl
+++ b/offapi/com/sun/star/awt/XAnimation.idl
diff --git a/offapi/com/sun/star/awt/XBitmap.idl b/offapi/com/sun/star/awt/XBitmap.idl
index e4a4cdfa8b6c..9825f87977c9 100644
--- a/offapi/com/sun/star/awt/XBitmap.idl
+++ b/offapi/com/sun/star/awt/XBitmap.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XBitmap_idl__
 #define __com_sun_star_awt_XBitmap_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 
 //=============================================================================
@@ -60,7 +56,7 @@ published interface XBitmap: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    /** returns the transparence mask of the device independent bitmap.
+    /** returns the transparency mask of the device independent bitmap.
      */
     sequence<byte> getMaskDIB();
 
diff --git a/offapi/com/sun/star/awt/XButton.idl b/offapi/com/sun/star/awt/XButton.idl
index 47b24d757811..2c22dd9824b3 100644
--- a/offapi/com/sun/star/awt/XButton.idl
+++ b/offapi/com/sun/star/awt/XButton.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XButton_idl__
 #define __com_sun_star_awt_XButton_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XActionListener_idl__
 #include <com/sun/star/awt/XActionListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XCallback.idl b/offapi/com/sun/star/awt/XCallback.idl
index 399fb16cec57..c184682020ad 100644
--- a/offapi/com/sun/star/awt/XCallback.idl
+++ b/offapi/com/sun/star/awt/XCallback.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XCallback_idl__
 #define __com_sun_star_awt_XCallback_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -38,7 +36,7 @@ module com { module sun { module star { module awt {
 
 //=============================================================================
 
-/** specifices an interface which can be used to call back
+/** specifies an interface which can be used to call back
     an implementation
  */
 published interface XCallback
diff --git a/offapi/com/sun/star/awt/XCheckBox.idl b/offapi/com/sun/star/awt/XCheckBox.idl
index 0e1011d75294..284adbe3c6b8 100644
--- a/offapi/com/sun/star/awt/XCheckBox.idl
+++ b/offapi/com/sun/star/awt/XCheckBox.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XCheckBox_idl__
 #define __com_sun_star_awt_XCheckBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XItemListener_idl__
 #include <com/sun/star/awt/XItemListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XComboBox.idl b/offapi/com/sun/star/awt/XComboBox.idl
index b85b36a037d3..88e22fa8a5f2 100644
--- a/offapi/com/sun/star/awt/XComboBox.idl
+++ b/offapi/com/sun/star/awt/XComboBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XComboBox_idl__
 #define __com_sun_star_awt_XComboBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XItemListener_idl__
 #include <com/sun/star/awt/XItemListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XActionListener_idl__
 #include <com/sun/star/awt/XActionListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl b/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
index 21711d918ac9..201f0e64ae53 100644
--- a/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
+++ b/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_awt_XContainerWindowEventHandler_idl__
 #define __com_sun_star_awt_XContainerWindowEventHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XContainerWindowProvider.idl b/offapi/com/sun/star/awt/XContainerWindowProvider.idl
index 6435c80d5025..b7fce615f913 100644
--- a/offapi/com/sun/star/awt/XContainerWindowProvider.idl
+++ b/offapi/com/sun/star/awt/XContainerWindowProvider.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_awt_XContainerWindowProvider_idl__
 #define __com_sun_star_awt_XContainerWindowProvider_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
 #include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XControl.idl b/offapi/com/sun/star/awt/XControl.idl
index ebc58f9967f3..870d4f16eb8f 100644
--- a/offapi/com/sun/star/awt/XControl.idl
+++ b/offapi/com/sun/star/awt/XControl.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_awt_XControl_idl__
 #define __com_sun_star_awt_XControl_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XToolkit_idl__
 #include <com/sun/star/awt/XToolkit.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
 #include <com/sun/star/awt/XWindowPeer.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XControlModel_idl__
 #include <com/sun/star/awt/XControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XView_idl__
 #include <com/sun/star/awt/XView.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XControlContainer.idl b/offapi/com/sun/star/awt/XControlContainer.idl
index 938d4ca364a0..dd165feb8e5e 100644
--- a/offapi/com/sun/star/awt/XControlContainer.idl
+++ b/offapi/com/sun/star/awt/XControlContainer.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XControlContainer_idl__
 #define __com_sun_star_awt_XControlContainer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XControl_idl__
 #include <com/sun/star/awt/XControl.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XControlModel.idl b/offapi/com/sun/star/awt/XControlModel.idl
index a8e7c84b93d1..b906ae50a162 100644
--- a/offapi/com/sun/star/awt/XControlModel.idl
+++ b/offapi/com/sun/star/awt/XControlModel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XControlModel_idl__
 #define __com_sun_star_awt_XControlModel_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XCurrencyField.idl b/offapi/com/sun/star/awt/XCurrencyField.idl
index d1345bfc679b..73fabb4fba66 100644
--- a/offapi/com/sun/star/awt/XCurrencyField.idl
+++ b/offapi/com/sun/star/awt/XCurrencyField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XCurrencyField_idl__
 #define __com_sun_star_awt_XCurrencyField_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl b/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl
index 8ce12873836a..13401c554dff 100644
--- a/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl
+++ b/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XDataTransferProviderAccess_idl__
 #define __com_sun_star_awt_XDataTransferProviderAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XDateField.idl b/offapi/com/sun/star/awt/XDateField.idl
index f7c0e3cc8f19..00bb6dbaf931 100644
--- a/offapi/com/sun/star/awt/XDateField.idl
+++ b/offapi/com/sun/star/awt/XDateField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XDateField_idl__
 #define __com_sun_star_awt_XDateField_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XDevice.idl b/offapi/com/sun/star/awt/XDevice.idl
index 9d05c05e5e2e..e7932ad1e17d 100644
--- a/offapi/com/sun/star/awt/XDevice.idl
+++ b/offapi/com/sun/star/awt/XDevice.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XDevice_idl__
 #define __com_sun_star_awt_XDevice_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_DeviceInfo_idl__
 #include <com/sun/star/awt/DeviceInfo.idl>
-#endif
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XDialog.idl b/offapi/com/sun/star/awt/XDialog.idl
index 831c80597070..a107f0be1a18 100644
--- a/offapi/com/sun/star/awt/XDialog.idl
+++ b/offapi/com/sun/star/awt/XDialog.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XDialog_idl__
 #define __com_sun_star_awt_XDialog_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XDialog2.idl b/offapi/com/sun/star/awt/XDialog2.idl
index e937dea9bb24..98d737f08655 100644
--- a/offapi/com/sun/star/awt/XDialog2.idl
+++ b/offapi/com/sun/star/awt/XDialog2.idl
@@ -1,9 +1,7 @@
 #ifndef __com_sun_star_awt_XDialog2_idl__
 #define __com_sun_star_awt_XDialog2_idl__
 
-#ifndef __com_sun_star_awt_XDialog_idl__
 #include <com/sun/star/awt/XDialog.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XDialogEventHandler.idl b/offapi/com/sun/star/awt/XDialogEventHandler.idl
index 57348bdb6eb2..992ab75b2ae5 100644
--- a/offapi/com/sun/star/awt/XDialogEventHandler.idl
+++ b/offapi/com/sun/star/awt/XDialogEventHandler.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_awt_XDialogEventHandler_idl__
 #define __com_sun_star_awt_XDialogEventHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XDialog_idl__
 #include <com/sun/star/awt/XDialog.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XDialogProvider.idl b/offapi/com/sun/star/awt/XDialogProvider.idl
index 625483c01909..0df719868ef5 100644
--- a/offapi/com/sun/star/awt/XDialogProvider.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_awt_XDialogProvider_idl__
 #define __com_sun_star_awt_XDialogProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XDialog_idl__
 #include <com/sun/star/awt/XDialog.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XDialogProvider2.idl b/offapi/com/sun/star/awt/XDialogProvider2.idl
index 7a2a549e5dd9..c6bef815ab99 100644
--- a/offapi/com/sun/star/awt/XDialogProvider2.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider2.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_awt_XDialogProvider2_idl__
 #define __com_sun_star_awt_XDialogProvider2_idl__
 
-#ifndef __com_sun_star_awt_XDialogProvider_idl__
 #include <com/sun/star/awt/XDialogProvider.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 
 //=============================================================================
@@ -115,7 +111,7 @@ published interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
 
         <p>The arguments accepted so far are
         <ul><li><em>ParentWindow</em> - must be a component supporting the <type>XWindowPeer</type> interface,
-                or a component supporting the <type>XControl</type> interfac, so an <code>XWindowPeer</code> can be
+                or a component supporting the <type>XControl</type> interface, so an <code>XWindowPeer</code> can be
                 obtained from it. The given window will be used as parent window for the to-be-created dialog.</li>
             <li><em>EventHandler</em> - specifies a component handling events in the dialog. See
                 <member>createDialogWithHandler</member> for a detailed specification of dialog event handling.</li>
diff --git a/offapi/com/sun/star/awt/XDisplayBitmap.idl b/offapi/com/sun/star/awt/XDisplayBitmap.idl
index b7b8d0fc3757..008a2fb16e8a 100644
--- a/offapi/com/sun/star/awt/XDisplayBitmap.idl
+++ b/offapi/com/sun/star/awt/XDisplayBitmap.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XDisplayBitmap_idl__
 #define __com_sun_star_awt_XDisplayBitmap_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XDisplayConnection.idl b/offapi/com/sun/star/awt/XDisplayConnection.idl
index 6e038bfe2b3c..7645fc2083fc 100644
--- a/offapi/com/sun/star/awt/XDisplayConnection.idl
+++ b/offapi/com/sun/star/awt/XDisplayConnection.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XDisplayConnection_idl__
 #define __com_sun_star_awt_XDisplayConnection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -66,8 +64,8 @@ published interface XDisplayConnection: com::sun::star::uno::XInterface
     /** removes a eventHandler from the handler list.
 
         @param window
-        the platform specific window id the handler should be deregistered for.
-        If empty, the handler should be deregistered completly.
+        the platform specific window id the handler should be unregistered for.
+        If empty, the handler should be unregistered completely.
 
         @param eventHandler
         the handler to remove.
@@ -96,7 +94,7 @@ published interface XDisplayConnection: com::sun::star::uno::XInterface
 
     /** returns a identifier.
 
-        @returns a unique platform dependend identifier for a display connection.
+        @returns a unique platform dependent identifier for a display connection.
     */
     any getIdentifier();
 
diff --git a/offapi/com/sun/star/awt/XDockableWindow.idl b/offapi/com/sun/star/awt/XDockableWindow.idl
index f50e8b558eb9..d7d4960f57ac 100644
--- a/offapi/com/sun/star/awt/XDockableWindow.idl
+++ b/offapi/com/sun/star/awt/XDockableWindow.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_XDockableWindow_idl__
 #define __com_sun_star_awt_XDockableWindow_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDockableWindowListener_idl__
 #include <com/sun/star/awt/XDockableWindowListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 //=============================================================================
 
@@ -125,16 +117,16 @@ interface XDockableWindow : com::sun::star::uno::XInterface
         see <type scope="com::sun::star::awt">XDockableWindowListener</type> for
         the corresponding events
         @param WindowRect
-            specifies the position and size of the popup window in frame coordinates
+            specifies the position and size of the pop-up window in frame coordinates
      */
     void startPopupMode( [in] com::sun::star::awt::Rectangle WindowRect );
 
     //-------------------------------------------------------------------------
 
-    /** queries the current popup mode
+    /** queries the current pop-up mode
         @returns
-            <TRUE/> if the window is in popup mode
-            <FALSE/> if the window is not in popup mode
+            <TRUE/> if the window is in pop-up mode
+            <FALSE/> if the window is not in pop-up mode
      */
     boolean isInPopupMode();
 };
diff --git a/offapi/com/sun/star/awt/XDockableWindowListener.idl b/offapi/com/sun/star/awt/XDockableWindowListener.idl
index 3a328993f170..40411aa40348 100644
--- a/offapi/com/sun/star/awt/XDockableWindowListener.idl
+++ b/offapi/com/sun/star/awt/XDockableWindowListener.idl
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_awt_XDockableWindowListener_idl__
 #define __com_sun_star_awt_XDockableWindowListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_DockingData_idl__
 #include <com/sun/star/awt/DockingData.idl>
-#endif
-#ifndef __com_sun_star_awt_EndDockingEvent_idl__
 #include <com/sun/star/awt/EndDockingEvent.idl>
-#endif
-#ifndef __com_sun_star_awt_DockingEvent_idl__
 #include <com/sun/star/awt/DockingEvent.idl>
-#endif
-#ifndef __com_sun_star_awt_EndPopupModeEvent_idl__
 #include <com/sun/star/awt/EndPopupModeEvent.idl>
-#endif
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
@@ -107,7 +95,7 @@ interface XDockableWindowListener: com::sun::star::lang::XEventListener
 
     //-------------------------------------------------------------------------
 
-    /** is invoked when the window currently is in popupmode and wants to be undocked
+    /** is invoked when the window currently is in pop-up mode and wants to be undocked
         or closed
      */
     void endPopupMode( [in] com::sun::star::awt::EndPopupModeEvent e );
diff --git a/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl b/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl
index 64dde0ed9390..fc512c8e5746 100644
--- a/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl
+++ b/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_XEnhancedMouseClickHandler_idl__
 #define __com_sun_star_awt_XEnhancedMouseClickHandler_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_EnhancedMouseEvent_idl__
 #include <com/sun/star/awt/EnhancedMouseEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XEventHandler.idl b/offapi/com/sun/star/awt/XEventHandler.idl
index 223973b8f59c..0dd2040f1990 100644
--- a/offapi/com/sun/star/awt/XEventHandler.idl
+++ b/offapi/com/sun/star/awt/XEventHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XEventHandler_idl__
 #define __com_sun_star_awt_XEventHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -47,13 +45,13 @@ published interface XEventHandler: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     /** requests the implementor of this interface to handle a platform
-        dependend event.
+        dependent event.
 
         @returns <TRUE/> if the event was handled properly and no further
         handling should take place, <FALSE/> otherwise.
 
         @param event
-        the platform dependend event.
+        the platform dependent event.
     */
     boolean handleEvent( [in] any event );
 
diff --git a/offapi/com/sun/star/awt/XExtendedToolkit.idl b/offapi/com/sun/star/awt/XExtendedToolkit.idl
index 0cb4cff2c800..d37f4639780f 100755..100644
--- a/offapi/com/sun/star/awt/XExtendedToolkit.idl
+++ b/offapi/com/sun/star/awt/XExtendedToolkit.idl
@@ -28,29 +28,12 @@
 #ifndef __com_sun_star_awt_XExtendedToolkit_idl__
 #define __com_sun_star_awt_XExtendedToolkit_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTopWindow_idl__
 #include <com/sun/star/awt/XTopWindow.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTopWindowListener_idl__
 #include <com/sun/star/awt/XTopWindowListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XKeyHandler_idl__
 #include <com/sun/star/awt/XKeyHandler.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XFocusListener_idl__
 #include <com/sun/star/awt/XFocusListener.idl>
-#endif
 
 
 //=============================================================================
@@ -104,7 +87,7 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
         <member>getTopWindowCount()</member> and successive calls to this
         function.
         @param nIndex
-            The index should be in the intervall from 0 up to but not
+            The index should be in the interval from 0 up to but not
             including the number of top-level windows as returned by
             <member>getTopWindowCount()</member>.
         @return
@@ -127,7 +110,7 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
 
     /** Add a new listener that is called for events that involve <type
         scope="::com::sun::star::awt">XTopWindow</type>s.  After having
-        obtained the current list of exisiting top-level windows you can
+        obtained the current list of existing top-level windows you can
         keep this list up-to-date by listening to opened or closed top-level
         windows.  Wait for activations or deactivations of top-level windows
         to keep track of the currently active frame.
@@ -145,7 +128,7 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
     /** Remove the specified listener from the list of listeners.
         @param xListener
             If the reference is empty then nothing will be changed.  If the
-            listener has been registered twice (or more) then all refrences
+            listener has been registered twice (or more) then all references
             will be removed.
     */
     [oneway] void removeTopWindowListener (
@@ -171,7 +154,7 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
     /** Remove the specified listener from the list of listeners.
         @param xHandler
             If the reference is empty then nothing will be changed.  If the
-            handler has been registered twice (or more) then all refrences
+            handler has been registered twice (or more) then all references
             will be removed.
     */
     [oneway] void removeKeyHandler (
@@ -197,7 +180,7 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
     /** Remove the specified listener from the list of listeners.
         @param xListener
             If the reference is empty then nothing will be changed.  If the
-            listener has been registered twice (or more) then all refrences
+            listener has been registered twice (or more) then all references
             will be removed.
     */
     [oneway] void removeFocusListener (
diff --git a/offapi/com/sun/star/awt/XFileDialog.idl b/offapi/com/sun/star/awt/XFileDialog.idl
index b9fe07c9e472..758d5decd3b1 100644
--- a/offapi/com/sun/star/awt/XFileDialog.idl
+++ b/offapi/com/sun/star/awt/XFileDialog.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XFileDialog_idl__
 #define __com_sun_star_awt_XFileDialog_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XFixedHyperlink.idl b/offapi/com/sun/star/awt/XFixedHyperlink.idl
index 978549828779..05cfe3805f95 100644
--- a/offapi/com/sun/star/awt/XFixedHyperlink.idl
+++ b/offapi/com/sun/star/awt/XFixedHyperlink.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_XFixedHyperlink_idl__
 #define __com_sun_star_awt_XFixedHyperlink_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XActionListener_idl__
 #include <com/sun/star/awt/XActionListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XFixedText.idl b/offapi/com/sun/star/awt/XFixedText.idl
index 55b3202e7173..6e234e8364ff 100644
--- a/offapi/com/sun/star/awt/XFixedText.idl
+++ b/offapi/com/sun/star/awt/XFixedText.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XFixedText_idl__
 #define __com_sun_star_awt_XFixedText_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XFocusListener.idl b/offapi/com/sun/star/awt/XFocusListener.idl
index fc45be62aa07..a6c001140a78 100644
--- a/offapi/com/sun/star/awt/XFocusListener.idl
+++ b/offapi/com/sun/star/awt/XFocusListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XFocusListener_idl__
 #define __com_sun_star_awt_XFocusListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_FocusEvent_idl__
 #include <com/sun/star/awt/FocusEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XFont.idl b/offapi/com/sun/star/awt/XFont.idl
index 54df687ca1e2..0318a8407748 100644
--- a/offapi/com/sun/star/awt/XFont.idl
+++ b/offapi/com/sun/star/awt/XFont.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XFont_idl__
 #define __com_sun_star_awt_XFont_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_awt_SimpleFontMetric_idl__
 #include <com/sun/star/awt/SimpleFontMetric.idl>
-#endif
 
 
 //=============================================================================
@@ -46,7 +40,7 @@
 
 //=============================================================================
 
-/** decribes a font on a specific device.
+/** describes a font on a specific device.
 
     <p>All values are in pixels within this device.</p>
  */
diff --git a/offapi/com/sun/star/awt/XFont2.idl b/offapi/com/sun/star/awt/XFont2.idl
index b67e8f2c1dee..702c835d76a5 100644
--- a/offapi/com/sun/star/awt/XFont2.idl
+++ b/offapi/com/sun/star/awt/XFont2.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XFont2_idl__
 #define __com_sun_star_awt_XFont2_idl__
 
-#ifndef __com_sun_star_awt_XFont_idl__
 #include <com/sun/star/awt/XFont.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XGraphics.idl b/offapi/com/sun/star/awt/XGraphics.idl
index 2b6b63a26b2e..be26a055bcf7 100644
--- a/offapi/com/sun/star/awt/XGraphics.idl
+++ b/offapi/com/sun/star/awt/XGraphics.idl
@@ -27,29 +27,16 @@
 #ifndef __com_sun_star_awt_XGraphics_idl__
 #define __com_sun_star_awt_XGraphics_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_SimpleFontMetric_idl__
 #include <com/sun/star/awt/SimpleFontMetric.idl>
-#endif
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_awt_RasterOperation_idl__
 #include <com/sun/star/awt/RasterOperation.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Gradient_idl__
 #include <com/sun/star/awt/Gradient.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XImageButton.idl b/offapi/com/sun/star/awt/XImageButton.idl
index e3676b50711d..605ab48ab523 100644
--- a/offapi/com/sun/star/awt/XImageButton.idl
+++ b/offapi/com/sun/star/awt/XImageButton.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XImageButton_idl__
 #define __com_sun_star_awt_XImageButton_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XActionListener_idl__
 #include <com/sun/star/awt/XActionListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XImageConsumer.idl b/offapi/com/sun/star/awt/XImageConsumer.idl
index 60c1223be42a..066b12d67c1c 100644
--- a/offapi/com/sun/star/awt/XImageConsumer.idl
+++ b/offapi/com/sun/star/awt/XImageConsumer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XImageConsumer_idl__
 #define __com_sun_star_awt_XImageConsumer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XImageProducer.idl b/offapi/com/sun/star/awt/XImageProducer.idl
index 0dc15218012c..6adcda8bb4e4 100644
--- a/offapi/com/sun/star/awt/XImageProducer.idl
+++ b/offapi/com/sun/star/awt/XImageProducer.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XImageProducer_idl__
 #define __com_sun_star_awt_XImageProducer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XImageConsumer_idl__
 #include <com/sun/star/awt/XImageConsumer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XInfoPrinter.idl b/offapi/com/sun/star/awt/XInfoPrinter.idl
index 71afa45e0bc1..f1aefb5764aa 100644
--- a/offapi/com/sun/star/awt/XInfoPrinter.idl
+++ b/offapi/com/sun/star/awt/XInfoPrinter.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XInfoPrinter_idl__
 #define __com_sun_star_awt_XInfoPrinter_idl__
 
-#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__
 #include <com/sun/star/awt/XPrinterPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XDevice_idl__
 #include <com/sun/star/awt/XDevice.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XItemEventBroadcaster.idl b/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
index 8eb95215eb68..47a9cdbc350f 100644
--- a/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
+++ b/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_XItemEventBroadcaster_idl__
 #define __com_sun_star_awt_XItemEventBroadcaster_idl__
 
-#ifndef __com_sun_star_awt_XItemListener_idl__
 #include <com/sun/star/awt/XItemListener.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/awt/XItemList.idl b/offapi/com/sun/star/awt/XItemList.idl
index 7d7a3e52f26d..aefb739d78ef 100644
--- a/offapi/com/sun/star/awt/XItemList.idl
+++ b/offapi/com/sun/star/awt/XItemList.idl
@@ -180,7 +180,7 @@ published interface XItemList
             )
             raises  ( ::com::sun::star::lang::IndexOutOfBoundsException );
 
-    /** associates an implementation dependend value with the given list item.
+    /** associates an implementation dependent value with the given list item.
 
         <p>You can use this to store data for an item which does not interfere with the displayed
         text and image, but can be used by the client of the list box for an arbitrary purpose.</p>
@@ -246,7 +246,7 @@ published interface XItemList
             )
             raises  ( ::com::sun::star::lang::IndexOutOfBoundsException );
 
-    /** retrieves the implementation dependend value associated with the given list item.
+    /** retrieves the implementation dependent value associated with the given list item.
         @see setItemData
 
         @param Position
diff --git a/offapi/com/sun/star/awt/XItemListListener.idl b/offapi/com/sun/star/awt/XItemListListener.idl
index 276fae3d0b00..27ef1831aba6 100644
--- a/offapi/com/sun/star/awt/XItemListListener.idl
+++ b/offapi/com/sun/star/awt/XItemListListener.idl
@@ -65,7 +65,7 @@ published interface XItemListListener : ::com::sun::star::lang::XEventListener
                 [in] ::com::sun::star::lang::EventObject Event
             );
 
-    /** is called when the changes to the item list which occured are too complex to be notified
+    /** is called when the changes to the item list which occurred are too complex to be notified
         in single events.
 
         <p>Consumers of this event should discard their cached information about the current item list,
diff --git a/offapi/com/sun/star/awt/XItemListener.idl b/offapi/com/sun/star/awt/XItemListener.idl
index ccb7b90ab773..1a282e2874a6 100644
--- a/offapi/com/sun/star/awt/XItemListener.idl
+++ b/offapi/com/sun/star/awt/XItemListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XItemListener_idl__
 #define __com_sun_star_awt_XItemListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_ItemEvent_idl__
 #include <com/sun/star/awt/ItemEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XKeyHandler.idl b/offapi/com/sun/star/awt/XKeyHandler.idl
index dba9f36f8318..ee5098aee81e 100644
--- a/offapi/com/sun/star/awt/XKeyHandler.idl
+++ b/offapi/com/sun/star/awt/XKeyHandler.idl
@@ -28,13 +28,9 @@
 #ifndef __com_sun_star_awt_XKeyHandler_idl__
 #define __com_sun_star_awt_XKeyHandler_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_KeyEvent_idl__
 #include <com/sun/star/awt/KeyEvent.idl>
-#endif
 
 
 module com {  module sun {  module star {  module awt {
@@ -61,7 +57,7 @@ published interface XKeyHandler : ::com::sun::star::lang::XEventListener
         when known, with that of other handlers.</p>
 
         <p>Consuming this event does not prevent the pending key-release
-        event from beeing broadcasted.</p>
+        event from being broadcasted.</p>
 
         @param aEvent
             The key event informs about the pressed key.
@@ -81,7 +77,7 @@ published interface XKeyHandler : ::com::sun::star::lang::XEventListener
         handling by the broadcaster will take place.
 
         <p>Consume the event if the action performed by the implementation
-        is mutualy exclusive with the default action of the broadcaster or,
+        is mutually exclusive with the default action of the broadcaster or,
         when known, with that of other handlers.</p>
 
         @param aEvent
diff --git a/offapi/com/sun/star/awt/XKeyListener.idl b/offapi/com/sun/star/awt/XKeyListener.idl
index 299cfddb9ad3..c3f71f0cdb94 100644
--- a/offapi/com/sun/star/awt/XKeyListener.idl
+++ b/offapi/com/sun/star/awt/XKeyListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XKeyListener_idl__
 #define __com_sun_star_awt_XKeyListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_KeyEvent_idl__
 #include <com/sun/star/awt/KeyEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XLayoutConstrains.idl b/offapi/com/sun/star/awt/XLayoutConstrains.idl
index c715d1b7d5d8..a071be89c336 100644
--- a/offapi/com/sun/star/awt/XLayoutConstrains.idl
+++ b/offapi/com/sun/star/awt/XLayoutConstrains.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XLayoutConstrains_idl__
 #define __com_sun_star_awt_XLayoutConstrains_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XLayoutContainer.idl b/offapi/com/sun/star/awt/XLayoutContainer.idl
index 46711f551af6..76d16055d721 100644
--- a/offapi/com/sun/star/awt/XLayoutContainer.idl
+++ b/offapi/com/sun/star/awt/XLayoutContainer.idl
@@ -1,24 +1,12 @@
 #ifndef __com_sun_star_awt_XLayoutContainer_idl__
 #define __com_sun_star_awt_XLayoutContainer_idl__
 
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
 #include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_awt_MaxChildrenException_idl__
 #include <com/sun/star/awt/MaxChildrenException.idl>
-#endif
-#ifndef __com_sun_star_awt_XLayoutUnit_idl__
 #include <com/sun/star/awt/XLayoutUnit.idl>
-#endif
 
 //=============================================================================
 
@@ -50,11 +38,11 @@ interface XLayoutContainer: com::sun::star::container::XChild
     /** Read/modify some child layout properties. XPropertySet provides a
        rich API that allows, e.g., for introspection.
        Should rarely be a need to use; containers shall provide an interface
-       for setting properties more confortably. */
+       for setting properties more comfortably. */
     com::sun::star::beans::XPropertySet getChildProperties(
         [in] com::sun::star::awt::XLayoutConstrains Child );
 
-    /** Set at initilization, this object should be notified when a containers state
+    /** Set at initialization, this object should be notified when a containers state
        changes, that may affect its size, to queue a layout re-calculation. */
     void setLayoutUnit( [in] com::sun::star::awt::XLayoutUnit Unit );
 
diff --git a/offapi/com/sun/star/awt/XLayoutFlow.idl b/offapi/com/sun/star/awt/XLayoutFlow.idl
index 1ec260aeab83..fa67142524f8 100644
--- a/offapi/com/sun/star/awt/XLayoutFlow.idl
+++ b/offapi/com/sun/star/awt/XLayoutFlow.idl
@@ -9,7 +9,7 @@ module com {  module sun {  module star {  module awt {
 
 //=============================================================================
 
-/** Enables height-for-width layout negociations, which allows for label wrapping
+/** Enables height-for-width layout negotiations, which allows for label wrapping
     and flow containers. Can be implemented by either a container or an ordinary widget;
     whether its parent will honor it is another story, so keep implementing
     getMinimumSize().
@@ -18,7 +18,7 @@ module com {  module sun {  module star {  module awt {
  */
 interface XLayoutFlow
 {
-    /** returns the prefered high this layout element would need for the given width. */
+    /** returns the preferred height this layout element would need for the given width. */
     long getHeightForWidth( [in] long Width );
 
     /** Allow the container/widget to toggle the functionality. */
diff --git a/offapi/com/sun/star/awt/XLayoutRoot.idl b/offapi/com/sun/star/awt/XLayoutRoot.idl
index 3234f15e13cf..064a2b41218c 100644
--- a/offapi/com/sun/star/awt/XLayoutRoot.idl
+++ b/offapi/com/sun/star/awt/XLayoutRoot.idl
@@ -1,15 +1,9 @@
 #ifndef __com_sun_star_awt_XLayoutRoot_idl__
 #define __com_sun_star_awt_XLayoutRoot_idl__
 
-#ifndef __com_sun_star_awt_XLayoutContainer_idl__
 #include <com/sun/star/awt/XLayoutContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XLayoutUnit.idl b/offapi/com/sun/star/awt/XLayoutUnit.idl
index cc3581ae4aa3..a3bcd8ea4261 100644
--- a/offapi/com/sun/star/awt/XLayoutUnit.idl
+++ b/offapi/com/sun/star/awt/XLayoutUnit.idl
@@ -1,9 +1,7 @@
 #ifndef __com_sun_star_awt_XLayoutUnit_idl__
 #define __com_sun_star_awt_XLayoutUnit_idl__
 
-#ifndef __com_sun_star_awt_XLayoutContainer_idl__
 #include <com/sun/star/awt/XLayoutContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XListBox.idl b/offapi/com/sun/star/awt/XListBox.idl
index 32b458d62a2f..adacd5d6c33e 100644
--- a/offapi/com/sun/star/awt/XListBox.idl
+++ b/offapi/com/sun/star/awt/XListBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XListBox_idl__
 #define __com_sun_star_awt_XListBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XItemListener_idl__
 #include <com/sun/star/awt/XItemListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XActionListener_idl__
 #include <com/sun/star/awt/XActionListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XMenu.idl b/offapi/com/sun/star/awt/XMenu.idl
index f9ebc738f18f..7b990a211b6d 100644
--- a/offapi/com/sun/star/awt/XMenu.idl
+++ b/offapi/com/sun/star/awt/XMenu.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XMenu_idl__
 #define __com_sun_star_awt_XMenu_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -123,14 +121,14 @@ published interface XMenu: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    /** sets the popup menu for a specified menu item.
+    /** sets the pop-up menu for a specified menu item.
      */
     [oneway] void setPopupMenu( [in] short nItemId,
              [in] XPopupMenu aPopupMenu );
 
     //-------------------------------------------------------------------------
 
-    /** returns the popup menu from the menu item.
+    /** returns the pop-up menu from the menu item.
      */
     XPopupMenu getPopupMenu( [in] short nItemId );
 
diff --git a/offapi/com/sun/star/awt/XMenuBar.idl b/offapi/com/sun/star/awt/XMenuBar.idl
index 40d92b9f0b80..86fabe34e47d 100644
--- a/offapi/com/sun/star/awt/XMenuBar.idl
+++ b/offapi/com/sun/star/awt/XMenuBar.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XMenuBar_idl__
 #define __com_sun_star_awt_XMenuBar_idl__
 
-#ifndef __com_sun_star_awt_XMenu_idl__
 #include <com/sun/star/awt/XMenu.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XMenuBarExtended.idl b/offapi/com/sun/star/awt/XMenuBarExtended.idl
index 97fbbb39f7a9..75880ab13592 100755..100644
--- a/offapi/com/sun/star/awt/XMenuBarExtended.idl
+++ b/offapi/com/sun/star/awt/XMenuBarExtended.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_XMenuBarExtended_idl__
 #define __com_sun_star_awt_XMenuBarExtended_idl__
 
-#ifndef __com_sun_star_awt_XMenuBar_idl__
 #include <com/sun/star/awt/XMenuBar.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuExtended2_idl__
 #include <com/sun/star/awt/XMenuExtended2.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XMenuExtended.idl b/offapi/com/sun/star/awt/XMenuExtended.idl
index 3efa60eeafe1..3bf1077793ec 100644
--- a/offapi/com/sun/star/awt/XMenuExtended.idl
+++ b/offapi/com/sun/star/awt/XMenuExtended.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XMenuExtended_idl__
 #define __com_sun_star_awt_XMenuExtended_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XMenuExtended2.idl b/offapi/com/sun/star/awt/XMenuExtended2.idl
index 613699c5dd29..eace9b2114b0 100755..100644
--- a/offapi/com/sun/star/awt/XMenuExtended2.idl
+++ b/offapi/com/sun/star/awt/XMenuExtended2.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_XMenuExtended2_idl__
 #define __com_sun_star_awt_XMenuExtended2_idl__
 
-#ifndef __com_sun_star_awt_XMenu_idl__
 #include <com/sun/star/awt/XMenu.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuExtended_idl__
 #include <com/sun/star/awt/XMenuExtended.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MenuItemType_idl__
 #include <com/sun/star/awt/MenuItemType.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
@@ -53,7 +42,7 @@ module com {  module sun {  module star {  module awt {
 published interface XMenuExtended2
 {
     /** specifies some extended menu functions, like setting a command URL and a help command for a menu item.<br>
-        These functions are available for both menu bar and popup menu.
+        These functions are available for both menu bar and pop-up menu.
     */
     interface com::sun::star::awt::XMenuExtended;
 
diff --git a/offapi/com/sun/star/awt/XMenuListener.idl b/offapi/com/sun/star/awt/XMenuListener.idl
index 12f713f83fb4..9f4c35497590 100644
--- a/offapi/com/sun/star/awt/XMenuListener.idl
+++ b/offapi/com/sun/star/awt/XMenuListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XMenuListener_idl__
 #define __com_sun_star_awt_XMenuListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_MenuEvent_idl__
 #include <com/sun/star/awt/MenuEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XMessageBox.idl b/offapi/com/sun/star/awt/XMessageBox.idl
index e10984a42f01..d34b46e7ea8a 100644
--- a/offapi/com/sun/star/awt/XMessageBox.idl
+++ b/offapi/com/sun/star/awt/XMessageBox.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XMessageBox_idl__
 #define __com_sun_star_awt_XMessageBox_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XMessageBoxFactory.idl b/offapi/com/sun/star/awt/XMessageBoxFactory.idl
index 67898a19f17a..e1fc47aeaa1c 100644
--- a/offapi/com/sun/star/awt/XMessageBoxFactory.idl
+++ b/offapi/com/sun/star/awt/XMessageBoxFactory.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_awt_XMessageBoxFactory_idl__
 #define __com_sun_star_awt_XMessageBoxFactory_idl__
 
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
 #include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMessageBox_idl__
 #include <com/sun/star/awt/XMessageBox.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MessageBoxButtons_idl__
 #include <com/sun/star/awt/MessageBoxButtons.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 
 //=============================================================================
@@ -75,28 +64,28 @@ published interface XMessageBoxFactory : com::sun::star::uno::XInterface
         a string which determines the message box type.
         The following strings are defined.
         <ul>
-            <li><b>infobox</b>A message box to inform the user about a certain event.
+            <li><b>infobox</b> A message box to inform the user about a certain event.
                 <b>Attention:</b><br/>This type of message box ignores the argument
                 aButton because a info box always shows a OK button.
             </li>
-            <li><b>warningbox</b>A message to warn the user about a certain problem.</li>
-            <li><b>errorbox</b>A message box to provide an error message to the user.</li>
-            <li><b>querybox</b>A message box to query information from the user.</li>
-            <li><b>messbox</b>A normal message box.</li>
+            <li><b>warningbox</b> A message to warn the user about a certain problem.</li>
+            <li><b>errorbox</b> A message box to provide an error message to the user.</li>
+            <li><b>querybox</b> A message box to query information from the user.</li>
+            <li><b>messbox</b> A normal message box.</li>
         </ul>
 
         @param aButtons
         specifies which buttons should be available on the
         message box. A combination of
         <type scope="com::sun::star::awt">MessageBoxButtons</type>. An <b>infobox</b>
-        ignores this paramter and always use button "OK".
+        ignores this parameter and always use button "OK".
 
         @param aTitle
         specifies the title of the message box.
 
         @param aMessage
         specifies text which will be shown by the message box.
-        Line-breaks must be added using 'CR' or 'CR+LF'.
+        Line-breaks must be added using "CR" or "CR+LF".
     */
     XMessageBox createMessageBox( [in] com::sun::star::awt::XWindowPeer aParent, [in] com::sun::star::awt::Rectangle aPosSize, [in] string aType, [in] long aButtons, [in] string aTitle, [in] string aMessage );
 };
diff --git a/offapi/com/sun/star/awt/XMetricField.idl b/offapi/com/sun/star/awt/XMetricField.idl
index 5bc6a7da40e2..15ea1d640e2f 100644
--- a/offapi/com/sun/star/awt/XMetricField.idl
+++ b/offapi/com/sun/star/awt/XMetricField.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_awt_XMetricField_idl__
 #define __com_sun_star_awt_XMetricField_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_MeasureUnit_idl__
 #include <com/sun/star/util/MeasureUnit.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XMouseClickHandler.idl b/offapi/com/sun/star/awt/XMouseClickHandler.idl
index ad98f9012cba..8d2414f81b04 100644
--- a/offapi/com/sun/star/awt/XMouseClickHandler.idl
+++ b/offapi/com/sun/star/awt/XMouseClickHandler.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_XMouseClickHandler_idl__
 #define __com_sun_star_awt_XMouseClickHandler_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MouseEvent_idl__
 #include <com/sun/star/awt/MouseEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XMouseListener.idl b/offapi/com/sun/star/awt/XMouseListener.idl
index d89f1e910fde..71282b4d4112 100644
--- a/offapi/com/sun/star/awt/XMouseListener.idl
+++ b/offapi/com/sun/star/awt/XMouseListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XMouseListener_idl__
 #define __com_sun_star_awt_XMouseListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_MouseEvent_idl__
 #include <com/sun/star/awt/MouseEvent.idl>
-#endif
 
 
 //=============================================================================
@@ -50,7 +46,7 @@ published interface XMouseListener: com::sun::star::lang::XEventListener
 
     /** is invoked when a mouse button has been pressed on a window.
 
-        <p>Since mouse presses are usually also used to indicate requests for popup menus
+        <p>Since mouse presses are usually also used to indicate requests for pop-up menus
         (also known as context menus) on objects, you might receive two events
         for a single mouse press: For example, if, on your operating system,
         pressing the right mouse button indicates the request for a context menu,
diff --git a/offapi/com/sun/star/awt/XMouseMotionHandler.idl b/offapi/com/sun/star/awt/XMouseMotionHandler.idl
index 541419711036..00ab02d7c22b 100644
--- a/offapi/com/sun/star/awt/XMouseMotionHandler.idl
+++ b/offapi/com/sun/star/awt/XMouseMotionHandler.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XMouseMotionHandler_idl__
 #define __com_sun_star_awt_XMouseMotionHandler_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_MouseEvent_idl__
 #include <com/sun/star/awt/MouseEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XMouseMotionListener.idl b/offapi/com/sun/star/awt/XMouseMotionListener.idl
index 66f2bf8bd9db..06005a8909c8 100644
--- a/offapi/com/sun/star/awt/XMouseMotionListener.idl
+++ b/offapi/com/sun/star/awt/XMouseMotionListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XMouseMotionListener_idl__
 #define __com_sun_star_awt_XMouseMotionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_MouseEvent_idl__
 #include <com/sun/star/awt/MouseEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XNumericField.idl b/offapi/com/sun/star/awt/XNumericField.idl
index f07131c453b1..deed913fc65c 100644
--- a/offapi/com/sun/star/awt/XNumericField.idl
+++ b/offapi/com/sun/star/awt/XNumericField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XNumericField_idl__
 #define __com_sun_star_awt_XNumericField_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XPaintListener.idl b/offapi/com/sun/star/awt/XPaintListener.idl
index 95874a5d6e10..46ae86be0590 100644
--- a/offapi/com/sun/star/awt/XPaintListener.idl
+++ b/offapi/com/sun/star/awt/XPaintListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XPaintListener_idl__
 #define __com_sun_star_awt_XPaintListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_PaintEvent_idl__
 #include <com/sun/star/awt/PaintEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XPatternField.idl b/offapi/com/sun/star/awt/XPatternField.idl
index 2db8433f8e57..91bae318a8cc 100644
--- a/offapi/com/sun/star/awt/XPatternField.idl
+++ b/offapi/com/sun/star/awt/XPatternField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XPatternField_idl__
 #define __com_sun_star_awt_XPatternField_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XPointer.idl b/offapi/com/sun/star/awt/XPointer.idl
index 63e5f99944d9..90cb5cbcf122 100644
--- a/offapi/com/sun/star/awt/XPointer.idl
+++ b/offapi/com/sun/star/awt/XPointer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XPointer_idl__
 #define __com_sun_star_awt_XPointer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XPopupMenu.idl b/offapi/com/sun/star/awt/XPopupMenu.idl
index 62280d4c6c89..d7c844ae89d4 100644
--- a/offapi/com/sun/star/awt/XPopupMenu.idl
+++ b/offapi/com/sun/star/awt/XPopupMenu.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XPopupMenu_idl__
 #define __com_sun_star_awt_XPopupMenu_idl__
 
-#ifndef __com_sun_star_awt_XMenu_idl__
 #include <com/sun/star/awt/XMenu.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 //=============================================================================
 
@@ -43,7 +39,7 @@
 
 //=============================================================================
 
-/** controls a popup menu.
+/** controls a pop-up menu.
  */
 published interface XPopupMenu: XMenu
 {
@@ -80,8 +76,8 @@ published interface XPopupMenu: XMenu
 
     //-------------------------------------------------------------------------
 
-    /** executes the popup menu and returns the selected item
-        or <code>0</code>, if cancelled.
+    /** executes the pop-up menu and returns the selected item
+        or <code>0</code>, if canceled.
      */
     short execute( [in] XWindowPeer Parent,
              [in] Rectangle Area,
diff --git a/offapi/com/sun/star/awt/XPopupMenuExtended.idl b/offapi/com/sun/star/awt/XPopupMenuExtended.idl
index 5b6d112e8f28..16cd5735ac85 100755..100644
--- a/offapi/com/sun/star/awt/XPopupMenuExtended.idl
+++ b/offapi/com/sun/star/awt/XPopupMenuExtended.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_awt_XPopupMenuExtended_idl__
 #define __com_sun_star_awt_XPopupMenuExtended_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XPopupMenu_idl__
 #include <com/sun/star/awt/XPopupMenu.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuExtended2_idl__
 #include <com/sun/star/awt/XMenuExtended2.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MenuLogo_idl__
 #include <com/sun/star/awt/MenuLogo.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
 #include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
@@ -65,7 +45,7 @@ module com {  module sun {  module star {  module awt {
  */
 published interface XPopupMenuExtended
 {
-    /** specifies basic functions for a popup menu.
+    /** specifies basic functions for a pop-up menu.
     */
     interface ::com::sun::star::awt::XPopupMenu;
 
@@ -139,9 +119,9 @@ published interface XPopupMenuExtended
     /** sets the <type>KeyEvent</type> for the menu item.
 
         <p>The <type>KeyEvent</type> is <b>only</b> used as a container to transport
-        the shortcut information, this methods only draws the text corresponding to
+        the shortcut information, this method only draws the text corresponding to
         this keyboard shortcut. The client code is responsible for listening to
-        keyboard events (typicaly done via <type>XUserInputInterception</type>),
+        keyboard events (typically done via <type>XUserInputInterception</type>),
         and dispatch the respective command.</p>
 
         @param nItemId
diff --git a/offapi/com/sun/star/awt/XPrinter.idl b/offapi/com/sun/star/awt/XPrinter.idl
index 4b600ad4ab01..08652be4c338 100644
--- a/offapi/com/sun/star/awt/XPrinter.idl
+++ b/offapi/com/sun/star/awt/XPrinter.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_awt_XPrinter_idl__
 #define __com_sun_star_awt_XPrinter_idl__
 
-#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__
 #include <com/sun/star/awt/XPrinterPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_awt_PrinterException_idl__
 #include <com/sun/star/awt/PrinterException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XDevice_idl__
 #include <com/sun/star/awt/XDevice.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XPrinterPropertySet.idl b/offapi/com/sun/star/awt/XPrinterPropertySet.idl
index 9dde4b077fe6..b22e49a03a86 100644
--- a/offapi/com/sun/star/awt/XPrinterPropertySet.idl
+++ b/offapi/com/sun/star/awt/XPrinterPropertySet.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XPrinterPropertySet_idl__
 #define __com_sun_star_awt_XPrinterPropertySet_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XPrinterServer.idl b/offapi/com/sun/star/awt/XPrinterServer.idl
index 275590e3e665..ca97a26e070f 100644
--- a/offapi/com/sun/star/awt/XPrinterServer.idl
+++ b/offapi/com/sun/star/awt/XPrinterServer.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XPrinterServer_idl__
 #define __com_sun_star_awt_XPrinterServer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XPrinter_idl__
 #include <com/sun/star/awt/XPrinter.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XInfoPrinter_idl__
 #include <com/sun/star/awt/XInfoPrinter.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XProgressBar.idl b/offapi/com/sun/star/awt/XProgressBar.idl
index 6107c1211105..1ea6c5b483bb 100644
--- a/offapi/com/sun/star/awt/XProgressBar.idl
+++ b/offapi/com/sun/star/awt/XProgressBar.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XProgressBar_idl__
 #define __com_sun_star_awt_XProgressBar_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XProgressMonitor.idl b/offapi/com/sun/star/awt/XProgressMonitor.idl
index 74cda157a017..f20dd2cd1e11 100644
--- a/offapi/com/sun/star/awt/XProgressMonitor.idl
+++ b/offapi/com/sun/star/awt/XProgressMonitor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XProgressMonitor_idl__
 #define __com_sun_star_awt_XProgressMonitor_idl__
 
-#ifndef __com_sun_star_awt_XProgressBar_idl__
 #include <com/sun/star/awt/XProgressBar.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XRadioButton.idl b/offapi/com/sun/star/awt/XRadioButton.idl
index 18a05a9cb5fe..b8eb312e741e 100644
--- a/offapi/com/sun/star/awt/XRadioButton.idl
+++ b/offapi/com/sun/star/awt/XRadioButton.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XRadioButton_idl__
 #define __com_sun_star_awt_XRadioButton_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XItemListener_idl__
 #include <com/sun/star/awt/XItemListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XRegion.idl b/offapi/com/sun/star/awt/XRegion.idl
index eabc39ac6697..60fe76cad720 100644
--- a/offapi/com/sun/star/awt/XRegion.idl
+++ b/offapi/com/sun/star/awt/XRegion.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XRegion_idl__
 #define __com_sun_star_awt_XRegion_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XRequestCallback.idl b/offapi/com/sun/star/awt/XRequestCallback.idl
index 4605fe348f3c..b1802c22884e 100644
--- a/offapi/com/sun/star/awt/XRequestCallback.idl
+++ b/offapi/com/sun/star/awt/XRequestCallback.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XRequestCallback_idl__
 #define __com_sun_star_awt_XRequestCallback_idl__
 
-#ifndef __com_sun_star_awt_XCallback_idl__
 #include <com/sun/star/awt/XCallback.idl>
-#endif
 
 //=============================================================================
 
@@ -38,7 +36,7 @@ module com { module sun { module star { module awt {
 
 //=============================================================================
 
-/** specifices an interface which can be used to call back
+/** specifies an interface which can be used to call back
     an implementation
  */
 published interface XRequestCallback
diff --git a/offapi/com/sun/star/awt/XReschedule.idl b/offapi/com/sun/star/awt/XReschedule.idl
index 7aaff1830b41..59b4a225f277 100644
--- a/offapi/com/sun/star/awt/XReschedule.idl
+++ b/offapi/com/sun/star/awt/XReschedule.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XReschedule_idl__
 #define __com_sun_star_awt_XReschedulet_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XScrollBar.idl b/offapi/com/sun/star/awt/XScrollBar.idl
index d5b0f2060582..e1799de83ee2 100644
--- a/offapi/com/sun/star/awt/XScrollBar.idl
+++ b/offapi/com/sun/star/awt/XScrollBar.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XScrollBar_idl__
 #define __com_sun_star_awt_XScrollBar_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XAdjustmentListener_idl__
 #include <com/sun/star/awt/XAdjustmentListener.idl>
-#endif
 
 
 //=============================================================================
@@ -68,7 +64,7 @@ published interface XScrollBar: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     /** sets the scroll value, visible area and maximum scroll value
-        of the scoll bar.
+        of the scroll bar.
      */
     [oneway] void setValues( [in] long nValue,
              [in] long nVisible,
diff --git a/offapi/com/sun/star/awt/XSimpleAnimation.idl b/offapi/com/sun/star/awt/XSimpleAnimation.idl
index bff9eeeb5a90..7ba74e337d73 100755..100644
--- a/offapi/com/sun/star/awt/XSimpleAnimation.idl
+++ b/offapi/com/sun/star/awt/XSimpleAnimation.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_XSimpleAnimation_idl__
 #define __com_sun_star_awt_XSimpleAnimation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XSimpleTabController.idl b/offapi/com/sun/star/awt/XSimpleTabController.idl
index b705a9b73ace..e69829de3936 100644
--- a/offapi/com/sun/star/awt/XSimpleTabController.idl
+++ b/offapi/com/sun/star/awt/XSimpleTabController.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_XSimpleTabController_idl__
 #define __com_sun_star_awt_XSimpleTabController_idl__
 
-#ifndef __com_sun_star_awt_XTabListener_idl__
 #include <com/sun/star/awt/XTabListener.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
@@ -56,7 +45,7 @@ published interface XSimpleTabController : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** create a new tab and return an unique ID,
-        which can be used further to adress this tab by using other methods
+        which can be used further to address this tab by using other methods
         of this interface.
 
         @return [long
@@ -71,7 +60,7 @@ published interface XSimpleTabController : com::sun::star::uno::XInterface
                 the ID of the tab, which should be removed.
 
         @throws  ::com::sun::star::lang::IndexOutOfBoundsException
-                if the specified ID isnt used inside this tab controller.
+                if the specified ID isn't used inside this tab controller.
      */
     void removeTab( [in] long ID )
         raises( com::sun::star::lang::IndexOutOfBoundsException );
@@ -106,7 +95,7 @@ published interface XSimpleTabController : com::sun::star::uno::XInterface
                 the ID of the tab, which should be changed.
 
         @throws  ::com::sun::star::lang::IndexOutOfBoundsException
-                if the specified ID isnt used inside this tab controller.
+                if the specified ID isn't used inside this tab controller.
      */
     void setTabProps( [in] long                                          ID         ,
                       [in] sequence< com::sun::star::beans::NamedValue > Properties )
@@ -119,7 +108,7 @@ published interface XSimpleTabController : com::sun::star::uno::XInterface
                 the ID of the tab.
 
         @throws  ::com::sun::star::lang::IndexOutOfBoundsException
-                if the specified ID isnt used inside this tab controller.
+                if the specified ID isn't used inside this tab controller.
      */
     sequence< com::sun::star::beans::NamedValue > getTabProps( [in] long ID )
         raises( com::sun::star::lang::IndexOutOfBoundsException );
@@ -128,14 +117,14 @@ published interface XSimpleTabController : com::sun::star::uno::XInterface
     /** activate the specified tab.
 
         @descr  The new tab will be activated and all listener will get an event describing this.
-                Of course there will be an event too, which notify's listener about the deactivation
+                Of course there will be an event too, which notifies listener about the deactivation
                 of the last active tab.
 
         @param  ID
                 the ID of the new active tab.
 
         @throws  ::com::sun::star::lang::IndexOutOfBoundsException
-                if the specified ID isnt used inside this tab controller.
+                if the specified ID isn't used inside this tab controller.
      */
     void activateTab( [in] long ID )
         raises( com::sun::star::lang::IndexOutOfBoundsException );
@@ -143,24 +132,24 @@ published interface XSimpleTabController : com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** return the unique ID of the current active tab.
 
-        @eturn  [long]
+        @return  [long]
                 the ID of the active tab.
      */
     long getActiveTabID();
 
     //-------------------------------------------------------------------------
-    /** register listener for inserting/removing tab's and changing her properties.
+    /** register listener for inserting/removing tabs and changing their properties.
 
         @param  Listener
-                the listener for registration.
+                the listener to register.
      */
     void addTabListener( [in] XTabListener Listener );
 
     //-------------------------------------------------------------------------
-    /** deregister listener for inserting/removing tab's and changing her properties.
+    /** unregister listener for inserting/removing tabs and changing their properties.
 
         @param  Listener
-                the listener for deregistration.
+                the listener to unregister.
      */
     void removeTabListener( [in] XTabListener Listener );
 };
diff --git a/offapi/com/sun/star/awt/XSpinField.idl b/offapi/com/sun/star/awt/XSpinField.idl
index 580472c8372f..8c830691e7ac 100644
--- a/offapi/com/sun/star/awt/XSpinField.idl
+++ b/offapi/com/sun/star/awt/XSpinField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XSpinField_idl__
 #define __com_sun_star_awt_XSpinField_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XSpinListener_idl__
 #include <com/sun/star/awt/XSpinListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XSpinListener.idl b/offapi/com/sun/star/awt/XSpinListener.idl
index 05446c42d29e..5a6b5ee0e887 100644
--- a/offapi/com/sun/star/awt/XSpinListener.idl
+++ b/offapi/com/sun/star/awt/XSpinListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XSpinListener_idl__
 #define __com_sun_star_awt_XSpinListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_SpinEvent_idl__
 #include <com/sun/star/awt/SpinEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XSpinValue.idl b/offapi/com/sun/star/awt/XSpinValue.idl
index be02f115a2c2..1876c30105c5 100644
--- a/offapi/com/sun/star/awt/XSpinValue.idl
+++ b/offapi/com/sun/star/awt/XSpinValue.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_XSpinValue_idl__
 #define __com_sun_star_awt_XSpinValue_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XAdjustmentListener_idl__
 #include <com/sun/star/awt/XAdjustmentListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XSystemChildFactory.idl b/offapi/com/sun/star/awt/XSystemChildFactory.idl
index d55fa005c4b2..99df05c3398a 100644
--- a/offapi/com/sun/star/awt/XSystemChildFactory.idl
+++ b/offapi/com/sun/star/awt/XSystemChildFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_awt_XSystemChildFactory_idl__
 #define __com_sun_star_awt_XSystemChildFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -53,7 +51,7 @@ published interface XSystemChildFactory : com::sun::star::uno::XInterface
         the created window.
 
         @param Parent
-        a sytem-specific handle to a window.
+        a system-specific handle to a window.
 
         <p>You must check the machine ID and the process ID.<BR>
         WIN32: HWND.<BR>
@@ -62,7 +60,6 @@ published interface XSystemChildFactory : com::sun::star::uno::XInterface
         JAVA: global reference to a java.awt.Component
         object provided from the JNI-API.<BR>
 
-        OS2: HWND.<BR>
         MAC: Not supported.<BR></p>
 
         @param ProcessId
diff --git a/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl b/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl
index 6ac9cce707b0..047453d41b7a 100644
--- a/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl
+++ b/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XSystemDependentMenuPeer_idl__
 #define __com_sun_star_awt_XSystemDependentMenuPeer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -51,7 +49,7 @@ interface XSystemDependentMenuPeer: com::sun::star::uno::XInterface
     /** returns a system-specific window handle.
 
         @returns
-        a sytem-specific handle to a menu
+        a system-specific handle to a menu
         or 0 if the menu is not in the same process.
 
         <p>You must check the machine ID and the process ID.<BR>
diff --git a/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl b/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl
index 29fae21d88a6..7f75ca63bb35 100644
--- a/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl
+++ b/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XSystemDependentWindowPeer_idl__
 #define __com_sun_star_awt_XSystemDependentWindowPeer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -51,7 +49,7 @@ published interface XSystemDependentWindowPeer: com::sun::star::uno::XInterface
     /** returns a system-specific window handle.
 
         @returns
-        a sytem-specific handle to a window
+        a system-specific handle to a window
         or 0 if the window is not in the same process.
 
         <p>You must check the machine ID and the process ID.<BR>
@@ -61,8 +59,6 @@ published interface XSystemDependentWindowPeer: com::sun::star::uno::XInterface
         JAVA: Returns a global reference to a java.awt.Component
         object provided from the JNI-API.<BR>
 
-        OS2: Returns an HWND if possible, otherwise 0.<BR>
-
         MAC: Returns a ptr to the NSView implementing the window.<BR>
 
         XWINDOW: Returns a structure SystemDependentXWindow
diff --git a/offapi/com/sun/star/awt/XTabController.idl b/offapi/com/sun/star/awt/XTabController.idl
index c5d36ed8238f..62310664d8bd 100644
--- a/offapi/com/sun/star/awt/XTabController.idl
+++ b/offapi/com/sun/star/awt/XTabController.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_awt_XTabController_idl__
 #define __com_sun_star_awt_XTabController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
 #include <com/sun/star/awt/XTabControllerModel.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XControlContainer_idl__
 #include <com/sun/star/awt/XControlContainer.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XControl_idl__
 #include <com/sun/star/awt/XControl.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XTabControllerModel.idl b/offapi/com/sun/star/awt/XTabControllerModel.idl
index 275a72d379ed..c9482c4d52d9 100644
--- a/offapi/com/sun/star/awt/XTabControllerModel.idl
+++ b/offapi/com/sun/star/awt/XTabControllerModel.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XTabControllerModel_idl__
 #define __com_sun_star_awt_XTabControllerModel_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XControlModel_idl__
 #include <com/sun/star/awt/XControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XTabListener.idl b/offapi/com/sun/star/awt/XTabListener.idl
index e169aa8fa126..682cfe9d1d99 100644
--- a/offapi/com/sun/star/awt/XTabListener.idl
+++ b/offapi/com/sun/star/awt/XTabListener.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_XTabListener_idl__
 #define __com_sun_star_awt_XTabListener_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
@@ -85,7 +77,7 @@ published interface XTabListener : com::sun::star::lang::XEventListener
     void activated( [in] long ID );
 
     //-------------------------------------------------------------------------
-    /** a tab was deactivated, because another tab becames the new active state.
+    /** a tab was deactivated, because another tab became the new active state.
      */
     void deactivated( [in] long ID );
 };
diff --git a/offapi/com/sun/star/awt/XTextArea.idl b/offapi/com/sun/star/awt/XTextArea.idl
index 051a74901303..7f7c3bb19339 100644
--- a/offapi/com/sun/star/awt/XTextArea.idl
+++ b/offapi/com/sun/star/awt/XTextArea.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XTextArea_idl__
 #define __com_sun_star_awt_XTextArea_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XTextComponent.idl b/offapi/com/sun/star/awt/XTextComponent.idl
index 92bbc8e8d219..833a66d858ca 100644
--- a/offapi/com/sun/star/awt/XTextComponent.idl
+++ b/offapi/com/sun/star/awt/XTextComponent.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XTextComponent_idl__
 #define __com_sun_star_awt_XTextComponent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XTextListener_idl__
 #include <com/sun/star/awt/XTextListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Selection_idl__
 #include <com/sun/star/awt/Selection.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XTextEditField.idl b/offapi/com/sun/star/awt/XTextEditField.idl
index b2898a72c6c7..e8dcc4154685 100644
--- a/offapi/com/sun/star/awt/XTextEditField.idl
+++ b/offapi/com/sun/star/awt/XTextEditField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XTextEditField_idl__
 #define __com_sun_star_awt_XTextEditField_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XTextLayoutConstrains.idl b/offapi/com/sun/star/awt/XTextLayoutConstrains.idl
index 642d525afe42..3cbe58721420 100644
--- a/offapi/com/sun/star/awt/XTextLayoutConstrains.idl
+++ b/offapi/com/sun/star/awt/XTextLayoutConstrains.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__
 #define __com_sun_star_awt_XTextLayoutConstrains_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 
 //=============================================================================
@@ -42,7 +38,7 @@
 
 //=============================================================================
 
-/** specifies the layout contstraints for a text field.
+/** specifies the layout constraints for a text field.
  */
 published interface XTextLayoutConstrains: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/awt/XTextListener.idl b/offapi/com/sun/star/awt/XTextListener.idl
index cd476068b1ef..ed7d1598b48c 100644
--- a/offapi/com/sun/star/awt/XTextListener.idl
+++ b/offapi/com/sun/star/awt/XTextListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XTextListener_idl__
 #define __com_sun_star_awt_XTextListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_TextEvent_idl__
 #include <com/sun/star/awt/TextEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XThrobber.idl b/offapi/com/sun/star/awt/XThrobber.idl
index 04dc6887cbe9..ba66a43ac7af 100644
--- a/offapi/com/sun/star/awt/XThrobber.idl
+++ b/offapi/com/sun/star/awt/XThrobber.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_XThrobber_idl__
 #define __com_sun_star_awt_XThrobber_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XTimeField.idl b/offapi/com/sun/star/awt/XTimeField.idl
index d2efddd4fa2b..7a6df6df216a 100644
--- a/offapi/com/sun/star/awt/XTimeField.idl
+++ b/offapi/com/sun/star/awt/XTimeField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XTimeField_idl__
 #define __com_sun_star_awt_XTimeField_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XToggleButton.idl b/offapi/com/sun/star/awt/XToggleButton.idl
index 447eebd5806c..45f9afec8e56 100644
--- a/offapi/com/sun/star/awt/XToggleButton.idl
+++ b/offapi/com/sun/star/awt/XToggleButton.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XToggleButton_idl__
 #define __com_sun_star_awt_XToggleButton_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XItemEventBroadcaster_idl__
 #include <com/sun/star/awt/XItemEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XToolkit.idl b/offapi/com/sun/star/awt/XToolkit.idl
index c92d928403ce..37c6bbd5cbba 100644
--- a/offapi/com/sun/star/awt/XToolkit.idl
+++ b/offapi/com/sun/star/awt/XToolkit.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_awt_XToolkit_idl__
 #define __com_sun_star_awt_XToolkit_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
 #include <com/sun/star/awt/XWindowPeer.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
-#ifndef __com_sun_star_awt_WindowDescriptor_idl__
 #include <com/sun/star/awt/WindowDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XDevice_idl__
 #include <com/sun/star/awt/XDevice.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XRegion_idl__
 #include <com/sun/star/awt/XRegion.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XTopWindow.idl b/offapi/com/sun/star/awt/XTopWindow.idl
index e74fc7e7ae7a..974761a8a52f 100644
--- a/offapi/com/sun/star/awt/XTopWindow.idl
+++ b/offapi/com/sun/star/awt/XTopWindow.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XTopWindow_idl__
 #define __com_sun_star_awt_XTopWindow_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XTopWindowListener_idl__
 #include <com/sun/star/awt/XTopWindowListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XMenuBar_idl__
 #include <com/sun/star/awt/XMenuBar.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XTopWindowListener.idl b/offapi/com/sun/star/awt/XTopWindowListener.idl
index cf78ff343839..2f88c80328be 100644
--- a/offapi/com/sun/star/awt/XTopWindowListener.idl
+++ b/offapi/com/sun/star/awt/XTopWindowListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XTopWindowListener_idl__
 #define __com_sun_star_awt_XTopWindowListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -76,7 +72,7 @@ published interface XTopWindowListener: com::sun::star::lang::XEventListener
 
     //-------------------------------------------------------------------------
 
-    /** is invoked when a window is de-iconified.
+    /** is invoked when a window is deiconified.
      */
     [oneway] void windowNormalized( [in] com::sun::star::lang::EventObject e );
 
@@ -88,7 +84,7 @@ published interface XTopWindowListener: com::sun::star::lang::XEventListener
 
     //-------------------------------------------------------------------------
 
-    /** is invoked when a window is de-activated.
+    /** is invoked when a window is deactivated.
      */
     [oneway] void windowDeactivated( [in] com::sun::star::lang::EventObject e );
 
diff --git a/offapi/com/sun/star/awt/XUnitConversion.idl b/offapi/com/sun/star/awt/XUnitConversion.idl
index aed9b4cbeee2..c0efbdacd493 100644
--- a/offapi/com/sun/star/awt/XUnitConversion.idl
+++ b/offapi/com/sun/star/awt/XUnitConversion.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_XUnitConversion_idl__
 #define __com_sun_star_awt_XUnitConversion_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XUnoControlContainer.idl b/offapi/com/sun/star/awt/XUnoControlContainer.idl
index 2d28b7152246..371361b7c2a4 100644
--- a/offapi/com/sun/star/awt/XUnoControlContainer.idl
+++ b/offapi/com/sun/star/awt/XUnoControlContainer.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XUnoControlContainer_idl__
 #define __com_sun_star_awt_XUnoControlContainer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XTabController_idl__
 #include <com/sun/star/awt/XTabController.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XUserInputInterception.idl b/offapi/com/sun/star/awt/XUserInputInterception.idl
index a329e7d2f39e..8814791fde1e 100644
--- a/offapi/com/sun/star/awt/XUserInputInterception.idl
+++ b/offapi/com/sun/star/awt/XUserInputInterception.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_awt_XUserInputInterception_idl__
 #define __com_sun_star_awt_XUserInputInterception_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XKeyHandler_idl__
 #include <com/sun/star/awt/XKeyHandler.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMouseClickHandler_idl__
 #include <com/sun/star/awt/XMouseClickHandler.idl>
-#endif
 
 module com {  module sun {  module star {  module awt {
 
@@ -66,7 +58,7 @@ published interface XUserInputInterception : ::com::sun::star::uno::XInterface
     /** Remove the specified listener from the list of listeners.
         @param xHandler
             If the reference is empty then nothing will be changed.  If the
-            handler has been registered twice (or more) then all refrences
+            handler has been registered twice (or more) then all references
             will be removed.
     */
     [oneway] void removeKeyHandler (
@@ -88,7 +80,7 @@ published interface XUserInputInterception : ::com::sun::star::uno::XInterface
     /** Remove the specified listener from the list of listeners.
         @param xHandler
             If the reference is empty then nothing will be changed.  If the
-            handler has been registered twice (or more) then all refrences
+            handler has been registered twice (or more) then all references
             will be removed.
     */
     [oneway] void removeMouseClickHandler (
diff --git a/offapi/com/sun/star/awt/XVclContainer.idl b/offapi/com/sun/star/awt/XVclContainer.idl
index 9126ad18f912..8b3111c9241e 100644
--- a/offapi/com/sun/star/awt/XVclContainer.idl
+++ b/offapi/com/sun/star/awt/XVclContainer.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XVclContainer_idl__
 #define __com_sun_star_awt_XVclContainer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XVclContainerListener_idl__
 #include <com/sun/star/awt/XVclContainerListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XVclContainerListener.idl b/offapi/com/sun/star/awt/XVclContainerListener.idl
index 160972dd3036..939bdedc77c9 100644
--- a/offapi/com/sun/star/awt/XVclContainerListener.idl
+++ b/offapi/com/sun/star/awt/XVclContainerListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XVclContainerListener_idl__
 #define __com_sun_star_awt_XVclContainerListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_VclContainerEvent_idl__
 #include <com/sun/star/awt/VclContainerEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XVclContainerPeer.idl b/offapi/com/sun/star/awt/XVclContainerPeer.idl
index 363e580ac7dc..081192e0cac3 100644
--- a/offapi/com/sun/star/awt/XVclContainerPeer.idl
+++ b/offapi/com/sun/star/awt/XVclContainerPeer.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XVclContainerPeer_idl__
 #define __com_sun_star_awt_XVclContainerPeer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XVclWindowPeer.idl b/offapi/com/sun/star/awt/XVclWindowPeer.idl
index 1e5e03b58b1f..cb8541bd5280 100644
--- a/offapi/com/sun/star/awt/XVclWindowPeer.idl
+++ b/offapi/com/sun/star/awt/XVclWindowPeer.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_XVclWindowPeer_idl__
 #define __com_sun_star_awt_XVclWindowPeer_idl__
 
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
 #include <com/sun/star/awt/XWindowPeer.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XView.idl b/offapi/com/sun/star/awt/XView.idl
index fdc57452683f..93c14ed7120c 100644
--- a/offapi/com/sun/star/awt/XView.idl
+++ b/offapi/com/sun/star/awt/XView.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XView_idl__
 #define __com_sun_star_awt_XView_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XGraphics_idl__
 #include <com/sun/star/awt/XGraphics.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 
 //=============================================================================
@@ -46,7 +40,7 @@
 
 //=============================================================================
 
-/** makes it possible to attach an oputput device to the object.
+/** makes it possible to attach an output device to the object.
 
     <p>This kind of object is called view-object.</p>
  */
diff --git a/offapi/com/sun/star/awt/XWindow.idl b/offapi/com/sun/star/awt/XWindow.idl
index 7742fd7b284d..ffba08dfaff4 100644
--- a/offapi/com/sun/star/awt/XWindow.idl
+++ b/offapi/com/sun/star/awt/XWindow.idl
@@ -27,37 +27,21 @@
 #ifndef __com_sun_star_awt_XWindow_idl__
 #define __com_sun_star_awt_XWindow_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XWindowListener_idl__
 #include <com/sun/star/awt/XWindowListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XFocusListener_idl__
 #include <com/sun/star/awt/XFocusListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XKeyListener_idl__
 #include <com/sun/star/awt/XKeyListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XMouseListener_idl__
 #include <com/sun/star/awt/XMouseListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XMouseMotionListener_idl__
 #include <com/sun/star/awt/XMouseMotionListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XPaintListener_idl__
 #include <com/sun/star/awt/XPaintListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XWindow2.idl b/offapi/com/sun/star/awt/XWindow2.idl
index 0116ff88943b..3badb862fd04 100644
--- a/offapi/com/sun/star/awt/XWindow2.idl
+++ b/offapi/com/sun/star/awt/XWindow2.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_XWindow2_idl__
 #define __com_sun_star_awt_XWindow2_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/awt/XWindowListener.idl b/offapi/com/sun/star/awt/XWindowListener.idl
index 2b7fb824d6fc..1546b44a7711 100644
--- a/offapi/com/sun/star/awt/XWindowListener.idl
+++ b/offapi/com/sun/star/awt/XWindowListener.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_awt_XWindowListener_idl__
 #define __com_sun_star_awt_XWindowListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_WindowEvent_idl__
 #include <com/sun/star/awt/WindowEvent.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XWindowListener2.idl b/offapi/com/sun/star/awt/XWindowListener2.idl
index bfb0dbab86fe..87296ffbad30 100644
--- a/offapi/com/sun/star/awt/XWindowListener2.idl
+++ b/offapi/com/sun/star/awt/XWindowListener2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_XWindowListener2_idl__
 #define __com_sun_star_awt_XWindowListener2_idl__
 
-#ifndef __com_sun_star_awt_XWindowListener_idl__
 #include <com/sun/star/awt/XWindowListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XWindowPeer.idl b/offapi/com/sun/star/awt/XWindowPeer.idl
index cc734d0c8784..e21e9c133c5f 100644
--- a/offapi/com/sun/star/awt/XWindowPeer.idl
+++ b/offapi/com/sun/star/awt/XWindowPeer.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_XWindowPeer_idl__
 #define __com_sun_star_awt_XWindowPeer_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
index 36e41d9384f9..0c64be948b6f 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_DefaultGridColumnModel_idl__
 #define __com_sun_star_awt_DefaultGridColumnModel_idl__
 
-#ifndef __com_sun_star_awt_grid_XGridColumnModel_idl__
 #include <com/sun/star/awt/grid/XGridColumnModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl b/offapi/com/sun/star/awt/grid/GridColumn.idl
index 383ff37eb673..25682223a41f 100644
--- a/offapi/com/sun/star/awt/grid/GridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_GridColumn_idl__
 #define __com_sun_star_awt_GridColumn_idl__
 
-#ifndef __com_sun_star_awt_grid_XGridColumn_idl__
 #include <com/sun/star/awt/grid/XGridColumn.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
index 0fe19dfea71a..10a5b03a058e 100644
--- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_grid_GridColumnEvent_idl__
 #define __com_sun_star_awt_grid_GridColumnEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
index ab180207a187..167acd434cff 100644
--- a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
+++ b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: GridInvalidDataException.idl,v $
- * $Revision: 1.0 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,9 +27,7 @@
 #ifndef __com_sun_star_awt_grid_GridInvalidDataException_idl__
 #define __com_sun_star_awt_grid_GridInvalidDataException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
index 791f691f20c6..cd3cc9623e9e 100644
--- a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
+++ b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: GridInvalidModelException.idl,v $
- * $Revision: 1.0 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,9 +27,7 @@
 #ifndef __com_sun_star_awt_grid_GridInvalidModelException_idl__
 #define __com_sun_star_awt_grid_GridInvalidModelException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
index e9b87c2fe7ed..fd67af6c4c1e 100644
--- a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_GridSelectionEvent_idl__
 #define __com_sun_star_awt_GridSelectionEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_awt_grid_SelectionEventType_idl__
 #include <com/sun/star/awt/grid/SelectionEventType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/grid/SortableGridDataModel.idl b/offapi/com/sun/star/awt/grid/SortableGridDataModel.idl
index 2b7aca1ca9f9..2b7aca1ca9f9 100755..100644
--- a/offapi/com/sun/star/awt/grid/SortableGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/SortableGridDataModel.idl
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
index 5141e8a52cce..ee8c5b303e5e 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_UnoControlGrid_idl__
 #define __com_sun_star_awt_UnoControlGrid_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
-#ifndef __com_sun_star_awt_grid_XGridControl_idl__
 #include <com/sun/star/awt/grid/XGridControl.idl>
-#endif
 
 //=============================================================================
 
@@ -48,7 +44,7 @@
     <p>
     <h4>The Column Model</h4>
     <p>The horizontal structure of the grid is defined by the <type>XGridColumnModel</type> implemented in <type>DefaultGridColumnModel</type>
-    The <type>XGridColumn</type> implemented in <typeGridColumn</type> describes the properties and behavior of a single column. Use the <member>XGridColumnModel::addColumn()</member> to add a column to the column model.
+    The <type>XGridColumn</type> implemented in <type>GridColumn</type> describes the properties and behavior of a single column. Use the <member>XGridColumnModel::addColumn()</member> to add a column to the column model.
     </p>
     <p>
     <h4>The Data Model</h4>
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
index d19225fbc6c2..3a359c451ff4 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -100,7 +100,7 @@ published interface XGridColumn
      */
     [attribute] ::com::sun::star::style::HorizontalAlignment HorizontalAlign;
 
-    /** A title is displayed in the colum header row if <method>UnoControlGridModel::ShowRowHeader</method> is set to <true/>**/
+    /** A title is displayed in the column header row if <method>UnoControlGridModel::ShowRowHeader</method> is set to <true/>**/
     [attribute] string Title;
 
     /** is the help text associated with the column.
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
index 434be67ed3f8..b868fd2228e6 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -30,7 +30,6 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/XComponent.idl>
 #include <com/sun/star/util/XCloneable.idl>
-
 #include <com/sun/star/awt/grid/XGridColumn.idl>
 #include <com/sun/star/container/XContainer.idl>
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
diff --git a/offapi/com/sun/star/awt/grid/XGridDataListener.idl b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
index 9a324aee2668..60be14026bd9 100644
--- a/offapi/com/sun/star/awt/grid/XGridDataListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_grid_XGridDataListener_idl__
 #define __com_sun_star_awt_grid_XGridDataListener_idl__
 
-#ifndef __com_sun_star_awt_grid_GridDataEvent_idl__
 #include <com/sun/star/awt/grid/GridDataEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/grid/XGridSelection.idl b/offapi/com/sun/star/awt/grid/XGridSelection.idl
index aa7fd5e42b4b..be8d1a9b8b76 100644
--- a/offapi/com/sun/star/awt/grid/XGridSelection.idl
+++ b/offapi/com/sun/star/awt/grid/XGridSelection.idl
@@ -63,9 +63,9 @@ interface XGridSelection
     */
     void deselectRow( [in] long RowIndex );
 
-    /** Returns the indicies of all selected rows.
+    /** Returns the indices of all selected rows.
         @returns
-            a sequence of indicies.
+            a sequence of indices.
     */
     sequence< long > getSelection();
 
diff --git a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
index 61e8d3050b0d..2dba133f9d5d 100644
--- a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_grid_XGridSelectionListener_idl__
 #define __com_sun_star_awt_grid_XGridSelectionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_grid_GridSelectionEvent_idl__
 #include <com/sun/star/awt/grid/GridSelectionEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl b/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl
index 5e10820ff9ef..d387b9f3cea7 100755..100644
--- a/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl
@@ -91,9 +91,9 @@ interface XMutableGridDataModel : XGridDataModel
     /** updates the content of a given row.
 
         <p>The change in the data model will be notified to registered listeners via
-        <member">XGridDataListener::dataChanged</member>. The <member>GridDataEvent::FirstColumn</member> and
+        <member>XGridDataListener::dataChanged</member>. The <member>GridDataEvent::FirstColumn</member> and
         <member>GridDataEvent::LastColumn</member> will denote the smallest respectively largest column
-        index from <argColumnIndexes</arg>.</p>
+        index from <arg>ColumnIndexes</arg>.</p>
 
         @param ColumnIndexes
             contains the column indexes of the cells, which should be updated
diff --git a/offapi/com/sun/star/awt/grid/XSortableGridData.idl b/offapi/com/sun/star/awt/grid/XSortableGridData.idl
index 9dcf9d95fb85..9dcf9d95fb85 100755..100644
--- a/offapi/com/sun/star/awt/grid/XSortableGridData.idl
+++ b/offapi/com/sun/star/awt/grid/XSortableGridData.idl
diff --git a/offapi/com/sun/star/awt/grid/XSortableMutableGridDataModel.idl b/offapi/com/sun/star/awt/grid/XSortableMutableGridDataModel.idl
index bbcd6bc29540..bbcd6bc29540 100755..100644
--- a/offapi/com/sun/star/awt/grid/XSortableMutableGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/XSortableMutableGridDataModel.idl
diff --git a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
index e3fd0c46b1db..c3a0db7d1ce4 100644
--- a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
+++ b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_tab_TabPageActivationEvent_idl__
 #define __com_sun_star_awt_tab_TabPageActivationEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/tab/makefile.mk b/offapi/com/sun/star/awt/tab/makefile.mk
index 39d1e66f7643..249760988b61 100644
--- a/offapi/com/sun/star/awt/tab/makefile.mk
+++ b/offapi/com/sun/star/awt/tab/makefile.mk
@@ -33,7 +33,6 @@ TARGET=cssawttab
 PACKAGE=com$/sun$/star$/awt$/tab
 
 # --- Settings -----------------------------------------------------
-
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # ------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/awt/tree/ExpandVetoException.idl b/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
index b3675f334336..70c2b5dd0fdc 100644
--- a/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
+++ b/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_tree_ExpandVetoException_idl__
 #define __com_sun_star_awt_tree_ExpandVetoException_idl__
 
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__
 #include <com/sun/star/awt/tree/TreeExpansionEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl b/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
index 8ecf6eba67a4..ad8bff90a4d5 100644
--- a/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_tree_MutableTreeDataModel_idl__
 #define __com_sun_star_awt_tree_MutableTreeDataModel_idl__
 
-#ifndef __com_sun_star_awt_tree_XMutableTreeDataModelidl__
 #include <com/sun/star/awt/tree/XMutableTreeDataModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
 #include <com/sun/star/awt/tree/XMutableTreeNode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/tree/MutableTreeNode.idl b/offapi/com/sun/star/awt/tree/MutableTreeNode.idl
index c2db72d93bb6..8aca7b30f4c5 100644
--- a/offapi/com/sun/star/awt/tree/MutableTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/MutableTreeNode.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_tree_MutableTreeNode_idl__
 #define __com_sun_star_awt_tree_MutableTreeNode_idl__
 
-#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
 #include <com/sun/star/awt/tree/XMutableTreeNode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/tree/TreeControl.idl b/offapi/com/sun/star/awt/tree/TreeControl.idl
index 79ed4b86ab90..cac1923660d3 100644
--- a/offapi/com/sun/star/awt/tree/TreeControl.idl
+++ b/offapi/com/sun/star/awt/tree/TreeControl.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_tree_TreeControl_idl__
 #define __com_sun_star_awt_tree_TreeControl_idl__
 
-#ifndef __com_sun_star_awt_tree_XTreeControl_idl__
 #include <com/sun/star/awt/tree/XTreeControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/tree/TreeControlModel.idl b/offapi/com/sun/star/awt/tree/TreeControlModel.idl
index 6a84d52e165e..4a619cdb9712 100644
--- a/offapi/com/sun/star/awt/tree/TreeControlModel.idl
+++ b/offapi/com/sun/star/awt/tree/TreeControlModel.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_tree_TreeControlModel_idl__
 #define __com_sun_star_awt_tree_TreeControlModel_idl__
 
-#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__
 #include <com/sun/star/awt/tree/XTreeDataModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_view_SelectionType_idl__
 #include <com/sun/star/view/SelectionType.idl>
-#endif
 
 //=============================================================================
 
@@ -73,7 +65,7 @@ service TreeControlModel
     [property] boolean RootDisplayed;
 
     /** Specifies whether the node handles should be displayed.
-        <p>The handles are doted lines that visualize the tree like hirarchie<p>
+        <p>The handles are doted lines that visualize the tree like hierarchy<p>
         <p>The default value is <TRUE/></p>
     */
     [property] boolean ShowsHandles;
diff --git a/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl b/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
index c0210870788f..d267301910ac 100644
--- a/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
+++ b/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_tree_TreeDataModelEvent_idl__
 #define __com_sun_star_awt_tree_TreeDataModelEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
 #include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl b/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
index 524b43dd3e6b..c30a531abdc4 100644
--- a/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
+++ b/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__
 #define __com_sun_star_awt_tree_TreeExpansionEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
 #include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl b/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
index 6634a31caaf4..0651234b521b 100644
--- a/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_tree_XMutableTreeDataModel_idl__
 #define __com_sun_star_awt_tree_XMutableTreeDataModel_idl__
 
-#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__
 #include <com/sun/star/awt/tree/XTreeDataModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
 #include <com/sun/star/awt/tree/XMutableTreeNode.idl>
-#endif
 
 //=============================================================================
 
@@ -44,15 +39,15 @@ module com {  module sun {  module star {  module awt {  module tree {
 /** This is the editable version of the <type>XTreeDataModel</type>.
 
     <p>Note that only <type>XTreeNode</type> created from the same instance with <member>createNode</member>
-    are valids nodes for this instance.</p>
+    are valid nodes for this instance.</p>
  */
 published interface XMutableTreeDataModel : XTreeDataModel
 {
     /** creates a new tree node with the given value and given settings.
 
         @param DisplayValue
-            should be convertable to a string and is used by the <type>XTreeControl</type>
-            as a textual represenation of the created node.
+            should be convertible to a string and is used by the <type>XTreeControl</type>
+            as a textual representation of the created node.
 
         @param ChildrenOnDemand
             if <TRUE/> is used as a parameter, the created node will be treated as a non-leaf
diff --git a/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl b/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
index fed14b189297..065f52b793a9 100644
--- a/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
 #define __com_sun_star_awt_tree_XMutableTreeNode_idl__
 
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
 #include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 //=============================================================================
 
@@ -92,10 +85,10 @@ published interface XMutableTreeNode : XTreeNode
     /** sets the display value of this node */
     void setDisplayValue( [in] any Value );
 
-    /** Stores an implementation dependend value.
+    /** Stores an implementation dependent value.
 
         <p>You can use this attribute to store data for this node that
-        is independend of the display value</p>
+        is independent of the display value</p>
     */
     [attribute] any DataValue;
 
diff --git a/offapi/com/sun/star/awt/tree/XTreeControl.idl b/offapi/com/sun/star/awt/tree/XTreeControl.idl
index 390d2c7a3b0c..bfe34b3226ce 100644
--- a/offapi/com/sun/star/awt/tree/XTreeControl.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeControl.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_tree_XTreeControl_idl__
 #define __com_sun_star_awt_tree_XTreeControl_idl__
 
-#ifndef __com_sun_star_awt_XControl_idl__
 #include <com/sun/star/awt/XControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XTreeExpansionListener_idl__
 #include <com/sun/star/awt/tree/XTreeExpansionListener.idl>
-#endif
-
-#ifndef __com_sun_star_view_XMultiSelectionSupplier_idl__
 #include <com/sun/star/view/XMultiSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XTreeEditListener_idl__
 #include <com/sun/star/awt/tree/XTreeEditListener.idl>
-#endif
 
 //=============================================================================
 
@@ -61,7 +50,7 @@ published interface XTreeControl
         <type>XTreeNode</type> or sequence&lt;<type>XTreeNode</type>&gt;.</p>
 
         <method scope="::com::sun::star::view">XSelectionSupplier::getSelection()</method>
-        returns an emtpy any for no selection, an any with <type>XTreeNode</type> for
+        returns an empty any for no selection, an any with <type>XTreeNode</type> for
         a single selection and a sequence&lt;<type>XTreeNode</type>&gt; for a multiselection.
     */
     interface ::com::sun::star::view::XMultiSelectionSupplier;
@@ -179,14 +168,14 @@ published interface XTreeControl
     /** If the given URL points to a loadable graphic, the graphic is rendered
         before expanded non leaf nodes.
 
-        <p>This can be overriden for individual nodes by <member>XTreeNode::getExpandedGraphicURL()</member></p>
+        <p>This can be overridden for individual nodes by <member>XTreeNode::getExpandedGraphicURL()</member></p>
     */
     [attribute] string DefaultExpandedGraphicURL;
 
     /** If the given URL points to a loadable graphic, the graphic is rendered
         before collapsed non leaf nodes.
 
-        <p>This can be overriden for individual nodes by <member>XTreeNode::getCollapsedGraphicURL()</member></p>
+        <p>This can be overridden for individual nodes by <member>XTreeNode::getCollapsedGraphicURL()</member></p>
     */
     [attribute] string DefaultCollapsedGraphicURL;
 
diff --git a/offapi/com/sun/star/awt/tree/XTreeDataModel.idl b/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
index f6eac6b115a3..b79b9718f81a 100644
--- a/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__
 #define __com_sun_star_awt_tree_XTreeDataModel_idl__
 
-#ifndef __com_sun_star_awt_tree_XTreeDataModelListener_idl__
 #include <com/sun/star/awt/tree/XTreeDataModelListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
 #include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
index 5925eeab3f5d..3858e37ecad7 100644
--- a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_awt_tree_XTreeDataModelListener_idl__
 #define __com_sun_star_awt_tree_XTreeDataModelListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_tree_TreeDataModelEvent_idl__
 #include <com/sun/star/awt/tree/TreeDataModelEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/tree/XTreeEditListener.idl b/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
index 75875c7fbc92..89bbd5f0d3fb 100644
--- a/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_awt_tree_XTreeEditListener_idl__
 #define __com_sun_star_awt_tree_XTreeEditListener_idl__
 
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
 #include <com/sun/star/awt/tree/XTreeNode.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
 //=============================================================================
 
@@ -46,7 +38,7 @@ module com {  module sun {  module star {  module awt {  module tree {
 //=============================================================================
 
 /** You can implement this interface and register with <method scope="XTreeControl">addTreeEditListener</method>
-    to get notifcaitons when editing of a node starts and ends.
+    to get notifications when editing of a node starts and ends.
 
     <p>You have to set the <member>TreeControlModel::Editable</member> property to
     <TRUE/> before a tree supports editing.</p>
diff --git a/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl b/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
index 759e74a40e50..95e57877359e 100644
--- a/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_awt_tree_XTreeExpansionListener_idl__
 #define __com_sun_star_awt_tree_XTreeExpansionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__
 #include <com/sun/star/awt/tree/TreeExpansionEvent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_ExpandVetoException_idl__
 #include <com/sun/star/awt/tree/ExpandVetoException.idl>
-#endif
 
 //=============================================================================
 
@@ -55,7 +48,7 @@ published interface XTreeExpansionListener: com::sun::star::lang::XEventListener
 {
     /** Invoked when a node with children on demand is about to be expanded.
 
-        <p>This event is invoked befor the <method>treeExpanding()</method>
+        <p>This event is invoked before the <method>treeExpanding()</method>
         event.</p>
     */
     void requestChildNodes( [in] TreeExpansionEvent Event );
@@ -64,7 +57,7 @@ published interface XTreeExpansionListener: com::sun::star::lang::XEventListener
 
         @throws ExpandVetoException
             to notify the calling <type>XTreeControl</type> that expanding
-            <member>TreeExpansionEvent::Node</member> should faild.
+            <member>TreeExpansionEvent::Node</member> should fail.
     */
     void treeExpanding( [in] TreeExpansionEvent Event )
         raises ( ExpandVetoException );
@@ -73,15 +66,15 @@ published interface XTreeExpansionListener: com::sun::star::lang::XEventListener
 
         @throws ExpandVetoException
             to notify the calling <type>XTreeControl</type> that collapsing
-            <member>TreeExpansionEvent::Node</member> should faild.
+            <member>TreeExpansionEvent::Node</member> should fail.
     */
     void treeCollapsing( [in] TreeExpansionEvent Event )
         raises ( ExpandVetoException );
 
-    /** Called whenever a node in the tree has been succesfully expanded. */
+    /** Called whenever a node in the tree has been successfully expanded. */
     void treeExpanded( [in] TreeExpansionEvent Event );
 
-    /** Called whenever a node in the tree has been succesfully collapsed. */
+    /** Called whenever a node in the tree has been successfully collapsed. */
     void treeCollapsed( [in] TreeExpansionEvent Event );
 };
 
diff --git a/offapi/com/sun/star/awt/tree/XTreeNode.idl b/offapi/com/sun/star/awt/tree/XTreeNode.idl
index e867f40d2bc4..2afa185b1adb 100644
--- a/offapi/com/sun/star/awt/tree/XTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeNode.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_awt_tree_XTreeNode_idl__
 #define __com_sun_star_awt_tree_XTreeNode_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef _com_sun_star_lang_IndexOutOfBoundsException_idl_
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl b/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
index 82f4d48daadb..6fc8e70295f5 100644
--- a/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
+++ b/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_chart_AccessibleChartDocumentView_idl__
 #define __com_sun_star_chart_AccessibleChartDocumentView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
 
 module com {  module sun {  module star {  module chart {
 
diff --git a/offapi/com/sun/star/chart/AccessibleChartElement.idl b/offapi/com/sun/star/chart/AccessibleChartElement.idl
index 3ea8cc050a10..6670e495bb9b 100644
--- a/offapi/com/sun/star/chart/AccessibleChartElement.idl
+++ b/offapi/com/sun/star/chart/AccessibleChartElement.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_chart_AccessibleChartElement_idl__
 #define __com_sun_star_chart_AccessibleChartElement_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 
 module com {  module sun {  module star {  module chart {
@@ -57,7 +51,7 @@ module com {  module sun {  module star {  module chart {
 
     <p>The
        <type scope="::com::sun::star::accessibility">XAccessibleExtendedComponent</type>
-       is suported by all chart elements.</p>
+       is supported by all chart elements.</p>
 
     @since OOo 1.1.2
 */
@@ -97,7 +91,7 @@ published service AccessibleChartElement
              contain children, all other objects in a chart do not, i.e., are
              leaves in the document representation tree.</dd>
          <dt>Parent</dt>
-             <dd>Because the <code>setParent</code> method from the JAA has
+             <dd>Because the <code>setParent</code> method from the JAVA has
              been removed, the reference to the parent has to be provided in an
              implementation specific way.</dd>
          <dt>Relations</dt>
diff --git a/offapi/com/sun/star/chart/AreaDiagram.idl b/offapi/com/sun/star/chart/AreaDiagram.idl
index 19f3cee7ce1d..b21a7907ffc2 100644
--- a/offapi/com/sun/star/chart/AreaDiagram.idl
+++ b/offapi/com/sun/star/chart/AreaDiagram.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_chart_AreaDiagram_idl__
 #define __com_sun_star_chart_AreaDiagram_idl__
 
-#ifndef __com_sun_star_chart_Diagram_idl__
 #include <com/sun/star/chart/Diagram.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
 #include <com/sun/star/chart/ChartStatistics.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
 #include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
 #include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__
 #include <com/sun/star/chart/ChartAxisZSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
 #include <com/sun/star/chart/Dim3DDiagram.idl>
-#endif
 
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
 #include <com/sun/star/chart/StackableDiagram.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/BarDiagram.idl b/offapi/com/sun/star/chart/BarDiagram.idl
index 7040781e9c50..8a818bf018c8 100644
--- a/offapi/com/sun/star/chart/BarDiagram.idl
+++ b/offapi/com/sun/star/chart/BarDiagram.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_chart_BarDiagram_idl__
 #define __com_sun_star_chart_BarDiagram_idl__
 
-#ifndef __com_sun_star_chart_Diagram_idl__
 #include <com/sun/star/chart/Diagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
 #include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
 #include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
 #include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__
 #include <com/sun/star/chart/ChartAxisZSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
 #include <com/sun/star/chart/Dim3DDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
 #include <com/sun/star/chart/StackableDiagram.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/BubbleDiagram.idl b/offapi/com/sun/star/chart/BubbleDiagram.idl
index 99298ed947d7..a3dccac9e6df 100644
--- a/offapi/com/sun/star/chart/BubbleDiagram.idl
+++ b/offapi/com/sun/star/chart/BubbleDiagram.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_chart_BubbleDiagram_idl__
 #define __com_sun_star_chart_BubbleDiagram_idl__
 
-#ifndef __com_sun_star_chart_Diagram_idl__
 #include <com/sun/star/chart/Diagram.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
 #include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
 #include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
 #include <com/sun/star/chart/ChartStatistics.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/Chart3DBarProperties.idl b/offapi/com/sun/star/chart/Chart3DBarProperties.idl
index 31b77e446bf9..82418c6ed8c8 100644
--- a/offapi/com/sun/star/chart/Chart3DBarProperties.idl
+++ b/offapi/com/sun/star/chart/Chart3DBarProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_Chart3DBarProperties_idl__
 #define __com_sun_star_chart_Chart3DBarProperties_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/ChartArea.idl b/offapi/com/sun/star/chart/ChartArea.idl
index 66109be78471..ce5c8b633d38 100644
--- a/offapi/com/sun/star/chart/ChartArea.idl
+++ b/offapi/com/sun/star/chart/ChartArea.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_chart_ChartArea_idl__
 #define __com_sun_star_chart_ChartArea_idl__
 
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/ChartAxis.idl b/offapi/com/sun/star/chart/ChartAxis.idl
index 20a6722af5d8..76867ecc6b95 100644
--- a/offapi/com/sun/star/chart/ChartAxis.idl
+++ b/offapi/com/sun/star/chart/ChartAxis.idl
@@ -27,49 +27,20 @@
 #ifndef __com_sun_star_chart_ChartAxis_idl__
 #define __com_sun_star_chart_ChartAxis_idl__
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartAxisArrangeOrderType_idl__
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisPosition_idl__
 #include <com/sun/star/chart/ChartAxisPosition.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisLabelPosition_idl__
 #include <com/sun/star/chart/ChartAxisLabelPosition.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisMarkPosition_idl__
 #include <com/sun/star/chart/ChartAxisMarkPosition.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisType_idl__
 #include <com/sun/star/chart/ChartAxisType.idl>
-#endif
-
-#ifndef __com_sun_star_chart_TimeIncrement_idl__
 #include <com/sun/star/chart/TimeIncrement.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XAxis_idl__
 #include <com/sun/star/chart/XAxis.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
 
 //=============================================================================
 
@@ -134,7 +105,7 @@ published service ChartAxis
 
     /**
     Contains the number of help intervals within a main interval. E.g. a StepHelpCount of 5 divides
-    the main interval into 5 pieces and thus producces 4 help tick marks.
+    the main interval into 5 pieces and thus produces 4 help tick marks.
     */
     [optional, property] long StepHelpCount;
 
@@ -148,7 +119,7 @@ published service ChartAxis
 
     //-------------------------------------------------------------------------
 
-    /** The maximium value of the axis scale is calculated by the chart if
+    /** The maximum value of the axis scale is calculated by the chart if
         this property is <TRUE/>.
      */
     [optional, property] boolean AutoMax;
@@ -217,8 +188,8 @@ published service ChartAxis
     //-------------------------------------------------------------------------
 
     /** Indicates the reference value where bars or areas have their grounding.
-        This property has only an effect when the used odf fileformat does not allow for
-        further axis posiioning or the axis is a secondary y-axis.
+        This property has only an effect when the used ODF file format does not allow for
+        further axis positioning or the axis is a secondary y-axis.
      */
     [optional, property] double Origin;
 
diff --git a/offapi/com/sun/star/chart/ChartAxisMarkPosition.idl b/offapi/com/sun/star/chart/ChartAxisMarkPosition.idl
index c47d7b05f22d..14eaf013af2b 100644
--- a/offapi/com/sun/star/chart/ChartAxisMarkPosition.idl
+++ b/offapi/com/sun/star/chart/ChartAxisMarkPosition.idl
@@ -48,14 +48,14 @@ published enum ChartAxisMarkPosition
     //-------------------------------------------------------------------------
 
     /** The interval marks are drawn at the axis line.
-    This makes a difference to 'AT_LABELS' only when the labels are not placed near the axis (@see ChartAxisLabelPosition).
+    This makes a difference to "AT_LABELS" only when the labels are not placed near the axis (@see ChartAxisLabelPosition).
      */
     AT_AXIS,
 
     //-------------------------------------------------------------------------
 
     /** Interval marks are drawn at the axis line and also besides the axis labels.
-    This makes a difference to 'AT_LABELS' only when the labels are not placed near the axis (@see ChartAxisLabelPosition).
+    This makes a difference to "AT_LABELS" only when the labels are not placed near the axis (@see ChartAxisLabelPosition).
      */
     AT_LABELS_AND_AXIS
 };
diff --git a/offapi/com/sun/star/chart/ChartAxisXSupplier.idl b/offapi/com/sun/star/chart/ChartAxisXSupplier.idl
index 3b3060bb8df7..b814d0451470 100644
--- a/offapi/com/sun/star/chart/ChartAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartAxisXSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
 #define __com_sun_star_chart_ChartAxisXSupplier_idl__
 
-#ifndef __com_sun_star_chart_XAxisXSupplier_idl__
 #include <com/sun/star/chart/XAxisXSupplier.idl>
-#endif
 
 
 //=============================================================================
@@ -38,7 +36,7 @@
 
 //=============================================================================
 
-/** has to be supported by charts providing the cpabilities of a
+/** has to be supported by charts providing the capabilities of a
    horizontal axis, i.e., an <em>x</em>-axis.
  */
 published service ChartAxisXSupplier
diff --git a/offapi/com/sun/star/chart/ChartAxisYSupplier.idl b/offapi/com/sun/star/chart/ChartAxisYSupplier.idl
index aa33daad6031..527c322df5ea 100644
--- a/offapi/com/sun/star/chart/ChartAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartAxisYSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
 #define __com_sun_star_chart_ChartAxisYSupplier_idl__
 
-#ifndef __com_sun_star_chart_XAxisYSupplier_idl__
 #include <com/sun/star/chart/XAxisYSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartAxisZSupplier.idl b/offapi/com/sun/star/chart/ChartAxisZSupplier.idl
index 3e18709c0319..13a22ef31a05 100644
--- a/offapi/com/sun/star/chart/ChartAxisZSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartAxisZSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__
 #define __com_sun_star_chart_ChartAxisZSupplier_idl__
 
-#ifndef __com_sun_star_chart_XAxisZSupplier_idl__
 #include <com/sun/star/chart/XAxisZSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartData.idl b/offapi/com/sun/star/chart/ChartData.idl
index ec5efcbe8db6..a6d9d04c9e9d 100644
--- a/offapi/com/sun/star/chart/ChartData.idl
+++ b/offapi/com/sun/star/chart/ChartData.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartData_idl__
 #define __com_sun_star_chart_ChartData_idl__
 
-#ifndef __com_sun_star_chart_XChartData_idl__
 #include <com/sun/star/chart/XChartData.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartDataArray.idl b/offapi/com/sun/star/chart/ChartDataArray.idl
index da4e2564f5c9..5490c423361f 100644
--- a/offapi/com/sun/star/chart/ChartDataArray.idl
+++ b/offapi/com/sun/star/chart/ChartDataArray.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_ChartDataArray_idl__
 #define __com_sun_star_chart_ChartDataArray_idl__
 
-#ifndef __com_sun_star_chart_ChartData_idl__
 #include <com/sun/star/chart/ChartData.idl>
-#endif
 
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
 #include <com/sun/star/chart/XChartDataArray.idl>
-#endif
 
-#ifndef __com_sun_star_chart_XChartData_idl__
 #include <com/sun/star/chart/XChartData.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartDataChangeEvent.idl b/offapi/com/sun/star/chart/ChartDataChangeEvent.idl
index bca4a7b565fd..a6288be21d5a 100644
--- a/offapi/com/sun/star/chart/ChartDataChangeEvent.idl
+++ b/offapi/com/sun/star/chart/ChartDataChangeEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_ChartDataChangeEvent_idl__
 #define __com_sun_star_chart_ChartDataChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartDataChangeType_idl__
 #include <com/sun/star/chart/ChartDataChangeType.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartDataPoint.idl b/offapi/com/sun/star/chart/ChartDataPoint.idl
index 3494ae1f3853..5c8545d82757 100644
--- a/offapi/com/sun/star/chart/ChartDataPoint.idl
+++ b/offapi/com/sun/star/chart/ChartDataPoint.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartDataPoint_idl__
 #define __com_sun_star_chart_ChartDataPoint_idl__
 
-#ifndef __com_sun_star_chart_ChartDataValue_idl__
 #include <com/sun/star/chart/ChartDataValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/ChartDataPointProperties.idl b/offapi/com/sun/star/chart/ChartDataPointProperties.idl
index d7a9db2da496..c648852cd81c 100644
--- a/offapi/com/sun/star/chart/ChartDataPointProperties.idl
+++ b/offapi/com/sun/star/chart/ChartDataPointProperties.idl
@@ -27,29 +27,16 @@
 #ifndef __com_sun_star_chart_ChartDataPointProperties_idl__
 #define __com_sun_star_chart_ChartDataPointProperties_idl__
 
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
 
-#ifndef __com_sun_star_chart_Chart3DBarPropertiesidl__
 #include <com/sun/star/chart/Chart3DBarProperties.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/ChartDataRow.idl b/offapi/com/sun/star/chart/ChartDataRow.idl
index 05f2002d60c8..d4fb2f24a26a 100644
--- a/offapi/com/sun/star/chart/ChartDataRow.idl
+++ b/offapi/com/sun/star/chart/ChartDataRow.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartDataRow_idl__
 #define __com_sun_star_chart_ChartDataRow_idl__
 
-#ifndef __com_sun_star_chart_ChartDataValue_idl__
 #include <com/sun/star/chart/ChartDataValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/ChartDataRowProperties.idl b/offapi/com/sun/star/chart/ChartDataRowProperties.idl
index 27a02f598c3e..1bb1faf5c88e 100644
--- a/offapi/com/sun/star/chart/ChartDataRowProperties.idl
+++ b/offapi/com/sun/star/chart/ChartDataRowProperties.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_chart_ChartDataRowProperties_idl__
 #define __com_sun_star_chart_ChartDataRowProperties_idl__
 
-#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__
 #include <com/sun/star/chart/ChartDataPointProperties.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
 #include <com/sun/star/chart/ChartStatistics.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/ChartDocument.idl b/offapi/com/sun/star/chart/ChartDocument.idl
index 2c5227329778..5de20f5a0b59 100644
--- a/offapi/com/sun/star/chart/ChartDocument.idl
+++ b/offapi/com/sun/star/chart/ChartDocument.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_chart_ChartDocument_idl__
 #define __com_sun_star_chart_ChartDocument_idl__
 
-#ifndef __com_sun_star_chart_XChartDocument_idl__
 #include <com/sun/star/chart/XChartDocument.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
-
 #include <com/sun/star/drawing/XDrawPageSupplier.idl>
 
-
 //=============================================================================
 
  module com {  module sun {  module star {  module chart {
diff --git a/offapi/com/sun/star/chart/ChartGrid.idl b/offapi/com/sun/star/chart/ChartGrid.idl
index b4c6f6001e13..db391a7f98c0 100644
--- a/offapi/com/sun/star/chart/ChartGrid.idl
+++ b/offapi/com/sun/star/chart/ChartGrid.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_ChartGrid_idl__
 #define __com_sun_star_chart_ChartGrid_idl__
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/ChartLegend.idl b/offapi/com/sun/star/chart/ChartLegend.idl
index a0fcf587c7ef..c16ec6774411 100644
--- a/offapi/com/sun/star/chart/ChartLegend.idl
+++ b/offapi/com/sun/star/chart/ChartLegend.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_chart_ChartLegend_idl__
 #define __com_sun_star_chart_ChartLegend_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartLegendPosition_idl__
 #include <com/sun/star/chart/ChartLegendPosition.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartLegendExpansion.idl b/offapi/com/sun/star/chart/ChartLegendExpansion.idl
index 3808c7ea9ad1..3808c7ea9ad1 100755..100644
--- a/offapi/com/sun/star/chart/ChartLegendExpansion.idl
+++ b/offapi/com/sun/star/chart/ChartLegendExpansion.idl
diff --git a/offapi/com/sun/star/chart/ChartLegendPosition.idl b/offapi/com/sun/star/chart/ChartLegendPosition.idl
index a7ef3e49bfdc..580a0002b76f 100644
--- a/offapi/com/sun/star/chart/ChartLegendPosition.idl
+++ b/offapi/com/sun/star/chart/ChartLegendPosition.idl
@@ -62,7 +62,7 @@ published enum ChartLegendPosition
 
     /** displays the chart legend above the diagram.
 
-        <p>The second entry in the legend is placed an the right hand
+        <p>The second entry in the legend is placed on the right hand
         side of the first one.</p>
      */
     TOP,
@@ -80,7 +80,7 @@ published enum ChartLegendPosition
 
     /** displays the chart legend beneath the diagram.
 
-        <p>The second entry in the legend is placed an the right hand
+        <p>The second entry in the legend is placed on the right hand
         side of the first one.</p>
      */
     BOTTOM
diff --git a/offapi/com/sun/star/chart/ChartLine.idl b/offapi/com/sun/star/chart/ChartLine.idl
index e9ae401edc11..fcb3e051d713 100644
--- a/offapi/com/sun/star/chart/ChartLine.idl
+++ b/offapi/com/sun/star/chart/ChartLine.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_ChartLine_idl__
 #define __com_sun_star_chart_ChartLine_idl__
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl b/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl
index b771d59e4c8d..7a123199999c 100644
--- a/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl
+++ b/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_ChartPieSegmentProperties_idl__
 #define __com_sun_star_chart_ChartPieSegmentProperties_idl__
 
-#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__
 #include <com/sun/star/chart/ChartDataPointProperties.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartRegressionCurveType.idl b/offapi/com/sun/star/chart/ChartRegressionCurveType.idl
index ab31eceabe2a..cfeb748104ea 100644
--- a/offapi/com/sun/star/chart/ChartRegressionCurveType.idl
+++ b/offapi/com/sun/star/chart/ChartRegressionCurveType.idl
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-/** specifiest the type of the regression curve to be displayed.
+/** specifies the type of the regression curve to be displayed.
  */
 published enum ChartRegressionCurveType
 {
diff --git a/offapi/com/sun/star/chart/ChartSolidType.idl b/offapi/com/sun/star/chart/ChartSolidType.idl
index e07500fd7802..6aeaabbdb824 100644
--- a/offapi/com/sun/star/chart/ChartSolidType.idl
+++ b/offapi/com/sun/star/chart/ChartSolidType.idl
@@ -59,7 +59,7 @@ published constants ChartSolidType
 
     //-------------------------------------------------------------------------
 
-    /** pyramidial with a square as base
+    /** pyramidal with a square as base
      */
     const long PYRAMID = 3;
 
diff --git a/offapi/com/sun/star/chart/ChartStatistics.idl b/offapi/com/sun/star/chart/ChartStatistics.idl
index 303c3fd9a706..695c942bbd2d 100644
--- a/offapi/com/sun/star/chart/ChartStatistics.idl
+++ b/offapi/com/sun/star/chart/ChartStatistics.idl
@@ -27,22 +27,10 @@
 #ifndef __com_sun_star_chart_ChartStatistics_idl__
 #define __com_sun_star_chart_ChartStatistics_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartErrorCategory_idl__
 #include <com/sun/star/chart/ChartErrorCategory.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartErrorIndicatorType_idl__
 #include <com/sun/star/chart/ChartErrorIndicatorType.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartRegressionCurveType_idl__
 #include <com/sun/star/chart/ChartRegressionCurveType.idl>
-#endif
-
 #include <com/sun/star/chart/ErrorBarStyle.idl>
 
 //=============================================================================
@@ -120,7 +108,7 @@ published service ChartStatistics
     /** specifies the percentage that is used to display error bars.
 
         <p>The length of the error indicators is calculated for each
-        data point by taking the given percentatge of its value.</p>
+        data point by taking the given percentage of its value.</p>
 
         <p>this setting is effective if the
         <member>ChartStatistics::ErrorCategory</member> is set to
@@ -163,7 +151,7 @@ published service ChartStatistics
      */
     [property] com::sun::star::chart::ChartRegressionCurveType RegressionCurves;
 
-    /** contains a cell range string for positve error bars. This
+    /** contains a cell range string for positive error bars. This
         property is used when the <type>ErrorBarCategory</type> is set
         to <member>ErrorBarCategory::FROM_DATA</member>.
      */
diff --git a/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl b/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl
index a9f72f0824cc..34fdcbff3f2f 100644
--- a/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_ChartTableAddressSupplier_idl__
 #define __com_sun_star_chart_ChartTableAddressSupplier_idl__
 
-#ifndef __com_sun_star_chart_ChartSeriesAddress_idl__
 #include <com/sun/star/chart/ChartSeriesAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/ChartTitle.idl b/offapi/com/sun/star/chart/ChartTitle.idl
index a35ba37300cd..e0ac92fa2645 100644
--- a/offapi/com/sun/star/chart/ChartTitle.idl
+++ b/offapi/com/sun/star/chart/ChartTitle.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_chart_ChartTitle_idl__
 #define __com_sun_star_chart_ChartTitle_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
 
 //=============================================================================
 
@@ -83,7 +78,7 @@ published service ChartTitle
 
     /** contains the text of the title.
 
-        <p>Note that you can not change attributes of parts of a
+        <p>Note that you cannot change attributes of parts of a
         title, e.g., put one word in bold characters.  All formatting
         affects the entire string.</p>
      */
diff --git a/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl b/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
index 66e1970da564..96b1f7091e65 100644
--- a/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_ChartTwoAxisXSupplier_idl__
 #define __com_sun_star_chart_ChartTwoAxisXSupplier_idl__
 
-#ifndef __com_sun_star_chart_XTwoAxisXSupplier_idl__
 #include <com/sun/star/chart/XTwoAxisXSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
 #include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl b/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
index cba1dfd64b32..a251105e6188 100644
--- a/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
 #define __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
 
-#ifndef __com_sun_star_chart_XTwoAxisYSupplier_idl__
 #include <com/sun/star/chart/XTwoAxisYSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
 #include <com/sun/star/chart/ChartAxisYSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/Diagram.idl b/offapi/com/sun/star/chart/Diagram.idl
index 854baadb38cc..26fc9523712c 100644
--- a/offapi/com/sun/star/chart/Diagram.idl
+++ b/offapi/com/sun/star/chart/Diagram.idl
@@ -27,33 +27,16 @@
 #ifndef __com_sun_star_chart_Diagram_idl__
 #define __com_sun_star_chart_Diagram_idl__
 
-#ifndef __com_sun_star_chart_XDiagram_idl__
 #include <com/sun/star/chart/XDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XAxisSupplier_idl__
 #include <com/sun/star/chart/XAxisSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XDiagramPositioning_idl__
 #include <com/sun/star/chart/XDiagramPositioning.idl>
-#endif
 
-#ifndef __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
 #include <com/sun/star/chart/XSecondAxisTitleSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartDataRowSource_idl__
 #include <com/sun/star/chart/ChartDataRowSource.idl>
-#endif
 
-#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/Dim3DDiagram.idl b/offapi/com/sun/star/chart/Dim3DDiagram.idl
index 16d010c26a58..83d0783290cd 100644
--- a/offapi/com/sun/star/chart/Dim3DDiagram.idl
+++ b/offapi/com/sun/star/chart/Dim3DDiagram.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_chart_Dim3DDiagram_idl__
 #define __com_sun_star_chart_Dim3DDiagram_idl__
 
-#ifndef __com_sun_star_chart_X3DDisplay_idl__
 #include <com/sun/star/chart/X3DDisplay.idl>
-#endif
-#ifndef __com_sun_star_chart_X3DDefaultSetter_idl__
 #include <com/sun/star/chart/X3DDefaultSetter.idl>
-#endif
 
 
 //=============================================================================
@@ -53,7 +49,7 @@ published service Dim3DDiagram
      */
     interface com::sun::star::chart::X3DDisplay;
 
-    /** makes it easy to set suiteable defaults for illumination and rotation for 3D charts
+    /** makes it easy to set suitable defaults for illumination and rotation for 3D charts
      */
     [optional] interface ::com::sun::star::chart::X3DDefaultSetter;
 
diff --git a/offapi/com/sun/star/chart/DonutDiagram.idl b/offapi/com/sun/star/chart/DonutDiagram.idl
index ff041f4561e0..b99aeaab58fc 100644
--- a/offapi/com/sun/star/chart/DonutDiagram.idl
+++ b/offapi/com/sun/star/chart/DonutDiagram.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_DonutDiagram_idl__
 #define __com_sun_star_chart_DonutDiagram_idl__
 
-#ifndef __com_sun_star_chart_Diagram_idl__
 #include <com/sun/star/chart/Diagram.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/ErrorBarStyle.idl b/offapi/com/sun/star/chart/ErrorBarStyle.idl
index 12738b4e60a2..12738b4e60a2 100755..100644
--- a/offapi/com/sun/star/chart/ErrorBarStyle.idl
+++ b/offapi/com/sun/star/chart/ErrorBarStyle.idl
diff --git a/offapi/com/sun/star/chart/FilledNetDiagram.idl b/offapi/com/sun/star/chart/FilledNetDiagram.idl
index bb6682ad4688..e930d649f3f4 100644
--- a/offapi/com/sun/star/chart/FilledNetDiagram.idl
+++ b/offapi/com/sun/star/chart/FilledNetDiagram.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_chart_FilledNetDiagram_idl__
 #define __com_sun_star_chart_FilledNetDiagram_idl__
 
-#ifndef __com_sun_star_chart_Diagram_idl__
 #include <com/sun/star/chart/Diagram.idl>
-#endif
 
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
 #include <com/sun/star/chart/StackableDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
 #include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
 #include <com/sun/star/chart/ChartAxisYSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/LineDiagram.idl b/offapi/com/sun/star/chart/LineDiagram.idl
index b9a118238486..e6134c130655 100644
--- a/offapi/com/sun/star/chart/LineDiagram.idl
+++ b/offapi/com/sun/star/chart/LineDiagram.idl
@@ -27,37 +27,20 @@
 #ifndef __com_sun_star_chart_LineDiagram_idl__
 #define __com_sun_star_chart_LineDiagram_idl__
 
-#ifndef __com_sun_star_chart_Diagram_idl__
 #include <com/sun/star/chart/Diagram.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
 #include <com/sun/star/chart/ChartStatistics.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
 #include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
 #include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__
 #include <com/sun/star/chart/ChartAxisZSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
 #include <com/sun/star/chart/Dim3DDiagram.idl>
-#endif
 
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
 #include <com/sun/star/chart/StackableDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/NetDiagram.idl b/offapi/com/sun/star/chart/NetDiagram.idl
index 328e33b50c69..4c69cd7cb004 100644
--- a/offapi/com/sun/star/chart/NetDiagram.idl
+++ b/offapi/com/sun/star/chart/NetDiagram.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_NetDiagram_idl__
 #define __com_sun_star_chart_NetDiagram_idl__
 
-#ifndef __com_sun_star_chart_Diagram_idl__
 #include <com/sun/star/chart/Diagram.idl>
-#endif
 
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
 #include <com/sun/star/chart/StackableDiagram.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
 #include <com/sun/star/chart/ChartAxisYSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/PieDiagram.idl b/offapi/com/sun/star/chart/PieDiagram.idl
index 54010971d450..424ea795031c 100644
--- a/offapi/com/sun/star/chart/PieDiagram.idl
+++ b/offapi/com/sun/star/chart/PieDiagram.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_PieDiagram_idl__
 #define __com_sun_star_chart_PieDiagram_idl__
 
-#ifndef __com_sun_star_chart_Diagram_idl__
 #include <com/sun/star/chart/Diagram.idl>
-#endif
 
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
 #include <com/sun/star/chart/Dim3DDiagram.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/StockDiagram.idl b/offapi/com/sun/star/chart/StockDiagram.idl
index 9d960468b17b..17e424494a09 100644
--- a/offapi/com/sun/star/chart/StockDiagram.idl
+++ b/offapi/com/sun/star/chart/StockDiagram.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_chart_StockDiagram_idl__
 #define __com_sun_star_chart_StockDiagram_idl__
 
-#ifndef __com_sun_star_chart_XStatisticDisplay_idl__
 #include <com/sun/star/chart/XStatisticDisplay.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
 #include <com/sun/star/chart/ChartStatistics.idl>
-#endif
 
-#ifndef __com_sun_star_chart_Diagram_idl__
 #include <com/sun/star/chart/Diagram.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
 #include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
 #include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/X3DDefaultSetter.idl b/offapi/com/sun/star/chart/X3DDefaultSetter.idl
index d002b9d4e76d..787b7bd92aff 100644
--- a/offapi/com/sun/star/chart/X3DDefaultSetter.idl
+++ b/offapi/com/sun/star/chart/X3DDefaultSetter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_X3DDefaultSetter_idl__
 #define __com_sun_star_chart_X3DDefaultSetter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -38,7 +36,7 @@
 
 //=============================================================================
 
-/** makes it easy to set suiteable defaults for illumination and rotation for 3D charts
+/** makes it easy to set suitable defaults for illumination and rotation for 3D charts
 
     @see Dim3DDiagram
  */
@@ -48,12 +46,12 @@ published interface X3DDefaultSetter : com::sun::star::uno::XInterface
     */
     void set3DSettingsToDefault();
 
-    /** sets a suiteable default for the rotation of the current 3D chart.
+    /** sets a suitable default for the rotation of the current 3D chart.
     The result may depend on the current chart type.
     */
     void setDefaultRotation();
 
-    /** set suiteable defaults for the illumination of the current 3D chart.
+    /** set suitable defaults for the illumination of the current 3D chart.
     The result may dependent on other 3D settings as rotation or shade mode. It may depend on the current chart type also.
     */
     void setDefaultIllumination();
diff --git a/offapi/com/sun/star/chart/X3DDisplay.idl b/offapi/com/sun/star/chart/X3DDisplay.idl
index f117ccc7b4af..7c9c27646477 100644
--- a/offapi/com/sun/star/chart/X3DDisplay.idl
+++ b/offapi/com/sun/star/chart/X3DDisplay.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_X3DDisplay_idl__
 #define __com_sun_star_chart_X3DDisplay_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/XAxis.idl b/offapi/com/sun/star/chart/XAxis.idl
index 763e2f45412b..0cd75f65459c 100755..100644
--- a/offapi/com/sun/star/chart/XAxis.idl
+++ b/offapi/com/sun/star/chart/XAxis.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart_XAxis_idl
 #define com_sun_star_chart_XAxis_idl
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 module com {  module sun {  module star {  module chart {
 
diff --git a/offapi/com/sun/star/chart/XAxisSupplier.idl b/offapi/com/sun/star/chart/XAxisSupplier.idl
index cf2bde2e310d..f87d2453ddce 100755..100644
--- a/offapi/com/sun/star/chart/XAxisSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart_XAxisSupplier_idl
 #define com_sun_star_chart_XAxisSupplier_idl
 
-#ifndef __com_sun_star_chart_XAxis_idl__
 #include <com/sun/star/chart/XAxis.idl>
-#endif
 
 module com {  module sun {  module star {  module chart {
 
diff --git a/offapi/com/sun/star/chart/XAxisXSupplier.idl b/offapi/com/sun/star/chart/XAxisXSupplier.idl
index 5a66136d25f0..21a934bf6265 100644
--- a/offapi/com/sun/star/chart/XAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisXSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_XAxisXSupplier_idl__
 #define __com_sun_star_chart_XAxisXSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/XAxisYSupplier.idl b/offapi/com/sun/star/chart/XAxisYSupplier.idl
index a84562415948..4ad491ee82db 100644
--- a/offapi/com/sun/star/chart/XAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisYSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_XAxisYSupplier_idl__
 #define __com_sun_star_chart_XAxisYSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/XAxisZSupplier.idl b/offapi/com/sun/star/chart/XAxisZSupplier.idl
index 220aef76afb2..79e4b6816b3a 100644
--- a/offapi/com/sun/star/chart/XAxisZSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisZSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_XAxisZSupplier_idl__
 #define __com_sun_star_chart_XAxisZSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/XChartData.idl b/offapi/com/sun/star/chart/XChartData.idl
index 4bcb4b199704..9aecb429e00a 100644
--- a/offapi/com/sun/star/chart/XChartData.idl
+++ b/offapi/com/sun/star/chart/XChartData.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_XChartData_idl__
 #define __com_sun_star_chart_XChartData_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_chart_XChartDataChangeEventListener_idl__
 #include <com/sun/star/chart/XChartDataChangeEventListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/XChartDataArray.idl b/offapi/com/sun/star/chart/XChartDataArray.idl
index 4e7519864382..1de92ba82891 100644
--- a/offapi/com/sun/star/chart/XChartDataArray.idl
+++ b/offapi/com/sun/star/chart/XChartDataArray.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_XChartDataArray_idl__
 #define __com_sun_star_chart_XChartDataArray_idl__
 
-#ifndef __com_sun_star_chart_XChartData_idl__
 #include <com/sun/star/chart/XChartData.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl b/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl
index 13b6145a452f..57be96cddbbb 100644
--- a/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl
+++ b/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_XChartDataChangeEventListener_idl__
 #define __com_sun_star_chart_XChartDataChangeEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartDataChangeEvent_idl__
 #include <com/sun/star/chart/ChartDataChangeEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/XChartDocument.idl b/offapi/com/sun/star/chart/XChartDocument.idl
index 1ffd268be59d..bb3d871cc8a0 100644
--- a/offapi/com/sun/star/chart/XChartDocument.idl
+++ b/offapi/com/sun/star/chart/XChartDocument.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_chart_XChartDocument_idl__
 #define __com_sun_star_chart_XChartDocument_idl__
 
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_chart_XDiagram_idl__
 #include <com/sun/star/chart/XDiagram.idl>
-#endif
 
-#ifndef __com_sun_star_chart_XChartData_idl__
 #include <com/sun/star/chart/XChartData.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl b/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
index 4e5af5f3ba83..680080c296be 100755..100644
--- a/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
+++ b/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart_XComplexDescriptionAccess_idl__
 #define __com_sun_star_chart_XComplexDescriptionAccess_idl__
 
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
 #include <com/sun/star/chart/XChartDataArray.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/XDateCategories.idl b/offapi/com/sun/star/chart/XDateCategories.idl
index 868670cb9c6f..868670cb9c6f 100755..100644
--- a/offapi/com/sun/star/chart/XDateCategories.idl
+++ b/offapi/com/sun/star/chart/XDateCategories.idl
diff --git a/offapi/com/sun/star/chart/XDiagram.idl b/offapi/com/sun/star/chart/XDiagram.idl
index 959ec6ce9dcd..ee3fc65edd29 100644
--- a/offapi/com/sun/star/chart/XDiagram.idl
+++ b/offapi/com/sun/star/chart/XDiagram.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_chart_XDiagram_idl__
 #define __com_sun_star_chart_XDiagram_idl__
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart/XDiagramPositioning.idl b/offapi/com/sun/star/chart/XDiagramPositioning.idl
index f64bbef4b641..b5e869a91401 100644
--- a/offapi/com/sun/star/chart/XDiagramPositioning.idl
+++ b/offapi/com/sun/star/chart/XDiagramPositioning.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDiagramPositioning.idl,v $
- * $Revision: 1.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,12 +27,8 @@
 #ifndef __com_sun_star_chart_XDiagramPositioning_idl__
 #define __com_sun_star_chart_XDiagramPositioning_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 //=============================================================================
 
@@ -49,11 +42,11 @@
  */
 interface XDiagramPositioning : com::sun::star::uno::XInterface
 {
-    /** the diagram will be placed automtically
+    /** the diagram will be placed automatically
     */
     void setAutomaticDiagramPositioning();
 
-    /** @returns whether the diagram is placed automtically
+    /** @returns whether the diagram is placed automatically
     */
     boolean isAutomaticDiagramPositioning();
 
diff --git a/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl b/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
index fcd347eeed47..527f58e2f735 100644
--- a/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
+++ b/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
@@ -1,13 +1,8 @@
 #ifndef __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
 #define __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 
 module com {  module sun {  module star {  module chart {
@@ -21,4 +16,4 @@ interface XSecondAxisTitleSupplier: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-#endif 
\ No newline at end of file
+#endif
diff --git a/offapi/com/sun/star/chart/XStatisticDisplay.idl b/offapi/com/sun/star/chart/XStatisticDisplay.idl
index a81038ab0c6d..094f4d480bab 100644
--- a/offapi/com/sun/star/chart/XStatisticDisplay.idl
+++ b/offapi/com/sun/star/chart/XStatisticDisplay.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_XStatisticDisplay_idl__
 #define __com_sun_star_chart_XStatisticDisplay_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl b/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl
index 2fbbf8f6cbf5..831f911f2a04 100644
--- a/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_XTwoAxisXSupplier_idl__
 #define __com_sun_star_chart_XTwoAxisXSupplier_idl__
 
-#ifndef __com_sun_star_chart_XAxisXSupplier_idl__
 #include <com/sun/star/chart/XAxisXSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl b/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl
index 01c8839df463..530363735d2e 100644
--- a/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_chart_XTwoAxisYSupplier_idl__
 #define __com_sun_star_chart_XTwoAxisYSupplier_idl__
 
-#ifndef __com_sun_star_chart_XAxisYSupplier_idl__
 #include <com/sun/star/chart/XAxisYSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart/XYDiagram.idl b/offapi/com/sun/star/chart/XYDiagram.idl
index 501608669f0c..423e7aadb072 100644
--- a/offapi/com/sun/star/chart/XYDiagram.idl
+++ b/offapi/com/sun/star/chart/XYDiagram.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_chart_XYDiagram_idl__
 #define __com_sun_star_chart_XYDiagram_idl__
 
-#ifndef __com_sun_star_chart_Diagram_idl__
 #include <com/sun/star/chart/Diagram.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
 #include <com/sun/star/chart/ChartStatistics.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
 #include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
 #include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_chart_LineDiagram_idl__
 #include <com/sun/star/chart/LineDiagram.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart2/Axis.idl b/offapi/com/sun/star/chart2/Axis.idl
index 009abd05a500..d5daba1232b8 100644
--- a/offapi/com/sun/star/chart2/Axis.idl
+++ b/offapi/com/sun/star/chart2/Axis.idl
@@ -28,15 +28,12 @@
 #define com_sun_star_chart_Axis_idl
 
 #include <com/sun/star/beans/PropertySet.idl>
-
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.idl>
 #include <com/sun/star/chart/ChartAxisPosition.idl>
 #include <com/sun/star/chart/ChartAxisLabelPosition.idl>
 #include <com/sun/star/chart/ChartAxisMarkPosition.idl>
-
 #include <com/sun/star/chart2/XAxis.idl>
 #include <com/sun/star/chart2/XTitled.idl>
-
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/style/CharacterProperties.idl>
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
@@ -87,15 +84,15 @@ service Axis
     */
     [property]      ::com::sun::star::chart::ChartAxisArrangeOrderType ArrangeOrder;
 
-    /** Determines wether the labels are allowed to break into more than one line
+    /** Determines whether the labels are allowed to break into more than one line
     */
     [property]      boolean   TextBreak;
 
-    /** Determines wether the labels are allowed to overlap
+    /** Determines whether the labels are allowed to overlap
     */
     [property]      boolean   TextOverlap;
 
-    /** Determines wether the characters in a single labels should be stacked one upon each other
+    /** Determines whether the characters in a single labels should be stacked one upon each other
     */
     [property]      boolean   StackCharacters;
 
diff --git a/offapi/com/sun/star/chart2/CandleStickChartType.idl b/offapi/com/sun/star/chart2/CandleStickChartType.idl
index 747531409fd3..155ab6838935 100644
--- a/offapi/com/sun/star/chart2/CandleStickChartType.idl
+++ b/offapi/com/sun/star/chart2/CandleStickChartType.idl
@@ -48,7 +48,7 @@ service CandleStickChartType
     service ChartType;
 
     /** If this property is <TRUE/>, the candlesticks are shown as
-        japanese candlesticks.  This implies that the property
+        Japanese candlesticks.  This implies that the property
         <member>ShowFirst</member> is also <TRUE/>.
 
         <p>Japanese candlesticks show the first and last value as
@@ -63,7 +63,7 @@ service CandleStickChartType
      */
     [maybedefault, property] boolean Japanese;
 
-    /** If the candlestick chart shows japanese candlesticks, that is
+    /** If the candlestick chart shows Japanese candlesticks, that is
         the property <member>Japanese</member> is <TRUE/>, the
         property set given here contains the formatting attributes of
         the white boxes, i.e. the boxes shown for rising values.</p>
@@ -76,7 +76,7 @@ service CandleStickChartType
      */
     [maybevoid, property] com::sun::star::beans::XPropertySet WhiteDay;
 
-    /** If the candlestick chart shows japanese candlesticks, that is
+    /** If the candlestick chart shows Japanese candlesticks, that is
         the property <member>Japanese</member> is <TRUE/>, the
         property set given here contains the formatting attributes of
         the black boxes, i.e. the boxes shown for falling values.</p>
@@ -93,8 +93,8 @@ service CandleStickChartType
         the opening course in a stock chart) is shown in the chart.
         This also makes the role "values-first" mandatory.
 
-        <p>This property is only evaluated for non-japanese
-        candlestick charts, as japanese candlesticks always require to
+        <p>This property is only evaluated for non-Japanese
+        candlestick charts, as Japanese candlesticks always require to
         show the first value.</p>
 
         <p>Default is <FALSE/>.</p>
diff --git a/offapi/com/sun/star/chart2/ChartDocument.idl b/offapi/com/sun/star/chart2/ChartDocument.idl
index c4927d8297be..56a04ed33522 100644
--- a/offapi/com/sun/star/chart2/ChartDocument.idl
+++ b/offapi/com/sun/star/chart2/ChartDocument.idl
@@ -29,11 +29,9 @@
 
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-
 #include <com/sun/star/chart2/XChartDocument.idl>
 #include <com/sun/star/chart2/XUndoSupplier.idl>
 #include <com/sun/star/chart2/data/XDataReceiver.idl>
-
 #include <com/sun/star/chart2/XTitled.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 
diff --git a/offapi/com/sun/star/chart2/ChartType.idl b/offapi/com/sun/star/chart2/ChartType.idl
index 266ab33fc8d2..e88abbeb9d5d 100644
--- a/offapi/com/sun/star/chart2/ChartType.idl
+++ b/offapi/com/sun/star/chart2/ChartType.idl
@@ -28,7 +28,6 @@
 #define com_sun_star_chart2_ChartType_idl
 
 #include <com/sun/star/beans/XPropertySet.idl>
-
 #include <com/sun/star/chart2/XChartType.idl>
 #include <com/sun/star/chart2/XDataSeriesContainer.idl>
 
diff --git a/offapi/com/sun/star/chart2/CoordinateSystem.idl b/offapi/com/sun/star/chart2/CoordinateSystem.idl
index 41695eb199af..b74aace0e7d9 100644
--- a/offapi/com/sun/star/chart2/CoordinateSystem.idl
+++ b/offapi/com/sun/star/chart2/CoordinateSystem.idl
@@ -1,21 +1,10 @@
 #ifndef com_sun_star_chart2_CoordinateSystem_idl
 #define com_sun_star_chart2_CoordinateSystem_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef com_sun_star_chart2_XScale_idl
 #include <com/sun/star/chart2/XScale.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloneable_idl__
 #include <com/sun/star/util/XCloneable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com
 {
@@ -34,7 +23,7 @@ service CoordinateSystem
      */
     interface XCoordinateSystem;
 
-    /** a coordinate system can contain several charttypes, which than do contain the data series.
+    /** a coordinate system can contain several chart types, which than do contain the data series.
     */
     interface com::sun::star::chart2::XChartTypeContainer;
 
diff --git a/offapi/com/sun/star/chart2/CoordinateSystemType.idl b/offapi/com/sun/star/chart2/CoordinateSystemType.idl
index faba718fe384..310da4e62c47 100644
--- a/offapi/com/sun/star/chart2/CoordinateSystemType.idl
+++ b/offapi/com/sun/star/chart2/CoordinateSystemType.idl
@@ -1,20 +1,13 @@
 #ifndef com_sun_star_chart2_CoordinateSystemType_idl
 #define com_sun_star_chart2_CoordinateSystemType_idl
 
-// #ifndef com_sun_star_chart2_XCoordinateSystemType_idl
-// #include <com/sun/star/chart2/XCoordinateSystemType.idl>
-// #endif
-
-//=============================================================================
 
 module com {  module sun {  module star {  module chart2 {
 
-//=============================================================================
-
 /**
 <p>
 The service CoordinateSystemType represents a special type of coordinate system.
-For example a 2 dimensional cartesian coordinate system is a CoordinateSystemType
+For example a 2 dimensional Cartesian coordinate system is a CoordinateSystemType
 and different from for example a 3 dimensional spherical coordinate system.
 </p>
 <p>A CoordinateSystemType is a stateless service which has no owner and does not
@@ -29,8 +22,6 @@ service CoordinateSystemType
 //  interface ::com::sun::star::chart2::XCoordinateSystemType;
 };
 
-//=============================================================================
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/chart2/DataPoint.idl b/offapi/com/sun/star/chart2/DataPoint.idl
index 9278ffb3566c..5f070bd0b857 100644
--- a/offapi/com/sun/star/chart2/DataPoint.idl
+++ b/offapi/com/sun/star/chart2/DataPoint.idl
@@ -28,7 +28,6 @@
 #define com_sun_star_chart2_DataPoint_idl
 
 #include <com/sun/star/style/CharacterProperties.idl>
-
 #include <com/sun/star/style/XStyle.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/DataPointProperties.idl b/offapi/com/sun/star/chart2/DataPointProperties.idl
index 1b3974ff37a4..4893449a2ce8 100644
--- a/offapi/com/sun/star/chart2/DataPointProperties.idl
+++ b/offapi/com/sun/star/chart2/DataPointProperties.idl
@@ -28,12 +28,10 @@
 #define com_sun_star_chart2_DataPointProperties_idl
 
 #include <com/sun/star/beans/PropertySet.idl>
-
 #include <com/sun/star/awt/Gradient.idl>
 #include <com/sun/star/drawing/Hatch.idl>
 #include <com/sun/star/drawing/LineDash.idl>
 #include <com/sun/star/style/XStyle.idl>
-
 #include <com/sun/star/chart2/BitmapProperty.idl>
 #include <com/sun/star/chart2/TransparencyStyle.idl>
 #include <com/sun/star/chart2/DataCaptionStyle.idl>
@@ -50,7 +48,7 @@ module chart2
 
 service DataPointProperties
 {
-    /** to give acces to the properties required by this service.
+    /** to give access to the properties required by this service.
     */
     service ::com::sun::star::beans::PropertySet;
 
@@ -196,7 +194,7 @@ service DataPointProperties
     [property] short FillBitmapOffsetY;
 
     /** Every second line of tiles is moved the given percent of the
-        witdh of the bitmap.
+        width of the bitmap.
     */
     [property] short FillBitmapPositionOffsetX;
 
@@ -253,7 +251,7 @@ service DataPointProperties
      */
     [optional, property] double                       Offset;
 
-    /** describes the geometry of a 3 dimensional datapoint.
+    /** describes the geometry of a 3 dimensional data point.
         Number is one of constant group <type>DataPointGeometry3D</type>.
         <p>This is especially used for 3D bar-charts.</p>
         <p>CUBOID==0 CYLINDER==1 CONE==2 PYRAMID==3 CUBOID==else</p>
diff --git a/offapi/com/sun/star/chart2/DataSeries.idl b/offapi/com/sun/star/chart2/DataSeries.idl
index e78592fb7144..61b0d795babb 100644
--- a/offapi/com/sun/star/chart2/DataSeries.idl
+++ b/offapi/com/sun/star/chart2/DataSeries.idl
@@ -31,8 +31,6 @@
 #include <com/sun/star/container/XIndexContainer.idl>
 #include <com/sun/star/container/XContainer.idl>
 #include <com/sun/star/style/XStyle.idl>
-
-//#include <com/sun/star/chart2/ChartTypeSupplier.idl>
 #include <com/sun/star/chart2/CoordinateSystemSupplier.idl>
 #include <com/sun/star/chart2/data/XDataSink.idl>
 #include <com/sun/star/chart2/data/XDataSource.idl>
@@ -54,7 +52,7 @@ module chart2
     //
     // coordinatesystem-supplier
     //
-    // chart-typ ? property string rendererServiceName
+    // chart-type ? property string rendererServiceName
 
 
 /** reflects the model data of the object that has all the information
@@ -151,7 +149,7 @@ service DataSeries
         series.</p>
 
         <p>If the sequence is empty, that means that all data points
-        look alike.  They are formatted using the propery values set
+        look alike.  They are formatted using the property values set
         in the data series.</p>
 
         <p>The indexes in this sequence match the indexes used by the
@@ -163,7 +161,7 @@ service DataSeries
      */
     [readonly, optional, property] sequence< long > AttributedDataPoints;
 
-    /** indicates wether this series should be stacked with respect to the previous series.
+    /** indicates whether this series should be stacked with respect to the previous series.
     */
     [property] StackingDirection StackingDirection;
 
@@ -172,7 +170,7 @@ service DataSeries
      */
     [optional, property] boolean                    VaryColorsByPoint;
 
-    /** This property describes wether the series should be shown at
+    /** This property describes whether the series should be shown at
         the main value axis or at the secondary value axis.  Having
         this property not set or setting it to 0 means that this data
         series will be scaled at the primary y-axis ( of the
diff --git a/offapi/com/sun/star/chart2/Diagram.idl b/offapi/com/sun/star/chart2/Diagram.idl
index 2ca0e1ade86d..e13d609523f0 100644
--- a/offapi/com/sun/star/chart2/Diagram.idl
+++ b/offapi/com/sun/star/chart2/Diagram.idl
@@ -27,10 +27,7 @@
 #ifndef com_sun_star_chart_Diagram_idl
 #define com_sun_star_chart_Diagram_idl
 
-#ifndef com_sun_star_chart2_XDiagram_idl__
 #include <com/sun/star/chart2/XDiagram.idl>
-#endif
-
 #include <com/sun/star/chart2/XCoordinateSystemContainer.idl>
 #include <com/sun/star/chart2/XTitled.idl>
 #include <com/sun/star/chart2/RelativePosition.idl>
@@ -62,13 +59,13 @@ service Diagram
      */
     interface  XTitled;
 
-    /** makes it easy to set suiteable defaults for illumination and rotation for 3D charts
+    /** makes it easy to set suitable defaults for illumination and rotation for 3D charts
      */
     [optional] interface ::com::sun::star::chart::X3DDefaultSetter;
 
     /** The position is as a relative position on the page.
 
-        <p>If a relative position is given the diagam is not automatically placed,
+        <p>If a relative position is given the diagram is not automatically placed,
         but instead is placed relative on the page.</p>
      */
     [property, maybevoid] ::com::sun::star::chart2::RelativePosition RelativePosition;
diff --git a/offapi/com/sun/star/chart2/ExponentialScaling.idl b/offapi/com/sun/star/chart2/ExponentialScaling.idl
index 95fd88853c71..eacf3e1e48ce 100644
--- a/offapi/com/sun/star/chart2/ExponentialScaling.idl
+++ b/offapi/com/sun/star/chart2/ExponentialScaling.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart2_ExponentialScaling_idl
 #define com_sun_star_chart2_ExponentialScaling_idl
 
-#ifndef com_sun_star_chart2_XScaling_idl
 #include <com/sun/star/chart2/XScaling.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/FillBitmap.idl b/offapi/com/sun/star/chart2/FillBitmap.idl
index a3020b50b8b0..46de06115b68 100644
--- a/offapi/com/sun/star/chart2/FillBitmap.idl
+++ b/offapi/com/sun/star/chart2/FillBitmap.idl
@@ -27,23 +27,10 @@
 #ifndef com_sun_star_chart2_FillBitmap_idl
 #define com_sun_star_chart2_FillBitmap_idl
 
-// #ifndef __com_sun_star_awt_XBitmap_idl__
-// #include <com/sun/star/awt/XBitmap.idl>
-// #endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_BitmapMode_idl__
 #include <com/sun/star/drawing/BitmapMode.idl>
-#endif
-#ifndef __com_sun_star_drawing_RectanglePoint_idl__
 #include <com/sun/star/drawing/RectanglePoint.idl>
-#endif
 
 
 module com
@@ -55,7 +42,7 @@ module star
 module chart2
 {
 
-/** This strucutre contains all properties of a bitmap when used as
+/** This structure contains all properties of a bitmap when used as
     FillStyle.
 
     @see com::sun::star::drawing::FillProperties
@@ -76,7 +63,7 @@ struct FillBitmap
     com::sun::star::awt::Point aOffset;
 
     /** Every second line (X) / row (Y) of tiles is moved the given
-        percent of the witdh of the bitmap.
+        percent of the width of the bitmap.
     */
     com::sun::star::awt::Point aPositionOffset;
 
diff --git a/offapi/com/sun/star/chart2/FormattedString.idl b/offapi/com/sun/star/chart2/FormattedString.idl
index 5c9c094adc5d..1916425e58b3 100644
--- a/offapi/com/sun/star/chart2/FormattedString.idl
+++ b/offapi/com/sun/star/chart2/FormattedString.idl
@@ -1,15 +1,11 @@
 #ifndef com_sun_star_chart_XFormattedString_idl
 #define com_sun_star_chart_XFormattedString_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/style/CharacterProperties.idl>
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-
 #include <com/sun/star/chart2/XFormattedString.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/GridProperties.idl b/offapi/com/sun/star/chart2/GridProperties.idl
index 878e63ec2569..dfa769b54761 100644
--- a/offapi/com/sun/star/chart2/GridProperties.idl
+++ b/offapi/com/sun/star/chart2/GridProperties.idl
@@ -28,9 +28,7 @@
 #define com_sun_star_chart_GridProperties_idl
 
 #include <com/sun/star/beans/XPropertySet.idl>
-
 #include <com/sun/star/chart2/XGrid.idl>
-
 #include <com/sun/star/drawing/LineProperties.idl>
 
 module com
@@ -50,7 +48,7 @@ service GridProperties
      */
     service ::com::sun::star::drawing::LineProperties;
 
-    /** Determines, whether the grid should be redered by the view.
+    /** Determines, whether the grid should be rendered by the view.
      */
     [property] boolean Show;
 };
diff --git a/offapi/com/sun/star/chart2/IncrementData.idl b/offapi/com/sun/star/chart2/IncrementData.idl
index ffd595807ce9..0342a1c150c6 100644
--- a/offapi/com/sun/star/chart2/IncrementData.idl
+++ b/offapi/com/sun/star/chart2/IncrementData.idl
@@ -27,7 +27,7 @@ struct IncrementData
     any         Distance;
 
     /**
-    <member>PostEquidistant</member> rules wether the member <member>Distance</member>
+    <member>PostEquidistant</member> rules whether the member <member>Distance</member>
     describes a distance before or after the scaling is applied.
 
     <p>If <member>PostEquidistant</member> equals <TRUE/> <member>Distance</member>
diff --git a/offapi/com/sun/star/chart2/Legend.idl b/offapi/com/sun/star/chart2/Legend.idl
index 32bd7aa7d85e..6a7317448410 100644
--- a/offapi/com/sun/star/chart2/Legend.idl
+++ b/offapi/com/sun/star/chart2/Legend.idl
@@ -30,7 +30,6 @@
 #include <com/sun/star/chart2/XLegend.idl>
 #include <com/sun/star/chart2/LegendPosition.idl>
 #include <com/sun/star/chart/ChartLegendExpansion.idl>
-
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/drawing/FillProperties.idl>
@@ -70,7 +69,7 @@ service Legend
      */
     [property] ::com::sun::star::chart::ChartLegendExpansion Expansion;
 
-    /** Determines, whether the legend should be redered by the view.
+    /** Determines, whether the legend should be rendered by the view.
      */
     [property] boolean Show;
 
diff --git a/offapi/com/sun/star/chart2/LinearScaling.idl b/offapi/com/sun/star/chart2/LinearScaling.idl
index 6d1b4c90aa38..a933192a558d 100644
--- a/offapi/com/sun/star/chart2/LinearScaling.idl
+++ b/offapi/com/sun/star/chart2/LinearScaling.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart2_LinearScaling_idl
 #define com_sun_star_chart2_LinearScaling_idl
 
-#ifndef com_sun_star_chart2_XScaling_idl
 #include <com/sun/star/chart2/XScaling.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/LogarithmicScaling.idl b/offapi/com/sun/star/chart2/LogarithmicScaling.idl
index 0c6c2eedba26..231ed2865d86 100644
--- a/offapi/com/sun/star/chart2/LogarithmicScaling.idl
+++ b/offapi/com/sun/star/chart2/LogarithmicScaling.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart2_LogarithmicScaling_idl
 #define com_sun_star_chart2_LogarithmicScaling_idl
 
-#ifndef com_sun_star_chart2_XScaling_idl
 #include <com/sun/star/chart2/XScaling.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/LogicTargetModel.idl b/offapi/com/sun/star/chart2/LogicTargetModel.idl
index f4edf4f31c0d..fc2ed9b7fdf1 100644
--- a/offapi/com/sun/star/chart2/LogicTargetModel.idl
+++ b/offapi/com/sun/star/chart2/LogicTargetModel.idl
@@ -14,11 +14,11 @@ module com {  module sun {  module star {  module chart2 {
 */
 service LogicTargetModel
 {
-    /** identifies an instance of this service within one chartdocument.
+    /** identifies an instance of this service within one chart document.
     */
     [ readonly, property ] string ID;
 
-    /** identifies an instance of the service com::sun::star::chart2::LegendModel within one chartdocument.
+    /** identifies an instance of the service com::sun::star::chart2::LegendModel within one chart document.
     * that instance is used to automatically calculate missing properties
     */
     [ property ] string LegendID;
diff --git a/offapi/com/sun/star/chart2/PowerScaling.idl b/offapi/com/sun/star/chart2/PowerScaling.idl
index 1d82f2a8f951..f141bb8c972a 100644
--- a/offapi/com/sun/star/chart2/PowerScaling.idl
+++ b/offapi/com/sun/star/chart2/PowerScaling.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart2_PowerScaling_idl
 #define com_sun_star_chart2_PowerScaling_idl
 
-#ifndef com_sun_star_chart2_XScaling_idl
 #include <com/sun/star/chart2/XScaling.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/RelativePosition.idl b/offapi/com/sun/star/chart2/RelativePosition.idl
index 7363a47f8f5a..c940ab0838f5 100644
--- a/offapi/com/sun/star/chart2/RelativePosition.idl
+++ b/offapi/com/sun/star/chart2/RelativePosition.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart2_RelativePosition_idl
 #define com_sun_star_chart2_RelativePosition_idl
 
-#ifndef __com_sun_star_drawing_Alignment_idl__
 #include <com/sun/star/drawing/Alignment.idl>
-#endif
 
 module com
 {
@@ -74,8 +72,8 @@ struct RelativePosition
         will be placed at the coordinates given within Primary and Secondary.</p>
 
         <p>For example if Anchor is TOP_LEFT the top left corner of an object will
-        be placed at the given coorediantes. If Anchor is RIGHT the right middle corner of the object will
-        be placed at the given coorediantes.</p>
+        be placed at the given coordinates. If Anchor is RIGHT the right middle corner of the object will
+        be placed at the given coordinates.</p>
      */
     ::com::sun::star::drawing::Alignment Anchor;
 };
diff --git a/offapi/com/sun/star/chart2/Scaling.idl b/offapi/com/sun/star/chart2/Scaling.idl
index 47b554dbc72e..3ca475cd5f04 100644
--- a/offapi/com/sun/star/chart2/Scaling.idl
+++ b/offapi/com/sun/star/chart2/Scaling.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart2_Scaling_idl
 #define com_sun_star_chart2_Scaling_idl
 
-#ifndef com_sun_star_chart2_XScaling_idl
 #include <com/sun/star/chart2/XScaling.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl b/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
index 6733715f1703..036f8555be71 100644
--- a/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
+++ b/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
@@ -27,9 +27,7 @@
 #ifndef com_sun_star_chart_StandardDiagramCreationParameters_idl
 #define com_sun_star_chart_StandardDiagramCreationParameters_idl
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/Symbol.idl b/offapi/com/sun/star/chart2/Symbol.idl
index 3743a68253a1..202301e3931d 100644
--- a/offapi/com/sun/star/chart2/Symbol.idl
+++ b/offapi/com/sun/star/chart2/Symbol.idl
@@ -27,13 +27,9 @@
 #ifndef com_sun_star_chart2_Symbol_idl
 #define com_sun_star_chart2_Symbol_idl
 
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
-
 #include <com/sun/star/awt/Size.idl>
 #include <com/sun/star/graphic/XGraphic.idl>
-
 #include <com/sun/star/chart2/SymbolStyle.idl>
 
 //=============================================================================
@@ -91,7 +87,7 @@ struct Symbol
 
     /** The size of the symbol in 100th of a mm.
 
-        @todo use a structure using doubles insted of longs
+        @todo use a structure using doubles instead of longs
      */
     com::sun::star::awt::Size                           Size;
 
diff --git a/offapi/com/sun/star/chart2/Title.idl b/offapi/com/sun/star/chart2/Title.idl
index d28cdcb6c4f9..8afc10a1af57 100644
--- a/offapi/com/sun/star/chart2/Title.idl
+++ b/offapi/com/sun/star/chart2/Title.idl
@@ -29,9 +29,7 @@
 
 #include <com/sun/star/style/ParagraphProperties.idl>
 #include <com/sun/star/layout/LayoutElement.idl>
-
 #include <com/sun/star/chart2/XTitle.idl>
-
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/drawing/FillProperties.idl>
diff --git a/offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl b/offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl
index ca455c401264..a62750fd4930 100755..100644
--- a/offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl
+++ b/offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_chart2_XAnyDescriptionAccess_idl__
 #define __com_sun_star_chart2_XAnyDescriptionAccess_idl__
 
-#ifndef __com_sun_star_chart_XComplexDescriptionAccess_idl__
 #include <com/sun/star/chart/XComplexDescriptionAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/XAxis.idl b/offapi/com/sun/star/chart2/XAxis.idl
index 55a9089da0cf..cf5e326e58df 100644
--- a/offapi/com/sun/star/chart2/XAxis.idl
+++ b/offapi/com/sun/star/chart2/XAxis.idl
@@ -27,12 +27,8 @@
 #ifndef com_sun_star_chart_XAxis_idl
 #define com_sun_star_chart_XAxis_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/beans/XPropertySet.idl>
-
 #include <com/sun/star/chart2/ScaleData.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/XChartShape.idl b/offapi/com/sun/star/chart2/XChartShape.idl
index c58f35023457..669aadabf052 100644
--- a/offapi/com/sun/star/chart2/XChartShape.idl
+++ b/offapi/com/sun/star/chart2/XChartShape.idl
@@ -1,34 +1,14 @@
 #ifndef com_sun_star_chart2_XChartShape_idl
 #define com_sun_star_chart2_XChartShape_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef com_sun_star_chart2_XTransformation_idl
 #include <com/sun/star/chart2/XTransformation.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart2/XChartShapeContainer.idl b/offapi/com/sun/star/chart2/XChartShapeContainer.idl
index f7505e030de6..e32e8f47b08f 100644
--- a/offapi/com/sun/star/chart2/XChartShapeContainer.idl
+++ b/offapi/com/sun/star/chart2/XChartShapeContainer.idl
@@ -1,13 +1,8 @@
 #ifndef com_sun_star_chart2_XChartShapeContainer_idl
 #define com_sun_star_chart2_XChartShapeContainer_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/XChartType.idl b/offapi/com/sun/star/chart2/XChartType.idl
index fb395790ff9b..6dce9a1e16c3 100644
--- a/offapi/com/sun/star/chart2/XChartType.idl
+++ b/offapi/com/sun/star/chart2/XChartType.idl
@@ -1,14 +1,8 @@
 #ifndef com_sun_star_chart2_XChartType_idl
 #define com_sun_star_chart2_XChartType_idl
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/chart2/XCoordinateSystem.idl>
 
 module com
@@ -25,7 +19,7 @@ module chart2
 interface XChartType : com::sun::star::uno::XInterface
 {
     /** A string representation of the chart type.
-        This needs to be the service-name which can be used to create a charttype.
+        This needs to be the service-name which can be used to create a chart type.
      */
     string getChartType();
 
@@ -33,16 +27,16 @@ interface XChartType : com::sun::star::uno::XInterface
         current settings and for the given dimension.
 
         @throws IllegalArgumentException
-            This charttype cannot be displayed in the given dimension.
+            This chart type cannot be displayed in the given dimension.
      */
     XCoordinateSystem createCoordinateSystem( [in] long DimensionCount )
         raises( com::sun::star::lang::IllegalArgumentException );
 
-    /** Returns a sequence of roles that are undestood by this chart
+    /** Returns a sequence of roles that are understood by this chart
         type.
 
         <p>All roles must be listed in the order in which they are
-        usually parsed.  This ensures that glueing sequences together
+        usually parsed.  This ensures that gluing sequences together
         and splitting them up apart again results in the same
         structure as before.</p>
 
diff --git a/offapi/com/sun/star/chart2/XChartTypeContainer.idl b/offapi/com/sun/star/chart2/XChartTypeContainer.idl
index c9e61ff9d9e8..083d48742348 100644
--- a/offapi/com/sun/star/chart2/XChartTypeContainer.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeContainer.idl
@@ -28,17 +28,9 @@
 #define com_sun_star_chart2_XChartTypeContainer_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
-#ifndef com_sun_star_chart_XChartType_idl
 #include <com/sun/star/chart2/XChartType.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 module com
 {
@@ -59,7 +51,7 @@ interface XChartTypeContainer : com::sun::star::uno::XInterface
     void addChartType( [in] XChartType aChartType )
         raises( com::sun::star::lang::IllegalArgumentException );
 
-    /** removes one data deries from the chart type container.
+    /** removes one data series from the chart type container.
      */
     void removeChartType( [in] XChartType aChartType )
         raises( com::sun::star::container::NoSuchElementException );
diff --git a/offapi/com/sun/star/chart2/XChartTypeManager.idl b/offapi/com/sun/star/chart2/XChartTypeManager.idl
index efc9e7a12e16..bc2b23d3e178 100644
--- a/offapi/com/sun/star/chart2/XChartTypeManager.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeManager.idl
@@ -3,7 +3,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-
 #include <com/sun/star/chart2/XChartTypeTemplate.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
index 05308ba7dfcf..b03f51df9915 100644
--- a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
@@ -27,17 +27,9 @@
 #ifndef com_sun_star_chart_XChartTypeTemplate_idl
 #define com_sun_star_chart_XChartTypeTemplate_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
 #include <com/sun/star/chart2/XDiagram.idl>
 #include <com/sun/star/chart2/data/XDataSource.idl>
 #include <com/sun/star/chart2/XChartType.idl>
@@ -150,7 +142,7 @@ interface XChartTypeTemplate : ::com::sun::star::uno::XInterface
             that the template matches more accurately.  E.g. for a
             line-chart with symbols the property "Symbol" would be set
             to <TRUE/>.  If this parameter is <FALSE/> the template
-            itselfs stays unmodified.
+            itself stays unmodified.
 
         @return
             <TRUE/> if the diagram given is structurally identical to
@@ -167,7 +159,7 @@ interface XChartTypeTemplate : ::com::sun::star::uno::XInterface
         series.
 
         @param aFormerlyUsedChartTypes
-            The list can be used to copy some aspects from old charttypes during the creation of a new chart type.
+            The list can be used to copy some aspects from old chart types during the creation of a new chart type.
             The list might be empty.
      */
     XChartType getChartTypeForNewSeries( [in] sequence< XChartType > aFormerlyUsedChartTypes );
diff --git a/offapi/com/sun/star/chart2/XCoordinateSystem.idl b/offapi/com/sun/star/chart2/XCoordinateSystem.idl
index 0756321cdbed..8a69c027d2a9 100644
--- a/offapi/com/sun/star/chart2/XCoordinateSystem.idl
+++ b/offapi/com/sun/star/chart2/XCoordinateSystem.idl
@@ -27,14 +27,8 @@
 #ifndef com_sun_star_chart2_XCoordinateSystem_idl
 #define com_sun_star_chart2_XCoordinateSystem_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
 #include <com/sun/star/chart2/XAxis.idl>
 
 module com
@@ -55,7 +49,7 @@ interface XCoordinateSystem : ::com::sun::star::uno::XInterface
      */
     long getDimension();
 
-    /** identifies the type of coordinate system (e.g. cartesian, polar ...)
+    /** identifies the type of coordinate system (e.g. Cartesian, polar ...)
     */
     string getCoordinateSystemType();
 
@@ -63,8 +57,8 @@ interface XCoordinateSystem : ::com::sun::star::uno::XInterface
     */
     string getViewServiceName();
 
-    /** The dimension says wether it is a x, y or z axis.
-        The index says wether it is a primary or a secondary axis.
+    /** The dimension says whether it is a x, y or z axis.
+        The index says whether it is a primary or a secondary axis.
         Use nIndex == 0 for a primary axis.
      */
     void setAxisByDimension( [in] long nDimension,
@@ -72,8 +66,8 @@ interface XCoordinateSystem : ::com::sun::star::uno::XInterface
                               [in] long nIndex )
         raises( com::sun::star::lang::IndexOutOfBoundsException );
 
-    /** The dimension says wether it is a x, y or z axis.
-        The index indicates wether it is a primary or a secondary axis or maybe more in future.
+    /** The dimension says whether it is a x, y or z axis.
+        The index indicates whether it is a primary or a secondary axis or maybe more in future.
         Use nIndex == 0 for a primary axis.
         An empty Reference will be returned if the given nDimension and nIndex are in the valid range but no axis is set for those values.
         An IndexOutOfBoundsException will be thrown if nDimension is lower than 0 or greater than the value returned by getDimension()
@@ -84,7 +78,7 @@ interface XCoordinateSystem : ::com::sun::star::uno::XInterface
 
     /** In one dimension there could be several axes to enable main and secondary axis and maybe more in future.
         This method returns the maximum index at which an axis exists for the given dimension.
-        It is allowed that some indexes inbetween do not have an axis.
+        It is allowed that some indexes in between do not have an axis.
     /*/
     long getMaximumAxisIndexByDimension( [in] long nDimension )
         raises( com::sun::star::lang::IndexOutOfBoundsException );
diff --git a/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl b/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl
index afbd6066e063..4917811b53a0 100644
--- a/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl
+++ b/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl
@@ -28,15 +28,9 @@
 #define com_sun_star_chart2_XCoordinateSystemContainer_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
 #include <com/sun/star/chart2/XCoordinateSystem.idl>
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XDataInterpreter.idl b/offapi/com/sun/star/chart2/XDataInterpreter.idl
index 14238dc531a5..a5f6dc2d8658 100644
--- a/offapi/com/sun/star/chart2/XDataInterpreter.idl
+++ b/offapi/com/sun/star/chart2/XDataInterpreter.idl
@@ -27,13 +27,8 @@
 #ifndef com_sun_star_chart2_XDataInterpreter_idl
 #define com_sun_star_chart2_XDataInterpreter_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
 #include <com/sun/star/chart2/InterpretedData.idl>
 #include <com/sun/star/chart2/data/XDataSource.idl>
 #include <com/sun/star/chart2/XDataSeries.idl>
diff --git a/offapi/com/sun/star/chart2/XDataSeries.idl b/offapi/com/sun/star/chart2/XDataSeries.idl
index aa55196ef67d..88f2b92e5443 100644
--- a/offapi/com/sun/star/chart2/XDataSeries.idl
+++ b/offapi/com/sun/star/chart2/XDataSeries.idl
@@ -27,19 +27,9 @@
 #ifndef com_sun_star_chart2_XDataSeries_idl
 #define com_sun_star_chart2_XDataSeries_idl
 
-// #include <com/sun/star/chart2/XCoordinateSystem.idl>
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 module com
 {
@@ -74,7 +64,7 @@ interface XDataSeries : ::com::sun::star::uno::XInterface
      */
     void resetDataPoint( [in] long nIndex );
 
-    /** all data point formattings are cleared
+    /** all data point formatting are cleared
      */
     void resetAllDataPoints();
 };
diff --git a/offapi/com/sun/star/chart2/XDataSeriesContainer.idl b/offapi/com/sun/star/chart2/XDataSeriesContainer.idl
index 659120d67ec6..05f270eb48c3 100644
--- a/offapi/com/sun/star/chart2/XDataSeriesContainer.idl
+++ b/offapi/com/sun/star/chart2/XDataSeriesContainer.idl
@@ -28,17 +28,9 @@
 #define com_sun_star_chart2_XDataSeriesContainer_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
-#ifndef com_sun_star_chart_XDataSeries_idl
 #include <com/sun/star/chart2/XDataSeries.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 module com
 {
@@ -59,7 +51,7 @@ interface XDataSeriesContainer : com::sun::star::uno::XInterface
     void addDataSeries( [in] XDataSeries aDataSeries )
         raises( com::sun::star::lang::IllegalArgumentException );
 
-    /** removes one data deries from the data series container.
+    /** removes one data series from the data series container.
      */
     void removeDataSeries( [in] XDataSeries aDataSeries )
         raises( com::sun::star::container::NoSuchElementException );
diff --git a/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl b/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
index 30694a87e7f0..2c96a060ef71 100644
--- a/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
+++ b/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
@@ -27,13 +27,8 @@
 #ifndef com_sun_star_chart2_xdefaultsizetransmitter_idl
 #define com_sun_star_chart2_xdefaultsizetransmitter_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XDiagram.idl b/offapi/com/sun/star/chart2/XDiagram.idl
index 23b256e63349..cfe57ab17973 100644
--- a/offapi/com/sun/star/chart2/XDiagram.idl
+++ b/offapi/com/sun/star/chart2/XDiagram.idl
@@ -27,10 +27,7 @@
 #ifndef com_sun_star_chart2_XDiagram_idl
 #define com_sun_star_chart2_XDiagram_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/beans/XPropertySet.idl>
 #include <com/sun/star/beans/PropertyValue.idl>
 #include <com/sun/star/chart2/XLegend.idl>
diff --git a/offapi/com/sun/star/chart2/XDiagramProvider.idl b/offapi/com/sun/star/chart2/XDiagramProvider.idl
index 9aaf2771b5f6..20b3358effec 100644
--- a/offapi/com/sun/star/chart2/XDiagramProvider.idl
+++ b/offapi/com/sun/star/chart2/XDiagramProvider.idl
@@ -27,10 +27,7 @@
 #ifndef com_sun_star_chart2_XDiagramProvider_idl
 #define com_sun_star_chart2_XDiagramProvider_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/chart2/XDiagram.idl>
 #include <com/sun/star/chart2/XChartTypeTemplate.idl>
 
diff --git a/offapi/com/sun/star/chart2/XFastPropertyState.idl b/offapi/com/sun/star/chart2/XFastPropertyState.idl
index 29d1e4c1b27f..076813c7818c 100644
--- a/offapi/com/sun/star/chart2/XFastPropertyState.idl
+++ b/offapi/com/sun/star/chart2/XFastPropertyState.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_beans_XFastPropertyState_idl__
 #define __com_sun_star_beans_XFastPropertyState_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyState_idl__
 #include <com/sun/star/beans/PropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart2/XFormattedString.idl b/offapi/com/sun/star/chart2/XFormattedString.idl
index 28321493abf2..6c6338f41a67 100644
--- a/offapi/com/sun/star/chart2/XFormattedString.idl
+++ b/offapi/com/sun/star/chart2/XFormattedString.idl
@@ -1,11 +1,7 @@
 #ifndef com_sun_star_chart_XFormattedString_idl
 #define com_sun_star_chart_XFormattedString_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#include <com/sun/star/chart2/XFormattedString.idl>
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XLabeled.idl b/offapi/com/sun/star/chart2/XLabeled.idl
index 4abaf59fd3ba..a3f4ff30f1c6 100644
--- a/offapi/com/sun/star/chart2/XLabeled.idl
+++ b/offapi/com/sun/star/chart2/XLabeled.idl
@@ -27,17 +27,9 @@
 #ifndef com_sun_star_chart2_XLabeled_idl
 #define com_sun_star_chart2_XLabeled_idl
 
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef com_sun_star_chart2_XTitle_idl
 #include <com/sun/star/chart2/XTitle.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RectanglePoint_idl__
 #include <com/sun/star/drawing/RectanglePoint.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XRegressionCurve.idl b/offapi/com/sun/star/chart2/XRegressionCurve.idl
index 1e23edd1d0f1..1ef46f815ad3 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurve.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurve.idl
@@ -29,7 +29,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/beans/XPropertySet.idl>
-
 #include <com/sun/star/chart2/XRegressionCurveCalculator.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl b/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
index e2d6f7dcca76..fbd63fe01394 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
@@ -28,7 +28,6 @@
 #define com_sun_star_chart2_XRegressionCurveCalculator_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #include <com/sun/star/geometry/RealPoint2D.idl>
@@ -93,7 +92,7 @@ interface XRegressionCurveCalculator : com::sun::star::uno::XInterface
         @param bMaySkipPointsInCalculation determines whether it is
                allowed to skip points in the calculation. When this
                parameter is <TRUE/> it is assumed that the underlying
-               coordinate system is cartesian.
+               coordinate system is Cartesian.
 
         @param xScalingX a scaling that is used for the values in
                x-direction
@@ -116,7 +115,7 @@ interface XRegressionCurveCalculator : com::sun::star::uno::XInterface
 
         <p>The value of <it>r</it> is signed.  Often
         <it>r</it><sup>2</sup> is used instead of <it>r</it> to denote
-        a regression curve's accuray.</p>
+        a regression curve's accuracy.</p>
 
         @return
             The return value is the fraction of the variance in the
@@ -135,7 +134,7 @@ interface XRegressionCurveCalculator : com::sun::star::uno::XInterface
      */
     string getRepresentation();
 
-    /** Returns a representation using the given numnber format for formatting all numbers
+    /** Returns a representation using the given number format for formatting all numbers
         contained in the formula.
 
         @see getRepresentation
diff --git a/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl b/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
index f54b351ef005..76690e3413a2 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
@@ -28,15 +28,9 @@
 #define com_sun_star_chart2_XRegressionCurveContainer_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
 #include <com/sun/star/chart2/XRegressionCurve.idl>
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XScaling.idl b/offapi/com/sun/star/chart2/XScaling.idl
index 569f29ff2128..b68ee3aea3c6 100644
--- a/offapi/com/sun/star/chart2/XScaling.idl
+++ b/offapi/com/sun/star/chart2/XScaling.idl
@@ -1,9 +1,7 @@
 #ifndef com_sun_star_chart2_XScaling_idl
 #define com_sun_star_chart2_XScaling_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/chart2/XStyleSupplier.idl b/offapi/com/sun/star/chart2/XStyleSupplier.idl
index cfc4d34ca5fa..f532b8f4da62 100644
--- a/offapi/com/sun/star/chart2/XStyleSupplier.idl
+++ b/offapi/com/sun/star/chart2/XStyleSupplier.idl
@@ -27,15 +27,9 @@
 #ifndef com_sun_star_style_XStyleSupplier_idl
 #define com_sun_star_style_XStyleSupplier_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_style_XStyle_idl__
 #include <com/sun/star/style/XStyle.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/XTarget.idl b/offapi/com/sun/star/chart2/XTarget.idl
index 1e18166d35fb..65ea3175d6a7 100644
--- a/offapi/com/sun/star/chart2/XTarget.idl
+++ b/offapi/com/sun/star/chart2/XTarget.idl
@@ -1,20 +1,11 @@
 #ifndef com_sun_star_chart2_XTarget_idl
 #define com_sun_star_chart2_XTarget_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-// #ifndef __com_sun_star_drawing_XShapes_idl__
-// #include <com/sun/star/drawing/XShapes.idl>
-// #endif
 
-//=============================================================================
 
 module com {  module sun {  module star {  module chart2 {
 
-//=============================================================================
-
 //................... wrong --> XDrawGroup
 
 // [in] com::sun::star::drawing::XShapes xShapes
@@ -26,8 +17,6 @@ interface XTarget : ::com::sun::star::uno::XInterface
     //... provide something for creation of Transformation ...
 };
 
-//=============================================================================
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/chart2/XTitle.idl b/offapi/com/sun/star/chart2/XTitle.idl
index 9be6629c12df..6defce7cc9b2 100644
--- a/offapi/com/sun/star/chart2/XTitle.idl
+++ b/offapi/com/sun/star/chart2/XTitle.idl
@@ -27,10 +27,7 @@
 #ifndef com_sun_star_chart_XTitle_idl
 #define com_sun_star_chart_XTitle_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/chart2/XFormattedString.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/XTitled.idl b/offapi/com/sun/star/chart2/XTitled.idl
index 4f6d2c1faf2a..b2726f9af8a9 100644
--- a/offapi/com/sun/star/chart2/XTitled.idl
+++ b/offapi/com/sun/star/chart2/XTitled.idl
@@ -27,10 +27,7 @@
 #ifndef com_sun_star_chart_XTitled_idl
 #define com_sun_star_chart_XTitled_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/chart2/XTitle.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/XTransformation.idl b/offapi/com/sun/star/chart2/XTransformation.idl
index fe8d314948fb..e8ec8c029460 100644
--- a/offapi/com/sun/star/chart2/XTransformation.idl
+++ b/offapi/com/sun/star/chart2/XTransformation.idl
@@ -27,13 +27,8 @@
 #ifndef com_sun_star_chart2_XTransformation_idl
 #define com_sun_star_chart2_XTransformation_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 module com
 {
@@ -46,7 +41,7 @@ module chart2
 
     // NOTES
 
-    //... provide help for creating the right transfomation
+    //... provide help for creating the right transformation
     //
     // ... access to source and destination coordinate system ?
 
diff --git a/offapi/com/sun/star/chart2/data/DataSequence.idl b/offapi/com/sun/star/chart2/data/DataSequence.idl
index 671f27575c1a..e6b914af8f50 100644
--- a/offapi/com/sun/star/chart2/data/DataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/DataSequence.idl
@@ -31,11 +31,9 @@
 #include <com/sun/star/container/XIndexReplace.idl>
 #include <com/sun/star/util/XCloneable.idl>
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-
 #include <com/sun/star/chart2/data/XDataSequence.idl>
 #include <com/sun/star/chart2/data/XNumericalDataSequence.idl>
 #include <com/sun/star/chart2/data/XTextualDataSequence.idl>
-
 #include <com/sun/star/chart2/data/DataSequenceRole.idl>
 
 module com
@@ -65,13 +63,13 @@ service DataSequence
      */
     interface XDataSequence;
 
-    /** you may implement this interface to allow a fast acces to
+    /** you may implement this interface to allow a fast access to
         numerical data.  With this interface you can get a
         <atom>sequence</atom> of <atom>double</atom> values.
     */
     [optional] interface   XNumericalDataSequence;
 
-    /** you may implement this interface to allow a fast acces to
+    /** you may implement this interface to allow a fast access to
         textual data.  With this interface you can get a
         <atom>sequence</atom> of <atom>string</atom> values.
     */
diff --git a/offapi/com/sun/star/chart2/data/DataSequenceRole.idl b/offapi/com/sun/star/chart2/data/DataSequenceRole.idl
index 4586faaed304..e9acb6a2c6b5 100644
--- a/offapi/com/sun/star/chart2/data/DataSequenceRole.idl
+++ b/offapi/com/sun/star/chart2/data/DataSequenceRole.idl
@@ -88,11 +88,11 @@ module data
           would be the closing course.</dd>
      <dt>values-min</dt>
       <dd>the minimum value of a series of values.  In a stock-chart
-          this would be the lowest course that occured during
+          this would be the lowest course that occurred during
           trading.</dd>
      <dt>values-max</dt>
       <dd>the maximum value of a series of values.  In a stock-chart
-          this would be the highest course that occured during
+          this would be the highest course that occurred during
           trading.</dd>
     </dl>
  */
diff --git a/offapi/com/sun/star/chart2/data/HighlightedRange.idl b/offapi/com/sun/star/chart2/data/HighlightedRange.idl
index 363d5a88484c..6d872da980d8 100644
--- a/offapi/com/sun/star/chart2/data/HighlightedRange.idl
+++ b/offapi/com/sun/star/chart2/data/HighlightedRange.idl
@@ -59,7 +59,7 @@ struct HighlightedRange
 
     /** If the highlighted range is visually highlighted and this
         member is <TRUE/>, the range given in
-        <member>RangeRepresentation</mamber> may be included in a
+        <member>RangeRepresentation</member> may be included in a
         merged range rectangle spanning a bigger range.
      */
     boolean   AllowMerginigWithOtherRanges;
diff --git a/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl b/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
index d6dcf7f5efa4..6daee636d067 100644
--- a/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
@@ -29,7 +29,6 @@
 
 #include <com/sun/star/util/XCloneable.idl>
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-
 #include <com/sun/star/chart2/data/XLabeledDataSequence.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/data/RangeHighlightListener.idl b/offapi/com/sun/star/chart2/data/RangeHighlightListener.idl
index 83f59166746c..19093a837d08 100644
--- a/offapi/com/sun/star/chart2/data/RangeHighlightListener.idl
+++ b/offapi/com/sun/star/chart2/data/RangeHighlightListener.idl
@@ -42,7 +42,7 @@ module data
 
 /** A selection change listener that is attached to a
     <type>XRangeHighlighter</type> in order to get notified about
-    selection changes that affect range hightlighting.
+    selection changes that affect range highlighting.
  */
 service RangeHighlightListener
 {
diff --git a/offapi/com/sun/star/chart2/data/TabularDataProviderArguments.idl b/offapi/com/sun/star/chart2/data/TabularDataProviderArguments.idl
index a6a0e7c519d9..d1a3c9cee680 100644
--- a/offapi/com/sun/star/chart2/data/TabularDataProviderArguments.idl
+++ b/offapi/com/sun/star/chart2/data/TabularDataProviderArguments.idl
@@ -46,7 +46,7 @@ service TabularDataProviderArguments
 {
     /** the range address string spanning all data.
 
-        <p>The range adress string must be interpretable by the
+        <p>The range address string must be interpretable by the
         component that implements <type>XDataProvider</type> and gets
         this property as argument to
         <member>XDataProvider::detectArguments</member>.</p>
@@ -97,17 +97,17 @@ service TabularDataProviderArguments
     /** determines the order of the created labeled sequences
 
         <p>For example a SequenceMapping of [3,0,2,1] indicates that
-        the sequence from old position '3' should now be the first one.
-        Then comes the sequence from old position '0'. Then that one
-        from old position '2' and then the sequence from old position '1'.</p>
+        the sequence from old position "3" should now be the first one.
+        Then comes the sequence from old position "0". Then that one
+        from old position "2" and then the sequence from old position "1".</p>
 
         <p>If the SequenceMapping contains invalid indexes just
         ignore those single indexes. For example if you only have three
         labeled sequences and a SequenceMapping [2,5,1,0], you should
-        ignore the '5' and continue to place the sequence from
-        old index '1' to the next new position and so on.</p>
+        ignore the "5" and continue to place the sequence from
+        old index "1" to the next new position and so on.</p>
 
-        <p>If the given SequenceMapping does not cover all exsisting
+        <p>If the given SequenceMapping does not cover all existing
         labeled sequences just put the remaining sequences in old order
         behind the others. For example you have 4 sequences and a
         SequenceMapping [3,1]. The result should be a as if [3,1,0,2]
diff --git a/offapi/com/sun/star/chart2/data/XDataProvider.idl b/offapi/com/sun/star/chart2/data/XDataProvider.idl
index 11dac7aae3cd..12b54a63723e 100644
--- a/offapi/com/sun/star/chart2/data/XDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDataProvider.idl
@@ -29,11 +29,8 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-
 #include <com/sun/star/chart2/data/XDataSource.idl>
-
 #include <com/sun/star/beans/PropertyValue.idl>
-
 #include <com/sun/star/sheet/XRangeSelection.idl>
 
 module com
@@ -70,7 +67,7 @@ interface XDataProvider  : ::com::sun::star::uno::XInterface
             given range.  The properties should be defined in a
             separate service.
 
-            <p>For spreadsheets and textdocument tables there exists a
+            <p>For spreadsheets and text document tables there exists a
             service <type>TabularDataProviderArguments</type>
             describing valid values for this list.</p>
 
diff --git a/offapi/com/sun/star/chart2/data/XDataReceiver.idl b/offapi/com/sun/star/chart2/data/XDataReceiver.idl
index 10602cee2f34..07a58072c137 100644
--- a/offapi/com/sun/star/chart2/data/XDataReceiver.idl
+++ b/offapi/com/sun/star/chart2/data/XDataReceiver.idl
@@ -27,28 +27,12 @@
 #ifndef com_sun_star_chart2_data_XDataReceiver_idl
 #define com_sun_star_chart2_data_XDataReceiver_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef com_sun_star_chart2_data_XDataProvider_idl
 #include <com/sun/star/chart2/data/XDataProvider.idl>
-#endif
-
-#ifndef com_sun_star_chart2_data_XRangeHighlighter_idl
 #include <com/sun/star/chart2/data/XRangeHighlighter.idl>
-#endif
-
-#ifndef com_sun_star_beans_PropertyValue_idl
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
 
 module com
 {
@@ -104,10 +88,10 @@ interface XDataReceiver : ::com::sun::star::uno::XInterface
         data ranges used by the currently selected objects in the data
         receiver component.
 
-        <p>This is typically used by a spreadsheet to hightlight the
+        <p>This is typically used by a spreadsheet to highlight the
         ranges used by the currently selected object in a chart.</p>
 
-        <p>The range hightlighter is optional, i.e., this method may
+        <p>The range highlighter is optional, i.e., this method may
         return an empty object.</p>
      */
     XRangeHighlighter getRangeHighlighter();
diff --git a/offapi/com/sun/star/chart2/data/XDataSequence.idl b/offapi/com/sun/star/chart2/data/XDataSequence.idl
index d821200cb772..87a206a718d0 100644
--- a/offapi/com/sun/star/chart2/data/XDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/XDataSequence.idl
@@ -43,7 +43,7 @@ module chart2
 module data
 {
 
-/** allows acces to a one-dimensional sequence of data.
+/** allows access to a one-dimensional sequence of data.
 
     <p>The data that is stored in this container may contain different
     types.</p>
@@ -86,7 +86,7 @@ interface XDataSequence : ::com::sun::star::uno::XInterface
             the longer side with parameter LONG_SIDE or you can obtain labels
             for the shorter side with parameter SHORT_SIDE.
 
-            If the range is not structured in a tabular way you may reveive
+            If the range is not structured in a tabular way you may receive
             no label.
 
         @return
@@ -97,7 +97,7 @@ interface XDataSequence : ::com::sun::star::uno::XInterface
             sequence "Row 1" "Row 2" "Row 3" for the long side to be used
             as categories for example.
 
-        Example: Assuming this sequence has a Rangerepresentation spanning
+        Example: Assuming this sequence has a Range representation spanning
         row 5 and 6 in column 8. Following sequences of strings or similar strings
         are expected as return values:
 
diff --git a/offapi/com/sun/star/chart2/data/XDataSink.idl b/offapi/com/sun/star/chart2/data/XDataSink.idl
index ec7f922bbc53..49208691c148 100644
--- a/offapi/com/sun/star/chart2/data/XDataSink.idl
+++ b/offapi/com/sun/star/chart2/data/XDataSink.idl
@@ -28,7 +28,6 @@
 #define com_sun_star_chart2_data_XDataSink_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
 #include <com/sun/star/chart2/data/XLabeledDataSequence.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/data/XDataSource.idl b/offapi/com/sun/star/chart2/data/XDataSource.idl
index 9fc4436a25b9..dda444e2461d 100644
--- a/offapi/com/sun/star/chart2/data/XDataSource.idl
+++ b/offapi/com/sun/star/chart2/data/XDataSource.idl
@@ -28,7 +28,6 @@
 #define com_sun_star_chart2_data_XDataSource_idl
 
 #include <com/sun/star/uno/XInterface.idl>
-
 #include <com/sun/star/chart2/data/XLabeledDataSequence.idl>
 
 module com
diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
index 260f97c7aa38..abe0c45b08f2 100644
--- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_report_XDatabaseDataProvider_idl__
 #define __com_sun_star_report_XDatabaseDataProvider_idl__
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 #include <com/sun/star/beans/XPropertySet.idl>
 #include <com/sun/star/beans/UnknownPropertyException.idl>
 #include <com/sun/star/lang/XInitialization.idl>
@@ -92,7 +90,7 @@ interface XDatabaseDataProvider
     /**is used for subreports and contains the names of the columns of the subreport
     which are related to the master fields of the parent report.
     <p>Entries in this sequence can either denote column names in the sub report,
-    or paramater names.<br/>
+    or parameter names.<br/>
     For instance, you could base the report on the SQL statement
     <code>SELECT * FROM invoices WHERE cust_ref = :cid</code>, and add <code>cid</code>
     to the DetailFields property. In this case, the parameter will be filled from
@@ -104,7 +102,7 @@ interface XDatabaseDataProvider
     master field.<br/>
     If a string in this property denotes both a column name and a parameter name, it
     is undefined which way it is interpreted, but implementations of the service are required
-    to either decide for the paramter or the column, and proceed as usual.
+    to either decide for the parameter or the column, and proceed as usual.
     </p>
     <p>The columns specified herein typically represent a part of the primary key
     fields or their aliases of the detail report.</p>
@@ -135,14 +133,14 @@ interface XDatabaseDataProvider
 
         <p><member>Command</member> needs to be interpreted depending on the value of this property.</p>
 
-        <p>This property is only meaningfull together with the <member>Command</member>
+        <p>This property is only meaningful together with the <member>Command</member>
         property, thus either <em>both</em> or <em>none</em> of them are present.</p>
 
         @see com::sun::star::sdb::CommandType
      */
     [attribute,bound] long CommandType;
 
-    /** specifies an addtional filter to optinally use.
+    /** specifies an additional filter to optionally use.
 
         <p>The Filter string has to form a SQL WHERE-clause, <em>without</em> the WHERE-string itself.</p>
 
@@ -177,7 +175,7 @@ interface XDatabaseDataProvider
         set raises (com::sun::star::beans::UnknownPropertyException);
     };
 
-    /** is a additional sort order definition for a rowset.
+    /** is a additional sort order definition for a row set.
      */
     [attribute,bound] string Order;
 
@@ -204,7 +202,7 @@ interface XDatabaseDataProvider
     {
         set raises (com::sun::star::lang::IllegalArgumentException);
     };
-    /** is the name of the datasource to use, this could be a named datasource
+    /** is the name of the data source to use, this could be a named data source
         or the URL of a data access component.
      */
     [attribute,bound] string DataSourceName;
diff --git a/offapi/com/sun/star/chart2/data/XLabeledDataSequence.idl b/offapi/com/sun/star/chart2/data/XLabeledDataSequence.idl
index dadba2306884..3ac92632d757 100644
--- a/offapi/com/sun/star/chart2/data/XLabeledDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/XLabeledDataSequence.idl
@@ -29,7 +29,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/chart2/data/XDataSequence.idl>
-// #include <com/sun/star/lang/IllegalArgumentException.idl>
 
 module com
 {
@@ -42,7 +41,7 @@ module chart2
 module data
 {
 
-/** allows acces to a one-dimensional sequence of data.
+/** allows access to a one-dimensional sequence of data.
 
     <p>The data that is stored in this container may contain different
     types.</p>
diff --git a/offapi/com/sun/star/chart2/data/XNumericalDataSequence.idl b/offapi/com/sun/star/chart2/data/XNumericalDataSequence.idl
index ef5be16be3f8..8868b91dbd81 100644
--- a/offapi/com/sun/star/chart2/data/XNumericalDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/XNumericalDataSequence.idl
@@ -40,7 +40,7 @@ module chart2
 module data
 {
 
-/** allows acces to a one-dimensional sequence of double precision
+/** allows access to a one-dimensional sequence of double precision
     floating-point numbers.
  */
 interface XNumericalDataSequence : ::com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl b/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl
index 95cb9ce06de6..077227f40e02 100644
--- a/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl
+++ b/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl
@@ -27,17 +27,9 @@
 #ifndef com_sun_star_chart2_data_XRangeHighlighter_idl
 #define com_sun_star_chart2_data_XRangeHighlighter_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__
 #include <com/sun/star/view/XSelectionChangeListener.idl>
-#endif
-
-#ifndef com_sun_star_chart2_data_HighlightedRange_idl
 #include <com/sun/star/chart2/data/HighlightedRange.idl>
-#endif
 
 module com
 {
diff --git a/offapi/com/sun/star/chart2/data/XRangeXMLConversion.idl b/offapi/com/sun/star/chart2/data/XRangeXMLConversion.idl
index de9a1f5615a8..9398284c309e 100644
--- a/offapi/com/sun/star/chart2/data/XRangeXMLConversion.idl
+++ b/offapi/com/sun/star/chart2/data/XRangeXMLConversion.idl
@@ -50,7 +50,7 @@ interface XRangeXMLConversion : ::com::sun::star::uno::XInterface
 
         <p>For example spreadsheet ranges consisting of more than one
         consecutive region are usually separated by a semicolon
-        whereas in XML you separate multiple regions by a spacce.</p>
+        whereas in XML you separate multiple regions by a space.</p>
      */
     string convertRangeToXML( [in] string aRangeRepresentation )
         raises( com::sun::star::lang::IllegalArgumentException );
diff --git a/offapi/com/sun/star/chart2/data/XTextualDataSequence.idl b/offapi/com/sun/star/chart2/data/XTextualDataSequence.idl
index 3f2786d34389..09c754d740e7 100644
--- a/offapi/com/sun/star/chart2/data/XTextualDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/XTextualDataSequence.idl
@@ -40,7 +40,7 @@ module chart2
 module data
 {
 
-/** allows acces to a one-dimensional sequence of strings.
+/** allows access to a one-dimensional sequence of strings.
  */
 interface XTextualDataSequence : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/configuration/AccessRootElement.idl b/offapi/com/sun/star/configuration/AccessRootElement.idl
index e6cab960ecb6..4787451853c1 100644
--- a/offapi/com/sun/star/configuration/AccessRootElement.idl
+++ b/offapi/com/sun/star/configuration/AccessRootElement.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_AccessRootElement_idl__
 #define __com_sun_star_configuration_AccessRootElement_idl__
 
-#ifndef __com_sun_star_configuration_HierarchyElement_idl__
 #include <com/sun/star/configuration/HierarchyElement.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XLocalizable_idl__
 #include <com/sun/star/lang/XLocalizable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XChangesNotifier_idl__
 #include <com/sun/star/util/XChangesNotifier.idl>
-#endif
 
 //=============================================================================
 
@@ -61,7 +50,7 @@ module com { module sun { module star { module configuration {
  It represents the <em>root</em> of the accessible part of the hierarchy.
  </p>
 
- <p><em><strong>NOTE:</strong> In this description 'hierarchy' may actually
+ <p><em><strong>NOTE:</strong> In this description "hierarchy" may actually
  designate a part or fragment of a larger hierarchy. It is that part that is
  rooted in the element represented by an implementation of this service
  and that is accessible starting from this element.</em>
diff --git a/offapi/com/sun/star/configuration/AdministrationProvider.idl b/offapi/com/sun/star/configuration/AdministrationProvider.idl
index 0c4a419fcf1f..af801bde4034 100644
--- a/offapi/com/sun/star/configuration/AdministrationProvider.idl
+++ b/offapi/com/sun/star/configuration/AdministrationProvider.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
 #define __com_sun_star_configuration_ConfigurationProvider_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
@@ -41,7 +36,7 @@ module com { module sun { module star { module configuration {
 
 //=============================================================================
 /** manages one, or more, complete sets of configuration data for
- administrative puposes and serves as a factory for objects that
+ administrative purposes and serves as a factory for objects that
  provide access to subsets of these shared configurations.
 
  <p>Shared sets of configuration data usually serve to provide defaults,
@@ -51,7 +46,7 @@ module com { module sun { module star { module configuration {
  </p>
  <p>Many aspects of the supported behavior depend strongly on the underlying
  data store and on the administrative structures it defines. With some data
- stores this service also enables access to individual users' configuration
+ stores this service also enables access to individual user's configuration
  data by an administrator.
  </p>
  <p>On the other hand, in the simplest model there is only a single layer of
@@ -127,7 +122,7 @@ published service AdministrationProvider
  accept a single argument named <code>nodepath</code> of type <atom>string</atom>.
  This argument must contain the absolute path to an element of the
  configuration. The view that is selected consists of the named element and
- all its decendants. The administrative entity is the default for the
+ all its descendants. The administrative entity is the default for the
  <type>AdministrationProvider</type>. Usually this is the largest entity
  encompassing all entities accessible from this instance. In other words this
  can be used to influence as global a scope as possible.
@@ -149,8 +144,8 @@ published service AdministrationProvider
  the locale set up for the user. But this service by default gets data for all
  locales for which data is present. Locale-dependent values in this case are
  replaced by a <type>SetAccess</type> using the language names as accessors.
- This also allows targetted setting of values for selected locales.
- This behavior can be requested explicitly by specifing a special argument
+ This also allows targeted setting of values for selected locales.
+ This behavior can be requested explicitly by specifying a special argument
  value <code>locale = "*"</code>.
  </p>
 
diff --git a/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl b/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl
index 7e6bb2daaaff..5ed6c9c726b2 100644
--- a/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl
+++ b/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
 #define __com_sun_star_configuration_CannotLoadConfigurationException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/ConfigurationAccess.idl b/offapi/com/sun/star/configuration/ConfigurationAccess.idl
index 41662f03f5e2..f4d7820656e5 100644
--- a/offapi/com/sun/star/configuration/ConfigurationAccess.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationAccess.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_configuration_ConfigurationAccess_idl__
 #define __com_sun_star_configuration_ConfigurationAccess_idl__
 
-#ifndef __com_sun_star_configuration_HierarchyAccess_idl__
 #include <com/sun/star/configuration/HierarchyAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_HierarchyElement_idl__
 #include <com/sun/star/configuration/HierarchyElement.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SetAccess_idl__
 #include <com/sun/star/configuration/SetAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_GroupAccess_idl__
 #include <com/sun/star/configuration/GroupAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_AccessRootElement_idl__
 #include <com/sun/star/configuration/AccessRootElement.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SetElement_idl__
 #include <com/sun/star/configuration/SetElement.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_GroupElement_idl__
 #include <com/sun/star/configuration/GroupElement.idl>
-#endif
 
 //=============================================================================
 
@@ -122,7 +102,7 @@ module com { module sun { module star { module configuration {
     <li><strong>string</strong> can hold a human-readable text.
         <p>Values are represented as <atom>string</atom>.</p>
         <p>Sequences are represented as <atom dim="[]">string</atom>.</p>
-        <p>'<em>human-readable</em>' here excludes non-printing characters
+        <p>"<em>human-readable</em>" here excludes non-printing characters
         except for CR, LF and TAB [Unicode code points 9,10,13].
         For binary data, use type <strong>binary</strong> instead.</p>
     </li>
diff --git a/offapi/com/sun/star/configuration/ConfigurationProvider.idl b/offapi/com/sun/star/configuration/ConfigurationProvider.idl
index c6924acf6c6e..257a8eca2a71 100644
--- a/offapi/com/sun/star/configuration/ConfigurationProvider.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationProvider.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
 #define __com_sun_star_configuration_ConfigurationProvider_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
@@ -109,7 +104,7 @@ published service ConfigurationProvider
  accept a single argument named <code>nodepath</code> of type <atom>string</atom>.
  This argument must contain the absolute path to an element of the
  configuration. The view that is selected consists of the named element and
- all its decendants.
+ all its descendants.
  </p>
 
  <p>Other arguments can be used to control the behavior of the view. These
diff --git a/offapi/com/sun/star/configuration/ConfigurationRegistry.idl b/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
index 870af90e7986..342e8576bd8a 100644
--- a/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
@@ -29,12 +29,8 @@
 
 //=============================================================================
 
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
 #include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 
@@ -86,7 +82,7 @@ published service ConfigurationRegistry
     /** is used to commit changes to the configuration.
         <p>As specified for the
         <type scope="com::sun::star::configuration">ConfigurationUpdateAccess</type>
-        service, all changes made to an configuration subtree have to be commited
+        service, all changes made to an configuration subtree have to be committed
         before they become persistent.
         To do this for a configuration accessed as a registry, call
         <method scope="com::sun::star::util">XFlushable::flush</method>.
diff --git a/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl b/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
index bd13b167c2c5..e42571cc7456 100644
--- a/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_ConfigurationUpdateAccess_idl__
 #define __com_sun_star_configuration_ConfigurationUpdateAccess_idl__
 
-#ifndef __com_sun_star_configuration_ConfigurationAccess_idl__
 #include <com/sun/star/configuration/ConfigurationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SetUpdate_idl__
 #include <com/sun/star/configuration/SetUpdate.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_GroupUpdate_idl__
 #include <com/sun/star/configuration/GroupUpdate.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_UpdateRootElement_idl__
 #include <com/sun/star/configuration/UpdateRootElement.idl>
-#endif
 
 //=============================================================================
 
@@ -76,7 +65,7 @@ module com { module sun { module star { module configuration {
         The root element of a modifiable tree provides extended functionality
         to control processing of changes for the entire tree (fragment) by
         supporting <type scope="com::sun::star::util">XChangesBatch</type>.
-        For elements of a <em>set</em> or a <em>group</em> no additinal
+        For elements of a <em>set</em> or a <em>group</em> no additional
         interfaces are supported.
     </li>
  </ul>
diff --git a/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl b/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl
index a2e827003eb3..77e5f5f40f17 100644
--- a/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl
+++ b/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_CorruptedConfigurationException_idl__
 #define __com_sun_star_configuration_CorruptedConfigurationException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl b/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl
index 5373cb570a91..03e14897f5c1 100644
--- a/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl
+++ b/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_CorruptedUIConfigurationException_idl__
 #define __com_sun_star_configuration_CorruptedUIConfigurationException_idl__
 
-#ifndef __com_sun_star_configuration_CorruptedConfigurationException_idl__
 #include <com/sun/star/configuration/CorruptedConfigurationException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/configuration/DefaultProvider.idl b/offapi/com/sun/star/configuration/DefaultProvider.idl
index 0fc09a078acc..a2875c68f4e6 100644
--- a/offapi/com/sun/star/configuration/DefaultProvider.idl
+++ b/offapi/com/sun/star/configuration/DefaultProvider.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_DefaultProvider_idl__
 #define __com_sun_star_configuration_DefaultProvider_idl__
 
-#ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
 #include <com/sun/star/configuration/ConfigurationProvider.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XLocalizable_idl__
 #include <com/sun/star/lang/XLocalizable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/configuration/GroupAccess.idl b/offapi/com/sun/star/configuration/GroupAccess.idl
index 46c0312eb617..5c069c539508 100644
--- a/offapi/com/sun/star/configuration/GroupAccess.idl
+++ b/offapi/com/sun/star/configuration/GroupAccess.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_GroupAccess_idl__
 #define __com_sun_star_configuration_GroupAccess_idl__
 
-#ifndef __com_sun_star_configuration_HierarchyAccess_idl__
 #include <com/sun/star/configuration/HierarchyAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_PropertyHierarchy_idl__
 #include <com/sun/star/configuration/PropertyHierarchy.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertyState_idl__
 #include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
 
 //=============================================================================
 
@@ -84,7 +73,7 @@ published service GroupAccess
  a view of the tree as a hierarchy of properties and subproperties.
 
  <p>This view is meaningful only for a static fragment of the hierarchy
- Objects' properties may change, but not which properties they have.
+ Object's properties may change, but not which properties they have.
  Therefore, dynamic elements of the hierarchy (see <type>SetAccess</type>)
  do not implement service <type>PropertyHierarchy</type>.
  </p>
diff --git a/offapi/com/sun/star/configuration/GroupElement.idl b/offapi/com/sun/star/configuration/GroupElement.idl
index 0f66580b0c92..822b5f8bbdf7 100644
--- a/offapi/com/sun/star/configuration/GroupElement.idl
+++ b/offapi/com/sun/star/configuration/GroupElement.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_GroupElement_idl__
 #define __com_sun_star_configuration_GroupElement_idl__
 
-#ifndef __com_sun_star_configuration_HierarchyElement_idl__
 #include <com/sun/star/configuration/HierarchyElement.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/GroupUpdate.idl b/offapi/com/sun/star/configuration/GroupUpdate.idl
index 0c7184c003c7..108f5ca769bc 100644
--- a/offapi/com/sun/star/configuration/GroupUpdate.idl
+++ b/offapi/com/sun/star/configuration/GroupUpdate.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_GroupUpdate_idl__
 #define __com_sun_star_configuration_GroupUpdate_idl__
 
-#ifndef __com_sun_star_configuration_GroupAccess_idl__
 #include <com/sun/star/configuration/GroupAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameReplace_idl__
 #include <com/sun/star/container/XNameReplace.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/HierarchyAccess.idl b/offapi/com/sun/star/configuration/HierarchyAccess.idl
index a5779042cd42..fb1fc1756266 100644
--- a/offapi/com/sun/star/configuration/HierarchyAccess.idl
+++ b/offapi/com/sun/star/configuration/HierarchyAccess.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_configuration_HierarchyAccess_idl__
 #define __com_sun_star_configuration_HierarchyAccess_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XExactName_idl__
 #include <com/sun/star/beans/XExactName.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
 #include <com/sun/star/beans/XPropertySetInfo.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertyState_idl__
 #include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
 
 //=============================================================================
 
@@ -111,7 +91,7 @@ published service HierarchyAccess
  any other interfaces that allow access to or manipulation of subnodes
  selected by name or hierarchical name.
  </p>
- <p>If an inexact name could be matched to either a simple or a hierachical
+ <p>If an inexact name could be matched to either a simple or a hierarchical
  name, the simple (immediate child) name is preferred.
  </p>
 */
diff --git a/offapi/com/sun/star/configuration/HierarchyElement.idl b/offapi/com/sun/star/configuration/HierarchyElement.idl
index 7a784821e202..ce9a536acb87 100644
--- a/offapi/com/sun/star/configuration/HierarchyElement.idl
+++ b/offapi/com/sun/star/configuration/HierarchyElement.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_configuration_HierarchyElement_idl__
 #define __com_sun_star_configuration_HierarchyElement_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_XHierarchicalName_idl__
 #include <com/sun/star/container/XHierarchicalName.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XProperty_idl__
 #include <com/sun/star/beans/XProperty.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyWithState_idl__
 #include <com/sun/star/beans/XPropertyWithState.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/InstallationIncompleteException.idl b/offapi/com/sun/star/configuration/InstallationIncompleteException.idl
index 568c36674286..f3328af71d35 100644
--- a/offapi/com/sun/star/configuration/InstallationIncompleteException.idl
+++ b/offapi/com/sun/star/configuration/InstallationIncompleteException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_InstallationIncompleteException_idl__
 #define __com_sun_star_configuration_InstallationIncompleteException_idl__
 
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
 #include <com/sun/star/configuration/CannotLoadConfigurationException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl b/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl
index d7cba09edf41..edf8aeb9479d 100644
--- a/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl
+++ b/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_InvalidBootstrapFileException_idl__
 #define __com_sun_star_configuration_InvalidBootstrapFileException_idl__
 
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
 #include <com/sun/star/configuration/CannotLoadConfigurationException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl b/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl
index b9588dc09a83..9a553e832e36 100644
--- a/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl
+++ b/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_MissingBootstrapFileException_idl__
 #define __com_sun_star_configuration_MissingBootstrapFileException_idl__
 
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
 #include <com/sun/star/configuration/CannotLoadConfigurationException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/PropertyHierarchy.idl b/offapi/com/sun/star/configuration/PropertyHierarchy.idl
index 3d37344a2c33..202605607f95 100644
--- a/offapi/com/sun/star/configuration/PropertyHierarchy.idl
+++ b/offapi/com/sun/star/configuration/PropertyHierarchy.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_PropertyHierarchy_idl__
 #define __com_sun_star_configuration_PropertyHierarchy_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XHierarchicalPropertySet_idl__
 #include <com/sun/star/beans/XHierarchicalPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiHierarchicalPropertySet_idl__
 #include <com/sun/star/beans/XMultiHierarchicalPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/SetAccess.idl b/offapi/com/sun/star/configuration/SetAccess.idl
index 9b564d90eabd..ea2e67692882 100644
--- a/offapi/com/sun/star/configuration/SetAccess.idl
+++ b/offapi/com/sun/star/configuration/SetAccess.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_SetAccess_idl__
 #define __com_sun_star_configuration_SetAccess_idl__
 
-#ifndef __com_sun_star_configuration_HierarchyAccess_idl__
 #include <com/sun/star/configuration/HierarchyAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SimpleSetAccess_idl__
 #include <com/sun/star/configuration/SimpleSetAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/SetElement.idl b/offapi/com/sun/star/configuration/SetElement.idl
index f82b642934be..4d679e335f52 100644
--- a/offapi/com/sun/star/configuration/SetElement.idl
+++ b/offapi/com/sun/star/configuration/SetElement.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_SetElement_idl__
 #define __com_sun_star_configuration_SetElement_idl__
 
-#ifndef __com_sun_star_configuration_HierarchyElement_idl__
 #include <com/sun/star/configuration/HierarchyElement.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_XTemplateInstance_idl__
 #include <com/sun/star/configuration/XTemplateInstance.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/SetUpdate.idl b/offapi/com/sun/star/configuration/SetUpdate.idl
index 57c56e7d0231..cfa7a8c6a120 100644
--- a/offapi/com/sun/star/configuration/SetUpdate.idl
+++ b/offapi/com/sun/star/configuration/SetUpdate.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_SetUpdate_idl__
 #define __com_sun_star_configuration_SetUpdate_idl__
 
-#ifndef __com_sun_star_configuration_SetAccess_idl__
 #include <com/sun/star/configuration/SetAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_SimpleSetUpdate_idl__
 #include <com/sun/star/configuration/SimpleSetUpdate.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/SimpleSetAccess.idl b/offapi/com/sun/star/configuration/SimpleSetAccess.idl
index 35f8745fe977..458c2e8ec12f 100644
--- a/offapi/com/sun/star/configuration/SimpleSetAccess.idl
+++ b/offapi/com/sun/star/configuration/SimpleSetAccess.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_SimpleSetAccess_idl__
 #define __com_sun_star_configuration_SimpleSetAccess_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_XTemplateContainer_idl__
 #include <com/sun/star/configuration/XTemplateContainer.idl>
-#endif
-
-#ifndef __com_sun_star_util_XStringEscape_idl__
 #include <com/sun/star/util/XStringEscape.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/SimpleSetUpdate.idl b/offapi/com/sun/star/configuration/SimpleSetUpdate.idl
index c9fb908281d1..cbd1641816d9 100644
--- a/offapi/com/sun/star/configuration/SimpleSetUpdate.idl
+++ b/offapi/com/sun/star/configuration/SimpleSetUpdate.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_SimpleSetUpdate_idl__
 #define __com_sun_star_configuration_SimpleSetUpdate_idl__
 
-#ifndef __com_sun_star_configuration_SimpleSetAccess_idl__
 #include <com/sun/star/configuration/SimpleSetAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/UpdateRootElement.idl b/offapi/com/sun/star/configuration/UpdateRootElement.idl
index 16ffa9450a08..d6ca451fae2c 100644
--- a/offapi/com/sun/star/configuration/UpdateRootElement.idl
+++ b/offapi/com/sun/star/configuration/UpdateRootElement.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_UpdateRootElement_idl__
 #define __com_sun_star_configuration_UpdateRootElement_idl__
 
-#ifndef __com_sun_star_configuration_AccessRootElement_idl__
 #include <com/sun/star/configuration/AccessRootElement.idl>
-#endif
-
-#ifndef __com_sun_star_util_XChangesBatch_idl__
 #include <com/sun/star/util/XChangesBatch.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/XTemplateContainer.idl b/offapi/com/sun/star/configuration/XTemplateContainer.idl
index 84331c660c19..a25a77567b7e 100644
--- a/offapi/com/sun/star/configuration/XTemplateContainer.idl
+++ b/offapi/com/sun/star/configuration/XTemplateContainer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_XTemplateContainer_idl__
 #define __com_sun_star_configuration_XTemplateContainer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/XTemplateInstance.idl b/offapi/com/sun/star/configuration/XTemplateInstance.idl
index f624ce8705f7..dd2b4ad6190b 100644
--- a/offapi/com/sun/star/configuration/XTemplateInstance.idl
+++ b/offapi/com/sun/star/configuration/XTemplateInstance.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_XTemplateInstance_idl__
 #define __com_sun_star_configuration_XTemplateInstance_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl b/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl
index 32ee9cf05f2f..228d33e4f150 100644
--- a/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl
+++ b/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_AuthenticationFailedException_idl__
 #define __com_sun_star_configuration_backend_AuthenticationFailedException_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
 #include <com/sun/star/configuration/backend/BackendSetupException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/Backend.idl b/offapi/com/sun/star/configuration/backend/Backend.idl
index 0932291c74bd..2bd3d29ab28b 100644
--- a/offapi/com/sun/star/configuration/backend/Backend.idl
+++ b/offapi/com/sun/star/configuration/backend/Backend.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_Backend_idl__
 #define __com_sun_star_configuration_backend_Backend_idl__
 
-#ifndef __com_sun_star_configuration_backend_XBackend_idl__
 #include <com/sun/star/configuration/backend/XBackend.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif
 
 //=============================================================================
 
@@ -57,7 +49,7 @@ module com { module sun { module star { module configuration { module backend {
         A component contains configuration data for a particular
         application domain or software module.
     </p>
-    <p> Entities are organised hierarchically in organisations,
+    <p> Entities are organized hierarchically in organizations,
         groups, roles and individual users. Each element of the associated
         hierarchy corresponds to a layer that applies to an entity.
     </p>
diff --git a/offapi/com/sun/star/configuration/backend/BackendAccessException.idl b/offapi/com/sun/star/configuration/backend/BackendAccessException.idl
index d5c80d01ee0b..f89b336aab0e 100644
--- a/offapi/com/sun/star/configuration/backend/BackendAccessException.idl
+++ b/offapi/com/sun/star/configuration/backend/BackendAccessException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #define __com_sun_star_configuration_backend_BackendAccessException_idl__
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/BackendAdapter.idl b/offapi/com/sun/star/configuration/backend/BackendAdapter.idl
index 176abb2d1ce0..1aed7c8719c8 100644
--- a/offapi/com/sun/star/configuration/backend/BackendAdapter.idl
+++ b/offapi/com/sun/star/configuration/backend/BackendAdapter.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
 #define __com_sun_star_configuration_backend_BackendAdapter_idl__
 
-#ifndef __com_sun_star_configuration_backend_Backend_idl__
 #include <com/sun/star/configuration/backend/Backend.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/BackendSetupException.idl b/offapi/com/sun/star/configuration/backend/BackendSetupException.idl
index c5ce0d0c47cd..860bcb1714dd 100644
--- a/offapi/com/sun/star/configuration/backend/BackendSetupException.idl
+++ b/offapi/com/sun/star/configuration/backend/BackendSetupException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
 #define __com_sun_star_configuration_backend_BackendSetupException_idl__
 
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
 #include <com/sun/star/configuration/CannotLoadConfigurationException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/CannotConnectException.idl b/offapi/com/sun/star/configuration/backend/CannotConnectException.idl
index 04a1d44b9c03..affdf32dea18 100644
--- a/offapi/com/sun/star/configuration/backend/CannotConnectException.idl
+++ b/offapi/com/sun/star/configuration/backend/CannotConnectException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_CannotConnectException_idl__
 #define __com_sun_star_configuration_backend_CannotConnectException_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
 #include <com/sun/star/configuration/backend/BackendSetupException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl b/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl
index afe42f257a83..5105cf3d706b 100644
--- a/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl
+++ b/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_ComponentChangeEvent_idl__
 #define __com_sun_star_configuration_backend_ComponentChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 //=============================================================================
 
 module com {  module sun {  module star {  module configuration {  module backend {
diff --git a/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl b/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl
index f6213e9327c5..6769ffd2e420 100644
--- a/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl
+++ b/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_ConnectionLostException_idl__
 #define __com_sun_star_configuration_backend_ConnectionLostException_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/CopyImporter.idl b/offapi/com/sun/star/configuration/backend/CopyImporter.idl
index ab790ba521e1..34a7ef7f9050 100644
--- a/offapi/com/sun/star/configuration/backend/CopyImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/CopyImporter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_CopyImporter_idl__
 #define __com_sun_star_configuration_backend_CopyImporter_idl__
 
-#ifndef __com_sun_star_configuration_backend_Importer_idl__
 #include <com/sun/star/configuration/backend/Importer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/DataImporter.idl b/offapi/com/sun/star/configuration/backend/DataImporter.idl
index a3b039e24ca0..9c7792b55e2d 100644
--- a/offapi/com/sun/star/configuration/backend/DataImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/DataImporter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_DataImporter_idl__
 #define __com_sun_star_configuration_backend_DataImporter_idl__
 
-#ifndef __com_sun_star_task_XJob_idl__
 #include <com/sun/star/task/XJob.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/DefaultBackend.idl b/offapi/com/sun/star/configuration/backend/DefaultBackend.idl
index 38ddc1e034e7..a22d72fb9ab2 100644
--- a/offapi/com/sun/star/configuration/backend/DefaultBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/DefaultBackend.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_DefaultBackend_idl__
 #define __com_sun_star_configuration_backend_DefaultBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_Backend_idl__
 #include <com/sun/star/configuration/backend/Backend.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl b/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
index 22f07f63b37b..bfb7452b59b9 100644
--- a/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
+++ b/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_HierarchyBrowser_idl__
 #define __com_sun_star_configuration_backend_HierarchyBrowser_idl__
 
-#ifndef __com_sun_star_task_XJob_idl__
 #include <com/sun/star/task/XJob.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/Importer.idl b/offapi/com/sun/star/configuration/backend/Importer.idl
index 8cb74626c6be..118b70388a18 100644
--- a/offapi/com/sun/star/configuration/backend/Importer.idl
+++ b/offapi/com/sun/star/configuration/backend/Importer.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_Importer_idl__
 #define __com_sun_star_configuration_backend_Importer_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayerImporter_idl__
 #include <com/sun/star/configuration/backend/XLayerImporter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl b/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl
index 81da4911437b..b570ea3b1065 100644
--- a/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl
+++ b/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_InsufficientAccessRightsException_idl__
 #define __com_sun_star_configuration_backend_InsufficientAccessRightsException_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl b/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl
index 50d9650636ff..be5628fae56f 100644
--- a/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl
+++ b/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_InvalidAuthenticationMechanismException_idl__
 #define __com_sun_star_configuration_backend_InvalidAuthenticationMechanismException_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
 #include <com/sun/star/configuration/backend/BackendSetupException.idl>
-#endif
 
 module com { module sun { module star { module configuration {
 module backend {
diff --git a/offapi/com/sun/star/configuration/backend/Layer.idl b/offapi/com/sun/star/configuration/backend/Layer.idl
index 545bddad641e..49aebb43e668 100644
--- a/offapi/com/sun/star/configuration/backend/Layer.idl
+++ b/offapi/com/sun/star/configuration/backend/Layer.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_configuration_backend_Layer_idl__
 #define __com_sun_star_configuration_backend_Layer_idl__
 
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XCompositeLayer_idl__
 #include <com/sun/star/configuration/backend/XCompositeLayer.idl>
-#endif
-
-#ifndef __com_sun_star_util_XTimeStamped_idl__
 #include <com/sun/star/util/XTimeStamped.idl>
-#endif
 
 //==============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/LayerDescriber.idl b/offapi/com/sun/star/configuration/backend/LayerDescriber.idl
index 1f6ae54f2c5f..6555dca64e0f 100644
--- a/offapi/com/sun/star/configuration/backend/LayerDescriber.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerDescriber.idl
@@ -1,13 +1,8 @@
 #ifndef __com_sun_star_configuration_backend_LayerDescriber_idl__
 #define __com_sun_star_configuration_backend_LayerDescriber_idl__
 
-#ifndef __com_sun_star_configuration_backend_XLayerContentDescriber_idl__
 #include <com/sun/star/configuration/backend/XLayerContentDescriber.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 
@@ -18,7 +13,7 @@ module com { module sun { module star { module configuration { module backend {
 //=============================================================================
 
 /**
-   describe the contents of a layer to an XLayerHander object. The contents of
+   describe the contents of a layer to an XLayerHandler object. The contents of
    the layer is contained in the sequence of PropertyInfo structures
    @see PropertyInfo
 
diff --git a/offapi/com/sun/star/configuration/backend/LayerFilter.idl b/offapi/com/sun/star/configuration/backend/LayerFilter.idl
index 357b5ba6b2e7..9218465ba9a9 100644
--- a/offapi/com/sun/star/configuration/backend/LayerFilter.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerFilter.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_configuration_backend_LayerFilter_idl__
 #define __com_sun_star_configuration_backend_LayerFilter_idl__
 
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //==============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl b/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl
index bff3c26c92a8..c221ee819c5d 100644
--- a/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_LayerUpdateMerger_idl__
 #define __com_sun_star_configuration_backend_LayerUpdateMerger_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__
 #include <com/sun/star/configuration/backend/XUpdateHandler.idl>
-#endif
 
 //=============================================================================
 
@@ -72,7 +67,7 @@ published service LayerUpdateMerger
             data source and an <type>XLayerHandler</type> object to receive the
             updated data.
         </p>
-        <p> Implementations can provide more arguments to finetune the behavior.
+        <p> Implementations can provide more arguments to fine tune the behavior.
             Such arguments are provided as
             <type scope="com::sun::star::beans">NamedValue</type>.
             Implementations should support the following named arguments:
diff --git a/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
index f02bd733498e..fe93e0b32118 100644
--- a/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LdapMultiLayerStratum_idl__
 #define __com_sun_star_configuration_backend_LdapMultiLayerStratum_idl__
 
-#ifndef __com_sun_star_configuration_backend_MultiLayerStratum_idl__
 #include <com/sun/star/configuration/backend/MultiLayerStratum.idl>
-#endif
 
 //=============================================================================
 
@@ -39,7 +37,7 @@ module com { module sun { module star { module configuration { module backend {
 
 /**
    implements <type>MultiLayerStratum</type> that
-    provides access to a multiple layers of configuration data from ldap source
+    provides access to a multiple layers of configuration data from LDAP source
 */
 service LdapMultiLayerStratum
 {
diff --git a/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl b/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
index 31897515ce7c..1b1601d743e7 100644
--- a/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LdapSingleBackend_idl__
 #define __com_sun_star_configuration_backend_LdapSingleBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_SingleBackend_idl__
 #include <com/sun/star/configuration/backend/SingleBackend.idl>
-#endif
 
 //=============================================================================
 
@@ -39,7 +37,7 @@ module com { module sun { module star { module configuration { module backend {
 
 /**
     implements <type>SingleBackend</type> that stores data in an
-    LDAP directoy.
+    LDAP directory.
 
     @since OOo 1.1.2
 */
diff --git a/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl b/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
index ae50be4c836a..99d9d0db69c4 100644
--- a/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LdapSingleStratum_idl__
 #define __com_sun_star_configuration_backend_LdapSingleStratum_idl__
 
-#ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 #include <com/sun/star/configuration/backend/SingleLayerStratum.idl>
-#endif
 
 //=============================================================================
 
@@ -39,7 +37,7 @@ module com { module sun { module star { module configuration { module backend {
 
 /**
    implements <type>SingleLayerStratum</type> that
-    provides access to a single layer of configuration data from ldap source
+    provides access to a single layer of configuration data from LDAP source
 */
 service LdapSingleStratum
 {
diff --git a/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl b/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
index 9c1dd5ee77f0..48435d7ff134 100644
--- a/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LocalDataImporter_idl__
 #define __com_sun_star_configuration_backend_LocalDataImporter_idl__
 
-#ifndef __com_sun_star_configuration_backend_DataImporter_idl__
 #include <com/sun/star/configuration/backend/DataImporter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl b/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl
index ae7244365af2..7903186fbf6f 100644
--- a/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LocalHierarchyBrowser_idl__
 #define __com_sun_star_configuration_backend_LocalHierarchyBrowser_idl__
 
-#ifndef __com_sun_star_configuration_backend_HierarchyBrowser_idl__
 #include <com/sun/star/configuration/backend/HierarchyBrowser.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl
index 3c72d908579c..f6806928daf8 100644
--- a/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LocalSchemaSupplier_idl__
 #define __com_sun_star_configuration_backend_LocalSchemaSupplier_idl__
 
-#ifndef __com_sun_star_configuration_backend_SchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/SchemaSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl b/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl
index 098d8123e079..b1a20ca7f4e2 100644
--- a/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LocalSingleBackend_idl__
 #define __com_sun_star_configuration_backend_LocalSingleBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_SingleBackend_idl__
 #include <com/sun/star/configuration/backend/SingleBackend.idl>
-#endif
 
 //=============================================================================
 
@@ -39,7 +37,7 @@ module com { module sun { module star { module configuration { module backend {
 
 /**
     implements <type>SingleBackend</type> that stores data in the
-    local filesystem using the OOR XML formats.
+    local file system using the OOR XML formats.
 
     @since OOo 1.1.2
 */
diff --git a/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl b/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl
index aea200df1925..86c47e989b0d 100644
--- a/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_LocalSingleStratum_idl__
 #define __com_sun_star_configuration_backend_LocalSingleStratum_idl__
 
-#ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 #include <com/sun/star/configuration/backend/SingleLayerStratum.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/MalformedDataException.idl b/offapi/com/sun/star/configuration/backend/MalformedDataException.idl
index 211571a41566..b529b1c12932 100644
--- a/offapi/com/sun/star/configuration/backend/MalformedDataException.idl
+++ b/offapi/com/sun/star/configuration/backend/MalformedDataException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #define __com_sun_star_configuration_backend_MalformedDataException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
@@ -69,7 +67,7 @@ published exception MalformedDataException: ::com::sun::star::uno::Exception
             <dd>for properties that are not in the schema.</dd>
 
             <dt><type scope="com::sun::star::lang">IllegalArgumentException</type></dt>
-            <dd>for data values (names,attibutes,etc.) that are invalid.</dd>
+            <dd>for data values (names,attributes,etc.) that are invalid.</dd>
 
             <dt><type scope="com::sun::star::lang">IllegalAccessException</type></dt>
             <dd>for changes that violate access restrictions.</dd>
diff --git a/offapi/com/sun/star/configuration/backend/MergeImporter.idl b/offapi/com/sun/star/configuration/backend/MergeImporter.idl
index d02d68985f32..d0f39d923b14 100644
--- a/offapi/com/sun/star/configuration/backend/MergeImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/MergeImporter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_MergeImporter_idl__
 #define __com_sun_star_configuration_backend_MergeImporter_idl__
 
-#ifndef __com_sun_star_configuration_backend_Importer_idl__
 #include <com/sun/star/configuration/backend/Importer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
index 133fc8080e66..e87f29522895 100644
--- a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
+++ b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_MergeRecoveryRequest_idl__
 #define __com_sun_star_configuration_backend_MergeRecoveryRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
@@ -71,9 +69,9 @@ exception MergeRecoveryRequest: ::com::sun::star::uno::Exception
     string ErrorLayerId;
 
     /**
-        specifies whether the requestor wants to remove or skip the invalid layer.
+        specifies whether the requester wants to remove or skip the invalid layer.
 
-        <p> If <TRUE/> the requestor wants to remove the underlying data of
+        <p> If <TRUE/> the requester wants to remove the underlying data of
             the layer.<BR/>
             If <FALSE/> the request is to skip the underlying data this time,
             but without removing it.
diff --git a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
index 375f8851829c..32772aa98ea7 100644
--- a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 #define __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
 #include <com/sun/star/configuration/backend/XMultiLayerStratum.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl b/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl
index 7e755d187d94..9eddb8b60ee9 100644
--- a/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_MultiStratumBackend_idl__
 #define __com_sun_star_configuration_backend_MultiStratumBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_Backend_idl__
 #include <com/sun/star/configuration/backend/Backend.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/OfflineBackend.idl b/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
index 57775a6a4afd..b1f710f63a17 100644
--- a/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_OfflineBackend_idl__
 #define __com_sun_star_configuration_backend_OfflineBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
 #include <com/sun/star/configuration/backend/BackendAdapter.idl>
-#endif
 
 //=============================================================================
 
@@ -52,16 +50,16 @@ published service OfflineBackend
 
     /** provides access to configuration data from a <type>SingleBackend</type>.
 
-      <p>If no backend is provided during initalization or if the context
-        contains an <code>Offline</code> flag that is <TRUE/>, then offline mode
-        is activated. This may fail, if the offline cache has not been filled
+      <p>If no backend is provided during initialization or if the context
+        contains an <code>Offline</code> flag that is <TRUE/>, then off-line mode
+        is activated. This may fail, if the off-line cache has not been filled
         during a previous execution.
       </p>
       <p>Less entities may be available from <type>XBackendEntities</type>,
-      when operating in offline mode than when operating with an online
+      when operating in off-line mode than when operating with an on-line
       <type>SingleBackend</type>.
       </p>
-      <p>If offline mode is not invoked, the implementation behaves
+      <p>If off-line mode is not invoked, the implementation behaves
         like any other <type>BackendAdapter</type>.
       </p>
 
diff --git a/offapi/com/sun/star/configuration/backend/OnlineBackend.idl b/offapi/com/sun/star/configuration/backend/OnlineBackend.idl
index a0d8e39abaf8..046d0e6c3761 100644
--- a/offapi/com/sun/star/configuration/backend/OnlineBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/OnlineBackend.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_OnlineBackend_idl__
 #define __com_sun_star_configuration_backend_OnlineBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
 #include <com/sun/star/configuration/backend/BackendAdapter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/PlatformBackend.idl b/offapi/com/sun/star/configuration/backend/PlatformBackend.idl
index 70577522da86..817c0d373a03 100644
--- a/offapi/com/sun/star/configuration/backend/PlatformBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/PlatformBackend.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_PlatformBackend_idl__
 #define __com_sun_star_configuration_backend_PlatformBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 #include <com/sun/star/configuration/backend/SingleLayerStratum.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/Schema.idl b/offapi/com/sun/star/configuration/backend/Schema.idl
index 61150a60435a..7c7778518c4b 100644
--- a/offapi/com/sun/star/configuration/backend/Schema.idl
+++ b/offapi/com/sun/star/configuration/backend/Schema.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_configuration_backend_Schema_idl__
 #define __com_sun_star_configuration_backend_Schema_idl__
 
-#ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #include <com/sun/star/configuration/backend/XSchema.idl>
-#endif
 
 //==============================================================================
 
@@ -41,7 +39,7 @@ module com { module sun { module star { module configuration { module backend {
 /**
   provides read only access to a configuration component schema.
 
-  <p>A component is a set of hierarchically organised and semantically
+  <p>A component is a set of hierarchically organized and semantically
   related configuration settings, e.g StarWriter settings.
   </p>
   <p>A component schema contains two separate sections, one which
diff --git a/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl
index 10b59ddc5c6d..fc932b809518 100644
--- a/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_SchemaSupplier_idl__
 #define __com_sun_star_configuration_backend_SchemaSupplier_idl__
 
-#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/SingleBackend.idl b/offapi/com/sun/star/configuration/backend/SingleBackend.idl
index 2cf1dc898661..a9bc99b60322 100644
--- a/offapi/com/sun/star/configuration/backend/SingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleBackend.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_SingleBackend_idl__
 #define __com_sun_star_configuration_backend_SingleBackend_idl__
 
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
 #include <com/sun/star/configuration/backend/XMultiLayerStratum.idl>
-#endif
 
 //=============================================================================
 
@@ -58,7 +50,7 @@ module com { module sun { module star { module configuration { module backend {
         A component contains configuration data for a particular
         application domain or software module.
     </p>
-    <p> Entities are organised hierarchically in organisations,
+    <p> Entities are organized hierarchically in organizations,
         groups, roles and individual users. Each element of the associated
         hierarchy corresponds to a layer that applies to an entity.
     </p>
diff --git a/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl b/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl
index 6135f75d9f68..704a56d436c8 100644
--- a/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_SingleBackendAdapter_idl__
 #define __com_sun_star_configuration_backend_SingleBackendAdapter_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
 #include <com/sun/star/configuration/backend/BackendAdapter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl b/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl
index 8f6a28085c7a..3da3b5cdbd20 100644
--- a/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 #define __com_sun_star_configuration_backend_SingleLayerStratum_idl__
 
-#ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XSingleLayerStratum_idl__
 #include <com/sun/star/configuration/backend/XSingleLayerStratum.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/configuration/backend/StratumCreationException.idl b/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
index 825c81a254ef..628b8a602e01 100644
--- a/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
+++ b/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_backend_StratumCreationException_idl__
 #define __com_sun_star_configuration_backend_StratumCreationException_idl__
 
-#ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
 #include <com/sun/star/configuration/backend/BackendSetupException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/SystemIntegration.idl b/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
index 5aa281a67ec0..1a278478e139 100644
--- a/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
+++ b/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_SystemIntegration_idl__
 #define __com_sun_star_configuration_backend_SystemIntegration_idl__
 
-#ifndef __com_sun_star_configuration_backend_Backend_idl__
 #include <com/sun/star/configuration/backend/Backend.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 //=============================================================================
 
 module com { module sun { module star { module configuration { module backend {
@@ -56,8 +51,8 @@ service SystemIntegration
     /**
        allows initialization of backend data sources
 
-       <p>no parameters need to be passed as backends are initialised
-          using the service registration database 'services.rdb'.
+       <p>no parameters need to be passed as backends are initialized
+          using the service registration database "services.rdb".
        </p>
 
     */
diff --git a/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl b/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl
index f74b1f2d5ce8..3b6e79bd2943 100644
--- a/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_configuration_backend_UpdatableLayer_idl__
 #define __com_sun_star_configuration_backend_UpdatableLayer_idl__
 
-#ifndef __com_sun_star_configuration_backend_Layer_idl__
 #include <com/sun/star/configuration/backend/Layer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
 #include <com/sun/star/configuration/backend/XUpdatableLayer.idl>
-#endif
 
 //==============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XBackend.idl b/offapi/com/sun/star/configuration/backend/XBackend.idl
index 5696bff294b3..861aea194e9c 100644
--- a/offapi/com/sun/star/configuration/backend/XBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackend.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_configuration_backend_XBackend_idl__
 #define __com_sun_star_configuration_backend_XBackend_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__
 #include <com/sun/star/configuration/backend/XUpdateHandler.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #include <com/sun/star/configuration/backend/XSchema.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl b/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl
index 6530e7182fea..93640149a7d1 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_configuration_backend_XBackendChangesListener_idl__
 #define __com_sun_star_configuration_backend_XBackendChangesListener_idl__
 
-#ifndef __com_sun_star_configuration_backend_ComponentChangeEvent_idl__
 #include <com/sun/star/configuration/backend/ComponentChangeEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 //=============================================================================
 
 module com {  module sun {  module star {  module configuration {  module backend {
diff --git a/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl b/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
index ca2861bcf443..adf653eabeee 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_configuration_backend_XBackendChangesNotifier_idl__
 #define __com_sun_star_configuration_backend_XBackendChangesNotifier_idl__
 
-#ifndef __com_sun_star_configuration_backend_XBackendChangesListener_idl__
 #include <com/sun/star/configuration/backend/XBackendChangesListener.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -48,7 +43,7 @@ module com {  module sun {  module star {  module configuration {  module backen
 interface XBackendChangesNotifier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** adds the specified listener to receive events when changes occured.
+    /** adds the specified listener to receive events when changes occurred.
         @param aListener
             specifies the listener object.
 
diff --git a/offapi/com/sun/star/configuration/backend/XBackendEntities.idl b/offapi/com/sun/star/configuration/backend/XBackendEntities.idl
index 9829ad993ec3..dbe929949fa3 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendEntities.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendEntities.idl
@@ -27,16 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #define __com_sun_star_configuration_backend_XBackendEntities_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl b/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl
index 74dc11e27820..4b95cde305a3 100644
--- a/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_configuration_backend_XCompositeLayer_idl__
 #define __com_sun_star_configuration_backend_XCompositeLayer_idl__
 
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
 
 //==============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XLayer.idl b/offapi/com/sun/star/configuration/backend/XLayer.idl
index 89911d869dc8..b2ff93184240 100644
--- a/offapi/com/sun/star/configuration/backend/XLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayer.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #define __com_sun_star_configuration_backend_XLayer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
 #include <com/sun/star/configuration/backend/XLayerHandler.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl b/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl
index d8718f361c1a..c1ca697b49ca 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_configuration_backend_XLayerContentDescriber_idl__
 #define __com_sun_star_configuration_backend_XLayerContentDescriber_idl__
 
-#ifndef __com_sun_star_configuration_backend_PropertyInfo_idl__
 #include <com/sun/star/configuration/backend/PropertyInfo.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
 #include <com/sun/star/configuration/backend/XLayerHandler.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
 
 //=============================================================================
 
@@ -54,7 +40,7 @@ module com { module sun { module star { module configuration { module backend {
 //=============================================================================
 
 /**
-   describe the contents of a layer to an XLayerHander object. The contents of
+   describe the contents of a layer to an XLayerHandler object. The contents of
    the layer is contained in the sequence of PropertyInfo structures
    @see PropertyInfo
 
diff --git a/offapi/com/sun/star/configuration/backend/XLayerHandler.idl b/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
index 22b75c9466dc..5ca2c1e10903 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
 #define __com_sun_star_configuration_backend_XLayerHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__
 #include <com/sun/star/configuration/backend/TemplateIdentifier.idl>
-#endif
 
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
@@ -150,7 +140,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
     /** receives notification that a new item is started.
 
         <p> The current node must be a set and
-            a preexisting item (if any) must be removeable.
+            a preexisting item (if any) must be removable.
         </p>
         <p> The new item will be created from the default template
             of the set.
@@ -178,7 +168,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
             <li>if there isn't a set node in progress currently</li>
             <li>if there already was a change to a node of that name</li>
             <li>if the template for the new node is not found</li>
-            <li>if an item of that name on a lower layer is not removeable</li>
+            <li>if an item of that name on a lower layer is not removable</li>
             <li>if the name is not a valid item name</li>
             <li>if the attributes are not valid for the node</li>
             </ul>
@@ -199,7 +189,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         is started.
 
         <p> The current node must be a set and
-            a preexisting item (if any) must be removeable.
+            a preexisting item (if any) must be removable.
         </p>
         <p> Subsequent calls describe the difference from the template
             of properties and members or items of the node until
@@ -228,7 +218,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
             <li>if there already was a change to a node of that name</li>
             <li>if the template for the new node is not found</li>
             <li>if the template is not a valid item type for the containing set</li>
-            <li>if an item of that name on a lower layer is not removeable</li>
+            <li>if an item of that name on a lower layer is not removable</li>
             <li>if the name is not a valid item name</li>
             <li>if the attributes are not valid for the node</li>
             </ul>
@@ -272,7 +262,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
     /** receives notification that a node is dropped from a set.
 
         <p> The current node must be a set and
-            the item must be removeable.
+            the item must be removable.
         </p>
 
         @param aName
@@ -283,7 +273,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
             <li>if there isn't a set node in progress currently</li>
             <li>if there already was a change to a node of that name</li>
             <li>if there is no item with that name</li>
-            <li>if the item is not removeable</li>
+            <li>if the item is not removable</li>
             <li>if the name is not a valid node name</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
diff --git a/offapi/com/sun/star/configuration/backend/XLayerImporter.idl b/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
index ee0d686dd640..ce8eefc526df 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
@@ -27,30 +27,13 @@
 #ifndef __com_sun_star_configuration_backend_XLayerImporter_idl__
 #define __com_sun_star_configuration_backend_XLayerImporter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XBackend_idl__
 #include <com/sun/star/configuration/backend/XBackend.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl
index 0f28433a24f6..f17683c237cb 100644
--- a/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
 #define __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
 #include <com/sun/star/configuration/backend/XUpdatableLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 //=============================================================================
 
@@ -90,7 +73,7 @@ published interface XMultiLayerStratum : ::com::sun::star::uno::XInterface
       @return
                 a list of layer identifiers that can be used to
                 retrieve <type>Layer</type> objects.
-                <p> The list ist ordered by priority. Typically
+                <p> The list is ordered by priority. Typically
                    the most general layers (global defaults,
                    entire organization) are first, more specific layers
                    (associated to specific groups or roles) are next
diff --git a/offapi/com/sun/star/configuration/backend/XSchema.idl b/offapi/com/sun/star/configuration/backend/XSchema.idl
index 6f761216fd39..e0ee0aba3051 100644
--- a/offapi/com/sun/star/configuration/backend/XSchema.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchema.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #define __com_sun_star_configuration_backend_XSchema_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XSchemaHandler_idl__
 #include <com/sun/star/configuration/backend/XSchemaHandler.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl b/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
index 635eb6164bbd..b1e11ec9946d 100644
--- a/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_configuration_backend_XSchemaHandler_idl__
 #define __com_sun_star_configuration_backend_XSchemaHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__
 #include <com/sun/star/configuration/backend/TemplateIdentifier.idl>
-#endif
 
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
@@ -59,7 +49,7 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
 
     /** receives notification that a schema description is started.
 
-        <p> The schema descrption may comprise components templates or both.
+        <p> The schema description may comprise components templates or both.
         </p>
 
         @throws com::sun::star::configuration::backend::MalformedDataException
diff --git a/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl
index d8005be6a38b..a896fc8ce698 100644
--- a/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #define __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #include <com/sun/star/configuration/backend/XSchema.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl b/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl
index 96ac572e82db..38a10baa2589 100644
--- a/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_configuration_backend_XSingleLayerStratum_idl__
 #define __com_sun_star_configuration_backend_XSingleLayerStratum_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
 #include <com/sun/star/configuration/backend/XUpdatableLayer.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl b/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl
index c2fdf99e2eb0..f0d106feea43 100644
--- a/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
 #define __com_sun_star_configuration_backend_XUpdatableLayer_idl__
 
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
 
 //==============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl b/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
index 918eee7ea365..49609e284522 100644
--- a/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
@@ -27,25 +27,12 @@
 #ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__
 #define __com_sun_star_configuration_backend_XUpdateHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__
 #include <com/sun/star/configuration/backend/TemplateIdentifier.idl>
-#endif
 
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
 #include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
 
 //=============================================================================
 
@@ -169,7 +156,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
     /** receives notification that a node is started as a new item.
 
         <p> The current node must be a set and
-            a preexisting item (if any) must be removeable.
+            a preexisting item (if any) must be removable.
         </p>
         <p> The new item will be created from the default template
             of the set.
@@ -196,7 +183,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <li>if there isn't a set node in progress currently</li>
             <li>if there already was a change to an item of that name</li>
             <li>if the template for the new node is not found</li>
-            <li>if an item of that name exists and is not removeable</li>
+            <li>if an item of that name exists and is not removable</li>
             <li>if the name is not a valid item name</li>
             <li>if the attributes are not valid for the node</li>
             </ul>
@@ -217,7 +204,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
         based on a particular template.
 
         <p> The current node must be a set and
-            a preexisting item (if any) must be removeable.
+            a preexisting item (if any) must be removable.
         </p>
         <p> Subsequent calls describe the difference from the template
             of properties or members of the node until a matching call
@@ -244,7 +231,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <li>if there isn't a set node in progress currently</li>
             <li>if there already was a change to an item of that name</li>
             <li>if the template for the new node is not found</li>
-            <li>if an item of that name exists and is not removeable</li>
+            <li>if an item of that name exists and is not removable</li>
             <li>if the name is not a valid item name</li>
             <li>if the template is not a valid item type for the containing set</li>
             <li>if the attributes are not valid for the node</li>
@@ -289,7 +276,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
     /** receives notification that an item is to be dropped from a set.
 
         <p> The current node must be a set and
-            the item must be removeable.
+            the item must be removable.
         </p>
 
         @param aName
@@ -300,7 +287,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <li>if there isn't a set node in progress currently</li>
             <li>if there already was a change to a node of that name</li>
             <li>if there is no item with that name</li>
-            <li>if the item is not removeable</li>
+            <li>if the item is not removable</li>
             <li>if the name is not a valid node name</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
@@ -538,7 +525,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         <p> The current node must be extensible and
             a preexisting property (if any) must be
-            removeable in this layer.
+            removable in this layer.
         </p>
 
         @param aName
@@ -564,7 +551,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <ul>
             <li>if there isn't a group or extensible node in progress currently</li>
             <li>if there already was a change to a property of that name</li>
-            <li>if a property of that name exists and is not removeable</li>
+            <li>if a property of that name exists and is not removable</li>
             <li>if the specified type is not allowed</li>
             <li>if the name is not a valid property name</li>
             <li>if the attributes are not valid for the property</li>
@@ -588,7 +575,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         <p> The current node must be extensible and
             a preexisting property (if any) must be
-            removeable in this layer.
+            removable in this layer.
         </p>
 
         @param aName
@@ -618,7 +605,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <ul>
             <li>if there isn't a group or extensible node in progress currently</li>
             <li>if there already was a change to a property of that name</li>
-            <li>if a property of that name exists and is not removeable</li>
+            <li>if a property of that name exists and is not removable</li>
             <li>if the type of the value is not an allowed type,
                 or if the value is <void/></li>
             <li>if the name is not a valid property name</li>
@@ -640,7 +627,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
     /** receives notification that a property is dropped from the current node.
 
-        <p>The current node must be extensible and the property removeable.</p>
+        <p>The current node must be extensible and the property removable.</p>
 
         @param aName
             specifies the name of the property.
@@ -649,7 +636,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <ul>
             <li>if there isn't a group or extensible node in progress currently</li>
             <li>if there is no property with that name</li>
-            <li>if the property is not removeable</li>
+            <li>if the property is not removable</li>
             <li>if the name is not a valid node name</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
diff --git a/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl
index 2bcefd070ac3..773457a9811e 100644
--- a/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_XVersionedSchemaSupplier_idl__
 #define __com_sun_star_configuration_backend_XVersionedSchemaSupplier_idl__
 
-#ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl b/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
index 864051bae236..5e2c3e497d75 100644
--- a/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_xml_LayerParser_idl__
 #define __com_sun_star_configuration_backend_xml_LayerParser_idl__
 
-#ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
@@ -50,12 +42,12 @@ module xml {
     represents a configuration data layer that is stored in a stream in
     OOR Update XML format.
 
-    <p> The configuration layer xml from a given stream is parsed and fed to a
+    <p> The configuration layer XML from a given stream is parsed and fed to a
     <type scope="com::sun::star::configuration::backend">XLayerHandler</type>.
     </p>
 
     @see com::sun::star::configuration::backend::xml::SchemaParser
-        Service that represents a configuration schema stored in xml.
+        Service that represents a configuration schema stored in XML.
 
     @see com::sun::star::configuration::backend::xml::LayerWriter
         Service that writes OOR Update XML for data described via
@@ -73,7 +65,7 @@ published service LayerParser
 
     //-------------------------------------------------------------------------
 
-    /** provides access to the source xml stream.
+    /** provides access to the source XML stream.
       */
     interface com::sun::star::io::XActiveDataSink ;
 
diff --git a/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl b/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
index 1a32587ad13a..25e930484897 100644
--- a/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_xml_LayerWriter_idl__
 #define __com_sun_star_configuration_backend_xml_LayerWriter_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
 #include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
 #include <com/sun/star/configuration/backend/XLayerHandler.idl>
-#endif
 
 //=============================================================================
 
@@ -47,7 +39,7 @@ module xml {
 //=============================================================================
 
 /**
-    can be used to parse a stream of configuration layer xml.
+    can be used to parse a stream of configuration layer XML.
 
     <p> The configuration layer data described to a
     <type scope="com::sun::star::configuration::backend">XLayerHandler</type>
@@ -55,7 +47,7 @@ module xml {
     </p>
 
     @see com::sun::star::configuration::backend::xml::LayerParser
-        Service that parses configuration layer xml.
+        Service that parses configuration layer XML.
 
     @since OOo 1.1.2
 */
diff --git a/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl b/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
index 6c60fa2a338a..0d734e6a1e61 100644
--- a/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_configuration_backend_xml_SchemaParser_idl__
 #define __com_sun_star_configuration_backend_xml_SchemaParser_idl__
 
-#ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #include <com/sun/star/configuration/backend/XSchema.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
@@ -49,12 +41,12 @@ module xml {
 /** represents a configuration schema that is stored in a stream in
     OOR Schema XML format.
 
-    <p> The configuration schema xml from a given stream is parsed and fed to a
+    <p> The configuration schema XML from a given stream is parsed and fed to a
         <type scope="com::sun::star::configuration::backend">XSchemaHandler</type>.
     </p>
 
     @see com::sun::star::configuration::backend::xml::LayerParser
-        Service that parses configuration layer xml.
+        Service that parses configuration layer XML.
 
     @since OOo 1.1.2
 */
@@ -68,7 +60,7 @@ published service SchemaParser
 
     //-------------------------------------------------------------------------
 
-    /** provides access to the source xml stream.
+    /** provides access to the source XML stream.
       */
     interface com::sun::star::io::XActiveDataSink ;
 
diff --git a/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl b/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
index 3441b45e73a1..7cc1d0932daf 100644
--- a/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
+++ b/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_configuration_bootstrap_BootstrapContext_idl__
 #define __com_sun_star_configuration_bootstrap_BootstrapContext_idl__
 
-#ifndef __com_sun_star_uno_XComponentContext_idl__
 #include <com/sun/star/uno/XComponentContext.idl>
-#endif
 
 //=============================================================================
 
@@ -47,7 +45,7 @@ module com { module sun { module star { module configuration { module bootstrap
         <type scope="com::sun::star::configuration::backend">DefaultBackend</type> of the
         component context.
     </p>
-    <p> The implementation is usally available as singleton in the context
+    <p> The implementation is usually available as a singleton in the context
         that it wraps..
     </p>
 
diff --git a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
index 29e9479f4a01..afb65c460126 100644
--- a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
+++ b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_DataFormatTranslator_idl__
 #define __com_sun_star_datatransfer_DataFormatTranslator_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
index 82deb7314b0c..9f019ca2b520 100644
--- a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
+++ b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_datatransfer_MimeContentType_idl__
 #define __com_sun_star_datatransfer_MimeContentType_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl b/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl
index 0d0ffda23547..7171915ecc9d 100644
--- a/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl
+++ b/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 #define __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl b/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
index aad2882af77b..fe097d5ae9fb 100644
--- a/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
+++ b/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
@@ -29,13 +29,8 @@
 #ifndef __com_sun_star_datatransfer_XDataFormatTranslator_idl__
 #define __com_sun_star_datatransfer_XDataFormatTranslator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
 
 module com { module sun { module star { module datatransfer {
 
@@ -52,7 +47,7 @@ module com { module sun { module star { module datatransfer {
 published interface XDataFormatTranslator : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Converts a <type>DataFlavor</type> to system dependend data type.
+    /** Converts a <type>DataFlavor</type> to system dependent data type.
 
         @param aDataFlavor
         Describes the format for which a system dependent data types is requested.
@@ -73,7 +68,7 @@ published interface XDataFormatTranslator : com::sun::star::uno::XInterface
 
         @returns
         A <type>DataFlavor</type> for the given system dependent data transfer type.
-        <p>If there is no appropriate mapping for a sytem dependent data type, the returned <type>DataFlavor</type> will be empty.</p>
+        <p>If there is no appropriate mapping for a system dependent data type, the returned <type>DataFlavor</type> will be empty.</p>
     */
     DataFlavor getDataFlavorFromSystemDataType( [in] any aSysDataType );
 };
diff --git a/offapi/com/sun/star/datatransfer/XMimeContentType.idl b/offapi/com/sun/star/datatransfer/XMimeContentType.idl
index ccfee62c6a2b..f296fccd651e 100644
--- a/offapi/com/sun/star/datatransfer/XMimeContentType.idl
+++ b/offapi/com/sun/star/datatransfer/XMimeContentType.idl
@@ -29,13 +29,8 @@
 #ifndef __com_sun_star_datatransfer_XMimeContentType_idl__
 #define __com_sun_star_datatransfer_XMimeContentType_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 module com { module sun { module star { module datatransfer {
 
diff --git a/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl
index 5b7df3168c3b..2601fc977d52 100644
--- a/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl
+++ b/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl
@@ -29,17 +29,9 @@
 #ifndef __com_sun_star_datatransfer_XMimeContentTypeFactory_idl__
 #define __com_sun_star_datatransfer_XMimeContentTypeFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XMimeContentType_idl__
 #include <com/sun/star/datatransfer/XMimeContentType.idl>
-#endif
 
 module com { module sun { module star { module datatransfer {
 
diff --git a/offapi/com/sun/star/datatransfer/XSystemTransferable.idl b/offapi/com/sun/star/datatransfer/XSystemTransferable.idl
index ad634d8a6190..35fcb7a57cbe 100644
--- a/offapi/com/sun/star/datatransfer/XSystemTransferable.idl
+++ b/offapi/com/sun/star/datatransfer/XSystemTransferable.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_XSystemTransferable_idl__
 #define __com_sun_star_datatransfer_XSystemTransferable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl b/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
index 1c766cd1ddd8..d89de2641f0d 100644
--- a/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_XTransferDataInfo_idl__
 #define __com_sun_star_datatransfer_XTransferDataInfo_idl__
 
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -54,7 +49,7 @@ published interface XTransferDataAccess: com::sun::star::uno::XInterface
     /** To query for the summarized data size in bytes of a sequence of <type>DataFlavor</type>.
 
         @param aFlavorList
-        A squence of requested <type>DataFlavor</type>.
+        A sequence of requested <type>DataFlavor</type>.
         <p>An unsupported <type>DataFlavor</type> will be ignored.</p>
 
         @returns
diff --git a/offapi/com/sun/star/datatransfer/XTransferable.idl b/offapi/com/sun/star/datatransfer/XTransferable.idl
index 3336b2d5db0b..836c42e4bed4 100644
--- a/offapi/com/sun/star/datatransfer/XTransferable.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferable.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #define __com_sun_star_datatransfer_XTransferable_idl__
 
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/XTransferableEx.idl b/offapi/com/sun/star/datatransfer/XTransferableEx.idl
index ab388725170f..5de7275fe70d 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableEx.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableEx.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_XTransferableEx_idl__
 #define __com_sun_star_datatransfer_XTransferable_idl__
 
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/XTransferableSource.idl b/offapi/com/sun/star/datatransfer/XTransferableSource.idl
index 0ff9bca08302..673268297313 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableSource.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableSource.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_XTransferableSource_idl__
 #define __com_sun_star_datatransfer_XTransferableSource_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl b/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
index db5e6520614a..6251dc14df2a 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_XTransferableSupplier_idl__
 #define __com_sun_star_datatransfer_XTransferableSupplier_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
index c7085041b3d0..d77c6bd6d412 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_clipboard_ClipboardEvent_idl__
 #define __com_sun_star_datatransfer_clipboard_ClipboardEvent_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
index 369bfd9c53d0..0294a51fcc98 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_datatransfer_clipboard_ClipboardManager_idl__
 #define __com_sun_star_datatransfer_clipboard_ClipboardManager_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
index 7a128ee2d108..e2cf5fbdb0f5 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_clipboard_GenericClipboard_idl__
 #define __com_sun_star_datatransfer_clipboard_GenericClipboard_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl b/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
index 5190f52a3ad9..8b47f0461c11 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
@@ -46,7 +46,7 @@ published constants RenderingCapabilities
     const byte Delayed = 1;
 
     //-------------------------------------------------------------------------
-    /** The implementation is able to store the data persistant in the system
+    /** The implementation is able to store the data persistent in the system
         so that it does not get lost when the source application no longer exist.
     */
     const byte Persistant = 2;
diff --git a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
index 43a8e0e5ba76..8ac56b72f95c 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__
 #define __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
index 11fe45a2a239..68c642bf4aac 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboard_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboard_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -88,7 +83,7 @@ published interface XClipboard: com::sun::star::uno::XInterface
         @returns
         The name of this clipboard object.
         <p>If the returned string is empty the
-        clipboard instance ist the system clipboard.</p>
+        clipboard instance is the system clipboard.</p>
     */
     string getName();
 };
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl
index 11f0757fe740..c4191c4bc554 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboardEx_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboardEx_idl__
 
-#ifndef __com_sun_star_datatransfer_clipboard_XClipboard_idl__
 #include <com/sun/star/datatransfer/clipboard/XClipboard.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl
index 24ded33f7239..8d9de83cc335 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboardFactory_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboardFactory_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl
index 36305a4ae412..435e4cd98f18 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboardListener_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboardListener_idl__
 
-#ifndef __com_sun_star_datatransfer_clipboard_ClipboardEvent_idl__
 #include <com/sun/star/datatransfer/clipboard/ClipboardEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl
index e9626c9fcd84..3dc8787e1560 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboardManager_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboardManager_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl
index 6cfbe19c31f5..e276f95edfd0 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl
@@ -28,16 +28,14 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboardNotifier_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboardNotifier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module datatransfer { module clipboard {
 
 //=============================================================================
-/** Provides the ability to request notifiations on clipboard content changes.
+/** Provides the ability to request notifications on clipboard content changes.
 
     @see com::sun::star::datatransfer::clipboard::XClipboardListener
 */
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
index 69127087617d..86417dae7329 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XClipboardOwner_idl__
 #define __com_sun_star_datatransfer_clipboard_XClipboardOwner_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -51,7 +46,7 @@ module com { module sun { module star { module datatransfer { module clipboard {
 published interface XClipboardOwner: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Notifies the tranferable object source that it is no longer the owner of
+    /** Notifies the transferable object source that it is no longer the owner of
         the clipboard.
 
         @param xClipboard
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl
index d3e1682090f7..2c51a9031004 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_clipboard_XFlushableClipboard_idl__
 #define __com_sun_star_datatransfer_clipboard_XFlushableClipboard_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl
index bc23cd376ced..9485b88834f4 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_DragGestureEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DragGestureEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl
index 4a51d894e1a6..45565bd69e33 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_DragSourceDragEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DragSourceDragEvent_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DragSourceEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DragSourceEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl
index 3ff38b281d17..8827fde1b24f 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_DragSourceDropEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DragSourceDropEvent_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DragSourceEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DragSourceEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl
index 3cf97f7c4418..1e2a473848bf 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_DragSourceEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DragSourceEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
index 688cfe843d52..f37f471cf45d 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_dnd_DropTargetDragEnterEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DropTargetDragEnterEvent_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetDragEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl
index d8280d0e5454..66d7c6636e34 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_DropTargetDragEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DropTargetDragEvent_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DropTargetEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl
index 661bfbdeae0c..a533dadef329 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_dnd_DropTargetDropEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DropTargetDropEvent_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DropTargetEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
 
 //=============================================================================
 
@@ -73,13 +68,13 @@ published struct DropTargetDropEvent: com::sun::star::datatransfer::dnd::DropTar
     byte DropAction;
 
     //-------------------------------------------------------------------------
-    /** The cursor's current x location within the windows' coordinates.
+    /** The cursor's current x location within the window's coordinates.
      */
 
     long LocationX;
 
     //-------------------------------------------------------------------------
-    /** The cursor's current y location within the windows' coordinates.
+    /** The cursor's current y location within the window's coordinates.
      */
 
     long LocationY;
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl
index c73958afce3a..cb152bb66d3a 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_DropTargetEvent_idl__
 #define __com_sun_star_datatransfer_dnd_DropTargetEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl b/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl
index 80397604cdc8..b8c7664c2e7a 100644
--- a/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
 #define __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
index 7227f805f642..67849ba3673b 100644
--- a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_dnd_OleDragSource_idl__
 #define __com_sun_star_datatransfer_dnd_OleDragSource_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
@@ -68,7 +57,7 @@ published service OleDragSource
 
     //-------------------------------------------------------------------------
     /** The service expects a byte sequence uniquely identifying the machine as
-        the first, and only, parameter. This idenifier should be checked to
+        the first, and only, parameter. This identifier should be checked to
         ensure that the window ids used for creating DropTargets are valid for
         the service, that is, come from the same machine.
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
index de1431e59e65..aede951e5f70 100644
--- a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_dnd_OleDropTarget_idl__
 #define __com_sun_star_datatransfer_dnd_OleDropTarget_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
@@ -62,7 +51,7 @@ module com { module sun { module star { module datatransfer { module dnd {
 published service OleDropTarget
 {
     //-------------------------------------------------------------------------
-    /** Used to provide data to other applications via Ole Drap & Drop protocol.
+    /** Used to provide data to other applications via Ole Drag & Drop protocol.
     */
     interface XDropTarget;
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
index c301d81e24f8..76f820702ae3 100644
--- a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_dnd_X11DragSource_idl__
 #define __com_sun_star_datatransfer_dnd_X11DragSource_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
index 0ed961ede186..73d71126d797 100644
--- a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_dnd_X11DropTarget_idl__
 #define __com_sun_star_datatransfer_dnd_X11DropTarget_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl b/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl
index 37efc1d7f6cd..163ae13a90d3 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_XAutoscroll_idl__
 #define __com_sun_star_datatransfer_dnd_XAutoscroll_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl b/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl
index 3aa14195448a..37e72e6bcc39 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDragGestureListener_idl__
 #define __com_sun_star_datatransfer_dnd_XDragGestureListener_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DragGestureEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DragGestureEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl b/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl
index 1d0fc5b63d13..0fe553b8d7fd 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDragGestureRecognizer_idl__
 #define __com_sun_star_datatransfer_dnd_XDragGestureRecognizer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl b/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl
index a67de276c1a5..d7e8459c0933 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDragSource_idl__
 #define __com_sun_star_datatransfer_dnd_XDragSource_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
 #include <com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_dnd_DragGestureEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DragGestureEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl b/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl
index 3c212d8999b0..9930ed2e0c3d 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDragSourceContext_idl__
 #define __com_sun_star_datatransfer_dnd_XDragSourceContext_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl b/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl
index b15896be1e6a..e6334e51cd91 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDragSourceListener_idl__
 #define __com_sun_star_datatransfer_dnd_XDragSourceListener_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DragSourceDragEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_dnd_DragSourceDropEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl
index f4b52182583a..704097b40f8c 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDropTarget_idl__
 #define __com_sun_star_datatransfer_dnd_XDropTarget_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl
index 261ad3a857f0..2454149e4639 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDropTargetDragContext_idl__
 #define __com_sun_star_datatransfer_dnd_XDropTargetDragContext_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
 #include <com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl
index 6cd354a92b2e..1a93c2df6c99 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDropTargetDropContext_idl__
 #define __com_sun_star_datatransfer_dnd_XDropTargetDropContext_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_InvalidDNDOperationException_idl__
 #include <com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl
index 78516990da84..f7dba8d2fc67 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_datatransfer_dnd_XDropTargetListener_idl__
 #define __com_sun_star_datatransfer_dnd_XDropTargetListener_idl__
 
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetDragEnterEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_dnd_DropTargetDropEvent_idl__
 #include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
@@ -58,7 +50,7 @@ published interface XDropTargetListener: com::sun::star::lang::XEventListener
     //-------------------------------------------------------------------------
     /** The drag operation has terminated with a drop on this drop target.
 
-        <p><strong>NOTE:</strong> This method should not be oneway. The implentation
+        <p><strong>NOTE:</strong> This method should not be oneway. The implementation
         has to wait until the method <method>XDropTargetDropContext::dropComplete</method>
         is called before releasing the data for the drop operation. This
         should occur before returning from drop in a normal flow of operation.
diff --git a/offapi/com/sun/star/deployment/DependencyException.idl b/offapi/com/sun/star/deployment/DependencyException.idl
index e9018eb0ed40..e0ae8dafb4e7 100644
--- a/offapi/com/sun/star/deployment/DependencyException.idl
+++ b/offapi/com/sun/star/deployment/DependencyException.idl
@@ -56,11 +56,11 @@ exception DependencyException: com::sun::star::uno::Exception {
        namespace name
        <code>http://openoffice.org/extensions/description/2006</code> and the
        local part <code>name</code> and whose value is a human-readable
-       (english) description of the dependency.  If an instance of OOo does not
+       (English) description of the dependency.  If an instance of OOo does not
        know more about a specific kind of dependency, it should display the
        value of that attribute to the user.</p>
 
-       <p>The sequence must not be emtpy, and none of the elements may be
+       <p>The sequence must not be empty, and none of the elements may be
        <NULL/>.</p>
     */
     sequence< com::sun::star::xml::dom::XElement > UnsatisfiedDependencies;
diff --git a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
index 79599b7fb53b..a67ab9b66190 100644
--- a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
+++ b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
@@ -49,7 +49,7 @@ exception InvalidRemovedParameterException: com::sun::star::uno::Exception {
     boolean PreviousValue;
     /**
        the <type>XPackage</type> that was already bound to the provided
-       <code>url</code> paramter during
+       <code>url</code> parameter during
        <member>XPackageRegistry::bindPackage</member>.
 
        <p>Must not be <NULL/>.</p>
diff --git a/offapi/com/sun/star/deployment/LicenseException.idl b/offapi/com/sun/star/deployment/LicenseException.idl
index a80a5e463dd6..eee7545410f9 100644
--- a/offapi/com/sun/star/deployment/LicenseException.idl
+++ b/offapi/com/sun/star/deployment/LicenseException.idl
@@ -33,7 +33,7 @@
 
 module com { module sun { module star { module deployment {
 
-/** A LicenseException reflects the necessity of someone aggreeing to a license.
+/** A LicenseException reflects the necessity of someone agreeing to a license.
 
     @since OOo 2.0.4
  */
diff --git a/offapi/com/sun/star/deployment/PackageInformationProvider.idl b/offapi/com/sun/star/deployment/PackageInformationProvider.idl
index dc0ad465856f..8f86fd4e1507 100644
--- a/offapi/com/sun/star/deployment/PackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/PackageInformationProvider.idl
@@ -24,6 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_deployment_XPackageInformationProvider_idl__
+#define __com_sun_star_deployment_XPackageInformationProvider_idl__
 
 #include <com/sun/star/deployment/XPackageInformationProvider.idl>
 
@@ -37,4 +39,4 @@ module com { module sun { module star { module deployment {
 published singleton PackageInformationProvider : XPackageInformationProvider;
 
 }; }; }; };
-
+#endif
diff --git a/offapi/com/sun/star/deployment/UpdateInformationEntry.idl b/offapi/com/sun/star/deployment/UpdateInformationEntry.idl
index 26d2a1b876e4..cdf669b39f72 100644
--- a/offapi/com/sun/star/deployment/UpdateInformationEntry.idl
+++ b/offapi/com/sun/star/deployment/UpdateInformationEntry.idl
@@ -24,6 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_deployment_UpdateInformationEntry_idl__
+#define __com_sun_star_deployment_UpdateInformationEntry_idl__
 
 module com { module sun { module star { module xml { module dom {
 interface XElement;
@@ -49,4 +51,4 @@ struct UpdateInformationEntry
 };
 
 }; }; }; };
-
+#endif
diff --git a/offapi/com/sun/star/deployment/UpdateInformationProvider.idl b/offapi/com/sun/star/deployment/UpdateInformationProvider.idl
index d5bee547c9da..4d35e941f7f3 100644
--- a/offapi/com/sun/star/deployment/UpdateInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/UpdateInformationProvider.idl
@@ -24,6 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_deployment_UpdateInformationProvider_idl__
+#define __com_sun_star_deployment_UpdateInformationProvider_idl__
 
 #include <com/sun/star/deployment/XUpdateInformationProvider.idl>
 
@@ -37,4 +39,4 @@ module com { module sun { module star { module deployment {
 service UpdateInformationProvider : XUpdateInformationProvider;
 
 }; }; }; };
-
+#endif
diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl
index b7528251d86c..333fb1a06b49 100644
--- a/offapi/com/sun/star/deployment/XExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl
@@ -218,7 +218,7 @@ interface XExtensionManager
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::lang::IllegalArgumentException);
 
-    /** gets all extensions with the same identifer from all repositories.
+    /** gets all extensions with the same identifier from all repositories.
 
         The extension at the first position in the returned sequence represents
         the extension from the user repository. The next element is from the shared
@@ -238,7 +238,7 @@ interface XExtensionManager
     /** returns a sequence containing all installed extensions.
 
         The members of the returned sequence correspond to an extension with a
-        particular extension identifer. The members are also sequences which
+        particular extension identifier. The members are also sequences which
         contain as many elements as there are repositories. Those are ordered
         according to the priority of the repository. That is, the first member
         is the extension from the user repository, the second is from the shared
@@ -277,7 +277,7 @@ interface XExtensionManager
 
 
     /** synchronizes the extension database with the contents of the extensions
-       folder of shared and bundled extensinos.
+       folder of shared and bundled extensions.
 
        Added extensions will be added to the database and removed extensions
        will be removed from the database.
@@ -286,7 +286,7 @@ interface XExtensionManager
 
        @return
               If true - then at least one extension was removed or added. Otherwise
-              nothing was chaned.
+              nothing was changed.
     */
     boolean synchronize(
         [in] com::sun::star::task::XAbortChannel xAbortChannel,
diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl
index ede234382974..d1f2b6b72d31 100755..100644
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@ -71,19 +71,19 @@ interface XPackage
 
     /** checks if the package can be installed.
 
-        Only if the return value is true the package is allowed to be installed.
-        In case of false or in case of an exception, the package must be removed
+        Only if the return value is <TRUE/> the package is allowed to be installed.
+        In case of <FALSE/> or in case of an exception, the package must be removed
         completely.
         After return of this function no code from the extension may be used
-        anymore, so that the extension can be safely removed from the harddisk.
+        anymore, so that the extension can be safely removed from the hard disk.
 
         @param xCmdEnv
                command environment for error handling and other interaction.
         @alreadyInstalled
-            indicates that an extension with the same identifyer is already installed.
+            indicates that an extension with the same identifier is already installed.
 
         @return
-            null - all prerequisites are met. Otherwise, a value from
+            <NULL/> - all prerequisites are met. Otherwise, a value from
             <member>Prerequisites</member> indicating what prerequisites are missing.
      */
     long checkPrerequisites(
@@ -97,7 +97,7 @@ interface XPackage
 
     /** checks if the dependencies for this package are still satisfied
 
-        After updateing the OpenOffice.org, some dependencies for packages might
+        After updating the OpenOffice.org, some dependencies for packages might
         no longer be satisfied.
 
         @since OOo 3.2
@@ -106,8 +106,8 @@ interface XPackage
                command environment for error handling and other interaction.
 
         @return
-            true - all dependencies are satisfied
-            false - at least one dependency failed.
+            <TRUE/> - all dependencies are satisfied
+            <FALSE/> - at least one dependency failed.
      */
     boolean checkDependencies(
         [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
@@ -116,12 +116,12 @@ interface XPackage
                 com::sun::star::ucb::CommandFailedException);
 
 
-    /** determines whether the package is currently is registered, i.e.
+    /** determines whether the package is currently registered, i.e.
         whether it is active.
 
         @param xAbortChannel
                abort channel to asynchronously abort the registration process,
-               or null
+               or <NULL/>
         @param xCmdEnv
                command environment for error and progress handling
         @return
@@ -143,11 +143,11 @@ interface XPackage
 
         @param startup
                indicates that registration is adapted to the particular
-               startup scenario. That is, it is set to true, when called
+               startup scenario. That is, it is set to <TRUE/>, when called
                from <member>XExtensionManager::synchronize</member>
         @param xAbortChannel
                abort channel to asynchronously abort the registration process,
-               or null
+               or <NULL/>
         @param xCmdEnv
                command environment for error and progress handling
     */
@@ -167,7 +167,7 @@ interface XPackage
 
         @param xAbortChannel
                abort channel to asynchronously abort the registration process,
-               or null
+               or <NULL/>
         @param xCmdEnv
                command environment for error and progress handling
     */
@@ -183,18 +183,18 @@ interface XPackage
         e.g. a zip (legacy) package file or a document hosting script packages.
 
         @return
-                in case this package relfects a package bundle
+                <TRUE/> if this package is a package bundle, <FALSE/> otherwise
     */
     boolean isBundle();
 
     /** Gets packages of the bundle.
 
-        If <member>isRemoved</member> returns true then getBundle may return an
+        If <member>isRemoved</member> returns <TRUE/> then getBundle may return an
         empty sequence in case the object is not registered.
 
         @param xAbortChannel
                abort channel to asynchronously abort the registration process,
-               or null
+               or <NULL/>
         @param xCmdEnv
                command environment for error and progress handling
         @return
@@ -281,8 +281,8 @@ interface XPackage
     */
     sequence<string> getUpdateInformationURLs()
         raises (ExtensionRemovedException);
-    /** returns the publisher info for a package, the strings
-        might be empty, if there are no publisher
+    /** returns the publisher info for the package, the strings
+        might be empty, if there is no publisher
 
         <type scope="::com::sun::star::beans">StringPair</type>::First
         represents the publisher name and
@@ -302,7 +302,7 @@ interface XPackage
     /** exports package to given destination URL.
 
         @param destFolderURL
-               package destination folder URL, must be UCB conform
+               package destination folder URL, must be UCB conforming
         @param newTitle
                new package name
         @param nameClashAction
@@ -345,7 +345,7 @@ interface XPackage
         If registration data are created during registration, but the package is
         currently not registered, for example after calling
         <member>XPackage::revokePackage</member>, then <member
-        scope="com::sun::star::beans">Optional::IsPresent</member> is true and
+        scope="com::sun::star::beans">Optional::IsPresent</member> is <TRUE/> and
         the <member scope="com::sun::star::beans">Optional::Value</member> may
         be an empty string.
     */
@@ -354,7 +354,7 @@ interface XPackage
 
     /** indicates if this object represents a removed extension or extension
         item. This is the case when it was created by providing
-        <code>true</code> for the <code>removed</code> parameter in the function
+        <TRUE/> for the <code>removed</code> parameter in the function
         <member>XPackageRegistry::bindPackage</member>.
      */
     boolean isRemoved();
diff --git a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
index 9389fb69bec6..8885fd1ccee2 100644
--- a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
@@ -25,6 +25,8 @@
  *
  ************************************************************************/
 
+#ifndef __com_sun_star_deployment_XPackageInformationProvide_idl__
+#define __com_sun_star_deployment_XPackageInformationProvide_idl_
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
@@ -44,11 +46,11 @@ published interface XPackageInformationProvider
                the unique identifier of an extension. The service looks for
                an installed package with the given id and returns the URL to
                the root of the package. If the service can not find a matching
-               package, an emty string will be returned.
+               package, an empty string will be returned.
     */
     string getPackageLocation( [in] string extensionId );
 
-    /** check if there are updates available for an extention.
+    /** check if there are updates available for an extension.
 
         @param extensionId
                the unique identifier of an extension. When the extensionId is empty,
@@ -61,10 +63,10 @@ published interface XPackageInformationProvider
     */
     sequence< sequence< string > > isUpdateAvailable( [in] string extensionId );
 
-    /** returns a list of all installed extention with their version.
+    /** returns a list of all installed extension with their version.
     */
     sequence< sequence< string > > getExtensionList();
 };
 
 }; }; }; };
-
+#endif
diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl
index 5ece66a87392..06a643c54800 100644
--- a/offapi/com/sun/star/deployment/XPackageManager.idl
+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
@@ -138,7 +138,7 @@ interface XPackageManager
     /** adds an extension.
 
         This copies the extension. If it was from the same repository,
-        which is represented by this XPackageManager insterface, then
+        which is represented by this XPackageManager interface, then
         nothing happens.
 
         @param extension
@@ -265,7 +265,7 @@ interface XPackageManager
             removed extensions which must be revoked
        @return
             If true - then at least one extension was removed or added. Otherwise
-            nothing was chaned.
+            nothing was changed.
     */
     boolean synchronize([in] com::sun::star::task::XAbortChannel xAbortChannel,
                      [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
diff --git a/offapi/com/sun/star/deployment/XPackageRegistry.idl b/offapi/com/sun/star/deployment/XPackageRegistry.idl
index 1ab29f0970ba..0c380a96924c 100644
--- a/offapi/com/sun/star/deployment/XPackageRegistry.idl
+++ b/offapi/com/sun/star/deployment/XPackageRegistry.idl
@@ -66,8 +66,8 @@ interface XPackageRegistry
         The implementation must ensure that there is only one instance of
         <type>XPackage</type> for the same <code>url</code> at any
         time. Therefore calling <member>bindPackage</member> again with the same
-        <code>url</code> but different <code>mediaType<code> (the exeption is,
-        if previsously an empty string was proveded to cause the determination
+        <code>url</code> but different <code>mediaType<code> (the exception is,
+        if previously an empty string was provided to cause the determination
         of the media type) or <code>removed</code> parameters will cause an
         exception. An <type
         scope="com::sun::star::lang">IllegalArgumentException</type> will be
@@ -86,7 +86,7 @@ interface XPackageRegistry
                media type of package, empty string if to be detected
         @param removed
 
-        @para unfulfilledPrerequisites
+        @param unfulfilledPrerequisites
               has a value other null if the extension could not be installed previously
               because <member>XPackage::checkPrerequisites</member> failed.
 
diff --git a/offapi/com/sun/star/deployment/XUpdateInformationProvider.idl b/offapi/com/sun/star/deployment/XUpdateInformationProvider.idl
index 6291b3f4e76f..8fb4acbc717e 100644
--- a/offapi/com/sun/star/deployment/XUpdateInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/XUpdateInformationProvider.idl
@@ -25,6 +25,8 @@
  *
  ************************************************************************/
 
+#ifndef __com_sun_star_deployment_XUpdateInformationProvider_idl__
+#define __com_sun_star_deployment_XUpdateInformationProvider_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
@@ -57,7 +59,7 @@ interface XUpdateInformationProvider
                a repository and its mirrors.
         @param extensionId
                the unique identifier of an extension. If it is not empty and
-               the update document is an atom feed, only items whose 'term'
+               the update document is an atom feed, only items whose "term"
                attribute of the atom:category tag matches extensionId are returned.
 
     */
@@ -66,7 +68,7 @@ interface XUpdateInformationProvider
         [in] string extensionId
     ) raises ( com::sun::star::uno::Exception );
 
-    /** interrupts a getUpdateInformation call and let's it return immediatly.
+    /** interrupts a getUpdateInformation call and let's it return immediately.
     */
     void cancel();
 
@@ -93,7 +95,7 @@ interface XUpdateInformationProvider
                a repository and its mirrors.
         @param extensionId
                the unique identifier of an extension. If it is not empty and
-               the update document is an atom feed, only items whose 'term'
+               the update document is an atom feed, only items whose "term"
                attribute of the atom:category tag matches extensionId are returned.
 
         @returns
@@ -106,4 +108,4 @@ interface XUpdateInformationProvider
 };
 
 }; }; }; };
-
+#endif
diff --git a/offapi/com/sun/star/deployment/test/SmoketestCommandEnvironment.idl b/offapi/com/sun/star/deployment/test/SmoketestCommandEnvironment.idl
index 0669705f351a..1bd996fd953b 100644
--- a/offapi/com/sun/star/deployment/test/SmoketestCommandEnvironment.idl
+++ b/offapi/com/sun/star/deployment/test/SmoketestCommandEnvironment.idl
@@ -33,9 +33,9 @@
 
 
 module com { module sun { module star { module deployment { module test {
- /* The service is intended to be used in the smoketest to test the installation of
+ /* The service is intended to be used in the smoke test to test the installation of
     an extension (com::sun::star::deployment::XPackageManager::addPackage). It may therefore
-    be constantly adapted to meet the need of the smoketest
+    be constantly adapted to meet the need of the smoke test
  */
         service SmoketestCommandEnvironment: ::com::sun::star::ucb::XCommandEnvironment;
 };};};};};
diff --git a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
index dc635ebb6347..19b3075509ac 100644
--- a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
@@ -52,7 +52,7 @@ service PackageManagerDialog : com::sun::star::ui::dialogs::XAsynchronousExecuta
         @param xParent
                parent window
         @param focussedContext
-               context to be focussed
+               context to be focused
     */
     create( [in] com::sun::star::awt::XWindow xParent,
             [in] string focussedContext );
diff --git a/offapi/com/sun/star/document/AmbigousFilterRequest.idl b/offapi/com/sun/star/document/AmbigousFilterRequest.idl
index 479f404f681b..860fec43eab6 100644
--- a/offapi/com/sun/star/document/AmbigousFilterRequest.idl
+++ b/offapi/com/sun/star/document/AmbigousFilterRequest.idl
@@ -27,16 +27,14 @@
 #ifndef __com_sun_star_document_AmbigousFilterRequest_idl__
 #define __com_sun_star_document_AmbigousFilterRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module document {
 
 //=============================================================================
-/** should be used for interaction to handle states of ambigous filter detection
+/** should be used for interaction to handle states of ambiguous filter detection
 
     <p>
     This exception indicates, that generic filter detection can't decide which of
@@ -58,7 +56,7 @@ published exception AmbigousFilterRequest : ::com::sun::star::uno::Exception
     string URL;
 
     //-------------------------------------------------------------------------
-    /** transport the pre selected filter
+    /** transport the preselected filter
      */
     string SelectedFilter;
 
diff --git a/offapi/com/sun/star/document/BrokenPackageRequest.idl b/offapi/com/sun/star/document/BrokenPackageRequest.idl
index 04b9b795027d..e3a834832ce3 100644
--- a/offapi/com/sun/star/document/BrokenPackageRequest.idl
+++ b/offapi/com/sun/star/document/BrokenPackageRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_BrokenPackageRequest_idl__
 #define __com_sun_star_document_BrokenPackageRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/ChangedByOthersRequest.idl b/offapi/com/sun/star/document/ChangedByOthersRequest.idl
index 04e22ce539f9..d7e2adfb1a48 100644
--- a/offapi/com/sun/star/document/ChangedByOthersRequest.idl
+++ b/offapi/com/sun/star/document/ChangedByOthersRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_ChangedByOthersRequest_idl__
 #define __com_sun_star_document_ChangedByOthersRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl b/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
index e3fbf81c7223..998afae94df7 100644
--- a/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
+++ b/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_CorruptedFilterConfigurationException_idl__
 #define __com_sun_star_document_CorruptedFilterConfigurationException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/DocumentEvent.idl b/offapi/com/sun/star/document/DocumentEvent.idl
index bd22f6fef522..c580387cc0f5 100644
--- a/offapi/com/sun/star/document/DocumentEvent.idl
+++ b/offapi/com/sun/star/document/DocumentEvent.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_document_DocumentEvent_idl__
 #define __com_sun_star_document_DocumentEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_frame_XController2_idl__
 #include <com/sun/star/frame/XController2.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/DocumentInfo.idl b/offapi/com/sun/star/document/DocumentInfo.idl
index f754013d665f..1560e3bd9e2d 100644
--- a/offapi/com/sun/star/document/DocumentInfo.idl
+++ b/offapi/com/sun/star/document/DocumentInfo.idl
@@ -27,36 +27,14 @@
 #ifndef __com_sun_star_document_DocumentInfo_idl__
 #define __com_sun_star_document_DocumentInfo_idl__
 
-#ifndef __com_sun_star_document_XDocumentInfo_idl__
 #include <com/sun/star/document/XDocumentInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
 #include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
@@ -68,8 +46,8 @@
 
     <p>
     Contrary to the service <type>StandaloneDocumentInfo</type> the document - which
-    contains such informations - must be loaded completly. As a result of that this
-    DocumengInfo service is available on an open document via the interface
+    contains such informations - must be loaded completely. As a result of that this
+    DocumentInfo service is available on an open document via the interface
     <type>XDocumentInfoSupplier</type> only.
     </p>
 
@@ -92,7 +70,7 @@ published service DocumentInfo
     interface XDocumentInfo;
 
     //-------------------------------------------------------------------------
-    /** neccessary to support normal properties
+    /** necessary to support normal properties
      */
     interface com::sun::star::beans::XPropertySet;
 
@@ -113,7 +91,7 @@ published service DocumentInfo
     [optional] interface com::sun::star::beans::XPropertyContainer;
 
     //-------------------------------------------------------------------------
-    /** contains the intial author of the document
+    /** contains the initial author of the document
      */
     [property] string Author;
 
diff --git a/offapi/com/sun/star/document/DocumentProperties.idl b/offapi/com/sun/star/document/DocumentProperties.idl
index 5b00f6c9a8e2..53ed7572cafa 100755..100644
--- a/offapi/com/sun/star/document/DocumentProperties.idl
+++ b/offapi/com/sun/star/document/DocumentProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_DocumentProperties_idl__
 #define __com_sun_star_document_DocumentProperties_idl__
 
-#ifndef __com_sun_star_document_XDocumentProperties_idl__
 #include <com/sun/star/document/XDocumentProperties.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl b/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl
index 6a2567abfab5..55a45216125a 100644
--- a/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl
+++ b/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_DocumentRevisionListPersistence_idl__
 #define __com_sun_star_document_DocumentRevisionListPersistence_idl__
 
-#ifndef __com_sun_star_document_XDocumentRevisionListPersistence_idl__
 #include <com/sun/star/document/XDocumentRevisionListPersistence.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/EmptyUndoStackException.idl b/offapi/com/sun/star/document/EmptyUndoStackException.idl
index 476a82bbe705..476a82bbe705 100755..100644
--- a/offapi/com/sun/star/document/EmptyUndoStackException.idl
+++ b/offapi/com/sun/star/document/EmptyUndoStackException.idl
diff --git a/offapi/com/sun/star/document/EventObject.idl b/offapi/com/sun/star/document/EventObject.idl
index 9cfbc48f449f..927c34b23797 100644
--- a/offapi/com/sun/star/document/EventObject.idl
+++ b/offapi/com/sun/star/document/EventObject.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_EventObject_idl__
 #define __com_sun_star_document_EventObject_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
@@ -47,7 +45,7 @@ module com {   module sun {   module star {   module document {
 published struct EventObject: com::sun::star::lang::EventObject
 {
     //-------------------------------------------------------------------------
-    /** specifies the name of the occured event
+    /** specifies the name of the occurred event
 
         <p>
         For a list of possible event names see <type>Events</type>.
diff --git a/offapi/com/sun/star/document/Events.idl b/offapi/com/sun/star/document/Events.idl
index 267f9c5329d0..4bf901d4c4b0 100644
--- a/offapi/com/sun/star/document/Events.idl
+++ b/offapi/com/sun/star/document/Events.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_Events_idl__
 #define __com_sun_star_document_Events_idl__
 
-#ifndef __com_sun_star_container_XNameReplace_idl__
 #include <com/sun/star/container/XNameReplace.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/ExportFilter.idl b/offapi/com/sun/star/document/ExportFilter.idl
index f8a4611feab7..2598bb19b354 100644
--- a/offapi/com/sun/star/document/ExportFilter.idl
+++ b/offapi/com/sun/star/document/ExportFilter.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_document_ExportFilter_idl__
 #define __com_sun_star_document_ExportFilter_idl__
 
-#ifndef __com_sun_star_document_XExporter_idl__
 #include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XFilter_idl__
 #include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
@@ -75,7 +64,7 @@ published service ExportFilter
 
         <p>
         It's used to filter a document at saving time.
-        The source document should be already setted by using another interface
+        The source document should be already set by using another interface
         <type>XExporter</type> which is supported by this service too.
         </p>
 
@@ -117,11 +106,11 @@ published service ExportFilter
         This internal filter name can be used on service <type>FilterFactory</type>
         to get further informations about it (e.g. his registration for mime types or extensions etc.)
         It's important that returned string is the "internal name" of the filter which must be
-        unambigous against all other registered filter in current instalation.
+        unambiguous against all other registered filters in current installation.
         </p>
         <p>
         <strong>Attention!</strong><br>
-        Supported method setName() sould be ignored or forwarded to the FilterFactory.
+        Supported method setName() should be ignored or forwarded to the FilterFactory.
         It's not allowed to set it directly to the configuration. Because it depends
         from real implementation of the FilterFactory if it will be allowed or not!
          </p>
diff --git a/offapi/com/sun/star/document/ExtendedTypeDetection.idl b/offapi/com/sun/star/document/ExtendedTypeDetection.idl
index f4f5b85d3e13..01a911051f56 100644
--- a/offapi/com/sun/star/document/ExtendedTypeDetection.idl
+++ b/offapi/com/sun/star/document/ExtendedTypeDetection.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_ExtendedTypeDetection_idl__
 #define __com_sun_star_document_ExtendedTypeDetection_idl__
 
-#ifndef __com_sun_star_document_XExtendedFilterDetection_idl__
 #include <com/sun/star/document/XExtendedFilterDetection.idl>
-#endif
 
 //=============================================================================
 
@@ -59,10 +57,10 @@ module com { module sun { module star { module document {
         <br>
         Example: "com.company.devision.DetectService"
         <br>
-        Note that this realy means the implementation name of the service.
+        Note that this really means the implementation name of the service.
         Because it's not possible otherwise to distinguish between more then one
         registered detect services in same office installation! But it's possible for
-        the generic type detection to create an uno service by his implementation name too.
+        the generic type detection to create an UNO service by his implementation name too.
         </li>
         <li>
         A list of <strong>Types</strong> able to be recognized by this service -
@@ -80,7 +78,7 @@ published service ExtendedTypeDetection
     /** makes the deep detection
 
         <p>
-        Generic type detection searchs for a registered DetectService for an
+        Generic type detection searches for a registered DetectService for an
         already flat detected type. If any could be found it will be created and
         used by calling methods of this interface. It gets a <type>MediaDescriptor</type>
         which contains information about the document which should be detected and must return
@@ -89,9 +87,9 @@ published service ExtendedTypeDetection
             <li>or <NULL/> if format is unknown nor supported.</li>
         </ul>
         May be that given descriptor already includes the opened document stream as parameter
-        <member>MediaDescriptor::InputStream</member>. Then this one should be used everytime.
+        <member>MediaDescriptor::InputStream</member>. Then this one should be used every time.
         If it's not included in descriptor the value of <member>MediaDescriptor::URL</member>
-        must be used to open requested ressource by this service.
+        must be used to open requested resource by this service.
         <br>
         Note: The stream should be added to the descriptor if it wasn't a part of them before.
         So further steps on the whole detection process can use it and will perform her work.
diff --git a/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl b/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
index bcab3aab75a9..074477fc22d0 100644
--- a/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
+++ b/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_document_ExtendedTypeDetectionFactory_idl__
 #define __com_sun_star_document_ExtendedTypeDetectionFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
 #include <com/sun/star/container/XContainerQuery.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
 
 //=============================================================================
 
@@ -64,15 +53,15 @@ published service ExtendedTypeDetectionFactory
     /** factory interface to create and initialize extended type detection components.
 
         <p>
-        A detection component must be specified by it's uno implementation name and will be crated then.
-        Every new created component can be intialized with it's own configuration data
+        A detection component must be specified by it's UNO implementation name and will be crated then.
+        Every new created component can be initialized with it's own configuration data
         and may given optional arguments of the corresponding createInstanceWithArguments() request. To do so the
         service must support the optional interface <type scope="com::sun::star::lang">XInitialization</type>.
         The arguments parameter will have the following structure:
         <ul>
             <li>sequence< Any >[0] contains a sequence< <type scope="com::sun::star::beans">PropertyValue</type> >,
                 which represent the configuration data set of this detector component. The used properties are the same, as
-                they are available at the container interface of this factoyr service. (see below)</li>
+                they are available at the container interface of this factory service. (see below)</li>
             <li>Every following item of the argument list sequence< Any >[1..n] contains the copied argument of the
                 corresponding createInstanceWithArguments() call. That means: Item 0 or the original list was copied as
                 item 1 of the destination list ... etc.
@@ -88,7 +77,7 @@ published service ExtendedTypeDetectionFactory
         Every container item is specified as a set of properties and will be
         represented by a sequence< <type scope="com::sun::star::beans">PropertyValue</type> > structure.
         Follow properties are supported:
-        (But note: not all of them must be present everytimes!)
+        (But note: not all of them must be present every time!)
         </p>
         <table border=1>
             <tr>
@@ -99,8 +88,8 @@ published service ExtendedTypeDetectionFactory
             <tr>
                 <td><em>Name</em></td>
                 <td>[string]</td>
-                <td>It means the uno implementation name of the detector component.
-                    Note: It means the realy the implementation instead of the uno service name.
+                <td>It means the UNO implementation name of the detector component.
+                    Note: It means the really the implementation instead of the UNO service name.
                     Because it's not possible to distinguish between more then one components; if all of them
                     uses a generic service identifier!</td>
             </tr>
@@ -135,12 +124,12 @@ published service ExtendedTypeDetectionFactory
 
         <p>
         Because the complexness of such configuration set can be very high,
-        it seams not very usefull to update the undelying configuration layer
-        on every container change request immediatly. Another strategy can be to
+        it seams not very useful to update the underlying configuration layer
+        on every container change request immediately. Another strategy can be to
         make all changes (adding/changing/removing of items) and call flush at the end.
         That will validate the whole container and reject inconsistent data sets.
         Only in case all made changes was correct, they will be written back to the
-        configuration. Further this interface provides the possibelity, that interested
+        configuration. Further this interface provides the possibility, that interested
         changes listener can be registered too.
         </p>
      */
diff --git a/offapi/com/sun/star/document/FilterAdapter.idl b/offapi/com/sun/star/document/FilterAdapter.idl
index 800ba1372115..70ae88598038 100644
--- a/offapi/com/sun/star/document/FilterAdapter.idl
+++ b/offapi/com/sun/star/document/FilterAdapter.idl
@@ -27,9 +27,7 @@
 #ifndef _COM_SUN_STAR_DOCUMENT_FILTERADAPTOR_IDL__
 #define _COM_SUN_STAR_DOCUMENT_FILTERADAPTOR_IDL__
 
-#ifndef _COM_SUN_STAR_DOCUMENT_XFILTERADAPTOR_IDL__
 #include <com/sun/star/document/XFilterAdapter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/FilterFactory.idl b/offapi/com/sun/star/document/FilterFactory.idl
index ddb4bcb5ebf6..95afa49d310f 100644
--- a/offapi/com/sun/star/document/FilterFactory.idl
+++ b/offapi/com/sun/star/document/FilterFactory.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_document_FilterFactory_idl__
 #define __com_sun_star_document_FilterFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
 #include <com/sun/star/container/XContainerQuery.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
 
 //=============================================================================
 
@@ -69,9 +58,9 @@ published service FilterFactory
     /** factory interface to create and initialize filter components.
 
         <p>
-        <strong>Current behaviour</strong><p>
+        <strong>Current behavior</strong><p>
         The methods createInstance() or createInstanceWithArguments() of this interface must be
-        called with an internal type name!. This name is used internaly to search a suitable
+        called with an internal type name!. This name is used internally to search a suitable
         (mostly the default) filter for this type then. The found filter will be created, initialized
         and returned then. Creation of a filter by using it's internal filter name directly can be
         reached by using createInstanceWithArguments() with an optional property "FilterName" only.
@@ -95,7 +84,7 @@ published service FilterFactory
         </p>
 
         <p>
-        <strong>Proposed behaviour</strong><p>
+        <strong>Proposed behavior</strong><p>
         Searching of a suitable filter for a given internal type name, must be done by the new interface
         <type scope="com::sun::star::container">XContainerQuery</type>, available on this factory too.
         The factory interface can be used to create filter components by it's internal filter name only.
@@ -103,7 +92,7 @@ published service FilterFactory
 
         <p>
         <strong>How it can be distinguished?</strong><p>
-        The new prosposed implementation will throw an <type scope="com::sun::star::container">NoSuchElementException</type>
+        The new proposed implementation will throw an <type scope="com::sun::star::container">NoSuchElementException</type>
         if the first parameter of createInstance() or createInstanceWithArguments() does not match to a valid container (means
         filter) item. Further it will throw an <type scope="com::sun::star::lang">IllegalArgumentException</type> if the optional
         parameter "FilterName" could not be detected inside the argument list of call createInstanceWithArguments().
@@ -111,14 +100,14 @@ published service FilterFactory
 
         <p>
         <strong>Initialization of a filter component</strong><p>
-        Every filter, which was created by this factory can(!) be intialized with it's own configuration data
+        Every filter, which was created by this factory can(!) be initialized with it's own configuration data
         and may given optional arguments of the corresponding createInstanceWithArguments() request. To do so the filter
         instance must support the optional interface <type scope="com::sun::star::lang">XInitialization</type>.
         The arguments parameter will have the following structure:
         <ul>
             <li>sequence< Any >[0] contains a sequence< <type scope="com::sun::star::beans">PropertyValue</type> >,
                 which represent the configuration data set of this filter. The used properties are the same, as
-                they are available at the container interface of this factoyr service. (see below)</li>
+                they are available at the container interface of this factory service. (see below)</li>
             <li>Every following item of the argument list sequence< Any >[1..n] contains the copied argument of the
                 corresponding createInstanceWithArguments() call. That means: Item 0 or the original list was copied as
                 item 1 of the destination list ... etc.
@@ -134,7 +123,7 @@ published service FilterFactory
         Every container item is specified as a set of properties and will be
         represented by a sequence< <type scope="com::sun::star::beans">PropertyValue</type> > structure.
         Follow properties are supported:
-        (But note: not all of them must be present everytimes!)
+        (But note: not all of them must be present every time!)
         </p>
         <table border=1>
             <tr>
@@ -169,14 +158,14 @@ published service FilterFactory
             <tr>
                 <td><em>DocumentService</em></td>
                 <td>[string]</td>
-                <td>It's the uno service name of the document type, which can be handled by this filter.
+                <td>It's the UNO service name of the document type, which can be handled by this filter.
                     (e.g. <type scope="com::sun::star::text">TextDocument</type>)</td>
             </tr>
             <tr>
                 <td><em>FilterService</em></td>
                 <td>[string]</td>
-                <td>It means the uno implementation name of the filter component.
-                    Note: It means the realy the implementation instead of the uno service name.
+                <td>It means the UNO implementation name of the filter component.
+                    Note: It really means the implementation instead of the UNO service name.
                     Because it's not possible to distinguish between more then one filters; if all of them
                     uses a generic identifier!</td>
             </tr>
@@ -206,8 +195,8 @@ published service FilterFactory
 
         <p>
         Note:<br>
-        All elements of this container will be adressed by his internal name,
-        and it must be an unambigous value.
+        All elements of this container will be addressed by his internal name,
+        and it must be an unambiguous value.
         </p>
      */
     interface com::sun::star::container::XNameAccess;
@@ -232,12 +221,12 @@ published service FilterFactory
 
         <p>
         Because the complexness of such configuration set can be very high,
-        it seams not very usefull to update the undelying configuration layer
-        on every container change request immediatly. Another strategy can be to
+        it seams not very useful to update the underlying configuration layer
+        on every container change request immediately. Another strategy can be to
         make all changes (adding/changing/removing of items) and call flush at the end.
         That will validate the whole container and reject inconsistent data sets.
         Only in case all made changes was correct, they will be written back to the
-        configuration. Further this interface provides the possibelity, that interested
+        configuration. Further this interface provides the possibility, that interested
         changes listener can be registered too.
         </p>
      */
diff --git a/offapi/com/sun/star/document/FilterOptionsRequest.idl b/offapi/com/sun/star/document/FilterOptionsRequest.idl
index 4b6bcb70e729..db78482437a9 100644
--- a/offapi/com/sun/star/document/FilterOptionsRequest.idl
+++ b/offapi/com/sun/star/document/FilterOptionsRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_AmbigousFilterRequest_idl__
 #define __com_sun_star_document_AmbigousFilterRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/HeaderFooterSettings.idl b/offapi/com/sun/star/document/HeaderFooterSettings.idl
index f81e227e5644..7d25734b4012 100644
--- a/offapi/com/sun/star/document/HeaderFooterSettings.idl
+++ b/offapi/com/sun/star/document/HeaderFooterSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_HeaderFooterSettings_idl__
 #define __com_sun_star_document_HeaderFooterSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -60,7 +58,7 @@ published service HeaderFooterSettings
      */
     [optional, property] boolean IsPrintDate;
 
-    /** enables or disables the printinge of the current time in the
+    /** enables or disables the printing of the current time in the
         header or footer
      */
     [optional, property] boolean IsPrintTime;
diff --git a/offapi/com/sun/star/document/ImportFilter.idl b/offapi/com/sun/star/document/ImportFilter.idl
index 40ca14c1d94b..d040d0fd4343 100644
--- a/offapi/com/sun/star/document/ImportFilter.idl
+++ b/offapi/com/sun/star/document/ImportFilter.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_document_ImportFilter_idl__
 #define __com_sun_star_document_ImportFilter_idl__
 
-#ifndef __com_sun_star_document_XImporter_idl__
 #include <com/sun/star/document/XImporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XFilter_idl__
 #include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
@@ -75,7 +64,7 @@ published service ImportFilter
 
         <p>
         It's used to filter a document at loading time.
-        The target document should be already setted by using another interface
+        The target document should be already set by using another interface
         <member>ImportFilter::XImporter</member> which is supported by this service too.
         </p>
 
@@ -117,11 +106,11 @@ published service ImportFilter
         This internal filter name can be used on service <type>FilterFactory</type>
         to get further informations about it (e.g. his registration for mime types or extensions etc.)
         It's important that returned string is the "internal name" of the filter which must be
-        unambigous against all other registered filter in current instalation.
+        unambiguous against all other registered filters in current installation.
         </p>
         <p>
         <strong>Attention!</strong><br>
-        Supported method setName() sould be ignored or forwarded to the FilterFactory.
+        Supported method setName() should be ignored or forwarded to the FilterFactory.
         It's not allowed to set it directly to the configuration. Because it depends
         from real implementation of the FilterFactory if it will be allowed or not!
          </p>
diff --git a/offapi/com/sun/star/document/LinkTarget.idl b/offapi/com/sun/star/document/LinkTarget.idl
index 3c4ba768c6d5..90e12ba16b49 100644
--- a/offapi/com/sun/star/document/LinkTarget.idl
+++ b/offapi/com/sun/star/document/LinkTarget.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_document_LinkTarget_idl__
 #define __com_sun_star_document_LinkTarget_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
 #include <com/sun/star/document/XLinkTargetSupplier.idl>
-#endif
 
 
 //=============================================================================
@@ -50,7 +46,7 @@ published service LinkTarget
     interface com::sun::star::beans::XPropertySet;
 
     /** a link target may have child objects which can be link targets too.
-        These are accessible by this optinonal interface.
+        These are accessible by this optional interface.
      */
     [optional] interface com::sun::star::document::XLinkTargetSupplier;
 
diff --git a/offapi/com/sun/star/document/LinkTargets.idl b/offapi/com/sun/star/document/LinkTargets.idl
index cd5fb928a6eb..742e69d35edf 100644
--- a/offapi/com/sun/star/document/LinkTargets.idl
+++ b/offapi/com/sun/star/document/LinkTargets.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_LinkTargets_idl__
 #define __com_sun_star_document_LinkTargets_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/LinkUpdateModes.idl b/offapi/com/sun/star/document/LinkUpdateModes.idl
index 98fbea289092..4c2ac905b191 100644
--- a/offapi/com/sun/star/document/LinkUpdateModes.idl
+++ b/offapi/com/sun/star/document/LinkUpdateModes.idl
@@ -49,7 +49,7 @@ published constants LinkUpdateModes
     const long AUTO = 2;
 
     /** use the setting that is configured in your installed
-        application.  This may be one of the above behaviours.
+        application.  This may be one of the above behaviors.
      */
     const long GLOBAL_SETTING = 3;
 };
diff --git a/offapi/com/sun/star/document/LockFileIgnoreRequest.idl b/offapi/com/sun/star/document/LockFileIgnoreRequest.idl
index d13a904ab80b..0ce59d8d6231 100644
--- a/offapi/com/sun/star/document/LockFileIgnoreRequest.idl
+++ b/offapi/com/sun/star/document/LockFileIgnoreRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_LockFileIgnoreRequest_idl__
 #define __com_sun_star_document_LockFileIgnoreRequest_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/LockedDocumentRequest.idl b/offapi/com/sun/star/document/LockedDocumentRequest.idl
index 23059c9c176c..cb6903171249 100644
--- a/offapi/com/sun/star/document/LockedDocumentRequest.idl
+++ b/offapi/com/sun/star/document/LockedDocumentRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_LockedDocumentRequest_idl__
 #define __com_sun_star_document_LockedDocumentRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/LockedOnSavingRequest.idl b/offapi/com/sun/star/document/LockedOnSavingRequest.idl
index 2dc63260bfad..b1a19293d994 100644
--- a/offapi/com/sun/star/document/LockedOnSavingRequest.idl
+++ b/offapi/com/sun/star/document/LockedOnSavingRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_LockedOnSavingRequest_idl__
 #define __com_sun_star_document_LockedOnSavingRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/MacroExecMode.idl b/offapi/com/sun/star/document/MacroExecMode.idl
index f74511445f61..d5590000562f 100644
--- a/offapi/com/sun/star/document/MacroExecMode.idl
+++ b/offapi/com/sun/star/document/MacroExecMode.idl
@@ -57,7 +57,7 @@ published constants MacroExecMode
     const short FROM_LIST = 1;
 
     //-------------------------------------------------------------------------
-    /** Execute any macro, macros signed with trusted sertificates and macros
+    /** Execute any macro, macros signed with trusted certificates and macros
         from secure list are executed quietly.
 
         <p>
diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl
index a0aaed88a929..f12956e360e8 100644
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@ -27,37 +27,14 @@
 #ifndef __com_sun_star_document_MediaDescriptor_idl__
 #define __com_sun_star_document_MediaDescriptor_idl__
 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
 #include <com/sun/star/task/XStatusIndicator.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
 
 //=============================================================================
 
@@ -72,15 +49,15 @@ module com { module sun { module star { module document {
     This service may be represented by a
     <type scope="com::sun::star::beans" dim="[]">PropertyValue</type>.
     Such descriptors will be passed to different functions, included into possible
-    load/save proccesses. Every member of such process can use this descriptor
+    load/save processes. Every member of such process can use this descriptor
     and may change it if to actualize the informations about the document.
     So this descriptor should be used as an in/out parameter.
     </p>
 
     <p>
     Note:<br>
-    It's not allowed to hold member of this descriptor by references longer the they
-    will be used (especialy a possible stream). It's allowed to use it directly
+    It's not allowed to hold member of this descriptor by references longer than they
+    will be used (especially a possible stream). It's allowed to use it directly
     or by copying it only.
     </p>
 
@@ -89,7 +66,7 @@ module com { module sun { module star { module document {
 published service MediaDescriptor
 {
     //-------------------------------------------------------------------------
-    /** May be set by filters or detection services if user has choosen to
+    /** May be set by filters or detection services if user has chosen to
         abort loading/saving, e.g. while entering a password.
      */
     [optional,property] boolean Aborted;
@@ -143,7 +120,7 @@ published service MediaDescriptor
         <p>
         This is a parameter that can be used for any properties specific
         for a special component type. Format of that depends from real
-        type of adressed component.
+        type of addressed component.
         </p>
 
         <p>
@@ -277,7 +254,7 @@ published service MediaDescriptor
         If no stream is provided, the loader will create a stream by itself using
         the other properties. It is not allowed to keep a reference to this
         InputStream after loading the component, and it would be useless, because
-        in general an InputStream is usable for readong only once, except when it
+        in general an InputStream is usable for reading only once, except when it
         also implements the <type scope="com::sun::star::io">XSeekable</type> interface.
         </p>
      */
@@ -290,10 +267,10 @@ published service MediaDescriptor
         Object implementing the <type scope="com::sun::star::task">InteractionHandler</type>
         service that is used to handle exceptional situations where proceeding with the task
         is impossible without additional information or impossible at all.
-        The implemented api provides a default implementation for it that can handle many situations.
+        The implemented API provides a default implementation for it that can handle many situations.
         If no InteractionHandler is set, a suitable exception is thrown.
         It is not allowed to keep a reference to this object, even not in the loaded
-        or stored components' copy of the MediaDescriptor provided by its arguments attribute.
+        or stored component's copy of the MediaDescriptor provided by its arguments attribute.
         </p>
      */
     [optional,property] com::sun::star::task::XInteractionHandler InteractionHandler;
@@ -302,8 +279,8 @@ published service MediaDescriptor
     /** jump to a marked position after loading
 
         <p>
-        This is the same as the text behind a '#' in a http URL. But
-        this syntax with a '#' is not specified in most URL schemas.
+        This is the same as the text behind a "#" in a http URL. But
+        this syntax with a "#" is not specified in most URL schemas.
         </p>
      */
     [optional,property] string JumpMark;
@@ -383,7 +360,7 @@ published service MediaDescriptor
     [optional,property] boolean Overwrite;
 
     //-------------------------------------------------------------------------
-    /** pasword for loading storing documents
+    /** password for loading storing documents
 
         <p>
         It contains a password for loading or storing a component (if necessary).
@@ -459,13 +436,13 @@ published service MediaDescriptor
     /** name of document referrer
 
         <p>
-        A URL describing the environment of the request; f.e. a referrer may be a
+        A URL describing the environment of the request; e.g. a referrer may be a
         URL of a document, if a hyperlink inside this document is clicked to load
         another document. The referrer may be evaluated by the addressed UCB content
         or the loaded document. Without a referrer the processing of URLs that
-        needs security checks will be denied, f.e. "macro:" URLs.
+        needs security checks will be denied, e.g. "macro:" URLs.
         <br>
-        Don't be confused about the wrong spelling; is kept for compatibility reasons.
+        Don't be confused about the wrong spelling; it is kept for compatibility reasons.
         </p>
      */
     [optional,property] string Referer;
@@ -489,7 +466,7 @@ published service MediaDescriptor
         Object implementing the <type scope="com::sun::star::task">XStatusIndicator</type>
         interface that can be used to give status information (text or progress) for the task.
         The office provides a default implementation for it. It is not allowed to keep
-        a reference to this object, even not in the loaded or stored components'
+        a reference to this object, even not in the loaded or stored component's
         copy of the MediaDescriptor provided by its arguments attribute.
         </p>
      */
@@ -554,7 +531,6 @@ published service MediaDescriptor
 
         <p>
         The location of the component in URL syntax. It must be the full qualified URL and
-        must include f.e. an optional <member>MediaDescriptor::JumpMark</member> too.
         </p>
      */
     [optional,property] string URL;
diff --git a/offapi/com/sun/star/document/NoSuchFilterRequest.idl b/offapi/com/sun/star/document/NoSuchFilterRequest.idl
index 604143bac339..b34df0de235d 100644
--- a/offapi/com/sun/star/document/NoSuchFilterRequest.idl
+++ b/offapi/com/sun/star/document/NoSuchFilterRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_NoSuchFilterRequest_idl__
 #define __com_sun_star_document_NoSuchFilterRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
@@ -43,7 +41,7 @@ module com { module sun { module star { module document {
     a possible <type scope="com::sun::star::task">InteractionHandler</type> will be used.
     (it's a a part of used <type>MediaDescriptor</type>)
     Such "NoSuchFilterRequest" will be used then to start right interaction on that to
-    get a decision wich filter should be used for given URL. A possible continiuation
+    get a decision which filter should be used for given URL. A possible continuation
     of type <type>XInteractionFilterSelect</type> will transport this decision back to
     generic filter detection and force using of it. Of course it's possible to abort
     the loading process by use another continuation <type scope="com::sun::star::task">XInteractionAbort</type>.
diff --git a/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl b/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl
index afb96812e6f3..5646d0c322c3 100644
--- a/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl
+++ b/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_OOXMLDocumentPropertiesImporter_idl__
 #define __com_sun_star_document_OOXMLDocumentPropertiesImporter_idl__
 
-#ifndef __com_sun_star_document_XOOXMLDocumentPropertiesImporter_idl__
 #include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/OfficeDocument.idl b/offapi/com/sun/star/document/OfficeDocument.idl
index 8467d206ff38..33b3f510c906 100644
--- a/offapi/com/sun/star/document/OfficeDocument.idl
+++ b/offapi/com/sun/star/document/OfficeDocument.idl
@@ -74,7 +74,7 @@ published service OfficeDocument
 
         <p>
         With this interface it's possible too, to reset the modify state.
-        That can be neccessary to prevent code against problem during closing
+        That can be necessary to prevent code against problem during closing
         of the document without saving any changes.
         </p>
      */
@@ -98,7 +98,7 @@ published service OfficeDocument
     /** offers a way to print a component
 
         <p>
-        It's possible to specify wich printer should be used and of course
+        It's possible to specify which printer should be used and of course
         print the document on it.
         </p>
      */
@@ -163,7 +163,7 @@ published service OfficeDocument
     [optional] interface XUndoManagerSupplier;
 
     //-------------------------------------------------------------------------
-    /** controls the focus behaviour of the form controls in the document
+    /** controls the focus behavior of the form controls in the document
 
         <p>
         If this flag is set to <TRUE/>, any view belonging to the document
diff --git a/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl b/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
index b47abb27aeda..dac2965d40be 100644
--- a/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
+++ b/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_OleEmbeddedServerRegistration_idl__
 #define __com_sun_star_document_OleEmbeddedServerRegistration_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl b/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl
index c2448f65ab42..85d6f4dff713 100644
--- a/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl
+++ b/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_OwnLockOnDocumentRequest_idl__
 #define __com_sun_star_document_OwnLockOnDocumentRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/PDFDialog.idl b/offapi/com/sun/star/document/PDFDialog.idl
index 6de6e05497c1..381c2abe7061 100644
--- a/offapi/com/sun/star/document/PDFDialog.idl
+++ b/offapi/com/sun/star/document/PDFDialog.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_PDFDialog_idl__
 #define __com_sun_star_document_PDFDialog_idl__
 
-#ifndef __com_sun_star_ui_dialogs_FilterOptionsDialog_idl__
 #include <com/sun/star/ui/dialogs/FilterOptionsDialog.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/Settings.idl b/offapi/com/sun/star/document/Settings.idl
index aa55320c773c..dde78877a68e 100644
--- a/offapi/com/sun/star/document/Settings.idl
+++ b/offapi/com/sun/star/document/Settings.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_document_Settings_idl__
 #define __com_sun_star_document_Settings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
 #include <com/sun/star/i18n/XForbiddenCharacters.idl>
-#endif
 
 //=============================================================================
 
@@ -69,7 +65,7 @@ published service Settings
 
         @return the
             <type scope="com::sun::star::i18n">XForbiddenCharacters</type>
-            interface to allow retreival and modification of the
+            interface to allow retrieval and modification of the
             forbidden characters set.
     */
     [optional, property] com::sun::star::i18n::XForbiddenCharacters ForbiddenCharacters;
@@ -277,7 +273,7 @@ published service Settings
 
     // Writer, maybe later other applications, too
     //-------------------------------------------------------------------------
-    /** layout engine should add value of a Font's 'external leading'
+    /** layout engine should add value of a Font's "external leading"
      * attribute to the line spacing.
      */
     [optional, property] boolean AddExternalLeading;
diff --git a/offapi/com/sun/star/document/StandaloneDocumentInfo.idl b/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
index a10515c7568b..2c8465ed7630 100644
--- a/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
+++ b/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_StandaloneDocumentInfo_idl__
 #define __com_sun_star_document_StandaloneDocumentInfo_idl__
 
-#ifndef __com_sun_star_document_DocumentInfo_idl__
 #include <com/sun/star/document/DocumentInfo.idl>
-#endif
-
-#ifndef __com_sun_star_document_XStandaloneDocumentInfo_idl__
 #include <com/sun/star/document/XStandaloneDocumentInfo.idl>
-#endif
 
 //=============================================================================
 
@@ -58,7 +53,7 @@
 published service StandaloneDocumentInfo
 {
     //-------------------------------------------------------------------------
-    /** use it to specify ressource or target of document info data
+    /** use it to specify resource or target of document info data
 
         <p>
         Must be the first action on this service. Otherwise all properties will be void.
diff --git a/offapi/com/sun/star/document/TypeDetection.idl b/offapi/com/sun/star/document/TypeDetection.idl
index eb754e62a12e..29b0ed7552b1 100644
--- a/offapi/com/sun/star/document/TypeDetection.idl
+++ b/offapi/com/sun/star/document/TypeDetection.idl
@@ -27,33 +27,22 @@
 #ifndef __com_sun_star_document_TypeDetection_idl__
 #define __com_sun_star_document_TypeDetection_idl__
 
-#ifndef __com_sun_star_document_XTypeDetection_idl__
 #include <com/sun/star/document/XTypeDetection.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
 #include <com/sun/star/container/XContainerQuery.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module document {
 
 //=============================================================================
-/** capsulate a type detection service and provide read/write access on it's configuration data.
+/** encapsulate a type detection service and provide read/write access on it's configuration data.
 
     <p>
-    It's possible to make a "flat" detection wich may use internal configuration
+    It's possible to make a "flat" detection which may use internal configuration
     data only - or a "deep" detection which use special <type>ExtendedTypeDetection</type>
-    services to look into the document stream. Last mode can be supressed to perform the operation.
+    services to look into the document stream. Last mode can be suppressed to perform the operation.
     Of course the results can't be guaranteed then. (e.g. in case the extension was changed)
     </p>
  */
@@ -78,7 +67,7 @@ published service TypeDetection
         Every container item is specified as a set of properties and will be
         represented by a sequence< <type scope="com::sun::star::beans">PropertyValue</type> > structure.
         Follow properties are supported:
-        (But note: not all of them must be present everytimes!)
+        (But note: not all of them must be present every time!)
 
         <table border=1>
             <tr>
@@ -108,12 +97,12 @@ published service TypeDetection
                 <td><em>MediaType</em></td>
                 <td>[string]</td>
                 <td>It contains the MIME or content type descriptor. The differences between a MIME type and
-                    an internal type name was made, to resolve existing ambigities.</td>
+                    an internal type name was made, to resolve existing ambiguities.</td>
             </tr>
             <tr>
                 <td><em>ClipboardFormat</em><strong>deprecated!</strong></td>
                 <td>[string]</td>
-                <td>It was interepreted as an identifier inside clipboard.
+                <td>It was interpreted as an identifier inside clipboard.
                     Please use new property ContentFormat instead of this now.</td>
             </tr>
             <tr>
@@ -130,9 +119,9 @@ published service TypeDetection
                 <td>[sequence< string >]</td>
                 <td>This list contains different URL patterns, which identify this type.
                     E.g. data base contents can be described by an new defined protocol like "sql://select*".
-                    In combination with a sutable <type scope="com::sun::star::frame">FrameLoader</type> or
-                    <type>ImportFilter</type>/<type>ExportFilter</type> it woul be possible then, to
-                    layout a sql query output into an office frame.</td>
+                    In combination with a suitable <type scope="com::sun::star::frame">FrameLoader</type> or
+                    <type>ImportFilter</type>/<type>ExportFilter</type> it would be possible then, to
+                    layout a SQL query output into an office frame.</td>
             </tr>
             <tr>
                 <td><em>Extensions</em></td>
@@ -140,8 +129,8 @@ published service TypeDetection
                 <td>It contains a list of file extensions, which match this type.
                     They must be specified as pure extension, without any special signs.
                     E.g.: "doc", "html" ... but not ".doc".
-                    Using of wildcards is allowed but not very usefull. The may resulting
-                    ambigities with other type registrations can't be resolved anytimes.</td>
+                    Using wild cards is allowed but not very useful. They may result in
+                    ambiguities with other type registrations can't be resolved anytime.</td>
             </tr>
             <tr>
                 <td><em>DocumentIconID</em></td>
@@ -153,8 +142,8 @@ published service TypeDetection
 
         <p>
         Note:<br>
-        All elements of this container will be adressed by his internal name,
-        and it must be an unambigous value.
+        All elements of this container will be addressed by his internal name,
+        and it must be an unambiguous value.
         </p>
      */
     interface com::sun::star::container::XNameAccess;
@@ -179,12 +168,12 @@ published service TypeDetection
 
         <p>
         Because the complexness of such configuration set can be very high,
-        it seams not very usefull to update the undelying configuration layer
-        on every container change request immediatly. Another strategy can be to
+        it seams not very useful to update the underlying configuration layer
+        on every container change request immediately. Another strategy can be to
         make all changes (adding/changing/removing of items) and call flush at the end.
         That will validate the whole container and reject inconsistent data sets.
         Only in case all made changes was correct, they will be written back to the
-        configuration. Further this interface provides the possibelity, that interested
+        configuration. Further this interface provides the possibility, that interested
         changes listener can be registered too.
         </p>
      */
diff --git a/offapi/com/sun/star/document/UndoContextNotClosedException.idl b/offapi/com/sun/star/document/UndoContextNotClosedException.idl
index 81eeca83c7ac..81eeca83c7ac 100755..100644
--- a/offapi/com/sun/star/document/UndoContextNotClosedException.idl
+++ b/offapi/com/sun/star/document/UndoContextNotClosedException.idl
diff --git a/offapi/com/sun/star/document/UndoFailedException.idl b/offapi/com/sun/star/document/UndoFailedException.idl
index 65b23148ad37..65b23148ad37 100755..100644
--- a/offapi/com/sun/star/document/UndoFailedException.idl
+++ b/offapi/com/sun/star/document/UndoFailedException.idl
diff --git a/offapi/com/sun/star/document/UndoManagerEvent.idl b/offapi/com/sun/star/document/UndoManagerEvent.idl
index 163b9c6dd33d..163b9c6dd33d 100755..100644
--- a/offapi/com/sun/star/document/UndoManagerEvent.idl
+++ b/offapi/com/sun/star/document/UndoManagerEvent.idl
diff --git a/offapi/com/sun/star/document/XActionLockable.idl b/offapi/com/sun/star/document/XActionLockable.idl
index 62add1717cd8..caaa4372f960 100644
--- a/offapi/com/sun/star/document/XActionLockable.idl
+++ b/offapi/com/sun/star/document/XActionLockable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XActionLockable_idl__
 #define __com_sun_star_document_XActionLockable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XBinaryStreamResolver.idl b/offapi/com/sun/star/document/XBinaryStreamResolver.idl
index 0f38a6d85606..c14ead0aaf37 100644
--- a/offapi/com/sun/star/document/XBinaryStreamResolver.idl
+++ b/offapi/com/sun/star/document/XBinaryStreamResolver.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_document_XBinaryStreamResolver_idl__
 #define __com_sun_star_document_XBinaryStreamResolver_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XOututStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
 
 //=============================================================================
 
@@ -45,18 +39,18 @@ module com {  module sun {  module star {  module document {
 
 /**
     <p>This interface encapsulates functionality to get/resolve binary data streams.
-    It is used to transform binary data to an url or to transform an url to binary
+    It is used to transform binary data to an URL or to transform an URL to binary
     data. The binary data is represented through input and output streams.</p>
 
-    <p>In the case of transforming an url to binary data, the <code>getInputStream</code>
+    <p>In the case of transforming an URL to binary data, the <code>getInputStream</code>
     method is used. This returns a <type scope="com::sun::star::io">XInputStream</type>
-    from which the binary data, transformed from the given url, can be read.</p>
+    from which the binary data, transformed from the given URL, can be read.</p>
 
-    <p>In the case of transforming binary data to an url, a
+    <p>In the case of transforming binary data to an URL, a
     <type scope="com::sun::star::io">XOutputStream</type> is created first to write
     the binary data to. After this, the <code>resolveOutputStream</code> method can
     be used to transform the binary data, represented through the
-    <type scope="com::sun::star::io">XOutputStream</type> interface, to an url.</p>
+    <type scope="com::sun::star::io">XOutputStream</type> interface, to an URL.</p>
  */
 published interface XBinaryStreamResolver: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/document/XCodeNameQuery.idl b/offapi/com/sun/star/document/XCodeNameQuery.idl
index 948c86debf3a..6c3c992e32e8 100755..100644
--- a/offapi/com/sun/star/document/XCodeNameQuery.idl
+++ b/offapi/com/sun/star/document/XCodeNameQuery.idl
@@ -2,12 +2,6 @@
  *
  *  OpenOffice.org - a multi-platform office productivity suite
  *
- *  $RCSfile: XDocumentPropertiesSupplier.idl,v $
- *
- *  $Revision$
- *
- *  last change: $Author$ $Date$
- *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
  *
@@ -35,9 +29,7 @@
 #ifndef __com_sun_star_document_XCodeNameQuery_idl__
 #define __com_sun_star_document_XCodeNameQuery_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/sal/osl/os2/procimpl.h b/offapi/com/sun/star/document/XCompatWriterDocProperties.idl
index 5ff7a9f36b91..48b25b977923 100644
--- a/sal/osl/os2/procimpl.h
+++ b/offapi/com/sun/star/document/XCompatWriterDocProperties.idl
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -24,29 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_document_XCompatWriterDocProperties_idl__
+#define __com_sun_star_document_XCompatWriterDocProperties_idl__
 
-#ifndef _OSL_PROCIMPL_H_
-#define _OSL_PROCIMPL_H_
+#include <com/sun/star/document/XDocumentProperties.idl>
+//=============================================================================
 
+module com {   module sun {   module star {   module document {
+interface XCompatWriterDocProperties
+{
+//    interface ::com::sun::star::document::XDocumentProperties;
+    [attribute] string Manager;
+    [attribute] string Category;
+    [attribute] string Company;
 
-#include <osl/process.h>
 
-#ifdef __cplusplus
-extern "C" {
+}; }; }; };
+};
 #endif
-
-typedef struct _oslProcessImpl {
-
-    PID pProcess;
-    sal_uInt32 nSessionID;
-    sal_uInt32 nResultCode;
-    BOOL bResultCodeValid;
-} oslProcessImpl;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-
diff --git a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
index 7274083fcf1e..e15dbf661405 100644
--- a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_document_XDocumentEventBroadcaster_idl__
 #define __com_sun_star_document_XDocumentEventBroadcaster_idl__
 
-#ifndef __com_sun_star_frame_XController2_idl__
 #include <com/sun/star/frame/XController2.idl>
-#endif
-
-#ifndef __com_sun_star_document_DocumentEvent_idl__
 #include <com/sun/star/document/DocumentEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 //=============================================================================
 
@@ -65,7 +54,7 @@ published interface XDocumentEventBroadcaster
     /** registers a listener which is notified about document events
 
         @param _Listener
-            the listener to register. The behaviour of the method is undefined this listener
+            the listener to register. The behavior of the method is undefined this listener
             is <NULL/>.
     */
     void    addDocumentEventListener( [in] XDocumentEventListener _Listener );
@@ -73,7 +62,7 @@ published interface XDocumentEventBroadcaster
     /** revokes a listener which has previously been registered to be notified about document events.
 
         @param _Listener
-            the listener to revoke. The behaviour of the method is undefined this listener
+            the listener to revoke. The behavior of the method is undefined this listener
             is <NULL/>.
     */
     void    removeDocumentEventListener( [in] XDocumentEventListener _Listener );
@@ -84,7 +73,7 @@ published interface XDocumentEventBroadcaster
         and fill in the <code>Source</code> member (denoting the broadcaster) as appropriate.</p>
 
         <p>Whether the actual notification happens synchronously or asynchronously is up to the
-        implementator of this method. However, implementations are encouraged to specify this, for the
+        implementor of this method. However, implementations are encouraged to specify this, for the
         list of supported event types, in their service contract.</p>
 
         <p>Implementations might also decide to limit the list of allowed events (means event names) at
@@ -123,3 +112,4 @@ published interface XDocumentEventBroadcaster
 //=============================================================================
 
 #endif
+
diff --git a/offapi/com/sun/star/document/XDocumentEventListener.idl b/offapi/com/sun/star/document/XDocumentEventListener.idl
index 94548e52b578..d58e99b141a4 100644
--- a/offapi/com/sun/star/document/XDocumentEventListener.idl
+++ b/offapi/com/sun/star/document/XDocumentEventListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XDocumentEventListener_idl__
 #define __com_sun_star_document_XDocumentEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_document_DocumentEvent_idl__
 #include <com/sun/star/document/DocumentEvent.idl>
-#endif
 
 //=============================================================================
 
@@ -51,7 +46,7 @@ module com { module sun { module star { module document {
  */
 published interface XDocumentEventListener : ::com::sun::star::lang::XEventListener
 {
-    /** is called whenever a document event occured
+    /** is called whenever a document event occurred
     */
     void documentEventOccured( [in] DocumentEvent Event );
 };
diff --git a/offapi/com/sun/star/document/XDocumentInfo.idl b/offapi/com/sun/star/document/XDocumentInfo.idl
index ea67495f44b9..c656a8e0467e 100644
--- a/offapi/com/sun/star/document/XDocumentInfo.idl
+++ b/offapi/com/sun/star/document/XDocumentInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XDocumentInfo_idl__
 #define __com_sun_star_document_XDocumentInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/ArrayIndexOutOfBoundsException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XDocumentInfoSupplier.idl b/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
index ceb17d1bcc5b..20e6b5107bad 100644
--- a/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XDocumentInfoSupplier_idl__
 #define __com_sun_star_document_XDocumentInfoSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_document_XDocumentInfo_idl__
 #include <com/sun/star/document/XDocumentInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XDocumentInsertable.idl b/offapi/com/sun/star/document/XDocumentInsertable.idl
index 60208ee05014..4956a0cfd760 100644
--- a/offapi/com/sun/star/document/XDocumentInsertable.idl
+++ b/offapi/com/sun/star/document/XDocumentInsertable.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_document_XDocumentInsertable_idl__
 #define __com_sun_star_document_XDocumentInsertable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentLanguages.idl b/offapi/com/sun/star/document/XDocumentLanguages.idl
index c6f17125d050..a12f4b4720df 100644
--- a/offapi/com/sun/star/document/XDocumentLanguages.idl
+++ b/offapi/com/sun/star/document/XDocumentLanguages.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_XDocumentLanguages_idl__
 #define __com_sun_star_document_XDocumentLanguages_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XDocumentProperties.idl b/offapi/com/sun/star/document/XDocumentProperties.idl
index 8a3b2c1843aa..79a07b9d9fca 100755..100644
--- a/offapi/com/sun/star/document/XDocumentProperties.idl
+++ b/offapi/com/sun/star/document/XDocumentProperties.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_document_XDocumentProperties_idl__
 #define __com_sun_star_document_XDocumentProperties_idl__
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_WrongFormatException_idl__
 #include <com/sun/star/io/WrongFormatException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
 
 
 //=============================================================================
@@ -210,7 +184,7 @@ published interface XDocumentProperties
         specified time after the document is loaded into a desktop frame.
         <p>
         An empty URL is valid and describes a case where the document shall be
-        reloaded from its original loction after some time described by the
+        reloaded from its original location after some time described by the
         attribute <member>AutoloadSecs</member>.
         An empty <atom>string</atom> together with an
         <member>AutoloadSecs</member> value of 0
@@ -292,7 +266,7 @@ published interface XDocumentProperties
     //-------------------------------------------------------------------------
     /** resets all attributes that could identify the user.
         <p>
-        Clears the document properties, such that it apperars the document
+        Clears the document properties, such that it appears the document
         has just been created.
         This is a convenience method which resets several attributes at once,
         as follows:
diff --git a/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl b/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
index 811513d7a026..1ebee0672208 100644
--- a/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XDocumentPropertiesSupplier_idl__
 #define __com_sun_star_document_XDocumentPropertiesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_document_XDocumentProperties_idl__
 #include <com/sun/star/document/XDocumentProperties.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XDocumentRecovery.idl b/offapi/com/sun/star/document/XDocumentRecovery.idl
index e5bf521d07f0..108c16abd54d 100644
--- a/offapi/com/sun/star/document/XDocumentRecovery.idl
+++ b/offapi/com/sun/star/document/XDocumentRecovery.idl
@@ -53,7 +53,7 @@ interface XDocumentRecovery
         <p>It's allowed to implement this method sloppy, by returning <TRUE/> in cases where it is not sure whether
         the document actually has been modified. So, the most simple implementation could simply delegate this call
         to <member scope="com::sun::star::util">XModifiable::isModified</member>. (Well, actually that's the
-        second simple implementation, the <em>most</em> simple one would, still egitimately, always return <TRUE/>.)</p>
+        second simple implementation, the <em>most</em> simple one would, still legitimately, always return <TRUE/>.)</p>
 
         <p>However, in such a case, the document might be saved more often than needed. In particular during the
         periodic session save, this might become a problem when saving is expensive, for a single document
diff --git a/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl b/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl
index 991b54fa84a9..ae6b1f83e4dd 100644
--- a/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl
+++ b/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_document_XDocumentRevisionListPersistence_idl__
 #define __com_sun_star_document_XDocumentRevisionListPersistence_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_util_RevisionTag_idl__
 #include <com/sun/star/util/RevisionTag.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/io/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
+#include <com/sun/star/container/NoSuchElementException.idl>
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl b/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
index 69cbe1bbfb2e..cb842a872fbb 100644
--- a/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XDocumentSubStorageSupplier_idl__
 #define __com_sun_star_document_XDocumentSubStorageSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl b/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl
index f1b31dd21d90..efa62d36e25a 100644
--- a/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl
+++ b/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XEmbeddedObjectResolver_idl__
 #define __com_sun_star_document_XEmbeddedObjectResolver_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl b/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl
index 1885121705dd..edc1f3858cda 100644
--- a/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl
+++ b/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__
 #define __com_sun_star_document_XEmbeddedObjectSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl b/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl
index 32d959cb3944..5e5903e49d75 100644
--- a/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl
+++ b/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_document_XEmbeddedObjectSupplier2_idl__
 #define __com_sun_star_document_XEmbeddedObjectSupplier2_idl__
 
-#ifndef __com_sun_star_embed_XEmbeddedObject_idl__
 #include <com/sun/star/embed/XEmbeddedObject.idl>
-#endif
 
-#ifndef __com_sun_star_graphic_XGraphic_idl__
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__
 #include <com/sun/star/document/XEmbeddedObjectSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XEmbeddedScripts.idl b/offapi/com/sun/star/document/XEmbeddedScripts.idl
index fba8541bafcb..a3ab23fa7b91 100644
--- a/offapi/com/sun/star/document/XEmbeddedScripts.idl
+++ b/offapi/com/sun/star/document/XEmbeddedScripts.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_document_XEmbeddedScripts_idl__
 #define __com_sun_star_document_XEmbeddedScripts_idl__
 
-#ifndef __com_sun_star_script_XStorageBasedLibraryContainer_idl__
 #include <com/sun/star/script/XStorageBasedLibraryContainer.idl>
-#endif
 
 //=============================================================================
 
@@ -38,7 +36,7 @@ module com { module sun { module star { module document {
 
 //=============================================================================
 
-/** is suppoerted by <type>OfficeDocument</type>s which allow to embed scripts
+/** is supported by <type>OfficeDocument</type>s which allow to embed scripts
 
     @since OOo 2.4
  */
diff --git a/offapi/com/sun/star/document/XEventBroadcaster.idl b/offapi/com/sun/star/document/XEventBroadcaster.idl
index ff4240b028ee..995c341d1f73 100644
--- a/offapi/com/sun/star/document/XEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XEventBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #define __com_sun_star_document_XEventBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventListener_idl__
 #include <com/sun/star/document/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XEventListener.idl b/offapi/com/sun/star/document/XEventListener.idl
index d32b04ced66f..4cbc64dd6e96 100644
--- a/offapi/com/sun/star/document/XEventListener.idl
+++ b/offapi/com/sun/star/document/XEventListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XEventListener_idl__
 #define __com_sun_star_document_XEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_document_EventObject_idl__
 #include <com/sun/star/document/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XEventsSupplier.idl b/offapi/com/sun/star/document/XEventsSupplier.idl
index d5bd2b0d9aa9..44d3669b9482 100644
--- a/offapi/com/sun/star/document/XEventsSupplier.idl
+++ b/offapi/com/sun/star/document/XEventsSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XEventsSupplier_idl__
 #define __com_sun_star_document_XEventsSupplier_idl__
 
-#ifndef __com_sun_star_container_XNameReplace_idl__
 #include <com/sun/star/container/XNameReplace.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XExporter.idl b/offapi/com/sun/star/document/XExporter.idl
index a89017c248a1..67fe3a2d2df3 100644
--- a/offapi/com/sun/star/document/XExporter.idl
+++ b/offapi/com/sun/star/document/XExporter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XExporter_idl__
 #define __com_sun_star_document_XExporter_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XExtendedFilterDetection.idl b/offapi/com/sun/star/document/XExtendedFilterDetection.idl
index b5aae4930fd8..402cd4c66a22 100644
--- a/offapi/com/sun/star/document/XExtendedFilterDetection.idl
+++ b/offapi/com/sun/star/document/XExtendedFilterDetection.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XExtendedFilterDetection_idl__
 #define __com_sun_star_document_XExtendedFilterDetection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
@@ -59,8 +54,8 @@ published interface XExtendedFilterDetection: com::sun::star::uno::XInterface
         with given URL or arguments
 
         <p>
-        Registerd services in configuration, which support this interface for different mime types,
-        will be called automaticly to look into the document stream and cdecide wich format it represent.
+        Registered services in configuration, which support this interface for different mime types,
+        will be called automatically to look into the document stream and decide which format it represent.
         Add the collected information about detected documents in given <type>MediaDescriptor</type>
         <var>Descriptor</var>. The decision must be returned as any valid type name (which specifies
         the detected format) or an empty value for unknown formats.
diff --git a/offapi/com/sun/star/document/XFilter.idl b/offapi/com/sun/star/document/XFilter.idl
index 24eab5fcde5a..a50f07cff9df 100644
--- a/offapi/com/sun/star/document/XFilter.idl
+++ b/offapi/com/sun/star/document/XFilter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XFilter_idl__
 #define __com_sun_star_document_XFilter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
@@ -62,7 +57,7 @@ published interface XFilter: com::sun::star::uno::XInterface
         /** filter the document.
 
         <p>
-        The given <type>MediaDescriptor</type> holds all neccessary information
+        The given <type>MediaDescriptor</type> holds all necessary information
         about the document.
 
         Don't hold hard references to the descriptor items. You must copy needed information!
diff --git a/offapi/com/sun/star/document/XFilterAdapter.idl b/offapi/com/sun/star/document/XFilterAdapter.idl
index 877587aa0e26..dbe3f650b752 100644
--- a/offapi/com/sun/star/document/XFilterAdapter.idl
+++ b/offapi/com/sun/star/document/XFilterAdapter.idl
@@ -27,10 +27,7 @@
 #ifndef _COM_SUN_STAR_DOCUMENT_XFILTERADAPTOR_IDL__
 #define _COM_SUN_STAR_DOCUMENT_XFILTERADAPTOR_IDL__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/io/XInputStream.idl>
 #include <com/sun/star/io/XOutputStream.idl>
diff --git a/offapi/com/sun/star/document/XGraphicObjectResolver.idl b/offapi/com/sun/star/document/XGraphicObjectResolver.idl
index 50863b04f38c..bf01b514ec80 100644
--- a/offapi/com/sun/star/document/XGraphicObjectResolver.idl
+++ b/offapi/com/sun/star/document/XGraphicObjectResolver.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XGraphicObjectResolver_idl__
 #define __com_sun_star_document_XGraphicObjectResolver_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XImporter.idl b/offapi/com/sun/star/document/XImporter.idl
index 9a784aeae173..6980a7d629ff 100644
--- a/offapi/com/sun/star/document/XImporter.idl
+++ b/offapi/com/sun/star/document/XImporter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XImporter_idl__
 #define __com_sun_star_document_XImporter_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XInteractionFilterOptions.idl b/offapi/com/sun/star/document/XInteractionFilterOptions.idl
index b11749297e14..27b32b5a16a2 100644
--- a/offapi/com/sun/star/document/XInteractionFilterOptions.idl
+++ b/offapi/com/sun/star/document/XInteractionFilterOptions.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XInteractionFilterOptions_idl__
 #define __com_sun_star_document_XInteractionFilterOptions_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XInteractionFilterSelect.idl b/offapi/com/sun/star/document/XInteractionFilterSelect.idl
index 0aa7770af8a2..374a06ec25b2 100644
--- a/offapi/com/sun/star/document/XInteractionFilterSelect.idl
+++ b/offapi/com/sun/star/document/XInteractionFilterSelect.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XInteractionFilterSelect_idl__
 #define __com_sun_star_document_XInteractionFilterSelect_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 //=============================================================================
 
@@ -44,7 +42,7 @@ module com { module sun { module star { module document {
     a possible <type scope="com::sun::star::task">InteractionHandler</type> will be used.
     (it's a a part of used <type>MediaDescriptor</type>)
     A <type>NoSuchFilterRequest</type> will be used then to start right interaction on that to
-    get a decision wich filter should be used for given URL. A possible continiuation
+    get a decision which filter should be used for given URL. A possible continuation
     of that can be this XInteractionFilterSelect. It will transport the decision back to
     generic filter detection and force using of it. Of course it's possible to abort
     the loading process by use another continuation <type scope="com::sun::star::task">XInteractionAbort</type>.
diff --git a/offapi/com/sun/star/document/XLinkTargetSupplier.idl b/offapi/com/sun/star/document/XLinkTargetSupplier.idl
index f48a68f9d429..a414a4cb6e31 100644
--- a/offapi/com/sun/star/document/XLinkTargetSupplier.idl
+++ b/offapi/com/sun/star/document/XLinkTargetSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
 #define __com_sun_star_document_XLinkTargetSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XMLBasicExporter.idl b/offapi/com/sun/star/document/XMLBasicExporter.idl
index 7766282276dd..8472330a745c 100644
--- a/offapi/com/sun/star/document/XMLBasicExporter.idl
+++ b/offapi/com/sun/star/document/XMLBasicExporter.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_XMLBasicExporter_idl__
 #define __com_sun_star_document_XMLBasicExporter_idl__
 
-#ifndef __com_sun_star_document_XExporter_idl__
 #include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XFilter_idl__
 #include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XMLBasicImporter.idl b/offapi/com/sun/star/document/XMLBasicImporter.idl
index 74b789c954ed..9dfd46c78e96 100644
--- a/offapi/com/sun/star/document/XMLBasicImporter.idl
+++ b/offapi/com/sun/star/document/XMLBasicImporter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XMLBasicImporter_idl__
 #define __com_sun_star_document_XMLBasicImporter_idl__
 
-#ifndef __com_sun_star_document_XImporter_idl__
 #include <com/sun/star/document/XImporter.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XMLOasisBasicExporter.idl b/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
index b5817e99e8ee..fbc47fbf3589 100644
--- a/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
+++ b/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_XMLOasisBasicExporter_idl__
 #define __com_sun_star_document_XMLOasisBasicExporter_idl__
 
-#ifndef __com_sun_star_document_XExporter_idl__
 #include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XFilter_idl__
 #include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
index c77c6395a9be..684fe1d6abe9 100644
--- a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
+++ b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XMLOasisBasicImporter_idl__
 #define __com_sun_star_document_XMLOasisBasicImporter_idl__
 
-#ifndef __com_sun_star_document_XImporter_idl__
 #include <com/sun/star/document/XImporter.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XMimeTypeInfo.idl b/offapi/com/sun/star/document/XMimeTypeInfo.idl
index fd3345f75c48..c634c1846758 100644
--- a/offapi/com/sun/star/document/XMimeTypeInfo.idl
+++ b/offapi/com/sun/star/document/XMimeTypeInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XMimeTypeInfo_idl__
 #define __com_sun_star_document_XMimeTypeInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl b/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl
index 23b29bcaca61..cb2ae988156b 100644
--- a/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl
+++ b/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl
@@ -27,32 +27,18 @@
 #ifndef __com_sun_star_document_XOOXMLDocumentPropertiesImporter_idl__
 #define __com_sun_star_document_XOOXMLDocumentPropertiesImporter_idl__
 
-#ifndef __com_sun_star_document_XDocumentProperties_idl__
 #include <com/sun/star/document/XDocumentProperties.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module document {
 
 //=============================================================================
-/** allows to import the document properties from OOXML fomat
+/** allows to import the document properties from OOXML format
  */
 interface XOOXMLDocumentPropertiesImporter: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/document/XRedlinesSupplier.idl b/offapi/com/sun/star/document/XRedlinesSupplier.idl
index 9ca883b140d4..bfbf47885a6d 100644
--- a/offapi/com/sun/star/document/XRedlinesSupplier.idl
+++ b/offapi/com/sun/star/document/XRedlinesSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XRedlinesSupplier_idl__
 #define __com_sun_star_document_XRedlinesSupplier_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
@@ -45,7 +43,7 @@ published interface XRedlinesSupplier: com::sun::star::uno::XInterface
     /** @returns
             an enumeration access that provides access to the redline objects of the document.
 
-            <p>The returned objects implent at least the interface
+            <p>The returned objects implement at least the interface
             <type scope="com::sun::star::beans">XPropertySet</type>.
             Specific objects may support other interfaces as well.</p>
      */
diff --git a/offapi/com/sun/star/document/XScriptInvocationContext.idl b/offapi/com/sun/star/document/XScriptInvocationContext.idl
index 68f5cd883410..c7f495bb738c 100644
--- a/offapi/com/sun/star/document/XScriptInvocationContext.idl
+++ b/offapi/com/sun/star/document/XScriptInvocationContext.idl
@@ -29,9 +29,7 @@
 #define __com_sun_star_document_XScriptInvocationContext_idl__
 
 
-#ifndef __com_sun_star_document_XEmbeddedScripts_idl__
 #include <com/sun/star/document/XEmbeddedScripts.idl>
-#endif
 
 //=============================================================================
 
@@ -50,7 +48,7 @@ module com { module sun { module star { module document {
     then this other document is denoted by <member>ScriptContainer</member>.</p>
 
     <p>If the interface is implemented by a controller, then <member>ScriptContainer</member>
-    refers to the document which supports embedding scripts, and which is unambiguosly
+    refers to the document which supports embedding scripts, and which is unambiguously
     associated with the controller. This must not necessarily be the model returned by
     <member scope="com::sun::star::frame">XController::getModel</member>.</p>
 
@@ -59,7 +57,7 @@ module com { module sun { module star { module document {
 interface XScriptInvocationContext
 {
     /** denotes the document which contains the scripts which are to be invoked from
-    the component implementing the XScriptInvocationContext inteface.
+    the component implementing the XScriptInvocationContext interface.
     */
     [attribute, readonly] XEmbeddedScripts ScriptContainer;
 };
diff --git a/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl b/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
index 51a0cd7fa289..cb7ebb4ce5e4 100644
--- a/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
+++ b/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XStandaloneDocumentInfo_idl__
 #define __com_sun_star_document_XStandaloneDocumentInfo_idl__
 
-#ifndef __com_sun_star_document_XDocumentInfo_idl__
 #include <com/sun/star/document/XDocumentInfo.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //=============================================================================
 
@@ -49,7 +44,7 @@ module com {   module sun {   module star {   module document {
     Instead of <type>DocumentInfo</type> not the whole document will be opened.
     Note: Without specifying the source or target of this info (the document)
     nothing can work and will be handled as void (for reading) or ignored (for writing).
-    After specigiying the source/target by using this interface,
+    After specifying the source/target by using this interface,
     the interface <type>XDocumentInfo</type> (which must be implemented on same
     object then this one!) provides access to the info properties.
     </p>
diff --git a/offapi/com/sun/star/document/XStorageBasedDocument.idl b/offapi/com/sun/star/document/XStorageBasedDocument.idl
index a352d36110a2..0fa418ed3689 100644
--- a/offapi/com/sun/star/document/XStorageBasedDocument.idl
+++ b/offapi/com/sun/star/document/XStorageBasedDocument.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
 #define __com_sun_star_embed_XStorageBasedDocument_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
 #include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
-
-#ifndef __com_sun_star_document_XStorageChangeListener_idl__
 #include <com/sun/star/document/XStorageChangeListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/document/XStorageChangeListener.idl b/offapi/com/sun/star/document/XStorageChangeListener.idl
index 6ed36735a1c1..a927f811010a 100644
--- a/offapi/com/sun/star/document/XStorageChangeListener.idl
+++ b/offapi/com/sun/star/document/XStorageChangeListener.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_document_XStorageChangeListener_idl__
 #define __com_sun_star_document_XStorageChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XTypeDetection.idl b/offapi/com/sun/star/document/XTypeDetection.idl
index 5fc14f65ebd9..45de3b0eb07a 100644
--- a/offapi/com/sun/star/document/XTypeDetection.idl
+++ b/offapi/com/sun/star/document/XTypeDetection.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_document_XTypeDetection_idl__
 #define __com_sun_star_document_XTypeDetection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
@@ -48,7 +43,7 @@ module com { module sun { module star { module document {
     may invalid results if e.g., the extension of the document is wrong.
     A "deep" detection means looking into the document stream to be right
     which format it supports. Of course that includes a "flat" detection before.
-    The combination of both ones should produce stable results everytime.
+    The combination of both ones should produce stable results every time.
     </p>
 
     @see TypeDetection
@@ -86,11 +81,11 @@ published interface XTypeDetection: com::sun::star::uno::XInterface
         The property <member>MediaDescriptor::URL</member> should be set on
         this descriptor as minimum. It specifies the location of the document.
         If this parameter is missing another one is required: <member>MediaDescriptor::InputStream</member>.
-        This can be usefull to prevent operaton against multiple opening of the stream
+        This can be useful to prevent operation against multiple opening of the stream
         and perform the operation. If this stream isn't already included the detection
         will open it (if allowed!) and add it to the descriptor so it will be available for
         all following parts.
-        A combination of both parameters can be usefull to perform the operation
+        A combination of both parameters can be useful to perform the operation
         and make results more stable; but only one of them is required.
         Of course its possible to specify more document properties (e.g.
         <member>MediaDescriptor::ReadOnly</member>).
@@ -100,7 +95,7 @@ published interface XTypeDetection: com::sun::star::uno::XInterface
         </p>
 
         @param Descriptor
-            means the <type>MediaDescriptor</type> which specify the ressource for detection
+            means the <type>MediaDescriptor</type> which specify the resource for detection
 
         @param AllowDeep
             if it is set to <TRUE/> a "deep" detection will be follow a "flat" detection
diff --git a/offapi/com/sun/star/document/XUndoAction.idl b/offapi/com/sun/star/document/XUndoAction.idl
index e65354013499..e65354013499 100755..100644
--- a/offapi/com/sun/star/document/XUndoAction.idl
+++ b/offapi/com/sun/star/document/XUndoAction.idl
diff --git a/offapi/com/sun/star/document/XUndoManager.idl b/offapi/com/sun/star/document/XUndoManager.idl
index 74aa4de0cf70..74aa4de0cf70 100755..100644
--- a/offapi/com/sun/star/document/XUndoManager.idl
+++ b/offapi/com/sun/star/document/XUndoManager.idl
diff --git a/offapi/com/sun/star/document/XUndoManagerListener.idl b/offapi/com/sun/star/document/XUndoManagerListener.idl
index 045e74761794..045e74761794 100755..100644
--- a/offapi/com/sun/star/document/XUndoManagerListener.idl
+++ b/offapi/com/sun/star/document/XUndoManagerListener.idl
diff --git a/offapi/com/sun/star/document/XUndoManagerSupplier.idl b/offapi/com/sun/star/document/XUndoManagerSupplier.idl
index 211dd151ecad..211dd151ecad 100755..100644
--- a/offapi/com/sun/star/document/XUndoManagerSupplier.idl
+++ b/offapi/com/sun/star/document/XUndoManagerSupplier.idl
diff --git a/offapi/com/sun/star/document/XVbaMethodParameter.idl b/offapi/com/sun/star/document/XVbaMethodParameter.idl
new file mode 100644
index 000000000000..18ead9138513
--- /dev/null
+++ b/offapi/com/sun/star/document/XVbaMethodParameter.idl
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright IBM Corporation 2009
+ * Copyright 2009 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __org_openoffice_vba_XVbaMethodParameter_idl__
+#define __org_openoffice_vba_XVbaMethodParameter_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module document {
+
+//=============================================================================
+//gives access to VBA method input/output parameters
+//
+//some OO objects need to implement this interface to support the passing of input/output parameters
+//for certain VBA events
+
+interface XVbaMethodParameter : com::sun::star::uno::XInterface
+{
+    //-------------------------------------------------------------------------
+
+    /** sets the value of the parameter with the specified name.
+     */
+    void setVbaMethodParameter( [in] string PropertyName,
+             [in] any Value );
+
+    //-------------------------------------------------------------------------
+
+    /** returns the value of the parameter with the specified name.
+     */
+    any getVbaMethodParameter( [in] string PropertyName );
+};
+
+//=============================================================================
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/document/XViewDataSupplier.idl b/offapi/com/sun/star/document/XViewDataSupplier.idl
index 0a27b906f358..aa8e8c511719 100644
--- a/offapi/com/sun/star/document/XViewDataSupplier.idl
+++ b/offapi/com/sun/star/document/XViewDataSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_document_XViewDataSupplier_idl__
 #define __com_sun_star_document_XViewDataSupplier_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/makefile.mk b/offapi/com/sun/star/document/makefile.mk
index 1521e6b9513c..d97c508c94b0 100644
--- a/offapi/com/sun/star/document/makefile.mk
+++ b/offapi/com/sun/star/document/makefile.mk
@@ -115,6 +115,8 @@ IDLFILES=\
     DocumentRevisionListPersistence.idl \
     XDocumentLanguages.idl \
     XCodeNameQuery.idl \
+    XCompatWriterDocProperties.idl \
+    XVbaMethodParameter.idl \
     XUndoAction.idl \
     XUndoManager.idl \
     XUndoManagerListener.idl \
diff --git a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
index d00884a08faf..4c96c86cc692 100644
--- a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
 #define __com_sun_star_drawing_AccessibleGraphicShape_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
@@ -56,7 +50,7 @@ module com {  module sun {  module star {  module drawing {
     <li>Only the current draw page and only the visible shapes are
     accessible.  To switch to another page or to access shapes that lie
     outside the currently visible area, the user has to issue these requests
-    manually or programmatically through the usual chanels, e.g. pressing
+    manually or programmatically through the usual channels, e.g. pressing
     keys or selecting menu entries.</li>
     <li>The hierarchy exposed through the
     <type scope="::com::sun::star::accessibility">XAccessibleContext</type>
@@ -100,7 +94,7 @@ published service AccessibleDrawDocumentView
             mode--the appropriate listeners are called and the user gets
             informed of this.</li>
         <li>Parent: The parent will usually be the window that contains the
-            draw document view.  It has to be set via implementation dependend
+            draw document view.  It has to be set via implementation dependent
             ways.</li>
         <li>Relations: Relations are set and modified from the outside.</li>
         <li>States: <const scope="com::sun::star::accessibility"
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphControl.idl b/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
index eb7fcd829fed..40b05c4abead 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module drawing {
     image map of the Draw and Impress applications and the contour dialog of
     the Writer application.
 
-    <p>The children of graph controls are shapes that define contrours.</p>
+    <p>The children of graph controls are shapes that define contours.</p>
 
      @since OOo 1.1.2
  */
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
index 884fbe181984..dd5722de6151 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
 #define __com_sun_star_drawing_AccessibleGraphicShape_idl__
 
-#ifndef __com_sun_star_drawing_AccessibleShape_idl__
 #include <com/sun/star/drawing/AccessibleShape.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
 #include <com/sun/star/accessibility/XAccessibleImage.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
@@ -42,7 +37,7 @@ module com {  module sun {  module star {  module drawing {
     graphic object shapes shapes com.sun.star.drawing.GraphicObjectShape and
     com.sun.star.presentation.GraphicObjectShape.
 
-    <p>It differs from the included <type>AccessibleShape</type> 'base'
+    <p>It differs from the included <type>AccessibleShape</type> "base"
     service by the additional support of the
     <type
     scope="::com::sun::star::accessibility">XAccessibleImage</type>
diff --git a/offapi/com/sun/star/drawing/AccessibleImageBullet.idl b/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
index 1a6464f3ef18..c7a3c3a2ac17 100644
--- a/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
+++ b/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_drawing_AccessibleImageBullet_idl__
 #define __com_sun_star_drawing_AccessibleImageBullet_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
 #include <com/sun/star/accessibility/XAccessibleEditableText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
index 00c46f4e34eb..daf85f9f3b1f 100644
--- a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
@@ -28,28 +28,23 @@
 #ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
 #define __com_sun_star_drawing_AccessibleGraphicShape_idl__
 
-#ifndef __com_sun_star_drawing_AccessibleShape_idl__
 #include <com/sun/star/drawing/AccessibleShape.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
 #include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
 /** The <type>AccessibleOLEShape</type> service is implemented by
     OLE shapes.
 
-    <p>This includes generic OLE shapes, frames, plugins, and applets.</p>
+    <p>This includes generic OLE shapes, frames, plug-ins, and applets.</p>
 
     <p>This service supports the additional <type
     scope="::com::sun::star::accessibility">XAccessibleAction</type>
     interface.</p>
 
     <p>OLE objects are handled as place holders.  While not activated the
-    accessible OLE shape is the only indicator of the OLE objects'
-    existence.  When an OLE object has been activated then the accessbility
+    accessible OLE shape is the only indicator of the OLE object's
+    existence.  When an OLE object has been activated then the accessibility
     tree representing it (as far as that is available) is included directly
     under the accessible document view and not under the OLE object.  This
     is due to underlying implementation constraints and may change in the
diff --git a/offapi/com/sun/star/drawing/AccessibleShape.idl b/offapi/com/sun/star/drawing/AccessibleShape.idl
index 5fa370bdb511..5991e2f34427 100644
--- a/offapi/com/sun/star/drawing/AccessibleShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleShape.idl
@@ -28,27 +28,21 @@
 #ifndef __com_sun_star_drawing_AccessibleShape_idl__
 #define __com_sun_star_drawing_AccessibleShape_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
 /** The <type>AccessibleShape</type> service is implemented by UNO shapes to
-    provide accessibility information that describe the shapes' features.
+    provide accessibility information that describe the shape's features.
     A UNO shape is any object that implements the <type
     scope="::com::sun::star::drawing">XShape</type> interface.
 
     <p>The content of a draw page is modeled as tree of accessible shapes
     and accessible text paragraphs.  The root of this (sub-)tree is the
     accessible draw document view.  An accessible shape implements either
-    this service or one of the 'derived' services
+    this service or one of the "derived" services
     <type>AccessibleGraphicShape</type> or <type>AccessibleOLEShape</type>.
     See the section Children in the description of the
     <type scope="::com::sun::star::accessibility"
@@ -122,8 +116,8 @@ published service AccessibleShape
                 exceptions.</p>
                 <p>If this state is set then no other of the states below is
                 set.  This  is also true for the states that are otherwise
-                allways set (which  makes 'allways' more of a sort of
-                'normally').</p></li>
+                always set (which  makes "always" more of a sort of
+                "normally").</p></li>
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::EDITABLE</const></li> is always set.
                 This state is interpreted to mean that not only text but
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideView.idl b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
index 661ace660bc4..430b8bad7263 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
 #define __com_sun_star_drawing_AccessibleGraphicShape_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
index b03d1583f0f2..400bdc074c2d 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_drawing_AccessibleGraphicShape_idl__
 #define __com_sun_star_drawing_AccessibleGraphicShape_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
diff --git a/offapi/com/sun/star/drawing/AppletShape.idl b/offapi/com/sun/star/drawing/AppletShape.idl
index 95e06b668b8e..4aaa8d4ebc13 100644
--- a/offapi/com/sun/star/drawing/AppletShape.idl
+++ b/offapi/com/sun/star/drawing/AppletShape.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_drawing_AppletShape_idl__
 #define __com_sun_star_drawing_AppletShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
@@ -78,7 +73,7 @@ published service AppletShape
 
     //-------------------------------------------------------------------------
 
-    /** This sequence contains paramaters that are passed to the applet
+    /** This sequence contains parameters that are passed to the applet
         when it is initialized.
     */
     [property] sequence< com::sun::star::beans::PropertyValue > AppletCommands;
diff --git a/offapi/com/sun/star/drawing/Background.idl b/offapi/com/sun/star/drawing/Background.idl
index 7625ef293370..b76eda938330 100644
--- a/offapi/com/sun/star/drawing/Background.idl
+++ b/offapi/com/sun/star/drawing/Background.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_Background_idl__
 #define __com_sun_star_drawing_Background_idl__
 
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/BezierPoint.idl b/offapi/com/sun/star/drawing/BezierPoint.idl
index 6adf8c5f0b42..a17baa2c9fd2 100644
--- a/offapi/com/sun/star/drawing/BezierPoint.idl
+++ b/offapi/com/sun/star/drawing/BezierPoint.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_BezierPoint_idl__
 #define __com_sun_star_drawing_BezierPoint_idl__
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 
 //=============================================================================
@@ -39,9 +37,9 @@
 //=============================================================================
 
 // DocMerge from xml: struct com::sun::star::drawing::BezierPoint
-/** This is a point on a bezier curve.
+/** This is a point on a Bezier curve.
 
-    <p>The two control points specify how the bezier curve
+    <p>The two control points specify how the Bezier curve
     goes through the given position.</p>
 
     @deprecated
diff --git a/offapi/com/sun/star/drawing/BitmapTable.idl b/offapi/com/sun/star/drawing/BitmapTable.idl
index 1ef488e87438..3a25dc540397 100644
--- a/offapi/com/sun/star/drawing/BitmapTable.idl
+++ b/offapi/com/sun/star/drawing/BitmapTable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_BitmapTable_idl__
 #define __com_sun_star_drawing_BitmapTable_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/BoundVolume.idl b/offapi/com/sun/star/drawing/BoundVolume.idl
index 706eaccecd96..841816d62913 100644
--- a/offapi/com/sun/star/drawing/BoundVolume.idl
+++ b/offapi/com/sun/star/drawing/BoundVolume.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_BoundVolume_idl__
 #define __com_sun_star_drawing_BoundVolume_idl__
 
-#ifndef __com_sun_star_drawing_Position3D_idl__
 #include <com/sun/star/drawing/Position3D.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/CameraGeometry.idl b/offapi/com/sun/star/drawing/CameraGeometry.idl
index 3d235e8a336f..7db515f070b0 100644
--- a/offapi/com/sun/star/drawing/CameraGeometry.idl
+++ b/offapi/com/sun/star/drawing/CameraGeometry.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_drawing_CameraGeometry_idl__
 #define __com_sun_star_drawing_CameraGeometry_idl__
 
-#ifndef __com_sun_star_drawing_Direction3D_idl__
 #include <com/sun/star/drawing/Direction3D.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Position3D_idl__
 #include <com/sun/star/drawing/Position3D.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/CaptionShape.idl b/offapi/com/sun/star/drawing/CaptionShape.idl
index d06d8e5ee260..2fb314045204 100644
--- a/offapi/com/sun/star/drawing/CaptionShape.idl
+++ b/offapi/com/sun/star/drawing/CaptionShape.idl
@@ -27,33 +27,16 @@
 #ifndef __com_sun_star_drawing_CaptionShape_idl__
 #define __com_sun_star_drawing_CaptionShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 //=============================================================================
 
@@ -130,12 +113,12 @@ published service CaptionShape
     */
     [property] boolean CaptionIsEscapeRelative;
 
-    /** This property specifies the relativ escape distance for
+    /** This property specifies the relative escape distance for
         the line of a caption.
     */
     [property] long CaptionEscapeRelative;
 
-    /** This property specifies the absolut escape distance for
+    /** This property specifies the absolute escape distance for
         the line of a caption.
     */
     [property] long CaptionEscapeAbsolute;
diff --git a/offapi/com/sun/star/drawing/ClosedBezierShape.idl b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
index 7442c553439f..68e7cad7eea1 100644
--- a/offapi/com/sun/star/drawing/ClosedBezierShape.idl
+++ b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_drawing_ClosedBezierShape_idl__
 #define __com_sun_star_drawing_ClosedBezierShape_idl__
 
-#ifndef __com_sun_star_drawing_LineShape_idl__
 #include <com/sun/star/drawing/LineShape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
 #include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
 
 
 //=============================================================================
@@ -62,7 +48,7 @@
 
 //=============================================================================
 
-/** This service is for a closed bezier shape.
+/** This service is for a closed Bezier shape.
  */
 published service ClosedBezierShape
 {
diff --git a/offapi/com/sun/star/drawing/ColorMode.idl b/offapi/com/sun/star/drawing/ColorMode.idl
index 9eeb0ba08d6c..4ebb4523b664 100644
--- a/offapi/com/sun/star/drawing/ColorMode.idl
+++ b/offapi/com/sun/star/drawing/ColorMode.idl
@@ -51,7 +51,7 @@ published enum ColorMode
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: value com::sun::star::drawing::ColorMode::GREYS
-    /** the graphic is rendered in greyscales on the output device,
+    /** the graphic is rendered in grayscale on the output device,
      */
     GREYS,
 
diff --git a/offapi/com/sun/star/drawing/ConnectorProperties.idl b/offapi/com/sun/star/drawing/ConnectorProperties.idl
index db86fca96f7a..97ddbc4d8ef4 100644
--- a/offapi/com/sun/star/drawing/ConnectorProperties.idl
+++ b/offapi/com/sun/star/drawing/ConnectorProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_ConnectorProperties_idl__
 #define __com_sun_star_drawing_ConnectorProperties_idl__
 
-#ifndef __com_sun_star_drawing_ConnectorType_idl__
 #include <com/sun/star/drawing/ConnectorType.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/ConnectorShape.idl b/offapi/com/sun/star/drawing/ConnectorShape.idl
index d76bea93345f..96de4be3925c 100644
--- a/offapi/com/sun/star/drawing/ConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/ConnectorShape.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_drawing_ConnectorShape_idl__
 #define __com_sun_star_drawing_ConnectorShape_idl__
 
-#ifndef __com_sun_star_drawing_XConnectorShape_idl__
 #include <com/sun/star/drawing/XConnectorShape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
 #include <com/sun/star/drawing/ConnectorProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/ControlShape.idl b/offapi/com/sun/star/drawing/ControlShape.idl
index 43055b54d26d..5e3acc31bdb0 100644
--- a/offapi/com/sun/star/drawing/ControlShape.idl
+++ b/offapi/com/sun/star/drawing/ControlShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_ControlShape_idl__
 #define __com_sun_star_drawing_ControlShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XControlShape_idl__
 #include <com/sun/star/drawing/XControlShape.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl b/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
index e0bed624f8fe..4038b741601a 100644
--- a/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_CoordinateSequenceSequence_idl__
 #define __com_sun_star_drawing_CoordinateSequenceSequence_idl__
 
-#ifndef __com_sun_star_drawing_CoordinateSequence_idl__
 #include <com/sun/star/drawing/CoordinateSequence.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/CustomShape.idl b/offapi/com/sun/star/drawing/CustomShape.idl
index 4ec4dbf7bf92..9a54c61101d7 100644
--- a/offapi/com/sun/star/drawing/CustomShape.idl
+++ b/offapi/com/sun/star/drawing/CustomShape.idl
@@ -27,33 +27,16 @@
 #ifndef __com_sun_star_drawing_CustomShape_idl__
 #define __com_sun_star_drawing_CustomShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/CustomShapeEngine.idl b/offapi/com/sun/star/drawing/CustomShapeEngine.idl
index 6df041ce1948..aa0b5d26c066 100644
--- a/offapi/com/sun/star/drawing/CustomShapeEngine.idl
+++ b/offapi/com/sun/star/drawing/CustomShapeEngine.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_CustomShapeEngine_idl__
 #define __com_sun_star_drawing_CustomShapeEngine_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XCustomShapeEngine_idl__
 #include <com/sun/star/drawing/XCustomShapeEngine.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/DashTable.idl b/offapi/com/sun/star/drawing/DashTable.idl
index 84c42b794f93..5a4bd611272d 100644
--- a/offapi/com/sun/star/drawing/DashTable.idl
+++ b/offapi/com/sun/star/drawing/DashTable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_DashTable_idl__
 #define __com_sun_star_drawing_DashTable_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/Defaults.idl b/offapi/com/sun/star/drawing/Defaults.idl
index 948b8c769649..480475804d13 100644
--- a/offapi/com/sun/star/drawing/Defaults.idl
+++ b/offapi/com/sun/star/drawing/Defaults.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_drawing_Defaults_idl__
 #define __com_sun_star_drawing_Defaults_idl__
 
-#ifndef __com_sun_star_drawing_TextProperties_idl__
 #include <com/sun/star/drawing/TextProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
 #include <com/sun/star/drawing/ConnectorProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_MeasureProperties_idl__
 #include <com/sun/star/drawing/MeasureProperties.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/DocumentSettings.idl b/offapi/com/sun/star/drawing/DocumentSettings.idl
index 29aee7f3b951..a4301c73fc42 100644
--- a/offapi/com/sun/star/drawing/DocumentSettings.idl
+++ b/offapi/com/sun/star/drawing/DocumentSettings.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_drawing_DocumentSettings_idl__
 #define __com_sun_star_drawing_DocumentSettings_idl__
 
-#ifndef __com_sun_star_document_Settings_idl__
 #include <com/sun/star/document/Settings.idl>
-#endif
-
-#ifndef __com_sun_star_document_HeaderFooterSettings_idl__
 #include <com/sun/star/document/HeaderFooterSettings.idl>
-#endif
 
 //=============================================================================
 
@@ -61,7 +56,7 @@ published service DocumentSettings
     //-------------------------------------------------------------------------
 
     /** This is the default logical measure unit that is used for string
-        formatings inside the document, f.e. the measure text
+        formating inside the document, f.e. the measure text
      */
     [optional, property] short MeasureUnit;
 
@@ -96,7 +91,7 @@ published service DocumentSettings
     /** If this is true, the distance between two paragraphs is
         the sum of ParaTopMargin of the previous and ParaBottomMargin of
         the next paragraph. If false, only the greater of the two is
-        choosen.
+        chosen.
      */
     [optional, property] boolean ParagraphSummation;
 
diff --git a/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl b/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
index f825d4805031..752a4a92381b 100644
--- a/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_DoubleSequenceSequence_idl__
 #define __com_sun_star_drawing_DoubleSequenceSequence_idl__
 
-#ifndef __com_sun_star_drawing_DoubleSequence_idl__
 #include <com/sun/star/drawing/DoubleSequence.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/DrawPage.idl b/offapi/com/sun/star/drawing/DrawPage.idl
index 44d534362e84..d9b3d07ccdd6 100644
--- a/offapi/com/sun/star/drawing/DrawPage.idl
+++ b/offapi/com/sun/star/drawing/DrawPage.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_drawing_DrawPage_idl__
 #define __com_sun_star_drawing_DrawPage_idl__
 
-#ifndef __com_sun_star_drawing_GenericDrawPage_idl__
 #include <com/sun/star/drawing/GenericDrawPage.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XMasterPageTarget_idl__
 #include <com/sun/star/drawing/XMasterPageTarget.idl>
-#endif
-
-#ifndef __com_sun_star_form_XFormsSupplier_idl__
 #include <com/sun/star/form/XFormsSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/DrawPages.idl b/offapi/com/sun/star/drawing/DrawPages.idl
index f65fac91c79e..e2097ed19546 100644
--- a/offapi/com/sun/star/drawing/DrawPages.idl
+++ b/offapi/com/sun/star/drawing/DrawPages.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_DrawPages_idl__
 #define __com_sun_star_drawing_DrawPages_idl__
 
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
 #include <com/sun/star/drawing/XDrawPages.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPageSummarizer_idl__
 #include <com/sun/star/drawing/XDrawPageSummarizer.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPageExpander_idl__
 #include <com/sun/star/drawing/XDrawPageExpander.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/DrawViewMode.idl b/offapi/com/sun/star/drawing/DrawViewMode.idl
index 497670828fd3..c75dba70b7f1 100644
--- a/offapi/com/sun/star/drawing/DrawViewMode.idl
+++ b/offapi/com/sun/star/drawing/DrawViewMode.idl
@@ -35,7 +35,7 @@
 //=============================================================================
 
 // DocMerge from xml: enum com::sun::star::drawing::DrawViewMode
-/** This enumeration specifies the viewmode of a view in a presentation
+/** This enumeration specifies the view mode of a view in a presentation
     document.
 
     @deprecated
diff --git a/offapi/com/sun/star/drawing/DrawingDocument.idl b/offapi/com/sun/star/drawing/DrawingDocument.idl
index 5fdca8fa5d00..2f9a39e34a65 100644
--- a/offapi/com/sun/star/drawing/DrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocument.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_DrawingDocument_idl__
 #define __com_sun_star_drawing_DrawingDocument_idl__
 
-#ifndef __com_sun_star_drawing_GenericDrawingDocument_idl__
 #include <com/sun/star/drawing/GenericDrawingDocument.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
index 38abff541b14..2cbf24e11880 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
@@ -27,37 +27,18 @@
 #ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__
 #define __com_sun_star_drawing_DrawingDocumentDrawView_idl__
 
-#ifndef __com_sun_star_drawing_XDrawView_idl__
 #include <com/sun/star/drawing/XDrawView.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_frame_Controller_idl__
 #include <com/sun/star/frame/Controller.idl>
-#endif
 
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module view {
@@ -70,7 +51,7 @@ module com {  module sun {  module star {  module view {
 
 //=============================================================================
 
-/** This componend integrates a view to a <type>DrawPage</type>s or
+/** This component integrates a view to a <type>DrawPage</type>s or
     <type>MasterPage</type> from a <type>DrawingDocument</type>.
  */
 published service DrawingDocumentDrawView
@@ -126,7 +107,7 @@ published service DrawingDocumentDrawView
 
     //-------------------------------------------------------------------------
 
-    /** If the view is in masterpage mode, the view shows the masterpages
+    /** If the view is in master page mode, the view shows the master pages
         of this model.
      */
     [property] boolean IsMasterPageMode;
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
index a07fba53ab8e..41bbd29afdb5 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_DrawingDocumentFactory_idl__
 #define __com::sun::star::drawing_DrawingDocumentFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EllipseShape.idl b/offapi/com/sun/star/drawing/EllipseShape.idl
index cdcbb7cf8676..4f3abe119b5e 100644
--- a/offapi/com/sun/star/drawing/EllipseShape.idl
+++ b/offapi/com/sun/star/drawing/EllipseShape.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_drawing_EllipseShape_idl__
 #define __com_sun_star_drawing_EllipseShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_CircleKind_idl__
 #include <com/sun/star/drawing/CircleKind.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
index f6a755e15827..09947838378e 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__
 
-#ifndef __com_sun_star_beans_PropertyState_idl__
 #include <com/sun/star/beans/PropertyState.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
index c34304f03d18..4e4b60a23717 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
@@ -27,30 +27,14 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeExtrusion_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeExtrusion_idl__
 
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_drawing_Position3D_idl__
 #include <com/sun/star/drawing/Position3D.idl>
-#endif
-#ifndef __com_sun_star_drawing_Direction3D_idl__
 #include <com/sun/star/drawing/Direction3D.idl>
-#endif
-#ifndef __com_sun_star_drawing_ProjectionMode_idl__
 #include <com/sun/star/drawing/ProjectionMode.idl>
-#endif
-#ifndef __com_sun_star_drawing_ShadeMode_idl__
 #include <com/sun/star/drawing/ShadeMode.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
index 16f3a3815c92..b7f2c3366395 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeGeometry_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeGeometry_idl__
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeHandle.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl>
-#endif
 
 //=============================================================================
 
@@ -94,7 +84,7 @@ service EnhancedCustomShapeGeometry
     */
     [optional, property] sequence<::com::sun::star::beans::PropertyValue> Path;
 
-    /** This property sequence is including the textpath description, the properties
+    /** This property sequence is including the text path description, the properties
         are as same as specified in the service com::sun::star:drawing::EnhancedCustomShapeTextPath
     */
     [optional, property] sequence<::com::sun::star::beans::PropertyValue> TextPath;
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl
index bda5c034d903..c384e8f14079 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl
@@ -34,15 +34,15 @@
 
 //=============================================================================
 
-/** defines which gluepoints are being offered by the EnhancedCustomShape
+/** defines which glue points are being offered by the EnhancedCustomShape
  */
 constants EnhancedCustomShapeGluePointType
 {
-    /** no gluepoints are offered
+    /** no glue points are offered
      */
     const short NONE = 0;
 
-    /** gluepoints are offered for each segment
+    /** glue points are offered for each segment
      */
     const short SEGMENTS = 1;
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
index d5e8420fc32f..b6e96863decd 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__
 
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
index b454950bf1fe..b9b865c229fe 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
 
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameter_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeParameter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
index d0bd22cafb5a..6d9279d6c13f 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
@@ -27,25 +27,12 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapePath_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapePath_idl__
 
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
-#ifndef __sun_star_drawing_EnhancedCustomShapeSegment_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.idl>
-#endif
-#ifndef __sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl>
-#endif
-
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
index a1a8ca12b51f..502e48c075aa 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeSegment_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeSegment_idl__
 
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeSegmentCommand_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
index e9bbd2c71962..47dc73b9af90 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
 
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
index 72674e8a3974..0cae956201ee 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeTextPath_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeTextPath_idl__
 
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeTextPathMode_idl__
 #include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/FillProperties.idl b/offapi/com/sun/star/drawing/FillProperties.idl
index ea6de0a07a87..d3048ce69d3a 100644
--- a/offapi/com/sun/star/drawing/FillProperties.idl
+++ b/offapi/com/sun/star/drawing/FillProperties.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_drawing_FillProperties_idl__
 #define __com_sun_star_drawing_FillProperties_idl__
 
-#ifndef __com_sun_star_drawing_FillStyle_idl__
 #include <com/sun/star/drawing/FillStyle.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Gradient_idl__
 #include <com/sun/star/awt/Gradient.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Hatch_idl__
 #include <com/sun/star/drawing/Hatch.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_BitmapMode_idl__
 #include <com/sun/star/drawing/BitmapMode.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RectanglePoint_idl__
 #include <com/sun/star/drawing/RectanglePoint.idl>
-#endif
 
 
 //=============================================================================
@@ -132,7 +112,7 @@ published service FillProperties
     [property] boolean FillBackground;
 
     //-------------------------------------------------------------------------
-    /** If the property <memebr>FillStyle</member> is set to <const>
+    /** If the property <member>FillStyle</member> is set to <const>
         FillStyle::BITMAP</const>, this is the name of the used fill bitmap
         style.
     */
@@ -166,7 +146,7 @@ published service FillProperties
 
     //-------------------------------------------------------------------------
     /** Every second line of tiles is moved the given percent of the
-        witdh of the bitmap.
+        width of the bitmap.
     */
     [property] short FillBitmapOffsetX;
 
@@ -235,7 +215,7 @@ published service FillProperties
         instead to set all supported bitmap modes.</p>
 
         <p>If set to <TRUE/>, the value of the FillBitmapMode property changes
-        to <const>BitmapMode::STRETCH</const>. BUT: behaviour is undefined, if
+        to <const>BitmapMode::STRETCH</const>. BUT: behavior is undefined, if
         the property <member>FillBitmapTile</member> is <TRUE/> too.</p>
 
         <p>If set to <FALSE/>, the value of the FillBitmapMode property
@@ -253,7 +233,7 @@ published service FillProperties
         instead to set all supported bitmap modes.</p>
 
         <p>If set to <TRUE/>, the value of the FillBitmapMode property changes
-        to <const>BitmapMode::REPEAT</const>. BUT: behaviour is undefined, if
+        to <const>BitmapMode::REPEAT</const>. BUT: behavior is undefined, if
         the property <member>FillBitmapStretch</member> is <TRUE/> too.</p>
 
         <p>If set to <FALSE/>, the value of the FillBitmapMode property
diff --git a/offapi/com/sun/star/drawing/FlagSequence.idl b/offapi/com/sun/star/drawing/FlagSequence.idl
index a2fcfe27dfc7..0650291e2e35 100644
--- a/offapi/com/sun/star/drawing/FlagSequence.idl
+++ b/offapi/com/sun/star/drawing/FlagSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_FlagSequence_idl__
 #define __com_sun_star_drawing_FlagSequence_idl__
 
-#ifndef __com_sun_star_drawing_PolygonFlags_idl__
 #include <com/sun/star/drawing/PolygonFlags.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/FlagSequenceSequence.idl b/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
index 5be60e2a1fb1..1e12941c3dc2 100644
--- a/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_FlagSequenceSequence_idl__
 #define __com_sun_star_drawing_FlagSequenceSequence_idl__
 
-#ifndef __com_sun_star_drawing_FlagSequence_idl__
 #include <com/sun/star/drawing/FlagSequence.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/GenericDrawPage.idl b/offapi/com/sun/star/drawing/GenericDrawPage.idl
index ee9920111805..a9151db4f5df 100644
--- a/offapi/com/sun/star/drawing/GenericDrawPage.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawPage.idl
@@ -27,41 +27,23 @@
 #ifndef __com_sun_star_drawing_GenericDrawPage_idl__
 #define __com_sun_star_drawing_GenericDrawPage_idl__
 
-#ifndef __com_sun_star_drawing_XShapes_idl__
 #include <com/sun/star/drawing/XShapes.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShapeGrouper_idl__
 #include <com/sun/star/drawing/XShapeGrouper.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShapeCombiner_idl__
 #include <com/sun/star/drawing/XShapeCombiner.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShapeBinder_idl__
 #include <com/sun/star/drawing/XShapeBinder.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_view_PaperOrientation_idl__
 #include <com/sun/star/view/PaperOrientation.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
@@ -129,7 +111,7 @@ published service GenericDrawPage
     // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::container::XNamed
     /** Gets or sets the name of this page.
 
-                <p>Duplicated pagenames inside a document are not allowed.
+                <p>Duplicated page names inside a document are not allowed.
      */
     [optional] interface com::sun::star::container::XNamed;
 
@@ -214,9 +196,9 @@ published service GenericDrawPage
 
     //-------------------------------------------------------------------------
 
-    /** this property is true if the avveraged background filling colors luminance
+    /** this property is true if the averaged background filling colors luminance
         is belove an application specified threshold value. This can be used to
-        determine the actuall value of an auto color.
+        determine the actual value of an auto color.
     */
     [readonly, optional, property] boolean IsBackgroundDark;
 
diff --git a/offapi/com/sun/star/drawing/GenericDrawingDocument.idl b/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
index 761fc3252b18..7cad9429739f 100644
--- a/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
@@ -27,49 +27,17 @@
 #ifndef __com_sun_star_drawing_GenericDrawingDocument_idl__
 #define __com_sun_star_drawing_GenericDrawingDocument_idl__
 
-#ifndef __com_sun_star_drawing_XDrawPageDuplicator_idl__
 #include <com/sun/star/drawing/XDrawPageDuplicator.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
 #include <com/sun/star/drawing/XDrawPagesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XMasterPagesSupplier_idl__
 #include <com/sun/star/drawing/XMasterPagesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XLayerSupplier_idl__
 #include <com/sun/star/drawing/XLayerSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
 #include <com/sun/star/i18n/XForbiddenCharacters.idl>
-#endif
-
-#ifndef __com_sun_star_document_OfficeDocument_idl__
 #include <com/sun/star/document/OfficeDocument.idl>
-#endif
 
 //=============================================================================
 
@@ -219,7 +187,7 @@ published service GenericDrawingDocument
 
     //-------------------------------------------------------------------------
 
-    /** if this document is an ole client, this is the current visible area
+    /** if this document is an OLE client, this is the current visible area
         in 100th mm
     */
     [property] com::sun::star::awt::Rectangle VisibleArea;
diff --git a/offapi/com/sun/star/drawing/GluePoint.idl b/offapi/com/sun/star/drawing/GluePoint.idl
index 83cfb638d35f..10f613adaa16 100644
--- a/offapi/com/sun/star/drawing/GluePoint.idl
+++ b/offapi/com/sun/star/drawing/GluePoint.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_GluePoint_idl__
 #define __com_sun_star_drawing_GluePoint_idl__
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/GluePoint2.idl b/offapi/com/sun/star/drawing/GluePoint2.idl
index 5169add58450..c8ae986bf94a 100644
--- a/offapi/com/sun/star/drawing/GluePoint2.idl
+++ b/offapi/com/sun/star/drawing/GluePoint2.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_drawing_GluePoint2_idl__
 #define __com_sun_star_drawing_GluePoint2_idl__
 
-#ifndef __com_sun_star_drawing_Alignment_idl__
 #include <com/sun/star/drawing/Alignment.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_EscapeDirection_idl__
 #include <com/sun/star/drawing/EscapeDirection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/GradientTable.idl b/offapi/com/sun/star/drawing/GradientTable.idl
index a8c3b67f4d12..bd9840712da0 100644
--- a/offapi/com/sun/star/drawing/GradientTable.idl
+++ b/offapi/com/sun/star/drawing/GradientTable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_GradientTable_idl__
 #define __com_sun_star_drawing_GradientTable_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/GraphicExportFilter.idl b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
index 97351fceaa55..490e9bf49193 100644
--- a/offapi/com/sun/star/drawing/GraphicExportFilter.idl
+++ b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_drawing_GraphicExportFilter_idl__
 #define __com_sun_star_drawing_GraphicExportFilter_idl__
 
-#ifndef __com_sun_star_document_XFilter_idl__
 #include <com/sun/star/document/XFilter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XExporter_idl__
 #include <com/sun/star/document/XExporter.idl>
-#endif
-
-#ifndef __com_sun_star_document_XMimeTypeInfo_idl__
 #include <com/sun/star/document/XMimeTypeInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/GraphicFilterRequest.idl b/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
index 9bf571609159..cbe407c9986d 100644
--- a/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
+++ b/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_GraphicFilterRequest_idl__
 #define __com_sun_star_drawing_GraphicFilterRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
@@ -39,7 +37,7 @@
 
 /** represents a general error graphic filter exception.
     It can be used to transport the error code information.
-    E.g. that can be usefull for interactions.
+    E.g. that can be useful for interactions.
 
     @since OOo 3.0
  */
diff --git a/offapi/com/sun/star/drawing/GraphicObjectShape.idl b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
index 06a45bbe813e..282e8f091886 100644
--- a/offapi/com/sun/star/drawing/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
@@ -27,37 +27,19 @@
 #ifndef __com_sun_star_drawing_GraphicObjectShape_idl__
 #define __com_sun_star_drawing_GraphicObjectShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
-#endif
-
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ColorMode_idl__
 #include <com/sun/star/drawing/ColorMode.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
 
 //=============================================================================
 
@@ -83,7 +65,7 @@ published service GraphicObjectShape
     [property] string GraphicURL;
 
     //-------------------------------------------------------------------------
-    /** This is an url to the stream ('in document' or linked graphic) for this graphic shape.
+    /** This is an url to the stream ("in document" or linked graphic) for this graphic shape.
     */
     [property] string GraphicStreamURL;
 
@@ -124,7 +106,7 @@ published service GraphicObjectShape
     [property] short AdjustBlue;
 
     //-------------------------------------------------------------------------
-    /** If this property is set, the gama value of this graphic shape is
+    /** If this property is set, the gamma value of this graphic shape is
         adjusted by the given value.
     */
     [property] double Gamma;
diff --git a/offapi/com/sun/star/drawing/GroupShape.idl b/offapi/com/sun/star/drawing/GroupShape.idl
index 4aa717692517..2ba5b322c01f 100644
--- a/offapi/com/sun/star/drawing/GroupShape.idl
+++ b/offapi/com/sun/star/drawing/GroupShape.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_drawing_GroupShape_idl__
 #define __com_sun_star_drawing_GroupShape_idl__
 
-#ifndef __com_sun_star_drawing_XShapeGroup_idl__
 #include <com/sun/star/drawing/XShapeGroup.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShapes_idl__
 #include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/Hatch.idl b/offapi/com/sun/star/drawing/Hatch.idl
index bfbbc94d8473..69f7266641b3 100644
--- a/offapi/com/sun/star/drawing/Hatch.idl
+++ b/offapi/com/sun/star/drawing/Hatch.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_Hatch_idl__
 #define __com_sun_star_drawing_Hatch_idl__
 
-#ifndef __com_sun_star_drawing_HatchStyle_idl__
 #include <com/sun/star/drawing/HatchStyle.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
@@ -43,7 +39,7 @@
 //=============================================================================
 
 // DocMerge from xml: struct com::sun::star::drawing::Hatch
-/** This struct defines the appearence of a hatch.
+/** This struct defines the appearance of a hatch.
 
     <p>A hatch is a texture made of straight lines.</p>
  */
diff --git a/offapi/com/sun/star/drawing/HatchTable.idl b/offapi/com/sun/star/drawing/HatchTable.idl
index c96a474fb596..b65859b6041b 100644
--- a/offapi/com/sun/star/drawing/HatchTable.idl
+++ b/offapi/com/sun/star/drawing/HatchTable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_HatchTable_idl__
 #define __com_sun_star_drawing_HatchTable_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix.idl b/offapi/com/sun/star/drawing/HomogenMatrix.idl
index fabfddc7875d..51f64cfb300d 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_HomogenMatrix_idl__
 #define __com_sun_star_drawing_HomogenMatrix_idl__
 
-#ifndef __com_sun_star_drawing_HomogenMatrixLine_idl__
 #include <com/sun/star/drawing/HomogenMatrixLine.idl>
-#endif
 
 
 //=============================================================================
@@ -39,7 +37,7 @@
 //=============================================================================
 
 // DocMerge from xml: struct com::sun::star::drawing::HomogenMatrix
-/** specifies a homogenous matrix by three homogenous lines
+/** specifies a homogeneous matrix by three homogeneous lines
  */
 published struct HomogenMatrix
 {
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix3.idl b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
index a2dfb7f6f00b..510d55cb3152 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix3.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
 #define __com_sun_star_drawing_HomogenMatrix3_idl__
 
-#ifndef __com_sun_star_drawing_HomogenMatrixLine3_idl__
 #include <com/sun/star/drawing/HomogenMatrixLine3.idl>
-#endif
 
 
 //=============================================================================
@@ -39,7 +37,7 @@
 //=============================================================================
 
 // DocMerge from xml: struct com::sun::star::drawing::HomogenMatrix
-/** specifies a homogenous matrix by three homogenous lines
+/** specifies a homogeneous matrix by three homogeneous lines
  */
 published struct HomogenMatrix3
 {
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix4.idl b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
index 345a6bf3ee1a..d7e2b0c77a65 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix4.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_HomogenMatrix4_idl__
 #define __com_sun_star_drawing_HomogenMatrix4_idl__
 
-#ifndef __com_sun_star_drawing_HomogenMatrixLine4_idl__
 #include <com/sun/star/drawing/HomogenMatrixLine4.idl>
-#endif
 
 
 //=============================================================================
@@ -39,7 +37,7 @@
 //=============================================================================
 
 // DocMerge from xml: struct com::sun::star::drawing::HomogenMatrix
-/** specifies a homogenous matrix by four homogenous lines.
+/** specifies a homogeneous matrix by four homogeneous lines.
  */
 published struct HomogenMatrix4
 {
diff --git a/offapi/com/sun/star/drawing/Layer.idl b/offapi/com/sun/star/drawing/Layer.idl
index a8a4476966eb..8e2533f3c748 100644
--- a/offapi/com/sun/star/drawing/Layer.idl
+++ b/offapi/com/sun/star/drawing/Layer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_Layer_idl__
 #define __com_sun_star_drawing_Layer_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/LayerManager.idl b/offapi/com/sun/star/drawing/LayerManager.idl
index ebcad6a021a8..7c5dd0530055 100644
--- a/offapi/com/sun/star/drawing/LayerManager.idl
+++ b/offapi/com/sun/star/drawing/LayerManager.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_LayerManager_idl__
 #define __com_sun_star_drawing_LayerManager_idl__
 
-#ifndef __com_sun_star_drawing_XLayerManager_idl__
 #include <com/sun/star/drawing/XLayerManager.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/LineDash.idl b/offapi/com/sun/star/drawing/LineDash.idl
index 3ffe6a0576cb..91727c775f1e 100644
--- a/offapi/com/sun/star/drawing/LineDash.idl
+++ b/offapi/com/sun/star/drawing/LineDash.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_LineDash_idl__
 #define __com_sun_star_drawing_LineDash_idl__
 
-#ifndef __com_sun_star_drawing_DashStyle_idl__
 #include <com/sun/star/drawing/DashStyle.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/LineProperties.idl b/offapi/com/sun/star/drawing/LineProperties.idl
index 87455cf45c3e..d0628a7fbe75 100644
--- a/offapi/com/sun/star/drawing/LineProperties.idl
+++ b/offapi/com/sun/star/drawing/LineProperties.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_drawing_LineProperties_idl__
 #define __com_sun_star_drawing_LineProperties_idl__
 
-#ifndef __com_sun_star_drawing_LineStyle_idl__
 #include <com/sun/star/drawing/LineStyle.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineDash_idl__
 #include <com/sun/star/drawing/LineDash.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineJoint_idl__
 #include <com/sun/star/drawing/LineJoint.idl>
-#endif
 
 
 //=============================================================================
@@ -102,27 +88,27 @@ published service LineProperties
 
     //-------------------------------------------------------------------------
 
-    /** This property contains the name of the line start poly polygon bezier.
+    /** This property contains the name of the line start poly polygon Bezier.
         <p>If this string is empty, no line start polygon is rendered.
      */
     [optional, property] string LineStartName;
 
     //-------------------------------------------------------------------------
 
-    /** This property contains the name of the line end poly polygon bezier.
+    /** This property contains the name of the line end poly polygon Bezier.
         <p>If this string is empty, no line end polygon is rendered.
      */
     [optional, property] string LineEndName;
 
     //-------------------------------------------------------------------------
 
-    /** This property contains the line start in the form of a poly polygon bezier.
+    /** This property contains the line start in the form of a poly polygon Bezier.
      */
     [optional, property] com::sun::star::drawing::PolyPolygonBezierCoords LineStart;
 
     //-------------------------------------------------------------------------
 
-    /** This property contains the line end in the form of a poly polygon bezier.
+    /** This property contains the line end in the form of a poly polygon Bezier.
      */
     [optional, property] com::sun::star::drawing::PolyPolygonBezierCoords LineEnd;
 
diff --git a/offapi/com/sun/star/drawing/LineShape.idl b/offapi/com/sun/star/drawing/LineShape.idl
index 8a98f94a6056..c2988b556d48 100644
--- a/offapi/com/sun/star/drawing/LineShape.idl
+++ b/offapi/com/sun/star/drawing/LineShape.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_drawing_LineShape_idl__
 #define __com_sun_star_drawing_LineShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
 #include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/MarkerTable.idl b/offapi/com/sun/star/drawing/MarkerTable.idl
index 0303c5573616..1b59d17be9b8 100644
--- a/offapi/com/sun/star/drawing/MarkerTable.idl
+++ b/offapi/com/sun/star/drawing/MarkerTable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_MarkerTable_idl__
 #define __com_sun_star_drawing_MarkerTable_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/MasterPage.idl b/offapi/com/sun/star/drawing/MasterPage.idl
index a56fc6d219c4..fc3a70a46621 100644
--- a/offapi/com/sun/star/drawing/MasterPage.idl
+++ b/offapi/com/sun/star/drawing/MasterPage.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_MasterPage_idl__
 #define __com_sun_star_drawing_MasterPage_idl__
 
-#ifndef __com_sun_star_drawing_GenericDrawPage_idl__
 #include <com/sun/star/drawing/GenericDrawPage.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/MasterPages.idl b/offapi/com/sun/star/drawing/MasterPages.idl
index 6c7ab4c8b9ce..b2c73e8e3eb2 100644
--- a/offapi/com/sun/star/drawing/MasterPages.idl
+++ b/offapi/com/sun/star/drawing/MasterPages.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_MasterPages_idl__
 #define __com_sun_star_drawing_MasterPages_idl__
 
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
 #include <com/sun/star/drawing/XDrawPages.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/MeasureProperties.idl b/offapi/com/sun/star/drawing/MeasureProperties.idl
index ab02f5605e91..055423545195 100644
--- a/offapi/com/sun/star/drawing/MeasureProperties.idl
+++ b/offapi/com/sun/star/drawing/MeasureProperties.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_MeasureProperties_idl__
 #define __com_sun_star_drawing_MeasureProperties_idl__
 
-#ifndef __com_sun_star_drawing_MeasureKind_idl__
 #include <com/sun/star/drawing/MeasureKind.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_MeasureTextHorzPos_idl__
 #include <com/sun/star/drawing/MeasureTextHorzPos.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_MeasureTextVertPos_idl__
 #include <com/sun/star/drawing/MeasureTextVertPos.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/MeasureShape.idl b/offapi/com/sun/star/drawing/MeasureShape.idl
index 7422b2d51d79..7e21158a2885 100644
--- a/offapi/com/sun/star/drawing/MeasureShape.idl
+++ b/offapi/com/sun/star/drawing/MeasureShape.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_drawing_MeasureShape_idl__
 #define __com_sun_star_drawing_MeasureShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_MeasureProperties_idl__
 #include <com/sun/star/drawing/MeasureProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/OLE2Shape.idl b/offapi/com/sun/star/drawing/OLE2Shape.idl
index 52eb671bdceb..2ff047194b7d 100644
--- a/offapi/com/sun/star/drawing/OLE2Shape.idl
+++ b/offapi/com/sun/star/drawing/OLE2Shape.idl
@@ -27,24 +27,16 @@
 #ifndef __com_sun_star_drawing_OLE2Shape_idl__
 #define __com_sun_star_drawing_OLE2Shape_idl__
 
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
 #include <com/sun/star/drawing/XShapeDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module drawing {
 
 //=============================================================================
-/** This service is for an ole shape.
+/** This service is for an OLE shape.
 */
 published service OLE2Shape
 {
@@ -67,7 +59,7 @@ published service OLE2Shape
     //-------------------------------------------------------------------------
 
     /** This is the model for the OLE2 inside this shape.
-        <p>This property returns an empty reference if the ole2 is not an
+        <p>This property returns an empty reference if the OLE2 is not an
         Office component.
 
     */
diff --git a/offapi/com/sun/star/drawing/OpenBezierShape.idl b/offapi/com/sun/star/drawing/OpenBezierShape.idl
index d515efe70a43..4008c634539b 100644
--- a/offapi/com/sun/star/drawing/OpenBezierShape.idl
+++ b/offapi/com/sun/star/drawing/OpenBezierShape.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_drawing_OpenBezierShape_idl__
 #define __com_sun_star_drawing_OpenBezierShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
 #include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
 
 
 //=============================================================================
@@ -58,7 +46,7 @@
 
 //=============================================================================
 
-/** This service is for an open bezier shape.
+/** This service is for an open Bezier shape.
  */
 published service OpenBezierShape
 {
diff --git a/offapi/com/sun/star/drawing/PageShape.idl b/offapi/com/sun/star/drawing/PageShape.idl
index d3bf315b8ed8..c36be42c32b1 100644
--- a/offapi/com/sun/star/drawing/PageShape.idl
+++ b/offapi/com/sun/star/drawing/PageShape.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_PageShape_idl__
 #define __com_sun_star_drawing_PageShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
 
 //=============================================================================
@@ -42,7 +40,7 @@
 /** This service is for a page shape.
     A page shape displays a preview of another page. These shapes
     are used inside notes pages to preview the corresponding
-    drawing page. Theyre also used in the handout page to preview
+    drawing page. They're also used in the handout page to preview
     the printing position and order of pages
  */
 published service PageShape
diff --git a/offapi/com/sun/star/drawing/PluginShape.idl b/offapi/com/sun/star/drawing/PluginShape.idl
index aaa8b3493c7d..3e595cee8f06 100644
--- a/offapi/com/sun/star/drawing/PluginShape.idl
+++ b/offapi/com/sun/star/drawing/PluginShape.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_drawing_PluginShape_idl__
 #define __com_sun_star_drawing_PluginShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
@@ -68,7 +63,7 @@ published service PluginShape
 
     //-------------------------------------------------------------------------
 
-    /** This sequence contains paramaters that are passed to the application
+    /** This sequence contains parameters that are passed to the application
         that renders the plugin when it is initialized.
     */
     [property] sequence< com::sun::star::beans::PropertyValue > PluginCommands;
diff --git a/offapi/com/sun/star/drawing/PointSequence.idl b/offapi/com/sun/star/drawing/PointSequence.idl
index 6d74d8ee3306..d415d1f3289e 100644
--- a/offapi/com/sun/star/drawing/PointSequence.idl
+++ b/offapi/com/sun/star/drawing/PointSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_PointSequence_idl__
 #define __com_sun_star_drawing_PointSequence_idl__
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/PointSequenceSequence.idl b/offapi/com/sun/star/drawing/PointSequenceSequence.idl
index 518751635173..511397e167a0 100644
--- a/offapi/com/sun/star/drawing/PointSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/PointSequenceSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
 #define __com_sun_star_drawing_PointSequenceSequence_idl__
 
-#ifndef __com_sun_star_drawing_PointSequence_idl__
 #include <com/sun/star/drawing/PointSequence.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/PolyLineShape.idl b/offapi/com/sun/star/drawing/PolyLineShape.idl
index c8ddb5a1e051..797cac70e440 100644
--- a/offapi/com/sun/star/drawing/PolyLineShape.idl
+++ b/offapi/com/sun/star/drawing/PolyLineShape.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_drawing_PolyLineShape_idl__
 #define __com_sun_star_drawing_PolyLineShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
 #include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
index bd671c1bbe5a..659d1825d242 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
 #define __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
 
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
 #include <com/sun/star/drawing/PointSequenceSequence.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_FlagSequenceSequence_idl__
 #include <com/sun/star/drawing/FlagSequenceSequence.idl>
-#endif
 
 
 //=============================================================================
@@ -43,7 +39,7 @@
 //=============================================================================
 
 // DocMerge from xml: struct com::sun::star::drawing::PolyPolygonBezierCoords
-/** specifies the coordinates for a poly polygon bezier.
+/** specifies the coordinates for a poly polygon Bezier.
  */
 published struct PolyPolygonBezierCoords
 {
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
index d498c4d2d4f8..bad769cb8ccf 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
 #define __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
 
-#ifndef __com_sun_star_drawing_PolygonKind_idl__
 #include <com/sun/star/drawing/PolygonKind.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
 
 
 //=============================================================================
@@ -43,7 +39,7 @@
 //=============================================================================
 
 /** This service describes a polypolygonbezier.
-    <p>A polypolygonbezier consists of multiple bezier polygons combined
+    <p>A polypolygonbezier consists of multiple Bezier polygons combined
     in one.</p>
  */
 published service PolyPolygonBezierDescriptor
@@ -56,13 +52,13 @@ published service PolyPolygonBezierDescriptor
 
     //-------------------------------------------------------------------------
 
-    /** These are the bezier points of this polygon.
+    /** These are the Bezier points of this polygon.
      */
     [property] com::sun::star::drawing::PolyPolygonBezierCoords PolyPolygonBezier;
 
     //-------------------------------------------------------------------------
 
-    /** These are the untransformed bezier coordinates of this polygon.
+    /** These are the untransformed Bezier coordinates of this polygon.
      */
     [property] com::sun::star::drawing::PolyPolygonBezierCoords Geometry;
 };
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
index 3ceabb8f129d..3a4d15562159 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_drawing_PolyPolygonBezierShape_idl__
 #define __com_sun_star_drawing_PolyPolygonBezierShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
 #include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
 
 
 //=============================================================================
@@ -63,7 +48,7 @@
 //=============================================================================
 
 // DocMerge from xml: service com::sun::star::drawing::PolyPolygonBezierShape
-/** This service specifies a polypolygon bezier shape.
+/** This service specifies a poly-polygon Bezier shape.
  */
 published service PolyPolygonBezierShape
 {
diff --git a/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl b/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
index 3626fb0ae7fd..5f907c424204 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
 #define __com_sun_star_drawing_PolyPolygonDescriptor_idl__
 
-#ifndef __com_sun_star_drawing_PolygonKind_idl__
 #include <com/sun/star/drawing/PolygonKind.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
 #include <com/sun/star/drawing/PointSequenceSequence.idl>
-#endif
 
 
 //=============================================================================
@@ -42,8 +38,8 @@
 
 //=============================================================================
 
-/** This service describes a polypolygon.
-    <p>A polypolygon consists of multiple polygons combined in one.</p>
+/** This service describes a poly-polygon.
+    <p>A poly-polygon consists of multiple polygons combined in one.</p>
  */
 published service PolyPolygonDescriptor
 {
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape.idl b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
index a72b00d8f1a8..18921c6f2ce6 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_drawing_PolyPolygonShape_idl__
 #define __com_sun_star_drawing_PolyPolygonShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
 #include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
 
 
 //=============================================================================
@@ -63,7 +48,7 @@
 //=============================================================================
 
 /** This service is for a polygon shape.
-    <p>A polypolygon has 2 or more straight lines, with the first and
+    <p>A poly-polygon has 2 or more straight lines, with the first and
     last point connected by a straight line.</p>
  */
 published service PolyPolygonShape
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
index 721839255774..e49df0ef183f 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_PolyPolygonShape3D_idl__
 #define __com_sun_star_drawing_PolyPolygonShape3D_idl__
 
-#ifndef __com_sun_star_drawing_DoubleSequenceSequence_idl__
 #include <com/sun/star/drawing/DoubleSequenceSequence.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/PolygonFlags.idl b/offapi/com/sun/star/drawing/PolygonFlags.idl
index 2bb6d565398f..97b2ba9e2cf3 100644
--- a/offapi/com/sun/star/drawing/PolygonFlags.idl
+++ b/offapi/com/sun/star/drawing/PolygonFlags.idl
@@ -35,7 +35,7 @@
 //=============================================================================
 
 // DocMerge from xml: enum com::sun::star::drawing::PolygonFlags
-/** defines how a bezier curve goes through a point.
+/** defines how a Bezier curve goes through a point.
  */
 published enum PolygonFlags
 {
diff --git a/offapi/com/sun/star/drawing/RectangleShape.idl b/offapi/com/sun/star/drawing/RectangleShape.idl
index 173df05c8c47..2a75d405520b 100644
--- a/offapi/com/sun/star/drawing/RectangleShape.idl
+++ b/offapi/com/sun/star/drawing/RectangleShape.idl
@@ -27,29 +27,16 @@
 #ifndef __com_sun_star_drawing_RectangleShape_idl__
 #define __com_sun_star_drawing_RectangleShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/RotationDescriptor.idl b/offapi/com/sun/star/drawing/RotationDescriptor.idl
index dd7c1d9c38b7..0dd39dbe8cd6 100644
--- a/offapi/com/sun/star/drawing/RotationDescriptor.idl
+++ b/offapi/com/sun/star/drawing/RotationDescriptor.idl
@@ -37,7 +37,7 @@
 /** This abstract service specifies the general characteristics of an optional
     rotation and shearing for a <type>Shape</type>.
 
-    This service is depricated, instead please use the <code>Transformation</code>
+    This service is deprecated, instead please use the <code>Transformation</code>
     property of the service <type>Shape</type>.
 
     @deprecated
diff --git a/offapi/com/sun/star/drawing/ShadeMode.idl b/offapi/com/sun/star/drawing/ShadeMode.idl
index e91154b6108c..e897b91fc1c1 100644
--- a/offapi/com/sun/star/drawing/ShadeMode.idl
+++ b/offapi/com/sun/star/drawing/ShadeMode.idl
@@ -57,7 +57,7 @@ published enum ShadeMode
 
     //-------------------------------------------------------------------------
 
-    /** With <const>SMOOTH</const> shading, the colors of the lit vertiecs is
+    /** With <const>SMOOTH</const> shading, the colors of the lit vertices is
         interpolated.
      */
     SMOOTH,
diff --git a/offapi/com/sun/star/drawing/ShadowProperties.idl b/offapi/com/sun/star/drawing/ShadowProperties.idl
index 9ecb450b0a2e..0cb105339c99 100644
--- a/offapi/com/sun/star/drawing/ShadowProperties.idl
+++ b/offapi/com/sun/star/drawing/ShadowProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #define __com_sun_star_drawing_ShadowProperties_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/Shape.idl b/offapi/com/sun/star/drawing/Shape.idl
index 3bf1c6fa15cc..867c47f1c5f4 100644
--- a/offapi/com/sun/star/drawing/Shape.idl
+++ b/offapi/com/sun/star/drawing/Shape.idl
@@ -27,37 +27,14 @@
 #ifndef __com_sun_star_drawing_Shape_idl__
 #define __com_sun_star_drawing_Shape_idl__
 
-#ifndef __com_sun_star_document_LinkTarget_idl__
 #include <com/sun/star/document/LinkTarget.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyle_idl__
 #include <com/sun/star/style/XStyle.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
 #include <com/sun/star/drawing/HomogenMatrix3.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XGluePointsSupplier_idl__
 #include <com/sun/star/drawing/XGluePointsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
 #include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -179,7 +156,7 @@ published service Shape
     /** this property lets you get and set the transformation matrix
         for this shape.
 
-        The transformation is a 3x3 homogen matrix and can contain
+        The transformation is a 3x3 homogeneous matrix and can contain
         translation, rotation, shearing and scaling.
      */
     [optional, property] com::sun::star::drawing::HomogenMatrix3 Transformation;
@@ -200,6 +177,10 @@ published service Shape
         the z-order.
     */
     [optional, property] long NavigationOrder;
+
+    /** this property lets you get and set a hyperlink for this shape.
+     */
+    [optional, property] string Hyperlink;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/ShapeCollection.idl b/offapi/com/sun/star/drawing/ShapeCollection.idl
index df633e334cb2..0195d5896715 100644
--- a/offapi/com/sun/star/drawing/ShapeCollection.idl
+++ b/offapi/com/sun/star/drawing/ShapeCollection.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_drawing_ShapeCollection_idl__
 #define __com_sun_star_drawing_ShapeCollection_idl__
 
-#ifndef __com_sun_star_drawing_Shapes_idl__
 #include <com/sun/star/drawing/Shapes.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/Shapes.idl b/offapi/com/sun/star/drawing/Shapes.idl
index e6c1663df2e0..db5daec0a0f6 100644
--- a/offapi/com/sun/star/drawing/Shapes.idl
+++ b/offapi/com/sun/star/drawing/Shapes.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_Shapes_idl__
 #define __com_sun_star_drawing_Shapes_idl__
 
-#ifndef __com_sun_star_drawing_XShapes_idl__
 #include <com/sun/star/drawing/XShapes.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/SlideRenderer.idl b/offapi/com/sun/star/drawing/SlideRenderer.idl
index 7607829ed338..fe4af524934d 100644
--- a/offapi/com/sun/star/drawing/SlideRenderer.idl
+++ b/offapi/com/sun/star/drawing/SlideRenderer.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_SlideRenderer_idl__
 #define __com_sun_star_drawing_SlideRenderer_idl__
 
-#ifndef __com_sun_star_drawing_XSlideRenderer_idl__
 #include <com/sun/star/drawing/XSlideRenderer.idl>
-#endif
 
 module com { module sun { module star { module drawing {
 
diff --git a/offapi/com/sun/star/drawing/SlideSorter.idl b/offapi/com/sun/star/drawing/SlideSorter.idl
index b5af6a596a04..b497917592dd 100644
--- a/offapi/com/sun/star/drawing/SlideSorter.idl
+++ b/offapi/com/sun/star/drawing/SlideSorter.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_drawing_SlideSorter_idl__
 #define __com_sun_star_drawing_SlideSorter_idl__
 
-#ifndef __com_sun_star_drawing_framework_XView_idl__
 #include <com/sun/star/drawing/framework/XView.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawView_idl__
 #include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 module com {  module sun {  module star {  module drawing {
 
diff --git a/offapi/com/sun/star/drawing/Text.idl b/offapi/com/sun/star/drawing/Text.idl
index cb9b0c182afd..cbafa06a4862 100644
--- a/offapi/com/sun/star/drawing/Text.idl
+++ b/offapi/com/sun/star/drawing/Text.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_Text_idl__
 #define __com_sun_star_drawing_Text_idl__
 
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextProperties_idl__
 #include <com/sun/star/drawing/TextProperties.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/TextAnimationKind.idl b/offapi/com/sun/star/drawing/TextAnimationKind.idl
index fa2a12f2e596..62fa2ecdb3a2 100644
--- a/offapi/com/sun/star/drawing/TextAnimationKind.idl
+++ b/offapi/com/sun/star/drawing/TextAnimationKind.idl
@@ -49,7 +49,7 @@ published enum TextAnimationKind
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: value com::sun::star::drawing::TextAnimationKind::BLINK
-    /** Let this text switch its state from visibile to nonvisible continuously.
+    /** Let this text switch its state from visible to invisible continuously.
      */
     BLINK,
 
diff --git a/offapi/com/sun/star/drawing/TextFitToSizeType.idl b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
index 39b92eeb9bbb..8ee5b90582c3 100644
--- a/offapi/com/sun/star/drawing/TextFitToSizeType.idl
+++ b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
@@ -60,9 +60,10 @@ published enum TextFitToSizeType
 
     //-------------------------------------------------------------------------
 
-    /** if the shape is scaled, the font attributes are scaled and hard set
-        on the text */
-    RESIZEATTR
+    /** if the shape is scaled, the font is scaled isotropically to
+        fit the available space. Auto line-breaks will keep working
+   */
+    AUTOFIT
 
 };
 
diff --git a/offapi/com/sun/star/drawing/TextProperties.idl b/offapi/com/sun/star/drawing/TextProperties.idl
index aaf7dc5e4be7..38b9b017bab3 100644
--- a/offapi/com/sun/star/drawing/TextProperties.idl
+++ b/offapi/com/sun/star/drawing/TextProperties.idl
@@ -27,61 +27,27 @@
 #ifndef __com_sun_star_drawing_TextProperties_idl__
 #define __com_sun_star_drawing_TextProperties_idl__
 
-#ifndef __com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
 
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
 
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
 #include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextFitToSizeType_idl__
 #include <com/sun/star/drawing/TextFitToSizeType.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextAdjust_idl__
 #include <com/sun/star/drawing/TextAdjust.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextAnimationDirection_idl__
 #include <com/sun/star/drawing/TextAnimationDirection.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextAnimationKind_idl__
 #include <com/sun/star/drawing/TextAnimationKind.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextVerticalAdjust_idl__
 #include <com/sun/star/drawing/TextVerticalAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextHorizontalAdjust_idl__
 #include <com/sun/star/drawing/TextHorizontalAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_text_WritingMode_idl__
 #include <com/sun/star/text/WritingMode.idl>
-#endif
 
 //=============================================================================
 
@@ -102,7 +68,7 @@ published service TextProperties
 
     //-------------------------------------------------------------------------
 
-    /** The properties in this service set default formats for asian text
+    /** The properties in this service set default formats for Asian text
         inside the <type>Shape</type>.
      */
     [optional] service com::sun::star::style::CharacterPropertiesAsian;
@@ -123,7 +89,7 @@ published service TextProperties
 
     //-------------------------------------------------------------------------
 
-    /** The properties in this service set default formats for asian text
+    /** The properties in this service set default formats for Asian text
         inside the <type>Shape</type>.
      */
     [optional] service com::sun::star::style::ParagraphPropertiesAsian;
@@ -244,7 +210,7 @@ published service TextProperties
     //-------------------------------------------------------------------------
 
     /** with this property you can set the maximum height for a shape with text.
-        On edit, the auto grow feature will not grow the object heigher than
+        On edit, the auto grow feature will not grow the object higher than
         the value of this property.
     */
     [property] long TextMaximumFrameHeight;
diff --git a/offapi/com/sun/star/drawing/TextShape.idl b/offapi/com/sun/star/drawing/TextShape.idl
index e1b8d23fbd1d..ef84a73266b3 100644
--- a/offapi/com/sun/star/drawing/TextShape.idl
+++ b/offapi/com/sun/star/drawing/TextShape.idl
@@ -27,29 +27,15 @@
 #ifndef __com_sun_star_drawing_TextShape_idl__
 #define __com_sun_star_drawing_TextShape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Text_idl__
 #include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
 #include <com/sun/star/drawing/LineProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
 #include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
 #include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/TransparencyGradientTable.idl b/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
index 1e91a5b40cd7..7049f87fe1cf 100644
--- a/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
+++ b/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_TransparencyGradientTable_idl__
 #define __com_sun_star_drawing_TransparencyGradientTable_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
@@ -47,7 +45,7 @@
 */
 published service TransparencyGradientTable
 {
-    /** this container lets you access the <typeu scope="com::sun::star::awt">Gradient</type>s that
+    /** this container lets you access the <type scope="com::sun::star::awt">Gradient</type>s that
         are indexed with a name.
 
         <p>Note: You can add new entries for later use, but you cannot
diff --git a/offapi/com/sun/star/drawing/XConnectableShape.idl b/offapi/com/sun/star/drawing/XConnectableShape.idl
index 12132d75c7fa..c9f790713e0b 100644
--- a/offapi/com/sun/star/drawing/XConnectableShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectableShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XConnectableShape_idl__
 #define __com_sun_star_drawing_XConnectableShape_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XConnectorShape.idl b/offapi/com/sun/star/drawing/XConnectorShape.idl
index 2cc777ebc2f4..63fb3c6dbc47 100644
--- a/offapi/com/sun/star/drawing/XConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectorShape.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XConnectorShape_idl__
 #define __com_sun_star_drawing_XConnectorShape_idl__
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XConnectableShape_idl__
 #include <com/sun/star/drawing/XConnectableShape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_ConnectionType_idl__
 #include <com/sun/star/drawing/ConnectionType.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XControlShape.idl b/offapi/com/sun/star/drawing/XControlShape.idl
index 2607f082b3d7..21c1c9933635 100644
--- a/offapi/com/sun/star/drawing/XControlShape.idl
+++ b/offapi/com/sun/star/drawing/XControlShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XControlShape_idl__
 #define __com_sun_star_drawing_XControlShape_idl__
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XControlModel_idl__
 #include <com/sun/star/awt/XControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XCustomShapeEngine.idl b/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
index 4bc2aa287066..691b56c5b130 100644
--- a/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
+++ b/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_drawing_XCustomShapeEngine_idl__
 #define __com_sun_star_drawing_XCustomShapeEngine_idl__
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_XCustomShapeHandle_idl__
 #include <com/sun/star/drawing/XCustomShapeHandle.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/XCustomShapeHandle.idl b/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
index 45861c445cbd..fd47ae6b4e10 100644
--- a/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
+++ b/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_drawing_XCustomShapeHandle_idl__
 #define __com_sun_star_drawing_XCustomShapeHandle_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 //=============================================================================
 
@@ -54,7 +49,7 @@ interface XCustomShapeHandle: com::sun::star::uno::XInterface
      */
     com::sun::star::awt::Point getPosition();
 
-    /** is setting a new positon for the handle
+    /** is setting a new position for the handle
      */
     void setControllerPosition( [in] com::sun::star::awt::Point aPoint );
 
diff --git a/offapi/com/sun/star/drawing/XDrawPage.idl b/offapi/com/sun/star/drawing/XDrawPage.idl
index 93ec75f7ea5f..f8cba41cdece 100644
--- a/offapi/com/sun/star/drawing/XDrawPage.idl
+++ b/offapi/com/sun/star/drawing/XDrawPage.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XDrawPage_idl__
 #define __com_sun_star_drawing_XDrawPage_idl__
 
-#ifndef __com_sun_star_drawing_XShapes_idl__
 #include <com/sun/star/drawing/XShapes.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl b/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
index 515d83ac9bc2..e7a19e2b199e 100644
--- a/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XDrawPageDuplicator_idl__
 #define __com_sun_star_drawing_XDrawPageDuplicator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPageExpander.idl b/offapi/com/sun/star/drawing/XDrawPageExpander.idl
index 306379ea9a3b..0fe1a7a7ead2 100644
--- a/offapi/com/sun/star/drawing/XDrawPageExpander.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageExpander.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XDrawPageExpander_idl__
 #define __com_sun_star_drawing_XDrawPageExpander_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
 #include <com/sun/star/drawing/XDrawPages.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
index 780a484d0783..c670da819484 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XDrawPageSummarizer_idl__
 #define __com_sun_star_drawing_XDrawPageSummarizer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
 #include <com/sun/star/drawing/XDrawPages.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
index 6804c0411271..96cf7d42fd5a 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XDrawPageSupplier_idl__
 #define __com_sun_star_drawing_XDrawPageSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawPages.idl b/offapi/com/sun/star/drawing/XDrawPages.idl
index f913259ed29b..16160477b34f 100644
--- a/offapi/com/sun/star/drawing/XDrawPages.idl
+++ b/offapi/com/sun/star/drawing/XDrawPages.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XDrawPages_idl__
 #define __com_sun_star_drawing_XDrawPages_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
 
 
 //=============================================================================
@@ -47,7 +43,7 @@
     <p>The pages are stored in an index container. The order is determined by
     the index.
 
-    You usualy get this interface if you use the
+    You usually get this interface if you use the
     <type>XDrawPagesSupplier</type> or the <type>XMasterPagesSupplier</type>
     at a model that contains <type>DrawPage</type>s or <type>MasterPage</type>s
 */
diff --git a/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl b/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
index fcc749269ef7..bd5bc521b07f 100644
--- a/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
 #define __com_sun_star_drawing_XDrawPagesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
 #include <com/sun/star/drawing/XDrawPages.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XDrawSubController.idl b/offapi/com/sun/star/drawing/XDrawSubController.idl
index 6c1f86dce440..90940d65ac96 100644
--- a/offapi/com/sun/star/drawing/XDrawSubController.idl
+++ b/offapi/com/sun/star/drawing/XDrawSubController.idl
@@ -28,19 +28,11 @@
 #ifndef __com_sun_star_drawing_XDrawSubController_idl__
 #define __com_sun_star_drawing_XDrawSubController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
 #include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawView_idl__
 #include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/drawing/XDrawView.idl b/offapi/com/sun/star/drawing/XDrawView.idl
index de6fd0bbc7c3..3f6eebae66dd 100644
--- a/offapi/com/sun/star/drawing/XDrawView.idl
+++ b/offapi/com/sun/star/drawing/XDrawView.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XDrawView_idl__
 #define __com_sun_star_drawing_XDrawView_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl b/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
index f69951d20f21..ae84f75ae3df 100644
--- a/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
+++ b/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XEnhancedCustomShapeDefaulter_idl__
 #define __com_sun_star_drawing_XEnhancedCustomShapeDefaulter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/XGluePointsSupplier.idl b/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
index 6fd8b7a8db24..56d1cef089dd 100644
--- a/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
+++ b/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XGluePointsSupplier_idl__
 #define __com_sun_star_drawing_XGluePointsSupplier_idl__
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/XLayer.idl b/offapi/com/sun/star/drawing/XLayer.idl
index 2a4f1941f0cd..e54d45c4cf84 100644
--- a/offapi/com/sun/star/drawing/XLayer.idl
+++ b/offapi/com/sun/star/drawing/XLayer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XLayer_idl__
 #define __com_sun_star_drawing_XLayer_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XLayerManager.idl b/offapi/com/sun/star/drawing/XLayerManager.idl
index 3c20758b9b0b..f47c7d53d925 100644
--- a/offapi/com/sun/star/drawing/XLayerManager.idl
+++ b/offapi/com/sun/star/drawing/XLayerManager.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_drawing_XLayerManager_idl__
 #define __com_sun_star_drawing_XLayerManager_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XLayer_idl__
 #include <com/sun/star/drawing/XLayer.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XLayerSupplier.idl b/offapi/com/sun/star/drawing/XLayerSupplier.idl
index 3c5bcfdbd3b8..a4e4530829fc 100644
--- a/offapi/com/sun/star/drawing/XLayerSupplier.idl
+++ b/offapi/com/sun/star/drawing/XLayerSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XLayerSupplier_idl__
 #define __com_sun_star_drawing_XLayerSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XMasterPageTarget.idl b/offapi/com/sun/star/drawing/XMasterPageTarget.idl
index 04dcab906881..472099c3a98c 100644
--- a/offapi/com/sun/star/drawing/XMasterPageTarget.idl
+++ b/offapi/com/sun/star/drawing/XMasterPageTarget.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XMasterPageTarget_idl__
 #define __com_sun_star_drawing_XMasterPageTarget_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl b/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
index 77d7fd1238dc..e8efee3edaf6 100644
--- a/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
+++ b/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XMasterPagesSupplier_idl__
 #define __com_sun_star_drawing_XMasterPagesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
 #include <com/sun/star/drawing/XDrawPages.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XPresenterHelper.idl b/offapi/com/sun/star/drawing/XPresenterHelper.idl
index d1a2d5d3e176..e1a749040bd2 100644
--- a/offapi/com/sun/star/drawing/XPresenterHelper.idl
+++ b/offapi/com/sun/star/drawing/XPresenterHelper.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_drawing_XPresenterHelper_idl__
 #define __com_sun_star_drawing_XPresenterHelper_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
 #include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 module com { module sun { module star { module drawing {
 
diff --git a/offapi/com/sun/star/drawing/XSelectionFunction.idl b/offapi/com/sun/star/drawing/XSelectionFunction.idl
index 5e7abe8b1d42..159f41ece68e 100644
--- a/offapi/com/sun/star/drawing/XSelectionFunction.idl
+++ b/offapi/com/sun/star/drawing/XSelectionFunction.idl
@@ -27,37 +27,15 @@
 #ifndef __com_sun_star_drawing_XSelectionFunction_idl__
 #define __com_sun_star_drawing_XSelectionFunction_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatch_idl__
 #include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XKeyHandler_idl__
 #include <com/sun/star/awt/XKeyHandler.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMouseClickHandler_idl__
 #include <com/sun/star/awt/XMouseClickHandler.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMouseMotionHandler_idl__
 #include <com/sun/star/awt/XMouseMotionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__
 #include <com/sun/star/view/XSelectionChangeListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/drawing/XShape.idl b/offapi/com/sun/star/drawing/XShape.idl
index f5ba5579ee30..1b7eca9396ec 100644
--- a/offapi/com/sun/star/drawing/XShape.idl
+++ b/offapi/com/sun/star/drawing/XShape.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_drawing_XShape_idl__
 #define __com_sun_star_drawing_XShape_idl__
 
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
 #include <com/sun/star/drawing/XShapeDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeAligner.idl b/offapi/com/sun/star/drawing/XShapeAligner.idl
index a3eda14c62b8..a13180ab47ef 100644
--- a/offapi/com/sun/star/drawing/XShapeAligner.idl
+++ b/offapi/com/sun/star/drawing/XShapeAligner.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XShapeAligner_idl__
 #define __com_sun_star_drawing_XShapeAligner_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShapes_idl__
 #include <com/sun/star/drawing/XShapes.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Alignment_idl__
 #include <com/sun/star/drawing/Alignment.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeArranger.idl b/offapi/com/sun/star/drawing/XShapeArranger.idl
index 18ca895d33f9..13e700dbd201 100644
--- a/offapi/com/sun/star/drawing/XShapeArranger.idl
+++ b/offapi/com/sun/star/drawing/XShapeArranger.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_drawing_XShapeArranger_idl__
 #define __com_sun_star_drawing_XShapeArranger_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShapes_idl__
 #include <com/sun/star/drawing/XShapes.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_Arrangement_idl__
 #include <com/sun/star/drawing/Arrangement.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeBinder.idl b/offapi/com/sun/star/drawing/XShapeBinder.idl
index 42b36a85f7f7..5a45008c9208 100644
--- a/offapi/com/sun/star/drawing/XShapeBinder.idl
+++ b/offapi/com/sun/star/drawing/XShapeBinder.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XShapeBinder_idl__
 #define __com_sun_star_drawing_XShapeBinder_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShapes_idl__
 #include <com/sun/star/drawing/XShapes.idl>
-#endif
 
 
 //=============================================================================
@@ -55,7 +49,7 @@ published interface XShapeBinder: com::sun::star::uno::XInterface
     /** binds <type>Shape</type>s together.
 
         @param xShapes
-            a container with <type>Shape</type>s that will be bind toghether.
+            a container with <type>Shape</type>s that will be bind together.
             All <type>Shapes</type> will be converted to a <type>PolyPolygonBezierShape</type>
             and the lines will be connected. The <type>Shape</types>s in xShape will be
             removed from the <type>GenericDrawPage</type> and disposed.
diff --git a/offapi/com/sun/star/drawing/XShapeCombiner.idl b/offapi/com/sun/star/drawing/XShapeCombiner.idl
index f97d15122440..535f0968bdbb 100644
--- a/offapi/com/sun/star/drawing/XShapeCombiner.idl
+++ b/offapi/com/sun/star/drawing/XShapeCombiner.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XShapeCombiner_idl__
 #define __com_sun_star_drawing_XShapeCombiner_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShapes_idl__
 #include <com/sun/star/drawing/XShapes.idl>
-#endif
 
 
 //=============================================================================
@@ -75,7 +69,7 @@ published interface XShapeCombiner: com::sun::star::uno::XInterface
 
         @param xShapes
             the <type>Shape</type> is converted to a
-            <type>PolyPolygonBezierShape</type>s and then splited into
+            <type>PolyPolygonBezierShape</type>s and then split into
             several <type>PolyPolygonBezierShape</type>s
             The <type>Shape</types>s in xShape will be removed from the
             <type>GenericDrawPage</type> and disposed.
diff --git a/offapi/com/sun/star/drawing/XShapeDescriptor.idl b/offapi/com/sun/star/drawing/XShapeDescriptor.idl
index dbadb01be765..e748c3d19f7b 100644
--- a/offapi/com/sun/star/drawing/XShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XShapeDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
 #define __com_sun_star_drawing_XShapeDescriptor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeGroup.idl b/offapi/com/sun/star/drawing/XShapeGroup.idl
index 66013be4bacb..bf2e24f18aa0 100644
--- a/offapi/com/sun/star/drawing/XShapeGroup.idl
+++ b/offapi/com/sun/star/drawing/XShapeGroup.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XShapeGroup_idl__
 #define __com_sun_star_drawing_XShapeGroup_idl__
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeGrouper.idl b/offapi/com/sun/star/drawing/XShapeGrouper.idl
index a5474b35a5d7..505d2eb55fb8 100644
--- a/offapi/com/sun/star/drawing/XShapeGrouper.idl
+++ b/offapi/com/sun/star/drawing/XShapeGrouper.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_drawing_XShapeGrouper_idl__
 #define __com_sun_star_drawing_XShapeGrouper_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShapeGroup_idl__
 #include <com/sun/star/drawing/XShapeGroup.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShapes_idl__
 #include <com/sun/star/drawing/XShapes.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapeMirror.idl b/offapi/com/sun/star/drawing/XShapeMirror.idl
index 1a64265bd10f..6d5ee56fb13a 100644
--- a/offapi/com/sun/star/drawing/XShapeMirror.idl
+++ b/offapi/com/sun/star/drawing/XShapeMirror.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_drawing_XShapeMirror_idl__
 #define __com_sun_star_drawing_XShapeMirror_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShapes_idl__
 #include <com/sun/star/drawing/XShapes.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_MirrorAxis_idl__
 #include <com/sun/star/drawing/MirrorAxis.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XShapes.idl b/offapi/com/sun/star/drawing/XShapes.idl
index b0b9c78646b5..fbe9c9dd153e 100644
--- a/offapi/com/sun/star/drawing/XShapes.idl
+++ b/offapi/com/sun/star/drawing/XShapes.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_drawing_XShapes_idl__
 #define __com_sun_star_drawing_XShapes_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
index eb1cecb7abb9..78ee0a9654b5 100644
--- a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
+++ b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_drawing_XSlidePreviewCache_idl__
 #define __com_sun_star_drawing_XSlidePreviewCache_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerSize2D_idl__
 #include <com/sun/star/geometry/IntegerSize2D.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#endif
 
 module com { module sun { module star { module drawing {
 
diff --git a/offapi/com/sun/star/drawing/XSlideRenderer.idl b/offapi/com/sun/star/drawing/XSlideRenderer.idl
index c2ad6030de9d..d18792f227a3 100644
--- a/offapi/com/sun/star/drawing/XSlideRenderer.idl
+++ b/offapi/com/sun/star/drawing/XSlideRenderer.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_drawing_XSlideRenderer_idl__
 #define __com_sun_star_drawing_XSlideRenderer_idl__
 
-#ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
 #include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
 
 
 module com { module sun { module star { module drawing {
@@ -74,7 +66,7 @@ interface XSlideRenderer
             memory consumption and longer runtime.
             This value is an attempt to provide some antialiasing and so to
             provide more readable slide previews.  May become obsolete in
-            the future when true antialiasing suppport will be integrated.
+            the future when true antialiasing support will be integrated.
     */
     com::sun::star::awt::XBitmap createPreview (
         [in] XDrawPage xSlide,
diff --git a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
index 60286c3271d6..fef14a3aab73 100644
--- a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_XUniversalShapeDescriptor_idl__
 #define __com_sun_star_drawing_XUniversalShapeDescriptor_idl__
 
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
 #include <com/sun/star/drawing/XShapeDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
index 9a65144514ca..4d0ab101bdab 100644
--- a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
+++ b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_ResourceSearchMode_idl__
 #define __com_sun_star_drawing_framework_ResourceSearchMode_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XCloneable_idl__
 #include <com/sun/star/util/XCloneable.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl b/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
index 2797362aade5..697e1f9cee44 100644
--- a/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_BasicPaneFactory_idl__
 #define __com_sun_star_drawing_framework_BasicPaneFactory_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef _COM_SUN_STAR_DRAWING_FRAMEWORK_XPANEFACTORY_IDL_
 #include <com/sun/star/drawing/framework/XResourceFactory.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl b/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
index e0a1529177d1..41989e8715ce 100644
--- a/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_BasicToolBarFactory_idl__
 #define __com_sun_star_drawing_framework_BasicToolBarFactory_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef _COM_SUN_STAR_DRAWING_FRAMEWORK_XPANEFACTORY_IDL_
 #include <com/sun/star/drawing/framework/XResourceFactory.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl b/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
index ffde0f8b4cb7..a9afa50ae3ef 100644
--- a/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_BasicViewFactory_idl__
 #define __com_sun_star_drawing_framework_BasicViewFactory_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResourceFactory_idl__
 #include <com/sun/star/drawing/framework/XResourceFactory.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/Configuration.idl b/offapi/com/sun/star/drawing/framework/Configuration.idl
index 3c070f8784a9..4b68541cb026 100644
--- a/offapi/com/sun/star/drawing/framework/Configuration.idl
+++ b/offapi/com/sun/star/drawing/framework/Configuration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_ConfigurationController_idl__
 #define __com_sun_star_drawing_framework_ConfigurationController_idl__
 
-#ifndef __com_sun_star_drawing_framework_XConfiguration_idl__
 #include <com/sun/star/drawing/framework/XConfiguration.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
index ac4db617ee12..c92772a0b15e 100644
--- a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
+++ b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
 #define __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 module com { module sun { module star { module uno { interface XInterface; }; }; }; };
 
diff --git a/offapi/com/sun/star/drawing/framework/ConfigurationController.idl b/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
index 23e43ab70a0c..0afb80f81a92 100644
--- a/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_drawing_framework_ConfigurationController_idl__
 #define __com_sun_star_drawing_framework_ConfigurationController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XConfigurationController_idl__
 #include <com/sun/star/drawing/framework/XConfigurationController.idl>
-#endif
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -46,7 +40,7 @@ module com { module sun { module star { module drawing { module framework {
     <p>This service is used at the moment by the
     <type>XControllerManager</type> to create a configuration controller.
     This allows developers to replace the default implementation of the
-    configuration controller with their own.  This may not be a usefull
+    configuration controller with their own.  This may not be a useful
     feature.  Furthermore the sub controllers may need a tighter coupling
     than the interfaces allow.  These are reasons for removing this service
     in the future and let the controller manager create the sub controllers
diff --git a/offapi/com/sun/star/drawing/framework/ModuleController.idl b/offapi/com/sun/star/drawing/framework/ModuleController.idl
index 3966a6fafb60..daf94314f2e6 100644
--- a/offapi/com/sun/star/drawing/framework/ModuleController.idl
+++ b/offapi/com/sun/star/drawing/framework/ModuleController.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_ModuleController_idl__
 #define __com_sun_star_drawing_framework_ModuleController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XModuleController_idl__
 #include <com/sun/star/drawing/framework/XModuleController.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/ResourceId.idl b/offapi/com/sun/star/drawing/framework/ResourceId.idl
index 635744f69246..aae71e8f1af5 100644
--- a/offapi/com/sun/star/drawing/framework/ResourceId.idl
+++ b/offapi/com/sun/star/drawing/framework/ResourceId.idl
@@ -28,15 +28,13 @@
 #ifndef __com_sun_star_drawing_framework_ResourceId_idl__
 #define __com_sun_star_drawing_framework_ResourceId_idl__
 
-#ifndef __com_sun_star_drawing_framework_XResourceId_idl__
 #include <com/sun/star/drawing/framework/XResourceId.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
 /** The <type>ResourceId</type> service provides several constructors for
     resource ids.
-    <p>They mainly differe in how the anchor is specified.</p>
+    <p>They mainly differ in how the anchor is specified.</p>
 */
 service ResourceId
     : XResourceId
@@ -52,7 +50,7 @@ service ResourceId
     create ([in] string sResourceURL);
 
     /** Create a resource id for an anchor that is given as
-        <type>XResourceId</type> object.  This is the mose general of the
+        <type>XResourceId</type> object.  This is the most general of the
         constructor variants.
     */
     createWithAnchor ([in] string sResourceURL, [in] XResourceId xAnchor);
diff --git a/offapi/com/sun/star/drawing/framework/TabBarButton.idl b/offapi/com/sun/star/drawing/framework/TabBarButton.idl
index 3ba80cefd3f8..6f4e59635b2f 100644
--- a/offapi/com/sun/star/drawing/framework/TabBarButton.idl
+++ b/offapi/com/sun/star/drawing/framework/TabBarButton.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module drawing { module framework {
 interface XResourceId;
 
 /** Descriptor of a tab bar button.  Tab bar buttons are typically used to
-    offer the user the choice between different views to be disiplayed in
+    offer the user the choice between different views to be displayed in
     one pane.
     <p>For identification only the <member>ResourceId</member> is used, so for
     some methods of the <type>XTabBar</type> interface only the
diff --git a/offapi/com/sun/star/drawing/framework/XConfiguration.idl b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
index acbb5ecab0c0..ad6bf6aa50f6 100644
--- a/offapi/com/sun/star/drawing/framework/XConfiguration.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_drawing_framework_XConfiguration_idl__
 #define __com_sun_star_drawing_framework_XConfiguration_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_XCloneable_idl__
 #include <com/sun/star/util/XCloneable.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_AnchorBindingMode_idl__
 #include <com/sun/star/drawing/framework/AnchorBindingMode.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -90,7 +84,7 @@ published interface XConfiguration
         [in] string sTargetURLPrefix,
         [in] AnchorBindingMode eSearchMode);
 
-    /** <p>Returns wether the specified resource is part of the
+    /** <p>Returns weather the specified resource is part of the
         configuration.</p>
         This is independent of whether the resource does really exist and is
         active, i.e. has a visible representation in the GUI.
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl b/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
index 742a3141350b..2bc727a0680d 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_XConfigurationChangeListener_idl__
 #define __com_sun_star_drawing_framework_XConfigurationChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
 #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl b/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
index 7a37f8e5652d..709e2350be52 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_XConfigurationChangeRequest_idl__
 #define __com_sun_star_drawing_framework_XConfigurationChangeRequest_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
 #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
index 9d7630318368..e80c14333ae3 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_drawing_framework_XConfigurationController_idl__
 #define __com_sun_star_drawing_framework_XConfigurationController_idl__
 
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
 #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XConfigurationControllerBroadcaster_idl__
 #include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XConfigurationControllerRequestQueue_idl__
 #include <com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResourceFactoryManager_idl__
 #include <com/sun/star/drawing/framework/XResourceFactoryManager.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ResourceActivationMode_idl__
 #include <com/sun/star/drawing/framework/ResourceActivationMode.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -65,7 +55,7 @@ published interface XResource;
 
     <p>When the two configurations differ then the current configuration is
     updated eventually to reflect the requested configuration.  An update
-    takes place when the following three conditions are fullfilled.
+    takes place when the following three conditions are fulfilled.
     <ol>
     <li>when the last pending request for configuration changes has been
     processed,</li>
@@ -108,7 +98,7 @@ published interface XResource;
     temporarily or permanently unavailable.  For example, during the
     start-up of a new Impress application the side panes are displayed
     with a visible delay because they are not provided sooner by the
-    underlying framework.  Such anavailable resources are not forgotten but
+    underlying framework.  Such unavailable resources are not forgotten but
     remain in the requested configuration.  Every time the configuration
     controller updates its current configuration these resources are
     requested once more.</li></ol></p>
@@ -252,12 +242,12 @@ published interface XConfigurationController
         allows the saving and restoring of configurations.  However, the
         given configuration can have other origins then these methods.</p>
         <p>The given configuration is transformed into a list of of change
-        requests so that the resulting reqeusted configuration equals the
+        requests so that the resulting requested configuration equals the
         given configuration.  This has the advantage that not only the
         resource activations and deactivations but all configuration
         changes are properly broadcasted.</p>
         <p>Note that because of the configuration change notifications
-        listeners can make more configuratio change requests, so that the
+        listeners can make more configuration change requests, so that the
         resulting requested configuration can be different from the given
         configuration.</p>
         @param xConfiguration
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
index 01755f1ab646..7411be75812b 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_XConfigurationControllerBroadcaster_idl__
 #define __com_sun_star_drawing_framework_XConfigurationControllerBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ConfigurationChangeEvent_idl__
 #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -61,7 +57,7 @@ published interface XConfigurationControllerBroadcaster
             will be called for all types of event.
         @param aUserData
             Arbitrary data that is passed to the listener when it is called
-            for the specified event type.  When one listener is regisered
+            for the specified event type.  When one listener is registered
             for more than one event type then different user data objects
             may be given as well.  Supplying unique integer values allows
             the listener to use a switch statement to distinguish between
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
index e993b5befde0..940f8be354a8 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_XConfigurationControllerRequestQueue_idl__
 #define __com_sun_star_drawing_framework_XConfigurationControllerRequestQueue_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -40,7 +38,7 @@ published interface XConfigurationChangeRequest;
     changes to the current configuration.
 
     <p>This interface allows callers to add requests to the back of the
-    queue and to determine wheter the queue is empty.  Using this interace
+    queue and to determine whether the queue is empty.  Using this interface
     should normally not be necessary for anyone else than the
     <type>XConfigurationController</type>.  It may be removed in the future.</p>
 */
@@ -56,7 +54,7 @@ published interface XConfigurationControllerRequestQueue
 
     /** Add a request for a configuration change to the request queue.
         <p>This method should not be called from outside the drawing
-        famework.  Other sub conrollers of the drawing framework are typical
+        framework.  Other sub controllers of the drawing framework are typical
         callers.  They can add change requests that can not be made with the
         <member>requestResourceActivation()</member> and
         <member>requestResourceDeactivation()</member> methods.</p>
diff --git a/offapi/com/sun/star/drawing/framework/XControllerManager.idl b/offapi/com/sun/star/drawing/framework/XControllerManager.idl
index fba9b5f920ca..b07aeec41d14 100644
--- a/offapi/com/sun/star/drawing/framework/XControllerManager.idl
+++ b/offapi/com/sun/star/drawing/framework/XControllerManager.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_XControllerManager_idl__
 #define __com_sun_star_drawing_framework_XControllerManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XModuleController.idl b/offapi/com/sun/star/drawing/framework/XModuleController.idl
index b115f955fac0..25ba576011e6 100644
--- a/offapi/com/sun/star/drawing/framework/XModuleController.idl
+++ b/offapi/com/sun/star/drawing/framework/XModuleController.idl
@@ -28,24 +28,16 @@
 #ifndef __com_sun_star_drawing_framework_XModuleController_idl__
 #define __com_sun_star_drawing_framework_XModuleController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_IDL_
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_ResourceId_idl__
 #include <com/sun/star/drawing/framework/ResourceId.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
 interface XView;
 
-/** The module controller is responsible for loading a module (addon,
+/** The module controller is responsible for loading a module (ad-don,
     plugin, whatever the name) when it is first used.
     <p>For this there is a
     list in the office configuration which associates resource URLs with
diff --git a/offapi/com/sun/star/drawing/framework/XPane.idl b/offapi/com/sun/star/drawing/framework/XPane.idl
index 1126b69bef31..a99dd567ed66 100644
--- a/offapi/com/sun/star/drawing/framework/XPane.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_drawing_framework_XPane_idl__
 #define __com_sun_star_drawing_framework_XPane_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCcanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResource_idl__
 #include <com/sun/star/drawing/framework/XResource.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XRelocatableResource_idl__
 #include <com/sun/star/drawing/framework/XRelocatableResource.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XPane2.idl b/offapi/com/sun/star/drawing/framework/XPane2.idl
index 85fec5a311cb..139614d7591e 100644
--- a/offapi/com/sun/star/drawing/framework/XPane2.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane2.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_XPane2_idl__
 #define __com_sun_star_drawing_framework_XPane2_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
index 80bd19403244..d4d953b1a936 100644
--- a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
+++ b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_drawing_framework_XPaneBorderPainter_idl__
 #define __com_sun_star_drawing_framework_XPaneBorderPainter_idl__
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -53,7 +47,7 @@ published enum BorderType
 
 /** Paint the border around a rectangular region, typically a pane.
 
-    <p>Calling objects have to be able to derive inner bounding boxs of the
+    <p>Calling objects have to be able to derive inner bounding boxes of the
     border from the outer ones and inner ones from outer ones.  This
     conversion and the painting of the border involves three rectangles.
     The inner and outer bounding box of the border.  This is a logical
@@ -87,7 +81,7 @@ published interface XPaneBorderPainter
         [in] ::com::sun::star::awt::Rectangle aRectangle,
         [in] BorderType eBorderType);
 
-    /** Shring the given rectangle by the size of the specified part of the
+    /** Shrink the given rectangle by the size of the specified part of the
         border.  This method can be used to convert an outer bounding box
         into the center box or the inner bounding box.
         @param sPaneBorderStyleName
@@ -132,11 +126,11 @@ published interface XPaneBorderPainter
         [in] ::com::sun::star::awt::Rectangle aRepaintArea,
         [in] string sTitle);
 
-    /** Paint the border around a pane where the border includes a callout
+    /** Paint the border around a pane where the border includes a call out
         that is anchored at the given point.  Most arguments have the same
         meaning as in the <method>paintBorder</method>.
         @param aCalloutAnchor
-            The anchor point of the callout.  It is usually located outside
+            The anchor point of the call out.  It is usually located outside
             the border.
     */
     void paintBorderWithCallout (
@@ -147,10 +141,10 @@ published interface XPaneBorderPainter
         [in] string sTitle,
         [in] ::com::sun::star::awt::Point aCalloutAnchor);
 
-    /** Return the offset of a callout anchor with respect to the outer
-        border.  This value is used when the callout is realized by a fixed
+    /** Return the offset of a call out anchor with respect to the outer
+        border.  This value is used when the call out is realized by a fixed
         bitmap in order to determine the size and/or location of the outer
-        border for a given callout.
+        border for a given call out.
     */
     ::com::sun::star::awt::Point getCalloutOffset (
         [in] string sPaneBorderStyleName);
diff --git a/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl b/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
index 9c8af5a15620..3152736825b5 100644
--- a/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
+++ b/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_XRelocatableResource_idl__
 #define __com_sun_star_drawing_framework_XRelocatableResource_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -46,7 +44,7 @@ interface XRelocatableResource
         @param xNewAnchor
             The new anchor.
         @return
-            Returns <TRUE/> when the relocation was successfull.
+            Returns <TRUE/> when the relocation was successful.
     */
     boolean relocateToAnchor ([in] XResource xNewAnchor);
 };
diff --git a/offapi/com/sun/star/drawing/framework/XResource.idl b/offapi/com/sun/star/drawing/framework/XResource.idl
index 3b3c6a643f4e..99cf9e2f2316 100644
--- a/offapi/com/sun/star/drawing/framework/XResource.idl
+++ b/offapi/com/sun/star/drawing/framework/XResource.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_XResource_idl__
 #define __com_sun_star_drawing_framework_XResource_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -42,7 +40,7 @@ published interface XResourceId;
 published interface XResource
 {
     /** Return an <type>XResourceId</type> object for the called resource.
-        The returned id unambiguously indentifies the resource.
+        The returned id unambiguously identifies the resource.
     */
     XResourceId getResourceId ();
 
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
index 6b76edad5496..2ed59bd0eb19 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_drawing_framework_XResourceFactory_idl__
 #define __com_sun_star_drawing_framework_XResourceFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
@@ -53,7 +47,7 @@ published interface XResourceFactory
 {
     /** Create a resource for the given <type>XResourceId</type> object.
         @param xResourceId
-            The resourc URL of this id specifies the type of resource to
+            The resource URL of this id specifies the type of resource to
             create.  The anchor can be used to obtain the associated object
             from the configuration controller.  For example, when a view is
             created, then the new object can be initialized with the pane
@@ -64,7 +58,7 @@ published interface XResourceFactory
             Returns a resource object that has been just created or was
             taken from a cache.  When the requested resource can not be
             created then an empty reference is returned.  A later call may
-            be successfull.  This, for example, can be the case with SFX
+            be successful.  This, for example, can be the case with SFX
             based side panes.  They are not available right after the
             creation of a new application frame.
         @throws InvalidArgumentException
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
index 5865d46257eb..0c5e3fceb491 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_XResourceFactoryManager_idl__
 #define __com_sun_star_drawing_framework_XResourceFactoryManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XResourceId.idl b/offapi/com/sun/star/drawing/framework/XResourceId.idl
index 1f5871f3a8ba..5dfe46acc005 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceId.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceId.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_drawing_framework_XResourceId_idl__
 #define __com_sun_star_drawing_framework_XResourceId_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_AnchorBindingMode_idl__
 #include <com/sun/star/drawing/framework/AnchorBindingMode.idl>
-#endif
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XTabBar.idl b/offapi/com/sun/star/drawing/framework/XTabBar.idl
index 8213b9babe0a..efdd534f3ddf 100644
--- a/offapi/com/sun/star/drawing/framework/XTabBar.idl
+++ b/offapi/com/sun/star/drawing/framework/XTabBar.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_drawing_framework_XTabBar_idl__
 #define __com_sun_star_drawing_framework_XTabBar_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_TabBarButton_idl__
 #include <com/sun/star/drawing/framework/TabBarButton.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XToolBar.idl b/offapi/com/sun/star/drawing/framework/XToolBar.idl
index 364406affc7f..0146245428d5 100644
--- a/offapi/com/sun/star/drawing/framework/XToolBar.idl
+++ b/offapi/com/sun/star/drawing/framework/XToolBar.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_drawing_framework_XToolBar_idl__
 #define __com_sun_star_drawing_framework_XToolBar_idl__
 
-#ifndef __com_sun_star_drawing_framework_XResource_idl__
 #include <com/sun/star/drawing/framework/XResource.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/framework/XView.idl b/offapi/com/sun/star/drawing/framework/XView.idl
index 3a45919fb316..3f9d5d379acc 100644
--- a/offapi/com/sun/star/drawing/framework/XView.idl
+++ b/offapi/com/sun/star/drawing/framework/XView.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_drawing_framework_XView_idl__
 #define __com_sun_star_drawing_framework_XView_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_framework_XResource_idl__
 #include <com/sun/star/drawing/framework/XResource.idl>
-#endif
 
 module com { module sun { module star { module drawing { module framework {
 
diff --git a/offapi/com/sun/star/drawing/modules.idl b/offapi/com/sun/star/drawing/modules.idl
index 5c9fe1d58c31..53d34c05fa9c 100644
--- a/offapi/com/sun/star/drawing/modules.idl
+++ b/offapi/com/sun/star/drawing/modules.idl
@@ -52,7 +52,7 @@ module com { module sun { module star { module drawing {
     It coordinates changes to the configuration made by the other sub
     controllers so that
     <ul><li>unnecessary ui updates (flickering) is avoided and</li>
-    <li>and the configuration is always in a valid and meaningfull
+    <li>and the configuration is always in a valid and meaningful
     state.</li></ul></p>
     <p>For more information please see the wiki page of the <a
     href="http://wiki.services.openoffice.org/wiki/Drawing_framework">drawing framework</a>.
diff --git a/offapi/com/sun/star/embed/Actions.idl b/offapi/com/sun/star/embed/Actions.idl
index 48ad78eb0ab2..f0c81b4bdb2a 100644
--- a/offapi/com/sun/star/embed/Actions.idl
+++ b/offapi/com/sun/star/embed/Actions.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module embed {
 published constants Actions
 {
     //------------------------------------------------------------------------
-    /** "Prevent Close" - throws veto excetion if target object is going to
+    /** "Prevent Close" - throws veto exception if target object is going to
         close.
 
         <p>
@@ -50,7 +50,7 @@ published constants Actions
     const long PREVENT_CLOSE = 1;
 
     //------------------------------------------------------------------------
-    /** "Prevent Termination" - throws veto excetion if target object is going
+    /** "Prevent Termination" - throws veto exception if target object is going
         to terminate.
 
         <p>
diff --git a/offapi/com/sun/star/embed/BaseStorage.idl b/offapi/com/sun/star/embed/BaseStorage.idl
index 81df39792b75..1ffe48b61583 100644
--- a/offapi/com/sun/star/embed/BaseStorage.idl
+++ b/offapi/com/sun/star/embed/BaseStorage.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_embed_BaseStorage_idl__
 #define __com_sun_star_embed_BaseStorage_idl__
 
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/DocumentCloser.idl b/offapi/com/sun/star/embed/DocumentCloser.idl
index 9b0eaf617527..22b0892568f4 100644
--- a/offapi/com/sun/star/embed/DocumentCloser.idl
+++ b/offapi/com/sun/star/embed/DocumentCloser.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_embed_DocumentCloser_idl__
 #define __com_sun_star_embed_DocumentCloser_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
 #include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module embed {
@@ -57,7 +47,7 @@ module com {  module sun {  module star {  module embed {
     the required actions to let the frame be closed using
     <type scope="com::sun::star::util">XCloseable</type>::close( true ). Thus
     in case there is a code that prevents closing of the frame the code
-    avtomatically becomes the owner of the frame.
+    automatically becomes the owner of the frame.
     </p>
 
     <p>
diff --git a/offapi/com/sun/star/embed/ElementModes.idl b/offapi/com/sun/star/embed/ElementModes.idl
index 314036fd45ec..2173186ae011 100644
--- a/offapi/com/sun/star/embed/ElementModes.idl
+++ b/offapi/com/sun/star/embed/ElementModes.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module embed {
 /** The constant set contains possible modes to open an element.
 
     <p>
-    The modes can be combined by 'or' operation.
+    The modes can be combined by "or" operation.
     <const>ElementModes::READ</const> and <const>ElementModes::WRITE</const>
     are base modes. A result mode must include one of base modes.
     </p>
@@ -55,7 +55,7 @@ published constants ElementModes
 
         <p>
         This mode is ignored for <type>Storage</type> elements.
-        This flag makes sence only in combination with
+        This flag makes sense only in combination with
         <const>ElementModes::READ</const> and/or
         <const>ElementModes::WRITE</const>.
         </p>
@@ -87,10 +87,10 @@ published constants ElementModes
     const long READWRITE = 7;
 
     //------------------------------------------------------------------------
-    /** lets the document be truncated immediatelly after opening.
+    /** lets the document be truncated immediately after opening.
 
         <p>
-        This flag makes sence only in combination with
+        This flag makes sense only in combination with
         <const>ElementModes::WRITE</const>.
         </p>
      */
@@ -101,7 +101,7 @@ published constants ElementModes
         does not exist.
 
         <p>
-        This flag makes sence only in combination with
+        This flag makes sense only in combination with
         <const>ElementModes::WRITE</const>.
         </p>
      */
diff --git a/offapi/com/sun/star/embed/EmbedMapUnits.idl b/offapi/com/sun/star/embed/EmbedMapUnits.idl
index ff8a3cebada5..9a8931779f70 100644
--- a/offapi/com/sun/star/embed/EmbedMapUnits.idl
+++ b/offapi/com/sun/star/embed/EmbedMapUnits.idl
@@ -41,25 +41,25 @@ published constants EmbedMapUnits
 {
     // ----------------------------------------------------------------------
     /** In this type of map mode one logical point is equal to one-hundredth
-        of milimetre.
+        of millimeter.
      */
     const long ONE_100TH_MM = 0;
 
     // ----------------------------------------------------------------------
     /** In this type of map mode one logical point is equal to one-tenth
-        of milimetre.
+        of millimeter.
      */
     const long ONE_10TH_MM = 1;
 
     // ----------------------------------------------------------------------
     /** In this type of map mode one logical point is equal to one
-        milimetre.
+        millimeter.
      */
     const long ONE_MM = 2;
 
     // ----------------------------------------------------------------------
     /** In this type of map mode one logical point is equal to one
-        centimetre.
+        centimeter.
      */
     const long ONE_CM = 3;
 
diff --git a/offapi/com/sun/star/embed/EmbedMisc.idl b/offapi/com/sun/star/embed/EmbedMisc.idl
index a1e05224b00b..2d2e987c5140 100644
--- a/offapi/com/sun/star/embed/EmbedMisc.idl
+++ b/offapi/com/sun/star/embed/EmbedMisc.idl
@@ -33,11 +33,11 @@
 module com { module sun { module star { module embed {
 
 //============================================================================
-/** The constant set contains flags describing miscellaneous charactetistics
+/** The constant set contains flags describing miscellaneous characteristics
     of embedded objects.
 
     <p>
-    The constant values can be combined with 'or' operation.
+    The constant values can be combined with "or" operation.
     The first 32 bits are reserved for MS values, they are added because
     this API is going to be used to embed MS OLE objects into OOo documents,
     so there should be a possibility to transfer all the possible MS flags
diff --git a/offapi/com/sun/star/embed/EmbedStates.idl b/offapi/com/sun/star/embed/EmbedStates.idl
index df94cfa045a5..935f32363e82 100644
--- a/offapi/com/sun/star/embed/EmbedStates.idl
+++ b/offapi/com/sun/star/embed/EmbedStates.idl
@@ -84,7 +84,7 @@ published constants EmbedStates
     /** "UI active" - the inplace active object that has user interface.
 
         <p>
-        The object is inplace active, allowed to have menues, toolbars,
+        The object is inplace active, allowed to have menus, toolbars,
         keyboard accelerators, and has the focus.
         </p>
      */
diff --git a/offapi/com/sun/star/embed/EmbedVerbs.idl b/offapi/com/sun/star/embed/EmbedVerbs.idl
index 5d34fb1e8153..a3610a076d23 100644
--- a/offapi/com/sun/star/embed/EmbedVerbs.idl
+++ b/offapi/com/sun/star/embed/EmbedVerbs.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module embed {
 published constants EmbedVerbs
 {
     //------------------------------------------------------------------------
-    /** lets the object do default activation, as by doubleclick.
+    /** lets the object do default activation, as by double-click.
      */
     const long MS_OLEVERB_PRIMARY = 0;
 
diff --git a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
index 5a47c8f8fafc..061adb423f19 100644
--- a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
+++ b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
@@ -27,30 +27,12 @@
 #ifndef __com_sun_star_embed_EmbeddedObjectDescriptor_idl__
 #define __com_sun_star_embed_EmbeddedObjectDescriptor_idl__
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
 #include <com/sun/star/task/XStatusIndicator.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterceptor_idl__
 #include <com/sun/star/frame/XDispatchProviderInterceptor.idl>
-#endif
-
 #include <com/sun/star/embed/XStorage.idl>
 
 //============================================================================
@@ -64,7 +46,7 @@ module com { module sun { module star { module embed {
     This service may be represented by a
     <type scope="com::sun::star::beans" dim="[]">PropertyValue</type>.
     Such descriptors will be passed to different functions, included into
-    possible load/save proccesses. Every member of such process can use
+    possible load/save processes. Every member of such process can use
     this descriptor and may change it to actualize the informations about
     the object. So this descriptor should be used as an in/out parameter.
     </p>
@@ -78,7 +60,7 @@ published service EmbeddedObjectDescriptor
 
         <p>
         Setting of this property to true tells the embedded object that
-        controlls the document to store or not to store the graphical
+        controls the document to store or not to store the graphical
         representation of the document in to the object persistence.
         If this property is not set the object makes the decision itself.
         </p>
diff --git a/offapi/com/sun/star/embed/EntryInitModes.idl b/offapi/com/sun/star/embed/EntryInitModes.idl
index ae67192d323a..4c63f813c7a9 100644
--- a/offapi/com/sun/star/embed/EntryInitModes.idl
+++ b/offapi/com/sun/star/embed/EntryInitModes.idl
@@ -34,14 +34,14 @@ module com { module sun { module star { module embed {
 
 //============================================================================
 /** This constant set contains possible modes to initialize object
-    persistance.
+    persistence.
 
     @see XEmbedPersist
 */
 published constants EntryInitModes
 {
     // -----------------------------------------------------------------------
-    /** In case object persistance is created based on existing entry,
+    /** In case object persistence is created based on existing entry,
         the object should be initialized from this entry. Otherwise
         the object should be initialized as a new one.
      */
diff --git a/offapi/com/sun/star/embed/FileSystemStorage.idl b/offapi/com/sun/star/embed/FileSystemStorage.idl
index 2b4d7d456751..666b36e30a4f 100644
--- a/offapi/com/sun/star/embed/FileSystemStorage.idl
+++ b/offapi/com/sun/star/embed/FileSystemStorage.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_embed_FileSystemStorage_idl__
 #define __com_sun_star_embed_FileSystemStorage_idl__
 
-#ifndef __com_sun_star_embed_BaseStorage_idl__
 #include <com/sun/star/embed/BaseStorage.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/FileSystemStorageFactory.idl b/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
index d27541d703ef..292725bc332f 100644
--- a/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
+++ b/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_embed_FileSystemStorageFactory_idl__
 #define __com_sun_star_embed_FileSystemStorageFactory_idl__
 
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
 
 
 //============================================================================
@@ -50,7 +48,7 @@ published service FileSystemStorageFactory
         <p>
         In case
         <method scope="com::sun::star::lang">XSingleServiceFactory::createInstance</method>
-        call is used the result storage will be open in readwrite mode based
+        call is used the result storage will be open in read-write mode based
         on an arbitrary file system folder.
         </p>
 
@@ -75,7 +73,7 @@ published service FileSystemStorageFactory
 
             <dt>parameter 3</dt>
             <dd>
-                      allowes to provide
+                      allows to provide
                       <type scope="com::sun::star::document">MediaDescryptor</type>
                       to the storage so some parts can be used for
                       initialization, it can be for example
diff --git a/offapi/com/sun/star/embed/InsertedObjectInfo.idl b/offapi/com/sun/star/embed/InsertedObjectInfo.idl
index dedfabb75a8f..ffc0fe6a774d 100644
--- a/offapi/com/sun/star/embed/InsertedObjectInfo.idl
+++ b/offapi/com/sun/star/embed/InsertedObjectInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_InsertedObjectInfo_idl__
 #define __com_sun_star_embed_InsertedObjectInfo_idl__
 
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XEmbeddedObject_idl__
 #include <com/sun/star/embed/XEmbeddedObject.idl>
-#endif
 
 //=============================================================================
 
@@ -55,7 +50,7 @@ published struct InsertedObjectInfo
 
         <p>
         A dialog related to embedded object creation usually allows user
-        to make some choiches that can be container related. This information
+        to make some choices that can be container related. This information
         can be provided by this member.
         </p>
      */
diff --git a/offapi/com/sun/star/embed/InstanceLocker.idl b/offapi/com/sun/star/embed/InstanceLocker.idl
index 3258dc3b9365..aa4d129c0977 100644
--- a/offapi/com/sun/star/embed/InstanceLocker.idl
+++ b/offapi/com/sun/star/embed/InstanceLocker.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_embed_InstanceLocker_idl__
 #define __com_sun_star_embed_InstanceLocker_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_embed_XActionsApproval_idl__
 #include <com/sun/star/embed/XActionsApproval.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
 #include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module embed {
diff --git a/offapi/com/sun/star/embed/InvalidStorageException.idl b/offapi/com/sun/star/embed/InvalidStorageException.idl
index f4eabfb8908e..d17c74d7b925 100644
--- a/offapi/com/sun/star/embed/InvalidStorageException.idl
+++ b/offapi/com/sun/star/embed/InvalidStorageException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_InvalidStorageException_idl__
 #define __com_sun_star_embed_InvalidStorageException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/LinkageMisuseException.idl b/offapi/com/sun/star/embed/LinkageMisuseException.idl
index fec43851a373..fb8609fa553c 100644
--- a/offapi/com/sun/star/embed/LinkageMisuseException.idl
+++ b/offapi/com/sun/star/embed/LinkageMisuseException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_LinkageMisuseException_idl__
 #define __com_sun_star_embed_LinkageMisuseException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/NeedsRunningStateException.idl b/offapi/com/sun/star/embed/NeedsRunningStateException.idl
index 8853049ab64f..89043476734a 100644
--- a/offapi/com/sun/star/embed/NeedsRunningStateException.idl
+++ b/offapi/com/sun/star/embed/NeedsRunningStateException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_NeedsRunningStateException_idl__
 #define __com_sun_star_embed_NeedsRunningStateException_idl__
 
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl b/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
index c5f8e5935b46..e07060e39eec 100644
--- a/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
+++ b/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_NoVisualAreaSizeException_idl__
 #define __com_sun_star_embed_NoVisualAreaSizeException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/OLESimpleStorage.idl b/offapi/com/sun/star/embed/OLESimpleStorage.idl
index 8aa4630acd6b..c32dac81ee63 100644
--- a/offapi/com/sun/star/embed/OLESimpleStorage.idl
+++ b/offapi/com/sun/star/embed/OLESimpleStorage.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_embed_OLESimpleStorage_idl__
 #define __com_sun_star_embed_OLESimpleStorage_idl__
 
-#ifndef __com_sun_star_embed_XOLESimpleStorage_idl__
 #include <com/sun/star/embed/XOLESimpleStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
 
 //============================================================================
 module com { module sun { module star { module embed {
diff --git a/offapi/com/sun/star/embed/ObjectSaveVetoException.idl b/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
index 3d0252e912fe..1f5befbaf019 100644
--- a/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
+++ b/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_ObjectSaveVetoException_idl__
 #define __com_sun_star_embed_ObjectSaveVetoException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //============================================================================
@@ -38,7 +36,7 @@
 
 //============================================================================
 
-/** This exception can be thrown in case container whants to avoid objects
+/** This exception can be thrown in case container wants to avoid objects
     saving.
 
     @see XEmbeddedClient
diff --git a/offapi/com/sun/star/embed/StateChangeInProgressException.idl b/offapi/com/sun/star/embed/StateChangeInProgressException.idl
index 648e839383ba..f46d257226bd 100644
--- a/offapi/com/sun/star/embed/StateChangeInProgressException.idl
+++ b/offapi/com/sun/star/embed/StateChangeInProgressException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_StateChangeInProgressException_idl__
 #define __com_sun_star_embed_StateChangeInProgressException_idl__
 
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/Storage.idl b/offapi/com/sun/star/embed/Storage.idl
index 8a793d513476..d05573b2e11d 100644
--- a/offapi/com/sun/star/embed/Storage.idl
+++ b/offapi/com/sun/star/embed/Storage.idl
@@ -28,37 +28,14 @@
 #ifndef __com_sun_star_embed_Storage_idl__
 #define __com_sun_star_embed_Storage_idl__
 
-#ifndef __com_sun_star_embed_BaseStorage_idl__
 #include <com/sun/star/embed/BaseStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
 #include <com/sun/star/embed/XEncryptionProtectedSource.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactedObject_idl__
 #include <com/sun/star/embed/XTransactedObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__
 #include <com/sun/star/embed/XTransactionBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifiable_idl__
 #include <com/sun/star/util/XModifiable.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //============================================================================
@@ -116,7 +93,7 @@ published service Storage
                 In case a storage object is disposed all the elements
                 ( substorages and substreams ) retrieved from the
                 object are disposed. If the storage was opened in
-                read-write mode all noncommited changes will be lost.
+                read-write mode all non-commited changes will be lost.
                 </p>
             </dd>
             <dt>interface <type>XStorage</type></dt>
@@ -130,7 +107,7 @@ published service Storage
                         </p>
 
                         <p>
-                        If the child stream is an encrypted one a corect
+                        If the child stream is an encrypted one a correct
                         common storage password should be set through
                         <type>XEncryptionProtectedSource</type> interface to
                         this storage or to a one of storages in parent
@@ -181,7 +158,7 @@ published service Storage
                         </p>
 
                         <p>
-                        If the child stream is an encrypted one a corect
+                        If the child stream is an encrypted one a correct
                         common storage password should be set through
                         <type>XEncryptionProtectedSource</type> interface to
                         this storage or to a one of storages in parent
@@ -316,7 +293,7 @@ published service Storage
         Usually means that the document validity is questionable, although
         the package itself is not corrupted. The decision about document
         validity in this case is in application hands. It is up to user of
-        the storage to deside whether he accepts the fallback approach for
+        the storage to decide whether he accepts the fallback approach for
         an implementation of this service, outputs a warning or an error.
         </p>
      */
@@ -346,11 +323,11 @@ published service Storage
     [property, optional, readonly] boolean HasEncryptedEntries;
 
     // -----------------------------------------------------------------------
-    /** allows to detect if the storage contains nonencrypted entries.
+    /** allows to detect if the storage contains non-encrypted entries.
 
         <p>
         In case it is set to <TRUE/> the storage itself and/or a tree of
-        substorages contains nonencrypted streams. Usually in case this
+        substorages contains non-encrypted streams. Usually in case this
         property is supported the implementation supports
         <type>XEncryptionProtectedSource</type> interface.
         </p>
diff --git a/offapi/com/sun/star/embed/StorageFactory.idl b/offapi/com/sun/star/embed/StorageFactory.idl
index 4b4b40d01a4c..65abbeb58d0b 100644
--- a/offapi/com/sun/star/embed/StorageFactory.idl
+++ b/offapi/com/sun/star/embed/StorageFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_embed_StorageFactory_idl__
 #define __com_sun_star_embed_StorageFactory_idl__
 
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
 
 
 //============================================================================
@@ -49,7 +47,7 @@ published service StorageFactory
         <p>
         In case
         <method scope="com::sun::star::lang">XSingleServiceFactory::createInstance</method>
-        call is used the result storage will be open in readwrite mode based
+        call is used the result storage will be open in read-write mode based
         on an arbitrary medium.
         </p>
 
@@ -82,7 +80,7 @@ published service StorageFactory
 
             <dt>parameter 3</dt>
             <dd>
-                      this paramenter represents
+                      this parameter represents
                       <type scope="com::sun::star::uno">Any</type>
                       containing a sequence of
                       <type scope="com::sun::star::beans">PropertyValue</type>.<br>
@@ -93,7 +91,7 @@ published service StorageFactory
                       <type scope="com::sun::star::task">XInteractionHandler</type>
                       implementation, password for the storage and repair
                       package flag.<br>
-                      Additionaly the parameter might contain property with the name
+                      Additionally the parameter might contain property with the name
                       "StorageFormat" that can take values from
                       <type scope="com::sun::star::embed">StorageFormats</type>.
                       If the property is not provided a storage of package format
diff --git a/offapi/com/sun/star/embed/StorageStream.idl b/offapi/com/sun/star/embed/StorageStream.idl
index 1fb6733605f0..2edcb26d0d49 100644
--- a/offapi/com/sun/star/embed/StorageStream.idl
+++ b/offapi/com/sun/star/embed/StorageStream.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_embed_StorageStream_idl__
 #define __com_sun_star_embed_StorageStream_idl__
 
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
 #include <com/sun/star/embed/XEncryptionProtectedSource.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XSeekable_idl__
 #include <com/sun/star/io/XSeekable.idl>
-#endif
 
 
 
@@ -60,7 +46,7 @@
     <type>Storage</type> service.
 
     <p>
-    In case a stream is open with readwrite access only one instance
+    In case a stream is open with read-write access only one instance
     of the stream can exist.
     </p>
  */
@@ -90,7 +76,7 @@ published service StorageStream
         <p>
         In case a stream is opened with read-write access only one instance of
         the stream can exist. It means that the stream can not be reopened
-        even for readonly access until the readwrite instance is disposed.
+        even for readonly access until the read-write instance is disposed.
         From the other side it is possible to open multiple streams for
         readonly access. But because of the rule mentioned above it will not
         be possible to open the stream for read-write access until all the
@@ -146,7 +132,7 @@ published service StorageStream
     /** allows to set password to the stream.
 
         <p>
-        This interface must be supported by a stream with readwrite access
+        This interface must be supported by a stream with read-write access
         to allow to set a password that should be used next time the
         stream is stored.
         </p>
@@ -201,7 +187,7 @@ published service StorageStream
 
         <p>
         In case stream is not encrypted and the property is set to <TRUE/>,
-        the stream will stay nonencrypted until the closest storage
+        the stream will stay non-encrypted until the closest storage
         in the parent hierarchy, that has common storage password, is commited.
         On the commit the stream will be encrypted with the common storage
         password. If there is no such storage in the hierarchy the stream
@@ -213,14 +199,14 @@ published service StorageStream
         If somebody sets a password explicitly by using
         <type>XEncryptionProtectedSource</type> interface the value is
         automatically set to <FALSE/> and the stream becomes encrypted
-        with specified password immediatelly.
+        with specified password immediately.
         </p>
 
         <p>
         In case stream is encrypted one and the value is set to <TRUE/>
-        the stream becomes nonencrypted until the common storage password
+        the stream becomes non-encrypted until the common storage password
         holder is commited. The data about previously set password ( if any )
-        will be removed and the stream can be accessed as nonencrypted stream.
+        will be removed and the stream can be accessed as non-encrypted stream.
         </p>
      */
     [property] boolean UseCommonStoragePasswordEncryption;
diff --git a/offapi/com/sun/star/embed/StorageWrappedTargetException.idl b/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
index aed449eb90a1..b6eaed500801 100644
--- a/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
+++ b/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
 #define __com_sun_star_embed_StorageWrappedTargetException_idl__
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/UnreachableStateException.idl b/offapi/com/sun/star/embed/UnreachableStateException.idl
index be53beda3bc3..88401160ebee 100644
--- a/offapi/com/sun/star/embed/UnreachableStateException.idl
+++ b/offapi/com/sun/star/embed/UnreachableStateException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_UnreachableStateException_idl__
 #define __com_sun_star_embed_UnreachableStateException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/UseBackupException.idl b/offapi/com/sun/star/embed/UseBackupException.idl
index e7d74d30f52c..ccddb2d8b87f 100644
--- a/offapi/com/sun/star/embed/UseBackupException.idl
+++ b/offapi/com/sun/star/embed/UseBackupException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_UseBackupException_idl__
 #define __com_sun_star_embed_UseBackupException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //============================================================================
@@ -40,7 +38,7 @@
 
 /** This exception can be thrown in case a storage commit is failed.
     <p>
-    If a commit process of a storage failes on last transfer and the original
+    If a commit process of a storage fails on last transfer and the original
     content may be corrupted the storage should throw this exception to notify
     the user that a backup usage is required to restore the original content.
     </p>
diff --git a/offapi/com/sun/star/embed/VisualRepresentation.idl b/offapi/com/sun/star/embed/VisualRepresentation.idl
index 8d07575008bb..251fd9fef8c3 100644
--- a/offapi/com/sun/star/embed/VisualRepresentation.idl
+++ b/offapi/com/sun/star/embed/VisualRepresentation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_VisualRepresentation_idl__
 #define __com_sun_star_embed_VisualRepresentation_idl__
 
-#ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/embed/WrongStateException.idl b/offapi/com/sun/star/embed/WrongStateException.idl
index 809389c3a1fa..103d5b476c5b 100644
--- a/offapi/com/sun/star/embed/WrongStateException.idl
+++ b/offapi/com/sun/star/embed/WrongStateException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_WrongStateException_idl__
 #define __com_sun_star_embed_WrongStateException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XActionsApproval.idl b/offapi/com/sun/star/embed/XActionsApproval.idl
index d3b64367a97b..5d4722e1c583 100644
--- a/offapi/com/sun/star/embed/XActionsApproval.idl
+++ b/offapi/com/sun/star/embed/XActionsApproval.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_XActionsApproval_idl__
 #define __com_sun_star_embed_XActionsApproval_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XClassifiedObject.idl b/offapi/com/sun/star/embed/XClassifiedObject.idl
index 2cde70fa8566..bc54afdfeff8 100644
--- a/offapi/com/sun/star/embed/XClassifiedObject.idl
+++ b/offapi/com/sun/star/embed/XClassifiedObject.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XClassifiedObject_idl__
 #define __com_sun_star_embed_XClassifiedObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XCommonEmbedPersist.idl b/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
index 8b82c44965e0..eb591ec66447 100644
--- a/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
+++ b/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_embed_XCommonEmbedPersist_idl__
 #define __com_sun_star_embed_XCommonEmbedPersist_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
@@ -95,7 +78,7 @@ published interface XCommonEmbedPersist: com::sun::star::uno::XInterface
     /** lets the object or the link reload itself.
 
         <p>
-        If the object has persistance it will be reloaded from it's persistant
+        If the object has persistence it will be reloaded from it's persistent
         entry.
         </p>
 
diff --git a/offapi/com/sun/star/embed/XComponentSupplier.idl b/offapi/com/sun/star/embed/XComponentSupplier.idl
index 548b5aa24510..84a820022ebf 100644
--- a/offapi/com/sun/star/embed/XComponentSupplier.idl
+++ b/offapi/com/sun/star/embed/XComponentSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_XComponentSupplier_idl__
 #define __com_sun_star_embed_XComponentSupplier_idl__
 
-#ifndef __com_sun_star_util_XCloseable_idl__
 #include <com/sun/star/util/XCloseable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl b/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
index 45f3aef06cd6..513159d9633b 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_embed_XEmbedObjectClipboardCreator_idl__
 #define __com_sun_star_embed_XEmbedObjectClipboardCreator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InsertedObjectInfo_idl__
 #include <com/sun/star/embed/InsertedObjectInfo.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
@@ -78,7 +58,7 @@ published interface XEmbedObjectClipboardCreator: com::sun::star::uno::XInterfac
 
         <p>
         The clipboard can provide a number of choices that are container
-        related. This infomation will be returned in the
+        related. This information will be returned in the
         <type>InsertedObjectInfo</type> object.
         <p>
 
diff --git a/offapi/com/sun/star/embed/XEmbedObjectCreator.idl b/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
index a214851922ad..a183801acc99 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_embed_XEmbedObjectCreator_idl__
 #define __com_sun_star_embed_XEmbedObjectCreator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XEmbedObjectFactory.idl b/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
index 67a355054c48..3e7de1034cce 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_embed_XEmbedObjectFactory_idl__
 #define __com_sun_star_embed_XEmbedObjectFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XEmbedPersist.idl b/offapi/com/sun/star/embed/XEmbedPersist.idl
index 73f807188ba6..0e73d0458c6b 100644
--- a/offapi/com/sun/star/embed/XEmbedPersist.idl
+++ b/offapi/com/sun/star/embed/XEmbedPersist.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_embed_XEmbedPersist_idl__
 #define __com_sun_star_embed_XEmbedPersist_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XCommonEmbedPersist_idl__
 #include <com/sun/star/embed/XCommonEmbedPersist.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
@@ -75,7 +55,7 @@ published interface XEmbedPersist: XCommonEmbedPersist
         <p>
         An entry with the specified name should be created/opened inside
         provided storage. It can be a storage or a stream. For example,
-        OOo API will refer to ole storages only by streams, but the object
+        OOo API will refer to OLE storages only by streams, but the object
         implementation will use storage based on this stream.
         </p>
 
diff --git a/offapi/com/sun/star/embed/XEmbeddedClient.idl b/offapi/com/sun/star/embed/XEmbeddedClient.idl
index f361ea2d8653..b6b7b12f883a 100644
--- a/offapi/com/sun/star/embed/XEmbeddedClient.idl
+++ b/offapi/com/sun/star/embed/XEmbeddedClient.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_embed_XEmbeddedClient_idl__
 #define __com_sun_star_embed_XEmbeddedClient_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XComponentSupplier_idl__
 #include <com/sun/star/embed/XComponentSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_embed_ObjectSaveVetoException_idl__
 #include <com/sun/star/embed/ObjectSaveVetoException.idl>
-#endif
 
 
 
@@ -58,7 +47,7 @@ published interface XEmbeddedClient: XComponentSupplier
     /** asks client to let the object store itself.
 
         @throws com::sun::star::uno::ObjectSaveVetoException
-            in case container whants to avoid saving of object
+            in case container chants to avoid saving of object
 
         @throws com::sun::star::uno::Exception
             in case of problems during saving
diff --git a/offapi/com/sun/star/embed/XEmbeddedObject.idl b/offapi/com/sun/star/embed/XEmbeddedObject.idl
index e0368736279f..5beb02bb9b3b 100644
--- a/offapi/com/sun/star/embed/XEmbeddedObject.idl
+++ b/offapi/com/sun/star/embed/XEmbeddedObject.idl
@@ -27,61 +27,20 @@
 #ifndef __com_sun_star_embed_XEmbeddedObject_idl__
 #define __com_sun_star_embed_XEmbeddedObject_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XEmbeddedClient_idl__
 #include <com/sun/star/embed/XEmbeddedClient.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XVisualObject_idl__
 #include <com/sun/star/embed/XVisualObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XClassifiedObject_idl__
 #include <com/sun/star/embed/XClassifiedObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XComponentSupplier_idl__
 #include <com/sun/star/embed/XComponentSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStateChangeBroadcaster_idl__
 #include <com/sun/star/embed/XStateChangeBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_embed_VerbDescriptor_idl__
 #include <com/sun/star/embed/VerbDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_embed_UnreachableStateException_idl__
 #include <com/sun/star/embed/UnreachableStateException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_NeedsRunningStateException_idl__
 #include <com/sun/star/embed/NeedsRunningStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseable_idl__
 #include <com/sun/star/util/XCloseable.idl>
-#endif
 
 
 
@@ -97,7 +56,7 @@ published interface XEmbeddedObject
     // INTERFACES
     //
     //------------------------------------------------------------------------
-    /** represents common visualisation functionality for embedded objects.
+    /** represents common visualization functionality for embedded objects.
      */
     interface XVisualObject;
 
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl b/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
index 9a71b99e871b..e6bf4b2fe128 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
 #define __com_sun_star_embed_XEncryptionProtectedSource_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl b/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
index 5930e8490678..f83937c4709c 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XEncryptionProtectedSource2_idl__
 #define __com_sun_star_embed_XEncryptionProtectedSource2_idl__
 
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
 #include <com/sun/star/embed/XEncryptionProtectedSource.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XExtendedStorageStream.idl b/offapi/com/sun/star/embed/XExtendedStorageStream.idl
index 397358db57ec..0bacaaa574ac 100644
--- a/offapi/com/sun/star/embed/XExtendedStorageStream.idl
+++ b/offapi/com/sun/star/embed/XExtendedStorageStream.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_embed_XExtendedStorageStream_idl__
 #define __com_sun_star_embed_XExtendedStorageStream_idl__
 
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XSeekable_idl__
 #include <com/sun/star/io/XSeekable.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
 #include <com/sun/star/embed/XEncryptionProtectedSource.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactedObject_idl__
 #include <com/sun/star/embed/XTransactedObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__
 #include <com/sun/star/embed/XTransactionBroadcaster.idl>
-#endif
 
 //============================================================================
 
@@ -91,7 +71,7 @@ published interface XExtendedStorageStream
     /** allows to set password to the stream.
 
         <p>
-        This interface must be supported by a stream with readwrite access
+        This interface must be supported by a stream with read-write access
         to allow to set a password that should be used next time the
         stream is stored if the encryption is supported.
         </p>
diff --git a/offapi/com/sun/star/embed/XHatchWindow.idl b/offapi/com/sun/star/embed/XHatchWindow.idl
index 33733958f6cd..e8438e85abc4 100644
--- a/offapi/com/sun/star/embed/XHatchWindow.idl
+++ b/offapi/com/sun/star/embed/XHatchWindow.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_embed_XHatchWindow_idl__
 #define __com_sun_star_embed_XHatchWindow_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XHatchWindowController_idl__
 #include <com/sun/star/embed/XHatchWindowController.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XHatchWindowController.idl b/offapi/com/sun/star/embed/XHatchWindowController.idl
index 7ec2e0c5a5bb..7f3310f60da2 100644
--- a/offapi/com/sun/star/embed/XHatchWindowController.idl
+++ b/offapi/com/sun/star/embed/XHatchWindowController.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XHatchWindowController_idl__
 #define __com_sun_star_embed_XHatchWindowController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XHatchWindowFactory.idl b/offapi/com/sun/star/embed/XHatchWindowFactory.idl
index 79d8db04832d..eae4d0769578 100644
--- a/offapi/com/sun/star/embed/XHatchWindowFactory.idl
+++ b/offapi/com/sun/star/embed/XHatchWindowFactory.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_embed_XHatchWindowFactory_idl__
 #define __com_sun_star_embed_XHatchWindowFactory_idl__
 
-#ifndef __com_sun_star_embed_XHatchWindow_idl__
 #include <com/sun/star/embed/XHatchWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
 #include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl b/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
index 1f2cdcf132f9..95e3e79add4b 100644
--- a/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
+++ b/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
@@ -27,53 +27,18 @@
 #ifndef __com_sun_star_embed_XHierarchicalStorageAccess_idl__
 #define __com_sun_star_embed_XHierarchicalStorageAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XExtendedStorageStream_idl__
 #include <com/sun/star/embed/XExtendedStorageStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
 #include <com/sun/star/embed/StorageWrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
 #include <com/sun/star/embed/InvalidStorageException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
 #include <com/sun/star/packages/WrongPasswordException.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
 #include <com/sun/star/packages/NoEncryptionException.idl>
-#endif
 
 
 //============================================================================
@@ -163,7 +128,7 @@ published interface XHierarchicalStorageAccess
             can be a combination of <type>ElementModes</type> values
 
         @param sPassword
-            this parameter allowes to specify a reading password for the
+            this parameter allows to specify a reading password for the
             stream, the password must be a correct one, otherwise an
             exception will be thrown
 
@@ -203,7 +168,7 @@ published interface XHierarchicalStorageAccess
             the path to the element to remove
 
         @throws ::com::sun::star::embed::InvalidStorageException
-            this storage is in invalid state for eny reason
+            this storage is in invalid state for any reason
 
         @throws ::com::sun::star::lang::IllegalArgumentException
             an illegal argument is provided
diff --git a/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl b/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl
index 0df83ea33580..ca38599f54d1 100644
--- a/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl
+++ b/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XHierarchicalStorageAccess2_idl__
 #define __com_sun_star_embed_XHierarchicalStorageAccess2_idl__
 
-#ifndef __com_sun_star_embed_XHierarchicalStorageAccess_idl__
 #include <com/sun/star/embed/XHierarchicalStorageAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XInplaceClient.idl b/offapi/com/sun/star/embed/XInplaceClient.idl
index b4edc9794c7e..9e1312377910 100644
--- a/offapi/com/sun/star/embed/XInplaceClient.idl
+++ b/offapi/com/sun/star/embed/XInplaceClient.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_embed_XInplaceClient_idl__
 #define __com_sun_star_embed_XInplaceClient_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XLayoutManager_idl__
 #include <com/sun/star/frame/XLayoutManager.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
 #include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
 
 
 //============================================================================
@@ -193,7 +167,7 @@ interface XInplaceClient: com::sun::star::uno::XInterface
         raises( ::com::sun::star::embed::WrongStateException );
 
     //------------------------------------------------------------------------
-    /** provides accelerator table the object whants to use while it is
+    /** provides accelerator table the object wants to use while it is
         inplace active.
 
         @param aKeys
diff --git a/offapi/com/sun/star/embed/XInplaceObject.idl b/offapi/com/sun/star/embed/XInplaceObject.idl
index 3ca6bdf359fb..c21b9ba80c66 100644
--- a/offapi/com/sun/star/embed/XInplaceObject.idl
+++ b/offapi/com/sun/star/embed/XInplaceObject.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_embed_XInplaceObject_idl__
 #define __com_sun_star_embed_XInplaceObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
 #include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
 
 
 
@@ -90,7 +79,7 @@ published interface XInplaceObject: com::sun::star::uno::XInterface
     /** enables or disables modeless dialogs of the object.
 
         <p>
-        In case contaner whants to show a modal dialog it should disable
+        In case container wants to show a modal dialog it should disable
         modeless of embedded object dialogs with this call. Later the same
         call can be used to enable it.
         </p>
@@ -110,7 +99,7 @@ published interface XInplaceObject: com::sun::star::uno::XInterface
                 ::com::sun::star::uno::Exception );
 
     //------------------------------------------------------------------------
-    /** provides accelerator table the container whants to use during inplace
+    /** provides accelerator table the container wants to use during inplace
         editing.
 
         @return
diff --git a/offapi/com/sun/star/embed/XInsertObjectDialog.idl b/offapi/com/sun/star/embed/XInsertObjectDialog.idl
index 7b98a1c767a2..6095d0072e76 100644
--- a/offapi/com/sun/star/embed/XInsertObjectDialog.idl
+++ b/offapi/com/sun/star/embed/XInsertObjectDialog.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_embed_XInsertObjectDialog_idl__
 #define __com_sun_star_embed_XInsertObjectDialog_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InsertedObjectInfo_idl__
 #include <com/sun/star/embed/InsertedObjectInfo.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
@@ -69,7 +49,7 @@ published interface XInsertObjectDialog: com::sun::star::uno::XInterface
 
         <p>
         The dialog allows for user to do a number of choices that are container
-        related. This infomation will be returned in the
+        related. This information will be returned in the
         <type>InsertedObjectInfo</type> object.
         <p>
 
diff --git a/offapi/com/sun/star/embed/XLinkCreator.idl b/offapi/com/sun/star/embed/XLinkCreator.idl
index be4bbe613288..9671dbda6706 100644
--- a/offapi/com/sun/star/embed/XLinkCreator.idl
+++ b/offapi/com/sun/star/embed/XLinkCreator.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_embed_XLinkCreator_idl__
 #define __com_sun_star_embed_XLinkCreator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/embed/XLinkFactory.idl b/offapi/com/sun/star/embed/XLinkFactory.idl
index cd77fbfe0dbb..4af985e2546b 100644
--- a/offapi/com/sun/star/embed/XLinkFactory.idl
+++ b/offapi/com/sun/star/embed/XLinkFactory.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_embed_XLinkFactory_idl__
 #define __com_sun_star_embed_XLinkFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XLinkageSupport.idl b/offapi/com/sun/star/embed/XLinkageSupport.idl
index a4a53c36e7a8..e52a94ab6d82 100644
--- a/offapi/com/sun/star/embed/XLinkageSupport.idl
+++ b/offapi/com/sun/star/embed/XLinkageSupport.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_embed_XLinkageSupport_idl__
 #define __com_sun_star_embed_XLinkageSupport_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XCommonEmbedPersist_idl__
 #include <com/sun/star/embed/XCommonEmbedPersist.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
 
 //============================================================================
 
@@ -113,7 +99,7 @@ published interface XLinkageSupport: XCommonEmbedPersist
         <p>
             Most of embedded objects will not support this interface, but some
         of them can do it, to allow conversion from link to object. After
-        the conversion the object does not change, so interface set staies the
+        the conversion the object does not change, so interface set stays the
         same, but the object is not a link any more.
         </p>
 
diff --git a/offapi/com/sun/star/embed/XOLESimpleStorage.idl b/offapi/com/sun/star/embed/XOLESimpleStorage.idl
index ac39370e8a8f..796588dfac41 100644
--- a/offapi/com/sun/star/embed/XOLESimpleStorage.idl
+++ b/offapi/com/sun/star/embed/XOLESimpleStorage.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_embed_XOLESimpleStorage_idl__
 #define __com_sun_star_embed_XOLESimpleStorage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactedObject_idl__
 #include <com/sun/star/embed/XTransactedObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XClassifiedObject_idl__
 #include <com/sun/star/embed/XClassifiedObject.idl>
-#endif
 
 
 //============================================================================
@@ -55,7 +41,7 @@ module com { module sun { module star { module embed {
 
     <p>
     This is a simple container allowing the access to OLE storages. The
-    subcomponents are either OLE storages themself or streams.
+    subcomponents are either OLE storages themselves or streams.
     </p>
 */
 published interface XOLESimpleStorage
@@ -72,7 +58,7 @@ published interface XOLESimpleStorage
     interface ::com::sun::star::container::XNameContainer;
 
     //------------------------------------------------------------------------
-    /** interface <type>XComponent</type> allows to exclicitly free resources
+    /** interface <type>XComponent</type> allows to explicitly free resources
         and break cyclic references.
     */
     interface ::com::sun::star::lang::XComponent;
@@ -81,7 +67,7 @@ published interface XOLESimpleStorage
     /** interface <type>XTransactedObject</type> allows transacted access to
         an object.
 
-        <p>The storages are always opened in transdacted mode, the
+        <p>The storages are always opened in transacted mode, the
         <type>XTransactedObject</type> interface allows to commit the storage.
         </p>
     */
diff --git a/offapi/com/sun/star/embed/XOptimizedStorage.idl b/offapi/com/sun/star/embed/XOptimizedStorage.idl
index d51371fadfbb..1d58b3ea37f3 100644
--- a/offapi/com/sun/star/embed/XOptimizedStorage.idl
+++ b/offapi/com/sun/star/embed/XOptimizedStorage.idl
@@ -27,65 +27,21 @@
 #ifndef __com_sun_star_embed_XOptimizedStorage_idl__
 #define __com_sun_star_embed_XOptimizedStorage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
 #include <com/sun/star/embed/StorageWrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
 #include <com/sun/star/embed/InvalidStorageException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__
 #include <com/sun/star/packages/EncryptionNotAllowedException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
 #include <com/sun/star/packages/NoRawFormatException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
 #include <com/sun/star/packages/WrongPasswordException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
 
 //============================================================================
 
@@ -94,13 +50,13 @@
 //============================================================================
 /** This is a temporary interface that is introduced to temporarily optimize
     the document storing process. PLEASE DO NOT USE IT, it might change in any
-    time and will be depricated soon!
+    time and will be deprecated soon!
     Another solution will be introduced as final one.
  */
 published interface XOptimizedStorage
 {
     // -----------------------------------------------------------------------
-    /** allows to insert a raw stream representing nonencrypted stream with
+    /** allows to insert a raw stream representing non-encrypted stream with
         header.
      */
     void insertRawNonEncrStreamElementDirect(
diff --git a/offapi/com/sun/star/embed/XPackageStructureCreator.idl b/offapi/com/sun/star/embed/XPackageStructureCreator.idl
index c76d4c787cc7..35996c54c710 100644
--- a/offapi/com/sun/star/embed/XPackageStructureCreator.idl
+++ b/offapi/com/sun/star/embed/XPackageStructureCreator.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XPackageStructureCreator_idl__
 #define __com_sun_star_embed_XPackageStructureCreator_idl__
 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/embed/XPersistanceHolder.idl b/offapi/com/sun/star/embed/XPersistanceHolder.idl
index 5528fe62e143..7b3a94b2697e 100644
--- a/offapi/com/sun/star/embed/XPersistanceHolder.idl
+++ b/offapi/com/sun/star/embed/XPersistanceHolder.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_embed_XPersistanceHolder_idl__
 #define __com_sun_star_embed_XPersistanceHolder_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
 
 //=============================================================================
 
@@ -49,7 +41,7 @@
 published interface XPersistanceHolder: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** disconnects the object from the persistance.
+    /** disconnects the object from the persistence.
 
         @throws com::sun::star::io::IOException
             in case of io problems
@@ -62,10 +54,10 @@ published interface XPersistanceHolder: com::sun::star::uno::XInterface
                 ::com::sun::star::uno::Exception );
 
     //-------------------------------------------------------------------------
-    /** connects the object to a persistance.
+    /** connects the object to a persistence.
 
         @param xStream
-            a stream that specify the persistance
+            a stream that specify the persistence
 
         @throws com::sun::star::io::IOException
             in case of io problems
diff --git a/offapi/com/sun/star/embed/XRelationshipAccess.idl b/offapi/com/sun/star/embed/XRelationshipAccess.idl
index 3c934caf1f33..61785c8ac342 100644
--- a/offapi/com/sun/star/embed/XRelationshipAccess.idl
+++ b/offapi/com/sun/star/embed/XRelationshipAccess.idl
@@ -27,39 +27,25 @@
 #ifndef __com_sun_star_embed_XRelationshipAccess_idl__
 #define __com_sun_star_embed_XRelationshipAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
 #include <com/sun/star/beans/StringPair.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //============================================================================
 
  module com {  module sun {  module star {  module embed {
 
 //============================================================================
-/** This interface allows to ge access to relationship data.
+/** This interface allows to get access to relationship data.
 
     <p>
     The relationship data is organized as a set of entries. Each of entry
     is represented by a set of tags, where each tag has unique for this entry
     name and a string value. An entry must contain at least one tag named
-    "ID", the value of this tag must be uniqued for the whole set of entries,
-    this tag is used as a uniqued identified of an entry.
+    "ID", the value of this tag must be unique for the whole set of entries,
+    this tag is used as a unique identifier of an entry.
     </p>
  */
 published interface XRelationshipAccess : ::com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl b/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
index 91a47e8f6288..785ecc9f77d3 100644
--- a/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
+++ b/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_embed_XStateChangeBroadcaster_idl__
 #define __com_sun_star_embed_XStateChangeBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_embed_XStateChangeListener_idl__
 #include <com/sun/star/embed/XStateChangeListener.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XStateChangeListener.idl b/offapi/com/sun/star/embed/XStateChangeListener.idl
index 3c552de33222..379a8ab3482a 100644
--- a/offapi/com/sun/star/embed/XStateChangeListener.idl
+++ b/offapi/com/sun/star/embed/XStateChangeListener.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_embed_XStateChangeListener_idl__
 #define __com_sun_star_embed_XStateChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XStorage.idl b/offapi/com/sun/star/embed/XStorage.idl
index 0a98cfa3e8eb..8304224704bb 100644
--- a/offapi/com/sun/star/embed/XStorage.idl
+++ b/offapi/com/sun/star/embed/XStorage.idl
@@ -27,61 +27,20 @@
 #ifndef __com_sun_star_embed_XStorage_idl__
 #define __com_sun_star_embed_XStorage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
 #include <com/sun/star/embed/StorageWrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
 #include <com/sun/star/embed/InvalidStorageException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
 #include <com/sun/star/packages/WrongPasswordException.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
 #include <com/sun/star/packages/NoEncryptionException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
 #include <com/sun/star/packages/NoRawFormatException.idl>
-#endif
 
 
 //============================================================================
@@ -110,7 +69,7 @@ published interface XStorage
     interface ::com::sun::star::container::XNameAccess;
 
     // -----------------------------------------------------------------------
-    /** allows to controll and track lifetime of the storage.
+    /** allows to control and track lifetime of the storage.
 
         <p>
         In case a storage is disposed any call to it's methods should result
@@ -214,7 +173,7 @@ published interface XStorage
             can be a combination of <type>ElementModes</type> values
 
         @param sPassword
-            this parameter allowes to specify a reading password for the
+            this parameter allows to specify a reading password for the
             stream, the password must be a correct one, otherwise an
             exception will be thrown
 
@@ -251,8 +210,8 @@ published interface XStorage
     /** allows to get access to a child storage.
 
         <p>
-        The opened substorage must support specified in 'nOpenMode' access
-        modes. It can support 'read' mode in addition. But any child element
+        The opened substorage must support specified in "nOpenMode" access
+        modes. It can support "read" mode in addition. But any child element
         can support one of those modes only in case this mode is supported by
         parent storage.
         </p>
@@ -340,7 +299,7 @@ published interface XStorage
             the name of the substream that should be copied
 
         @param sPassword
-            this parameter allowes to specify a reading password for the
+            this parameter allows to specify a reading password for the
             stream, the password must be a correct one, otherwise an
             exception will be thrown
 
@@ -376,7 +335,7 @@ published interface XStorage
     /** allows to get copy of this storage at the state of it's last commit.
 
         <p>
-        This method makes sence only for services implementations that allow
+        This method makes sense only for services implementations that allow
         transaction in the storage.
         </p>
 
@@ -406,7 +365,7 @@ published interface XStorage
     /** allows to get copy of a child storage at the state of it's last commit.
 
         <p>
-        This method makes sence only for services implementations that allow
+        This method makes sense only for services implementations that allow
         transaction in the storage.
         </p>
 
@@ -505,7 +464,7 @@ published interface XStorage
             the name of the element to remove
 
         @throws ::com::sun::star::embed::InvalidStorageException
-            this storage is in invalid state for eny reason
+            this storage is in invalid state for any reason
 
         @throws ::com::sun::star::lang::IllegalArgumentException
             an illegal argument is provided
@@ -537,7 +496,7 @@ published interface XStorage
             the new name of the element to rename
 
         @throws ::com::sun::star::embed::InvalidStorageException
-            this storage is in invalid state for eny reason
+            this storage is in invalid state for any reason
 
         @throws ::com::sun::star::lang::IllegalArgumentException
             an illegal argument is provided
@@ -581,7 +540,7 @@ published interface XStorage
             the name of the result element in destination storage
 
         @throws ::com::sun::star::embed::InvalidStorageException
-            this storage is in invalid state for eny reason
+            this storage is in invalid state for any reason
 
         @throws ::com::sun::star::container::NoSuchElementException
             there is no specified source element in this storage
@@ -625,7 +584,7 @@ published interface XStorage
             the name of the result element in destination storage
 
         @throws ::com::sun::star::embed::InvalidStorageException
-            this storage is in invalid state for eny reason
+            this storage is in invalid state for any reason
 
         @throws ::com::sun::star::container::NoSuchElementException
             there is no specified source element in this storage
diff --git a/offapi/com/sun/star/embed/XStorage2.idl b/offapi/com/sun/star/embed/XStorage2.idl
index cf4f9907b66e..1cd973cfbf3a 100644
--- a/offapi/com/sun/star/embed/XStorage2.idl
+++ b/offapi/com/sun/star/embed/XStorage2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_embed_XStorage2_idl__
 #define __com_sun_star_embed_XStorage2_idl__
 
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XStorageRawAccess.idl b/offapi/com/sun/star/embed/XStorageRawAccess.idl
index b70b2e3c1235..c8d989aff7e9 100644
--- a/offapi/com/sun/star/embed/XStorageRawAccess.idl
+++ b/offapi/com/sun/star/embed/XStorageRawAccess.idl
@@ -27,49 +27,17 @@
 #ifndef __com_sun_star_embed_XStorageRawAccess_idl__
 #define __com_sun_star_embed_XStorageRawAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
 #include <com/sun/star/embed/StorageWrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
 #include <com/sun/star/embed/InvalidStorageException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
 #include <com/sun/star/packages/NoEncryptionException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
 #include <com/sun/star/packages/NoRawFormatException.idl>
-#endif
 
 
 //============================================================================
@@ -86,7 +54,7 @@ published interface XStorageRawAccess
 
         <p>
         This method returns a stream from the package as it is stored there,
-        without any decompression/decription and etc. This method can be
+        without any decompression/description and etc. This method can be
         helpful to check file consistency, for example by signing.
         </p>
 
@@ -126,11 +94,11 @@ published interface XStorageRawAccess
         <p>
         This method allows to transport encrypted streams without decryption.
         Mainly this method is introduced to allow to copy one encrypted
-        storage stream to another without decryption. It is not reccomended to
+        storage stream to another without decryption. It is not recommended to
         use this method outside of storage implementation since different
         storages implementation could have different encryption format. If the
         method is used outside of storage implementation the user code is
-        resposible to get sure that the raw format of source and target
+        responsible to get sure that the raw format of source and target
         storages is the same.
         </p>
 
@@ -179,7 +147,7 @@ published interface XStorageRawAccess
         header.
 
         <p>
-        This method allows to insert a stream retrived by
+        This method allows to insert a stream retrieved by
         <method>XStorageRawAccess::getRawEncrStreamElement()</method> into a
         storage.
         </p>
@@ -187,7 +155,7 @@ published interface XStorageRawAccess
         <p>
         This method allows to transport encrypted streams without decryption.
         Mainly this method is introduced to allow to copy one encrypted
-        storage stream to another without decryption. It is not reccomended to
+        storage stream to another without decryption. It is not recommended to
         use this method outside of storage implementation since different
         storages implementation could have different encryption format.
         </p>
diff --git a/offapi/com/sun/star/embed/XTransactedObject.idl b/offapi/com/sun/star/embed/XTransactedObject.idl
index 80f86187a7c6..81f5e749304a 100644
--- a/offapi/com/sun/star/embed/XTransactedObject.idl
+++ b/offapi/com/sun/star/embed/XTransactedObject.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_embed_XTransactedObject_idl__
 #define __com_sun_star_embed_XTransactedObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XTransactionBroadcaster.idl b/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
index fb5b7d2acc06..be2927f71fac 100644
--- a/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
+++ b/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__
 #define __com_sun_star_embed_XTransactionBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_embed_XTransactionListener_idl__
 #include <com/sun/star/embed/XTransactionListener.idl>
-#endif
 
 
 //============================================================================
@@ -42,7 +38,7 @@ module com {  module sun {  module star {  module embed {
 
 //============================================================================
 
-/** broadcasts messege in case transacted object is commited or reverted.
+/** broadcasts message in case transacted object is commited or reverted.
  */
 published interface XTransactionBroadcaster: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/embed/XTransactionListener.idl b/offapi/com/sun/star/embed/XTransactionListener.idl
index 89e80956cf11..ac355e6ceba2 100644
--- a/offapi/com/sun/star/embed/XTransactionListener.idl
+++ b/offapi/com/sun/star/embed/XTransactionListener.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_embed_XTransactionListener_idl__
 #define __com_sun_star_embed_XTransactionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XTransferableSupplier.idl b/offapi/com/sun/star/embed/XTransferableSupplier.idl
index d22c6fb27769..83677602b984 100644
--- a/offapi/com/sun/star/embed/XTransferableSupplier.idl
+++ b/offapi/com/sun/star/embed/XTransferableSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_embed_XTransferableSupplier_idl__
 #define __com_sun_star_embed_XTransferableSupplier_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/embed/XVisualObject.idl b/offapi/com/sun/star/embed/XVisualObject.idl
index 158c49851a6f..dc4f3563937e 100644
--- a/offapi/com/sun/star/embed/XVisualObject.idl
+++ b/offapi/com/sun/star/embed/XVisualObject.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_embed_XVisualObject_idl__
 #define __com_sun_star_embed_XVisualObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_embed_VisualRepresentation_idl__
 #include <com/sun/star/embed/VisualRepresentation.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
 #include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
@@ -53,7 +39,7 @@
  module com {  module sun {  module star {  module embed {
 
 //=============================================================================
-/** represents common visualisation functionality for embedded objects.
+/** represents common visualization functionality for embedded objects.
  */
 published interface XVisualObject: ::com::sun::star::uno::XInterface
 {
@@ -122,7 +108,7 @@ published interface XVisualObject: ::com::sun::star::uno::XInterface
     /** retrieves visual representation of the object in preferable format.
 
         <p>
-        If the object persistance entry contains cached visual representation
+        If the object persistence entry contains cached visual representation
         then it can be retrieved by using this method even in loaded state.
         </p>
 
diff --git a/offapi/com/sun/star/embed/XWindowSupplier.idl b/offapi/com/sun/star/embed/XWindowSupplier.idl
index e878a65d21d2..644651120a84 100644
--- a/offapi/com/sun/star/embed/XWindowSupplier.idl
+++ b/offapi/com/sun/star/embed/XWindowSupplier.idl
@@ -27,24 +27,22 @@
 #ifndef __com_sun_star_embed_XWindowSupplier_idl__
 #define __com_sun_star_embed_XWindowSupplier_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //============================================================================
 
  module com {  module sun {  module star {  module embed {
 
 //============================================================================
-/** provides access to a vcl window implementation.
+/** provides access to a VCL window implementation.
  */
 published interface XWindowSupplier: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
-    /** allows to get access to a vcl window implementation.
+    /** allows to get access to a VCL window implementation.
 
         @return
-            vcl window implementation
+            VCL window implementation
      */
     ::com::sun::star::awt::XWindow getWindow();
 };
diff --git a/offapi/com/sun/star/form/DataAwareControlModel.idl b/offapi/com/sun/star/form/DataAwareControlModel.idl
index d8d52376de8e..7ca7944f6659 100644
--- a/offapi/com/sun/star/form/DataAwareControlModel.idl
+++ b/offapi/com/sun/star/form/DataAwareControlModel.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #define __com_sun_star_form_DataAwareControlModel_idl__
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XBoundComponent_idl__
 #include <com/sun/star/form/XBoundComponent.idl>
-#endif
 
-#ifndef __com_sun_star_form_XLoadListener_idl__
 #include <com/sun/star/form/XLoadListener.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
@@ -57,7 +47,7 @@
 /** is an abstract service for specialized <type>FormControlModel</type>s
     which are data aware and thus can be bound to a data source.
 
-    <p>The connection between a data-aware control model and a form which's data the
+    <p>The connection between a data-aware control model and a form whose data the
     control should display is made by parentship relations. The parent of a data-aware
     control model (see <type scope="com::sun::star::container">XChild</type>, inherited
     via the <type>FormControlModel</type> and <type>FormComponent</type> services) has
@@ -89,13 +79,13 @@ published service DataAwareControlModel
 
         <p>In the context of a control model which is data-aware, the semantics of <em>default value</em>
         (see <type>XReset</type>) is as follows:<br/>
-        If (and only if) the control is valid bound to a column of it's <typee scope="com::sun::star::form::component">DataForm</type>, and the form
+        If (and only if) the control is valid bound to a column of it's <type scope="com::sun::star::form::component">DataForm</type>, and the form
         is not positioned on a new record (see <member scope="com::sun::star::sdb">RowSet::IsNew</member>), then
         <member>XReset::reset</member> does not reset the model's value to it's default value, but uses the
         underlying column value.<br/>
         In all other cases, the model is reset to the default value as specified by the respective property.</p>
 
-        <p>For an example, have a look at the <type scope="com::sun::star::form::component">TextField</type>. It inherites
+        <p>For an example, have a look at the <type scope="com::sun::star::form::component">TextField</type>. It inherits
         the <member scope="com::sun::star::awt">UnoControlEditModel::Text</member> property from the underlying
         service, and additionally specifies the <member scope="com::sun::star::form::component">TextField::DefaultText</member>.
         </p>
@@ -157,7 +147,7 @@ published service DataAwareControlModel
         with the latter describing the content of the former. For instance, you may have a
         <type scope="com::sun::star::form::component">TextField</type>, which is bound to the e-mail
         column of your data source. Then you will probably add a
-        <type scope="com::sun::star::form::component">FixedText</type> which's label is "E-Mail",
+        <type scope="com::sun::star::form::component">FixedText</type> whose label is "E-Mail",
         and associate it with the TextField by setting it as <member>LabelControl</member>.<br/>
         Now if you imagine a component offering data search in a form, this component will examine
         the <member>LabelControl</member> property, find the <type scope="com::sun::star::form::component">FixedText</type>,
@@ -177,8 +167,8 @@ published service DataAwareControlModel
                 is required. Which kind of service is in the request depends on the type of the control model.<br/>
 
                 For instance, text fields (<type scope="com::sun::star::form::component">TextField</type>) can be
-                labelled by label controls only (<type scope="com::sun::star::form::component">FixedText</type>),
-                and radio buttons (<type scope="com::sun::star::form::component">RadioButton</type>) can be labelled
+                labeled by label controls only (<type scope="com::sun::star::form::component">FixedText</type>),
+                and radio buttons (<type scope="com::sun::star::form::component">RadioButton</type>) can be labeled
                 by group boxes (<type scope="com::sun::star::form::component">GroupBox</type>) only.
             </li>
         </ul>
diff --git a/offapi/com/sun/star/form/DatabaseDeleteEvent.idl b/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
index adad03001091..e34bb91307cf 100644
--- a/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
+++ b/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_DatabaseDeleteEvent_idl__
 #define __com_sun_star_form_DatabaseDeleteEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/DatabaseParameterEvent.idl b/offapi/com/sun/star/form/DatabaseParameterEvent.idl
index f933f612e345..1a1c53e10b4f 100644
--- a/offapi/com/sun/star/form/DatabaseParameterEvent.idl
+++ b/offapi/com/sun/star/form/DatabaseParameterEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_DatabaseParameterEvent_idl__
 #define __com_sun_star_form_DatabaseParameterEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/ErrorEvent.idl b/offapi/com/sun/star/form/ErrorEvent.idl
index b5267df0c7b5..dffba943fe0e 100644
--- a/offapi/com/sun/star/form/ErrorEvent.idl
+++ b/offapi/com/sun/star/form/ErrorEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_ErrorEvent_idl__
 #define __com_sun_star_form_ErrorEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/FormComponent.idl b/offapi/com/sun/star/form/FormComponent.idl
index 489f97e66795..56dcf480e0d5 100644
--- a/offapi/com/sun/star/form/FormComponent.idl
+++ b/offapi/com/sun/star/form/FormComponent.idl
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_form_FormComponent_idl__
 #define __com_sun_star_form_FormComponent_idl__
 
-#ifndef __com_sun_star_form_XFormComponent_idl__
 #include <com/sun/star/form/XFormComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_io_XPersistObject_idl__
 #include <com/sun/star/io/XPersistObject.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyBag_idl__
 #include <com/sun/star/beans/PropertyBag.idl>
-#endif
 
 
 //=============================================================================
@@ -100,7 +88,7 @@ published service FormComponent
         use by other instances.</p>
 
         <p>Note that dynamic properties added to a form component are, by definition,
-        removeable. That is, the <member scope="com::sun::star::beans">PropertyAttribute::REMOVEABLE</member>
+        removable. That is, the <member scope="com::sun::star::beans">PropertyAttribute::REMOVEABLE</member>
         will always be set, even if you do not specify it in the
         <member scope="com::sun::star::beans">XPropertyContainer::addProperty</member> call.</p>
 
diff --git a/offapi/com/sun/star/form/FormComponents.idl b/offapi/com/sun/star/form/FormComponents.idl
index 475deb7659d3..32feb2da0b2f 100644
--- a/offapi/com/sun/star/form/FormComponents.idl
+++ b/offapi/com/sun/star/form/FormComponents.idl
@@ -27,22 +27,10 @@
 #ifndef __com_sun_star_form_FormComponents_idl__
 #define __com_sun_star_form_FormComponents_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-
 #include <com/sun/star/script/XEventAttacherManager.idl>
 
 //=============================================================================
@@ -91,7 +79,7 @@ published service FormComponents
         <p>For instance, at any time you can obtain the events associated with the <code>n</code><super>th</super>
         element in the form components by calling
         <member scope="com::sun::star::script">XEventAttacherManager::getScriptEvents</member>
-        with paramter <code>n</code>. In particular, this invariant is always met, even after you
+        with parameter <code>n</code>. In particular, this invariant is always met, even after you
         inserted/removed elements into/from the container.</p>
      */
     interface com::sun::star::script::XEventAttacherManager;
diff --git a/offapi/com/sun/star/form/FormControlModel.idl b/offapi/com/sun/star/form/FormControlModel.idl
index c0cbc6051a75..e8d1ab415ffe 100644
--- a/offapi/com/sun/star/form/FormControlModel.idl
+++ b/offapi/com/sun/star/form/FormControlModel.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_form_FormControlModel_idl__
 #define __com_sun_star_form_FormControlModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormComponent_idl__
 #include <com/sun/star/form/FormComponent.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
 #include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/FormController.idl b/offapi/com/sun/star/form/FormController.idl
index f14fd5181355..ef4dd8bc1928 100644
--- a/offapi/com/sun/star/form/FormController.idl
+++ b/offapi/com/sun/star/form/FormController.idl
@@ -27,49 +27,23 @@
 #ifndef __com_sun_star_form_FormController_idl__
 #define __com_sun_star_form_FormController_idl__
 
-#ifndef __com_sun_star_form_XFormController_idl__
 #include <com/sun/star/form/XFormController.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XTabController_idl__
 #include <com/sun/star/awt/XTabController.idl>
-#endif
 
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
 #include <com/sun/star/form/XConfirmDeleteBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
 #include <com/sun/star/sdb/XSQLErrorBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
 #include <com/sun/star/sdb/XRowSetApproveBroadcaster.idl>
-#endif
 
-#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
 #include <com/sun/star/form/XDatabaseParameterBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControllerDispatcher_idl__
 #include <com/sun/star/form/FormControllerDispatcher.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/FormControllerDispatcher.idl b/offapi/com/sun/star/form/FormControllerDispatcher.idl
index e277f95c9949..652a16647472 100644
--- a/offapi/com/sun/star/form/FormControllerDispatcher.idl
+++ b/offapi/com/sun/star/form/FormControllerDispatcher.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_FormControllerDispatcher_idl__
 #define __com_sun_star_form_FormControllerDispatcher_idl__
 
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/FormSubmitMethod.idl b/offapi/com/sun/star/form/FormSubmitMethod.idl
index a002dc32d990..7f70d86a2edc 100644
--- a/offapi/com/sun/star/form/FormSubmitMethod.idl
+++ b/offapi/com/sun/star/form/FormSubmitMethod.idl
@@ -47,7 +47,7 @@ published enum FormSubmitMethod
 
     //-------------------------------------------------------------------------
 
-    /** speficies to send the input information in a data body.
+    /** specifies to send the input information in a data body.
     */
     POST
 
diff --git a/offapi/com/sun/star/form/Forms.idl b/offapi/com/sun/star/form/Forms.idl
index 533113d4aafd..567b4336f48e 100644
--- a/offapi/com/sun/star/form/Forms.idl
+++ b/offapi/com/sun/star/form/Forms.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_form_Forms_idl__
 #define __com_sun_star_form_Forms_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponents_idl__
 #include <com/sun/star/form/FormComponents.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/PropertyBrowserController.idl b/offapi/com/sun/star/form/PropertyBrowserController.idl
index 52e50979654f..180c4c45d684 100644
--- a/offapi/com/sun/star/form/PropertyBrowserController.idl
+++ b/offapi/com/sun/star/form/PropertyBrowserController.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_form_PropertyBrowserController_idl__
 #define __com_sun_star_form_PropertyBrowserController_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
 #include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -58,7 +47,7 @@
     data binding, it's layout, and it's event binding</p>
 
     <p>For using a PropertyBrowserController, you need to
-    <ul><li>instatiate it at a service factory of your choice</li>
+    <ul><li>instantiate it at a service factory of your choice</li>
         <li>attach it to an empty frame of your choice</li>
         <li>set the IntrospectedObject property to the control model which you wish to analyze</li>
     </ul>
@@ -110,7 +99,7 @@ published service PropertyBrowserController
         The appearance of the visual component created by the controller is that 3 tab pages, one for
         each group, are displayed (of course if the control does not support any aspects of a given group,
         the group is omitted).<br/>
-        With this property, it can be controller which page is currently acticve.</p>
+        With this property, it can be controller which page is currently active.</p>
 
         <p>Valid values are (this list may be extended in the future):
         <ul><li>Generic</li>
@@ -131,7 +120,7 @@ published service PropertyBrowserController
     */
     interface com::sun::star::beans::XPropertySet;
 
-    /** allows to access the properties via indicies
+    /** allows to access the properties via indices
     */
     interface com::sun::star::beans::XFastPropertySet;
 
diff --git a/offapi/com/sun/star/form/XApproveActionBroadcaster.idl b/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
index ef53896fd501..7ce0bd7f3899 100644
--- a/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
+++ b/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
 #define __com_sun_star_form_XApproveActionBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_form_XApproveActionListener_idl__
 #include <com/sun/star/form/XApproveActionListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XApproveActionListener.idl b/offapi/com/sun/star/form/XApproveActionListener.idl
index f35ef82ba509..4cd630bbef15 100644
--- a/offapi/com/sun/star/form/XApproveActionListener.idl
+++ b/offapi/com/sun/star/form/XApproveActionListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XApproveActionListener_idl__
 #define __com_sun_star_form_XApproveActionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XBoundComponent.idl b/offapi/com/sun/star/form/XBoundComponent.idl
index 8a64b441f58a..df7c209c7a6c 100644
--- a/offapi/com/sun/star/form/XBoundComponent.idl
+++ b/offapi/com/sun/star/form/XBoundComponent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_XBoundComponent_idl__
 #define __com_sun_star_form_XBoundComponent_idl__
 
-#ifndef __com_sun_star_form_XUpdateBroadcaster_idl__
 #include <com/sun/star/form/XUpdateBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XBoundControl.idl b/offapi/com/sun/star/form/XBoundControl.idl
index 549e091ab1b5..5831888ad8fe 100644
--- a/offapi/com/sun/star/form/XBoundControl.idl
+++ b/offapi/com/sun/star/form/XBoundControl.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_XBoundControl_idl__
 #define __com_sun_star_form_XBoundControl_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XChangeBroadcaster.idl b/offapi/com/sun/star/form/XChangeBroadcaster.idl
index e67f288c0433..ba74a34d8654 100644
--- a/offapi/com/sun/star/form/XChangeBroadcaster.idl
+++ b/offapi/com/sun/star/form/XChangeBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XChangeBroadcaster_idl__
 #define __com_sun_star_form_XChangeBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_form_XChangeListener_idl__
 #include <com/sun/star/form/XChangeListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XChangeListener.idl b/offapi/com/sun/star/form/XChangeListener.idl
index 2b817320fb75..c09a98a47921 100644
--- a/offapi/com/sun/star/form/XChangeListener.idl
+++ b/offapi/com/sun/star/form/XChangeListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XChangeListener_idl__
 #define __com_sun_star_form_XChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -57,7 +53,7 @@ published interface XChangeListener: com::sun::star::lang::XEventListener
     /** is invoked when the data of a component has been changed.
 
         @param rEvent
-            A dedscriptor specifying the source of the event.
+            A descriptor specifying the source of the event.
      */
     [oneway] void changed( [in] com::sun::star::lang::EventObject rEvent );
 
diff --git a/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl b/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
index bf38373c2f49..85ab19b3a09f 100644
--- a/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
+++ b/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
 #define __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_form_XConfirmDeleteListener_idl__
 #include <com/sun/star/form/XConfirmDeleteListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XConfirmDeleteListener.idl b/offapi/com/sun/star/form/XConfirmDeleteListener.idl
index debd3db0265f..c30fb45d41d1 100644
--- a/offapi/com/sun/star/form/XConfirmDeleteListener.idl
+++ b/offapi/com/sun/star/form/XConfirmDeleteListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XConfirmDeleteListener_idl__
 #define __com_sun_star_form_XConfirmDeleteListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_sdb_RowChangeEvent_idl__
 #include <com/sun/star/sdb/RowChangeEvent.idl>
-#endif
 
 //=============================================================================
 
@@ -53,10 +49,10 @@ published interface XConfirmDeleteListener: com::sun::star::lang::XEventListener
     /** is invoked when the current record of a database form will be deleted.
 
         @param aEvent
-            A dedscriptor specifying the deletion request.
+            A descriptor specifying the deletion request.
 
         @returns
-            <TRUE/> when the row caan be deleted, otherwise <FALSE/>.
+            <TRUE/> when the row can be deleted, otherwise <FALSE/>.
      */
     boolean confirmDelete( [in] com::sun::star::sdb::RowChangeEvent aEvent );
 };
diff --git a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
index d73d1d4f9116..6644871c1c1b 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
 #define __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_form_XDatabaseParameterListener_idl__
 #include <com/sun/star/form/XDatabaseParameterListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
index 28448b136be9..acf6c8c44d1a 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_XDatabaseParameterBroadcaster2_idl__
 #define __com_sun_star_form_XDatabaseParameterBroadcaster2_idl__
 
-#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
 #include <com/sun/star/form/XDatabaseParameterBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/XDatabaseParameterListener.idl b/offapi/com/sun/star/form/XDatabaseParameterListener.idl
index 38cd22bbee3f..c673d48a1cd3 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterListener.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XDatabaseParameterListener_idl__
 #define __com_sun_star_form_XDatabaseParameterListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_form_DatabaseParameterEvent_idl__
 #include <com/sun/star/form/DatabaseParameterEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XDeleteListener.idl b/offapi/com/sun/star/form/XDeleteListener.idl
index 48a3dc6c9d6a..95e86dd12d6a 100644
--- a/offapi/com/sun/star/form/XDeleteListener.idl
+++ b/offapi/com/sun/star/form/XDeleteListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XDeleteListener_idl__
 #define __com_sun_star_form_XDeleteListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -48,7 +44,7 @@
     <p> "approveDelete" may be used to abort a deletion of the current data
     record.</p>
 
-    <p>Please do <em><b>not</b></em> use anymore, this interface is superseeded
+    <p>Please do <em><b>not</b></em> use anymore, this interface is superseded
     by <type scope="com::sun::star::form">XConfirmDeleteListener</type>.</p>
 
     @deprecated
diff --git a/offapi/com/sun/star/form/XErrorBroadcaster.idl b/offapi/com/sun/star/form/XErrorBroadcaster.idl
index 7775f23e9c8e..7f9baaa9eb90 100644
--- a/offapi/com/sun/star/form/XErrorBroadcaster.idl
+++ b/offapi/com/sun/star/form/XErrorBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XErrorBroadcaster_idl__
 #define __com_sun_star_form_XErrorBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_form_XErrorListener_idl__
 #include <com/sun/star/form/XErrorListener.idl>
-#endif
 
 
 //=============================================================================
@@ -44,7 +40,7 @@
 
 /** provides the possibility of receiving database error events.
 
-    <p>Please do <em><b>not</b></em> use anymore, this interface is superseeded
+    <p>Please do <em><b>not</b></em> use anymore, this interface is superseded
     by <type scope="com::sun::star::sdb">XSQLErrorBroadcaster</type>.</p>
 
     @deprecated
diff --git a/offapi/com/sun/star/form/XErrorListener.idl b/offapi/com/sun/star/form/XErrorListener.idl
index 7f6a6c4c74a2..5b5877d87504 100644
--- a/offapi/com/sun/star/form/XErrorListener.idl
+++ b/offapi/com/sun/star/form/XErrorListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XErrorListener_idl__
 #define __com_sun_star_form_XErrorListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_form_ErrorEvent_idl__
 #include <com/sun/star/form/ErrorEvent.idl>
-#endif
 
 
 //=============================================================================
@@ -48,7 +44,7 @@
     event is posted to the error listeners. This event may be used to
     configure the error handling of a database form.</p>
 
-    <p>Please do <em><b>not</b></em> use anymore, this interface is superseeded
+    <p>Please do <em><b>not</b></em> use anymore, this interface is superseded
     by <type scope="com::sun::star::sdb">XSQLErrorListener</type>.</p>
 
     @deprecated
diff --git a/offapi/com/sun/star/form/XForm.idl b/offapi/com/sun/star/form/XForm.idl
index 4fc0daaf427a..2c65b6a54b43 100644
--- a/offapi/com/sun/star/form/XForm.idl
+++ b/offapi/com/sun/star/form/XForm.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_XForm_idl__
 #define __com_sun_star_form_XForm_idl__
 
-#ifndef __com_sun_star_form_XFormComponent_idl__
 #include <com/sun/star/form/XFormComponent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XFormComponent.idl b/offapi/com/sun/star/form/XFormComponent.idl
index 7d32c30deef1..24fe4996c9fd 100644
--- a/offapi/com/sun/star/form/XFormComponent.idl
+++ b/offapi/com/sun/star/form/XFormComponent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_XFormComponent_idl__
 #define __com_sun_star_form_XFormComponent_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XFormController.idl b/offapi/com/sun/star/form/XFormController.idl
index e78de565f7ce..47835242e42d 100644
--- a/offapi/com/sun/star/form/XFormController.idl
+++ b/offapi/com/sun/star/form/XFormController.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_XFormController_idl__
 #define __com_sun_star_form_XFormController_idl__
 
-#ifndef __com_sun_star_awt_XTabController_idl__
 #include <com/sun/star/awt/XTabController.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XControl_idl__
 #include <com/sun/star/awt/XControl.idl>
-#endif
 
-#ifndef __com_sun_star_form_XFormControllerListener_idl__
 #include <com/sun/star/form/XFormControllerListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XFormControllerListener.idl b/offapi/com/sun/star/form/XFormControllerListener.idl
index 6d12ab85eba8..ec61cb3d493d 100644
--- a/offapi/com/sun/star/form/XFormControllerListener.idl
+++ b/offapi/com/sun/star/form/XFormControllerListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XFormControllerListener_idl__
 #define __com_sun_star_form_XFormControllerListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -57,7 +53,7 @@ published interface XFormControllerListener: com::sun::star::lang::XEventListene
         the controller was not previously activated.
 
         @param rEvent
-            the event happend.
+            the event happened.
      */
     [oneway] void formActivated( [in] com::sun::star::lang::EventObject rEvent );
 
@@ -68,7 +64,7 @@ published interface XFormControllerListener: com::sun::star::lang::XEventListene
         words, no control of the controller owns the focus.
 
         @param rEvent
-            the event happend.
+            the event happened.
      */
     [oneway] void formDeactivated( [in] com::sun::star::lang::EventObject rEvent );
 
diff --git a/offapi/com/sun/star/form/XFormsSupplier.idl b/offapi/com/sun/star/form/XFormsSupplier.idl
index 121ee9ffac8b..c342d3462ead 100644
--- a/offapi/com/sun/star/form/XFormsSupplier.idl
+++ b/offapi/com/sun/star/form/XFormsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XFormsSupplier_idl__
 #define __com_sun_star_form_XFormsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XFormsSupplier2.idl b/offapi/com/sun/star/form/XFormsSupplier2.idl
index 30a22e02b91c..b0ab96e52d91 100644
--- a/offapi/com/sun/star/form/XFormsSupplier2.idl
+++ b/offapi/com/sun/star/form/XFormsSupplier2.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_XFormsSupplier2_idl__
 #define __com_sun_star_form_XFormsSupplier2_idl__
 
-#ifndef __com_sun_star_form_XFormsSupplier_idl__
 #include <com/sun/star/form/XFormsSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/XGrid.idl b/offapi/com/sun/star/form/XGrid.idl
index f60fa5be9cee..b1aec8c904fd 100644
--- a/offapi/com/sun/star/form/XGrid.idl
+++ b/offapi/com/sun/star/form/XGrid.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_XGrid_idl__
 #define __com_sun_star_form_XGrid_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XGridColumnFactory.idl b/offapi/com/sun/star/form/XGridColumnFactory.idl
index 76d1b3735b9f..ae44b6a15c9d 100644
--- a/offapi/com/sun/star/form/XGridColumnFactory.idl
+++ b/offapi/com/sun/star/form/XGridColumnFactory.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_XGridColumnFactory_idl__
 #define __com_sun_star_form_XGridColumnFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XGridFieldDataSupplier.idl b/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
index 5a4aa9b57fec..7c6202a37c5f 100644
--- a/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
+++ b/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__
 #define __com_sun_star_form_XGridFieldDataSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
 
 //=============================================================================
@@ -46,7 +42,7 @@
 
     <p>You can retrieve the data type information and the data in a row.</p>
 
-    <p>This interface allows to retrieve data even for rows which are not current, which is quite usefull,
+    <p>This interface allows to retrieve data even for rows which are not current, which is quite useful,
     as normally, you can't affect the current row in a grid control without moving the cursor of the underlying
     <type scope="com::sun::star::form::component">DataForm</type>.</p>
 
diff --git a/offapi/com/sun/star/form/XGridPeer.idl b/offapi/com/sun/star/form/XGridPeer.idl
index 57d815caa214..08cca59f9994 100644
--- a/offapi/com/sun/star/form/XGridPeer.idl
+++ b/offapi/com/sun/star/form/XGridPeer.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XGridPeer_idl__
 #define __com_sun_star_form_XGridPeer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XImageProducerSupplier.idl b/offapi/com/sun/star/form/XImageProducerSupplier.idl
index 74a52e8e526c..312f5c78159d 100644
--- a/offapi/com/sun/star/form/XImageProducerSupplier.idl
+++ b/offapi/com/sun/star/form/XImageProducerSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XImageProducerSupplier_idl__
 #define __com_sun_star_form_XImageProducerSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XImageProducer_idl__
 #include <com/sun/star/awt/XImageProducer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XInsertListener.idl b/offapi/com/sun/star/form/XInsertListener.idl
index 63da8d514c4b..9d107289551f 100644
--- a/offapi/com/sun/star/form/XInsertListener.idl
+++ b/offapi/com/sun/star/form/XInsertListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XInsertListener_idl__
 #define __com_sun_star_form_XInsertListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** allows to receive notifications about insertions into a database form.
 
     <p>Please do <em><b>not</b></em> use anymore, this interface is deprecated, and
-    superseeded by functionality from the <type scope="com::sun::star::form::component">DataForm</type>
+    superseded by functionality from the <type scope="com::sun::star::form::component">DataForm</type>
     service, as well as the <type scope="com::sun::star::sdbc">XRowSetListener</type> and
     <type scope="com::sun::star::sdb">XRowSetApproveListener</type> interfaces.</p>
 
diff --git a/offapi/com/sun/star/form/XLoadListener.idl b/offapi/com/sun/star/form/XLoadListener.idl
index afbf72027e9b..101f9c26c84a 100644
--- a/offapi/com/sun/star/form/XLoadListener.idl
+++ b/offapi/com/sun/star/form/XLoadListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XLoadListener_idl__
 #define __com_sun_star_form_XLoadListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -58,7 +54,7 @@ published interface XLoadListener: com::sun::star::lang::XEventListener
     /** is invoked when the object has successfully connected to a datasource.
 
         @param aEvent
-            the event happend.
+            the event happened.
      */
     [oneway] void loaded( [in] com::sun::star::lang::EventObject aEvent );
 
@@ -69,7 +65,7 @@ published interface XLoadListener: com::sun::star::lang::XEventListener
         the event source before the object is unloaded.</p>
 
         @param aEvent
-            the event happend.
+            the event happened.
      */
     [oneway] void unloading( [in] com::sun::star::lang::EventObject aEvent );
 
@@ -78,7 +74,7 @@ published interface XLoadListener: com::sun::star::lang::XEventListener
     /** is invoked after the object has disconnected from a datasource.
 
         @param aEvent
-            the event happend.
+            the event happened.
      */
     [oneway] void unloaded( [in] com::sun::star::lang::EventObject aEvent );
 
@@ -90,7 +86,7 @@ published interface XLoadListener: com::sun::star::lang::XEventListener
         to the event source until they get the reloaded event.</p>
 
         @param aEvent
-            the event happend.
+            the event happened.
      */
     [oneway] void reloading( [in] com::sun::star::lang::EventObject aEvent );
 
@@ -99,7 +95,7 @@ published interface XLoadListener: com::sun::star::lang::XEventListener
     /** is invoked when the object has been reloaded.
 
         @param aEvent
-            the event happend.
+            the event happened.
      */
     [oneway] void reloaded( [in] com::sun::star::lang::EventObject aEvent );
 };
diff --git a/offapi/com/sun/star/form/XLoadable.idl b/offapi/com/sun/star/form/XLoadable.idl
index 1c1abb68059c..01363e892064 100644
--- a/offapi/com/sun/star/form/XLoadable.idl
+++ b/offapi/com/sun/star/form/XLoadable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XLoadable_idl__
 #define __com_sun_star_form_XLoadable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_form_XLoadListener_idl__
 #include <com/sun/star/form/XLoadListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/XPositioningListener.idl b/offapi/com/sun/star/form/XPositioningListener.idl
index 391380e1d3a4..653922f6a510 100644
--- a/offapi/com/sun/star/form/XPositioningListener.idl
+++ b/offapi/com/sun/star/form/XPositioningListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XPositioningListener_idl__
 #define __com_sun_star_form_XPositioningListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** allows to receive notifications about cursor movements into a database form.
 
     <p>Please do <em><b>not</b></em> use anymore, this interface is deprecated, and
-    superseeded by functionality from the <type scope="com::sun::star::form::component">DataForm</type>
+    superseded by functionality from the <type scope="com::sun::star::form::component">DataForm</type>
     service, as well as the <type scope="com::sun::star::sdbc">XRowSetListener</type>.</p>
 
     @deprecated
diff --git a/offapi/com/sun/star/form/XReset.idl b/offapi/com/sun/star/form/XReset.idl
index 9ef8f37e649b..7173c38ef66a 100644
--- a/offapi/com/sun/star/form/XReset.idl
+++ b/offapi/com/sun/star/form/XReset.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XReset_idl__
 #define __com_sun_star_form_XReset_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_form_XResetListener_idl__
 #include <com/sun/star/form/XResetListener.idl>
-#endif
 
 
 //=============================================================================
@@ -44,7 +40,7 @@
 
 /** provides functionality to reset components to some default values.
 
-    <p>The semantincs of <em>default value</em> depends on the providing service.</p>
+    <p>The semantics of <em>default value</em> depends on the providing service.</p>
  */
 published interface XReset: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/form/XResetListener.idl b/offapi/com/sun/star/form/XResetListener.idl
index b7f338fe59fb..3806d5868283 100644
--- a/offapi/com/sun/star/form/XResetListener.idl
+++ b/offapi/com/sun/star/form/XResetListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XResetListener_idl__
 #define __com_sun_star_form_XResetListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -42,7 +38,7 @@
 
 //=============================================================================
 
-/** is the interface for receiving notificaions about reset events.
+/** is the interface for receiving notifications about reset events.
 
     <p>The listener is called if a component implementing the
     <type>XReset</type> interface performs a reset.</br>
@@ -63,10 +59,10 @@ published interface XResetListener: com::sun::star::lang::XEventListener
     /** is invoked before a component is reset.
 
         @param rEvent
-            the event happend.
+            the event happened.
 
         @returns
-            <TRUE/> when reset was approved, <FALSE/> when the reset operation should be cancelled.
+            <TRUE/> when reset was approved, <FALSE/> when the reset operation should be canceled.
      */
     boolean approveReset( [in] com::sun::star::lang::EventObject rEvent );
 
@@ -75,7 +71,7 @@ published interface XResetListener: com::sun::star::lang::XEventListener
     /** is invoked when a component has been reset.
 
         @param rEvent
-            the event happend.
+            the event happened.
      */
     [oneway] void resetted( [in] com::sun::star::lang::EventObject rEvent );
 
diff --git a/offapi/com/sun/star/form/XRestoreListener.idl b/offapi/com/sun/star/form/XRestoreListener.idl
index f5b4c77325f5..a64142113cd7 100644
--- a/offapi/com/sun/star/form/XRestoreListener.idl
+++ b/offapi/com/sun/star/form/XRestoreListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XRestoreListener_idl__
 #define __com_sun_star_form_XRestoreListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -42,14 +38,14 @@
 
 //=============================================================================
 
-/** receives notifications about data beeing restored.
+/** receives notifications about data being restored.
 
     <p>Such a notification is typically sent when the user cancels updating the
     current record of a database form
     without saving the data. After restoring, the user operates on the original data.</p>
 
     <p>Please do <em><b>not</b></em> use anymore, this interface is deprecated, and
-    superseeded by functionality from the <type scope="com::sun::star::form::component">DataForm</type>
+    superseded by functionality from the <type scope="com::sun::star::form::component">DataForm</type>
     and <type scope="com::sun::star::sdb">RowSet</type> services</p>
 
     @deprecated
diff --git a/offapi/com/sun/star/form/XSubmit.idl b/offapi/com/sun/star/form/XSubmit.idl
index d7b766990fdc..1511c3267bd5 100644
--- a/offapi/com/sun/star/form/XSubmit.idl
+++ b/offapi/com/sun/star/form/XSubmit.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_form_XSubmit_idl__
 #define __com_sun_star_form_XSubmit_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XControl_idl__
 #include <com/sun/star/awt/XControl.idl>
-#endif
 
-#ifndef __com_sun_star_awt_MouseEvent_idl__
 #include <com/sun/star/awt/MouseEvent.idl>
-#endif
 
-#ifndef __com_sun_star_form_XSubmitListener_idl__
 #include <com/sun/star/form/XSubmitListener.idl>
-#endif
 
 
 //=============================================================================
@@ -64,7 +56,7 @@ published interface XSubmit: com::sun::star::uno::XInterface
     /** submits the component's data to a specified target.
 
         @param aControl
-            the control which's data is to be be submitted
+            the control whose data is to be be submitted
 
         @param aMouseEvt
             the event which triggered the submit, if it was a mouse event
diff --git a/offapi/com/sun/star/form/XSubmitListener.idl b/offapi/com/sun/star/form/XSubmitListener.idl
index 1943c2071a2d..f2396a60cff8 100644
--- a/offapi/com/sun/star/form/XSubmitListener.idl
+++ b/offapi/com/sun/star/form/XSubmitListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XSubmitListener_idl__
 #define __com_sun_star_form_XSubmitListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -42,9 +38,9 @@
 
 //=============================================================================
 
-/** receives notifications about data beeing submitted.
+/** receives notifications about data being submitted.
 
-    <p>The submission may be cancelled, so the listener has the possibility
+    <p>The submission may be canceled, so the listener has the possibility
     of verifying the data before submission.</p>
 
     @see XSubmit
@@ -60,7 +56,7 @@ published interface XSubmitListener: com::sun::star::lang::XEventListener
     /** is invoked when a component is about to submit it's data.
 
         @param aEvent
-            the event happend
+            the event happened
 
         @returns
             <TRUE/> when submitting was approved, otherwise <FALSE/>.
diff --git a/offapi/com/sun/star/form/XUpdateBroadcaster.idl b/offapi/com/sun/star/form/XUpdateBroadcaster.idl
index cf4f20a4da69..908fcbb95b39 100644
--- a/offapi/com/sun/star/form/XUpdateBroadcaster.idl
+++ b/offapi/com/sun/star/form/XUpdateBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XUpdateBroadcaster_idl__
 #define __com_sun_star_form_XUpdateBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_form_XUpdateListener_idl__
 #include <com/sun/star/form/XUpdateListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/XUpdateListener.idl b/offapi/com/sun/star/form/XUpdateListener.idl
index 172a3593c87f..b058369e91f3 100644
--- a/offapi/com/sun/star/form/XUpdateListener.idl
+++ b/offapi/com/sun/star/form/XUpdateListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_XUpdateListener_idl__
 #define __com_sun_star_form_XUpdateListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
@@ -55,10 +51,10 @@ published interface XUpdateListener: com::sun::star::lang::XEventListener
     /** is invoked to check the current data.
 
         <p>For a given update process, if one of the <type>XUpdateListener</type>s
-        vetos the change, the update is canceled, and no further notification happens.</p>
+        vetoes the change, the update is canceled, and no further notification happens.</p>
 
         @param aEvent
-            An event dedscriptor specifying the broadcaster of the change.
+            An event descriptor specifying the broadcaster of the change.
 
         @returns
             <TRUE/> when the update was approved, otherwise <FALSE/>.
@@ -71,7 +67,7 @@ published interface XUpdateListener: com::sun::star::lang::XEventListener
         the data has been successfully written.
 
         @param aEvent
-            A event dedscriptor specifying the broadcaster of the change.
+            A event descriptor specifying the broadcaster of the change.
      */
     void updated( [in] com::sun::star::lang::EventObject aEvent );
 
diff --git a/offapi/com/sun/star/form/binding/BindableControlModel.idl b/offapi/com/sun/star/form/binding/BindableControlModel.idl
index 8b0d1058c77b..ec889e1d12ac 100644
--- a/offapi/com/sun/star/form/binding/BindableControlModel.idl
+++ b/offapi/com/sun/star/form/binding/BindableControlModel.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableControlModel_idl__
 #define __com_sun_star_form_binding_BindableControlModel_idl__
 
-#ifndef __com_sun_star_form_binding_XBindableValue_idl__
 #include <com/sun/star/form/binding/XBindableValue.idl>
-#endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl b/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
index c16d53a9c304..3569a692348d 100644
--- a/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
+++ b/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #define __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
 #include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
 
 //=============================================================================
 
@@ -49,7 +44,7 @@ module com {  module sun {  module star {  module form { module binding {
     content of the controls associated with this model. For instance, for an
     <type scope="com::sun::star::form::component">TextField</type>, this would be the
     <member scope="com::sun::star::awt">UnoControlEditModel::Text</member> property of the base
-    service. Similarily, a <type scope="com::sun::star::form::component">CheckBox</type> has
+    service. Similarly, a <type scope="com::sun::star::form::component">CheckBox</type> has
     a property <member scope="com::sun::star::awt">UnoControlCheckBoxModel::State</member>, which
     reflects the current check state.</p>
 
@@ -95,7 +90,7 @@ module com {  module sun {  module star {  module form { module binding {
                 Note that this restriction is inherited from the <type>BindableControlModel</type>.
             </li>
             <li><b>Cloning</b><br/>
-                <type scope="com::sun::star::form">FormControlModel</type>s support cloning themself
+                <type scope="com::sun::star::form">FormControlModel</type>s support cloning themselves
                 via the <type scope="com::sun::star::util">XCloneable</type> interface which they
                 inherit from the <type scope="com::sun::star::awt">UnoControlModel</type> service.</br>
                 When a <type>BindableDataAwareControlModel</type> is cloned while it has an active
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
index 868fc02c1705..8a06b3590d97 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseCheckBox_idl__
 #define __com_sun_star_form_binding_BindableDatabaseCheckBox_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__
 #include <com/sun/star/form/component/DatabaseCheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
@@ -50,8 +45,8 @@ module com {  module sun {  module star {  module form {  module binding {
     boolean values. The following mapping between external values and control states apply:
     <ul><li><TRUE/> will be mapped to the box being checked, and vice versa</li>
         <li><FALSE/> will be mapped to it being unchecked, and vice versa</li>
-        <li><NULL/> will be mapped to it being in indetermined state, if the box currently supports
-        this, or being unchecked else. The indetermined of the check box will always be
+        <li><NULL/> will be mapped to it being in undetermined state, if the box currently supports
+        this, or being unchecked else. The undetermined of the check box will always be
         mapped to <NULL/> when writing the external value.</li>
     </ul></p>
 
@@ -60,7 +55,7 @@ module com {  module sun {  module star {  module form {  module binding {
     is <em>not</em> empty, then the radio button will exchange it's value as string:
     <ul><li>A string equal to the reference value will be mapped to the button being checked, and vice versa</li>
         <li>A string not equal to the reference value will be mapped to the button being unchecked, and vice versa</li>
-        <li><NULL/> will be mapped to it being in indetermined state</li>
+        <li><NULL/> will be mapped to it being in undetermined state</li>
     </ul></p>
 
     @see com::sun::star::form::binding::XValueBinding::supportsType
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
index 9c379190afcc..bb1dd78886ef 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseComboBox_idl__
 #define __com_sun_star_form_binding_BindableDatabaseComboBox_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseComboBox_idl__
 #include <com/sun/star/form/component/DatabaseComboBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
index 2df7988e5d40..acf6a05e8c30 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseDateField_idl__
 #define __com_sun_star_form_binding_BindableDatabaseDateField_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseDateField_idl__
 #include <com/sun/star/form/component/DatabaseDateField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
index c6f433339295..b4ad3a6e85a5 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseFormattedField_idl__
 #define __com_sun_star_form_binding_BindableDatabaseFormattedField_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__
 #include <com/sun/star/form/component/DatabaseFormattedField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
index d07665579638..c2ee16193a16 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseListBox_idl__
 #define __com_sun_star_form_binding_BindableDatabaseListBox_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseListBox_idl__
 #include <com/sun/star/form/component/DatabaseListBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
index c34acbe14ce1..e56243f40407 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseNumericField_idl__
 #define __com_sun_star_form_binding_BindableDatabaseNumericField_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseNumericField_idl__
 #include <com/sun/star/form/component/DatabaseNumericField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl b/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
index d2779ba1ea8d..e8c5dd5b806d 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseRadioButton_idl__
 #define __com_sun_star_form_binding_BindableDatabaseRadioButton_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__
 #include <com/sun/star/form/component/DatabaseRadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
@@ -50,7 +45,7 @@ module com {  module sun {  module star {  module form {  module binding {
     boolean values. The following mapping between external values and control states apply:
     <ul><li><TRUE/> will be mapped to the button being checked, and vice versa</li>
         <li><FALSE/> will be mapped to it being unchecked, and vice versa</li>
-        <li><NULL/> will be mapped to it being in indetermined state</li>
+        <li><NULL/> will be mapped to it being in undetermined state</li>
     </ul></p>
 
     <p>If the value binding associated with a <type>BindableDatabaseRadioButton</type>
@@ -58,7 +53,7 @@ module com {  module sun {  module star {  module form {  module binding {
     is <em>not</em> empty, then the radio button will exchange it's value as string:
     <ul><li>A string equal to the reference value will be mapped to the button being checked, and vice versa</li>
         <li>A string not equal to the reference value will be mapped to the button being unchecked, and vice versa</li>
-        <li><NULL/> will be mapped to it being in indetermined state</li>
+        <li><NULL/> will be mapped to it being in undetermined state</li>
     </ul></p>
 
     @see com::sun::star::form::binding::XValueBinding::supportsType
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
index 81906b7759a5..4c3d67e2db9d 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseTextField_idl__
 #define __com_sun_star_form_binding_BindableDatabaseTextField_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseTextField_idl__
 #include <com/sun/star/form/component/DatabaseTextField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
index fafa1a06a507..8dd842d34117 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_binding_BindableDatabaseTimeField_idl__
 #define __com_sun_star_form_binding_BindableDatabaseTimeField_idl__
 
-#ifndef __com_sun_star_form_component_DatabaseTimeField_idl__
 #include <com/sun/star/form/component/DatabaseTimeField.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableDataAwareControlModel_idl__
 #include <com/sun/star/form/binding/BindableDataAwareControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl b/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
index 478c6875f717..6a27ee71b10b 100644
--- a/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
+++ b/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_binding_BindableIntegerValueRange_idl__
 #define __com_sun_star_form_binding_BindableIntegerValueRange_idl__
 
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
 #include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl b/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
index 4f0b6551e973..066c4e030060 100644
--- a/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
+++ b/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
 #define __com_sun_star_form_binding_IncompatibleTypesException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl b/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
index d25f6159e88b..30c42840f0fe 100644
--- a/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
+++ b/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_binding_InvalidBindingStateException_idl__
 #define __com_sun_star_form_binding_InvalidBindingStateException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/binding/ListEntryEvent.idl b/offapi/com/sun/star/form/binding/ListEntryEvent.idl
index 046888d7b8cc..dfcc76d97055 100644
--- a/offapi/com/sun/star/form/binding/ListEntryEvent.idl
+++ b/offapi/com/sun/star/form/binding/ListEntryEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_binding_ListEntryEvent_idl__
 #define __com_sun_star_form_binding_ListEntryEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
@@ -39,14 +37,14 @@ module com {  module sun {  module star {  module form { module binding {
 //=============================================================================
 
 /** specifies the event which is notified when a change in a string entry
-    list occured
+    list occurred
 
     @see XListEntrySource
     @see XListEntryListener
 */
 struct ListEntryEvent : com::sun::star::lang::EventObject
 {
-    /** denotes the position where a change occured.
+    /** denotes the position where a change occurred.
 
         <p>The concrete semantics of the value depends on the concrete
         event being notified.</p>
diff --git a/offapi/com/sun/star/form/binding/ListEntrySource.idl b/offapi/com/sun/star/form/binding/ListEntrySource.idl
index 15ea1f3bcf27..6bce223367c2 100644
--- a/offapi/com/sun/star/form/binding/ListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/ListEntrySource.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_form_binding_ListEntrySource_idl__
 #define __com_sun_star_form_binding_ListEntrySource_idl__
 
-#ifndef __com_sun_star_form_binding_XListEntrySource_idl__
 #include <com/sun/star/form/binding/XListEntrySource.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
 
 //=============================================================================
 
@@ -62,7 +56,7 @@ service ListEntrySource
         the <type>ListEntrySource</type> for whatever reasons (e.g. because the data model
         which the binding reflected died). For this reason, a <type>ListEntrySource</type>
         must offer a possibility to be obsoleted by it's owner, and to notify this
-        obsoletion to other interested parties, such as <type>XListEntrySink</type>s.</p>
+        obsoleteness to other interested parties, such as <type>XListEntrySink</type>s.</p>
     */
     interface com::sun::star::lang::XComponent;
 };
diff --git a/offapi/com/sun/star/form/binding/ValueBinding.idl b/offapi/com/sun/star/form/binding/ValueBinding.idl
index f7c99e8ca6af..b05192924df4 100644
--- a/offapi/com/sun/star/form/binding/ValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/ValueBinding.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_form_binding_ValueBinding_idl__
 #define __com_sun_star_form_binding_ValueBinding_idl__
 
-#ifndef __com_sun_star_util_XValueBinding_idl__
 #include <com/sun/star/form/binding/XValueBinding.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
 
 //=============================================================================
 
@@ -112,7 +104,7 @@ service ValueBinding
         the <type>ValueBinding</type> for whatever reasons (e.g. because the data model
         which the binding reflected died). For this reason, a <type>ValueBinding</type>
         must offer a possibility to be obsoleted by it's owner, and to notify this
-        obsoletion to other interested parties, such as <type>XBindableValue</type>s.</p>
+        obsoleteness to other interested parties, such as <type>XBindableValue</type>s.</p>
     */
     interface com::sun::star::lang::XComponent;
 };
diff --git a/offapi/com/sun/star/form/binding/XBindableValue.idl b/offapi/com/sun/star/form/binding/XBindableValue.idl
index 2d8413029323..192cd2dbecb5 100644
--- a/offapi/com/sun/star/form/binding/XBindableValue.idl
+++ b/offapi/com/sun/star/form/binding/XBindableValue.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_form_binding_XBindableValue_idl__
 #define __com_sun_star_form_binding_XBindableValue_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
 #include <com/sun/star/form/binding/IncompatibleTypesException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/XListEntryListener.idl b/offapi/com/sun/star/form/binding/XListEntryListener.idl
index b48ec45198fc..2d2d244f8f52 100644
--- a/offapi/com/sun/star/form/binding/XListEntryListener.idl
+++ b/offapi/com/sun/star/form/binding/XListEntryListener.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_form_binding_XListEntryListener_idl__
 #define __com_sun_star_form_binding_XListEntryListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_form_binding_ListEntryEvent_idl__
 #include <com/sun/star/form/binding/ListEntryEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/XListEntrySink.idl b/offapi/com/sun/star/form/binding/XListEntrySink.idl
index 0f2e84a8011d..8e910d6415fb 100644
--- a/offapi/com/sun/star/form/binding/XListEntrySink.idl
+++ b/offapi/com/sun/star/form/binding/XListEntrySink.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_binding_XListEntrySink_idl__
 #define __com_sun_star_form_binding_XListEntrySink_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/binding/XListEntrySource.idl b/offapi/com/sun/star/form/binding/XListEntrySource.idl
index 4d6390b41ece..242b211ee4be 100644
--- a/offapi/com/sun/star/form/binding/XListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/XListEntrySource.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_form_binding_XListEntrySource_idl__
 #define __com_sun_star_form_binding_XListEntrySource_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 //=============================================================================
 
@@ -84,7 +78,7 @@ interface XListEntrySource : com::sun::star::uno::XInterface
                 raises( com::sun::star::lang::NullPointerException );
 
     /** revokes the given listener from the list of components which will
-        be notfiied about changes in the entry list.
+        be notified about changes in the entry list.
 
         @throws <type scope="com::sun::star::lang">NullPointerException</type>
             if the given listener is <NULL/>
diff --git a/offapi/com/sun/star/form/binding/XValueBinding.idl b/offapi/com/sun/star/form/binding/XValueBinding.idl
index 207b3ec7e7ad..4c49932f793e 100644
--- a/offapi/com/sun/star/form/binding/XValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/XValueBinding.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_form_binding_XValueBinding_idl__
 #define __com_sun_star_form_binding_XValueBinding_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
-#ifndef __com_sun_star_form_binding_IncompatibleTypesException_idl__
 #include <com/sun/star/form/binding/IncompatibleTypesException.idl>
-#endif
-#ifndef __com_sun_star_form_binding_InvalidBindingStateException_idl__
 #include <com/sun/star/form/binding/InvalidBindingStateException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/CheckBox.idl b/offapi/com/sun/star/form/component/CheckBox.idl
index 5db7acb3d2a6..bcf5072c0a4f 100644
--- a/offapi/com/sun/star/form/component/CheckBox.idl
+++ b/offapi/com/sun/star/form/component/CheckBox.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_form_component_CheckBox_idl__
 #define __com_sun_star_form_component_CheckBox_idl__
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlCheckBoxModel_idl__
 #include <com/sun/star/awt/UnoControlCheckBoxModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/ComboBox.idl b/offapi/com/sun/star/form/component/ComboBox.idl
index c5d02077cad8..7b3155703838 100644
--- a/offapi/com/sun/star/form/component/ComboBox.idl
+++ b/offapi/com/sun/star/form/component/ComboBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_ComboBox_idl__
 #define __com_sun_star_form_component_ComboBox_idl__
 
-#ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__
 #include <com/sun/star/awt/UnoControlComboBoxModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/CurrencyField.idl b/offapi/com/sun/star/form/component/CurrencyField.idl
index 1e190f2ae1ca..163f6375d96c 100644
--- a/offapi/com/sun/star/form/component/CurrencyField.idl
+++ b/offapi/com/sun/star/form/component/CurrencyField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_CurrencyField_idl__
 #define __com_sun_star_form_component_CurrencyField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__
 #include <com/sun/star/awt/UnoControlCurrencyFieldModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DataForm.idl b/offapi/com/sun/star/form/component/DataForm.idl
index 9b5f1f03f757..e52dcc9b418e 100644
--- a/offapi/com/sun/star/form/component/DataForm.idl
+++ b/offapi/com/sun/star/form/component/DataForm.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_form_component_DataForm_idl__
 #define __com_sun_star_form_component_DataForm_idl__
 
-#ifndef __com_sun_star_form_component_Form_idl__
 #include <com/sun/star/form/component/Form.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_RowSet_idl__
 #include <com/sun/star/sdb/RowSet.idl>
-#endif
-
-#ifndef __com_sun_star_form_TabulatorCycle_idl__
 #include <com/sun/star/form/TabulatorCycle.idl>
-#endif
-
-#ifndef __com_sun_star_form_NavigationBarMode_idl__
 #include <com/sun/star/form/NavigationBarMode.idl>
-#endif
-
-#ifndef __com_sun_star_form_XLoadable_idl__
 #include <com/sun/star/form/XLoadable.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
 #include <com/sun/star/sdb/XCompletedExecution.idl>
-#endif
-
-#ifndef __com_sun_star_awt_TabControllerModel_idl__
 #include <com/sun/star/awt/TabControllerModel.idl>
-#endif
 
 //=============================================================================
 
@@ -65,7 +45,7 @@ module com { module sun { module star { module form {
 module component {
 //=============================================================================
 /** This service specifies a form which is connected to a database and
-    displays the results of SQL queries. It provides the possiblity of
+    displays the results of SQL queries. It provides the possibility of
     adding new data records, modifying existing ones, or deleting them.
 
     <p>A database form is a special kind of enhanced database row set
@@ -133,7 +113,7 @@ published service DataForm
         (if any). All values which can't be filled are then passed to all listeners, which can
         fill them by their own choice.</p>
 
-        <p>This is sligtly changed if the form is loaded using the
+        <p>This is slightly changed if the form is loaded using the
         <member scope="com::sun::star::sdb">XCompletedExecution::connectWithCompletion</member> method. In this case, the parameters
         are obtained from the interaction handler, not from the listeners</p>
 
@@ -161,7 +141,7 @@ published service DataForm
         which are related to the master fields of the parent form.
 
         <p>Entries in this sequence can either denote column names in the sub form,
-        or paramater names.<br/>
+        or parameter names.<br/>
         For instance, you could base the form on the SQL statement
         <code>SELECT * FROM invoices WHERE cust_ref = :cid</code>, and add <code>cid</code>
         to the DetailFields property. In this case, the parameter will be filled from
@@ -173,7 +153,7 @@ published service DataForm
         master field.<br/>
         If a string in this property denotes both a column name and a parameter name, it
         is undefined which way it is interpreted, but implementations of the service are required
-        to either decide for the paramter or the column, and proceed as usual.
+        to either decide for the parameter or the column, and proceed as usual.
         </p>
 
         <p>The columns specified herein typically represent a part of the primary key
diff --git a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
index 82f49ad55d02..508195af437f 100644
--- a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__
 #define __com_sun_star_form_component_DatabaseCheckBox_idl__
 
-#ifndef __com_sun_star_form_component_CheckBox_idl__
 #include <com/sun/star/form/component/CheckBox.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseComboBox.idl b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
index 2ccca56dbb3e..e5f2c8b3edd0 100644
--- a/offapi/com/sun/star/form/component/DatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_DatabaseComboBox_idl__
 #define __com_sun_star_form_component_DatabaseComboBox_idl__
 
-#ifndef __com_sun_star_form_component_ComboBox_idl__
 #include <com/sun/star/form/component/ComboBox.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_ListSourceType_idl__
 #include <com/sun/star/form/ListSourceType.idl>
-#endif
 
 
 //=============================================================================
@@ -73,7 +67,7 @@ published service DatabaseComboBox
      */
     [property] boolean ConvertEmptyToNull;
 
-    /** describes the source of items in the combo box' list.
+    /** describes the source of items in the combo box's list.
 
         <p>The concrete meaning of this property depends on the value of <member>ListSourceType</member></p>
      */
diff --git a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
index 3d56099c31d7..7421d716ff24 100644
--- a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseCurrencyField_idl__
 #define __com_sun_star_form_component_DatabaseCurrencyField_idl__
 
-#ifndef __com_sun_star_form_component_CurrencyField_idl__
 #include <com/sun/star/form/component/CurrencyField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseDateField.idl b/offapi/com/sun/star/form/component/DatabaseDateField.idl
index 8673636874b0..b4ff715315cc 100644
--- a/offapi/com/sun/star/form/component/DatabaseDateField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseDateField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseDateField_idl__
 #define __com_sun_star_form_component_DatabaseDateField_idl__
 
-#ifndef __com_sun_star_form_component_DateField_idl__
 #include <com/sun/star/form/component/DateField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
index 575ad5d8ff02..9b402401eb52 100644
--- a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__
 #define __com_sun_star_form_component_DatabaseFormattedField_idl__
 
-#ifndef __com_sun_star_form_component_FormattedField_idl__
 #include <com/sun/star/form/component/FormattedField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseImageControl.idl b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
index 731a27437bf5..6325517fff61 100644
--- a/offapi/com/sun/star/form/component/DatabaseImageControl.idl
+++ b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_DatabaseImageControl_idl__
 #define __com_sun_star_form_component_DatabaseImageControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
 #include <com/sun/star/awt/UnoControlImageControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
 #include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseListBox.idl b/offapi/com/sun/star/form/component/DatabaseListBox.idl
index daa06fef61b3..a93fe0c9032e 100644
--- a/offapi/com/sun/star/form/component/DatabaseListBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseListBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_DatabaseListBox_idl__
 #define __com_sun_star_form_component_DatabaseListBox_idl__
 
-#ifndef __com_sun_star_form_component_ListBox_idl__
 #include <com/sun/star/form/component/ListBox.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_ListSourceType_idl__
 #include <com/sun/star/form/ListSourceType.idl>
-#endif
 
 
 //=============================================================================
@@ -58,7 +52,7 @@
 
     <p>For instance, you may have a form which is bound to a table <em>invoice</em>, and you use it
     to enter invoices for your customers. Probably, you will have a second table (say <em>customer</em>),
-    which (amonst other data) contains a unique key for identifying customers. In your invoice table, you will
+    which (among other data) contains a unique key for identifying customers. In your invoice table, you will
     have a foreign key referring to these customers.<br/>
     Now, besides the result set the form is based on (all your invoices), the list box can be caused
     to open a second result set, this time for the <em>customer</em> table, and fill it's list with entries
@@ -143,7 +137,7 @@ published service DatabaseListBox
 
                 <dt><member scope="com::sun::star::form">ListSourceType::TABLEFIELDS</member></dt>
                 <dd>The first element of the string sequence in <member>ListBox::ListSource</member>
-                determines the table which's column names should fill the list.</dd>
+                determines the table whose column names should fill the list.</dd>
             </dl>
         </p>
 
diff --git a/offapi/com/sun/star/form/component/DatabaseNumericField.idl b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
index 57853d6ddc83..8f138d7f2ee0 100644
--- a/offapi/com/sun/star/form/component/DatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseNumericField_idl__
 #define __com_sun_star_form_component_DatabaseNumericField_idl__
 
-#ifndef __com_sun_star_form_component_NumericField_idl__
 #include <com/sun/star/form/component/NumericField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabasePatternField.idl b/offapi/com/sun/star/form/component/DatabasePatternField.idl
index 2488b4160cad..04b11ccb0f09 100644
--- a/offapi/com/sun/star/form/component/DatabasePatternField.idl
+++ b/offapi/com/sun/star/form/component/DatabasePatternField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabasePatternField_idl__
 #define __com_sun_star_form_component_DatabasePatternField_idl__
 
-#ifndef __com_sun_star_form_component_PatternField_idl__
 #include <com/sun/star/form/component/PatternField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
index 2b60c3fb5dd3..982119f1a080 100644
--- a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__
 #define __com_sun_star_form_component_DatabaseRadioButton_idl__
 
-#ifndef __com_sun_star_form_component_RadioButton_idl__
 #include <com/sun/star/form/component/RadioButton.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseTextField.idl b/offapi/com/sun/star/form/component/DatabaseTextField.idl
index 001f342d3c53..036deac327df 100644
--- a/offapi/com/sun/star/form/component/DatabaseTextField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTextField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseTextField_idl__
 #define __com_sun_star_form_component_DatabaseTextField_idl__
 
-#ifndef __com_sun_star_form_component_TextField_idl__
 #include <com/sun/star/form/component/TextField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DatabaseTimeField.idl b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
index 1ac3d51ccc36..0bd5ecf0ec31 100644
--- a/offapi/com/sun/star/form/component/DatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_DatabaseTimeField_idl__
 #define __com_sun_star_form_component_DatabaseTimeField_idl__
 
-#ifndef __com_sun_star_form_component_TimeField_idl__
 #include <com/sun/star/form/component/TimeField.idl>
-#endif
 
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
 #include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/DateField.idl b/offapi/com/sun/star/form/component/DateField.idl
index b7764c8ea874..dca52c109763 100644
--- a/offapi/com/sun/star/form/component/DateField.idl
+++ b/offapi/com/sun/star/form/component/DateField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_DateField_idl__
 #define __com_sun_star_form_component_DateField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__
 #include <com/sun/star/awt/UnoControlDateFieldModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/FileControl.idl b/offapi/com/sun/star/form/component/FileControl.idl
index d9956c7114b6..c5006ac6880f 100644
--- a/offapi/com/sun/star/form/component/FileControl.idl
+++ b/offapi/com/sun/star/form/component/FileControl.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_FileControl_idl__
 #define __com_sun_star_form_component_FileControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__
 #include <com/sun/star/awt/UnoControlFileControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/FixedText.idl b/offapi/com/sun/star/form/component/FixedText.idl
index 1bb60c47388e..84a796d9f46d 100644
--- a/offapi/com/sun/star/form/component/FixedText.idl
+++ b/offapi/com/sun/star/form/component/FixedText.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_FixedText_idl__
 #define __com_sun_star_form_component_FixedText_idl__
 
-#ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__
 #include <com/sun/star/awt/UnoControlFixedTextModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/Form.idl b/offapi/com/sun/star/form/component/Form.idl
index 526a2febecb0..c72e5b4a42a8 100644
--- a/offapi/com/sun/star/form/component/Form.idl
+++ b/offapi/com/sun/star/form/component/Form.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_form_component_Form_idl__
 #define __com_sun_star_form_component_Form_idl__
 
-#ifndef __com_sun_star_form_FormComponent_idl__
 #include <com/sun/star/form/FormComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponents_idl__
 #include <com/sun/star/form/FormComponents.idl>
-#endif
-
-#ifndef __com_sun_star_form_XForm_idl__
 #include <com/sun/star/form/XForm.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
 #include <com/sun/star/awt/XTabControllerModel.idl>
-#endif
-
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
 #include <com/sun/star/script/XEventAttacherManager.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/FormattedField.idl b/offapi/com/sun/star/form/component/FormattedField.idl
index 21ab49c523ff..08ec5b9767eb 100644
--- a/offapi/com/sun/star/form/component/FormattedField.idl
+++ b/offapi/com/sun/star/form/component/FormattedField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_FormattedField_idl__
 #define __com_sun_star_form_component_FormattedField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlFormattedFieldModel_idl__
 #include <com/sun/star/awt/UnoControlFormattedFieldModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
@@ -47,7 +41,7 @@
 //=============================================================================
 
 /** This service specifies the control model of an edit field for entering text which can be
-    (nearly) arbirtrarily formatted.
+    (nearly) arbitrarily formatted.
 
     @see com::sun::star::util::XNumberFormatsSupplier
  */
diff --git a/offapi/com/sun/star/form/component/GridControl.idl b/offapi/com/sun/star/form/component/GridControl.idl
index b39dc67e9fef..925a8ed992dc 100644
--- a/offapi/com/sun/star/form/component/GridControl.idl
+++ b/offapi/com/sun/star/form/component/GridControl.idl
@@ -27,53 +27,27 @@
 #ifndef __com_sun_star_form_component_GridControl_idl__
 #define __com_sun_star_form_component_GridControl_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XGridColumnFactory_idl__
 #include <com/sun/star/form/XGridColumnFactory.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormComponents_idl__
 #include <com/sun/star/form/FormComponents.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
 
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
 #include <com/sun/star/script/XEventAttacherManager.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
 
 
 //=============================================================================
@@ -113,7 +87,7 @@ published service GridControl
 
     /** allows to create column models to be inserted into the control model.
 
-        <p>Note that the object returned by the <membere scope="com::sun::star::form">XGridColumnFactory::createColumn</member>
+        <p>Note that the object returned by the <member scope="com::sun::star::form">XGridColumnFactory::createColumn</member>
         method is not part of the grid control, yet. It needs to be inserted using any of the
         container interfaces.</p>
 
@@ -125,11 +99,11 @@ published service GridControl
     /** gives access to the currently selection.
 
         <p>In a grid control, single columns can be selected (at most one at a time).<br/>
-        For various unfortunate reaons, this selection is an aspect of the model, not of the
+        For various unfortunate reasons, this selection is an aspect of the model, not of the
         control as you would expect.</p>
 
         <p>This interface is deprecated, new implementations should not use it anymore, as it is to
-        be superseeded by a solution which is bound to the control, not the model.</p>
+        be superseded by a solution which is bound to the control, not the model.</p>
 
         @deprecated
     */
diff --git a/offapi/com/sun/star/form/component/GroupBox.idl b/offapi/com/sun/star/form/component/GroupBox.idl
index d4f2b57375ae..6d9fcfff51fe 100644
--- a/offapi/com/sun/star/form/component/GroupBox.idl
+++ b/offapi/com/sun/star/form/component/GroupBox.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_form_component_GroupBox_idl__
 #define __com_sun_star_form_component_GroupBox_idl__
 
-#ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__
 #include <com/sun/star/awt/UnoControlGroupBoxModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/HTMLForm.idl b/offapi/com/sun/star/form/component/HTMLForm.idl
index 763f388a4185..95f725713f26 100644
--- a/offapi/com/sun/star/form/component/HTMLForm.idl
+++ b/offapi/com/sun/star/form/component/HTMLForm.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_form_component_HTMLForm_idl__
 #define __com_sun_star_form_component_HTMLForm_idl__
 
-#ifndef __com_sun_star_form_component_Form_idl__
 #include <com/sun/star/form/component/Form.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
-#ifndef __com_sun_star_form_XSubmit_idl__
 #include <com/sun/star/form/XSubmit.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormSubmitMethod_idl__
 #include <com/sun/star/form/FormSubmitMethod.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormSubmitEncoding_idl__
 #include <com/sun/star/form/FormSubmitEncoding.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/HiddenControl.idl b/offapi/com/sun/star/form/component/HiddenControl.idl
index cf516df86d12..9b758b4e6dfd 100644
--- a/offapi/com/sun/star/form/component/HiddenControl.idl
+++ b/offapi/com/sun/star/form/component/HiddenControl.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_form_component_HiddenControl_idl__
 #define __com_sun_star_form_component_HiddenControl_idl__
 
-#ifndef __com_sun_star_form_FormComponent_idl__
 #include <com/sun/star/form/FormComponent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/ImageButton.idl b/offapi/com/sun/star/form/component/ImageButton.idl
index 69df0e295106..8f789ef56200 100644
--- a/offapi/com/sun/star/form/component/ImageButton.idl
+++ b/offapi/com/sun/star/form/component/ImageButton.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_form_component_ImageButton_idl__
 #define __com_sun_star_form_component_ImageButton_idl__
 
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
 #include <com/sun/star/awt/UnoControlImageControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
 #include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
 
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
 #include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormButtonType_idl__
 #include <com/sun/star/form/FormButtonType.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/ListBox.idl b/offapi/com/sun/star/form/component/ListBox.idl
index f636d25b77ee..d1a4fc4537e2 100644
--- a/offapi/com/sun/star/form/component/ListBox.idl
+++ b/offapi/com/sun/star/form/component/ListBox.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_ListBox_idl__
 #define __com_sun_star_form_component_ListBox_idl__
 
-#ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__
 #include <com/sun/star/awt/UnoControlListBoxModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/NavigationToolBar.idl b/offapi/com/sun/star/form/component/NavigationToolBar.idl
index 0e3880db707d..2be8ff59cc36 100644
--- a/offapi/com/sun/star/form/component/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/component/NavigationToolBar.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_form_component_NavigationToolBar_idl__
 #define __com_sun_star_form_component_NavigationToolBar_idl__
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
 
 //=============================================================================
 
@@ -135,7 +131,7 @@ service NavigationToolBar
     //-------------------------------------------------------------------------
     /** specifies a repeat delay for the control
 
-        <p>Some buttons of a NavigationToolBar may show repeating behaviour, e.g. may be
+        <p>Some buttons of a NavigationToolBar may show repeating behavior, e.g. may be
         repeatedly triggered when the user keeps the mouse pressed over such a button.<br/>
         The delay between two such triggers (in milliseconds) is specified with this property.
         </p>
diff --git a/offapi/com/sun/star/form/component/NumericField.idl b/offapi/com/sun/star/form/component/NumericField.idl
index 62336316eb0a..9abf804f964d 100644
--- a/offapi/com/sun/star/form/component/NumericField.idl
+++ b/offapi/com/sun/star/form/component/NumericField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_NumericField_idl__
 #define __com_sun_star_form_component_NumericField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__
 #include <com/sun/star/awt/UnoControlNumericFieldModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/PatternField.idl b/offapi/com/sun/star/form/component/PatternField.idl
index f41a12d2231e..22187b2749d8 100644
--- a/offapi/com/sun/star/form/component/PatternField.idl
+++ b/offapi/com/sun/star/form/component/PatternField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_PatternField_idl__
 #define __com_sun_star_form_component_PatternField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__
 #include <com/sun/star/awt/UnoControlPatternFieldModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/RadioButton.idl b/offapi/com/sun/star/form/component/RadioButton.idl
index 76575e3450bd..a38c86594f2f 100644
--- a/offapi/com/sun/star/form/component/RadioButton.idl
+++ b/offapi/com/sun/star/form/component/RadioButton.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_RadioButton_idl__
 #define __com_sun_star_form_component_RadioButton_idl__
 
-#ifndef __com_sun_star_awt_UnoControlRadioButtonModel_idl__
 #include <com/sun/star/awt/UnoControlRadioButtonModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/RichTextControl.idl b/offapi/com/sun/star/form/component/RichTextControl.idl
index 0566f658a197..086a8dc455bf 100644
--- a/offapi/com/sun/star/form/component/RichTextControl.idl
+++ b/offapi/com/sun/star/form/component/RichTextControl.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_form_component_RichTextControl_idl__
 #define __com_sun_star_form_component_RichTextControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
 #include <com/sun/star/awt/UnoControlEditModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextRange_idl__
 #include <com/sun/star/text/TextRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/ScrollBar.idl b/offapi/com/sun/star/form/component/ScrollBar.idl
index 69e0fc7e78ff..81248839641c 100644
--- a/offapi/com/sun/star/form/component/ScrollBar.idl
+++ b/offapi/com/sun/star/form/component/ScrollBar.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_form_component_ScrollBar_idl__
 #define __com_sun_star_form_component_ScrollBar_idl__
 
-#ifndef __com_sun_star_awt_UnoControlScrollBarModel_idl__
 #include <com/sun/star/awt/UnoControlScrollBarModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/SpinButton.idl b/offapi/com/sun/star/form/component/SpinButton.idl
index 09be77ed47c3..8323ab7854fe 100644
--- a/offapi/com/sun/star/form/component/SpinButton.idl
+++ b/offapi/com/sun/star/form/component/SpinButton.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_form_component_SpinButton_idl__
 #define __com_sun_star_form_component_SpinButton_idl__
 
-#ifndef __com_sun_star_awt_UnoControlSpinButtonModel_idl__
 #include <com/sun/star/awt/UnoControlSpinButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/SubmitButton.idl b/offapi/com/sun/star/form/component/SubmitButton.idl
index b540065cb989..6330c455677f 100644
--- a/offapi/com/sun/star/form/component/SubmitButton.idl
+++ b/offapi/com/sun/star/form/component/SubmitButton.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_form_component_SubmitButton_idl__
 #define __com_sun_star_form_component_SubmitButton_idl__
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlButtonModel_idl__
 #include <com/sun/star/awt/UnoControlButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_submission_XSubmissionSupplier_idl__
 #include <com/sun/star/form/submission/XSubmissionSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/component/TextField.idl b/offapi/com/sun/star/form/component/TextField.idl
index bb4cf5ce046c..9cc34b6c77b1 100644
--- a/offapi/com/sun/star/form/component/TextField.idl
+++ b/offapi/com/sun/star/form/component/TextField.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_form_component_TextField_idl__
 #define __com_sun_star_form_component_TextField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
 #include <com/sun/star/awt/UnoControlEditModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_component_RichTextControl_idl__
 #include <com/sun/star/form/component/RichTextControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/component/TimeField.idl b/offapi/com/sun/star/form/component/TimeField.idl
index d752ca28928a..a3aee8eb856e 100644
--- a/offapi/com/sun/star/form/component/TimeField.idl
+++ b/offapi/com/sun/star/form/component/TimeField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_form_component_TimeField_idl__
 #define __com_sun_star_form_component_TimeField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__
 #include <com/sun/star/awt/UnoControlTimeFieldModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_form_XReset_idl__
 #include <com/sun/star/form/XReset.idl>
-#endif
 
 
 //=============================================================================
@@ -46,7 +40,7 @@
 
 //=============================================================================
 
-/** sepecifies the control model for a field which can be used to input time values.
+/** specifies the control model for a field which can be used to input time values.
  */
 published service TimeField
 {
diff --git a/offapi/com/sun/star/form/control/CheckBox.idl b/offapi/com/sun/star/form/control/CheckBox.idl
index 763e8ec9132c..0cd41a120679 100644
--- a/offapi/com/sun/star/form/control/CheckBox.idl
+++ b/offapi/com/sun/star/form/control/CheckBox.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_component_checkbox_idl__
 #define __com_sun_star_form_component_checkbox_idl__
 
-#ifndef __com_sun_star_awt_UnoControlCheckBox_idl__
 #include <com/sun/star/awt/UnoControlCheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/ComboBox.idl b/offapi/com/sun/star/form/control/ComboBox.idl
index b4dbfac27509..de8444eb4231 100644
--- a/offapi/com/sun/star/form/control/ComboBox.idl
+++ b/offapi/com/sun/star/form/control/ComboBox.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_ComboBox_idl__
 #define __com_sun_star_form_control_ComboBox_idl__
 
-#ifndef __com_sun_star_awt_UnoControlComboBox_idl__
 #include <com/sun/star/awt/UnoControlComboBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/CommandButton.idl b/offapi/com/sun/star/form/control/CommandButton.idl
index d4a4b48356ad..5105d902b3b9 100644
--- a/offapi/com/sun/star/form/control/CommandButton.idl
+++ b/offapi/com/sun/star/form/control/CommandButton.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_CommandButton_idl__
 #define __com_sun_star_form_control_CommandButton_idl__
 
-#ifndef __com_sun_star_awt_UnoControlButton_idl__
 #include <com/sun/star/awt/UnoControlButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
 #include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/CurrencyField.idl b/offapi/com/sun/star/form/control/CurrencyField.idl
index 203278150878..ad5f7a980eba 100644
--- a/offapi/com/sun/star/form/control/CurrencyField.idl
+++ b/offapi/com/sun/star/form/control/CurrencyField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_CurrencyField_idl__
 #define __com_sun_star_form_control_CurrencyField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlCurrencyField_idl__
 #include <com/sun/star/awt/UnoControlCurrencyField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/DateField.idl b/offapi/com/sun/star/form/control/DateField.idl
index ead9d296fb0e..49da27029784 100644
--- a/offapi/com/sun/star/form/control/DateField.idl
+++ b/offapi/com/sun/star/form/control/DateField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_DateField_idl__
 #define __com_sun_star_form_control_DateField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlDateField_idl__
 #include <com/sun/star/awt/UnoControlDateField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/FormattedField.idl b/offapi/com/sun/star/form/control/FormattedField.idl
index f40453a4d1e9..95607506b2d6 100644
--- a/offapi/com/sun/star/form/control/FormattedField.idl
+++ b/offapi/com/sun/star/form/control/FormattedField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_FormattedField_idl__
 #define __com_sun_star_form_control_FormattedField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlFormattedField_idl__
 #include <com/sun/star/awt/UnoControlFormattedField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/GridControl.idl b/offapi/com/sun/star/form/control/GridControl.idl
index 06395d41e38d..dc298031636e 100644
--- a/offapi/com/sun/star/form/control/GridControl.idl
+++ b/offapi/com/sun/star/form/control/GridControl.idl
@@ -28,49 +28,17 @@
 #ifndef __com_sun_star_form_control_GridControl_idl__
 #define __com_sun_star_form_control_GridControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XGrid_idl__
 #include <com/sun/star/form/XGrid.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundComponent_idl__
 #include <com/sun/star/form/XBoundComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__
 #include <com/sun/star/form/XGridFieldDataSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModeSelector_idl__
 #include <com/sun/star/util/XModeSelector.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
 #include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
 
 //=============================================================================
 
@@ -125,7 +93,7 @@ published service GridControl
 
     /** is used to switch the operating modes of the control.
 
-        <p>Besides the normal opreration mode (which is used to display the database form's data) the control may
+        <p>Besides the normal operation mode (which is used to display the database form's data) the control may
         for instance support a filter mode.</p>
     */
     [optional] interface com::sun::star::util::XModeSelector;
@@ -142,9 +110,9 @@ published service GridControl
     /** allows external components to register dispatchers for some common form actions.
 
         <p>A grid control can contain own UI elements for traveling within the database form it belongs to (This
-        concept seems to make sense, as a grid control - in opposite to other data aware controls - displayes
+        concept seems to make sense, as a grid control - in opposite to other data aware controls - displays
         not only one record at a time, but a larger number of records of the database form.)<br/>
-        With the help of this interface, external components which wish to handle such travelings themself can
+        With the help of this interface, external components which wish to handle such travelings themselves can
         register interceptors for the actions in question.</p>
 
         <p>Usual URLs to use include
diff --git a/offapi/com/sun/star/form/control/GroupBox.idl b/offapi/com/sun/star/form/control/GroupBox.idl
index 5466f2c19c59..b83a76dca57e 100644
--- a/offapi/com/sun/star/form/control/GroupBox.idl
+++ b/offapi/com/sun/star/form/control/GroupBox.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_GroupBox_idl__
 #define __com_sun_star_form_control_GroupBox_idl__
 
-#ifndef __com_sun_star_awt_UnoControlGroupBox_idl__
 #include <com/sun/star/awt/UnoControlGroupBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/ImageButton.idl b/offapi/com/sun/star/form/control/ImageButton.idl
index 278de5ca515d..6c9461098469 100644
--- a/offapi/com/sun/star/form/control/ImageButton.idl
+++ b/offapi/com/sun/star/form/control/ImageButton.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_ImageButton_idl__
 #define __com_sun_star_form_control_ImageButton_idl__
 
-#ifndef __com_sun_star_awt_UnoControlImageControl_idl__
 #include <com/sun/star/awt/UnoControlImageControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
 #include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/ImageControl.idl b/offapi/com/sun/star/form/control/ImageControl.idl
index 10ef14cdf60b..873ddaa2f4c0 100644
--- a/offapi/com/sun/star/form/control/ImageControl.idl
+++ b/offapi/com/sun/star/form/control/ImageControl.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_ImageControl_idl__
 #define __com_sun_star_form_control_ImageControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlImageControl_idl__
 #include <com/sun/star/awt/UnoControlImageControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/InteractionGridControl.idl b/offapi/com/sun/star/form/control/InteractionGridControl.idl
index 480f4f26243d..db14a209c0b0 100644
--- a/offapi/com/sun/star/form/control/InteractionGridControl.idl
+++ b/offapi/com/sun/star/form/control/InteractionGridControl.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_form_component_InteractionGridControl_idl__
 #define __com_sun_star_form_component_InteractionGridControl_idl__
 
-#ifndef __com_sun_star_form_control_GridControl_idl__
 #include <com/sun/star/form/control/GridControl.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatch_idl__
 #include <com/sun/star/frame/XDispatch.idl>
-#endif
 
 //=============================================================================
 
@@ -49,7 +45,7 @@ published service InteractionGridControl
 
     /** allows access to the UI features of the control
 
-        <p>Though concret implementations of the service may offer different sets of aspects which can be customized,
+        <p>Though concrete implementations of the service may offer different sets of aspects which can be customized,
         the following commands have, if supported, a defined meaning:
         <dl>
             <dt>.uno:GridSlots/BrowserAttribs</dt><dd> (interactively) customize the overall appearance of the grid (font etc.)</dd>
diff --git a/offapi/com/sun/star/form/control/ListBox.idl b/offapi/com/sun/star/form/control/ListBox.idl
index b830a2b3d045..8f5575a21fad 100644
--- a/offapi/com/sun/star/form/control/ListBox.idl
+++ b/offapi/com/sun/star/form/control/ListBox.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_form_control_ListBox_idl__
 #define __com_sun_star_form_control_ListBox_idl__
 
-#ifndef __com_sun_star_awt_UnoControlListBox_idl__
 #include <com/sun/star/awt/UnoControlListBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
 #include <com/sun/star/form/XChangeBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/NavigationToolBar.idl b/offapi/com/sun/star/form/control/NavigationToolBar.idl
index 7f792a221a34..192c222ce4f6 100644
--- a/offapi/com/sun/star/form/control/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/control/NavigationToolBar.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_control_NavigationToolBar_idl__
 #define __com_sun_star_form_control_NavigationToolBar_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/NumericField.idl b/offapi/com/sun/star/form/control/NumericField.idl
index b088f6a782eb..8167da7f0e10 100644
--- a/offapi/com/sun/star/form/control/NumericField.idl
+++ b/offapi/com/sun/star/form/control/NumericField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_NumericField_idl__
 #define __com_sun_star_form_control_NumericField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlNumericField_idl__
 #include <com/sun/star/awt/UnoControlNumericField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/PatternField.idl b/offapi/com/sun/star/form/control/PatternField.idl
index 8c373702bd34..467651633ba8 100644
--- a/offapi/com/sun/star/form/control/PatternField.idl
+++ b/offapi/com/sun/star/form/control/PatternField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_PatternField_idl__
 #define __com_sun_star_form_control_PatternField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlPatternField_idl__
 #include <com/sun/star/awt/UnoControlPatternField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/RadioButton.idl b/offapi/com/sun/star/form/control/RadioButton.idl
index b600885453a8..8c4a242f4d02 100644
--- a/offapi/com/sun/star/form/control/RadioButton.idl
+++ b/offapi/com/sun/star/form/control/RadioButton.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_RadioButton_idl__
 #define __com_sun_star_form_control_RadioButton_idl__
 
-#ifndef __com_sun_star_awt_UnoControlRadioButton_idl__
 #include <com/sun/star/awt/UnoControlRadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/SubmitButton.idl b/offapi/com/sun/star/form/control/SubmitButton.idl
index a0174a45f673..548585375f3c 100644
--- a/offapi/com/sun/star/form/control/SubmitButton.idl
+++ b/offapi/com/sun/star/form/control/SubmitButton.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_SubmitButton_idl__
 #define __com_sun_star_form_control_SubmitButton_idl__
 
-#ifndef __com_sun_star_awt_UnoControlButton_idl__
 #include <com/sun/star/awt/UnoControlButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_submission_XSubmission_idl__
 #include <com/sun/star/form/submission/XSubmission.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/control/TextField.idl b/offapi/com/sun/star/form/control/TextField.idl
index 71a1ace31ec2..ec6be0816607 100644
--- a/offapi/com/sun/star/form/control/TextField.idl
+++ b/offapi/com/sun/star/form/control/TextField.idl
@@ -28,16 +28,9 @@
 #ifndef __com_sun_star_form_control_TextField_idl__
 #define __com_sun_star_form_control_TextField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
 #include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
 #include <com/sun/star/form/XChangeBroadcaster.idl>
-#endif
 
 //=============================================================================
 
@@ -45,7 +38,7 @@
 
 //=============================================================================
 
-/** describes a control for entering arbiotrary text which can (but not necessarily has to) be bound
+/** describes a control for entering arbitrary text which can (but not necessarily has to) be bound
     to a database field.
 
     <p>The model of the control has to support the <type scope="com::sun::star::form::component">TextField</type>
diff --git a/offapi/com/sun/star/form/control/TimeField.idl b/offapi/com/sun/star/form/control/TimeField.idl
index 20cd540c82a2..e28e4b197a00 100644
--- a/offapi/com/sun/star/form/control/TimeField.idl
+++ b/offapi/com/sun/star/form/control/TimeField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_control_TimeField_idl__
 #define __com_sun_star_form_control_TimeField_idl__
 
-#ifndef __com_sun_star_awt_UnoControlTimeField_idl__
 #include <com/sun/star/awt/UnoControlTimeField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
 #include <com/sun/star/form/XBoundControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
index 99145dc4f036..6f131220f967 100644
--- a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
+++ b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_ButtonNavigationHandler_idl__
 #define __com_sun_star_form_ButtonNavigationHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl b/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
index 609f087f71f1..5fac8099e578 100644
--- a/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_inspection_CellBindingPropertyHandler_idl__
 #define __com_sun_star_form_inspection_CellBindingPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
index 11140ee20476..52304087bb3e 100644
--- a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
+++ b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
 #define __com_sun_star_form_DefaultFormComponentInspectorModel_idl__
 
-#ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
 #include <com/sun/star/inspection/XObjectInspectorModel.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl b/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
index 2e206f7f1f52..b803837c35f5 100644
--- a/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_inspection_EditPropertyHandler_idl__
 #define __com_sun_star_form_inspection_EditPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
@@ -39,7 +37,7 @@ module com {  module sun {  module star {  module form { module inspection {
 //=============================================================================
 
 /** implements a property handler for use with an <type scope="com::sun::star::inspection">ObjectInspector</type>
-    which provides convinience wrappers for some properties existing at a form component
+    which provides convenience wrappers for some properties existing at a form component
     derived from <type scope="com::sun::star::awt">UnoControlEditModel</type>.
 
     <p>First, the handler supersedes the HScroll and the VScroll properties of a <type scope="com::sun::star::awt">UnoControlEditModel</type>
diff --git a/offapi/com/sun/star/form/inspection/EventHandler.idl b/offapi/com/sun/star/form/inspection/EventHandler.idl
index 3940c082af22..2330573ab930 100644
--- a/offapi/com/sun/star/form/inspection/EventHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EventHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_EventHandler_idl__
 #define __com_sun_star_form_EventHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
index 3b51ba36b6ac..d280442aa6c8 100644
--- a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_inspection_FormComponentPropertyHandler_idl__
 #define __com_sun_star_form_inspection_FormComponentPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl b/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
index 449368af6a1a..d415949bd9a4 100644
--- a/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_inspection_SubmissionPropertyHandler_idl__
 #define __com_sun_star_form_inspection_SubmissionPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl b/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
index 654e17a21ba4..f4aa43fec4de 100644
--- a/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_inspection_XMLFormsPropertyHandler_idl__
 #define __com_sun_star_form_inspection_XMLFormsPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl b/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
index 6896225cfbdd..e3919919b38c 100644
--- a/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_inspection_XSDValidationPropertyHandler_idl__
 #define __com_sun_star_form_inspection_XSDValidationPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/FormFeature.idl b/offapi/com/sun/star/form/runtime/FormFeature.idl
index 13045b0f6bb9..4c7cbc0905be 100644
--- a/offapi/com/sun/star/form/runtime/FormFeature.idl
+++ b/offapi/com/sun/star/form/runtime/FormFeature.idl
@@ -54,12 +54,12 @@ constants FormFeature
         including the potentially active insertion row.
 
         <p>This is not strictly an operation you can do on a form, but rather a
-        state you can retrieve (and display to the user) using the <type>XFormOperations</type>'
+        state you can retrieve (and display to the user) using the <type>XFormOperations</type>'s
         respective methods.</p>
 
         <p>The state obtained here is a string, not a number. This is because in an UI
         form, the fact that the current record count is not yet known (since not all
-        records have been visited, yet) is indicated by an asterik (<code>*</code>) besides
+        records have been visited, yet) is indicated by an asterisk (<code>*</code>) besides
         the record count.</p>
     */
     const short TotalRecords        = 2;
@@ -84,7 +84,7 @@ constants FormFeature
     */
     const short SaveRecordChanges   = 8;
 
-    /** revertsall changes in the form's current record, including changes in the current
+    /** reverts all changes in the form's current record, including changes in the current
         control which had not yet been committed to the form
     */
     const short UndoRecordChanges   = 9;
@@ -124,9 +124,9 @@ constants FormFeature
     */
     const short ToggleApplyFilter   = 17;
 
-    /** removes all filter and sort criterions put on the form.
+    /** removes all filter and sort criteria put on the form.
 
-        <p>Note that this does not apply to criterios which are part of the form's
+        <p>Note that this does not apply to criteria which are part of the form's
         data source. That is, if you bind the form to the SQL command <code>SELECT * FROM
         Articles WHERE Price &gt; 100</code>, then the <code>Price &gt; 100</code> filter
         will not be removed.</p>
@@ -136,7 +136,7 @@ constants FormFeature
     */
     const short RemoveFilterAndSort = 18;
 
-    /** refreshs the current control
+    /** refreshes the current control
 
         <p>Basically, this means calling XRefreshable::refresh on the current control, if it supports
         this interface.</p>
diff --git a/offapi/com/sun/star/form/runtime/FormOperations.idl b/offapi/com/sun/star/form/runtime/FormOperations.idl
index c96844ded821..2572ae86f962 100644
--- a/offapi/com/sun/star/form/runtime/FormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/FormOperations.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_form_runtime_FormOperations_idl__
 #define __com_sun_star_form_runtime_FormOperations_idl__
 
-#ifndef __com_sun_star_form_runtime_XFormOperations_idl__
 #include <com/sun/star/form/runtime/XFormOperations.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
 #include <com/sun/star/form/runtime/XFormController.idl>
-#endif
-#ifndef __com_sun_star_form_XForm_idl__
 #include <com/sun/star/form/XForm.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
index 0f1ca0df7578..4754b9c3a196 100644
--- a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
+++ b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_runtime_XFeatureInvalidation_idl__
 #define __com_sun_star_form_runtime_XFeatureInvalidation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/XFilterController.idl b/offapi/com/sun/star/form/runtime/XFilterController.idl
index e1c3f0f69fee..d1c3471148f5 100644
--- a/offapi/com/sun/star/form/runtime/XFilterController.idl
+++ b/offapi/com/sun/star/form/runtime/XFilterController.idl
@@ -44,7 +44,7 @@ interface XFilterControllerListener;
     which allows entering a search expression. This so-called <em>predicate expression</em> is basically a part of an
     SQL <code>WHERE</code> clause, but without the the part denoting the database column. For instance, if you
     have a form control bound to a table column named <code>Name</code>, then entering the string
-    <q>LIKE '%Smith%'</q> effectively consitutes a SQL <code>WHERE</code> clause <code>"Name" LIKE '%Smith%'</code>.</p>
+    <q>LIKE '%Smith%'</q> effectively constitutes a SQL <code>WHERE</code> clause <code>"Name" LIKE '%Smith%'</code>.</p>
 
     <p>In the actual document view, there are usually some relaxations to this. For instance, keywords such as
     <code>LIKE</code> might be localized, according to OpenOffice.org's UI locale. Also, for an equality criterion,
diff --git a/offapi/com/sun/star/form/runtime/XFormController.idl b/offapi/com/sun/star/form/runtime/XFormController.idl
index 482c66f06262..629f2ebc4945 100644
--- a/offapi/com/sun/star/form/runtime/XFormController.idl
+++ b/offapi/com/sun/star/form/runtime/XFormController.idl
@@ -90,7 +90,7 @@ interface XFormControllerContext;
     message is shown to the user saying that input is required, the respective control is focused, and
     the update of the record is vetoed.</p>
 
-    <p>Note that you can precent the second check - for database fields containing <NULL/> values - on
+    <p>Note that you can present the second check - for database fields containing <NULL/> values - on
     a per-form and a per-database basis.<br/>
     For the former, you need to add a boolean property <code>FormsCheckRequiredFields</code> to the form
     (aka the <code>FormController</code>'s model), using its
@@ -107,7 +107,7 @@ interface XFormControllerContext;
     functionality to the controller by querying the dispatch interceptor for it.</p>
 
     <p>Below, there's a list of URLs which have a defined meaning - if an implementation supports one of them,
-    there must be a guaranteed semantices. However, concrete implementations may support an arbitrary sub or super
+    there must be a guaranteed semantics. However, concrete implementations may support an arbitrary sub or super
     set of these URLs.</p>
 
     <p>In general, all URLs start with the same prefix, namely <em>.uno:FormController/</em>. To this, a suffix is
@@ -333,7 +333,7 @@ interface XFormController
     */
     [attribute, readonly] XFormOperations FormOperations;
 
-    /** provicdes access to the currently active control
+    /** provides access to the currently active control
       */
     [attribute, readonly] ::com::sun::star::awt::XControl CurrentControl;
 
diff --git a/offapi/com/sun/star/form/runtime/XFormOperations.idl b/offapi/com/sun/star/form/runtime/XFormOperations.idl
index 9775fb87e64a..ab108b732f2e 100644
--- a/offapi/com/sun/star/form/runtime/XFormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/XFormOperations.idl
@@ -28,31 +28,14 @@
 #ifndef __com_sun_star_form_runtime_XFormOperations_idl__
 #define __com_sun_star_form_runtime_XFormOperations_idl__
 
-#ifndef __com_sun_star_form_runtime_FeatureState_idl__
 #include <com/sun/star/form/runtime/FeatureState.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XRowSet_idl__
 #include <com/sun/star/sdbc/XRowSet.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XResultSetUpdate_idl__
 #include <com/sun/star/sdbc/XResultSetUpdate.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
 #include <com/sun/star/form/runtime/XFormController.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
@@ -79,7 +62,7 @@ interface XFeatureInvalidation;
     When the user just entered some data into one of the form fields, but did not yet
     leave this field, then the data is not yet committed to the form, not to talk
     about being committed to the underlying database. So, before everything else,
-    you would nee to obtain the active control of the form, and commit it.<br/>
+    you would need to obtain the active control of the form, and commit it.<br/>
     <em>Now</em> you're done ...</p>
 
     <p>As another example, consider that you want to delete the current record from the
@@ -123,7 +106,7 @@ interface XFormOperations : ::com::sun::star::lang::XComponent
         evaluating to <TRUE/>.<p>
 
         @param Feature
-            the feature whose state is to be determimed. Must be one of the <type>FormFeature</type>
+            the feature whose state is to be determined. Must be one of the <type>FormFeature</type>
             constants.<br/>
             An invalid value here will be silently ignored, and simply return a <type>FeatureState</type>
             indicating <em>disabled</em> with a <NULL/> state.</p>
@@ -138,7 +121,7 @@ interface XFormOperations : ::com::sun::star::lang::XComponent
         <member>FeatureState::Enabled</member> member.</p>
 
         @param Feature
-            the feature whose state is to be determimed. Must be one of the <type>FormFeature</type>
+            the feature whose state is to be determined. Must be one of the <type>FormFeature</type>
             constants.<br/>
             An invalid value here will be silently ignored, and simply return <FALSE/>.
     */
@@ -153,11 +136,11 @@ interface XFormOperations : ::com::sun::star::lang::XComponent
             constants.
 
         @throws ::com::sun::star::lang::IllegalArgumentException
-            if the given Feature is unknown, not executable, or striclty requires arguments
+            if the given Feature is unknown, not executable, or strictly requires arguments
             to be executed.
 
         @throws ::com::sun::star::sdbc::SQLException
-            if a database access erorr occurs
+            if a database access error occurs
 
         @throws ::com::sun::star::lang::WrappedTargetException
             if an exception is caught which is no <type scope="com::sun::star::uno">RuntimeException</type>
@@ -190,7 +173,7 @@ interface XFormOperations : ::com::sun::star::lang::XComponent
             if the given arguments are not sufficient to execute the feature
 
         @throws ::com::sun::star::sdbc::SQLException
-            if a database access erorr occurs
+            if a database access error occurs
 
         @throws ::com::sun::star::lang::WrappedTargetException
             if an exception is caught which is no <type scope="com::sun::star::uno">RuntimeException</type>
@@ -216,7 +199,7 @@ interface XFormOperations : ::com::sun::star::lang::XComponent
             case if the record or the active control of the form were modified.
 
         @throws ::com::sun::star::sdbc::SQLException
-            if a database access erorr occurs
+            if a database access error occurs
     */
     boolean         commitCurrentRecord(
                         [out] boolean RecordInserted
@@ -226,7 +209,7 @@ interface XFormOperations : ::com::sun::star::lang::XComponent
     /** commits the current control of our controller
 
         @throws ::com::sun::star::sdbc::SQLException
-            if a database access erorr occurs
+            if a database access error occurs
     */
     boolean         commitCurrentControl(
                     )
@@ -234,7 +217,7 @@ interface XFormOperations : ::com::sun::star::lang::XComponent
 
     /** determines whether the form is currently positioned on the insertion row
 
-        <p>This is a convenience method only. Calling it es equivalent to examing the
+        <p>This is a convenience method only. Calling it is equivalent to examining the
         <member scope="com::sun::star::sdb">RowSet::IsNew</member> property of the form.</p>
 
         @throws ::com::sun::star::lang::WrappedTargetException
@@ -246,7 +229,7 @@ interface XFormOperations : ::com::sun::star::lang::XComponent
 
     /** determines whether the current row of the form is modified
 
-        <p>This is a convenience method only. Calling it es equivalent to examing the
+        <p>This is a convenience method only. Calling it is equivalent to examining the
         <member scope="com::sun::star::sdb">RowSet::IsModified</member> property of the form.</p>
 
         @throws ::com::sun::star::lang::WrappedTargetException
diff --git a/offapi/com/sun/star/form/submission/XSubmission.idl b/offapi/com/sun/star/form/submission/XSubmission.idl
index 7eacf7f13935..976259f36c7d 100644
--- a/offapi/com/sun/star/form/submission/XSubmission.idl
+++ b/offapi/com/sun/star/form/submission/XSubmission.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_form_submission_XSubmission_idl__
 #define __com_sun_star_form_submission_XSubmission_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 //=============================================================================
 
@@ -63,7 +53,7 @@ interface XSubmission : com::sun::star::uno::XInterface
             requirements for the submission, e.g. data consistency, are fulfilled.
 
         @throws com::sun::star::lang::WrappedTargetException
-            if an error occured during invoking the submission target
+            if an error occurred during invoking the submission target
     */
     void submit( )
                 raises ( com::sun::star::util::VetoException, com::sun::star::lang::WrappedTargetException );
@@ -79,7 +69,7 @@ interface XSubmission : com::sun::star::uno::XInterface
             requirements for the submission, e.g. data consistency, are fulfilled.
 
         @throws com::sun::star::lang::WrappedTargetException
-            if an error occured during invoking the submission target
+            if an error occurred during invoking the submission target
     */
     void submitWithInteraction( [in] com::sun::star::task::XInteractionHandler aHandler )
                 raises ( com::sun::star::util::VetoException, com::sun::star::lang::WrappedTargetException );
@@ -90,7 +80,7 @@ interface XSubmission : com::sun::star::uno::XInterface
             the listener to register
 
         @throws com::sun::star::lang::NoSupportException
-            when the component does not support external componentsw vetoing the submission
+            when the component does not support external components vetoing the submission
      */
     void addSubmissionVetoListener( [in] XSubmissionVetoListener listener )
         raises ( com::sun::star::lang::NoSupportException );
@@ -101,7 +91,7 @@ interface XSubmission : com::sun::star::uno::XInterface
             the listener to revoke
 
         @throws com::sun::star::lang::NoSupportException
-            when the component does not support external componentsw vetoing the submission
+            when the component does not support external components vetoing the submission
      */
     void removeSubmissionVetoListener( [in] XSubmissionVetoListener listener )
         raises ( com::sun::star::lang::NoSupportException );
diff --git a/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl b/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
index 8132bfcdf1ac..7c723b11b618 100644
--- a/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
+++ b/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_submission_XSubmissionSupplier_idl__
 #define __com_sun_star_form_submission_XSubmissionSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl b/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
index 0c9f32f5fa91..f64567d33f0c 100644
--- a/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
+++ b/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_form_submission_XSubmissionVetoListener_idl__
 #define __com_sun_star_form_submission_XSubmissionVetoListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl b/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
index 9b436b605efa..cd7e3d7ae890 100644
--- a/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_validation_ValidatableBindableControlModel_idl__
 #define __com_sun_star_form_validation_ValidatableBindableControlModel_idl__
 
-#ifndef __com_sun_star_form_validation_ValidatableControlModel_idl__
 #include <com/sun/star/form/validation/ValidatableControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_BindableControlModel_idl__
 #include <com/sun/star/form/binding/BindableControlModel.idl>
-#endif
 //=============================================================================
 
 module com {  module sun {  module star {  module form { module validation {
diff --git a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
index 5ca51efdab1f..09b6e4490c6a 100644
--- a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_form_validation_ValidatableControlModel_idl__
 #define __com_sun_star_form_validation_ValidatableControlModel_idl__
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
 #include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidatableFormComponent_idl__
 #include <com/sun/star/form/validation/XValidatableFormComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidityConstraintListener_idl__
 #include <com/sun/star/form/validation/XValidityConstraintListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl b/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
index f28c054918b9..92ba6fb4630d 100644
--- a/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
+++ b/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_validation_XFormComponentValidityListener_idl__
 #define __com_sun_star_form_validation_XFormComponentValidityListener_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/validation/XValidatable.idl b/offapi/com/sun/star/form/validation/XValidatable.idl
index aa7799dfff85..a386584ff299 100644
--- a/offapi/com/sun/star/form/validation/XValidatable.idl
+++ b/offapi/com/sun/star/form/validation/XValidatable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_validation_XValidatable_idl__
 #define __com_sun_star_form_validation_XValidatable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl b/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
index eae3a9f48518..adf36adf380b 100644
--- a/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
+++ b/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_form_validation_XValidatableFormComponent_idl__
 #define __com_sun_star_form_validation_XValidatableFormComponent_idl__
 
-#ifndef __com_sun_star_form_validation_XValidatable_idl__
 #include <com/sun/star/form/validation/XValidatable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
 
 //=============================================================================
 
@@ -66,7 +58,7 @@ interface XFormComponentValidityListener;
     <p>An <type>XValidatableFormComponent</type> allows to easily access both of these aspects.</p>
 
     <p>Note that all of the information provided at this interface can also obtained by other means,
-    but much more inconviniently.</p>
+    but much more inconveniently.</p>
 
     @see XValidatable
     @see XValidator
diff --git a/offapi/com/sun/star/form/validation/XValidator.idl b/offapi/com/sun/star/form/validation/XValidator.idl
index 03753ef90fbb..ea4e4003bb9e 100644
--- a/offapi/com/sun/star/form/validation/XValidator.idl
+++ b/offapi/com/sun/star/form/validation/XValidator.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_form_validation_XValidator_idl__
 #define __com_sun_star_form_validation_XValidator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
 
 //=============================================================================
 
@@ -71,7 +66,7 @@ interface XValidator : com::sun::star::uno::XInterface
     @param aValue
         the value which has been recognized as being invalid
     @return
-        a human-readable string, which explains why the given valus is considered invalid.
+        a human-readable string, which explains why the given value is considered invalid.
     */
     string explainInvalid( [in] any Value );
 
@@ -80,7 +75,7 @@ interface XValidator : com::sun::star::uno::XInterface
     <p>Usually, an <type>XValidatable</type> instance will also add itself as validity listener,
     as soon as the validator is introduced to it.</p>
 
-    <p>Implementations which do not support dynamic validity contraints should simply ignore this
+    <p>Implementations which do not support dynamic validity constraints should simply ignore this
     call.</p>
 
     @throws <type scope="com::sun::star::lang">NullPointerException</type>
diff --git a/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl b/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
index 593b230f6d52..299808f57618 100644
--- a/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
+++ b/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_form_validation_XValidityConstraintListener_idl__
 #define __com_sun_star_form_validation_XValidityConstraintListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaText.idl b/offapi/com/sun/star/formula/AccessibleFormulaText.idl
index 98099f32ca27..b164c4e5453d 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaText.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaText.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_formula_AccessibleFormulaText_idl__
 #define __com_sun_star_formula_AccessibleFormulaText_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaView.idl b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
index 3cbcf84950a5..887be948b74d 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaView.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_formula_AccessibleFormulaView__
 #define __com_sun_star_formula_AccessibleFormulaView__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/formula/FormulaProperties.idl b/offapi/com/sun/star/formula/FormulaProperties.idl
index 4e03ff36c3a5..8ae400096bf3 100644
--- a/offapi/com/sun/star/formula/FormulaProperties.idl
+++ b/offapi/com/sun/star/formula/FormulaProperties.idl
@@ -169,7 +169,7 @@ published service FormulaProperties
     [property] string   Formula;
     //-------------------------------------------------------------------------
 
-    /** decides if all brackets (even those without 'left'/'right'
+    /** decides if all brackets (even those without "left"/"right"
         modifier) are scaled.
      */
     [property] boolean  IsScaleAllBrackets;
diff --git a/offapi/com/sun/star/formula/SymbolDescriptor.idl b/offapi/com/sun/star/formula/SymbolDescriptor.idl
index da83b3dc8db1..29b6b2e31a3c 100644
--- a/offapi/com/sun/star/formula/SymbolDescriptor.idl
+++ b/offapi/com/sun/star/formula/SymbolDescriptor.idl
@@ -53,7 +53,7 @@ published struct SymbolDescriptor
     */
     string sSymbolSet;
 
-    /** Specifies the unicode character of the symbol.
+    /** Specifies the Unicode character of the symbol.
     */
     long nCharacter;
 
diff --git a/offapi/com/sun/star/frame/CommandGroup.idl b/offapi/com/sun/star/frame/CommandGroup.idl
index 6cad9c9c4f88..bb2d30d502b2 100644
--- a/offapi/com/sun/star/frame/CommandGroup.idl
+++ b/offapi/com/sun/star/frame/CommandGroup.idl
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module frame {
 published constants CommandGroup
 {
     //-------------------------------------------------------------------------
-    /** specifies interal commands.
+    /** specifies internal commands.
      */
     const short INTERNAL = 0;
 
diff --git a/offapi/com/sun/star/frame/Components.idl b/offapi/com/sun/star/frame/Components.idl
index 705ad4364d73..b630949a00d6 100644
--- a/offapi/com/sun/star/frame/Components.idl
+++ b/offapi/com/sun/star/frame/Components.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_Components_idl__
 #define __com_sun_star_frame_Components_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
@@ -49,7 +47,7 @@ module com {  module sun {  module star {  module frame {
 published service Components
 {
     //-------------------------------------------------------------------------
-    /** use it to get snapshot of current avaliable components as an enumeration
+    /** use it to get snapshot of current available components as an enumeration
      */
     interface com::sun::star::container::XEnumerationAccess;
 };
diff --git a/offapi/com/sun/star/frame/ContentHandler.idl b/offapi/com/sun/star/frame/ContentHandler.idl
index ad30ccab2108..58f29c01ae0b 100644
--- a/offapi/com/sun/star/frame/ContentHandler.idl
+++ b/offapi/com/sun/star/frame/ContentHandler.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_ContentHandler_idl__
 #define __com_sun_star_frame_ContentHandler_idl__
 
-#ifndef __com_sun_star_frame_XNotifyingDispatch_idl__
 #include <com/sun/star/frame/XNotifyingDispatch.idl>
-#endif
 
 //=============================================================================
 
@@ -55,7 +53,7 @@ published service ContentHandler
 
         <p>
         Base interface of <type>XNotifyingDispatch</type> is <type>XDispatch</type>
-        and can be called for requests if result isn't neccessary for dispatch operation.
+        and can be called for requests if result isn't necessary for dispatch operation.
         </p>
 
         @see XDispatch
diff --git a/offapi/com/sun/star/frame/ContentHandlerFactory.idl b/offapi/com/sun/star/frame/ContentHandlerFactory.idl
index 7fb08ba7aa13..c800d19d279d 100644
--- a/offapi/com/sun/star/frame/ContentHandlerFactory.idl
+++ b/offapi/com/sun/star/frame/ContentHandlerFactory.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_ContentHandlerFactory_idl__
 #define __com_sun_star_frame_ContentHandlerFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
 #include <com/sun/star/container/XContainerQuery.idl>
-#endif
 
 //=============================================================================
 
@@ -62,7 +54,7 @@ published service ContentHandlerFactory
 
         <p>
         Returned objects must support the service specification of a <type>ContentHandler</type>.
-        They can be created by using of his internal name, which must be unambigous everytime, only.
+        They can be created by using of his internal name, which must be unambiguous everytime, only.
         To get this name use further specified interfaces of this factory for access on
         the flat configuration.
         </p>
diff --git a/offapi/com/sun/star/frame/ControlCommand.idl b/offapi/com/sun/star/frame/ControlCommand.idl
index 9be9a6948349..58cac6e3c4b8 100644
--- a/offapi/com/sun/star/frame/ControlCommand.idl
+++ b/offapi/com/sun/star/frame/ControlCommand.idl
@@ -28,9 +28,7 @@
 #define __com_sun_star_frame_ControlCommand_idl__
 
 
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/ControlEvent.idl b/offapi/com/sun/star/frame/ControlEvent.idl
index 7cde5fc5ee54..4ae0bc1a18f8 100644
--- a/offapi/com/sun/star/frame/ControlEvent.idl
+++ b/offapi/com/sun/star/frame/ControlEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_frame_ControlEvent_idl__
 #define __com_sun_star_frame_ControlEvent_idl__
 
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
@@ -54,7 +50,7 @@ struct ControlEvent
     */
     ::com::sun::star::util::URL aURL;
 
-    /** specifies the event which has occured.
+    /** specifies the event which has occurred.
      */
     string Event;
 
@@ -62,7 +58,7 @@ struct ControlEvent
 
     /** specifies a sequence of named values which are used as
         additional values for the event. The number and types of
-        named values depent on the event.
+        named values depend on the event.
      */
     sequence< com::sun::star::beans::NamedValue > aInformation;
 };
diff --git a/offapi/com/sun/star/frame/Controller.idl b/offapi/com/sun/star/frame/Controller.idl
index 5371d3c331e0..298249d1d44c 100644
--- a/offapi/com/sun/star/frame/Controller.idl
+++ b/offapi/com/sun/star/frame/Controller.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_frame_Controller_idl__
 #define __com_sun_star_frame_Controller_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XContextMenuInterception_idl__
 #include <com/sun/star/ui/XContextMenuInterception.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XUserInputInterception_idl__
 #include <com/sun/star/awt/XUserInputInterception.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferableSupplier_idl__
 #include <com/sun/star/datatransfer/XTransferableSupplier.idl>
-#endif
 
 //=============================================================================
 
@@ -98,7 +78,7 @@ published service Controller
 
     //-------------------------------------------------------------------------
     /** this interface enables the controller to get interceptors registered that
-        change context menue or prevent them from beeing executed
+        change context menus or prevent them from being executed
 
         <p>
         Don't mix it with <type>XDispatchProviderInterception</type> which
diff --git a/offapi/com/sun/star/frame/Desktop.idl b/offapi/com/sun/star/frame/Desktop.idl
index f7a92ca25df0..9c534cbe7ee1 100644
--- a/offapi/com/sun/star/frame/Desktop.idl
+++ b/offapi/com/sun/star/frame/Desktop.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_frame_Desktop_idl__
 #define __com_sun_star_frame_Desktop_idl__
 
-#ifndef __com_sun_star_frame_Frame_idl__
 #include <com/sun/star/frame/Frame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDesktop_idl__
 #include <com/sun/star/frame/XDesktop.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XComponentLoader_idl__
 #include <com/sun/star/frame/XComponentLoader.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -64,12 +50,12 @@
 published service Desktop
 {
     //-------------------------------------------------------------------------
-    /** make it possible to be the global root of different seperated frame trees
+    /** make it possible to be the global root of different separated frame trees
 
         <p>
         It's not a must for a frame (neither a frame tree) to be a part of this
         global tree. But such outstanding frames won't be accessible by the normal
-        frame api.
+        frame API.
         </p>
      */
     service Frame;
@@ -81,7 +67,7 @@ published service Desktop
     interface XDesktop;
 
     //-------------------------------------------------------------------------
-    /** supports simple api for loading components into the frame environment
+    /** supports simple API for loading components into the frame environment
      */
     interface XComponentLoader;
 
diff --git a/offapi/com/sun/star/frame/DesktopTask.idl b/offapi/com/sun/star/frame/DesktopTask.idl
index 3640f57c332f..a6f9de46fc17 100644
--- a/offapi/com/sun/star/frame/DesktopTask.idl
+++ b/offapi/com/sun/star/frame/DesktopTask.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_frame_DesktopTask_idl__
 #define __com_sun_star_frame_DesktopTask_idl__
 
-#ifndef __com_sun_star_frame_XDesktopTask_idl__
 #include <com/sun/star/frame/XDesktopTask.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XWindowArranger_idl__
 #include <com/sun/star/frame/XWindowArranger.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFramesSupplier_idl__
 #include <com/sun/star/frame/XFramesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DesktopTasks.idl b/offapi/com/sun/star/frame/DesktopTasks.idl
index afb479209b3d..34bdfccc9859 100644
--- a/offapi/com/sun/star/frame/DesktopTasks.idl
+++ b/offapi/com/sun/star/frame/DesktopTasks.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DesktopTasks_idl__
 #define __com_sun_star_frame_DesktopTasks_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DispatchDescriptor.idl b/offapi/com/sun/star/frame/DispatchDescriptor.idl
index f3b3867695f3..1aaaf9593740 100644
--- a/offapi/com/sun/star/frame/DispatchDescriptor.idl
+++ b/offapi/com/sun/star/frame/DispatchDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DispatchDescriptor_idl__
 #define __com_sun_star_frame_DispatchDescriptor_idl__
 
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
 
 //=============================================================================
@@ -41,9 +39,9 @@
     has to be loaded into a specified frame
 
     <p>
-    For a normal dispatch calls all needed parameters are seperated.
+    For a normal dispatch calls all needed parameters are separated.
     For optimized remote functionality <member>XDispatch::queryDispatches()</member>
-    it's neccessary to pack these parameters in a flat structure wich can be used
+    it's necessary to pack these parameters in a flat structure which can be used
     in a simple manner.
     </p>
 
@@ -67,7 +65,7 @@ published struct DispatchDescriptor
     /** name of the target frame
 
         <p>
-        Special targets (e.g. "_blank", "_self") or realy existing target names can be used.
+        Special targets (e.g. "_blank", "_self") or really existing target names can be used.
         </p>
 
         @see XDispatchProvider::queryDispatch()
diff --git a/offapi/com/sun/star/frame/DispatchHelper.idl b/offapi/com/sun/star/frame/DispatchHelper.idl
index 088a113d1fc0..4047eadb0b41 100644
--- a/offapi/com/sun/star/frame/DispatchHelper.idl
+++ b/offapi/com/sun/star/frame/DispatchHelper.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DispatchHelper_idl__
 #define __com_sun_star_frame_DispatchHelper_idl__
 
-#ifndef __com_sun_star_frame_XDispatchHelper_idl__
 #include <com/sun/star/frame/XDispatchHelper.idl>
-#endif
 
 //=============================================================================
 
@@ -39,7 +37,7 @@ module com {  module sun {  module star {  module frame {
 /** provides an easy way to dispatch an URL using one call instead of multiple ones.
 
     <p>
-    Normaly a complete dispatch is splitted into different parts:
+    Normally a complete dispatch is split into different parts:
     - converting and parsing the URL
     - searching for a valid dispatch object available on a dispatch provider
     - dispatching of the URL and it's parameters
diff --git a/offapi/com/sun/star/frame/DispatchInformation.idl b/offapi/com/sun/star/frame/DispatchInformation.idl
index 861699f018e7..fadd3db939bb 100644
--- a/offapi/com/sun/star/frame/DispatchInformation.idl
+++ b/offapi/com/sun/star/frame/DispatchInformation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DispatchInformation_idl__
 #define __com_sun_star_frame_DispatchInformation_idl__
 
-#ifndef __com_sun_star_frame_CommandGroup_idl__
 #include <com/sun/star/frame/CommandGroup.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DispatchProvider.idl b/offapi/com/sun/star/frame/DispatchProvider.idl
index 0eb061d54971..de33c6cfda69 100644
--- a/offapi/com/sun/star/frame/DispatchProvider.idl
+++ b/offapi/com/sun/star/frame/DispatchProvider.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_DispatchProvider_idl__
 #define __com_sun_star_frame_DispatchProvider_idl__
 
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
 #include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
 
 //=============================================================================
 
@@ -61,7 +56,7 @@ published service DispatchProvider
 
         <p>
         Base interface of <type>XNotifyingDispatch</type> is <type>XDispatch</type>
-        and can be called for requests if result isn't neccessary for dispatch operation.
+        and can be called for requests if result isn't necessary for dispatch operation.
         </p>
 
         @see XDispatch
diff --git a/offapi/com/sun/star/frame/DispatchRecorder.idl b/offapi/com/sun/star/frame/DispatchRecorder.idl
index 276d332e45a4..56a693fd25c7 100644
--- a/offapi/com/sun/star/frame/DispatchRecorder.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorder.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_DispatchRecorder_idl__
 #define __com_sun_star_frame_DispatchRecorder_idl__
 
-#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
 #include <com/sun/star/frame/XDispatchRecorder.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
 
 //=============================================================================
 
@@ -43,7 +38,7 @@
 /** provides functionality to record <member>XDispatch::dispatch()</member> requests
 
     <p>
-    It records all neccessary parameters of a call <member>XDispatch::dispatch()</member>
+    It records all necessary parameters of a call <member>XDispatch::dispatch()</member>
     and generate code which can be executed at later time to run same operations
     again. Which code will be generated depends from real implementation. So it's
     possible to generate e.g. Java/Basic or may Perl code.
diff --git a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
index 7dec99011b17..6e476eeecbf2 100644
--- a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DispatchRecorderSupplier_idl__
 #define __com_sun_star_frame_DispatchRecorderSupplier_idl__
 
-#ifndef __com_sun_star_frame_XDispatchRecorderSupplier_idl__
 #include <com/sun/star/frame/XDispatchRecorderSupplier.idl>
-#endif
 
 //=============================================================================
 
@@ -40,8 +38,8 @@
 
     <p>
     This supplier regulate macro recording of <member>XDispatch::dispatch()</member>
-    calls. For that it capsulate a reference to a <type>DispatchRecorder</type>.
-    Such recorder is used internaly and can be used externaly too.
+    calls. For that it encapsulates a reference to a <type>DispatchRecorder</type>.
+    Such recorder is used internally and can be used externally too.
     A supplier will be available on a <type>Frame</type> if recording was enabled,
     otherwise not. A frame supports a special property for that.
     This modular concept of recorder, supplier and frame makes it possible to
diff --git a/offapi/com/sun/star/frame/DispatchResultEvent.idl b/offapi/com/sun/star/frame/DispatchResultEvent.idl
index c295f517b446..6bd95e340bd2 100644
--- a/offapi/com/sun/star/frame/DispatchResultEvent.idl
+++ b/offapi/com/sun/star/frame/DispatchResultEvent.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_frame_DispatchResultEvent_idl__
 #define __com_sun_star_frame_DispatchResultEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
 //=============================================================================
 
@@ -44,10 +39,10 @@
 /** contains the result of the dispatch action, if State is set to SUCCESS
 
     <p>
-    The type of the result is dispatch action dependend. The member State
+    The type of the result is dispatch action dependent. The member State
     can be set to one of the values defined in <type>DispatchResultState</type>.
     If State is set to <const>DispatchResultState::FAILURE</const>, Result may
-    specify the reason (or is empty). The type is also dispatch action dependend.
+    specify the reason (or is empty). The type is also dispatch action dependent.
     If State is set to <const>DispatchResultState::DONTKNOW</const>, Result is empty.
     </p>
 
diff --git a/offapi/com/sun/star/frame/DispatchStatement.idl b/offapi/com/sun/star/frame/DispatchStatement.idl
index c1965b0db838..c27f8cf004b8 100644
--- a/offapi/com/sun/star/frame/DispatchStatement.idl
+++ b/offapi/com/sun/star/frame/DispatchStatement.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DispatchStatement_idl__
 #define __com_sun_star_frame_DispatchStatement_idl__
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DocumentTemplates.idl b/offapi/com/sun/star/frame/DocumentTemplates.idl
index b3c44ffe83ad..2912a7ef8087 100644
--- a/offapi/com/sun/star/frame/DocumentTemplates.idl
+++ b/offapi/com/sun/star/frame/DocumentTemplates.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_DocumentTemplates_idl__
 #define __com_sun_star_frame_DocumentTemplates_idl__
 
-#ifndef __com_sun_star_frame_XDocumentTemplates_idl__
 #include <com/sun/star/frame/XDocumentTemplates.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/DoubleInitializationException.idl b/offapi/com/sun/star/frame/DoubleInitializationException.idl
index f1121156a2cc..d225770b6e83 100644
--- a/offapi/com/sun/star/frame/DoubleInitializationException.idl
+++ b/offapi/com/sun/star/frame/DoubleInitializationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_TerminationVetoException_idl__
 #define __com_sun_star_frame_TerminationVetoException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/FeatureStateEvent.idl b/offapi/com/sun/star/frame/FeatureStateEvent.idl
index c812424e42ac..ae58f8d62766 100644
--- a/offapi/com/sun/star/frame/FeatureStateEvent.idl
+++ b/offapi/com/sun/star/frame/FeatureStateEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_FeatureStateEvent_idl__
 #define __com_sun_star_frame_FeatureStateEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/Frame.idl b/offapi/com/sun/star/frame/Frame.idl
index 27ae448134dd..794eb1beeb70 100644
--- a/offapi/com/sun/star/frame/Frame.idl
+++ b/offapi/com/sun/star/frame/Frame.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_frame_Frame_idl__
 #define __com_sun_star_frame_Frame_idl__
 
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchRecorderSupplier_idl__
 #include <com/sun/star/frame/XDispatchRecorderSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
 #include <com/sun/star/frame/XDispatchProviderInterception.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFramesSupplier_idl__
 #include <com/sun/star/frame/XFramesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicatorFactory_idl__
 #include <com/sun/star/task/XStatusIndicatorFactory.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchInformationProvider_idl__
 #include <com/sun/star/frame/XDispatchInformationProvider.idl>
-#endif
-
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 //=============================================================================
 
@@ -71,9 +45,9 @@
 /** represents the environment for a desktop component
 
     <p>
-    Frames are the anchors for the office components and they are the components' link
-    to the outside world. They create a skeleton for the whole office api infrastructure
-    by building frame hierarchys. These hierarchies contains all currently loaded
+    Frames are the anchors for the office components and they are the component's link
+    to the outside world. They create a skeleton for the whole office API infrastructure
+    by building frame hierarchies. These hierarchies contains all currently loaded
     documents and make it possible to walk during these trees.
     A special service <type>Desktop</type> can(!) combine different of such trees
     to a global one which life time will be controlled by it.
@@ -135,7 +109,7 @@ published service Frame
     /** supports interception mechanism for dispatched URLs
 
         <p>
-        Registered objects can intercept, supress or deroute dispatched URLs.
+        Registered objects can intercept, suppress or reroute dispatched URLs.
         If they support another interface too (<type>XInterceptorInfo</type>)
         it's possible to perform it by directly calling of right interceptor without
         using list of all registered ones.
@@ -174,7 +148,7 @@ published service Frame
         The supplier contains a dispatch recorder and provide the functionality
         to use it for any dispatch object from outside which supports the interface
         <type>XDispatch</type>. A supplier is available only, if recording was enabled.
-        That means: if somewhere whish to enable recoding on a frame he must set
+        That means: if someone wishes to enable recoding on a frame he must set
         a supplier with a recorder object inside of it. Every user of dispatches
         has to check then if such supplier is available at this frame property.
         If value of this property is <NULL/> he must call <member>XDispatch::dispatch()</member>
@@ -185,7 +159,7 @@ published service Frame
 
         <p>
         Note:<br>
-        It's not recommended to cache an already getted supplier. Because there exist
+        It's not recommended to cache an already gotten supplier. Because there exist
         no possibility to check for enabled/disabled recording then.
         </p>
 
diff --git a/offapi/com/sun/star/frame/FrameAction.idl b/offapi/com/sun/star/frame/FrameAction.idl
index e3249900095e..7e12a0db4fd3 100644
--- a/offapi/com/sun/star/frame/FrameAction.idl
+++ b/offapi/com/sun/star/frame/FrameAction.idl
@@ -37,7 +37,7 @@
     of the desktop
 
     <p>
-    Interest listener can get informations about loaded/realoed or unloaded
+    Interest listener can get informations about loaded/reloaded or unloaded
     components into a <type>Frame</type>.
     </p>
 
@@ -92,7 +92,7 @@ published enum FrameAction
         activated
 
         <p>
-        Activations are broacast from the top component which was
+        Activations are broadcast from the top component which was
         not active before, down to the inner most component.
         </p>
 
diff --git a/offapi/com/sun/star/frame/FrameActionEvent.idl b/offapi/com/sun/star/frame/FrameActionEvent.idl
index 563cf5ffe064..27cc6acdad34 100644
--- a/offapi/com/sun/star/frame/FrameActionEvent.idl
+++ b/offapi/com/sun/star/frame/FrameActionEvent.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_FrameActionEvent_idl__
 #define __com_sun_star_frame_FrameActionEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_FrameAction_idl__
 #include <com/sun/star/frame/FrameAction.idl>
-#endif
 
 //=============================================================================
 
@@ -52,7 +44,7 @@
 published struct FrameActionEvent: com::sun::star::lang::EventObject
 {
     //-------------------------------------------------------------------------
-    /** contains the frame in which the event occured
+    /** contains the frame in which the event occurred
      */
     XFrame Frame;
 
diff --git a/offapi/com/sun/star/frame/FrameControl.idl b/offapi/com/sun/star/frame/FrameControl.idl
index d05819970559..b163fcd2062e 100644
--- a/offapi/com/sun/star/frame/FrameControl.idl
+++ b/offapi/com/sun/star/frame/FrameControl.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_FrameControl_idl__
 #define __com_sun_star_frame_FrameControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -45,7 +40,7 @@
     <p>
     If the control is visible and has a valid (loadable) component URL,
     then the <member>FrameControl::Frame</member> property is set.
-    Normaly this control can be used for preview functionality inside
+    Normally this control can be used for preview functionality inside
     any UI.
     </p>
  */
diff --git a/offapi/com/sun/star/frame/FrameLoader.idl b/offapi/com/sun/star/frame/FrameLoader.idl
index 3ba240608dbf..f2799135a99c 100644
--- a/offapi/com/sun/star/frame/FrameLoader.idl
+++ b/offapi/com/sun/star/frame/FrameLoader.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_FrameLoader_idl__
 #define __com_sun_star_frame_FrameLoader_idl__
 
-#ifndef __com_sun_star_frame_XFrameLoader_idl__
 #include <com/sun/star/frame/XFrameLoader.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
@@ -70,7 +62,7 @@ published service FrameLoader
         <p>
         Concrete implementations should use it to get her own configuration data
         directly after creation by the <type>FrameLoaderFactory</type>.
-        Otherwhise they must use normal configuration api to do so.
+        Otherwise they must use normal configuration API to do so.
         </p>
      */
     [optional] interface com::sun::star::lang::XInitialization;
@@ -86,7 +78,7 @@ published service FrameLoader
     can be used on service <type>FrameLoaderFactory</type> to get further informations about this loader.
         Setting of this name by calling <member scope="com::sun::star::container">XNamed::setName()</member>
     must be forwarded to same factory service. He should decide, if it's allowed or not.
-        The reason: prevent code against name ambigities.
+        The reason: prevent code against name ambiguities.
         </p>
      */
      [optional] interface com::sun::star::container::XNamed;
diff --git a/offapi/com/sun/star/frame/FrameLoaderFactory.idl b/offapi/com/sun/star/frame/FrameLoaderFactory.idl
index 1866f286d2cf..f911a4358759 100644
--- a/offapi/com/sun/star/frame/FrameLoaderFactory.idl
+++ b/offapi/com/sun/star/frame/FrameLoaderFactory.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_FrameLoaderFactory_idl__
 #define __com_sun_star_frame_FrameLoaderFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerQuery_idl__
 #include <com/sun/star/container/XContainerQuery.idl>
-#endif
 
 //=============================================================================
 
@@ -49,9 +41,9 @@ module com { module sun { module star { module frame {
     <p>
     With this factory it's possible to
     <ul>
-        <li>have access on configuration of set of registered frame laoder objects</li>
-        <li>create a frame laoder by his internal name</li>
-        <li>query for a frame laoder by using special query or property description.</li>
+        <li>have access on configuration of set of registered frame loader objects</li>
+        <li>create a frame loader by his internal name</li>
+        <li>query for a frame loader by using special query or property description.</li>
     </ul>
     </p>
  */
@@ -62,9 +54,9 @@ published service FrameLoaderFactory
 
         <p>
         Returned objects must support the service specification of a <type>FrameLoader</type>
-        or <type>SynchronousFrameLoader</type>. (Note: last one will be prefered if both ones
+        or <type>SynchronousFrameLoader</type>. (Note: last one will be preferred if both ones
         are available)
-        They can be created by using of his internal name, which must be unambigous everytime, only.
+        They can be created by using of his internal name, which must be unambiguous everytime, only.
         To get this name use further specified interfaces of this factory for access on
         the flat configuration.
         </p>
diff --git a/offapi/com/sun/star/frame/FrameSearchFlag.idl b/offapi/com/sun/star/frame/FrameSearchFlag.idl
index ac3acee82f7e..8b1f249d0cd9 100644
--- a/offapi/com/sun/star/frame/FrameSearchFlag.idl
+++ b/offapi/com/sun/star/frame/FrameSearchFlag.idl
@@ -74,7 +74,7 @@ published constants FrameSearchFlag
         /** includes all child frames of the start frame
 
             <p>
-            Note: That means all direct children and of course her childrens too.
+            Note: That means all direct children and of course her children too.
                   Search doesn't stop at the next level inside the tree!
             </p>
          */
@@ -89,7 +89,7 @@ published constants FrameSearchFlag
         /** includes the direct siblings of the start frame
 
             <p>
-            Normaly it's interpreted as search on the direct childs of the parent
+            Normally it's interpreted as search on the direct children of the parent
             only. But in combination with e.g. the CHILDREN flag it can include all
             children of it too.
             </p>
@@ -102,9 +102,9 @@ published constants FrameSearchFlag
         <p>
         If this flag isn't present, any search from bottom to top has to stop, if a top frame
         will be reached. It doesn't influence a search from top to bottom.
-        But it can be used at the root of the frame tree to search on direct childrens of it only.
+        But it can be used at the root of the frame tree to search on direct children of it only.
         Because the direct children of the root node are the root's of the task sub trees, which
-        are top frames too. Instead of using the CHILDREN flag there, it's possible so to supress
+        are top frames too. Instead of using the CHILDREN flag there, it's possible so to suppress
         a deeper search so.
         </p>
      */
diff --git a/offapi/com/sun/star/frame/FramesContainer.idl b/offapi/com/sun/star/frame/FramesContainer.idl
index 450da0ac0538..9fe185c5397f 100644
--- a/offapi/com/sun/star/frame/FramesContainer.idl
+++ b/offapi/com/sun/star/frame/FramesContainer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_FramesContainer_idl__
 #define __com_sun_star_frame_FramesContainer_idl__
 
-#ifndef __com_sun_star_frame_XFrames_idl__
 #include <com/sun/star/frame/XFrames.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl b/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
index 23c98809acbd..7f0ce10ccac0 100644
--- a/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_GlobalEventBroadcaster_idl__
 #define __com_sun_star_frame_GlobalEventBroadcaster_idl__
 
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventsSupplier_idl__
 #include <com/sun/star/document/XEventsSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
index 2154daac70fe..a0bef818d0fd 100644
--- a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
+++ b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_TerminationVetoException_idl__
 #define __com_sun_star_frame_TerminationVetoException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl
index e54df74e59d3..92d987892e60 100644
--- a/offapi/com/sun/star/frame/LayoutManager.idl
+++ b/offapi/com/sun/star/frame/LayoutManager.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_frame_LayoutManager_idl__
 #define __com_sun_star_frame_LayoutManager_idl__
 
-#ifndef __com_sun_star_frame_XLayoutManager_idl__
 #include <com/sun/star/frame/XLayoutManager.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrameActionListener_idl__
 #include <com/sun/star/frame/XFrameActionListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
 #include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XInplaceLayout_idl__
 #include <com/sun/star/frame/XInplaceLayout.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XMenuBarMergingAcceptor_idl__
 #include <com/sun/star/frame/XMenuBarMergingAcceptor.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XLayoutManagerEventBroadcaster_idl__
 #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl b/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
index d4f934c39f44..53084a1f11eb 100644
--- a/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
+++ b/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_MediaTypeDetectionHelper_idl__
 #define __com_sun_star_frame_MediaTypeDetectionHelper_idl__
 
-#ifndef __com_sun_star_util_XStringMapping_idl__
 #include <com/sun/star/util/XStringMapping.idl>
-#endif
 
 //=============================================================================
 
@@ -45,7 +43,7 @@ published service MediaTypeDetectionHelper
     /** provides a mapping from <atom>string<atom> to <atom>string<atom>
 
         <p>
-        Order of given and their returned coressponding strings is important.
+        Order of given and their returned corresponding strings is important.
         Don't pack or optimize it. Every item of [in] list must match
         to an item of [out] list.
         </p>
diff --git a/offapi/com/sun/star/frame/ModuleManager.idl b/offapi/com/sun/star/frame/ModuleManager.idl
index 186e89858c20..c69cd2156dba 100644
--- a/offapi/com/sun/star/frame/ModuleManager.idl
+++ b/offapi/com/sun/star/frame/ModuleManager.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_frame_ModuleManager_idl__
 #define __com_sun_star_frame_ModuleManager_idl__
 
-#ifndef __com_sun_star_frame_XModuleManager_idl__
 #include <com/sun/star/frame/XModuleManager.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //===============================================
 
@@ -66,7 +61,7 @@ published service ModuleManager
         (which is used inside configuration as set node name too)
         and is further represented by a sequence of elements of type
         <type scope="com::sun::star::beans">PropertyValue</type>.
-        A list of properties can be getted from the configuration template
+        A list of properties can be gotten from the configuration template
         org.openoffice.Setup/Factory.
         </p>
      */
diff --git a/offapi/com/sun/star/frame/PopupMenuController.idl b/offapi/com/sun/star/frame/PopupMenuController.idl
index eab60de2fd2c..bf2b83d84869 100644
--- a/offapi/com/sun/star/frame/PopupMenuController.idl
+++ b/offapi/com/sun/star/frame/PopupMenuController.idl
@@ -28,26 +28,11 @@
 #ifndef __com_sun_star_frame_PopupMenuController_idl__
 #define __com_sun_star_frame_PopupMenuController_idl__
 
-#ifndef __com_sun_star_frame_XPopupMenuController_idl__
 #include <com/sun/star/frame/XPopupMenuController.idl>
-#endif
-
-#ifndef _com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
 #include <com/sun/star/frame/XStatusListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
 
 //=============================================================================
 
@@ -55,12 +40,12 @@ module com { module sun { module star { module frame {
 
 //=============================================================================
 
-/** provides access to a popup menu controller.
+/** provides access to a pop-up menu controller.
 
     <p>
-    A popup menu controller is used to make special functions available to
+    A pop-up menu controller is used to make special functions available to
     users, which depend on runtime or context specific conditions.<br/>
-    A typical example for a popup menu controller can be a recent file list
+    A typical example for a pop-up menu controller can be a recent file list
     implementation which provides a list of latest files that a user has
     worked on. This list gets changes consistently during a work session.
     </p>
@@ -71,32 +56,32 @@ module com { module sun { module star { module frame {
 service PopupMenuController
 {
     //-------------------------------------------------------------------------
-    /** supports functions to initialize and update a popup menu controller
+    /** supports functions to initialize and update a pop-up menu controller
         implementation.
 
         <p>
-        A popup menu controller implementation gets initialized with a
+        A pop-up menu controller implementation gets initialized with a
         <type scope="com::sun::star::awt">XPopupMenu</type> object. This assures
-        that a popup menu controller can be implemented with any UNO based
+        that a pop-up menu controller can be implemented with any UNO based
         language.
         </p>
     */
     interface com::sun::star::frame::XPopupMenuController;
 
     //-------------------------------------------------------------------------
-    /** provides functions to initialize a popup menu controller with
+    /** provides functions to initialize a pop-up menu controller with
         specific data which are needed.
 
         <p>
         This interface should not directly used. A factory service is responsible to
         initialize every controller correctly.<br/>
 
-        A popup menu controller needs at least two additional arguments
+        A pop-up menu controller needs at least two additional arguments
         provided as <type scope="com::sun::star::beans">PropertyValue</type>:
         <ul>
             <li><b>Frame</b><br>specifies the <type scope="com::sun::star::frame">XFrame</type>
-                   instance to which the popup menu controller belongs to.</li>
-            <li><b>CommandURL</b><br>specifies which popup menu controller should be created.</li>
+                   instance to which the pop-up menu controller belongs to.</li>
+            <li><b>CommandURL</b><br>specifies which pop-up menu controller should be created.</li>
         </ul>
         </p>
 
@@ -105,10 +90,10 @@ service PopupMenuController
     interface com::sun::star::lang::XInitialization;
 
     //-------------------------------------------------------------------------
-    /** used to brief the popup menu controller with new status information.
+    /** used to brief the pop-up menu controller with new status information.
 
         <p>
-        A popup menu controller makes special functions available to users which
+        A pop-up menu controller makes special functions available to users which
         normally depend on the state of other data. This interface is used to
         send this data to a controller implementation.
         </p>
@@ -116,15 +101,15 @@ service PopupMenuController
     interface com::sun::star::frame::XStatusListener;
 
     //-------------------------------------------------------------------------
-    /** used to query for commands supported by the popup menu controller to
+    /** used to query for commands supported by the pop-up menu controller to
         execute them directly.
 
         <p>
-        A popup menu controller provides special functions which should be
+        A pop-up menu controller provides special functions which should be
         available by the normal dispatch API. This optional interface enables
-        popup menu controller to be normal dispatch providers.<br/>
+        pop-up menu controller to be normal dispatch providers.<br/>
         <b>Attention:</b><br/>
-        Popup menu controller functions must be specified using the following
+        Po-pup menu controller functions must be specified using the following
         the dispatch URL scheme: "vnd.sun.star.popup:" opaque_part [ "?" query ].
         </p>
 
@@ -133,11 +118,11 @@ service PopupMenuController
     [optional] interface com::sun::star::frame::XDispatchProvider;
 
     //-------------------------------------------------------------------------
-    /** used to dispose popup menu controller by the owner instance.
+    /** used to dispose pop-up menu controller by the owner instance.
 
         <p>
-        A popup menu controller resides in a menu which has a limited
-        life-time. For correct life-time handling a popup menu
+        A pop-up menu controller resides in a menu which has a limited
+        life-time. For correct life-time handling a pop-up menu
         controller should support this interface.
         </p>
 
diff --git a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
index 4bf62ffb1efa..78b3937f5c7f 100644
--- a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
+++ b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_frame_PopupMenuControllerFactory_idl__
 #define __com_sun_star_frame_PopupMenuControllerFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
 #include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XUIControllerRegistration_idl__
 #include <com/sun/star/frame/XUIControllerRegistration.idl>
-#endif
 
 //=============================================================================
 
@@ -42,11 +37,11 @@ module com { module sun { module star { module frame {
 
 //=============================================================================
 
-/** specifies a factory that creates instances of registered popup menu controller.
+/** specifies a factory that creates instances of registered pop-up menu controller.
 
     <p>
-    A popup menu controller can be registered for a command URL and a model service name.
-    A menu bar or context menu will automatically create a popup menu controller if
+    A pop-up menu controller can be registered for a command URL and a model service name.
+    A menu bar or context menu will automatically create a pop-up menu controller if
     it contains a registered command URL.
     </p>
 
@@ -55,25 +50,25 @@ module com { module sun { module star { module frame {
 
 service PopupMenuControllerFactory
 {
-    /** this interface provides functions to create new instances of a registered popup menu controller.
+    /** this interface provides functions to create new instances of a registered pop-up menu controller.
 
         <p>
         Use <member scope="com.sun.star.lang">XMultiComponentFactory::createInstanceWithArguments()</member> to create
-        a new popup menu controller instance. Use the CommandURL as the service specifier.
+        a new pop-up menu controller instance. Use the CommandURL as the service specifier.
 
         This call supports the following arguments provided as <type scope="com::sun::star::beans">PropertyValue</type>:
         <ul>
             <li><b>Frame</b><br>specifies the <type scope="com::sun::star::frame">XFrame</type>
-                   instance to which the popup menu controller belongs to. This property must be provided to
-                   the popup menu controller, otherwise it cannot dispatch its internal commands.</li>
-            <li><b>ModuleIdentifier</b><br>optional string that specifies in which module context the popup menu
+                   instance to which the pop-up menu controller belongs to. This property must be provided to
+                   the pop-up menu controller, otherwise it cannot dispatch its internal commands.</li>
+            <li><b>ModuleIdentifier</b><br>optional string that specifies in which module context the pop-up menu
                    controller should be created.</li>
         </ul>
         </p>
      */
     interface com::sun::star::lang::XMultiComponentFactory;
 
-    /** provides functions to query for, register and deregister a popup menu controller.
+    /** provides functions to query for, register and deregister a pop-up menu controller.
      */
     interface com::sun::star::frame::XUIControllerRegistration;
 };
diff --git a/offapi/com/sun/star/frame/ProtocolHandler.idl b/offapi/com/sun/star/frame/ProtocolHandler.idl
index f1a6e9dbc6fc..85e629d679fe 100644
--- a/offapi/com/sun/star/frame/ProtocolHandler.idl
+++ b/offapi/com/sun/star/frame/ProtocolHandler.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_ProtocolHandler_idl__
 #define __com_sun_star_frame_ProtocolHandler_idl__
 
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
@@ -51,7 +46,7 @@
     <p>
     Supported URLs must match follow format: <protocol scheme>:<protocol specific part>
     If a handler provides optional arguments ("?") or jump marks ("#") depends from his
-    defintion and implementation. The generic dispatch provider will use registered
+    definition and implementation. The generic dispatch provider will use registered
     URL pattern to detect right handler.
     </p>
  */
@@ -72,8 +67,8 @@ published service ProtocolHandler
         /** initialize the new handler instance with some context informations
 
         <p>
-        Sometimes it can be usefull for a handler object, to know something about the
-        environment, in which it runs - especily the frame. For this case the generic
+        Sometimes it can be useful for a handler object, to know something about the
+        environment, in which it runs - especially the frame. For this case the generic
         code (which uses the handler) will ask for this optional interface and use it, if it exist.
         Following parameters are passed to the service:
         <ul>
@@ -82,8 +77,8 @@ published service ProtocolHandler
         </p>
 
         <p>
-        Please note: if this mechanism is used it seams not usefull (nor possible) to implement a ProtocolHandler
-        as a singleton. Otherwhise the implementation can't distinguish between different environments
+        Please note: if this mechanism is used it seams not useful (nor possible) to implement a ProtocolHandler
+        as a singleton. Otherwise the implementation can't distinguish between different environments
         and her corresponding dispatch requests.
         </p>
         */
diff --git a/offapi/com/sun/star/frame/SessionManager.idl b/offapi/com/sun/star/frame/SessionManager.idl
index 56c59705fd36..06d73679216f 100644
--- a/offapi/com/sun/star/frame/SessionManager.idl
+++ b/offapi/com/sun/star/frame/SessionManager.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_SessionManager_idl__
 #define __com_sun_star_frame_SessionManager_idl__
 
-#ifndef __com_sun_star_frame_XSessionManagerClient_idl__
 #include <com/sun/star/frame/XSessionManagerClient.idl>
-#endif
 
 //=============================================================================
 
@@ -53,7 +51,7 @@
         <ul>
         <li>The application may request to interact with the user (e.g. to ask
         where to save documents). This request is necessary because at any one
-        time only one application can iteract with the user. The session manager
+        time only one application can interact with the user. The session manager
         coordinates these requests and grants every application in need of user
         interaction a timeslot in which it may interact with the user</li>
         <li>try to cancel the whole shutdown; the session manager may or may
diff --git a/offapi/com/sun/star/frame/Settings.idl b/offapi/com/sun/star/frame/Settings.idl
index 81a2a6a857d4..4f9365c6bac6 100644
--- a/offapi/com/sun/star/frame/Settings.idl
+++ b/offapi/com/sun/star/frame/Settings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_Settings_idl__
 #define __com_sun_star_frame_Settings_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/StatusbarController.idl b/offapi/com/sun/star/frame/StatusbarController.idl
index 9331f95b1816..b68a62ae6041 100644
--- a/offapi/com/sun/star/frame/StatusbarController.idl
+++ b/offapi/com/sun/star/frame/StatusbarController.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_StatusbarController_idl__
 #define __com_sun_star_frame_StatusbarController_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_util_XUpdatable_idl__
 #include <com/sun/star/util/XUpdatable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
 #include <com/sun/star/frame/XStatusListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusbarController_idl__
 #include <com/sun/star/frame/XStatusbarController.idl>
-#endif
 
 //=============================================================================
 
@@ -112,7 +101,7 @@ service StatusbarController
 
         <p>
         A status bar controller instance is ready for use after this call has
-        been made the first time. The status bar implementation guarentees that
+        been made the first time. The status bar implementation guarantees that
         the controller's item window has been added to the status bar and its
         reference is held by it.
         </p>
@@ -126,7 +115,7 @@ service StatusbarController
         <p>
         Mostly used by a status bar implementation to forward information to
         and request services from a status bar controller component. This
-        interface must be useable after
+        interface must be usable after
         <member scope="com::sun::star::lang">XInitialitation::initialize</member>
         has been called.  The behavior of the interface is undefined if the
         controller component hasn't been initialized.
diff --git a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
index dd2b756c319a..c0d9e46c33bf 100644
--- a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
+++ b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_frame_StatusbarControllerFactory_idl__
 #define __com_sun_star_frame_StatusbarControllerFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
 #include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XUIControllerRegistration_idl__
 #include <com/sun/star/frame/XUIControllerRegistration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/SynchronousFrameLoader.idl b/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
index b6c954c8fff8..51ec02d3a3a3 100644
--- a/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
+++ b/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_SynchronousFrameLoader_idl__
 #define __com_sun_star_frame_SynchronousFrameLoader_idl__
 
-#ifndef __com_sun_star_frame_XSynchronousFrameLoader_idl__
 #include <com/sun/star/frame/XSynchronousFrameLoader.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
@@ -70,7 +62,7 @@ published service SynchronousFrameLoader
         <p>
         Concrete implementations should use it to get her own configuration data
         directly after creation by the <type>FrameLoaderFactory</type>.
-        Otherwhise they must use normal configuration api to do so.
+        Otherwise they must use normal configuration API to do so.
         </p>
      */
     [optional] interface com::sun::star::lang::XInitialization;
@@ -86,7 +78,7 @@ published service SynchronousFrameLoader
         used on service <type>FrameLoaderFactory</type> to get further informations about this loader.
         Setting of this name by calling <member scope="com::sun::star::container">XNamed::setName()</member> must be
         forwarded to same factory service. He should decide, if it's allowed or not.
-        The reason: prevent code against name ambigities.
+        The reason: prevent code against name ambiguities.
         </p>
      */
      [optional] interface com::sun::star::container::XNamed;
diff --git a/offapi/com/sun/star/frame/Task.idl b/offapi/com/sun/star/frame/Task.idl
index 76e7bef933a9..49dc9af232ca 100644
--- a/offapi/com/sun/star/frame/Task.idl
+++ b/offapi/com/sun/star/frame/Task.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_Task_idl__
 #define __com_sun_star_frame_Task_idl__
 
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTask_idl__
 #include <com/sun/star/frame/XTask.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/TemplateAccess.idl b/offapi/com/sun/star/frame/TemplateAccess.idl
index 049529a930c3..6110da1468e7 100644
--- a/offapi/com/sun/star/frame/TemplateAccess.idl
+++ b/offapi/com/sun/star/frame/TemplateAccess.idl
@@ -27,20 +27,15 @@
 #ifndef __com_sun_star_frame_TemplateAccess_idl__
 #define __com_sun_star_frame_TemplateAccess_idl__
 
-#ifndef __com_sun_star_lang_XLocalizable_idl__
 #include <com/sun/star/lang/XLocalizable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDocumentTemplates_idl__
 #include <com/sun/star/frame/XDocumentTemplates.idl>
-#endif
 
 //=============================================================================
 
 module com {  module sun {  module star {  module frame {
 
 //=============================================================================
-/** provides a high level api to organize document templates
+/** provides a high level API to organize document templates
  */
 published service TemplateAccess
 {
diff --git a/offapi/com/sun/star/frame/TerminationVetoException.idl b/offapi/com/sun/star/frame/TerminationVetoException.idl
index aa114abd98c4..df92e499f139 100644
--- a/offapi/com/sun/star/frame/TerminationVetoException.idl
+++ b/offapi/com/sun/star/frame/TerminationVetoException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_TerminationVetoException_idl__
 #define __com_sun_star_frame_TerminationVetoException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
@@ -44,7 +42,7 @@
     the termination of the office, he will be the new "owner" of it.
     After his own operation will be finished, he MUST try to terminate the
     office again. Any other veto listener can intercept that again or office
-    will die realy.
+    will die really.
     </p>
 
     @see XDesktop::terminate()
diff --git a/offapi/com/sun/star/frame/TitleChangedEvent.idl b/offapi/com/sun/star/frame/TitleChangedEvent.idl
index f93ef7ccc564..da0d5a820be7 100644
--- a/offapi/com/sun/star/frame/TitleChangedEvent.idl
+++ b/offapi/com/sun/star/frame/TitleChangedEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_TitleChangedEvent_idl__
 #define __com_sun_star_frame_TitleChangedEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/ToolbarController.idl b/offapi/com/sun/star/frame/ToolbarController.idl
index 8f49b0ae17ea..5d7fff1f54aa 100644
--- a/offapi/com/sun/star/frame/ToolbarController.idl
+++ b/offapi/com/sun/star/frame/ToolbarController.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_frame_ToolbarController_idl__
 #define __com_sun_star_frame_ToolbarController_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_util_XUpdatable_idl__
 #include <com/sun/star/util/XUpdatable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
 #include <com/sun/star/frame/XStatusListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XToolbarController_idl__
 #include <com/sun/star/frame/XToolbarController.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XSubToolbarController_idl__
 #include <com/sun/star/frame/XSubToolbarController.idl>
-#endif
 
 //=============================================================================
 
@@ -105,7 +91,7 @@ service ToolbarController
 
         <p>
         A toolbar controller instance is ready for use after this call has been made
-        the first time. The toolbar implementation guarentees that the controller's
+        the first time. The toolbar implementation guarantees that the controller's
         item window has been added to the toolbar and its reference is held by it.
         </p>
     */
@@ -117,7 +103,7 @@ service ToolbarController
 
         <p>
         Mostly used by a toolbar implementation to forward information to and request
-        services from a toolbar controller component. This interface must be useable
+        services from a toolbar controller component. This interface must be usable
         after <member scope="com::sun::star::lang">XInitialitation::initialize</member>
         has been called.  The behavior of the interface is undefined if the controller
         component hasn't been initialized.
diff --git a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
index 0f982fa0f4cb..576535859ff0 100644
--- a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_TransientDocumentsDocumentContentFactory_idl__
 #define __com_sun_star_frame_TransientDocumentsDocumentContentFactory_idl__
 
-#ifndef __com_sun_star_frame_XTransientDocumentsDocumentContentFactory_idl__
 #include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/UnknownModuleException.idl b/offapi/com/sun/star/frame/UnknownModuleException.idl
index 510cc08203e0..0751c535ed47 100644
--- a/offapi/com/sun/star/frame/UnknownModuleException.idl
+++ b/offapi/com/sun/star/frame/UnknownModuleException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_UnknownModuleException_idl__
 #define __com_sun_star_frame_UnknownModuleException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //===============================================
 
diff --git a/offapi/com/sun/star/frame/XBorderResizeListener.idl b/offapi/com/sun/star/frame/XBorderResizeListener.idl
index c6c96dc9c7fc..2d3f9b457825 100644
--- a/offapi/com/sun/star/frame/XBorderResizeListener.idl
+++ b/offapi/com/sun/star/frame/XBorderResizeListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XBorderResizeListener_idl__
 #define __com_sun_star_frame_XBorderResizeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_BorderWidths_idl__
 #include <com/sun/star/frame/BorderWidths.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl b/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
index e6ee4b618519..8b041fcad3f3 100644
--- a/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
+++ b/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XBrowseHistoryRegistry_idl__
 #define __com_sun_star_frame_XBrowseHistoryRegistry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XComponentLoader.idl b/offapi/com/sun/star/frame/XComponentLoader.idl
index 37589454b260..1220fdac0fe5 100644
--- a/offapi/com/sun/star/frame/XComponentLoader.idl
+++ b/offapi/com/sun/star/frame/XComponentLoader.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_frame_XComponentLoader_idl__
 #define __com_sun_star_frame_XComponentLoader_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
@@ -145,7 +131,7 @@ published interface XComponentLoader: com::sun::star::uno::XInterface
                     Should be used for viewable components only. It is not allowed to dispose
                     it after use directly, because the frame containing the component is its owner.
                     Because the frame object is not accessible through the interface too,
-                    only an interacting user can do this by closing the frames' window.
+                    only an interacting user can do this by closing the frame's window.
                 </li>
                 <li>
                     <type>XController</type> for richer components<br/>
diff --git a/offapi/com/sun/star/frame/XComponentRegistry.idl b/offapi/com/sun/star/frame/XComponentRegistry.idl
index 9a9f32541b7b..020d84848724 100644
--- a/offapi/com/sun/star/frame/XComponentRegistry.idl
+++ b/offapi/com/sun/star/frame/XComponentRegistry.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XComponentRegistry_idl__
 #define __com_sun_star_frame_XComponentRegistry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Uik_idl__
 #include <com/sun/star/uno/Uik.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XConfigManager.idl b/offapi/com/sun/star/frame/XConfigManager.idl
index d46cf5696478..02a078a00f04 100644
--- a/offapi/com/sun/star/frame/XConfigManager.idl
+++ b/offapi/com/sun/star/frame/XConfigManager.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XConfigManager_idl__
 #define __com_sun_star_frame_XConfigManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
 #include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/frame/XControlNotificationListener.idl b/offapi/com/sun/star/frame/XControlNotificationListener.idl
index 1ebc134cc76f..b39de77b5c36 100644
--- a/offapi/com/sun/star/frame/XControlNotificationListener.idl
+++ b/offapi/com/sun/star/frame/XControlNotificationListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XControlNotificationListener_idl__
 #define __com_sun_star_frame_XControlNotificationListener_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_ControlEvent_idl__
 #include <com/sun/star/frame/ControlEvent.idl>
-#endif
 
 //=============================================================================
 
@@ -49,10 +44,10 @@ module com {  module sun {  module star {  module frame {
 interface XControlNotificationListener : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** notifies that a control event has happend
+    /** notifies that a control event has happened
 
         @param Event
-            contains the event informantion
+            contains the event information
         */
     void controlEvent( [in] ControlEvent Event );
 
diff --git a/offapi/com/sun/star/frame/XController.idl b/offapi/com/sun/star/frame/XController.idl
index 50d58246fb1a..3ec12169f3d8 100644
--- a/offapi/com/sun/star/frame/XController.idl
+++ b/offapi/com/sun/star/frame/XController.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XController_idl__
 #define __com_sun_star_frame_XController_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XController2.idl b/offapi/com/sun/star/frame/XController2.idl
index 15c6b0ceaa51..f3d7f07abd78 100644
--- a/offapi/com/sun/star/frame/XController2.idl
+++ b/offapi/com/sun/star/frame/XController2.idl
@@ -63,7 +63,7 @@ published interface XController2 : XController
     /** denotes the arguments used to create the instance.
 
         <p>Usually, controllers are created via <member>XModel2::createViewController</member>, where the
-        caller can pass not only a controller name, but also arguments parametrizing the to-be-created instance.
+        caller can pass not only a controller name, but also arguments parameterizing the to-be-created instance.
         Those arguments used at creation time can subsequently be retrieved using the <code>CreationArguments</code>
         member.</p>
     */
diff --git a/offapi/com/sun/star/frame/XControllerBorder.idl b/offapi/com/sun/star/frame/XControllerBorder.idl
index 9f8659ee8da9..dd7686a9cd0b 100644
--- a/offapi/com/sun/star/frame/XControllerBorder.idl
+++ b/offapi/com/sun/star/frame/XControllerBorder.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XControllerBorder_idl__
 #define __com_sun_star_frame_XControllerBorder_idl__
 
-#ifndef __com_sun_star_frame_BorderWidths_idl__
 #include <com/sun/star/frame/BorderWidths.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XBorderResizeListener_idl__
 #include <com/sun/star/frame/XBorderResizeListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/frame/XDesktop.idl b/offapi/com/sun/star/frame/XDesktop.idl
index 18f531703da5..b5cb7b8de11d 100644
--- a/offapi/com/sun/star/frame/XDesktop.idl
+++ b/offapi/com/sun/star/frame/XDesktop.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_frame_XDesktop_idl__
 #define __com_sun_star_frame_XDesktop_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTerminateListener_idl__
 #include <com/sun/star/frame/XTerminateListener.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
 
 
 //=============================================================================
@@ -147,11 +133,11 @@ published interface XDesktop: com::sun::star::uno::XInterface
     com::sun::star::lang::XComponent getCurrentComponent();
 
     //-------------------------------------------------------------------------
-    /** provides read access to the frame wich contains the current component
+    /** provides read access to the frame which contains the current component
 
         @returns
             the frame of the component which has the
-            UI focus within this desktop enviroment
+            UI focus within this desktop environment
 
         @see XDesktop::getCurrentComponent()
      */
diff --git a/offapi/com/sun/star/frame/XDesktopTask.idl b/offapi/com/sun/star/frame/XDesktopTask.idl
index 7a1c3cdbc436..f4558286507a 100644
--- a/offapi/com/sun/star/frame/XDesktopTask.idl
+++ b/offapi/com/sun/star/frame/XDesktopTask.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XDesktopTask_idl__
 #define __com_sun_star_frame_XDesktopTask_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatch.idl b/offapi/com/sun/star/frame/XDispatch.idl
index bad1f6525079..cbecdbfc4f7a 100644
--- a/offapi/com/sun/star/frame/XDispatch.idl
+++ b/offapi/com/sun/star/frame/XDispatch.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XDispatch_idl__
 #define __com_sun_star_frame_XDispatch_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStatusListener_idl__
 #include <com/sun/star/frame/XStatusListener.idl>
-#endif
 
 
 //=============================================================================
@@ -79,7 +68,7 @@ published interface XDispatch: com::sun::star::uno::XInterface
 
         <p>
         It is only allowed to dispatch URLs for which this <type>XDispatch</type>
-        was explicitely queried. Additional arguments ("'#..." or "?...") are allowed.
+        was explicitly queried. Additional arguments ("'#..." or "?...") are allowed.
         </p>
 
         @param URL
@@ -87,7 +76,7 @@ published interface XDispatch: com::sun::star::uno::XInterface
 
         @param Arguments
             optional arguments for this request.
-            They depend on the real implementation of the dipsatch object.
+            They depend on the real implementation of the dispatch object.
 
         @example
             <listing>
@@ -121,7 +110,7 @@ published interface XDispatch: com::sun::star::uno::XInterface
 
         <p>
         It is only allowed to register URLs for which this <type>XDispatch</type>
-        was explicitely queried. Additional arguments ("#..." or "?...") will be ignored.
+        was explicitly queried. Additional arguments ("#..." or "?...") will be ignored.
         </p>
         Note: Notifications can't be guaranteed! This will be a part of interface <type>XNotifyingDispatch</type>.
 
diff --git a/offapi/com/sun/star/frame/XDispatchHelper.idl b/offapi/com/sun/star/frame/XDispatchHelper.idl
index 7d58677c19b7..8816a980bb08 100644
--- a/offapi/com/sun/star/frame/XDispatchHelper.idl
+++ b/offapi/com/sun/star/frame/XDispatchHelper.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XDispatchHelper_idl__
 #define __com_sun_star_frame_XDispatchHelper_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
index a7f50d78c79c..418d6076caa0 100644
--- a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
+++ b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XDispatchInformationProvider_idl__
 #define __com_sun_star_frame_XDispatchInformationProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DispatchInformation_idl__
 #include <com/sun/star/frame/DispatchInformation.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XDispatchProvider.idl b/offapi/com/sun/star/frame/XDispatchProvider.idl
index 8197d272a119..7182a23f9296 100644
--- a/offapi/com/sun/star/frame/XDispatchProvider.idl
+++ b/offapi/com/sun/star/frame/XDispatchProvider.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #define __com_sun_star_frame_XDispatchProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatch_idl__
 #include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DispatchDescriptor_idl__
 #include <com/sun/star/frame/DispatchDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchProviderInterception.idl b/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
index 769a4acce3ac..b55b8029caf4 100644
--- a/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
+++ b/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
 #define __com_sun_star_frame_XDispatchProviderInterception_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProviderInterceptor_idl__
 #include <com/sun/star/frame/XDispatchProviderInterceptor.idl>
-#endif
 
 
 //=============================================================================
@@ -61,7 +56,7 @@ published interface XDispatchProviderInterception: com::sun::star::uno::XInterfa
         the first interceptor in the chain of registered interceptors.
 
         @param Interceptor
-            the interceptor which whish to be registered
+            the interceptor which wishes to be registered
 
         @see XDispatchProviderInterception::releaseDispatchProviderInterceptor()
      */
@@ -76,7 +71,7 @@ published interface XDispatchProviderInterception: com::sun::star::uno::XInterfa
         </p>
 
         @param Interceptor
-            the interceptor which whish to be unregistered
+            the interceptor which wishes to be unregistered
 
         @see XDispatchProviderInterception::registerDispatchProviderInterceptor()
      */
diff --git a/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl b/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
index 3b1ee2c16f71..076c459ee0b6 100644
--- a/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
+++ b/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XDispatchProviderInterceptor_idl__
 #define __com_sun_star_frame_XDispatchProviderInterceptor_idl__
 
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XDispatchRecorder.idl b/offapi/com/sun/star/frame/XDispatchRecorder.idl
index ed980d89f91d..00b0b06d81a4 100644
--- a/offapi/com/sun/star/frame/XDispatchRecorder.idl
+++ b/offapi/com/sun/star/frame/XDispatchRecorder.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XDispatchRecorder_idl__
 #define __com_sun_star_frame_XDispatchRecorder_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
@@ -130,7 +122,7 @@ published interface XDispatchRecorder: com::sun::star::uno::XInterface
 
         <p>
         This method must be used before <member>endRecording()</member> is called!
-        Otherwhise the macro will be relased.
+        Otherwise the macro will be released.
         </p>
 
         @returns
diff --git a/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
index c63e34dec1e9..2330e4603c03 100644
--- a/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XDispatchRecorderSupplier_idl__
 #define __com_sun_star_frame_XDispatchRecorderSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatch_idl__
 #include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
 #include <com/sun/star/frame/XDispatchRecorder.idl>
-#endif
 
 //=============================================================================
 
@@ -51,7 +43,7 @@
     of <member>XDispatch::dispatch()</member>. The recorded data (may a script)
     can be used to automate recorded dispatch and start it at later time again.
     This supplier provides access to the recorder and supports some functionality
-    to work with the mcaro recording mechanism in an easy manner.
+    to work with the macro recording mechanism in an easy manner.
     </p>
 
     @see XDispatchRecorder
@@ -79,8 +71,8 @@ published interface XDispatchRecorderSupplier: com::sun::star::uno::XInterface
     /** provides access on the recorder of this supplier
 
         <p>
-        Returned recorder can be used to record dispatches manualy or to get
-        recorded data for further using e.g. saving. He is internaly used too
+        Returned recorder can be used to record dispatches manually or to get
+        recorded data for further using e.g. saving. He is internally used too
         due to the method <member>XDispatchRecorderSupplier::dispatchAndRecord()</member>.
         </p>
 
@@ -95,7 +87,7 @@ published interface XDispatchRecorderSupplier: com::sun::star::uno::XInterface
     /** dispatch given URL and record it if recording is enabled
 
         <p>
-        Parameter <var>Dispatcher</var> is used internaly to make the dispatch.
+        Parameter <var>Dispatcher</var> is used internally to make the dispatch.
         If recording isn't enabled it will be a normal <member>XDispatch::dispatch()</member>
         call. Otherwise follow algorithm is used:
         <ul>
@@ -109,7 +101,7 @@ published interface XDispatchRecorderSupplier: com::sun::star::uno::XInterface
             </li>
             <li>If <var>Dispatcher</var> support the interface
                 <type>XRecordableDispatch</type> it will be used
-                to dispatch and record all neccessary parameters of
+                to dispatch and record all necessary parameters of
                 the whole process.
             </li>
         </ul>
diff --git a/offapi/com/sun/star/frame/XDispatchResultListener.idl b/offapi/com/sun/star/frame/XDispatchResultListener.idl
index 409bd4e0206e..48276d1bb1b3 100644
--- a/offapi/com/sun/star/frame/XDispatchResultListener.idl
+++ b/offapi/com/sun/star/frame/XDispatchResultListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XDispatchResultListener_idl__
 #define __com_sun_star_frame_XDispatchResultListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DispatchResultEvent_idl__
 #include <com/sun/star/frame/DispatchResultEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XDocumentTemplates.idl b/offapi/com/sun/star/frame/XDocumentTemplates.idl
index bc41386ea1fd..38f7b2f89bdb 100644
--- a/offapi/com/sun/star/frame/XDocumentTemplates.idl
+++ b/offapi/com/sun/star/frame/XDocumentTemplates.idl
@@ -27,20 +27,15 @@
 #ifndef __com_sun_star_frame_XDocumentTemplates_idl__
 #define __com_sun_star_frame_XDocumentTemplates_idl__
 
-#ifndef __com_sun_star_frame_XStorable_idl__
 #include <com/sun/star/frame/XStorable.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
 
 //=============================================================================
 
 module com {  module sun {  module star {  module frame {
 
 //=============================================================================
-/** provides a high level api to organize document templates
+/** provides a high level API to organize document templates
 
     <p>
     Template informations are saved as links to the original content
@@ -54,7 +49,7 @@ module com {  module sun {  module star {  module frame {
 published interface XDocumentTemplates:  com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** privides access to the root of internal used hierarchy
+    /** provides access to the root of internal used hierarchy
 
         <p>
         This content can be used for accessing the groups directly.
@@ -79,7 +74,7 @@ published interface XDocumentTemplates:  com::sun::star::uno::XInterface
             specifies the target
 
         @return
-            <TRUE/> if operation was sucessfully
+            <TRUE/> if operation was successful
             <br>
             <FALSE/> otherwise
 
@@ -104,7 +99,7 @@ published interface XDocumentTemplates:  com::sun::star::uno::XInterface
             specifies the position of template
 
         @return
-            <TRUE/> if operation was sucessfully
+            <TRUE/> if operation was successful
             <br>
             <FALSE/> otherwise
 
@@ -125,7 +120,7 @@ published interface XDocumentTemplates:  com::sun::star::uno::XInterface
             specifies the template for delete
 
         @return
-            <TRUE/> if operation was sucessfully
+            <TRUE/> if operation was successful
             <br>
             <FALSE/> otherwise
      */
@@ -143,7 +138,7 @@ published interface XDocumentTemplates:  com::sun::star::uno::XInterface
             specifies the template for renaming
 
         @return
-            <TRUE/> if operation was sucessfully
+            <TRUE/> if operation was successful
             <br>
             <FALSE/> otherwise
      */
@@ -159,7 +154,7 @@ published interface XDocumentTemplates:  com::sun::star::uno::XInterface
             the name of the group to be created
 
         @return
-            <TRUE/> if operation was sucessfully
+            <TRUE/> if operation was successful
             <br>
             <FALSE/> otherwise
     */
@@ -172,7 +167,7 @@ published interface XDocumentTemplates:  com::sun::star::uno::XInterface
             the name of the group to be removed
 
         @return
-            <TRUE/> if operation was sucessfully
+            <TRUE/> if operation was successful
             <br>
             <FALSE/> otherwise
      */
@@ -188,7 +183,7 @@ published interface XDocumentTemplates:  com::sun::star::uno::XInterface
             the new name of the group
 
         @return
-            <TRUE/> if operation was sucessfully
+            <TRUE/> if operation was successful
             <br>
             <FALSE/> otherwise
      */
diff --git a/offapi/com/sun/star/frame/XExtendedFilterDetection.idl b/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
index b51feda6d406..a5a725d8803c 100644
--- a/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
+++ b/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XExtendedFilterDetection_idl__
 #define __com_sun_star_frame_XExtendedFilterDetection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/frame/XFilterDetect.idl b/offapi/com/sun/star/frame/XFilterDetect.idl
index 5add9f5e34e9..95edf2d659ee 100644
--- a/offapi/com/sun/star/frame/XFilterDetect.idl
+++ b/offapi/com/sun/star/frame/XFilterDetect.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XFilterDetect_idl__
 #define __com_sun_star_frame_XFilterDetect_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrame.idl b/offapi/com/sun/star/frame/XFrame.idl
index e74a15446d1e..29ab70b1f527 100644
--- a/offapi/com/sun/star/frame/XFrame.idl
+++ b/offapi/com/sun/star/frame/XFrame.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XFrame_idl__
 #define __com_sun_star_frame_XFrame_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //=============================================================================
 
@@ -48,8 +43,8 @@
     can be attached to.
 
     <p>
-    A frame can be (it's not a must!) a part of a frame tree. If not this frame willn't be
-    accessible by using the api. This mode make sense for previews.
+    A frame can be (it's not a must!) a part of a frame tree. If not this frame won't be
+    accessible by using the API. This mode make sense for previews.
     The root node of the tree can be a <type>Desktop</type> implementation.
     </p>
 
@@ -67,7 +62,7 @@ published interface XFrame: com::sun::star::lang::XComponent
         It's designed for initializing - not for setting.
         </p>
 
-        <p>This frame will take over ownership of the window refered from
+        <p>This frame will take over ownership of the window referred from
         <var>xWindow</var>.  Thus, the previous owner is not allowed to
         dispose this window anymore. </p>
 
@@ -100,8 +95,8 @@ published interface XFrame: com::sun::star::lang::XComponent
         Only the creator is allowed to call this method.
         But creator doesn't mean the implementation which creates this instance ...
         it means the parent frame of the frame hierarchy.
-        Because; normaly a frame should be created by using the api
-        and is neccessary for searches inside the tree (e.g. <member>XFrame::findFrame()</member>)
+        Because; normally a frame should be created by using the API
+        and is necessary for searches inside the tree (e.g. <member>XFrame::findFrame()</member>)
         </p>
 
         @param Creator
@@ -291,7 +286,7 @@ published interface XFrame: com::sun::star::lang::XComponent
         @return
             <TRUE/>if setting of new component or release of an existing one was successfully
             <br>
-            <FALSE/> otherwise (especialy, if an existing controller disagree within his
+            <FALSE/> otherwise (especially, if an existing controller disagree within his
             <member>XController::suspend()</member> call)
 
         @see XFrame::getComponentWindow()
@@ -374,7 +369,7 @@ published interface XFrame: com::sun::star::lang::XComponent
     /** unregisters an event listener
 
         @param xListener
-            specifies the listener which willn't be informed any longer
+            specifies the listener which won't be informed any longer
 
         @see XFrame::addFrameActionListener()
      */
diff --git a/offapi/com/sun/star/frame/XFrameActionListener.idl b/offapi/com/sun/star/frame/XFrameActionListener.idl
index 52f87f960113..27e8f54c8048 100644
--- a/offapi/com/sun/star/frame/XFrameActionListener.idl
+++ b/offapi/com/sun/star/frame/XFrameActionListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XFrameActionListener_idl__
 #define __com_sun_star_frame_XFrameActionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_FrameActionEvent_idl__
 #include <com/sun/star/frame/FrameActionEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrameLoader.idl b/offapi/com/sun/star/frame/XFrameLoader.idl
index 4e830af1dc4e..f050f512a0d0 100644
--- a/offapi/com/sun/star/frame/XFrameLoader.idl
+++ b/offapi/com/sun/star/frame/XFrameLoader.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XFrameLoader_idl__
 #define __com_sun_star_frame_XFrameLoader_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XLoadEventListener_idl__
 #include <com/sun/star/frame/XLoadEventListener.idl>
-#endif
 
 
 //=============================================================================
@@ -53,7 +42,7 @@
 
     <p>
     It's an asynchronous loading. For synchronous processes use <type>XSynchronousFrameLoader</type>
-    instead of this one. The generic load algorithm of the office supports both ones - but prefered
+    instead of this one. The generic load algorithm of the office supports both ones - but preferred
     the synchronous interface.
     </p>
 
@@ -68,7 +57,7 @@ published interface XFrameLoader: com::sun::star::uno::XInterface
             specifies the loading target
 
         @param URL
-            describes the ressource of loading component
+            describes the resource of loading component
             Support of special protocols are implementation details
             and depends from the environment.
 
diff --git a/offapi/com/sun/star/frame/XFrameLoaderQuery.idl b/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
index 370386cc73e3..7cca75ab61f0 100644
--- a/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
+++ b/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XFrameLoaderQuery_idl__
 #define __com_sun_star_frame_XFrameLoaderQuery_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/frame/XFrameSetModel.idl b/offapi/com/sun/star/frame/XFrameSetModel.idl
index d5baf6f86466..3f3dfec64ade 100644
--- a/offapi/com/sun/star/frame/XFrameSetModel.idl
+++ b/offapi/com/sun/star/frame/XFrameSetModel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XFrameSetModel_idl__
 #define __com_sun_star_frame_XFrameSetModel_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XFrames.idl b/offapi/com/sun/star/frame/XFrames.idl
index 42a7b0eb35e8..ba13b0a71c70 100644
--- a/offapi/com/sun/star/frame/XFrames.idl
+++ b/offapi/com/sun/star/frame/XFrames.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XFrames_idl__
 #define __com_sun_star_frame_XFrames_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XFramesSupplier.idl b/offapi/com/sun/star/frame/XFramesSupplier.idl
index 6674693e8fe2..c1c44066132b 100644
--- a/offapi/com/sun/star/frame/XFramesSupplier.idl
+++ b/offapi/com/sun/star/frame/XFramesSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XFramesSupplier_idl__
 #define __com_sun_star_frame_XFramesSupplier_idl__
 
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl b/offapi/com/sun/star/frame/XInplaceLayout.idl
index fa2d8944f878..7748350da171 100644
--- a/offapi/com/sun/star/frame/XInplaceLayout.idl
+++ b/offapi/com/sun/star/frame/XInplaceLayout.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_frame_XInplaceLayout_idl__
 #define __com_sun_star_frame_XInplaceLayout_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XInterceptorInfo.idl b/offapi/com/sun/star/frame/XInterceptorInfo.idl
index de135a517171..e3cf7a4df622 100644
--- a/offapi/com/sun/star/frame/XInterceptorInfo.idl
+++ b/offapi/com/sun/star/frame/XInterceptorInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XInterceptorInfo_idl__
 #define __com_sun_star_frame_XInterceptorInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -56,12 +54,12 @@ published interface XInterceptorInfo: com::sun::star::uno::XInterface
     /** returns the URL list for interception.
 
         <p>
-        Wildcards inside the URL's are allowed to register the interceptor for
-        URL's too, which can have optional arguments (e.g. "..#.." or "..?..").
+        Wildcards inside the URLs are allowed to register the interceptor for
+        URLs too, which can have optional arguments (e.g. "..#.." or "..?..").
         </p>
 
         @return
-            a list of URL's wich are handled by this interceptor
+            a list of URLs which are handled by this interceptor
      */
     sequence< string > getInterceptedURLs();
 };
diff --git a/offapi/com/sun/star/frame/XLayoutManager.idl b/offapi/com/sun/star/frame/XLayoutManager.idl
index f9f027dfa81d..13396ffe5f33 100644
--- a/offapi/com/sun/star/frame/XLayoutManager.idl
+++ b/offapi/com/sun/star/frame/XLayoutManager.idl
@@ -28,37 +28,14 @@
 #ifndef __com_sun_star_frame_XLayoutManager_idl__
 #define __com_sun_star_frame_XLayoutManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElement_idl__
 #include <com/sun/star/ui/XUIElement.idl>
-#endif
-
-#ifndef __com_sun_star_ui_DockingArea_idl__
 #include <com/sun/star/ui/DockingArea.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XDockingAreaAcceptor_idl__
 #include <com/sun/star/ui/XDockingAreaAcceptor.idl>
-#endif
 
 //=============================================================================
 
@@ -73,21 +50,21 @@ module com { module sun { module star { module frame {
     Every user interface element which is controlled by a layout manager has
     a unique identifier called resource URL.
 
-    A resourcce URL must meet the following syntax:
-    "private:resource/$type/$name". It is only allowed to use ascii characters
+    A resource URL must meet the following syntax:
+    "private:resource/$type/$name". It is only allowed to use ASCII characters
     for type and name.
 
     Currently the following user interface element types are defined:
     <ul>
-        <li><b>menubar</b>A configurable user interface element representing
+        <li><b>menubar</b> A configurable user interface element representing
         a menu bar.</li>
-        <li><b>popupmenu</b>A configurable user interface element representing
-        a popup menu.</li>
-        <li><b>toolbar</b>A configurable user interface element a tool
+        <li><b>popupmenu</b> A configurable user interface element representing
+        a pop-up menu.</li>
+        <li><b>toolbar</b> A configurable user interface element a tool
         bar.</li>
-        <li><b>statusbar</b>A configurable user interfave element representing
+        <li><b>statusbar</b> A configurable user interface element representing
         a status bar.</li>
-        <li><b>floater</b>A basic user interface element representing a
+        <li><b>floater</b> A basic user interface element representing a
         floating window.</li>
     </ul>
 
@@ -171,8 +148,8 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** creates a new user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be created. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be created. A resource URL must meet the following
+            syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
     */
     void createElement( [in] string ResourceURL );
@@ -180,8 +157,8 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** destroys a user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be destroyed. A resourcce URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii
+            specifies which user interface element should be destroyed. A resource URL must meet
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII
             characters for type and name.
     */
     void destroyElement( [in] string ResourceURL );
@@ -189,9 +166,9 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** request to make a user interface element visible if it is not in hidden state.
 
         @param ResourceURL
-            specifies which user interface element should be made visible. A resourcce URL must
+            specifies which user interface element should be made visible. A resource URL must
             meet the following syntax: "private:resource/$type/$name". It is only allowed to use
-            ascii characters for type and
+            ASCII characters for type and
             name.
 
         @return
@@ -210,8 +187,8 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** retrieves a user interface element which has been created before.
 
         @param ResourceURL
-            specifies which user interface element should be retrieved. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be retrieved. A resource URL must meet the following
+            syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         <p>
@@ -221,7 +198,7 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     */
     com::sun::star::ui::XUIElement getElement( [in] string ResourceURL );
 
-    /** retrieves all user interface elements which are currently instanciated.
+    /** retrieves all user interface elements which are currently instantiated.
 
         @return
             a sequence of user interface elements providing <type scope="com::sun::star::ui">XUIElement</type>
@@ -237,8 +214,8 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** shows a user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be shown. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be shown. A resource URL must meet the following
+            syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @return
@@ -249,8 +226,8 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** hides a user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be hidden. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be hidden. A resource URL must meet the following
+            syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @return
@@ -261,8 +238,8 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** docks a window based user interface element to a specified docking area.
 
         @param ResourceURL
-            specifies which user interface element should be docked. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be docked. A resource URL must meet the following
+            syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @param DockingArea
@@ -294,8 +271,8 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** forces a window based user interface element to float.
 
         @param ResourceURL
-            specifies which user interface element should be float. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be float. A resource URL must meet the following
+            syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @return
@@ -306,8 +283,8 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** locks a window based user interface element if it's in a docked state.
 
         @param ResourceURL
-            specifies which user interface element should be locked. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be locked. A resource URL must meet the following
+            syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @return
@@ -318,9 +295,9 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** unlocks a window based user interface element if it's in a docked state.
 
         @param ResourceURL
-            specifies which user interface element should be unlocked. A resourcce URL must
+            specifies which user interface element should be unlocked. A resource URL must
             meet the following syntax: "private:resource/$type/$name". It is only allowed
-            to use ascii characters for type and name.
+            to use ASCII characters for type and name.
 
         @return
             returns <TRUE/> if the user interface element has been unlocked, otherwise
@@ -331,8 +308,8 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** sets a new size for a window based user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be resized. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be resized. A resource URL must meet the following
+            syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @param Size
@@ -348,8 +325,8 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** sets a new position for a window based user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be moved. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be moved. A resource URL must meet the following
+            syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @param Pos
@@ -365,8 +342,8 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** sets a new position and size for a window based user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be moved and resized. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be moved and resized. A resource URL must meet the following
+            syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @param Pos
@@ -386,7 +363,7 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
 
         @param ResourceURL
             specifies for which user interface element the visibility state should be retrieved. A resource URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @return
@@ -398,7 +375,7 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
 
         @param ResourceURL
             specifies for which user interface element the floating state should be retrieved. A resource URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @return
@@ -410,7 +387,7 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
 
         @param ResourceURL
             specifies for which user interface element the docking state should be retrieved. A resource URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @return
@@ -422,7 +399,7 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
 
         @param ResourceURL
             specifies for which user interface element the lock state should be retrieved. A resource URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @return
@@ -434,7 +411,7 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
 
         @param ResourceURL
             specifies for which user interface element the current size should be retrieved. A resource URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @return
@@ -446,7 +423,7 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
 
         @param ResourceURL
             specifies for which user interface element the current position should be retrieved. A resource URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ASCII characters for type and
             name.
 
         @return
@@ -457,7 +434,7 @@ published interface XLayoutManager : com::sun::star::uno::XInterface
     /** prohibit all layout updates until unlock is called again.
 
         <p>
-        This call can be used to speed up the creation process of serveral user interface elements. Otherwise the layout manager
+        This call can be used to speed up the creation process of several user interface elements. Otherwise the layout manager
         would calculate the layout for every creation.
         </p>
     */
diff --git a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
index 48d077815ca4..28767c69eb5f 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XLayoutManagerEventBroadcaster_idl__
 #define __com_sun_star_frame_XLayoutManagerEventBroadcaster_idl__
 
-#ifndef __com_sun_star_frame_XLayoutManagerListener_idl__
 #include <com/sun/star/frame/XLayoutManagerListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XLayoutManagerListener.idl b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
index 6a47bd382e45..fbacb6c5dfb1 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerListener.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XLayoutManagerListener_idl__
 #define __com_sun_star_frame_XLayoutManagerListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
@@ -39,7 +37,7 @@ module com {  module sun {  module star {  module frame {
 /** makes it possible to receive events from a layout manager.
 
     <p>Events are provided <strong>only</strong> for notification
-    purposes only.  All operations are handled interally by the
+    purposes only.  All operations are handled internally by the
     layout manager component, so that GUI layout works properly
     regardless of whether a component registers such a listener
     or not.</p>
@@ -58,7 +56,7 @@ published interface XLayoutManagerListener : com::sun::star::lang::XEventListene
             reference to the layout manager which invoked the event.
 
         @param eLayoutEvent
-            identifies the layout event that has occured.
+            identifies the layout event that has occurred.
 
         @param aInfo
             provides additional information about the event. The type
diff --git a/offapi/com/sun/star/frame/XLoadEventListener.idl b/offapi/com/sun/star/frame/XLoadEventListener.idl
index c682114f9234..8169d122a132 100644
--- a/offapi/com/sun/star/frame/XLoadEventListener.idl
+++ b/offapi/com/sun/star/frame/XLoadEventListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XLoadEventListener_idl__
 #define __com_sun_star_frame_XLoadEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
@@ -53,7 +51,7 @@ published interface XLoadEventListener: com::sun::star::lang::XEventListener
     [oneway] void loadFinished( [in] XFrameLoader Loader );
 
     //-------------------------------------------------------------------------
-    /** is called when a frame load is cancelled or failed.
+    /** is called when a frame load is canceled or failed.
 
         @param Loader
             the source of this event
diff --git a/offapi/com/sun/star/frame/XLoadable.idl b/offapi/com/sun/star/frame/XLoadable.idl
index 073ca9a55f34..98a3df9c96c4 100644
--- a/offapi/com/sun/star/frame/XLoadable.idl
+++ b/offapi/com/sun/star/frame/XLoadable.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XLoadable_idl__
 #define __com_sun_star_frame_XLoadable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_DoubleInitializationException_idl__
 #include <com/sun/star/frame/DoubleInitializationException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
index a5c2f54676d8..50bcbf2fed33 100644
--- a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_frame_LayoutManager_idl__
 #define __com_sun_star_frame_LayoutManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuBar_idl__
 #include <com/sun/star/awt/XMenuBar.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
index 500c069006ee..4d01fd2ddf12 100644
--- a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_frame_XMenuBarMergingAcceptor_idl__
 #define __com_sun_star_frame_XMenuBarMergingAcceptor_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XModel.idl b/offapi/com/sun/star/frame/XModel.idl
index 7ae603a38df9..245f41dc737e 100644
--- a/offapi/com/sun/star/frame/XModel.idl
+++ b/offapi/com/sun/star/frame/XModel.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_frame_XModel_idl__
 #define __com_sun_star_frame_XModel_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -85,10 +71,10 @@ published interface XModel: com::sun::star::lang::XComponent
     /** informs a model about its resource description.
 
         @param URL
-            specifies the ressource
+            specifies the resource
 
         @param Arguments
-            are optional arguments for that ressource
+            are optional arguments for that resource
             (see <type scope="com::sun::star::document">MediaDescriptor</type>)
 
         @return
@@ -111,7 +97,7 @@ published interface XModel: com::sun::star::lang::XComponent
     string getURL();
 
     //-------------------------------------------------------------------------
-    /** provides read acces on currently representation of the
+    /** provides read access on currently representation of the
         <type scope="com::sun::star::document">MediaDescriptor</type>
         of this model which describes the model and his state
 
diff --git a/offapi/com/sun/star/frame/XModel2.idl b/offapi/com/sun/star/frame/XModel2.idl
index 0b18ff02be1f..ef66fb89380c 100644
--- a/offapi/com/sun/star/frame/XModel2.idl
+++ b/offapi/com/sun/star/frame/XModel2.idl
@@ -40,7 +40,7 @@
 //=============================================================================
 /** extends interface XModel.
 
-    The foloowing functions are added:
+    The following functions are added:
 
     - enumeration of all currently connected controller objects.
       (not getCurrentController() only, which depends on focus)
diff --git a/offapi/com/sun/star/frame/XModule.idl b/offapi/com/sun/star/frame/XModule.idl
index 26b2d4cf5f0e..77ed1335b032 100644
--- a/offapi/com/sun/star/frame/XModule.idl
+++ b/offapi/com/sun/star/frame/XModule.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_frame_XModule_idl__
 #define __com_sun_star_frame_XModule_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_UnknownModuleException_idl__
 #include <com/sun/star/frame/UnknownModuleException.idl>
-#endif
 
 //===============================================
 
@@ -48,7 +40,7 @@ module com { module sun { module star { module frame {
 /** can be used to overrule identification of office modules.
 
     <p>
-    Normaly an office module will be identified by it's service name
+    Normally an office module will be identified by it's service name
     in combination with a set of configuration data.
     But sometimes whole existing office modules will be used as black box components
     to implement a different office module on top of it. Patching a service name
diff --git a/offapi/com/sun/star/frame/XModuleManager.idl b/offapi/com/sun/star/frame/XModuleManager.idl
index c240e382322e..04eae9710dac 100644
--- a/offapi/com/sun/star/frame/XModuleManager.idl
+++ b/offapi/com/sun/star/frame/XModuleManager.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_frame_XModuleManager_idl__
 #define __com_sun_star_frame_XModuleManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_frame_UnknownModuleException_idl__
 #include <com/sun/star/frame/UnknownModuleException.idl>
-#endif
 
 //===============================================
 
@@ -80,7 +72,7 @@ published interface XModuleManager : com::sun::star::uno::XInterface
                    </li>
                    <li>
                        <b><type scope="com::sun::star::frame">XModel</type></b><br>
-                       A model represent a module everytimes and can be used for
+                       A model represent a module everytime and can be used for
                        identification directly.
                    </li>
                </ul>
@@ -90,7 +82,7 @@ published interface XModuleManager : com::sun::star::uno::XInterface
                <ul>
                    <li>an empty one</li>
                    <li>or does not provide one of the needed interface
-                       XFrame, XControllerm, XModel</li>
+                       XFrame, XController, XModel</li>
                    <li>or does not provide the needed interface XServiceInfo.</li>
                </ul>
 
@@ -100,7 +92,7 @@ published interface XModuleManager : com::sun::star::uno::XInterface
                a document, this exception is thrown too!
 
        @return An identifier for the given module.
-               Note: This value is valie everytimes. Error will be transported
+               Note: This value varies everytime. Error will be transported
                by thrown exceptions!
      */
     string identify( [in] ::com::sun::star::uno::XInterface Module )
diff --git a/offapi/com/sun/star/frame/XNotifyingDispatch.idl b/offapi/com/sun/star/frame/XNotifyingDispatch.idl
index 2d1a9bbc203d..7a1ac504dcdc 100644
--- a/offapi/com/sun/star/frame/XNotifyingDispatch.idl
+++ b/offapi/com/sun/star/frame/XNotifyingDispatch.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XNotifyingDispatch_idl__
 #define __com_sun_star_frame_XNotifyingDispatch_idl__
 
-#ifndef __com_sun_star_frame_XDispatch_idl__
 #include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchResultListener_idl__
 #include <com/sun/star/frame/XDispatchResultListener.idl>
-#endif
 //=============================================================================
 
 module com {  module sun {  module star {  module frame {
diff --git a/offapi/com/sun/star/frame/XPopupMenuController.idl b/offapi/com/sun/star/frame/XPopupMenuController.idl
index cf65f41f8038..c22d7ef6280c 100644
--- a/offapi/com/sun/star/frame/XPopupMenuController.idl
+++ b/offapi/com/sun/star/frame/XPopupMenuController.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_frame_XPopupMenuController_idl__
 #define __com_sun_star_frame_XPopupMenuController_idl__
 
-#ifndef __com_sun_star_awt_XPopupMenu_idl__
 #include <com/sun/star/awt/XPopupMenu.idl>
-#endif
 
 //=============================================================================
 
@@ -38,14 +36,14 @@ module com { module sun { module star { module frame {
 
 //=============================================================================
 
-/** provides data to a popup menu controller implementation to
-    fill and update a popup menu dynamically.
+/** provides data to a pop-up menu controller implementation to
+    fill and update a pop-up menu dynamically.
 
     <p>
-    A popup menu controller gets a <type scope="com::sun::star::awt">XPopupMenu</type>
-    from its parent menu implementation. The controller has to fill this popup
+    A pop-up menu controller gets a <type scope="com::sun::star::awt">XPopupMenu</type>
+    from its parent menu implementation. The controller has to fill this pop-up
     menu with a set of menu items and/or sub menus. The parent menu implementation
-    briefs the controller whenever the popup menu gets activated by a user.
+    briefs the controller whenever the pop-up menu gets activated by a user.
     </p>
 
     @since OOo 2.0
@@ -53,22 +51,22 @@ module com { module sun { module star { module frame {
 interface XPopupMenuController : com::sun::star::uno::XInterface
 {
     /** provides a <type scope="com::sun::star::awt">XPopupMenu</type> to a
-        popup menu controller implementation. The controller must fill this
-        popup menu with its functions.
+        pop-up menu controller implementation. The controller must fill this
+        pop-up menu with its functions.
 
         @param PopupMenu
-            An empty popup menu that must be filled by the popup menu controller.
+            An empty pop-up menu that must be filled by the pop-up menu controller.
     */
     void setPopupMenu( [in] com::sun::star::awt::XPopupMenu PopupMenu );
 
-    /** briefs the popup menu controller to update the contents of the provided
-        popup menu to reflect the current state.
+    /** briefs the pop-up menu controller to update the contents of the provided
+        pop-up menu to reflect the current state.
 
-        <p>A controller should <b>never</b> update the popup menu structure on its
+        <p>A controller should <b>never</b> update the pop-up menu structure on its
         own to prevent performance problems. A better way would be that a controller
         registers itself as status listener to for a command URL and immediately
         deregister after that. Therefor status updates will not be send regularly
-        for a non visible popup menu.
+        for a non visible pop-up menu.
         </p>
     */
     void updatePopupMenu();
diff --git a/offapi/com/sun/star/frame/XRecordableDispatch.idl b/offapi/com/sun/star/frame/XRecordableDispatch.idl
index 189dfb04ab5a..e8230278ec7a 100644
--- a/offapi/com/sun/star/frame/XRecordableDispatch.idl
+++ b/offapi/com/sun/star/frame/XRecordableDispatch.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XRecordableDispatch_idl__
 #define __com_sun_star_frame_XRecordableDispatch_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatchRecorder_idl__
 #include <com/sun/star/frame/XDispatchRecorder.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
 //=============================================================================
 
@@ -55,11 +47,11 @@
     </p>
 
     <p>
-    But normaly this interface mustn't be used directly.
+    But normally this interface mustn't be used directly.
     If a dispatch object is well known and recording was enabled
     on a <type>XDispatchRecorderSupplier</type> it's possible to use method
     <member>XDispatchRecorderSupplier::dispatchAndRecord()</member> of it
-    to make dispatch and recording automaticly. The interface XRecordableDispatch
+    to make dispatch and recording automatically. The interface XRecordableDispatch
     is used transparently there.
     </p>
 
@@ -91,7 +83,7 @@ published interface XRecordableDispatch: com::sun::star::uno::XInterface
     /** dispatch and record it
 
         @param URL
-            full parsed URL wich describe the feature which should be dispatched (executed)
+            full parsed URL which describe the feature which should be dispatched (executed)
 
         @param Arguments
             optional arguments for this request
diff --git a/offapi/com/sun/star/frame/XSessionManagerClient.idl b/offapi/com/sun/star/frame/XSessionManagerClient.idl
index 8d1f51d4632a..5609389a4e2b 100644
--- a/offapi/com/sun/star/frame/XSessionManagerClient.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerClient.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XSessionManagerClient_idl__
 #define __com_sun_star_frame_XSessionManagerClient_idl__
 
-#ifndef __com_sun_star_frame_XSessionManagerListener_idl__
 #include <com/sun/star/frame/XSessionManagerListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XSessionManagerListener.idl b/offapi/com/sun/star/frame/XSessionManagerListener.idl
index 2ee33c160240..2b3d00d5f1b3 100644
--- a/offapi/com/sun/star/frame/XSessionManagerListener.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XSessionManagerListener_idl__
 #define __com_sun_star_frame_XSessionManagerListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 //=============================================================================
 
 module com {  module sun {  module star {  module frame {
diff --git a/offapi/com/sun/star/frame/XSessionManagerListener2.idl b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
index 233b7614ad2e..87a988bc2b5e 100644
--- a/offapi/com/sun/star/frame/XSessionManagerListener2.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XSessionManagerListener2_idl__
 #define __com_sun_star_frame_XSessionManagerListener2_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XSessionManagerListener_idl__
 #include <com/sun/star/frame/XSessionManagerListener.idl>
-#endif
 //=============================================================================
 
 module com {  module sun {  module star {  module frame {
diff --git a/offapi/com/sun/star/frame/XStatusListener.idl b/offapi/com/sun/star/frame/XStatusListener.idl
index 250e22c2141d..f67d6a91c0cb 100644
--- a/offapi/com/sun/star/frame/XStatusListener.idl
+++ b/offapi/com/sun/star/frame/XStatusListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XStatusListener_idl__
 #define __com_sun_star_frame_XStatusListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_FeatureStateEvent_idl__
 #include <com/sun/star/frame/FeatureStateEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XStatusbarController.idl b/offapi/com/sun/star/frame/XStatusbarController.idl
index 5ded8dc55c1a..22211830dfde 100644
--- a/offapi/com/sun/star/frame/XStatusbarController.idl
+++ b/offapi/com/sun/star/frame/XStatusbarController.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XStatusbarController_idl__
 #define __com_sun_star_frame_XStatusbarController_idl__
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MouseEvent_idl__
 #include <com/sun/star/awt/MouseEvent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XGraphics_idl__
 #include <com/sun/star/awt/XGraphics.idl>
-#endif
 
 //=============================================================================
 
@@ -56,7 +45,7 @@ module com {  module sun {  module star {  module frame {
     bar controller can be added to a Statusbar and provide information or
     functions with a more sophisticated user interface.<br/>
     A typical example for status bar controller is a zoom chooser. It shows
-    the current zoom and provides general zoom levels on a popup menu
+    the current zoom and provides general zoom levels on a pop-up menu
     that can be activated by a mouse action for context menus.
     <p>
 
diff --git a/offapi/com/sun/star/frame/XStorable.idl b/offapi/com/sun/star/frame/XStorable.idl
index 6c54b5b84c1c..094b4a5fb0d6 100644
--- a/offapi/com/sun/star/frame/XStorable.idl
+++ b/offapi/com/sun/star/frame/XStorable.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XStorable_idl__
 #define __com_sun_star_frame_XStorable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 //=============================================================================
@@ -99,7 +91,7 @@ published interface XStorable: com::sun::star::uno::XInterface
         <p>Only objects which know their locations can be stored.</p>
 
         @throws com::sun::star::io::IOException
-            if an IO error occured during save operation
+            if an IO error occurred during save operation
             (may the location is unknown)
 
         @see XStorable::storeAsURL
@@ -129,7 +121,7 @@ published interface XStorable: com::sun::star::uno::XInterface
             (see <type scope="com::sun::star::document">MediaDescriptor</type> for further details)
 
         @throws com::sun::star::io::IOException
-            if an IO error occured during save operation
+            if an IO error occurred during save operation
             (may the location is unknown)
 
         @see XStorable::store
@@ -152,7 +144,7 @@ published interface XStorable: com::sun::star::uno::XInterface
         persistence capability.</p>
 
         @throws com::sun::star::io::IOException
-            if an IO error occured during save operation
+            if an IO error occurred during save operation
             (may the location is unknown)
 
         @param lArguments
diff --git a/offapi/com/sun/star/frame/XStorable2.idl b/offapi/com/sun/star/frame/XStorable2.idl
index d33f49da8b8b..e2ee330f7606 100644
--- a/offapi/com/sun/star/frame/XStorable2.idl
+++ b/offapi/com/sun/star/frame/XStorable2.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XStorable2_idl__
 #define __com_sun_star_frame_XStorable2_idl__
 
-#ifndef __com_sun_star_frame_XStorable_idl__
 #include <com/sun/star/frame/XStorable.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 //=============================================================================
@@ -60,8 +49,8 @@ published interface XStorable2: XStorable
         </p>
 
         <p>
-            This is an extention of the <method>XStorable::store()</method>.
-            This method allows to specify some additional parametes for
+            This is an extension of the <method>XStorable::store()</method>.
+            This method allows to specify some additional parameters for
             storing process.
         </p>
 
@@ -73,7 +62,7 @@ published interface XStorable2: XStorable
             the optional parameters contain unacceptable for save entry
 
         @throws com::sun::star::io::IOException
-            if an IO error occured during save operation
+            if an IO error occurred during save operation
 
         @see XStorable::store
      */
diff --git a/offapi/com/sun/star/frame/XSubToolbarController.idl b/offapi/com/sun/star/frame/XSubToolbarController.idl
index a9614e5ba04a..fdbe019edb95 100644
--- a/offapi/com/sun/star/frame/XSubToolbarController.idl
+++ b/offapi/com/sun/star/frame/XSubToolbarController.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XSubToolbarController_idl__
 #define __com_sun_star_frame_XSubToolbarController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XSynchronousDispatch.idl b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
index 7357bc209513..ff8e21463017 100644
--- a/offapi/com/sun/star/frame/XSynchronousDispatch.idl
+++ b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XSynchronousDispatch_idl__
 #define __com_sun_star_frame_XSynchronousDispatch_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
@@ -59,7 +51,7 @@ published interface XSynchronousDispatch: com::sun::star::uno::XInterface
         </p>
 
         @param URL
-            full parsed URL wich describe the feature which should be dispatched (executed)
+            full parsed URL which describe the feature which should be dispatched (executed)
 
         @param Arguments
             optional arguments for this request
diff --git a/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl b/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
index 6a39bbfeaf98..d60ffa0c392c 100644
--- a/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
+++ b/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XSynchronousFrameLoader_idl__
 #define __com_sun_star_frame_XSynchronousFrameLoader_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
@@ -58,7 +50,7 @@ published interface XSynchronousFrameLoader: com::sun::star::uno::XInterface
     /** starts the loading of the specified resource into the specified <type>Frame</type>.
 
         @param Descriptor
-            describes the ressource which should be loaded
+            describes the resource which should be loaded
             It use a <type scope="com::sun::star::document">MediaDescriptor</type> for that.
 
         @param Frame
diff --git a/offapi/com/sun/star/frame/XTask.idl b/offapi/com/sun/star/frame/XTask.idl
index f0a59b25bcb0..a2dca9d7bc81 100644
--- a/offapi/com/sun/star/frame/XTask.idl
+++ b/offapi/com/sun/star/frame/XTask.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XTask_idl__
 #define __com_sun_star_frame_XTask_idl__
 
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XTasksSupplier.idl b/offapi/com/sun/star/frame/XTasksSupplier.idl
index deb1b3cbb757..2eae9ef31598 100644
--- a/offapi/com/sun/star/frame/XTasksSupplier.idl
+++ b/offapi/com/sun/star/frame/XTasksSupplier.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XTasksSupplier_idl__
 #define __com_sun_star_frame_XTasksSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTask_idl__
 #include <com/sun/star/frame/XTask.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XTerminateListener.idl b/offapi/com/sun/star/frame/XTerminateListener.idl
index 937e3523817b..60896f11dfae 100644
--- a/offapi/com/sun/star/frame/XTerminateListener.idl
+++ b/offapi/com/sun/star/frame/XTerminateListener.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_frame_XTerminateListener_idl__
 #define __com_sun_star_frame_XTerminateListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_frame_TerminationVetoException_idl__
 #include <com/sun/star/frame/TerminationVetoException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XTerminateListener2.idl b/offapi/com/sun/star/frame/XTerminateListener2.idl
index e4b000bc2f0a..d57c21fedc3d 100644
--- a/offapi/com/sun/star/frame/XTerminateListener2.idl
+++ b/offapi/com/sun/star/frame/XTerminateListener2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XTerminateListener2_idl__
 #define __com_sun_star_frame_XTerminateListener2_idl__
 
-#ifndef __com_sun_star_frame_XTerminateListener_idl__
 #include <com/sun/star/frame/XTerminateListener.idl>
-#endif
 
 //=============================================================================
 
@@ -37,23 +35,23 @@
 
 //=============================================================================
 /** extend interface XTerminateListener so a listener will be informed
-    in case termination process was cancelled by other reasons.
+    in case termination process was canceled by other reasons.
  */
 interface XTerminateListener2 : ::com::sun::star::frame::XTerminateListener
 {
     //-------------------------------------------------------------------------
-    /** is called when the master environment (e.g., desktop) was cancelled in
+    /** is called when the master environment (e.g., desktop) was canceled in
         it's terminate request.
 
         <p>
         Termination can be intercepted by throwing <type>TerminationVetoException</type>.
-        But if a listener was queried for termination .. doesnt throwed a veto exception ...
-        it doesnt know if termination will be real next time.
+        But if a listener was queried for termination .. doesn't throw a veto exception ...
+        it doesn't know if termination will be real next time.
         Because any other listener can throw those exception too ... and so it can happen
-        that after queryTermination() no notifyTermination() will occure. But these listener
-        doesnt know if its allowed to start new processes then.
+        that after queryTermination() no notifyTermination() will occur. But these listener
+        don't know if its allowed to start new processes then.
         Using this optional(!) interface will make it possible to be informed about
-        cancelled termination requests also.
+        canceled termination requests also.
         </p>
 
         @param Event
diff --git a/offapi/com/sun/star/frame/XTitle.idl b/offapi/com/sun/star/frame/XTitle.idl
index 2bc71111f932..b4c460cf550e 100644
--- a/offapi/com/sun/star/frame/XTitle.idl
+++ b/offapi/com/sun/star/frame/XTitle.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XTitle_idl__
 #define __com_sun_star_frame_XTitle_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl b/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
index 3bc851f4a557..03d70c0db3ce 100644
--- a/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XTitleChangeBroadcaster_idl__
 #define __com_sun_star_frame_XTitleChangeBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XTitleChangeListener_idl__
 #include <com/sun/star/frame/XTitleChangeListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XTitleChangeListener.idl b/offapi/com/sun/star/frame/XTitleChangeListener.idl
index 8d1c4c1d8019..35e2286a511f 100644
--- a/offapi/com/sun/star/frame/XTitleChangeListener.idl
+++ b/offapi/com/sun/star/frame/XTitleChangeListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XTitleChangeListener_idl__
 #define __com_sun_star_frame_XTitleChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_frame_TitleChangedEvent_idl__
 #include <com/sun/star/frame/TitleChangedEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XToolbarController.idl b/offapi/com/sun/star/frame/XToolbarController.idl
index 07bf0bbd9ec2..623d8a517a31 100644
--- a/offapi/com/sun/star/frame/XToolbarController.idl
+++ b/offapi/com/sun/star/frame/XToolbarController.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XToolbarController_idl__
 #define __com_sun_star_frame_XToolbarController_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyModifier_idl__
 #include <com/sun/star/awt/KeyModifier.idl>
-#endif
 
 //=============================================================================
 
@@ -65,7 +60,7 @@ interface XToolbarController : com::sun::star::uno::XInterface
             the current state of the modifier keys.
 
         <p>
-        This function is usally called by a toolbar implementation when a user clicked on a toolbar button
+        This function is usually called by a toolbar implementation when a user clicked on a toolbar button
         or pressed enter on the keyboard when the item has the input focus.
         </p>
     */
@@ -82,7 +77,7 @@ interface XToolbarController : com::sun::star::uno::XInterface
     void doubleClick();
 
     //=============================================================================
-    /** requests to create a popup window for additional functions.
+    /** requests to create a pop-up window for additional functions.
 
         @return
             a <type scope="com::sun::star::awt">XWindow</type> which provides additional functions
diff --git a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
index 9fc7172fd203..f8b67e4c3016 100644
--- a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_frame_XTransientDocumentsDocumentContentFactory_idl__
 #define __com_sun_star_frame_XTransientDocumentsDocumentContentFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/frame/XUIControllerRegistration.idl b/offapi/com/sun/star/frame/XUIControllerRegistration.idl
index 3fcc74e4c320..64553913ce0e 100644
--- a/offapi/com/sun/star/frame/XUIControllerRegistration.idl
+++ b/offapi/com/sun/star/frame/XUIControllerRegistration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_frame_XUIControllerRegistration_idl__
 #define __com_sun_star_frame_XUIControllerRegistration_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -73,7 +71,7 @@ published interface XUIControllerRegistration : com::sun::star::uno::XInterface
         and a command URL and optional module.
 
         @param aCommandURL
-            a command URL which specifies an action which shoudl be associated with a user
+            a command URL which specifies an action which should be associated with a user
             interface controller.
 
         @param aModelName
@@ -90,7 +88,7 @@ published interface XUIControllerRegistration : com::sun::star::uno::XInterface
         implementation and a command URL and optional module.
 
         @param aCommandURL
-            a command URL which specifies an action which shoudl be associated with a user
+            a command URL which specifies an action which should be associated with a user
             interface controller.
 
         @param aModelName
diff --git a/offapi/com/sun/star/frame/XUntitledNumbers.idl b/offapi/com/sun/star/frame/XUntitledNumbers.idl
index e2864d709c2f..595a0ac224df 100644
--- a/offapi/com/sun/star/frame/XUntitledNumbers.idl
+++ b/offapi/com/sun/star/frame/XUntitledNumbers.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_frame_XUntitledNumbers_idl__
 #define __com_sun_star_frame_XUntitledNumbers_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -51,10 +46,10 @@ constants UntitledNumbersConst
 interface XUntitledNumbers : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** calli has to lease a number befor he can use it within in its own title.
+    /** callee has to lease a number before he can use it within in its own title.
 
         Such number must be freed after using e.g. while the object was closed or
-        get's another title (e.g. by saving a document to a real location on disc).
+        gets another title (e.g. by saving a document to a real location on disc).
 
         @param  xComponent
                 the component which has to be registered for the leased number.
@@ -70,10 +65,10 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** has to be used to mark those number as "free for using".
 
-        If the reqistered component does not use such leased number any longer
+        If the registered component does not use such leased number any longer
         it has to be released so it can be used for new components.
 
-        Note: calling this method with an unknown (but normaly valid number)
+        Note: calling this method with an unknown (but normally valid number)
               has to be ignored. No exceptions - no errors.
 
         @param  nNumber
@@ -99,10 +94,10 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
         raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
-    /** returns the localized string value to be used for untitles objects in
+    /** returns the localized string value to be used for untitled objects in
         combination with the leased number.
 
-        Note: Such string already contains leading spaces/tabs etcpp. !
+        Note: Such string already contains leading spaces/tabs etc. !
         The only thing which an outside code has todo then ... adding a leased number
         to the string.
 
diff --git a/offapi/com/sun/star/frame/XUrlList.idl b/offapi/com/sun/star/frame/XUrlList.idl
index d4005ded9cd2..af6d35e104ee 100644
--- a/offapi/com/sun/star/frame/XUrlList.idl
+++ b/offapi/com/sun/star/frame/XUrlList.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XUrlList_idl__
 #define __com_sun_star_frame_XUrlList_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/XWindowArranger.idl b/offapi/com/sun/star/frame/XWindowArranger.idl
index ed5044b9d5aa..4ebbaa0538e6 100644
--- a/offapi/com/sun/star/frame/XWindowArranger.idl
+++ b/offapi/com/sun/star/frame/XWindowArranger.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XWindowArranger_idl__
 #define __com_sun_star_frame_XWindowArranger_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/frame/status/ClipboardFormats.idl b/offapi/com/sun/star/frame/status/ClipboardFormats.idl
index 2cc39db0696f..caa823036acf 100644
--- a/offapi/com/sun/star/frame/status/ClipboardFormats.idl
+++ b/offapi/com/sun/star/frame/status/ClipboardFormats.idl
@@ -34,7 +34,7 @@ module com {  module sun {  module star {  module frame { module status {
 
 //=============================================================================
 
-/** contains a list of format ID's and names which are part of the
+/** contains a list of format IDs and names which are part of the
     system clipboard.
 
     @since OOo 2.0
diff --git a/offapi/com/sun/star/gallery/GalleryItem.idl b/offapi/com/sun/star/gallery/GalleryItem.idl
index ab588f988b67..751863faae62 100644
--- a/offapi/com/sun/star/gallery/GalleryItem.idl
+++ b/offapi/com/sun/star/gallery/GalleryItem.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_gallery_GalleryItem_idl__
 #define __com_sun_star_gallery_GalleryItem_idl__
 
-#ifndef __com_sun_star_gallery_XGalleryItem_idl__
 #include <com/sun/star/gallery/XGalleryItem.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_graphic_XGraphic_idl__
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
@@ -65,7 +57,7 @@ service GalleryItem
 
         <p>The interpretation of the URL depends on the type
         of the Gallery item. In case of graphic and media items,
-        the URL is a 'real' URL, in case of drawings it is a private
+        the URL is a "real" URL, in case of drawings it is a private
         URL</p>
      */
     [readonly, property] string URL;
diff --git a/offapi/com/sun/star/gallery/GalleryTheme.idl b/offapi/com/sun/star/gallery/GalleryTheme.idl
index 207aec2c73a6..ff379beacf76 100644
--- a/offapi/com/sun/star/gallery/GalleryTheme.idl
+++ b/offapi/com/sun/star/gallery/GalleryTheme.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_gallery_GalleryTheme_idl__
 #define __com_sun_star_gallery_GalleryTheme_idl__
 
-#ifndef __com_sun_star_gallery_XGalleryTheme_idl__
 #include <com/sun/star/gallery/XGalleryTheme.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/gallery/GalleryThemeProvider.idl b/offapi/com/sun/star/gallery/GalleryThemeProvider.idl
index f08b8756f20f..98cad2313abf 100644
--- a/offapi/com/sun/star/gallery/GalleryThemeProvider.idl
+++ b/offapi/com/sun/star/gallery/GalleryThemeProvider.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_gallery_GalleryThemeProvider_idl__
 #define __com_sun_star_gallery_GalleryThemeProvider_idl__
 
-#ifndef __com_sun_star_gallery_XGalleryThemeProvider_idl__
 #include <com/sun/star/gallery/XGalleryThemeProvider.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/gallery/XGalleryItem.idl b/offapi/com/sun/star/gallery/XGalleryItem.idl
index fac404145e3b..d31f35af649e 100644
--- a/offapi/com/sun/star/gallery/XGalleryItem.idl
+++ b/offapi/com/sun/star/gallery/XGalleryItem.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_gallery_XGalleryItem_idl__
 #define __com_sun_star_gallery_XGalleryItem_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/gallery/XGalleryTheme.idl b/offapi/com/sun/star/gallery/XGalleryTheme.idl
index ed8ac5230335..ff71a42738b5 100644
--- a/offapi/com/sun/star/gallery/XGalleryTheme.idl
+++ b/offapi/com/sun/star/gallery/XGalleryTheme.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_gallery_XGalleryTheme_idl__
 #define __com_sun_star_gallery_XGalleryTheme_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_graphic_XGraphic_idl__
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-#ifndef __com_sun_star_gallery_XGalleryItem_idl__
 #include <com/sun/star/gallery/XGalleryItem.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl b/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl
index c7fa2dbfdc17..91f64847e9ba 100644
--- a/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl
+++ b/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_gallery_XGalleryThemeProvider_idl__
 #define __com_sun_star_gallery_XGalleryThemeProvider_idl__
 
-#ifndef __com_sun_star_gallery_XGalleryTheme_idl__
 #include <com/sun/star/gallery/XGalleryTheme.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/geometry/AffineMatrix2D.idl b/offapi/com/sun/star/geometry/AffineMatrix2D.idl
index 5162db83a75b..919ee070b65f 100644
--- a/offapi/com/sun/star/geometry/AffineMatrix2D.idl
+++ b/offapi/com/sun/star/geometry/AffineMatrix2D.idl
@@ -33,7 +33,7 @@ module com {  module sun {  module star {  module geometry {
 
     The matrix defined by this structure constitutes an affine mapping
     of a point in 2D to another point in 2D. The last line of a
-    complete 3 by 3 matrix is omitted, since it is implicitely assumed
+    complete 3 by 3 matrix is omitted, since it is implicitly assumed
     to be [0,0,1].<p>
 
     An affine mapping, as performed by this matrix, can be written out
diff --git a/offapi/com/sun/star/geometry/AffineMatrix3D.idl b/offapi/com/sun/star/geometry/AffineMatrix3D.idl
index a7d9f9b5b000..7e838e9f92a2 100644
--- a/offapi/com/sun/star/geometry/AffineMatrix3D.idl
+++ b/offapi/com/sun/star/geometry/AffineMatrix3D.idl
@@ -33,7 +33,7 @@ module com {  module sun {  module star {  module geometry {
 
     The matrix defined by this structure constitutes an affine mapping
     of a point in 3D to another point in 3D. The last line of a
-    complete 4 by 4 matrix is omitted, since it is implicitely assumed
+    complete 4 by 4 matrix is omitted, since it is implicitly assumed
     to be [0,0,0,1].<p>
 
     An affine mapping, as performed by this matrix, can be written out
@@ -63,8 +63,8 @@ module com {  module sun {  module star {  module geometry {
     physical dimensions attached to them. This physical measurement
     units are typically only added when using these data types to
     render something onto a physical output device. For 3D coordinates
-    there is also a projection from 3D to 2D device coordiantes needed.
-    Only then the total transformation matrix (oncluding projection to 2D)
+    there is also a projection from 3D to 2D device coordinates needed.
+    Only then the total transformation matrix (including projection to 2D)
     and the device resolution determine the actual measurement unit in 3D.<p>
 
     @since OOo 2.0
diff --git a/offapi/com/sun/star/geometry/EllipticalArc.idl b/offapi/com/sun/star/geometry/EllipticalArc.idl
index 3dff5ced8c9b..4c6f2c5b0492 100644
--- a/offapi/com/sun/star/geometry/EllipticalArc.idl
+++ b/offapi/com/sun/star/geometry/EllipticalArc.idl
@@ -27,16 +27,14 @@
 #ifndef __com_sun_star_geometry_EllipticalArc_idl__
 #define __com_sun_star_geometry_EllipticalArc_idl__
 
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
 
 module com {  module sun {  module star {  module geometry {
 
 /** This structure specifies an arbitrary elliptical arc.<p>
 
     This structure contains all parameters necessary to specify
-    arbitrary elliptical arcs. The parameters are modelled closely
+    arbitrary elliptical arcs. The parameters are modeled closely
     after the <a href="www.w3c.org">SVG</a> specification.<p>
 
     As with the parameters below, there are mostly four different
diff --git a/offapi/com/sun/star/geometry/XMapping2D.idl b/offapi/com/sun/star/geometry/XMapping2D.idl
index a9a458579ab9..356afa5dfdfc 100644
--- a/offapi/com/sun/star/geometry/XMapping2D.idl
+++ b/offapi/com/sun/star/geometry/XMapping2D.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_geometry_XMapping2D_idl__
 #define __com_sun_star_geometry_XMapping2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
 
 module com {  module sun {  module star {  module geometry {
 
diff --git a/offapi/com/sun/star/graphic/Graphic.idl b/offapi/com/sun/star/graphic/Graphic.idl
index 02bb048096e0..06f1f9c8214d 100755..100644
--- a/offapi/com/sun/star/graphic/Graphic.idl
+++ b/offapi/com/sun/star/graphic/Graphic.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module graphic
     access to the attributes of the graphic.
 
     @see XGraphic
-    @see XGraphicTtransformer
+    @see XGraphicTransformer
     @see GraphicDescriptor
 */
 published service Graphic
diff --git a/offapi/com/sun/star/graphic/GraphicDescriptor.idl b/offapi/com/sun/star/graphic/GraphicDescriptor.idl
index fce984008c71..fce984008c71 100755..100644
--- a/offapi/com/sun/star/graphic/GraphicDescriptor.idl
+++ b/offapi/com/sun/star/graphic/GraphicDescriptor.idl
diff --git a/offapi/com/sun/star/graphic/GraphicObject.idl b/offapi/com/sun/star/graphic/GraphicObject.idl
index c3353724133f..e6ae5456e57d 100644
--- a/offapi/com/sun/star/graphic/GraphicObject.idl
+++ b/offapi/com/sun/star/graphic/GraphicObject.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module graphic
 {
 /** The <code>GraphicObject</code> service can be used to create <type>XGraphicObject</type> instances.
 
-    <p><type>XGraphicObject</type> objects are accessable using GraphicObject scheme urls like
+    <p><type>XGraphicObject</type> objects are accessible using GraphicObject scheme URLs like
     <code>vnd.sun.star.GraphicObject:10000000000001940000012FB99807BD</code>.
     As long as at least one instance of <type>XGraphicObject</type> with a particular UniqueID exists,
     the associated image/graphic is available.</p>
diff --git a/offapi/com/sun/star/graphic/GraphicProvider.idl b/offapi/com/sun/star/graphic/GraphicProvider.idl
index b8109919a349..b8109919a349 100755..100644
--- a/offapi/com/sun/star/graphic/GraphicProvider.idl
+++ b/offapi/com/sun/star/graphic/GraphicProvider.idl
diff --git a/offapi/com/sun/star/graphic/GraphicRendererVCL.idl b/offapi/com/sun/star/graphic/GraphicRendererVCL.idl
index 10cc215629d4..10cc215629d4 100755..100644
--- a/offapi/com/sun/star/graphic/GraphicRendererVCL.idl
+++ b/offapi/com/sun/star/graphic/GraphicRendererVCL.idl
diff --git a/offapi/com/sun/star/graphic/GraphicType.idl b/offapi/com/sun/star/graphic/GraphicType.idl
index 133b2621887d..133b2621887d 100755..100644
--- a/offapi/com/sun/star/graphic/GraphicType.idl
+++ b/offapi/com/sun/star/graphic/GraphicType.idl
diff --git a/offapi/com/sun/star/graphic/MediaProperties.idl b/offapi/com/sun/star/graphic/MediaProperties.idl
index 889db82278fd..c6be9cfbe33f 100755..100644
--- a/offapi/com/sun/star/graphic/MediaProperties.idl
+++ b/offapi/com/sun/star/graphic/MediaProperties.idl
@@ -48,7 +48,7 @@ published service MediaProperties
         property</p>
 
         <p>In addition to the normal protocols like file:// or http://
-        you can use private URL's as follows to get access to graphics
+        you can use private URLs as follows to get access to graphics
         lying inside the resource system within an Office context:
 
         <ul>
@@ -58,7 +58,7 @@ published service MediaProperties
             <li>private:resource/projectshortname/imagelist/12345</li>
             <li>private:resource/projectshortname/imagelist/12345/12</li>
         </ul>
-And additionally, GraphicObject scheme url's like
+And additionally, GraphicObject scheme URLs like
             <ul> <li>vnd.sun.star.GraphicObject:10000000000001940000012FB99807BD</li> </ul>
               can be used to access graphics held by the GraphicCache implementation.
         </p>
diff --git a/offapi/com/sun/star/graphic/XGraphic.idl b/offapi/com/sun/star/graphic/XGraphic.idl
index 9cb351da156b..9cb351da156b 100755..100644
--- a/offapi/com/sun/star/graphic/XGraphic.idl
+++ b/offapi/com/sun/star/graphic/XGraphic.idl
diff --git a/offapi/com/sun/star/graphic/XGraphicObject.idl b/offapi/com/sun/star/graphic/XGraphicObject.idl
index adc5d5ee5e1e..2ab3e6c42742 100644
--- a/offapi/com/sun/star/graphic/XGraphicObject.idl
+++ b/offapi/com/sun/star/graphic/XGraphicObject.idl
@@ -36,7 +36,7 @@ interface XGraphic;
 /** <code>XGraphicObject</code> objects represent in-memory image and graphic
     objects.
 
-    <p>Such objects are accessable using GraphicObject scheme urls like
+    <p>Such objects are accessible using GraphicObject scheme URLs like
     <ul>
         <li>vnd.sun.star.GraphicObject:10000000000001940000012FB99807BD</li>
     </ul>
diff --git a/offapi/com/sun/star/graphic/XGraphicProvider.idl b/offapi/com/sun/star/graphic/XGraphicProvider.idl
index de5a193961df..de5a193961df 100755..100644
--- a/offapi/com/sun/star/graphic/XGraphicProvider.idl
+++ b/offapi/com/sun/star/graphic/XGraphicProvider.idl
diff --git a/offapi/com/sun/star/graphic/XGraphicRenderer.idl b/offapi/com/sun/star/graphic/XGraphicRenderer.idl
index f49746c4e5d5..f49746c4e5d5 100755..100644
--- a/offapi/com/sun/star/graphic/XGraphicRenderer.idl
+++ b/offapi/com/sun/star/graphic/XGraphicRenderer.idl
diff --git a/offapi/com/sun/star/graphic/XPrimitive2D.idl b/offapi/com/sun/star/graphic/XPrimitive2D.idl
index 377bcb5b7802..a0e62c24e598 100644
--- a/offapi/com/sun/star/graphic/XPrimitive2D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitive2D.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_graphic_XPrimitive2D_idl__
 #define __com_sun_star_graphic_XPrimitive2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
 
 module com {  module sun {  module star {  module graphic {
 
@@ -62,7 +56,7 @@ interface XPrimitive2D : ::com::sun::star::uno::XInterface
         ::com::sun::star::geometry::RealRectangle2D Viewport
 
         Defines the visible part of the view in world coordinates. May be used
-        to optimize decompositions, e.g. for 3d scenes only the visible part
+        to optimize decompositions, e.g. for 3D scenes only the visible part
         needs to be created. If not given, an empty Viewport is implied which
         means all is visible.
 
diff --git a/offapi/com/sun/star/graphic/XPrimitive3D.idl b/offapi/com/sun/star/graphic/XPrimitive3D.idl
index 5083ed338a76..cbcbcd4685d7 100644
--- a/offapi/com/sun/star/graphic/XPrimitive3D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitive3D.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_graphic_XPrimitive3D_idl__
 #define __com_sun_star_graphic_XPrimitive3D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle3D_idl__
 #include <com/sun/star/geometry/RealRectangle3D.idl>
-#endif
 
 module com {  module sun {  module star {  module graphic {
 
diff --git a/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl b/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
index 846d0c3d5154..edd26a509056 100644
--- a/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_graphic_XPrimitiveFactory2D_idl__
 #define __com_sun_star_graphic_XPrimitiveFactory2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines
diff --git a/offapi/com/sun/star/graphic/makefile.mk b/offapi/com/sun/star/graphic/makefile.mk
index 6e4a0187c15c..6e4a0187c15c 100755..100644
--- a/offapi/com/sun/star/graphic/makefile.mk
+++ b/offapi/com/sun/star/graphic/makefile.mk
diff --git a/offapi/com/sun/star/i18n/BreakIterator.idl b/offapi/com/sun/star/i18n/BreakIterator.idl
index 658ce5764d76..ff9a9a65a2b1 100644
--- a/offapi/com/sun/star/i18n/BreakIterator.idl
+++ b/offapi/com/sun/star/i18n/BreakIterator.idl
@@ -28,10 +28,7 @@
 #define __com_sun_star_i18n_BreakIterator_idl__
 
 #include <com/sun/star/lang/XServiceInfo.idl>
-
-#ifndef __com_sun_star_i18n_XBreakIterator_idl__
 #include <com/sun/star/i18n/XBreakIterator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/i18n/CTLScriptType.idl b/offapi/com/sun/star/i18n/CTLScriptType.idl
index a192f5f5d0c2..768b657c289c 100644
--- a/offapi/com/sun/star/i18n/CTLScriptType.idl
+++ b/offapi/com/sun/star/i18n/CTLScriptType.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module i18n {
 //=============================================================================
 
 //--------------------------------------------------------------------------
-/** CTL tcript type constants for layout engine, returned by
+/** CTL script type constants for layout engine, returned by
     <member>XScriptTypeDetector::getCTLScriptType()</member>
 
      @since OOo 1.1.2
diff --git a/offapi/com/sun/star/i18n/Calendar.idl b/offapi/com/sun/star/i18n/Calendar.idl
index 8e063c04e853..99ecfdeb23f2 100644
--- a/offapi/com/sun/star/i18n/Calendar.idl
+++ b/offapi/com/sun/star/i18n/Calendar.idl
@@ -58,7 +58,7 @@ published struct Calendar
     short                       MinimumNumberOfDaysForFirstWeek;
     /// if this is the default calendar for a given locale.
     boolean                     Default;
-    /// the name of the calendar, for example, <b>gregorian</b>.
+    /// the name of the calendar, for example, <b>Gregorian</b>.
     string                      Name;
 };
 
diff --git a/offapi/com/sun/star/i18n/CharacterClassification.idl b/offapi/com/sun/star/i18n/CharacterClassification.idl
index 1c903b95033d..bde28553fa01 100644
--- a/offapi/com/sun/star/i18n/CharacterClassification.idl
+++ b/offapi/com/sun/star/i18n/CharacterClassification.idl
@@ -29,7 +29,6 @@
 #define __com_sun_star_i18n_CharacterClassification_idl__
 
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include <com/sun/star/i18n/XCharacterClassification.idl>
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/Collator.idl b/offapi/com/sun/star/i18n/Collator.idl
index 79cea254bb56..87a95b242ab3 100644
--- a/offapi/com/sun/star/i18n/Collator.idl
+++ b/offapi/com/sun/star/i18n/Collator.idl
@@ -28,10 +28,7 @@
 #define __com_sun_star_i18n_Collator_idl__
 
 #include <com/sun/star/lang/XServiceInfo.idl>
-
-#ifndef __com_sun_star_i18n_XCollator_idl__
 #include <com/sun/star/i18n/XCollator.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/i18n/Currency2.idl b/offapi/com/sun/star/i18n/Currency2.idl
index e6a7cc2a5090..98a573b7a435 100644
--- a/offapi/com/sun/star/i18n/Currency2.idl
+++ b/offapi/com/sun/star/i18n/Currency2.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_i18n_Currency2_idl__
 #define __com_sun_star_i18n_Currency2_idl__
 
-#ifndef __com_sun_star_i18n_Currency_idl__
 #include <com/sun/star/i18n/Currency.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl b/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl
index fb58e57fc9d1..e975a70bf295 100644
--- a/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl
+++ b/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_i18n_LineBreakHyphenationOptions_idl__
 #define __com_sun_star_i18n_LineBreakHyphenationOptions_idl__
 
-#ifndef __com_sun_star_linguistic2_XHyphenator_idl__
 #include <com/sun/star/linguistic2/XHyphenator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/i18n/LineBreakResults.idl b/offapi/com/sun/star/i18n/LineBreakResults.idl
index 00b34baeee68..35b6594372bd 100644
--- a/offapi/com/sun/star/i18n/LineBreakResults.idl
+++ b/offapi/com/sun/star/i18n/LineBreakResults.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_i18n_LineBreakResults_idl__
 #define __com_sun_star_i18n_LineBreakResults_idl__
 
-#ifndef __com_sun_star_linguistic2_XHyphenatedWord_idl__
 #include <com/sun/star/linguistic2/XHyphenatedWord.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl b/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl
index f0dcd01ee0f9..54eed8478d96 100644
--- a/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl
+++ b/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_i18n_MultipleCharsOutputException_idl__
 #define __com_sun_star_i18n_MultipleCharsOutputException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/i18n/NumberFormatIndex.idl b/offapi/com/sun/star/i18n/NumberFormatIndex.idl
index 38163215d054..40f3613a456d 100644
--- a/offapi/com/sun/star/i18n/NumberFormatIndex.idl
+++ b/offapi/com/sun/star/i18n/NumberFormatIndex.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module i18n {
     <member scope="::com::sun::star::util">XNumberFormatTypes::getFormatIndex()</member>.
 
     <p> Each locale can support up to about 5000 arbitrary format
-    codes. But for backward compatiblity reasons, each locale
+    codes. But for backward compatibility reasons, each locale
     <b>MUST</b> support some predefined format codes. These predefined
     format codes are accessed through indices as the following, and
     the locale data format code definitions in
@@ -66,7 +66,7 @@ module com { module sun { module star { module i18n {
         <ul>
             <li> DIN 5008 (Deutsche Industrie Norm) </li>
             <li> EN 28601 (European Norm) </li>
-            <li> ISO 8601 (International Standards Organisation) </li>
+            <li> ISO 8601 (International Standards Organization) </li>
         </ul>
     </p>
 
diff --git a/offapi/com/sun/star/i18n/TextConversion.idl b/offapi/com/sun/star/i18n/TextConversion.idl
index 42fcb192294e..d95d4140f636 100644
--- a/offapi/com/sun/star/i18n/TextConversion.idl
+++ b/offapi/com/sun/star/i18n/TextConversion.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_i18n_TextConversion_idl__
 #define __com_sun_star_i18n_TextConversion_idl__
 
-#ifndef __com_sun_star_i18n_XTextConversion_idl__
 #include <com/sun/star/i18n/XTextConversion.idl>
-#endif
 
 //=============================================================================
 
@@ -38,7 +36,7 @@ module com { module sun { module star { module i18n {
 //=============================================================================
 /** offers generic text conversion.
 
-    <p>This is an abstract service which does not make sense to be instatiated.
+    <p>This is an abstract service which does not make sense to be instantiated.
 
      @since OOo 1.1.2
 */
diff --git a/offapi/com/sun/star/i18n/TextConversionOption.idl b/offapi/com/sun/star/i18n/TextConversionOption.idl
index d21e3e3151e1..a7fe61a64a05 100644
--- a/offapi/com/sun/star/i18n/TextConversionOption.idl
+++ b/offapi/com/sun/star/i18n/TextConversionOption.idl
@@ -38,7 +38,7 @@ module com {  module sun {  module star {  module i18n {
 //--------------------------------------------------------------------------
 /** Text conversion options to be used with <type>XTextConversion</type>.
 
-    <p>These text conversion options are usuall selected by end users.
+    <p>These text conversion options are usually selected by end users.
     The options can be combined and may be related to
     <type>TextConversionType</type>. </p>
 
@@ -57,7 +57,7 @@ published constants TextConversionOption
     const long  IGNORE_POST_POSITIONAL_WORD     = 2;    // (1 << 1)
 
     /** Use Taiwan, HongKong SAR, and Macao SAR character variants for
-        Simplified to Traditionary Chinese conversion
+        Simplified to Traditional Chinese conversion
 
         @since OOo 2.0
     */
diff --git a/offapi/com/sun/star/i18n/TextConversionResult.idl b/offapi/com/sun/star/i18n/TextConversionResult.idl
index 226687ec3d67..92260294ee77 100644
--- a/offapi/com/sun/star/i18n/TextConversionResult.idl
+++ b/offapi/com/sun/star/i18n/TextConversionResult.idl
@@ -29,9 +29,7 @@
 #define __com_sun_star_i18n_XTextConversionResult_idl__
 
 
-#ifndef __com_sun_star_i18n_Boundary_idl__
 #include <com/sun/star/i18n/Boundary.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/TextConversionType.idl b/offapi/com/sun/star/i18n/TextConversionType.idl
index f7c29404aa0c..65504c1084c8 100644
--- a/offapi/com/sun/star/i18n/TextConversionType.idl
+++ b/offapi/com/sun/star/i18n/TextConversionType.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module i18n {
 //=============================================================================
 
 //--------------------------------------------------------------------------
-/** These constansts specifiy the conversion type to be used with
+/** These constants specify the conversion type to be used with
     <type>XTextConversion</type>.
 
      @since OOo 1.1.2
diff --git a/offapi/com/sun/star/i18n/TransliterationModules.idl b/offapi/com/sun/star/i18n/TransliterationModules.idl
index 69618dee0c9f..605152d02134 100644
--- a/offapi/com/sun/star/i18n/TransliterationModules.idl
+++ b/offapi/com/sun/star/i18n/TransliterationModules.idl
@@ -53,21 +53,21 @@ published enum TransliterationModules
     FULLWIDTH_HALFWIDTH            = 4,
     /// Transliterate a Japanese string from Katakana to Hiragana
     KATAKANA_HIRAGANA              = 5,
-    /// Transliterate a Japanese string from Hiragnan to Katakana
+    /// Transliterate a Japanese string from Hiragana to Katakana
     HIRAGANA_KATAKANA              = 6,
-    /// Transliterate an ascii number string to Simplified Chinese lower case number string in spellout format
+    /// Transliterate an ASCII number string to Simplified Chinese lower case number string in spellout format
     NumToTextLower_zh_CN           = 7,
-    /// Transliterate an ascii number string to Simplified Chinese upper case number string in spellout format
+    /// Transliterate an ASCII number string to Simplified Chinese upper case number string in spellout format
     NumToTextUpper_zh_CN           = 8,
-    /// Transliterate an ascii number string to Traditional Chinese lower case number string in spellout format
+    /// Transliterate an ASCII number string to Traditional Chinese lower case number string in spellout format
     NumToTextLower_zh_TW           = 9,
-    /// Transliterate an ascii number string to Traditional Chinese upper case number string in spellout format
+    /// Transliterate an ASCII number string to Traditional Chinese upper case number string in spellout format
     NumToTextUpper_zh_TW           = 10,
-    /// Transliterate an ascii number string to formal Korean Hangul number string in spellout format
+    /// Transliterate an ASCII number string to formal Korean Hangul number string in spellout format
     NumToTextFormalHangul_ko       = 11,
-    /// Transliterate an ascii number string to formal Korean Hanja lower case number string in spellout format
+    /// Transliterate an ASCII number string to formal Korean Hanja lower case number string in spellout format
     NumToTextFormalLower_ko        = 12,
-    /// Transliterate an ascii number string to formal Korean Hanja upper case number string in spellout format
+    /// Transliterate an ASCII number string to formal Korean Hanja upper case number string in spellout format
     NumToTextFormalUpper_ko        = 13,
     NON_IGNORE_MASK                = 0x000000ff,
     IGNORE_MASK                    = -0x100,
diff --git a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
index 17cd0d6a7ba6..f6d1f48e303d 100644
--- a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
+++ b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransliterationModulesExtra.idl,v $
- * $Revision: 1.0 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/offapi/com/sun/star/i18n/TransliterationModulesNew.idl b/offapi/com/sun/star/i18n/TransliterationModulesNew.idl
index 796cf44f5b6e..149dc0c94a82 100644
--- a/offapi/com/sun/star/i18n/TransliterationModulesNew.idl
+++ b/offapi/com/sun/star/i18n/TransliterationModulesNew.idl
@@ -49,7 +49,7 @@ published enum TransliterationModulesNew
     FULLWIDTH_HALFWIDTH            = 4,
     /// Transliterate a Japanese string from Katakana to Hiragana
     KATAKANA_HIRAGANA              = 5,
-    /// Transliterate a Japanese string from Hiragnan to Katakana
+    /// Transliterate a Japanese string from Hiragana to Katakana
     HIRAGANA_KATAKANA              = 6,
     /// Ignore case when comparing strings by transliteration service
     IGNORE_CASE                    = 7,
@@ -93,78 +93,78 @@ published enum TransliterationModulesNew
     smallToLarge_ja_JP             = 26,
     /// transliterate Japanese normal sized character to small sized character
     largeToSmall_ja_JP             = 27,
-    /// Transliterate an ascii number string to Simplified Chinese lower case number string in spellout format
+    /// Transliterate an ASCII number string to Simplified Chinese lower case number string in spellout format
     NumToTextLower_zh_CN           = 28,
-    /// Transliterate an ascii number string to Simplified Chinese upper case number string in spellout format
+    /// Transliterate an ASCII number string to Simplified Chinese upper case number string in spellout format
     NumToTextUpper_zh_CN           = 29,
-    /// Transliterate an ascii number string to Traditional Chinese lower case number string in spellout format
+    /// Transliterate an ASCII number string to Traditional Chinese lower case number string in spellout format
     NumToTextLower_zh_TW           = 30,
-    /// Transliterate an ascii number string to Traditional Chinese upper case number string in spellout format
+    /// Transliterate an ASCII number string to Traditional Chinese upper case number string in spellout format
     NumToTextUpper_zh_TW           = 31,
-    /// Transliterate an ascii number string to formal Korean Hangul number string in spellout format
+    /// Transliterate an ASCII number string to formal Korean Hangul number string in spellout format
     NumToTextFormalHangul_ko       = 32,
-    /// Transliterate an ascii number string to formal Korean Hanja lower case number string in spellout format
+    /// Transliterate an ASCII number string to formal Korean Hanja lower case number string in spellout format
     NumToTextFormalLower_ko        = 33,
-    /// Transliterate an ascii number string to formal Korean Hanja upper case number string in spellout format
+    /// Transliterate an ASCII number string to formal Korean Hanja upper case number string in spellout format
     NumToTextFormalUpper_ko        = 34,
-    /// Transliterate an ascii number string to informal Korean Hangul number string in spellout format
+    /// Transliterate an ASCII number string to informal Korean Hangul number string in spellout format
     NumToTextInformalHangul_ko     = 35,
-    /// Transliterate an ascii number string to informal Korean Hanja lower case number string in spellout format
+    /// Transliterate an ASCII number string to informal Korean Hanja lower case number string in spellout format
     NumToTextInformalLower_ko      = 36,
-    /// Transliterate an ascii number string to informal Korean Hanja upper case number string in spellout format
+    /// Transliterate an ASCII number string to informal Korean Hanja upper case number string in spellout format
     NumToTextInformalUpper_ko      = 37,
-    /// Transliterate an ascii number string to Simplified Chinese lower case number string
+    /// Transliterate an ASCII number string to Simplified Chinese lower case number string
     NumToCharLower_zh_CN           = 38,
-    /// Transliterate an ascii number string to Simplified Chinese upper case number string
+    /// Transliterate an ASCII number string to Simplified Chinese upper case number string
     NumToCharUpper_zh_CN           = 39,
-    /// Transliterate an ascii number string to Traditional Chinese lower case number string
+    /// Transliterate an ASCII number string to Traditional Chinese lower case number string
     NumToCharLower_zh_TW           = 40,
-    /// Transliterate an ascii number string to Traditional Chinese upper case number string
+    /// Transliterate an ASCII number string to Traditional Chinese upper case number string
     NumToCharUpper_zh_TW           = 41,
-    /// Transliterate an ascii number string to Korean Hangul number string
+    /// Transliterate an ASCII number string to Korean Hangul number string
     NumToCharHangul_ko             = 42,
-    /// Transliterate an ascii number string to Korean Hanja lower case number string
+    /// Transliterate an ASCII number string to Korean Hanja lower case number string
     NumToCharLower_ko              = 43,
-    /// Transliterate an ascii number string to Korean Hanja upper case number string
+    /// Transliterate an ASCII number string to Korean Hanja upper case number string
     NumToCharUpper_ko              = 44,
     /// Transliterate a half width number string to full width number string
     NumToCharFullwidth             = 45,
-    /// Transliterate an ascii number string to Japanese Kanji number string
+    /// Transliterate an ASCII number string to Japanese Kanji number string
     NumToCharKanjiShort_ja_JP      = 46,
-    /// Transliterate a Simplified Chinese lower case number string (sepllout) to ascii number string
+    /// Transliterate a Simplified Chinese lower case number string (spellout) to ASCII number string
     TextToNumLower_zh_CN           = 47,
-    /// Transliterate a Simplified Chinese upper case number string (sepllout) to ascii number string
+    /// Transliterate a Simplified Chinese upper case number string (spellout) to ASCII number string
     TextToNumUpper_zh_CN           = 48,
-    /// Transliterate a Traditional Chinese lower case number string (sepllout) to ascii number string
+    /// Transliterate a Traditional Chinese lower case number string (spellout) to ASCII number string
     TextToNumLower_zh_TW           = 49,
-    /// Transliterate a Traditional Chinese upper case number string (sepllout) to ascii number string
+    /// Transliterate a Traditional Chinese upper case number string (spellout) to ASCII number string
     TextToNumUpper_zh_TW           = 50,
-    /// Transliterate a Korean formal Hangul number string (sepllout) to ascii number string
+    /// Transliterate a Korean formal Hangul number string (spellout) to ASCII number string
     TextToNumFormalHangul_ko       = 51,
-    /// Transliterate a Korean formal Hanja lower case number string (sepllout) to ascii number string
+    /// Transliterate a Korean formal Hanja lower case number string (spellout) to ASCII number string
     TextToNumFormalLower_ko        = 52,
-    /// Transliterate a Korean formal Hanja upper case number string (sepllout) to ascii number string
+    /// Transliterate a Korean formal Hanja upper case number string (spellout) to ASCII number string
     TextToNumFormalUpper_ko        = 53,
-    /// Transliterate a Korean informal Hangul number string (sepllout) to ascii number string
+    /// Transliterate a Korean informal Hangul number string (spellout) to ASCII number string
     TextToNumInformalHangul_ko     = 54,
-    /// Transliterate a Korean informal Hanja lower case number string (sepllout) to ascii number string
+    /// Transliterate a Korean informal Hanja lower case number string (spellout) to ASCII number string
     TextToNumInformalLower_ko      = 55,
-    /// Transliterate a Korean informal Hanja upper case number string (sepllout) to ascii number string
+    /// Transliterate a Korean informal Hanja upper case number string (spellout) to ASCII number string
     TextToNumInformalUpper_ko      = 56,
     // 2 Spaces for Japanese TextToNum
-    /// Transliterate a Simplified Chinese lower case number string to ascii number string
+    /// Transliterate a Simplified Chinese lower case number string to ASCII number string
     CharToNumLower_zh_CN           = 59,
-    /// Transliterate a Simplified Chinese upper case number string to ascii number string
+    /// Transliterate a Simplified Chinese upper case number string to ASCII number string
     CharToNumUpper_zh_CN           = 60,
-    /// Transliterate a Traditional Chinese lower case number string to ascii number string
+    /// Transliterate a Traditional Chinese lower case number string to ASCII number string
     CharToNumLower_zh_TW           = 61,
-    /// Transliterate a Traditional Chinese upper case number string to ascii number string
+    /// Transliterate a Traditional Chinese upper case number string to ASCII number string
     CharToNumUpper_zh_TW           = 62,
-    /// Transliterate a Korean Hangul number string to ascii number string
+    /// Transliterate a Korean Hangul number string to ASCII number string
     CharToNumHangul_ko             = 63,
-    /// Transliterate a Korean Hanja lower case number string to ascii number string
+    /// Transliterate a Korean Hanja lower case number string to ASCII number string
     CharToNumLower_ko              = 64,
-    /// Transliterate a Korean Hanja upper case number string to ascii number string
+    /// Transliterate a Korean Hanja upper case number string to ASCII number string
     CharToNumUpper_ko              = 65,
     END_OF_MODULE                  = 0
 };
diff --git a/offapi/com/sun/star/i18n/TransliterationType.idl b/offapi/com/sun/star/i18n/TransliterationType.idl
index 4a7b8223ab61..b09fda4ba427 100644
--- a/offapi/com/sun/star/i18n/TransliterationType.idl
+++ b/offapi/com/sun/star/i18n/TransliterationType.idl
@@ -56,8 +56,8 @@ published constants TransliterationType
     const short ONE_TO_ONE         = 1;
 
     /** A transliteration module can have attribute NUMERIC if it
-        tranliterates numbers in different languages like chinese
-        numbers to arabic numbers and vice versa. This mapping need not
+        transliterates numbers in different languages like Chinese
+        numbers to Arabic numbers and vice versa. This mapping need not
         be one to one, it should be primarily used by number formatting
         and parsing methods. */
     const short NUMERIC            = 2;
@@ -66,7 +66,7 @@ published constants TransliterationType
         both one to one mapping and handles number also. */
     const short ONE_TO_ONE_NUMERIC = 3;
 
-    /** With a transliterator IGNORE case, the regular
+    /** With a transliteration IGNORE case, the regular
         expression A-Z can be transformed to a-z, for example. */
     const short IGNORE             = 4;
 
diff --git a/offapi/com/sun/star/i18n/XBreakIterator.idl b/offapi/com/sun/star/i18n/XBreakIterator.idl
index b1bf01526548..47a36c855557 100644
--- a/offapi/com/sun/star/i18n/XBreakIterator.idl
+++ b/offapi/com/sun/star/i18n/XBreakIterator.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_i18n_XBreakIterator_idl__
 #define __com_sun_star_i18n_XBreakIterator_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_LineBreakUserOptions_idl__
 #include <com/sun/star/i18n/LineBreakUserOptions.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_LineBreakHyphenationOptions_idl__
 #include <com/sun/star/i18n/LineBreakHyphenationOptions.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_LineBreakResults_idl__
 #include <com/sun/star/i18n/LineBreakResults.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_Boundary_idl__
 #include <com/sun/star/i18n/Boundary.idl>
-#endif
 
 //============================================================================
 
@@ -99,7 +85,7 @@ published interface XBreakIterator: com::sun::star::uno::XInterface
 
         @param nWordType
             One of <type>WordType</type>, specifies the type of
-            travelling.
+            traveling.
 
         @returns
             The <type>Boundary</type> of the found word. Normally used for
@@ -135,7 +121,7 @@ published interface XBreakIterator: com::sun::star::uno::XInterface
 
         @param nWordType
             One of <type>WordType</type>, specifies the type of
-            travelling.
+            traveling.
 
         @returns
             The <type>Boundary</type> of the found word. Normally used for
@@ -175,7 +161,7 @@ published interface XBreakIterator: com::sun::star::uno::XInterface
 
         <p> This method is mis-defined, since <type>WordType</type>
         is not an attribute of a word, but a way to break words,
-        like excluding or including tail spaces for spellchecker
+        like excluding or including tail spaces for spell checker
         or cursor traveling. It returns 0 always.
         </p>
      */
diff --git a/offapi/com/sun/star/i18n/XCalendar.idl b/offapi/com/sun/star/i18n/XCalendar.idl
index 04fd12bf73e4..ec300cfe20ed 100644
--- a/offapi/com/sun/star/i18n/XCalendar.idl
+++ b/offapi/com/sun/star/i18n/XCalendar.idl
@@ -63,7 +63,7 @@ published interface XCalendar : com::sun::star::uno::XInterface
 
     //------------------------------------------------------------------------
     /** Returns the ID string of the loaded calendar, for example,
-        <b>"gregorian"</b>
+        <b>"Gregorian"</b>
      */
     string  getUniqueID();
 
diff --git a/offapi/com/sun/star/i18n/XCharacterClassification.idl b/offapi/com/sun/star/i18n/XCharacterClassification.idl
index 5b32c032b90a..3423913e2ddd 100644
--- a/offapi/com/sun/star/i18n/XCharacterClassification.idl
+++ b/offapi/com/sun/star/i18n/XCharacterClassification.idl
@@ -29,13 +29,8 @@
 #define __com_sun_star_i18n_XCharacterClassification_idl__
 
 #include <com/sun/star/i18n/ParseResult.idl>
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //============================================================================
 
@@ -156,7 +151,7 @@ published interface XCharacterClassification : com::sun::star::uno::XInterface
 
         @returns
             A filled <type>ParseResult</type> structure. If no
-            unambigous token could be parsed,
+            unambiguous token could be parsed,
             <member>ParseResult::TokenType</member> will be set to
             <b>0</b> (zero), other fields will contain the values parsed
             so far.
diff --git a/offapi/com/sun/star/i18n/XExtendedCalendar.idl b/offapi/com/sun/star/i18n/XExtendedCalendar.idl
index b8b6d9ed9936..1c67222d6c72 100644
--- a/offapi/com/sun/star/i18n/XExtendedCalendar.idl
+++ b/offapi/com/sun/star/i18n/XExtendedCalendar.idl
@@ -57,7 +57,7 @@ published interface XExtendedCalendar : ::com::sun::star::i18n::XCalendar
 
         <p> Note that the string returned depends completely on the
         locale's calendar. It is not predictable if the string will be
-        numeric or a name, or if in case it retuns a numeric string
+        numeric or a name, or if in case it returns a numeric string
         how many digits that will have. For example, a short year
         display string will normally be two digits with a Gregorian
         calendar, but with a Jewish calendar it will have three
diff --git a/offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier.idl b/offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier.idl
index 0e03605669fd..391b84760dda 100644
--- a/offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier.idl
+++ b/offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module i18n {
     <ul>
     <li>Provide supported language/locale list.
     <li>Provide supported algorithm list.
-    <li>Provide phonetic entry support for CJK languge.
+    <li>Provide phonetic entry support for CJK language.
     <li>Provide method to compare index entry.
     </ul>
 
diff --git a/offapi/com/sun/star/i18n/XExtendedTextConversion.idl b/offapi/com/sun/star/i18n/XExtendedTextConversion.idl
index 9c6c5ee43fce..bd27381a61e8 100644
--- a/offapi/com/sun/star/i18n/XExtendedTextConversion.idl
+++ b/offapi/com/sun/star/i18n/XExtendedTextConversion.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module i18n {
     <p> It is derived from
     <type scope="::com::sun::star::i18n">XTextConversion</type> and provides
     a new conversion function containing position map (offset) between original
-    and conveted string. </p>
+    and converted string. </p>
 
      @since OOo 2.0
  */
diff --git a/offapi/com/sun/star/i18n/XExtendedTransliteration.idl b/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
index d7c852e772ea..ca2348d5d3a5 100644
--- a/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
+++ b/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module i18n {
     additional functionality for character to character and
     string to string without offset parameter transliteration. These
     should be used for performance reason if their full-blown
-    counterparts aren't neded.  </p>
+    counterparts aren't needed.  </p>
 
      @since OOo 1.1.2
  */
@@ -56,7 +56,7 @@ published interface XExtendedTransliteration : ::com::sun::star::i18n::XTranslit
     //------------------------------------------------------------------------
     /** Transliterate a substring. The functionality is the same as
         <member scope="::com::sun::star::i18n">XTransliteration::transliterate()</member>
-        but omits the offset prameter to improve performance.
+        but omits the offset parameter to improve performance.
 
         @param aStr
             The input string.
@@ -65,7 +65,7 @@ published interface XExtendedTransliteration : ::com::sun::star::i18n::XTranslit
             Start position within aStr from where transliteration starts.
 
         @param nCount
-            Number of codepoints to be transliterated.
+            Number of code points to be transliterated.
 
      */
     string  transliterateString2String( [in] string aStr,
@@ -84,7 +84,7 @@ published interface XExtendedTransliteration : ::com::sun::star::i18n::XTranslit
     /** Transliterate a character to a character.
 
         <p> If the output contains multiple characters, for example when
-        transliterating German sharp 's' (the one that looks like a
+        transliterating German sharp "s" (the one that looks like a
         Greek Beta) to upper case "SS", MultipleCharsOutputException
         will be thrown, the caller must catch the exception and then
         call
diff --git a/offapi/com/sun/star/i18n/XForbiddenCharacters.idl b/offapi/com/sun/star/i18n/XForbiddenCharacters.idl
index 6b107c02bec5..ae8be008d169 100644
--- a/offapi/com/sun/star/i18n/XForbiddenCharacters.idl
+++ b/offapi/com/sun/star/i18n/XForbiddenCharacters.idl
@@ -28,13 +28,8 @@
 #define __com_sun_star_i18n_XForbiddenCharacters_idl__
 
 #include <com/sun/star/i18n/ForbiddenCharacters.idl>
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //============================================================================
diff --git a/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl b/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
index 14244be6264f..00c80b0ca513 100644
--- a/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
+++ b/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_i18n_XIndexEntrySupplier_idl__
 #define __com_sun_star_i18n_XIndexEntrySupplier_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/i18n/XLocaleData.idl b/offapi/com/sun/star/i18n/XLocaleData.idl
index d71a2a937c82..89f55423a8b9 100644
--- a/offapi/com/sun/star/i18n/XLocaleData.idl
+++ b/offapi/com/sun/star/i18n/XLocaleData.idl
@@ -112,7 +112,7 @@ published interface XLocaleData: com::sun::star::uno::XInterface
                                 [in] com::sun::star::lang::Locale aLocale );
 
     //------------------------------------------------------------------------
-    /** returns all LC_MISC forbidden charatcers for a locale.
+    /** returns all LC_MISC forbidden characters for a locale.
      */
     ForbiddenCharacters getForbiddenCharacters (
                                 [in] com::sun::star::lang::Locale aLocale );
diff --git a/offapi/com/sun/star/i18n/XNumberFormatCode.idl b/offapi/com/sun/star/i18n/XNumberFormatCode.idl
index 662657ff3ee4..3eceb5eef5e4 100644
--- a/offapi/com/sun/star/i18n/XNumberFormatCode.idl
+++ b/offapi/com/sun/star/i18n/XNumberFormatCode.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_i18n_XNumberFormatCode_idl__
 #define __com_sun_star_i18n_XNumberFormatCode_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/i18n/NumberFormatCode.idl>
 
diff --git a/offapi/com/sun/star/i18n/XOrdinalSuffix.idl b/offapi/com/sun/star/i18n/XOrdinalSuffix.idl
index 382cb4dafd31..9cd444400f66 100644
--- a/offapi/com/sun/star/i18n/XOrdinalSuffix.idl
+++ b/offapi/com/sun/star/i18n/XOrdinalSuffix.idl
@@ -45,22 +45,24 @@ module com { module sun { module star { module i18n {
     ATTENTION: This interface is marked <em>internal</em> and does not
     have the <em>published</em> flag, which means it is subject to
     change without notice and should not be used outside the OOo core.
-    The current version is a draft and works only for English language
-    locales. Future enhancements adding functionality for other locales
-    should use the 'ordinal' RuleBasedNumberFormat of the ICU if
-    possible, see
-    http://icu.sourceforge.net/apiref/icu4c/classRuleBasedNumberFormat.html
-    which might make it necessary to change the interface.
  */
 
 interface XOrdinalSuffix : com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
-    /** Returns the ordinal suffix for the number, for example,
-        "<b>st</b>", "<b>nd</b>", "<b>rd</b>", "<b>th</b>"
-        in an English locale.
+    /** Returns all the possible ordinal suffixes for the number.
+
+        This method will provide "<b>st</b>", "<b>nd</b>", "<b>rd</b>",
+        "<b>th</b>" for an English locale, depending on the provided number.
+        In some locales like French, Italian or Spanish it ca return several
+        suffixes for one number.
+
+        Examples: for the number '1', the values will be <b>st</b> in
+        English, but <b>er</b> and <b>re</b> in French. All these values
+        may depend on the underlying version of ICU.
+
      */
-    string getOrdinalSuffix( [in] long nNumber, [in] com::sun::star::lang::Locale aLocale );
+    sequence< string > getOrdinalSuffix( [in] long nNumber, [in] com::sun::star::lang::Locale aLocale );
 };
 
 //============================================================================
diff --git a/offapi/com/sun/star/i18n/XTextConversion.idl b/offapi/com/sun/star/i18n/XTextConversion.idl
index 0e22052ff93e..87f72c6a632c 100644
--- a/offapi/com/sun/star/i18n/XTextConversion.idl
+++ b/offapi/com/sun/star/i18n/XTextConversion.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_i18n_XTextConversion_idl__
 #define __com_sun_star_i18n_XTextConversion_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_TextConversionResult_idl__
 #include <com/sun/star/i18n/TextConversionResult.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 
 //=============================================================================
@@ -69,7 +55,7 @@ published interface XTextConversion : ::com::sun::star::uno::XInterface
         @param nStartPos
             The start position in aText for the conversion
         @param nLength
-            The length of the partion in aText for the conversion
+            The length of the portion in aText for the conversion
         @param aLocal
             Locale the conversion is referring to.
         @param nTextConversionType
@@ -103,7 +89,7 @@ published interface XTextConversion : ::com::sun::star::uno::XInterface
         @param nStartPos
             The start position in aText for the conversion
         @param nLength
-            The length of the partion in aText for the conversion
+            The length of the portion in aText for the conversion
         @param aLocal
             Locale the conversion is referring to.
         @param nTextConversionType
diff --git a/offapi/com/sun/star/i18n/XTransliteration.idl b/offapi/com/sun/star/i18n/XTransliteration.idl
index aa003604eadf..93cd613741fd 100644
--- a/offapi/com/sun/star/i18n/XTransliteration.idl
+++ b/offapi/com/sun/star/i18n/XTransliteration.idl
@@ -74,7 +74,7 @@ module com { module sun { module star { module i18n {
  * 0.
  * All the IGNORE-type functionalities (Range, equals) are based on mapping.
  * except equals() method in IGNORE_CASE, which is based on Locale-independent
- * casefolding
+ * case folding
  * ( This second assumption is very complicated and may cause confusion of use)
  *
  * 1.
@@ -94,7 +94,7 @@ module com { module sun { module star { module i18n {
  *
  * 4.
  * Implementation name in the methods below is not the same as
- * the true implemenation name registered.
+ * the true implementation name registered.
  * In particular, for generic modules:"UPPERCASE_LOWERCASE",
  * "LOWERCASE_UPPERCASE", "IGNORE_CASE", there is no registered name.
  */
@@ -112,7 +112,7 @@ published interface XTransliteration: com::sun::star::uno::XInterface
     string  getName();
 
     //------------------------------------------------------------------------
-    /** Return the attribute(s) associated with this transliterator
+    /** Return the attribute(s) associated with this transliteration
         object, as defined in <type>TransliterationType</type>. The
         value is determined by the transliteration modules. For example,
         for UPPERCASE_LOWERCASE, a ONE_TO_ONE is returned, for
@@ -158,7 +158,7 @@ published interface XTransliteration: com::sun::star::uno::XInterface
 
     //------------------------------------------------------------------------
     /** Load a sequence of instances of transliteration modules.
-        Output of one module is feeded as input to the next module in
+        Output of one module is fed as input to the next module in
         the sequence. The object created by this call has
         <type>TransliterationType</type> CASCADE and IGNORE types.
 
@@ -193,7 +193,7 @@ published interface XTransliteration: com::sun::star::uno::XInterface
             Start position within aStr from where transliteration starts.
 
         @param nCount
-            Number of codepoints to be transliterated.
+            Number of code points to be transliterated.
 
         @param rOffset
             To find the grapheme of input string corresponding to the
@@ -273,7 +273,7 @@ published interface XTransliteration: com::sun::star::uno::XInterface
         returns {"A","I","a","i"}, transliterateRange( "a", "a" )
         returns {"A","A","a","a"}. </p>
 
-        <p> Use this transliteration to create regular expresssions like
+        <p> Use this transliteration to create regular expressions like
         [a-i] --> [A-Ia-i]. </p>
 
         @returns
diff --git a/offapi/com/sun/star/image/ImageMap.idl b/offapi/com/sun/star/image/ImageMap.idl
index 45f82a157faa..d18ad608c14b 100644
--- a/offapi/com/sun/star/image/ImageMap.idl
+++ b/offapi/com/sun/star/image/ImageMap.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_image_ImageMap_idl__
 #define __com_sun_star_image_ImageMap_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
 
 //=============================================================================
 
@@ -41,7 +36,7 @@
 
 //=============================================================================
 
-/** This service specifies a html image map.
+/** This service specifies a HTML image map.
  */
 published service ImageMap
 {
@@ -52,7 +47,7 @@ published service ImageMap
         the objects inside this image map.
         @see ImageMapRectangleObject
         @see ImageMapCircleObject
-        @see ImageMapPolygonObjec
+        @see ImageMapPolygonObject
     */
     interface ::com::sun::star::container::XIndexContainer;
 };
diff --git a/offapi/com/sun/star/image/ImageMapCircleObject.idl b/offapi/com/sun/star/image/ImageMapCircleObject.idl
index aa4b881516e6..b10608b38ebe 100644
--- a/offapi/com/sun/star/image/ImageMapCircleObject.idl
+++ b/offapi/com/sun/star/image/ImageMapCircleObject.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_image_ImageMapCircleObject_idl__
 #define __com_sun_star_image_ImageMapCircleObject_idl__
 
-#ifndef __com_sun_star_image_ImageMapObject_idl__
 #include <com/sun/star/image/ImageMapObject.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 //=============================================================================
 
@@ -42,7 +38,7 @@
 //=============================================================================
 
 /** this service describes a circular-shaped region inside
-    a html image map.
+    a HTML image map.
     @see ImageMap
     @see ImageMapObject
 */
diff --git a/offapi/com/sun/star/image/ImageMapObject.idl b/offapi/com/sun/star/image/ImageMapObject.idl
index de29a2f22d3c..8f732f2c3660 100644
--- a/offapi/com/sun/star/image/ImageMapObject.idl
+++ b/offapi/com/sun/star/image/ImageMapObject.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_image_ImageMapObject_idl__
 #define __com_sun_star_image_ImageMapObject_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_document_XEventsSupplier_idl__
 #include <com/sun/star/document/XEventsSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/image/ImageMapPolygonObject.idl b/offapi/com/sun/star/image/ImageMapPolygonObject.idl
index 298b9ac8db44..d50e7a2dc98a 100644
--- a/offapi/com/sun/star/image/ImageMapPolygonObject.idl
+++ b/offapi/com/sun/star/image/ImageMapPolygonObject.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_image_ImageMapPolygonObject_idl__
 #define __com_sun_star_image_ImageMapPolygonObject_idl__
 
-#ifndef __com_sun_star_image_ImageMapObject_idl__
 #include <com/sun/star/image/ImageMapObject.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_PointSequence_idl__
 #include <com/sun/star/drawing/PointSequence.idl>
-#endif
 
 //=============================================================================
 
@@ -42,7 +38,7 @@
 //=============================================================================
 
 /** this service describes a polygon-shaped region inside
-    a html image map.
+    a HTML image map.
     @see ImageMap
     @see ImageMapObject
 */
diff --git a/offapi/com/sun/star/image/ImageMapRectangleObject.idl b/offapi/com/sun/star/image/ImageMapRectangleObject.idl
index 8d1844736c86..8a479850985c 100644
--- a/offapi/com/sun/star/image/ImageMapRectangleObject.idl
+++ b/offapi/com/sun/star/image/ImageMapRectangleObject.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_image_ImageMapRectangleObject_idl__
 #define __com_sun_star_image_ImageMapRectangleObject_idl__
 
-#ifndef __com_sun_star_image_ImageMapObject_idl__
 #include <com/sun/star/image/ImageMapObject.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 //=============================================================================
 
@@ -42,7 +38,7 @@
 //=============================================================================
 
 /** this service describes a rectangular-shaped region inside
-    a html image map.
+    a HTML image map.
     @see ImageMap
     @see ImageMapObject
 */
diff --git a/offapi/com/sun/star/inspection/DefaultHelpProvider.idl b/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
index b5847f918191..392cbe000b01 100644
--- a/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
+++ b/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_inspection_DefaultHelpProvider_idl__
 #define __com_sun_star_inspection_DefaultHelpProvider_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/inspection/GenericPropertyHandler.idl b/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
index f8e0e69a3499..85db8c54c235 100644
--- a/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
+++ b/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_inspection_GenericPropertyHandler_idl__
 #define __com_sun_star_inspection_GenericPropertyHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
diff --git a/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl b/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
index 4c8dc9f1a55c..0d00b86e8bd8 100644
--- a/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
+++ b/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module inspection {
 */
 published enum InteractiveSelectionResult
 {
-    /** The interactive selection of a property value was cancelled.
+    /** The interactive selection of a property value was canceled.
     */
     Cancelled,
 
diff --git a/offapi/com/sun/star/inspection/LineDescriptor.idl b/offapi/com/sun/star/inspection/LineDescriptor.idl
index b574e05f774c..a6d248093d4f 100644
--- a/offapi/com/sun/star/inspection/LineDescriptor.idl
+++ b/offapi/com/sun/star/inspection/LineDescriptor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_inspection_LineDescriptor_idl__
 #define __com_sun_star_inspection_LineDescriptor_idl__
 
-#ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -71,7 +69,7 @@ published struct LineDescriptor
     */
     string HelpURL;
 
-    /** detetrmines whether a button exists which can be used for a more complex, interactive
+    /** determines whether a button exists which can be used for a more complex, interactive
         property value input.
 
         <p>If no image for the primary button is specified, but a primary button is present,
@@ -121,7 +119,7 @@ published struct LineDescriptor
     */
     com::sun::star::graphic::XGraphic PrimaryButtonImage;
 
-    /** detetrmines whether a secondary button exists which can be used for a more complex, interactive
+    /** determines whether a secondary button exists which can be used for a more complex, interactive
         property value input.
 
         <p>A secondary button subordinated to the primary button. If no primary button exists
diff --git a/offapi/com/sun/star/inspection/ObjectInspector.idl b/offapi/com/sun/star/inspection/ObjectInspector.idl
index fb42d3342e7a..49ca2806deba 100644
--- a/offapi/com/sun/star/inspection/ObjectInspector.idl
+++ b/offapi/com/sun/star/inspection/ObjectInspector.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_inspection_ObjectInspector_idl__
 #define __com_sun_star_inspection_ObjectInspector_idl__
 
-#ifndef __com_sun_star_inspection_XObjectInspector_idl__
 #include <com/sun/star/inspection/XObjectInspector.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
diff --git a/offapi/com/sun/star/inspection/ObjectInspectorModel.idl b/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
index 073ea4d5f10c..b6e31286e066 100644
--- a/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
+++ b/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_inspection_ObjectInspectorModel_idl__
 #define __com_sun_star_inspection_ObjectInspectorModel_idl__
 
-#ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
 #include <com/sun/star/inspection/XObjectInspectorModel.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
diff --git a/offapi/com/sun/star/inspection/PropertyControlType.idl b/offapi/com/sun/star/inspection/PropertyControlType.idl
index ef5e76c54aea..d2bec8ec0c97 100644
--- a/offapi/com/sun/star/inspection/PropertyControlType.idl
+++ b/offapi/com/sun/star/inspection/PropertyControlType.idl
@@ -35,7 +35,7 @@ module com {  module sun {  module star {  module inspection {
 /** describes pre-defined possible control types to be used to display and enter
     property values within a <type>ObjectInspector</type>.
 
-    <p>The type of a control determines its visual appearance, its behaviour, and - important
+    <p>The type of a control determines its visual appearance, its behavior, and - important
     for property handlers using a control - the expected type when reading and writing the
     control's value.</p>
 
@@ -102,7 +102,7 @@ published constants PropertyControlType
         <member>XPropertyControl::Value</member>, and if this string has previously been added to the list
         using the <type>XStringListControl</type> interface, this string is selected. Vice versa, if the user
         selects one of those non-color strings in the list, then reading <member>XPropertyControl::Value</member>
-        will retrieve you this stting.</p>
+        will retrieve you this string.</p>
     */
     const short ColorListBox = 7;
 
diff --git a/offapi/com/sun/star/inspection/XHyperlinkControl.idl b/offapi/com/sun/star/inspection/XHyperlinkControl.idl
index 6537da25a966..6beb5cda56ec 100644
--- a/offapi/com/sun/star/inspection/XHyperlinkControl.idl
+++ b/offapi/com/sun/star/inspection/XHyperlinkControl.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_inspection_XHyperlinkControl_idl__
 #define __com_sun_star_inspection_XHyperlinkControl_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyControl_idl__
 #include <com/sun/star/inspection/XPropertyControl.idl>
-#endif
-#ifndef __com_sun_star_awt_XActionListener_idl__
 #include <com/sun/star/awt/XActionListener.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
diff --git a/offapi/com/sun/star/inspection/XNumericControl.idl b/offapi/com/sun/star/inspection/XNumericControl.idl
index 16009b0e786f..6f79c9bae12c 100644
--- a/offapi/com/sun/star/inspection/XNumericControl.idl
+++ b/offapi/com/sun/star/inspection/XNumericControl.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_inspection_XNumericControl_idl__
 #define __com_sun_star_inspection_XNumericControl_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyControl_idl__
 #include <com/sun/star/inspection/XPropertyControl.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
 #include <com/sun/star/beans/Optional.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -66,7 +60,7 @@ published interface XNumericControl : XPropertyControl
 
         <p>Only a certain set of <type scope="com::sun::star::util">MeasureUnit</type> values is
         supported. In particular, every value which denotes a fraction of another
-        unit (like 100th millimiters) cannot be used as DisplayUnit.</p>
+        unit (like 100th millimeters) cannot be used as DisplayUnit.</p>
 
         @throws com::sun::star::lang::IllegalArgumentException
             if the caller attempts to set an unsupported <type scope="com::sun::star::util">MeasureUnit</type>
@@ -77,7 +71,7 @@ published interface XNumericControl : XPropertyControl
     };
 
     /** describes a <type scope="com::sun::star::util">MeasureUnit</type> to be
-        applied for transfering values.
+        applied for transferring values.
 
         <p>The core measurement unit for a property value might differ from the unit which
         is used by the control to display it. For instance, your property value might require
diff --git a/offapi/com/sun/star/inspection/XObjectInspector.idl b/offapi/com/sun/star/inspection/XObjectInspector.idl
index 12d656692b74..ae24450f31ac 100644
--- a/offapi/com/sun/star/inspection/XObjectInspector.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspector.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_inspection_XObjectInspector_idl__
 #define __com_sun_star_inspection_XObjectInspector_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
diff --git a/offapi/com/sun/star/inspection/XObjectInspectorModel.idl b/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
index f018081e85e2..621219777272 100644
--- a/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
 #define __com_sun_star_inspection_XObjectInspectorModel_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_inspection_PropertyCategoryDescriptor_idl__
 #include <com/sun/star/inspection/PropertyCategoryDescriptor.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -54,7 +50,7 @@ published interface XObjectInspectorModel
         <p>Every element of the sequence must contain information to create a
         <type>XPropertyHandler</type> instance. Two ways are currently supported:
         <ul>
-            <li>A sevice name:</br>
+            <li>A service name:</br>
                 If a sequence element contains a string, this string is interpreted
                 as service name, and an <type scope="com::sun::star::lang">XMultiComponentFactory</type>
                 is asked to create an instance of this service.</li>
@@ -67,7 +63,7 @@ published interface XObjectInspectorModel
         <p>This attribute is usually only evaluated by the <type>ObjectInspector</type> instance
         which the model is currently bound to.</p>
 
-        <p>The order of factories is important: If two property handlers declare themself responsible
+        <p>The order of factories is important: If two property handlers declare themselves responsible
         for the same property, the one whose factory is listed <strong>last</strong> wins. Also,
         if a handler <code>B</code> wants to supersede a property of another handler <code>A</code>,
         <code>A</code>'s factory must precede the factory of <code>B</code>.</p>
@@ -174,7 +170,7 @@ published interface XObjectInspectorModel
         change any of them.</p>
 
         <p>In a read-only object inspector, the property controls are readonly or
-        disabled themself, and the primary and secondary buttons of a property line
+        disabled themselves, and the primary and secondary buttons of a property line
         are both disabled.</p>
 
         @see XPropertyControl
diff --git a/offapi/com/sun/star/inspection/XObjectInspectorUI.idl b/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
index 81b4836c4c36..cde86cea2aeb 100644
--- a/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_inspection_XObjectInspectorUI_idl__
 #define __com_sun_star_inspection_XObjectInspectorUI_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyControl_idl__
 #include <com/sun/star/inspection/XPropertyControl.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
 #include <com/sun/star/beans/Optional.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
diff --git a/offapi/com/sun/star/inspection/XPropertyControl.idl b/offapi/com/sun/star/inspection/XPropertyControl.idl
index 5f414ccdcd28..0f00cd84b0a9 100644
--- a/offapi/com/sun/star/inspection/XPropertyControl.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControl.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_inspection_XPropertyControl_idl__
 #define __com_sun_star_inspection_XPropertyControl_idl__
 
-#ifndef __com_sun_star_beans_IllegalTypeException_idl__
 #include <com/sun/star/beans/IllegalTypeException.idl>
-#endif
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
diff --git a/offapi/com/sun/star/inspection/XPropertyControlContext.idl b/offapi/com/sun/star/inspection/XPropertyControlContext.idl
index e2f4b0224ccb..48d3497592eb 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlContext.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlContext.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_inspection_XPropertyControlContext_idl__
 #define __com_sun_star_inspection_XPropertyControlContext_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyControlObserver_idl__
 #include <com/sun/star/inspection/XPropertyControlObserver.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
diff --git a/offapi/com/sun/star/inspection/XPropertyControlFactory.idl b/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
index c4ff4dd875d1..117886a5eae9 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_inspection_XPropertyControlFactory_idl__
 #define __com_sun_star_inspection_XPropertyControlFactory_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
diff --git a/offapi/com/sun/star/inspection/XPropertyControlObserver.idl b/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
index 90b1337b5d08..8a995e22e248 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_inspection_XPropertyControlObserver_idl__
 #define __com_sun_star_inspection_XPropertyControlObserver_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/inspection/XPropertyHandler.idl b/offapi/com/sun/star/inspection/XPropertyHandler.idl
index d58c6fa10f04..7c89c0576ff2 100644
--- a/offapi/com/sun/star/inspection/XPropertyHandler.idl
+++ b/offapi/com/sun/star/inspection/XPropertyHandler.idl
@@ -27,30 +27,14 @@
 #ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #define __com_sun_star_inspection_XPropertyHandler_idl__
 
-#ifndef __com_sun_star_beans_PropertyState_idl__
 #include <com/sun/star/beans/PropertyState.idl>
-#endif
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
 #include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
-#ifndef __com_sun_star_inspection_LineDescriptor_idl__
 #include <com/sun/star/inspection/LineDescriptor.idl>
-#endif
-#ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_inspection_InteractiveSelectionResult_idl__
 #include <com/sun/star/inspection/InteractiveSelectionResult.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -233,7 +217,7 @@ published interface XPropertyHandler
 
         <p>If a handler implementation supports property change listeners, it must be able to cope
         with a call to <member>addPropertyChangeListener</member> even if currently no component is
-        being inspected. In this case, the listener must become active as soon as a new introspectee
+        being inspected. In this case, the listener must become active as soon as a new introspection
         is set in the next <member>inspect</member> call.</p>
 
         @param Listener
@@ -255,7 +239,7 @@ published interface XPropertyHandler
     /** returns the properties which the handler can handle
 
         <p>A handler is allowed to return an empty sequence here, indicating that for
-        the given introspectee, no properties handling can be provided. This might happen
+        the given introspection, no properties handling can be provided. This might happen
         when a fixed set of property handlers is used for a variety of components to inspect,
         where not all handlers can really cope with all components.</p>
 
@@ -278,8 +262,8 @@ published interface XPropertyHandler
         <p>In such a case, simply return those properties here.</p>
 
         <p>There is a precedence in the property handlers used by an <type>ObjectInspector</type>,
-        which also is important for the superseded properties. This precendence is implied by the
-        precendence of factories to create the property handlers, as denoted in the
+        which also is important for the superseded properties. This precedence is implied by the
+        precedence of factories to create the property handlers, as denoted in the
         <member>XObjectInspectorModel::HandlerFactories</member> attribute.</p>
 
         <p>With this in mind, property handlers can only supersede properties which are supported
@@ -334,7 +318,7 @@ published interface XPropertyHandler
     boolean isComposable( [in] string PropertyName )
         raises (::com::sun::star::beans::UnknownPropertyException);
 
-    /** called when a browse button belonging to a property UI represenation has been clicked
+    /** called when a browse button belonging to a property UI representation has been clicked
 
         <p>Property handlers can raise a dedicated UI for entering or somehow changing a property value.
         Usually, this will be a modal dialog, but it can also be a non-modal user interface component.</p>
@@ -347,7 +331,7 @@ published interface XPropertyHandler
         property value, and return the result of this (see <type>InteractiveSelectionResult</type>).</p>
 
         <p>It is recommended that property handlers do not directly set the property value which has
-        been obatined from the user, but store it in the output-parameter Data, and return
+        been obtained from the user, but store it in the output-parameter Data, and return
         <member>InteractiveSelectionResult::ObtainedValue</member>.</p>
 
         <p>If a handler sets the new property value directly, and returns
@@ -357,7 +341,7 @@ published interface XPropertyHandler
         will be called at one handler only, however the new property would have to be forwarded to
         all handlers.</p>
 
-        <p>If a property is not composeable, directly setting the new property value does not yield any problem,
+        <p>If a property is not composable, directly setting the new property value does not yield any problem,
         as long as property listeners are properly notified of the change.</p>
 
         @param PropertyName
@@ -420,7 +404,7 @@ published interface XPropertyHandler
             <br/>
             In some cases it may be necessary to differentiate between both situations. For instance,
             if you want to set the value of another property when an actuating property's value changed,
-            you should definately not do this when <arg>FirstTimeInit</arg> is <TRUE/>.
+            you should definitely not do this when <arg>FirstTimeInit</arg> is <TRUE/>.
         @throws com::sun::star::lang::NullPointerException
             if <arg>InspectorUI</arg> is <NULL/>
     */
diff --git a/offapi/com/sun/star/inspection/XStringListControl.idl b/offapi/com/sun/star/inspection/XStringListControl.idl
index fc3f1dedd1ae..87908aaf292b 100644
--- a/offapi/com/sun/star/inspection/XStringListControl.idl
+++ b/offapi/com/sun/star/inspection/XStringListControl.idl
@@ -28,16 +28,14 @@
 #ifndef __com_sun_star_inspection_XStringListControl_idl__
 #define __com_sun_star_inspection_XStringListControl_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyControl_idl__
 #include <com/sun/star/inspection/XPropertyControl.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
 //-----------------------------------------------------------------------------
 /** defines the interface for an <type>XPropertyControl</type> which, additionally
-    to the basic behaviour, supports a list of strings interpreted as possible
+    to the basic behavior, supports a list of strings interpreted as possible
     property values.
 
     <p>A control which would canonically implement this interface is a list box control:
diff --git a/offapi/com/sun/star/inspection/XStringRepresentation.idl b/offapi/com/sun/star/inspection/XStringRepresentation.idl
index cb527f12cc96..a2bfd5065926 100644
--- a/offapi/com/sun/star/inspection/XStringRepresentation.idl
+++ b/offapi/com/sun/star/inspection/XStringRepresentation.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_inspection_XStringRepresentation_idl__
 #define __com_sun_star_inspection_XStringRepresentation_idl__
 
-#ifndef __com_sun_star_script_XTypeConverter_idl__
 #include <com/sun/star/script/XTypeConverter.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
@@ -50,7 +48,7 @@ published interface XStringRepresentation
     */
     string  convertToControlValue([in]any PropertyValue) raises( com::sun::star::uno::Exception );
 
-    /** converts a string into an any with the type defined by the target tpye.
+    /** converts a string into an any with the type defined by the target type.
         @param ControlValue
             The to-be-converted control value.
         @param ControlValueType
diff --git a/offapi/com/sun/star/installation/InstallationCheck.idl b/offapi/com/sun/star/installation/InstallationCheck.idl
index 80b3b4ecbe19..d9f473bc6158 100644
--- a/offapi/com/sun/star/installation/InstallationCheck.idl
+++ b/offapi/com/sun/star/installation/InstallationCheck.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_installation_InstallationCheck_idl__
 #define __com_sun_star_installation_InstallationCheck_idl__
 
-#ifndef __com_sun_star_installation_XInstallationCheck_idl__
 #include <com/sun/star/installation/XInstallationCheck.idl>
-#endif
 
 //=============================================================================
 
@@ -43,9 +41,9 @@
     <p> This implementation only checks the fonts "StarBats" and "StarMath".
     </p>
     <p> When running under Win32 the methods check and checkWithDialog will try to
-    fix any missing RegistryKey of fonts which still reside in the font directory.
+    fix any missing Registry Key of fonts which still reside in the font directory.
     </p>
-    <p>If it is possbile to fix, the method returns <TRUE/>.
+    <p>If it is possible to fix, the method returns <TRUE/>.
     </p>
 
     @see XInstallationCheck
diff --git a/offapi/com/sun/star/installation/InstallationCheckService.idl b/offapi/com/sun/star/installation/InstallationCheckService.idl
index 0036c521d33f..6d5155badb3d 100644
--- a/offapi/com/sun/star/installation/InstallationCheckService.idl
+++ b/offapi/com/sun/star/installation/InstallationCheckService.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_installation_InstallationCheckService_idl__
 #define __com_sun_star_installation_InstallationCheckService_idl__
 
-#ifndef __com_sun_star_installation_XInstallationCheck_idl__
 #include <com/sun/star/installation/XInstallationCheck.idl>
-#endif
 
 
 //=============================================================================
@@ -41,7 +39,7 @@ module com { module sun { module star { module installation {
 
     <p>This implementation only checks the fonts "StarBats" and "StarMath".
     When running under Win32 the methods check and checkWithDialog will try to
-    fix any missing RegistryKey of fonts which still reside in the font directory.
+    fix any missing Registry Key of fonts which still reside in the font directory.
     If fixing is possible the methods returns TRUE.</p>
     @version 1.0
     @author Berndt Reinhold
diff --git a/offapi/com/sun/star/installation/InternetSettings.idl b/offapi/com/sun/star/installation/InternetSettings.idl
index 578bfa592f1e..4a6d88307439 100644
--- a/offapi/com/sun/star/installation/InternetSettings.idl
+++ b/offapi/com/sun/star/installation/InternetSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_installation_InternetSettings_idl__
 #define __com_sun_star_installation_InternetSettings_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/installation/ProtDlgRes.idl b/offapi/com/sun/star/installation/ProtDlgRes.idl
index a27b3776b19e..eab9ee8f6990 100644
--- a/offapi/com/sun/star/installation/ProtDlgRes.idl
+++ b/offapi/com/sun/star/installation/ProtDlgRes.idl
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-/** contains the status of a dialog with an 'always display Checkbox'.
+/** contains the status of a dialog with an "always display Checkbox".
 
     @deprecated
  */
diff --git a/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl b/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl
index e18062e667c5..b4fb23b834e7 100644
--- a/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl
+++ b/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_installation_ProtocolHandlerCheck_idl__
 #define __com_sun_star_installation_ProtocolHandlerCheck_idl__
 
-#ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__
 #include <com/sun/star/installation/XProtocolHandlerCheck.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl b/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl
index e2a9bc1b1830..6bc5c32fc6f4 100644
--- a/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl
+++ b/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_installation_ProtocolHandlerCheckService_idl__
 #define __com_sun_star_installation_ProtocolHandlerCheckService_idl__
 
-#ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__
 #include <com/sun/star/installation/XProtocolHandlerCheck.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/installation/XInstallationCheck.idl b/offapi/com/sun/star/installation/XInstallationCheck.idl
index 41fc7b1b90ad..7baee94aa4ab 100644
--- a/offapi/com/sun/star/installation/XInstallationCheck.idl
+++ b/offapi/com/sun/star/installation/XInstallationCheck.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_installation_XInstallationCheck_idl__
 #define __com_sun_star_installation_XInstallationCheck_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl b/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
index 6961660b0e69..1a8ee29e0cf9 100644
--- a/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
+++ b/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__
 #define __com_sun_star_installation_XProtocolHandlerCheck_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_installation_ProtDlgRes_idl__
 #include <com/sun/star/installation/ProtDlgRes.idl>
-#endif
 
 
 //=============================================================================
@@ -76,7 +72,7 @@ published interface XProtocolHandlerCheck: com::sun::star::uno::XInterface
         The dialog has "Yes" and "No" buttons, and a checkbox
         with "Always display this message". The checkbox
         is initially checked. If the "Yes" button was pressed,
-        it performs all neccessary action to make StarOffice the
+        it performs all necessary action to make StarOffice the
         protocol-handler. If the "No" button was pressed,
         don't perform any action. Both buttons closes the dialog.@see isProtocolHandler
      */
diff --git a/offapi/com/sun/star/installation/protocols.idl b/offapi/com/sun/star/installation/protocols.idl
index d6be9fae6e86..32c4cf1ddcff 100644
--- a/offapi/com/sun/star/installation/protocols.idl
+++ b/offapi/com/sun/star/installation/protocols.idl
@@ -35,7 +35,7 @@
 //=============================================================================
 
 /** A protocol-handler is a part of StarOffice which performs
-        the comunication on a paticular protocol. This can be HTTP, FTP, HTTPS,
+        the communication on a particular protocol. This can be HTTP, FTP, HTTPS,
         MAILTO, or NEWS. An implementation of this interface should be able
         to check/set all of these protocols.
 
diff --git a/offapi/com/sun/star/ldap/LdapConnectionException.idl b/offapi/com/sun/star/ldap/LdapConnectionException.idl
index df0d963807e9..94af54ed80cb 100644
--- a/offapi/com/sun/star/ldap/LdapConnectionException.idl
+++ b/offapi/com/sun/star/ldap/LdapConnectionException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ldap_LdapConnectionException_idl__
 #define __com_sun_star_ldap_LdapConnectionException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module ldap {
 
diff --git a/offapi/com/sun/star/ldap/LdapGenericException.idl b/offapi/com/sun/star/ldap/LdapGenericException.idl
index bcdaab0cf00f..624d8c692e48 100644
--- a/offapi/com/sun/star/ldap/LdapGenericException.idl
+++ b/offapi/com/sun/star/ldap/LdapGenericException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ldap_LdapGenericException_idl__
 #define __com_sun_star_ldap_LdapGenericException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module ldap {
 
diff --git a/offapi/com/sun/star/linguistic2/ConversionDictionary.idl b/offapi/com/sun/star/linguistic2/ConversionDictionary.idl
index b501478f8ebd..7391fc038495 100644
--- a/offapi/com/sun/star/linguistic2/ConversionDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/ConversionDictionary.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_linguistic2_ConversionDictionary_idl__
 #define __com_sun_star_linguistic2_ConversionDictionary_idl__
 
-#ifndef __com_sun_star_linguistic2_XConversionDictionary_idl__
 #include <com/sun/star/linguistic2/XConversionDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XConversionPropertyType_idl__
 #include <com/sun/star/linguistic2/XConversionPropertyType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl b/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl
index 825634af1849..9338ae8a646c 100644
--- a/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_ConversionDictionaryList_idl__
 #define __com_sun_star_linguistic2_ConversionDictionaryList_idl__
 
-#ifndef __com_sun_star_linguistic2_XConversionDictionaryList_idl__
 #include <com/sun/star/linguistic2/XConversionDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/ConversionDictionaryType.idl b/offapi/com/sun/star/linguistic2/ConversionDictionaryType.idl
index cd06ee9bc5ee..e5a9c4d0233e 100644
--- a/offapi/com/sun/star/linguistic2/ConversionDictionaryType.idl
+++ b/offapi/com/sun/star/linguistic2/ConversionDictionaryType.idl
@@ -42,7 +42,7 @@ constants ConversionDictionaryType
     */
     const short HANGUL_HANJA        = 1;
 
-    /** Dictionary type for the conversion between Simplified and Traditionary Chinese
+    /** Dictionary type for the conversion between Simplified and Traditional Chinese
 
         @since OOo 2.0
     */
diff --git a/offapi/com/sun/star/linguistic2/Dictionary.idl b/offapi/com/sun/star/linguistic2/Dictionary.idl
index 397b882bc78d..4f4ca6b58b97 100644
--- a/offapi/com/sun/star/linguistic2/Dictionary.idl
+++ b/offapi/com/sun/star/linguistic2/Dictionary.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_linguistic2_Dictionary_idl__
 #define __com_sun_star_linguistic2_Dictionary_idl__
 
-#ifndef __com_sun_star_linguistic2_XDictionary_idl__
 #include <com/sun/star/linguistic2/XDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSearchableDictionary_idl__
 #include <com/sun/star/linguistic2/XSearchableDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XStorable_idl__
 #include <com/sun/star/frame/XStorable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/DictionaryEvent.idl b/offapi/com/sun/star/linguistic2/DictionaryEvent.idl
index e76395292204..25bc084c7d79 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryEvent.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_DictionaryEvent_idl__
 #define __com_sun_star_linguistic2_DictionaryEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
 #include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/DictionaryList.idl b/offapi/com/sun/star/linguistic2/DictionaryList.idl
index f7f61e95b884..4fdb478a59ed 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryList.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_linguistic2_DictionaryList_idl__
 #define __com_sun_star_linguistic2_DictionaryList_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
 //=============================================================================
 
@@ -44,7 +40,7 @@ module com { module sun { module star { module linguistic2 {
 /** is the list of personal dictionaries.
 
      <P>The active dictionaries of this list will be used for
-     spellchecking and hyphenation.</P>
+     spell checking and hyphenation.</P>
 
     @see <type scope="com::sun::star::linguistic2">XDictionary</type>
     @see <type scope="com::sun::star::linguistic2">XDictionaryList</type>
diff --git a/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl b/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
index 8718219247dd..2c9df5cc81ff 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_DictionaryListEvent_idl__
 #define __com_sun_star_linguistic2_DictionaryListEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryEvent_idl__
 #include <com/sun/star/linguistic2/DictionaryEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/Hyphenator.idl b/offapi/com/sun/star/linguistic2/Hyphenator.idl
index 630a0c64baa1..5d50ec171d45 100644
--- a/offapi/com/sun/star/linguistic2/Hyphenator.idl
+++ b/offapi/com/sun/star/linguistic2/Hyphenator.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_linguistic2_Hyphenator_idl__
 #define __com_sun_star_linguistic2_Hyphenator_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceDisplayName_idl__
 #include <com/sun/star/lang/XServiceDisplayName.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/LinguProperties.idl b/offapi/com/sun/star/linguistic2/LinguProperties.idl
index d3b419e06b48..5237bf92dc49 100644
--- a/offapi/com/sun/star/linguistic2/LinguProperties.idl
+++ b/offapi/com/sun/star/linguistic2/LinguProperties.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_linguistic2_LinguProperties_idl__
 #define __com_sun_star_linguistic2_LinguProperties_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
 #include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
@@ -60,7 +50,7 @@ published service LinguProperties
 
     //-------------------------------------------------------------------------
     /** defines whether new German spelling rules should be used for German
-         text or not when doing spellchecking or hyphenation, or using the
+         text or not when doing spell checking or hyphenation, or using the
          thesaurus.
 
         @deprecated since OOo 3.0.1
@@ -68,31 +58,31 @@ published service LinguProperties
     [property, maybevoid] boolean IsGermanPreReform;
 
     //-------------------------------------------------------------------------
-    /** defines if the dictionary-list should be used for spellchecking
+    /** defines if the dictionary-list should be used for spell checking
          and hyphenation or not.
     */
     [property] boolean IsUseDictionaryList;
 
     //-------------------------------------------------------------------------
     /** defines if control characters should be ignored or not, by the linguistic
-         (i.e., spellchecker, hyphenator and thesaurus).
+         (i.e., spell checker, hyphenator and thesaurus).
     */
     [property] boolean IsIgnoreControlCharacters;
 
     //-------------------------------------------------------------------------
     /** defines if words with only uppercase letters should be
-         subject to spellchecking or not.
+         subject to spell checking or not.
     */
     [property] boolean IsSpellUpperCase;
 
     //-------------------------------------------------------------------------
     /** defines if words containing digits (or numbers) should be
-         subject to spellchecking or not.
+         subject to spell checking or not.
     */
     [property] boolean IsSpellWithDigits;
 
     //-------------------------------------------------------------------------
-    /** defines if the captitalization of words should be checked or not.
+    /** defines if the capitalization of words should be checked or not.
     */
     [property] boolean IsSpellCapitalization;
 
@@ -132,7 +122,7 @@ published service LinguProperties
     [property] boolean IsHyphSpecial;
 
     //-------------------------------------------------------------------------
-    /** indicates whether spellchecking should be done automatically or not.
+    /** indicates whether spell checking should be done automatically or not.
     */
     [property] boolean IsSpellAuto;
 
@@ -145,7 +135,7 @@ published service LinguProperties
     [property, maybevoid] boolean IsSpellHide;
 
     //-------------------------------------------------------------------------
-    /** indicates if spellchecking should be performed in all available
+    /** indicates if spell checking should be performed in all available
          languages.
 
         @deprecated since OOo 3.0.1
@@ -153,13 +143,13 @@ published service LinguProperties
     [property, maybevoid] boolean IsSpellInAllLanguages;
 
     //-------------------------------------------------------------------------
-    /** defines whether spellchecking should be done in special regions of
+    /** defines whether spell checking should be done in special regions of
          documents or not.
     */
     [property] boolean IsSpellSpecial;
 
     //-------------------------------------------------------------------------
-    /** defines whether spellchecking should be done in reverse
+    /** defines whether spell checking should be done in reverse
          direction or not.
     */
     [property] boolean IsWrapReverse;
diff --git a/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl b/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl
index a3a79079301a..3a421b376389 100644
--- a/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl
+++ b/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_linguistic2_LinguServiceEvent_idl__
 #define __com_sun_star_linguistic2_LinguServiceEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
@@ -38,7 +36,7 @@ module com { module sun { module star { module linguistic2 {
 //=============================================================================
 /** represents a linguistic service event.
 
-    <P>This type of event may be broadcast by a spellchecker or
+    <P>This type of event may be broadcast by a spell checker or
     hyphenator service implementation to inform its listeners (clients)
     that the results of previous function calls may be different now.
     It is possible to suggest that hyphenation should be done again
diff --git a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
index eac83abc40d6..9d55117c93af 100644
--- a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
+++ b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_linguistic2_LinguServiceManager_idl__
 #define __com_sun_star_linguistic2_LinguServiceManager_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/ProofreadingResult.idl b/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
index 2a0fde6a0d12..867d120b425a 100644
--- a/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
+++ b/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
@@ -27,23 +27,10 @@
 #ifndef __com_sun_star_linguistic2_ProofreadingResult_idl__
 #define __com_sun_star_linguistic2_ProofreadingResult_idl__
 
-#ifndef __com_sun_star_text_XFlatParagraph_idl__
 #include <com/sun/star/text/XFlatParagraph.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_SingleProofreadingError_idl__
 #include <com/sun/star/linguistic2/SingleProofreadingError.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_idl_
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl b/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
index 95d4ce58991c..385b13dd7cbc 100644
--- a/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
+++ b/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_SingleProofreadingError_idl__
 #define __com_sun_star_linguistic2_SingleProofreadingError_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_idl_
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
@@ -67,7 +62,7 @@ struct SingleProofreadingError
     string aFullComment;
 
     // a list of correction suggestions
-    // Usually emtpy if only automatic checking was done.
+    // Usually empty if only automatic checking was done.
     sequence< string > aSuggestions;
 
     // a list of properties
diff --git a/offapi/com/sun/star/linguistic2/SpellChecker.idl b/offapi/com/sun/star/linguistic2/SpellChecker.idl
index 2ab83c0049c8..d6c7ffdf42a4 100644
--- a/offapi/com/sun/star/linguistic2/SpellChecker.idl
+++ b/offapi/com/sun/star/linguistic2/SpellChecker.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_linguistic2_SpellChecker_idl__
 #define __com_sun_star_linguistic2_SpellChecker_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceDisplayName_idl__
 #include <com/sun/star/lang/XServiceDisplayName.idl>
-#endif
 
 //=============================================================================
 
@@ -48,7 +40,7 @@ module com { module sun { module star { module linguistic2 {
  published interface XLinguServiceEventBroadcaster;
 
 //=============================================================================
-/** offers spellchecking functionality.
+/** offers spell checking functionality.
 */
 published service SpellChecker
 {
diff --git a/offapi/com/sun/star/linguistic2/SpellFailure.idl b/offapi/com/sun/star/linguistic2/SpellFailure.idl
index 0fcb12842823..7c6bed3cba27 100644
--- a/offapi/com/sun/star/linguistic2/SpellFailure.idl
+++ b/offapi/com/sun/star/linguistic2/SpellFailure.idl
@@ -33,11 +33,11 @@
 module com { module sun { module star { module linguistic2 {
 
 //=============================================================================
-/** these define the various return types for spellchecking to fail verification.
+/** these define the various return types for spell checking to fail verification.
 
     <P>A value of this type is part of the
     <type scope="com::sun::star::linguistic2">XSpellAlternatives</type>
-    interface which is the return type for an unsuccessfull
+    interface which is the return type for an unsuccessful
     spelling attempt.</P>
 
     @see    <type scope="com::sun::star::linguistic2">XSpellChecker</type>
diff --git a/offapi/com/sun/star/linguistic2/Thesaurus.idl b/offapi/com/sun/star/linguistic2/Thesaurus.idl
index e181ea0f70a9..19b0f664602c 100644
--- a/offapi/com/sun/star/linguistic2/Thesaurus.idl
+++ b/offapi/com/sun/star/linguistic2/Thesaurus.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_linguistic2_Thesaurus_idl__
 #define __com_sun_star_linguistic2_Thesaurus_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_XServiceDisplayName_idl__
 #include <com/sun/star/lang/XServiceDisplayName.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XAvailableLocales.idl b/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
index 97d75f7c0937..c1368243c23a 100644
--- a/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
+++ b/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
@@ -28,9 +28,7 @@
 #define __com_sun_star_linguistic2_XAvailableLocales_idl__
 
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XConversionDictionary.idl b/offapi/com/sun/star/linguistic2/XConversionDictionary.idl
index ddcf471bcd39..cdd15c5ffb57 100644
--- a/offapi/com/sun/star/linguistic2/XConversionDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XConversionDictionary.idl
@@ -28,33 +28,13 @@
 #define __com_sun_star_linguistic2_XConversionDictionary_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_ConversionDictionaryType_idl__
 #include <com/sun/star/linguistic2/ConversionDictionaryType.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_ConversionDirection_idl__
 #include <com/sun/star/linguistic2/ConversionDirection.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl b/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl
index 5df62f5dbb6d..d464053e9d37 100644
--- a/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl
@@ -28,29 +28,12 @@
 #define __com_sun_star_linguistic2_XConversionDictionaryList_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XConversionDictionary_idl__
 #include <com/sun/star/linguistic2/XConversionDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
 
 //=============================================================================
@@ -147,7 +130,7 @@ published interface XConversionDictionaryList : com::sun::star::uno::XInterface
 
 
         @param aLocale
-            Locale the conversion is refered to.
+            Locale the conversion is referred to.
 
         @param nConversionDictionaryType
             specifies the type of conversion the dictionary
@@ -193,7 +176,7 @@ published interface XConversionDictionaryList : com::sun::star::uno::XInterface
         right text from entries should be considered.</p>
 
         @param aLocale
-            Locale the conversion is refered to.
+            Locale the conversion is referred to.
         @param nConversionDictionaryType
             specifies the type of conversion dictionaries to be looked up.
             It is one of
diff --git a/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl b/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl
index 7dcccf3d05f8..e813ddf42ca4 100644
--- a/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl
+++ b/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl
@@ -28,18 +28,11 @@
 #define __com_sun_star_linguistic2_XConversionPropertyType_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XDictionary.idl b/offapi/com/sun/star/linguistic2/XDictionary.idl
index 305b508c1fa4..d0c504ee62da 100644
--- a/offapi/com/sun/star/linguistic2/XDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionary.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_linguistic2_XDictionary_idl__
 #define __com_sun_star_linguistic2_XDictionary_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryType_idl__
 #include <com/sun/star/linguistic2/DictionaryType.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
 #include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEventListener_idl__
 #include <com/sun/star/linguistic2/XDictionaryEventListener.idl>
-#endif
 
 //=============================================================================
 
@@ -55,16 +41,16 @@ module com { module sun { module star { module linguistic2 {
 /** This interfaces enables the object to access personal dictionaries.
 
     <P>Personal dictionaries are used to supply additional
-    information for spellchecking and hyphenation (see
+    information for spell checking and hyphenation (see
     <type scope="com::sun::star::linguistic2">XDictionaryEntry</type>).
     Only active dictionaries with an appropriate language are used
     for that purpose.
     The entries of an active, positive dictionary are words that are
-    required to be recognized as correct during the spellchecking
+    required to be recognized as correct during the spell checking
     process. Additionally, they will be used for hyphenation.
     Entries of a negative dictionary are required to be recognized
     as negative words, for example, words that should not be used, during
-    spellcheck. An entry in a negative dictionary may supply a
+    SPELLCHECK. An entry in a negative dictionary may supply a
     proposal for a word to be used instead of the one being used.</P>
 
     @see    <type scope="com::sun::star::linguistic2">XDictionaryEvent</type>
@@ -144,7 +130,7 @@ published interface XDictionary : com::sun::star::container::XNamed
         <P>If an entry already exists, the dictionary remains unchanged
          and <FALSE/> will be returned.</P>
 
-        <P>In positive dictionaries only postive entries
+        <P>In positive dictionaries only positive entries
         can be made, and in negative ones only negative entries.</P>
 
         @param  xDicEntry
@@ -165,7 +151,7 @@ published interface XDictionary : com::sun::star::container::XNamed
         <P>If an entry already exists, the dictionary remains unchanged
          and <FALSE/> will be returned.</P>
 
-        <P>In positive dictionaries only postive entries
+        <P>In positive dictionaries only positive entries
         can be made, and in negative ones only negative entries.</P>
 
         @param  aWord
diff --git a/offapi/com/sun/star/linguistic2/XDictionary1.idl b/offapi/com/sun/star/linguistic2/XDictionary1.idl
index acf2b38fbc93..73fc5f89695c 100644
--- a/offapi/com/sun/star/linguistic2/XDictionary1.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionary1.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_linguistic2_XDictionary1_idl__
 #define __com_sun_star_linguistic2_XDictionary1_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryType_idl__
 #include <com/sun/star/linguistic2/DictionaryType.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
 #include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEventListener_idl__
 #include <com/sun/star/linguistic2/XDictionaryEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl b/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl
index c9f2f89e588a..ae7ef99b1fb0 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
 #define __com_sun_star_linguistic2_XDictionaryEntry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
@@ -42,19 +37,19 @@ module com { module sun { module star { module linguistic2 {
 //=============================================================================
 /** This interfaces gives access to a dictionary entry.
 
-    <P>A dictionary entry can supply a word and its hyhenation
+    <P>A dictionary entry can supply a word and its hyphenation
     and indicate if it is a negative word.
     If it is a negative entry it may supply a replacement text to
     be used instead of the entry word.</P>
 
-     <P>Hyphenation positions are represented by an '=' in the word.
-     If the '=' is the last character of the word this means it should not
-     be hyphenated. If there is no '=' charcter in the word, hyphenation
+     <P>Hyphenation positions are represented by an "=" in the word.
+     If the "=" is the last character of the word this means it should not
+     be hyphenated. If there is no "=" charter in the word, hyphenation
      positions will be determined automatically (i.e., from the hyphenator
     service alone).</P>
 
      <P>Entries whose words only differ in hyphenation are considered
-     to be equal. Also a '.' at the end of the word will make no
+     to be equal. Also a "." at the end of the word will make no
      difference.</P>
 
     @see    <type scope="com::sun::star::linguistic2">XDictionary</type>
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl b/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl
index 7436ab9283cc..3ec4c8fbf6ed 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XDictionaryEventListener_idl__
 #define __com_sun_star_linguistic2_XDictionaryEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryEvent_idl__
 #include <com/sun/star/linguistic2/DictionaryEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryList.idl b/offapi/com/sun/star/linguistic2/XDictionaryList.idl
index c45c18b8bb43..49520f367160 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryList.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
 #define __com_sun_star_linguistic2_XDictionaryList_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionary_idl__
 #include <com/sun/star/linguistic2/XDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryListEventListener_idl__
 #include <com/sun/star/linguistic2/XDictionaryListEventListener.idl>
-#endif
 
 //=============================================================================
 
@@ -46,7 +38,7 @@ module com { module sun { module star { module linguistic2 {
 //=============================================================================
 /** is used to manage and maintain a list of dictionaries.
 
-    <P>A dictionary-list may be given to a spellchecker or hyphenator
+    <P>A dictionary-list may be given to a spell checker or hyphenator
     service implementation on their creation in order to supply a set
     of dictionaries and additional information to be used for
     those purposes.</P>
@@ -191,7 +183,7 @@ published interface XDictionaryList : com::sun::star::uno::XInterface
 
          <P>There should be one matching endCollectEvents call for every
          beginCollectEvents call. Usually you will group these around
-         some code where you do not wish to get notfied of every single
+         some code where you do not wish to get notified of every single
          event.</P>
 
         @returns
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl b/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl
index c1c251de04ae..047265536803 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XDictionaryListEventListener_idl__
 #define __com_sun_star_linguistic2_XDictionaryListEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_DictionaryListEvent_idl__
 #include <com/sun/star/linguistic2/DictionaryListEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl b/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl
index 94aa9166c2e9..510672a23d60 100644
--- a/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl
+++ b/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XHyphenatedWord_idl__
 #define __com_sun_star_linguistic2_XHyphenatedWord_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XHyphenator.idl b/offapi/com/sun/star/linguistic2/XHyphenator.idl
index dce5a4674865..5b4ccc81a0a4 100644
--- a/offapi/com/sun/star/linguistic2/XHyphenator.idl
+++ b/offapi/com/sun/star/linguistic2/XHyphenator.idl
@@ -28,34 +28,13 @@
 #define __com_sun_star_linguistic2_XHyphenator_idl__
 
 
-#ifndef __com_sun_star_lang_Localeidl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
 #include <com/sun/star/linguistic2/XSupportedLocales.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
 #include <com/sun/star/linguistic2/XDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XHyphenatedWord_idl__
 #include <com/sun/star/linguistic2/XHyphenatedWord.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XPossibleHyphens_idl__
 #include <com/sun/star/linguistic2/XPossibleHyphens.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_idl_
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
 
 //=============================================================================
 
@@ -87,7 +66,7 @@ published interface XHyphenator : com::sun::star::linguistic2::XSupportedLocales
     /** tries to find a valid hyphenation position relative
         to the beginning of a word.
 
-        <P>Note: Some languages, for example arabic, are written from right
+        <P>Note: Some languages, for example Arabic, are written from right
         to left.</P>
 
         @returns
diff --git a/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl b/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
index 5535c6e98569..f20a211d5bdb 100644
--- a/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
+++ b/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_linguistic2_XLanguageGuessing_idl__
 #define __com_sun_star_linguistic2_XLanguageGuessing_idl__
 
-#ifndef _COM_SUN_STAR_UNO_XINTERFACE_idl_
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef _COM_SUN_STAR_LANG_LOCALE_idl_
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_IDL_
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 module com { module sun { module star { module linguistic2 {
 
@@ -98,7 +92,7 @@ module com { module sun { module star { module linguistic2 {
         <li>sa : Sanskrit</li>
         <li>sco : Scots</li>
         <li>sh : Serbian (written with latin characters)</li>
-        <li>sk-SK : Slovak (written with latin characters)</li>
+        <li>sk-SK : Slovak (written with Latin characters)</li>
         <li>sl : Slovenian</li>
         <li>sq : Albanian</li>
         <li>sr : Serbian (written with cyrillic characters) (added with OOo 3.4)</li>
@@ -130,10 +124,10 @@ interface XLanguageGuessing
         A word is much less likely guessed correctly compared to
         a sentence or even a whole paragraph.</p>
 
-        <p>Also note that some languages are that 'close' to each other
+        <p>Also note that some languages are that "close" to each other
         that it will be quite unlikely to find a difference in them,
         e.g. English (UK), English (IE) and English (AUS) and
-        most liklely English (US) as well. And thus the result may
+        most likely English (US) as well. And thus the result may
         be arbitrary.</p>
 
         @returns
diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl b/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl
index ec61bdca6679..1947f1706c56 100644
--- a/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl
+++ b/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl
@@ -28,13 +28,8 @@
 #define __com_sun_star_linguistic2_XLinguServiceEventBroadcaster_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XLinguServiceEventListener_idl__
 #include <com/sun/star/linguistic2/XLinguServiceEventListener.idl>
-#endif
 
 //=============================================================================
 
@@ -43,14 +38,14 @@ module com { module sun { module star { module linguistic2 {
 //=============================================================================
 /** is used to register a listener for LinguServiceEvents.
 
-    <P>This interface may be used by spellchecker or hyphenator
+    <P>This interface may be used by spell checker or hyphenator
     implementations to allow clients to be registered and informed about
     <type scope="com::sun::star::linguistic2">LinguServiceEvent</type>s.
     </P>
 
     <P>Note: The LinguServiceManager forwards the
     <type scope="com::sun::star::linguistic2">LinguServiceEvent</type>s
-    it receives (from spellcheckers or hyphenators) to its own listeners.
+    it receives (from spell checkers or hyphenators) to its own listeners.
     Thus, there should be no need to register
     as a listener for a specific implementation./P>
 
@@ -66,7 +61,7 @@ published interface XLinguServiceEventBroadcaster : com::sun::star::uno::XInterf
             <FALSE/> otherwise.
 
         @param xLstnr
-            the listener to be addded.
+            the listener to be added.
      */
     boolean addLinguServiceEventListener (
         [in] com::sun::star::linguistic2::XLinguServiceEventListener    xLstnr );
diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl b/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl
index f838529078e4..84382cb5feb4 100644
--- a/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl
+++ b/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl
@@ -28,13 +28,8 @@
 #define __com_sun_star_linguistic2_XLinguServiceEventListener_idl__
 
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_LinguServiceEvent_idl__
 #include <com/sun/star/linguistic2/LinguServiceEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl b/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
index 15b8acc6322a..f68ee6080c77 100644
--- a/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
+++ b/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
@@ -28,21 +28,10 @@
 #define __com_sun_star_linguistic2_XLinguServiceManager_idl__
 
 
-#ifndef __com_sun_star_linguistic2_XSpellChecker_idl__
 #include <com/sun/star/linguistic2/XSpellChecker.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XHyphenator_idl__
 #include <com/sun/star/linguistic2/XHyphenator.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XThesaurus_idl__
 #include <com/sun/star/linguistic2/XThesaurus.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
@@ -51,7 +40,7 @@ module com { module sun { module star { module linguistic2 {
 //=============================================================================
 /** the basic interface to be used to access linguistic functionality.
 
-    <P>This interface is used to access spellchecker, hyphenator, and
+    <P>This interface is used to access spell checker, hyphenator, and
     thesaurus functionality.
     Additionally, it can query what implementations of those services are
     available (for specific languages or in general).
@@ -59,9 +48,9 @@ module com { module sun { module star { module linguistic2 {
     be used for a specific language.</P>
 
     <P>
-    For spellchecking and thesaurus, the order in the list defines the order
+    For spell checking and thesaurus, the order in the list defines the order
     of creation/usage of those services.
-    That is, if the first spellchecker implementation does not recognize
+    That is, if the first spell checker implementation does not recognize
     the given word as correct, the second service implementation for that
     language is created and gets queried. If that one fails, the third one
     gets created and queried and so on.
@@ -82,7 +71,7 @@ published interface XLinguServiceManager : com::sun::star::uno::XInterface
     /**
         @returns
             the <type scope="com::sun::star::linguistic2">XSpellChecker</type>
-            interface to be used for spellchecking.
+            interface to be used for spell checking.
     */
     com::sun::star::linguistic2::XSpellChecker  getSpellChecker();
 
@@ -113,7 +102,7 @@ published interface XLinguServiceManager : com::sun::star::uno::XInterface
         </P>
 
         @returns
-            <TRUE/> if the listener was succesfully added, <FALSE/> otherwise.
+            <TRUE/> if the listener was successfully added, <FALSE/> otherwise.
 
         @param xListener
             the listener to be added.
@@ -125,7 +114,7 @@ published interface XLinguServiceManager : com::sun::star::uno::XInterface
     /** removes a listener from the list of event listeners.
 
         @returns
-            <TRUE/> if the listener was succesfully removed, <FALSE/> otherwise.
+            <TRUE/> if the listener was successfully removed, <FALSE/> otherwise.
 
         @param xListener
             the listener to be removed.
diff --git a/offapi/com/sun/star/linguistic2/XMeaning.idl b/offapi/com/sun/star/linguistic2/XMeaning.idl
index f7a0eb007817..668c936046a3 100644
--- a/offapi/com/sun/star/linguistic2/XMeaning.idl
+++ b/offapi/com/sun/star/linguistic2/XMeaning.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_linguistic2_XMeaning_idl__
 #define __com_sun_star_linguistic2_XMeaning_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl b/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl
index 14f45212f223..ee8be10d2055 100644
--- a/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl
+++ b/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XPossibleHyphens_idl__
 #define __com_sun_star_linguistic2_XPossibleHyphens_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
@@ -76,7 +71,7 @@ published interface XPossibleHyphens : com::sun::star::uno::XInterface
     /**
          @returns
              a string depicting the word with all hyphen positions
-             which are represented by '=' characters.
+             which are represented by "=" characters.
              If there are any alternative spellings, the word will be altered
              accordingly.
     */
diff --git a/offapi/com/sun/star/linguistic2/XProofreader.idl b/offapi/com/sun/star/linguistic2/XProofreader.idl
index 89a6bc8d7a3e..952debd53f6c 100644
--- a/offapi/com/sun/star/linguistic2/XProofreader.idl
+++ b/offapi/com/sun/star/linguistic2/XProofreader.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_linguistic2_XProofreader_idl__
 #define __com_sun_star_linguistic2_XProofreader_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
 #include <com/sun/star/linguistic2/XSupportedLocales.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraph_idl__
 #include <com/sun/star/text/XFlatParagraph.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_ProofreadingResult_idl__
 #include <com/sun/star/linguistic2/ProofreadingResult.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_idl_
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
@@ -68,7 +48,7 @@ interface XProofreader: com::sun::star::linguistic2::XSupportedLocales
 {
 
     //-------------------------------------------------------------------------
-    /** whether is the text checked by the spellchecker
+    /** whether is the text checked by the spell checker
 
         @returns true if it is also a spell checker
     */
diff --git a/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl b/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
index c7be591e86ad..910c5ca7290f 100644
--- a/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
+++ b/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_linguistic2_XProofreadingIterator_idl__
 #define __com_sun_star_linguistic2_XProofreadingIterator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraphIteratorProvider_idl__
 #include <com/sun/star/text/XFlatParagraphIteratorProvider.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraph_idl__
 #include <com/sun/star/text/XFlatParagraph.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_ProofreadingResult_idl__
 #include <com/sun/star/linguistic2/ProofreadingResult.idl>
-#endif
 
 //=============================================================================
 
@@ -104,7 +87,7 @@ interface XProofreadingIterator: com::sun::star::uno::XInterface
             raises( com::sun::star::lang::IllegalArgumentException );
 
     //-------------------------------------------------------------------------
-    /** clears the list of ignored rules for each prrofreader
+    /** clears the list of ignored rules for each proofreader
     */
     void resetIgnoreRules();
 
diff --git a/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl b/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
index 69c8f00b3089..f048d23af074 100644
--- a/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XSearchableDictionary_idl__
 #define __com_sun_star_linguistic2_XSearchableDictionary_idl__
 
-#ifndef __com_sun_star_linguistic2_XDictionary_idl__
 #include <com/sun/star/linguistic2/XDictionary.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
 #include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl b/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl
index 4e61072d7286..d9a72e0bec30 100644
--- a/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl
@@ -28,17 +28,9 @@
 #define __com_sun_star_linguistic2_XSearchableDictionaryList_idl__
 
 
-#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
 #include <com/sun/star/linguistic2/XDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryEntry_idl__
 #include <com/sun/star/linguistic2/XDictionaryEntry.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
@@ -51,7 +43,7 @@ module com { module sun { module star { module linguistic2 {
     <P> Only active dictionaries of a suitable language will be searched
     for the entry.
     The language is suitable if it is the same as the dictionary's language or
-    the dictionary may hold entries of all langauges.
+    the dictionary may hold entries of all languages.
     <P>
 
     @see <type scope="com::sun::star::linguistic2">XDictionaryList</type>
@@ -75,7 +67,7 @@ published interface XSearchableDictionaryList : com::sun::star::linguistic2::XDi
             <FALSE/> if only negative dictionaries should be searched.
 
         @param bSpellEntry
-            <TRUE/> if entries for purposes of spellchecking are required.
+            <TRUE/> if entries for purposes of spell checking are required.
             <FALSE/> if only entries for hyphenation purposes are required.
 */
     com::sun::star::linguistic2::XDictionaryEntry   queryDictionaryEntry(
diff --git a/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl b/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
index 3d91e61a0d85..9f72356a1f73 100644
--- a/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
+++ b/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_linguistic2_XSetSpellAlternatives_idl__
 #define __com_sun_star_linguistic2_XSetSpellAlternatives_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -60,7 +58,7 @@ interface XSetSpellAlternatives : com::sun::star::uno::XInterface
     /**
         set the type of error found.
 
-        @see    <tyoe scope="com::sun::star::linguistic2">SpellFailure</type>
+        @see    <type scope="com::sun::star::linguistic2">SpellFailure</type>
         @since  OOo 3.0.1
     */
     void setFailureType( [in] short nFailureType );
diff --git a/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl b/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl
index de14f5bdc420..1ed28661e6d4 100644
--- a/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl
+++ b/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XSpellAlternatives_idl__
 #define __com_sun_star_linguistic2_XSpellAlternatives_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
@@ -41,16 +36,16 @@ module com { module sun { module star { module linguistic2 {
 
 //=============================================================================
 /** Gives access to the results of failed
-    spellchecking attempts and may provide spelling alternatives.
+    spell checking attempts and may provide spelling alternatives.
 
     <P>This is used by the
     <member scope="com::sun::star::linguistic2">XSpellChecker::spell</member>
     function when the word was not found to be correct.
     Suggestions for other words to be used may be provided along with
-    a failure-type that may specifiy why the word was not correct.
+    a failure-type that may specify why the word was not correct.
     </P>
 
-    @see    <tyoe scope="com::sun::star::linguistic2">SpellFailure</type>
+    @see    <type scope="com::sun::star::linguistic2">SpellFailure</type>
 */
 published interface XSpellAlternatives : com::sun::star::uno::XInterface
 {
@@ -71,9 +66,9 @@ published interface XSpellAlternatives : com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /**
         @returns
-            the type (reason) for spellchecking to have failed verification.
+            the type (reason) for spell checking to have failed verification.
 
-    @see    <tyoe scope="com::sun::star::linguistic2">SpellFailure</type>
+    @see    <type scope="com::sun::star::linguistic2">SpellFailure</type>
     */
     short getFailureType();
 
diff --git a/offapi/com/sun/star/linguistic2/XSpellChecker.idl b/offapi/com/sun/star/linguistic2/XSpellChecker.idl
index a8c432f6b6e9..3c70f02795d7 100644
--- a/offapi/com/sun/star/linguistic2/XSpellChecker.idl
+++ b/offapi/com/sun/star/linguistic2/XSpellChecker.idl
@@ -27,33 +27,18 @@
 #ifndef __com_sun_star_linguistic2_XSpellChecker_idl__
 #define __com_sun_star_linguistic2_XSpellChecker_idl__
 
-#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
 #include <com/sun/star/linguistic2/XSupportedLocales.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
 #include <com/sun/star/linguistic2/XDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSpellAlternatives_idl__
 #include <com/sun/star/linguistic2/XSpellAlternatives.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_idl_
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
 
 //=============================================================================
 
 module com { module sun { module star { module linguistic2 {
 
 //=============================================================================
-/** This interface allows for spellchecking.
+/** This interface allows for spell checking.
 
     <P>It is possible to simply check if a word, in a specified language,
     is correct or additionally, if it was misspelled, some proposals
diff --git a/offapi/com/sun/star/linguistic2/XSpellChecker1.idl b/offapi/com/sun/star/linguistic2/XSpellChecker1.idl
index 39f649b383c4..189dd6b0ab47 100644
--- a/offapi/com/sun/star/linguistic2/XSpellChecker1.idl
+++ b/offapi/com/sun/star/linguistic2/XSpellChecker1.idl
@@ -27,26 +27,11 @@
 #ifndef __com_sun_star_linguistic2_XSpellChecker1_idl__
 #define __com_sun_star_linguistic2_XSpellChecker1_idl__
 
-#ifndef __com_sun_star_linguistic2_XSupportedLanguages_idl__
 #include <com/sun/star/linguistic2/XSupportedLanguages.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XDictionaryList_idl__
 #include <com/sun/star/linguistic2/XDictionaryList.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XSpellAlternatives_idl__
 #include <com/sun/star/linguistic2/XSpellAlternatives.idl>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_idl_
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl b/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl
index 38410fb5e788..f23748654d3d 100644
--- a/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl
+++ b/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_linguistic2_XSupportedLanguages_idl__
 #define __com_sun_star_linguistic2_XSupportedLanguages_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XSupportedLocales.idl b/offapi/com/sun/star/linguistic2/XSupportedLocales.idl
index 6e145eaee2c3..8dd4f83cfa8d 100644
--- a/offapi/com/sun/star/linguistic2/XSupportedLocales.idl
+++ b/offapi/com/sun/star/linguistic2/XSupportedLocales.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
 #define __com_sun_star_linguistic2_XSupportedLocales_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/linguistic2/XThesaurus.idl b/offapi/com/sun/star/linguistic2/XThesaurus.idl
index 602f78184bd7..cd34d1bfb609 100644
--- a/offapi/com/sun/star/linguistic2/XThesaurus.idl
+++ b/offapi/com/sun/star/linguistic2/XThesaurus.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_linguistic2_XThesaurus_idl__
 #define __com_sun_star_linguistic2_XThesaurus_idl__
 
-#ifndef __com_sun_star_linguistic2_XSupportedLocales_idl__
 #include <com/sun/star/linguistic2/XSupportedLocales.idl>
-#endif
-
-#ifndef __com_sun_star_linguistic2_XMeaning_idl__
 #include <com/sun/star/linguistic2/XMeaning.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/ConsoleHandler.idl b/offapi/com/sun/star/logging/ConsoleHandler.idl
index 92bd6fdc7e28..eb8ad4ce3e17 100644
--- a/offapi/com/sun/star/logging/ConsoleHandler.idl
+++ b/offapi/com/sun/star/logging/ConsoleHandler.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_logging_ConsoleHandler_idl__
 #define __com_sun_star_logging_ConsoleHandler_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/CsvLogFormatter.idl b/offapi/com/sun/star/logging/CsvLogFormatter.idl
index 4db61b9be9d9..168653398f11 100644
--- a/offapi/com/sun/star/logging/CsvLogFormatter.idl
+++ b/offapi/com/sun/star/logging/CsvLogFormatter.idl
@@ -42,8 +42,8 @@ interface XCsvLogFormatter;
     The sequence number, the thread ID, the time of the logged event,
     the source class/method name will get logged alongside the message, if this
     is not disabled. The Formatter also supports logging an arbitrary number of
-    userdefined columns. If the Formatter is configured to have more than one
-    (userdefined) column the data to log has to be preformatted with the
+    user-defined columns. If the Formatter is configured to have more than one
+    (user-defined) column the data to log has to be preformatted with the
     formatMultiColumn method.</p>
 
     @since OOo 3.0
diff --git a/offapi/com/sun/star/logging/DocumentIOLogRing.idl b/offapi/com/sun/star/logging/DocumentIOLogRing.idl
index 59593e2b3285..fd35a54fccb4 100644
--- a/offapi/com/sun/star/logging/DocumentIOLogRing.idl
+++ b/offapi/com/sun/star/logging/DocumentIOLogRing.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_logging_DocumentIOLogRing_idl__
 #define __com_sun_star_logging_DocumentIOLogRing_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/FileHandler.idl b/offapi/com/sun/star/logging/FileHandler.idl
index b20a50618a56..68501f8dd28c 100644
--- a/offapi/com/sun/star/logging/FileHandler.idl
+++ b/offapi/com/sun/star/logging/FileHandler.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_logging_FileHandler_idl__
 #define __com_sun_star_logging_FileHandler_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/LogRecord.idl b/offapi/com/sun/star/logging/LogRecord.idl
index f7a299503322..4019f4acdeec 100644
--- a/offapi/com/sun/star/logging/LogRecord.idl
+++ b/offapi/com/sun/star/logging/LogRecord.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_logging_LogRecord_idl__
 #define __com_sun_star_logging_LogRecord_idl__
 
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/LoggerPool.idl b/offapi/com/sun/star/logging/LoggerPool.idl
index 5372e09c088d..e71a3e9c8f64 100644
--- a/offapi/com/sun/star/logging/LoggerPool.idl
+++ b/offapi/com/sun/star/logging/LoggerPool.idl
@@ -1,9 +1,7 @@
 #ifndef __com_sun_star_logging_LoggerPool_idl__
 #define __com_sun_star_logging_LoggerPool_idl__
 
-#ifndef __com_sun_star_logging_XLoggerPool_idl__
 #include <com/sun/star/logging/XLoggerPool.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/SimpleLogRing.idl b/offapi/com/sun/star/logging/SimpleLogRing.idl
index fe3083724c26..c23c3788c2e4 100644
--- a/offapi/com/sun/star/logging/SimpleLogRing.idl
+++ b/offapi/com/sun/star/logging/SimpleLogRing.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_logging_SimpleLogRing_idl__
 #define __com_sun_star_logging_SimpleLogRing_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XConsoleHandler.idl b/offapi/com/sun/star/logging/XConsoleHandler.idl
index a8d634c78f05..de854df65cee 100644
--- a/offapi/com/sun/star/logging/XConsoleHandler.idl
+++ b/offapi/com/sun/star/logging/XConsoleHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __offapi_com_sun_star_logging_XConsoleHandler_idl__
 #define __offapi_com_sun_star_logging_XConsoleHandler_idl__
 
-#ifndef __com_sun_star_logging_XLogHandler_idl__
 #include <com/sun/star/logging/XLogHandler.idl>
-#endif
 
 //=============================================================================
 
@@ -47,7 +45,7 @@ module com { module sun { module star { module logging {
  */
 interface XConsoleHandler : XLogHandler
 {
-    /** renotes the <type>LogLevel</type> threshold used to determine to which
+    /** denotes the <type>LogLevel</type> threshold used to determine to which
         console the events should be logged.
 
         <p>Events with a level greater or equal to <code>Threshold</code> will be
diff --git a/offapi/com/sun/star/logging/XCsvLogFormatter.idl b/offapi/com/sun/star/logging/XCsvLogFormatter.idl
index ca054060be87..6e77b299e95a 100644
--- a/offapi/com/sun/star/logging/XCsvLogFormatter.idl
+++ b/offapi/com/sun/star/logging/XCsvLogFormatter.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_logging_XCsvLogFormatter_idl__
 #define __com_sun_star_logging_XCsvLogFormatter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_logging_XLogFormatter_idl__
 #include <com/sun/star/logging/XLogFormatter.idl>
-#endif
 
 //=============================================================================
 
@@ -42,7 +37,7 @@ module com { module sun { module star { module logging {
 
 //=============================================================================
 
-/** specifies the interface used for formatting log records for RFC4180 csv
+/** specifies the interface used for formatting log records for RFC4180 CSV
     output
 
     @see XLogFormatter, XLogHandler
@@ -66,7 +61,7 @@ interface XCsvLogFormatter : XLogFormatter
         <code>formatMultiColumn</code>*/
     [attribute] sequence< string >  Columnnames;
     /** if the CsvLogFormatter is set to have more than one
-        column, any logged infomation has to be send through this
+        column, any logged information has to be send through this
         method before calling log(). E.g.:
 
         <code>XLoggerInstance.log(1000, XCsvLogFormatterInstance.formatMultiColumn(column_data))</code>
diff --git a/offapi/com/sun/star/logging/XLogFormatter.idl b/offapi/com/sun/star/logging/XLogFormatter.idl
index a6a3fc9ccf1d..adc4c34ab8f3 100644
--- a/offapi/com/sun/star/logging/XLogFormatter.idl
+++ b/offapi/com/sun/star/logging/XLogFormatter.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_logging_XLogFormatter_idl__
 #define __com_sun_star_logging_XLogFormatter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_logging_LogRecord_idl__
 #include <com/sun/star/logging/LogRecord.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XLogHandler.idl b/offapi/com/sun/star/logging/XLogHandler.idl
index 048e3161c761..2d9610dcc460 100644
--- a/offapi/com/sun/star/logging/XLogHandler.idl
+++ b/offapi/com/sun/star/logging/XLogHandler.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_logging_XLogHandler_idl__
 #define __com_sun_star_logging_XLogHandler_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_logging_LogRecord_idl__
 #include <com/sun/star/logging/LogRecord.idl>
-#endif
-
-#ifndef __com_sun_star_logging_XLogFormatter_idl__
 #include <com/sun/star/logging/XLogFormatter.idl>
-#endif
 
 //=============================================================================
 
@@ -46,7 +38,7 @@ module com { module sun { module star { module logging {
 
 //=============================================================================
 
-/** provides possibilites to send <type>LogRecord</type>s to an arbitrary output
+/** provides possibilities to send <type>LogRecord</type>s to an arbitrary output
     channel.
 
     @see XLogger
diff --git a/offapi/com/sun/star/logging/XLogger.idl b/offapi/com/sun/star/logging/XLogger.idl
index b3e6bb1ddce9..b5ee7c3ed99f 100644
--- a/offapi/com/sun/star/logging/XLogger.idl
+++ b/offapi/com/sun/star/logging/XLogger.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_logging_XLogger_idl__
 #define __com_sun_star_logging_XLogger_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -46,7 +44,7 @@ published interface XLogHandler;
     <a href="http://java.sun.com/javase/6/docs/api/java/util/logging/package-summary.html">Java
     Logging API</a>. However, there are some differences, the major ones being:
     <ul><li>There's no support (yet) for filtering log events.</li>
-        <li>There ain't no convenience menthods for logging.</li>
+        <li>There ain't no convenience methods for logging.</li>
         <li>There's no localization support.</li>
         <li>Logger instances do not form a hierarchy.</li>
     </ul></p>
@@ -87,7 +85,7 @@ published interface XLogger
 
         @param LogHandler
             the handler to remove from the list of handlers. The call is ignored if this
-            parameter is <NULL/>, or if the handler has not previously beed added.
+            parameter is <NULL/>, or if the handler has not previously been added.
     */
     void    removeLogHandler( [in] XLogHandler LogHandler );
 
@@ -121,17 +119,17 @@ published interface XLogger
     void    log( [in] long Level, [in] string Message );
 
     /** logs a given message, detailing the source class and method at which the logged
-        event occured.
+        event occurred.
 
         @param Level
             the log level of this message. If this level is smaller than the logger's <member>Level</member>
             attribute, then the call will be ignored.
 
         @param SourceClass
-            the source class at which the logged event occured.
+            the source class at which the logged event occurred.
 
         @param SourceMethod
-            the source class at which the logged event occured.
+            the source class at which the logged event occurred.
 
         @param Message
             the message to log
diff --git a/offapi/com/sun/star/logging/XLoggerPool.idl b/offapi/com/sun/star/logging/XLoggerPool.idl
index e7c1017dc8a4..ec5cf81d271a 100644
--- a/offapi/com/sun/star/logging/XLoggerPool.idl
+++ b/offapi/com/sun/star/logging/XLoggerPool.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_logging_XLoggerPool_idl__
 #define __com_sun_star_logging_XLoggerPool_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XSimpleLogRing.idl b/offapi/com/sun/star/logging/XSimpleLogRing.idl
index a0a8d1f0483c..7432648ec21c 100644
--- a/offapi/com/sun/star/logging/XSimpleLogRing.idl
+++ b/offapi/com/sun/star/logging/XSimpleLogRing.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_logging_XSimpleLogRing_idl__
 #define __com_sun_star_logging_XSimpleLogRing_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mail/MailAttachment.idl b/offapi/com/sun/star/mail/MailAttachment.idl
index ef45f157ac31..f5529284d654 100644
--- a/offapi/com/sun/star/mail/MailAttachment.idl
+++ b/offapi/com/sun/star/mail/MailAttachment.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_MailAttachment_idl__
 #define __com_sun_star_mail_MailAttachment_idl__
 
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
@@ -48,7 +46,7 @@ struct MailAttachment
         It is expected that the transferable delivers the data as
         sequence of bytes. Although a transferable may support
         multiple data flavors only the first data flavor supplied
-        will be used to retrive the data and it is expected that
+        will be used to retrieve the data and it is expected that
         the type of the data is a sequence of bytes.
 
         @see ::com::sun::star::datatransfer::XTransferable
diff --git a/offapi/com/sun/star/mail/MailException.idl b/offapi/com/sun/star/mail/MailException.idl
index 2022c2aee483..d952578ca8cc 100644
--- a/offapi/com/sun/star/mail/MailException.idl
+++ b/offapi/com/sun/star/mail/MailException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_MailException_idl__
 #define __com_sun_star_mail_MailException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/MailMessage.idl b/offapi/com/sun/star/mail/MailMessage.idl
index 71dea28cb36c..28d63c5a04e7 100644
--- a/offapi/com/sun/star/mail/MailMessage.idl
+++ b/offapi/com/sun/star/mail/MailMessage.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_mail_MailMessage_idl__
 #define __com_sun_star_mail_MailMessage_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailAttachment_idl__
 #include <com/sun/star/mail/MailAttachment.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/MailServer.idl b/offapi/com/sun/star/mail/MailServer.idl
index 2ae7afc016bf..8076a5df2c47 100644
--- a/offapi/com/sun/star/mail/MailServer.idl
+++ b/offapi/com/sun/star/mail/MailServer.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_MailServer_idl__
 #define __com_sun_star_mail_MailServer_idl__
 
-#ifndef __com_sun_star_mail_NoMailTransportProviderException_idl__
 #include <com/sun/star/mail/NoMailTransportProviderException.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/MailServiceProvider.idl b/offapi/com/sun/star/mail/MailServiceProvider.idl
index 0645d9556e66..9f2acbad513e 100644
--- a/offapi/com/sun/star/mail/MailServiceProvider.idl
+++ b/offapi/com/sun/star/mail/MailServiceProvider.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_mail_MailServiceProvider_idl__
 #define __com_sun_star_mail_MailServiceProvider_idl__
 
-#ifndef __com_sun_star_mail_XMailServiceProvider_idl__
 #include <com/sun/star/mail/XMailServiceProvider.idl>
-#endif
-
-#ifndef __com_sun_star_mail_NoMailServiceProviderException_idl__
 #include <com/sun/star/mail/NoMailServiceProviderException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailServiceType_idl__
 #include <com/sun/star/mail/MailServiceType.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/NoMailServiceProviderException.idl b/offapi/com/sun/star/mail/NoMailServiceProviderException.idl
index f1a2074d66ea..b1af77081171 100644
--- a/offapi/com/sun/star/mail/NoMailServiceProviderException.idl
+++ b/offapi/com/sun/star/mail/NoMailServiceProviderException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_NoMailServiceProviderException_idl__
 #define __com_sun_star_mail_NoMailServiceProviderException_idl__
 
-#ifndef __com_sun_star_mail_MailException_idl__
 #include <com/sun/star/mail/MailException.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/NoMailTransportProviderException.idl b/offapi/com/sun/star/mail/NoMailTransportProviderException.idl
index fa275ed7f7f2..a389c2fd4d9a 100644
--- a/offapi/com/sun/star/mail/NoMailTransportProviderException.idl
+++ b/offapi/com/sun/star/mail/NoMailTransportProviderException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_NoMailTransportProviderException_idl__
 #define __com_sun_star_mail_NoMailTransportProviderException_idl__
 
-#ifndef __com_sun_star_mail_MailException_idl__
 #include <com/sun/star/mail/MailException.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/SendMailMessageFailedException.idl b/offapi/com/sun/star/mail/SendMailMessageFailedException.idl
index 91a6cb29b5d8..edfe8bba17eb 100644
--- a/offapi/com/sun/star/mail/SendMailMessageFailedException.idl
+++ b/offapi/com/sun/star/mail/SendMailMessageFailedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_SendMailMessageFailedException_idl__
 #define __com_sun_star_mail_SendMailMessageFailedException_idl__
 
-#ifndef __com_sun_star_mail_MailException_idl__
 #include <com/sun/star/mail/MailException.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/XAuthenticator.idl b/offapi/com/sun/star/mail/XAuthenticator.idl
index 6ae813a161ef..142f046c43c2 100644
--- a/offapi/com/sun/star/mail/XAuthenticator.idl
+++ b/offapi/com/sun/star/mail/XAuthenticator.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mail_XAuthenticator_idl__
 #define __com_sun_star_mail_XAuthenticator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/XConnectionListener.idl b/offapi/com/sun/star/mail/XConnectionListener.idl
index cd5153f5e96e..469bc6bfcdea 100644
--- a/offapi/com/sun/star/mail/XConnectionListener.idl
+++ b/offapi/com/sun/star/mail/XConnectionListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_mail_XConnectionListener_idl__
 #define __com_sun_star_mail_XConnectionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/XMailMessage.idl b/offapi/com/sun/star/mail/XMailMessage.idl
index abc3017297d7..e25eed8830c3 100644
--- a/offapi/com/sun/star/mail/XMailMessage.idl
+++ b/offapi/com/sun/star/mail/XMailMessage.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_mail_XMailMessage_idl__
 #define __com_sun_star_mail_XMailMessage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailAttachment_idl__
 #include <com/sun/star/mail/MailAttachment.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_XTransferable_idl__
 #include <com/sun/star/datatransfer/XTransferable.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
@@ -90,12 +82,12 @@ interface XMailMessage: ::com::sun::star::uno::XInterface {
     void addCcRecipient([in] string sRecipientAddress);
 
     /**
-        Add an Bcc recipients e-mail address to the list of recipients of this mail message.
+        Add an BCC recipients e-mail address to the list of recipients of this mail message.
         If the e-mail address doesn't conform to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>
         sending the mail message will fail.
 
         @param sRecipientAddress
-        [in] the e-mail address of the Bcc recipient.
+        [in] the e-mail address of the BCC recipient.
     */
     void addBccRecipient([in] string sRecipientAddress);
 
@@ -112,7 +104,7 @@ interface XMailMessage: ::com::sun::star::uno::XInterface {
     sequence<string> getCcRecipients();
 
     /**
-        Return a sequence of the e-mail addresses of all the Bcc recipients
+        Return a sequence of the e-mail addresses of all the BCC recipients
         of this mail message.
     */
     sequence<string> getBccRecipients();
diff --git a/offapi/com/sun/star/mail/XMailServer.idl b/offapi/com/sun/star/mail/XMailServer.idl
index 401a13424566..02217a1a2396 100644
--- a/offapi/com/sun/star/mail/XMailServer.idl
+++ b/offapi/com/sun/star/mail/XMailServer.idl
@@ -28,65 +28,21 @@
 #ifndef __com_sun_star_mail_XMailServer_idl__
 #define __com_sun_star_mail_XMailServer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XAuthenticator_idl__
 #include <com/sun/star/mail/XAuthenticator.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XMailMessage_idl__
 #include <com/sun/star/mail/XMailMessage.idl>
-#endif
-
-#ifndef __com_sun_star_auth_AuthenticationFailedException_idl__
 #include <com/sun/star/auth/AuthenticationFailedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_AlreadyConnectedException_idl__
 #include <com/sun/star/io/AlreadyConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
 #include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_UnknownHostException_idl__
 #include <com/sun/star/io/UnknownHostException.idl>
-#endif
-
-#ifndef __com_sun_star_io_NoRouteToHostException_idl__
 #include <com/sun/star/io/NoRouteToHostException.idl>
-#endif
-
-#ifndef __com_sun_star_io_ConnectException_idl__
 #include <com/sun/star/io/ConnectException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
 #include <com/sun/star/ucb/InteractiveIOException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailException_idl__
 #include <com/sun/star/mail/MailException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_SendMailMessageFailedException_idl__
 #include <com/sun/star/mail/SendMailMessageFailedException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XConnectionListener_idl__
 #include <com/sun/star/mail/XConnectionListener.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
@@ -114,7 +70,7 @@ interface XMailServer: ::com::sun::star::uno::XInterface {
     /**
         Returns all connection types which are supported by the
         mail server. Possible connection types are for instance
-        secure connections like 'SSL' or 'TLS'.
+        secure connections like "SSL" or "TLS".
 
         @returns
         a sequence of supported connection types.
@@ -191,13 +147,13 @@ interface XMailServer: ::com::sun::star::uno::XInterface {
         a wrong server name, an unreachable DNS server, etc.
 
         @throws com::sun::star::io::NoRouteToHostException
-        if an error occured to connect to the remote mail server.
+        if an error occurred to connect to the remote mail server.
         Typically the remote mail server cannot be reach because of an
         intervening firewall, or if an intermediate router is down,
         the network connection is broken, etc.
 
         @throws com::sun::star::io::ConnectException
-        if an error occured while attempting to connect to the remote
+        if an error occurred while attempting to connect to the remote
         mail server. Typically the connection was refused remotely,
         because the mail server is not listening on the remote address/port.
 
@@ -228,7 +184,7 @@ interface XMailServer: ::com::sun::star::uno::XInterface {
                com::sun::star::mail::MailException);
 
     /**
-        Logoff the currently logged in user.
+        Log off the currently logged in user.
 
         @throws com::sun::star::mail::MessagingException
         if errors occur during logoff.
@@ -263,7 +219,7 @@ interface XMailServer: ::com::sun::star::uno::XInterface {
         @throws com::sun::star::datatransfer::UnsupportedFlavorException
         is thrown when the body of the mail message is provided in an
         unsupported mime content type or may be thrown if one of the file
-        attachments specifies an unspupported mime content type.
+        attachments specifies an unsupported mime content type.
 
         @see com::sun::star::io::NotConnectedExceptionException
         @see com::sun::star::mail::SendMailMessageFailedException
diff --git a/offapi/com/sun/star/mail/XMailService.idl b/offapi/com/sun/star/mail/XMailService.idl
index f06937b79d57..331725e373b1 100644
--- a/offapi/com/sun/star/mail/XMailService.idl
+++ b/offapi/com/sun/star/mail/XMailService.idl
@@ -28,53 +28,18 @@
 #ifndef __com_sun_star_mail_XMailService_idl__
 #define __com_sun_star_mail_XMailService_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XAuthenticator_idl__
 #include <com/sun/star/mail/XAuthenticator.idl>
-#endif
-
-#ifndef __com_sun_star_auth_AuthenticationFailedException_idl__
 #include <com/sun/star/auth/AuthenticationFailedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_AlreadyConnectedException_idl__
 #include <com/sun/star/io/AlreadyConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
 #include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_UnknownHostException_idl__
 #include <com/sun/star/io/UnknownHostException.idl>
-#endif
-
-#ifndef __com_sun_star_io_NoRouteToHostException_idl__
 #include <com/sun/star/io/NoRouteToHostException.idl>
-#endif
-
-#ifndef __com_sun_star_io_ConnectException_idl__
 #include <com/sun/star/io/ConnectException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XConnectionListener_idl__
 #include <com/sun/star/mail/XConnectionListener.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailException_idl__
 #include <com/sun/star/mail/MailException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XCurrentContext_idl__
 #include <com/sun/star/uno/XCurrentContext.idl>
-#endif
 
 
 module com { module sun { module star { module mail {
@@ -93,7 +58,7 @@ interface XMailService: ::com::sun::star::uno::XInterface {
         connection types are (the values should be handled
         case insensitive):
         "Insecure" - insecure connections
-        "Ssl" - Secure Socket Layer 2.0/3.0 based connection
+        "SSL" - Secure Socket Layer 2.0/3.0 based connection
 
         @returns
         a sequence of supported connection types.
@@ -121,7 +86,7 @@ interface XMailService: ::com::sun::star::uno::XInterface {
     void removeConnectionListener([in] XConnectionListener xListener);
 
     /**
-        Return the context of the current connnection. The context
+        Return the context of the current connection. The context
         contains information like the server name, port, connection type
         etc.
 
@@ -147,8 +112,8 @@ interface XMailService: ::com::sun::star::uno::XInterface {
         @param xConnectionContext
         [in] an interface used to query for connection related information.
         The context must contain the following values:
-        "ServerName" of type 'string', "Port" of type 'long', "ConnectionType"
-        of type 'string'. A list of supported connection types can be queried
+        "ServerName" of type "string", "Port" of type "long", "ConnectionType"
+        of type "string". A list of supported connection types can be queried
         using <code>getSupportedConnectionTypes</code>.
 
         @param xAuthenticator
@@ -169,13 +134,13 @@ interface XMailService: ::com::sun::star::uno::XInterface {
         a wrong server name, an unreachable DNS server, etc.
 
         @throws com::sun::star::io::NoRouteToHostException
-        if an error occured to connect to the remote mail server.
+        if an error occurred to connect to the remote mail server.
         Typically the remote mail server cannot be reach because of an
         intervening firewall, or if an intermediate router is down,
         the network connection is broken, etc.
 
         @throws com::sun::star::io::ConnectException
-        if an error occured while attempting to connect to the remote
+        if an error occurred while attempting to connect to the remote
         mail server. Typically the connection was refused remotely,
         because the mail server is not listening on the remote address/port.
 
diff --git a/offapi/com/sun/star/mail/XMailServiceProvider.idl b/offapi/com/sun/star/mail/XMailServiceProvider.idl
index 5430a45fced0..aab6cf4a5b49 100644
--- a/offapi/com/sun/star/mail/XMailServiceProvider.idl
+++ b/offapi/com/sun/star/mail/XMailServiceProvider.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_mail_XMailServiceProvider_idl__
 #define __com_sun_star_mail_XMailServiceProvider_idl__
 
-#ifndef __com_sun_star_mail_XMailService_idl__
 #include <com/sun/star/mail/XMailService.idl>
-#endif
-
-#ifndef __com_sun_star_mail_NoMailServiceProviderException_idl__
 #include <com/sun/star/mail/NoMailServiceProviderException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailServiceType_idl__
 #include <com/sun/star/mail/MailServiceType.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
diff --git a/offapi/com/sun/star/mail/XSmtpService.idl b/offapi/com/sun/star/mail/XSmtpService.idl
index 9ffec785bf09..9b72d57dce61 100644
--- a/offapi/com/sun/star/mail/XSmtpService.idl
+++ b/offapi/com/sun/star/mail/XSmtpService.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_mail_XSmtpService_idl__
 #define __com_sun_star_mail_XSmtpService_idl__
 
-#ifndef __com_sun_star_mail_XMailService_idl__
 #include <com/sun/star/mail/XMailService.idl>
-#endif
-
-#ifndef __com_sun_star_mail_XMailMessage_idl__
 #include <com/sun/star/mail/XMailMessage.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
 #include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_ConnectException_idl__
 #include <com/sun/star/io/ConnectException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_MailException_idl__
 #include <com/sun/star/mail/MailException.idl>
-#endif
-
-#ifndef __com_sun_star_mail_SendMailMessageFailedException_idl__
 #include <com/sun/star/mail/SendMailMessageFailedException.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
 
 module com { module sun { module star { module mail {
 
@@ -90,7 +70,7 @@ interface XSmtpService: ::com::sun::star::mail::XMailService {
         @throws com::sun::star::datatransfer::UnsupportedFlavorException
         is thrown when the body of the mail message is provided in an
         unsupported mime content type or may be thrown if one of the file
-        attachments specifies an unspupported mime content type.
+        attachments specifies an unsupported mime content type.
 
         @see com::sun::star::mail::XMailMessage
         @see com::sun::star::io::NotConnectedException
diff --git a/offapi/com/sun/star/media/Manager.idl b/offapi/com/sun/star/media/Manager.idl
index 2eed3fb47625..8b225769a12b 100644
--- a/offapi/com/sun/star/media/Manager.idl
+++ b/offapi/com/sun/star/media/Manager.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_media_Manager_idl__
 #define __com_sun_star_media_Manager_idl__
 
-#ifndef __com_sun_star_media_XManager_idl__
 #include <com/sun/star/media/XManager.idl>
-#endif
 
 module com {  module sun {  module star {  module media {
 
diff --git a/offapi/com/sun/star/media/XFrameGrabber.idl b/offapi/com/sun/star/media/XFrameGrabber.idl
index 36852c9802d3..5b203f594bdd 100644
--- a/offapi/com/sun/star/media/XFrameGrabber.idl
+++ b/offapi/com/sun/star/media/XFrameGrabber.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_media_XFrameGrabber_idl__
 #define __com_sun_star_media_XFrameGrabber_idl__
 
-#ifndef __com_sun_star_graphic_XGraphic_idl__
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 module com {  module sun {  module star {  module media {
 
diff --git a/offapi/com/sun/star/media/XManager.idl b/offapi/com/sun/star/media/XManager.idl
index 1e63ee20bfc9..8166351ef244 100644
--- a/offapi/com/sun/star/media/XManager.idl
+++ b/offapi/com/sun/star/media/XManager.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_media_XManager_idl__
 #define __com_sun_star_media_XManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_media_XPlayer_idl__
 #include <com/sun/star/media/XPlayer.idl>
-#endif
 
 module com {  module sun {  module star {  module media {
 
diff --git a/offapi/com/sun/star/media/XPlayer.idl b/offapi/com/sun/star/media/XPlayer.idl
index 7546e9d27d8c..a4d82d28fbe9 100644
--- a/offapi/com/sun/star/media/XPlayer.idl
+++ b/offapi/com/sun/star/media/XPlayer.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_media_XPlayer_idl__
 #define __com_sun_star_media_XPlayer_idl__
 
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_media_XPlayerWindow_idl__
 #include <com/sun/star/media/XPlayerWindow.idl>
-#endif
-#ifndef __com_sun_star_media_XFrameGrabber_idl__
 #include <com/sun/star/media/XFrameGrabber.idl>
-#endif
 
 module com {  module sun {  module star {  module media {
 
diff --git a/offapi/com/sun/star/media/XPlayerWindow.idl b/offapi/com/sun/star/media/XPlayerWindow.idl
index efd8f6750243..f4833cee2ab0 100644
--- a/offapi/com/sun/star/media/XPlayerWindow.idl
+++ b/offapi/com/sun/star/media/XPlayerWindow.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_media_XPlayerWindow_idl__
 #define __com_sun_star_media_XPlayerWindow_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_media_ZoomLevel_idl__
 #include <com/sun/star/media/ZoomLevel.idl>
-#endif
 
 module com {  module sun {  module star {  module media {
 
diff --git a/offapi/com/sun/star/modules.idl b/offapi/com/sun/star/modules.idl
index 4224ab354dbf..8da2239a147c 100644
--- a/offapi/com/sun/star/modules.idl
+++ b/offapi/com/sun/star/modules.idl
@@ -44,7 +44,7 @@ module awt {};
 
     <p>Making a class accessible starts by supporting the <type
     scope="::com::sun::star::accessibility">XAccessible</type> interface.
-    This interface' only method returns the actual accessibility object, an
+    This interface's only method returns the actual accessibility object, an
     instance of <type
     scope="::com::sun::star::accessibility">XAccessibleContext</type>.
     These two interfaces may be implemented by the same class in which case
@@ -159,7 +159,7 @@ module setup {};
 /// Spreadsheet specific interfaces.
 module sheet {};
 
-/// Formatting and layout style and stylesheet interfaces.
+/// Formatting and layout style and style sheet interfaces.
 module style {};
 
 /// Interfaces for import/export of Scaleable Vector Format.
@@ -192,7 +192,7 @@ module ui {};
 /// Miscellaneous interfaces for sorting, connecting objects etc.
 module util {};
 
-/// Document view specfic interfaces (e.g. selection access and printing).
+/// Document view specific interfaces (e.g. selection access and printing).
 module view {};
 
 /// XML related interfaces.
@@ -204,7 +204,7 @@ module system {};
 /// Package file format interfaces.
 module packages {};
 
-/// image manupulation interfaces.
+/// image manipulation interfaces.
 module image {};
 
 /// interfaces for XForms (XML-based forms) implementation
diff --git a/offapi/com/sun/star/mozilla/MenuMultipleChange.idl b/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
index 1fac0524bba7..d260d633d8fe 100644
--- a/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
+++ b/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_mozilla_MenuMultipleChange_idl__
 #define __com_sun_star_mozilla_MenuMultipleChange_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mozilla/MenuProxy.idl b/offapi/com/sun/star/mozilla/MenuProxy.idl
index 9e2bbf75eae1..875c113f992d 100644
--- a/offapi/com/sun/star/mozilla/MenuProxy.idl
+++ b/offapi/com/sun/star/mozilla/MenuProxy.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_mozilla_MenuProxy_idl__
 #define __com_sun_star_mozilla_MenuProxy_idl__
 
-#ifndef __com_sun_star_mozilla_XMenuProxy_idl__
 #include <com/sun/star/mozilla/XMenuProxy.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mozilla/MenuProxyListener.idl b/offapi/com/sun/star/mozilla/MenuProxyListener.idl
index b239ae302b58..c3deceb3f66d 100644
--- a/offapi/com/sun/star/mozilla/MenuProxyListener.idl
+++ b/offapi/com/sun/star/mozilla/MenuProxyListener.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_mozilla_MenuProxyListener_idl__
 #define __com_sun_star_mozilla_MenuProxyListener_idl__
 
-#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__
 #include <com/sun/star/mozilla/XMenuProxyListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mozilla/MenuSingleChange.idl b/offapi/com/sun/star/mozilla/MenuSingleChange.idl
index d46210ed9306..4c60204e9143 100644
--- a/offapi/com/sun/star/mozilla/MenuSingleChange.idl
+++ b/offapi/com/sun/star/mozilla/MenuSingleChange.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_mozilla_MenuSingleChange_idl__
 #define __com_sun_star_mozilla_MenuSingleChange_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mozilla/MozillaBootstrap.idl b/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
index 5b15847fa352..72f95517c693 100644
--- a/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
+++ b/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_mozilla_MozillaBootstrap_idl__
 #define __com_sun_star_mozilla_MozillaBootstrap_idl__
 
-#ifndef __com_sun_star_mozilla_XMozillaBootstrap_idl__
 #include <com/sun/star/mozilla/XMozillaBootstrap.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mozilla/XCloseSessionListener.idl b/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
index 2a62769e8094..d51fe3263a8c 100644
--- a/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
+++ b/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_mozilla_XCloseSessionListener_idl__
 #define __com_sun_star_mozilla_XCloseSessionListener_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mozilla/XCodeProxy.idl b/offapi/com/sun/star/mozilla/XCodeProxy.idl
index c91eacd092ac..2ce48d0e22e9 100644
--- a/offapi/com/sun/star/mozilla/XCodeProxy.idl
+++ b/offapi/com/sun/star/mozilla/XCodeProxy.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdbc_XCodeProxy_idl__
 #define __com_sun_star_sdbc_XCodeProxy_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__
 #include <com/sun/star/mozilla/MozillaProductType.idl>
-#endif
 
  module com {  module sun {  module star {  module mozilla {
 
diff --git a/offapi/com/sun/star/mozilla/XMenuProxy.idl b/offapi/com/sun/star/mozilla/XMenuProxy.idl
index 15aefc596ef0..d6d2dbf5cf0c 100644
--- a/offapi/com/sun/star/mozilla/XMenuProxy.idl
+++ b/offapi/com/sun/star/mozilla/XMenuProxy.idl
@@ -29,13 +29,9 @@
 #ifndef __com_sun_star_mozilla_XMenuProxy_idl__
 #define __com_sun_star_mozilla_XMenuProxy_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__
 #include <com/sun/star/mozilla/XMenuProxyListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mozilla/XMenuProxyListener.idl b/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
index 78b3d7d5df21..c156712db074 100644
--- a/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
+++ b/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
@@ -29,17 +29,11 @@
 #ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__
 #define __com_sun_star_mozilla_XMenuProxyListener_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_mozilla_MenuMultipleChange_idl__
 #include <com/sun/star/mozilla/MenuMultipleChange.idl>
-#endif
 
-#ifndef __com_sun_star_mozilla_MenuSingleChange_idl__
 #include <com/sun/star/mozilla/MenuSingleChange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl b/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl
index e955ad2b93cb..6796a0ea2f9f 100644
--- a/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl
+++ b/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl
@@ -27,19 +27,10 @@
 #ifndef __com_sun_star_mozilla_XMozillaBootstrap_idl__
 #define __com_sun_star_mozilla_XMozillaBootstrap_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mozilla_XProfileDiscover_idl__
 #include <com/sun/star/mozilla/XProfileDiscover.idl>
-#endif
-#ifndef __com_sun_star_mozilla_XProfileManager_idl__
 #include <com/sun/star/mozilla/XProfileManager.idl>
-#endif
-#ifndef __com_sun_star_mozilla_XProxyRunner_idl__
 #include <com/sun/star/mozilla/XProxyRunner.idl>
-#endif
 
 
  module com {  module sun {  module star {  module mozilla {
diff --git a/offapi/com/sun/star/mozilla/XPluginInstance.idl b/offapi/com/sun/star/mozilla/XPluginInstance.idl
index 614da9444144..ed47702e5929 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstance.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstance.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_mozilla_XPluginInstance_idl__
 #define __com_sun_star_mozilla_XPluginInstance_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
 //=============================================================================
 
@@ -43,7 +38,7 @@
 
 
 // DocMerge from xml: method com::sun::star::mozilla::XPluginInstance::start
-/** Allows to controll an office side plugin instance and to communicate with it.
+/** Allows to control an office side plugin instance and to communicate with it.
     This interface is oriented for communication with browsers plugins.
  */
 published interface XPluginInstance: com::sun::star::uno::XInterface
@@ -117,7 +112,7 @@ published interface XPluginInstance: com::sun::star::uno::XInterface
     /** Notifies the plugin of a new url to open as document.
 
         @param MIMEDesc     [in]:   the MIMEtype of the data stream
-        @param theURL       [in]:   the URL to be openend
+        @param theURL       [in]:   the URL to be opened
         @param filter       [in]:   a filter string to suggest a component that should handle the document
         @param sessiondata  [in]:   the data specifying the current session
 
@@ -128,7 +123,7 @@ published interface XPluginInstance: com::sun::star::uno::XInterface
 
 
     // DocMerge from idl: method com::sun::star::mozilla::XPluginInstance::getHttpServerURL
-    /** Retrieves the URL of the HTTP Loadbalancing Slave.
+    /** Retrieves the URL of the HTTP Load balancing Slave.
 
         @param aURL     [out]:  the full qualified host name of the LBS
         @param aPort    [out]:  the port number
diff --git a/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl b/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
index 20ad31aed362..c7038d969ea5 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_mozilla_XPluginInstanceNotifySink_idl__
 #define __com_sun_star_mozilla_XPluginInstanceNotifySink_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl b/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
index 3e06b9940b9c..dbdbe71d97e2 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_mozilla_XPluginInstancePeer_idl__
 #define __com_sun_star_mozilla_XPluginInstancePeer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
 #include <com/sun/star/io/XActiveDataSource.idl>
-#endif
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 //=============================================================================
 
@@ -105,7 +97,7 @@ published interface XPluginInstancePeer: com::sun::star::uno::XInterface
 
         @param MIMEDesc [in]:   the MIME type of the plug-in to create
         @param target   [in]:   the name of the target window or frame (supports _blank, _self)
-        @param data     [in]:   on success the outputstream will be associated with this instance
+        @param data     [in]:   on success the output stream will be    associated with this instance
 
      */
     [oneway] void newStream(
diff --git a/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl b/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
index 8818ef587be7..1f9a898d3195 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_mozilla_XPluginInstanceSyncPeer_idl__
 #define __com_sun_star_mozilla_XPluginInstanceSyncPeer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mozilla_XPluginInstance_idl__
 #include <com/sun/star/mozilla/XPluginInstance.idl>
-#endif
 
 //=============================================================================
 
@@ -42,7 +37,7 @@
 //=============================================================================
 
 // DocMerge from xml: interface com::sun::star::mozilla::XPluginInstanceSyncPeer
-/** This interface is an extention for <type>XPluginInstancePeer</type> interface.
+/** This interface is an extension for <type>XPluginInstancePeer</type> interface.
     An object can support this interface in addition to <type>XPluginInstancePeer</type> interface.
  */
 published interface XPluginInstanceSyncPeer : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl b/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
index 3e8d86fba3c2..d12330746bfe 100644
--- a/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_mozilla_XPluginWindowPeer_idl__
 #define __com_sun_star_mozilla_XPluginWindowPeer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mozilla/XProfileDiscover.idl b/offapi/com/sun/star/mozilla/XProfileDiscover.idl
index bd36a6eb0b89..4df02e590d69 100644
--- a/offapi/com/sun/star/mozilla/XProfileDiscover.idl
+++ b/offapi/com/sun/star/mozilla/XProfileDiscover.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_mozilla_XProfileDiscover_idl__
 #define __com_sun_star_mozilla_XProfileDiscover_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__
 #include <com/sun/star/mozilla/MozillaProductType.idl>
-#endif
 
 
  module com {  module sun {  module star {  module mozilla {
diff --git a/offapi/com/sun/star/mozilla/XProfileManager.idl b/offapi/com/sun/star/mozilla/XProfileManager.idl
index b409cc5adcf1..f09bdc5b7a02 100644
--- a/offapi/com/sun/star/mozilla/XProfileManager.idl
+++ b/offapi/com/sun/star/mozilla/XProfileManager.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_mozilla_XProfileManager_idl__
 #define __com_sun_star_mozilla_XProfileManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__
 #include <com/sun/star/mozilla/MozillaProductType.idl>
-#endif
 
 
 
@@ -40,7 +36,7 @@
 
 
 
-/** is the interface to bootup and switch Mozilla/Thunderbird profiles
+/** is the interface to boot up and switch Mozilla/Thunderbird profiles
 
     @see com::sun::star::mozilla::MozillaProductType
     @see com::sun::star::mozilla::XProfileDiscover
@@ -50,14 +46,14 @@ published interface XProfileManager: com::sun::star::uno::XInterface
 {
 
     // DocMerge from xml: method com::sun::star::mozilla::XProfileManager::bootupProfile
-    /** attempts to init xpcom runtime using given profile.
+    /** attempts to init XPCOM runtime using given profile.
 
         @param product
             is the product to start up.
         @param profileName
             the profile name to be used.
         @returns
-            the current refrence count for the given profile.
+            the current reference count for the given profile.
 
      */
     long bootupProfile( [in]MozillaProductType product,[in]string profileName);
@@ -65,7 +61,7 @@ published interface XProfileManager: com::sun::star::uno::XInterface
     /** attempts to shutdown the current profile.
 
         @returns
-            the current refrence count for the current profile.
+            the current reference count for the current profile.
 
      */
     long shutdownProfile();
diff --git a/offapi/com/sun/star/mozilla/XProxyRunner.idl b/offapi/com/sun/star/mozilla/XProxyRunner.idl
index 3848242cae36..b4d7c17a5847 100644
--- a/offapi/com/sun/star/mozilla/XProxyRunner.idl
+++ b/offapi/com/sun/star/mozilla/XProxyRunner.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_mozilla_XProxyRunner_idl__
 #define __com_sun_star_mozilla_XProxyRunner_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mozilla_XCodeProxy_idl__
 #include <com/sun/star/mozilla/XCodeProxy.idl>
-#endif
 
 
  module com {  module sun {  module star {  module mozilla {
@@ -41,7 +36,7 @@
 
 published interface XCodeProxy;
 // DocMerge from xml: interface com::sun::star::mozilla::XProxyRunner
-/** is the interface run Mozilla XPCOM code in a managered environment
+/** is the interface run Mozilla XPCOM code in a managed environment
 
     @see com::sun::star::mozilla::XProfileDiscover
     @see com::sun::star::mozilla::MozillaBootstrap
@@ -50,7 +45,7 @@ published interface XProxyRunner: com::sun::star::uno::XInterface
 {
 
     // DocMerge from xml: method com::sun::star::mozilla::XProxyRunner::Run
-    /** attempts to Run XPCOM code in a managered environment
+    /** attempts to Run XPCOM code in a managed environment
 
         @param aCode
             is a com:sun:star:mozilla:XCodeProxy object to be run.
diff --git a/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl b/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
index a08da8b54155..40e837cb5798 100644
--- a/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
+++ b/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_mozilla_XRemoteServiceManagerProvider_idl__
 #define __com_sun_star_mozilla_XRemoteServiceManagerProvider_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/office/XAnnotation.idl b/offapi/com/sun/star/office/XAnnotation.idl
index 7c601c5fe21a..d38c90624d90 100644
--- a/offapi/com/sun/star/office/XAnnotation.idl
+++ b/offapi/com/sun/star/office/XAnnotation.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_office_XAnnotation_idl__
 #define __com_sun_star_office_XAnnotation_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
-
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-
-#ifndef __com_sun_star_geometry_RealSize2D_idl__
 #include <com/sun/star/geometry/RealSize2D.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/office/XAnnotationAccess.idl b/offapi/com/sun/star/office/XAnnotationAccess.idl
index 201151b7c0fc..2eb65fd78c23 100644
--- a/offapi/com/sun/star/office/XAnnotationAccess.idl
+++ b/offapi/com/sun/star/office/XAnnotationAccess.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_office_XAnnotationAccess_idl__
 #define __com_sun_star_office_XAnnotationAccess_idl__
 
-#ifndef __com_sun_star_office_XAnnotationEnumeration_idl__
 #include <com/sun/star/office/XAnnotationEnumeration.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/office/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_office_XAnnotation_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
 #include <com/sun/star/office/XAnnotation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/office/XAnnotationEnumeration.idl b/offapi/com/sun/star/office/XAnnotationEnumeration.idl
index aa252c9c5ded..c27f29f583b3 100644
--- a/offapi/com/sun/star/office/XAnnotationEnumeration.idl
+++ b/offapi/com/sun/star/office/XAnnotationEnumeration.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_office_XAnnotationEnumeration_idl__
 #define __com_sun_star_office_XAnnotationEnumeration_idl__
 
-#ifndef __com_sun_star_office_XAnnotation_idl__
 #include <com/sun/star/office/XAnnotation.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/oooimprovement/CoreController.idl b/offapi/com/sun/star/oooimprovement/CoreController.idl
index 2ec833a5a5b4..234fcf4fadb9 100644
--- a/offapi/com/sun/star/oooimprovement/CoreController.idl
+++ b/offapi/com/sun/star/oooimprovement/CoreController.idl
@@ -35,7 +35,7 @@ interface XCoreController;
 
 //=============================================================================
 
-/** specifies a service controlling the core components of the Openoffice.org
+/** specifies a service controlling the core components of the OpenOffice.org
     improvement program. The OOo improvement program extension has to implement
     this service.
 
diff --git a/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl b/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
index 61f5dbbfe140..db93be316eb2 100644
--- a/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
+++ b/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__
 #define __com_sun_star_packages_EncryptionNotAllowedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/packages/NoEncryptionException.idl b/offapi/com/sun/star/packages/NoEncryptionException.idl
index cffecf7bd637..94fa8f4175d5 100644
--- a/offapi/com/sun/star/packages/NoEncryptionException.idl
+++ b/offapi/com/sun/star/packages/NoEncryptionException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_packages_NoEncryptionException_idl__
 #define __com_sun_star_packages_NoEncryptionException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/packages/NoRawFormatException.idl b/offapi/com/sun/star/packages/NoRawFormatException.idl
index a2730b41da62..51eb0698b0b7 100644
--- a/offapi/com/sun/star/packages/NoRawFormatException.idl
+++ b/offapi/com/sun/star/packages/NoRawFormatException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_packages_NoRawFormatException_idl__
 #define __com_sun_star_packages_NoRawFormatException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/packages/Package.idl b/offapi/com/sun/star/packages/Package.idl
index 954b4434fbaa..4ee4b78b1188 100644
--- a/offapi/com/sun/star/packages/Package.idl
+++ b/offapi/com/sun/star/packages/Package.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_packages_Package_idl__
 #define __com_sun_star_packages_Package_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_util_XChangesBatch_idl__
 #include <com/sun/star/util/XChangesBatch.idl>
-#endif
 
 
 //=============================================================================
@@ -55,14 +44,14 @@ module com {  module sun {  module star {  module packages {
 
     Each instance is created with an argument which specifies the URL of
     the Package file to which the user requires access. If the instance is
-    created without arguments, it must be initialised with the
+    created without arguments, it must be initialized with the
     <type scope="com::sun::star::lang">XInitialization</type> service methods
     before it is a valid instance of the service.
 */
 published service Package
 {
     /**
-    A Package can be initialised with one of the following:
+    A Package can be initialized with one of the following:
 
     1. A file URL referring to a package.
     2. An XInputStream referring to a package (it must also
@@ -71,9 +60,9 @@ published service Package
        an XSeekable interface, and the XOutputStream must support an
        XTruncate interface.
 
-    It will throw a css::uno::Exception if initialised with bad data or
-    if the package has an invalid format (for example, a corrupt central d
-    irectory record if the file is a ZIP file).
+    It will throw a css::uno::Exception if initialized with bad data or
+    if the package has an invalid format (for example, a corrupt central
+    directory record if the file is a ZIP file).
     */
     interface com::sun::star::lang::XInitialization;
     /**
diff --git a/offapi/com/sun/star/packages/PackageFolder.idl b/offapi/com/sun/star/packages/PackageFolder.idl
index dcf87f26911d..7c7aa4eb8fe2 100644
--- a/offapi/com/sun/star/packages/PackageFolder.idl
+++ b/offapi/com/sun/star/packages/PackageFolder.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_packages_PackageFolder_idl__
 #define __com_sun_star_packages_PackageFolder_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_udl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 //=============================================================================
 
 module com {  module sun {  module star {   module packages {
@@ -98,7 +84,7 @@ published service PackageFolder
     /**
     This interface provides access to the properties of the package entry.
     Currently, this only supports one entry which is a string called
-    MediaType. This contains the MIME type of the stream (eg. "text/html").
+    MediaType. This contains the MIME type of the stream (e.g. "text/html").
     For PackageFolders, this is always an empty string.
     */
     interface com::sun::star::beans::XPropertySet;
diff --git a/offapi/com/sun/star/packages/PackageFolderEnumeration.idl b/offapi/com/sun/star/packages/PackageFolderEnumeration.idl
index 11e1d6f22b5a..6b50050a0a8a 100644
--- a/offapi/com/sun/star/packages/PackageFolderEnumeration.idl
+++ b/offapi/com/sun/star/packages/PackageFolderEnumeration.idl
@@ -28,9 +28,7 @@
 #define __com_sun_star_packages_PackageFolderEnumeration_idl__
 
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/packages/PackageStream.idl b/offapi/com/sun/star/packages/PackageStream.idl
index c12860f1cf57..8dff65df1488 100644
--- a/offapi/com/sun/star/packages/PackageStream.idl
+++ b/offapi/com/sun/star/packages/PackageStream.idl
@@ -28,21 +28,10 @@
 #define __com_sun_star_packages_PackageStream_idl__
 
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/packages/WrongPasswordException.idl b/offapi/com/sun/star/packages/WrongPasswordException.idl
index 954e0bd68afc..411ab5c45956 100644
--- a/offapi/com/sun/star/packages/WrongPasswordException.idl
+++ b/offapi/com/sun/star/packages/WrongPasswordException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_packages_WrongPasswordException_idl__
 #define __com_sun_star_packages_WrongPasswordException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl b/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl
index 3f768b6a421d..dbe6ce3fd557 100644
--- a/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl
+++ b/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl
@@ -27,33 +27,16 @@
 #ifndef __com_sun_star_packages_XDataSinkEncrSupport_idl__
 #define __com_sun_star_packages_XDataSinkEncrSupport_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
 #include <com/sun/star/packages/WrongPasswordException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
 #include <com/sun/star/packages/NoEncryptionException.idl>
-#endif
 
-#ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__
 #include <com/sun/star/packages/EncryptionNotAllowedException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
 #include <com/sun/star/packages/NoRawFormatException.idl>
-#endif
 
 
 //=============================================================================
@@ -92,7 +75,7 @@ interface XDataSinkEncrSupport: com::sun::star::uno::XInterface
     In case stream is not encrypted an exception will be thrown.
     <p>
         The difference of raw stream is that it contains header for encrypted data,
-    so an encrypted stream can be copyed from one PackageStream to
+    so an encrypted stream can be copied from one PackageStream to
     another one without decryption.
     </p>
 
diff --git a/offapi/com/sun/star/packages/manifest/XManifestReader.idl b/offapi/com/sun/star/packages/manifest/XManifestReader.idl
index 91f589ee258e..7a0a7b3047f5 100644
--- a/offapi/com/sun/star/packages/manifest/XManifestReader.idl
+++ b/offapi/com/sun/star/packages/manifest/XManifestReader.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_packages_manifest_XManifestReader_idl__
 #define __com_sun_star_packages_manifest_XManifestReader_idl__
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
 //=============================================================================
 
@@ -41,7 +36,7 @@ module com {  module sun {  module star {   module packages {  module manifest {
 
 //=============================================================================
 /** This interface reads the manifest data from a file. The user
-    must supply an XInputStream when calling readManifestSequence() to recieve
+    must supply an XInputStream when calling readManifestSequence() to receive
     a sequence of manifest entries. Each manifest entry is represented by
     a sequence of PropertyValues. */
 //=============================================================================
diff --git a/offapi/com/sun/star/packages/manifest/XManifestWriter.idl b/offapi/com/sun/star/packages/manifest/XManifestWriter.idl
index c38b9cacaf76..6eb1ed7b9ab6 100644
--- a/offapi/com/sun/star/packages/manifest/XManifestWriter.idl
+++ b/offapi/com/sun/star/packages/manifest/XManifestWriter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_packages_manifest_XManifestWriter_idl__
 #define __com_sun_star_packages_manifest_XManifestWriter_idl__
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
index 089b2e3a57cf..6cc11b3875a3 100644
--- a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
+++ b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_packages_zip_XZipFileAccess_idl__
 #define __com_sun_star_packages_zip_XZipFileAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_packages_zip_ZipEntry_idl__
 #include <com/sun/star/packages/zip/ZipEntry.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl_
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
@@ -50,7 +39,7 @@ module com {  module sun {  module star {   module packages {  module zip {
 
 //=============================================================================
 
-/** allows to get reading access to nonencrypted entries inside zip file.
+/** allows to get reading access to non-encrypted entries inside zip file.
  */
 interface XZipFileAccess: ::com::sun::star::uno::XInterface
 {
@@ -59,8 +48,8 @@ interface XZipFileAccess: ::com::sun::star::uno::XInterface
 
         <p>
         The first stream with a name that fits to the pattern will be returned.
-        The pattern allows to use '*' wildcard symbol. If the name contains '*'
-        or '\' symbols itself they must guarded with backslash '\'.
+        The pattern allows to use "*" wildcard symbol. If the name contains "*"
+        or "\" symbols itself they must guarded with backslash "\".
         The slashes have no special meaning here so they can be replaced
         by wildcards also.
         </p>
diff --git a/offapi/com/sun/star/packages/zip/ZipConstants.idl b/offapi/com/sun/star/packages/zip/ZipConstants.idl
index 1a823a889255..951ab75ae0f8 100644
--- a/offapi/com/sun/star/packages/zip/ZipConstants.idl
+++ b/offapi/com/sun/star/packages/zip/ZipConstants.idl
@@ -159,7 +159,7 @@ published constants ZipConstants
     const short LOCTIM = 10;
 
     //-------------------------------------------------------------------------
-    /** LOC header field "crc of uncompressed data" offset
+    /** LOC header field "CRC of uncompressed data" offset
      */
     const short LOCCRC = 14;
 
@@ -184,7 +184,7 @@ published constants ZipConstants
     const short LOCEXT = 28;
 
     //-------------------------------------------------------------------------
-    /** EXT header field "crc of uncompressed data" offsets
+    /** EXT header field "CRC of uncompressed data" offsets
      */
     const short EXTCRC = 4;
 
@@ -229,7 +229,7 @@ published constants ZipConstants
     const short CENDAT = 14;
 
     //-------------------------------------------------------------------------
-    /** CEN header field "crc of uncompressed data" offset
+    /** CEN header field "CRC of uncompressed data" offset
      */
     const short CENCRC = 16;
 
diff --git a/offapi/com/sun/star/packages/zip/ZipEntry.idl b/offapi/com/sun/star/packages/zip/ZipEntry.idl
index f363c3244c41..0640781b5ecb 100644
--- a/offapi/com/sun/star/packages/zip/ZipEntry.idl
+++ b/offapi/com/sun/star/packages/zip/ZipEntry.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_packages_zip_ZipEntry_idl__
 #define __com_sun_star_packages_zip_ZipEntry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
 #include <com/sun/star/xml/sax/InputSource.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
@@ -75,7 +69,7 @@ published struct ZipEntry
     long nTime;
 
     //-------------------------------------------------------------------------
-    /** crc-32 of entry data
+    /** CRC-32 of entry data
      */
     long nCrc;
 
diff --git a/offapi/com/sun/star/packages/zip/ZipException.idl b/offapi/com/sun/star/packages/zip/ZipException.idl
index 4e816287ee92..fd2396061754 100644
--- a/offapi/com/sun/star/packages/zip/ZipException.idl
+++ b/offapi/com/sun/star/packages/zip/ZipException.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_packages_zip_ZipException_idl__
 #define __com_sun_star_packages_zip_ZipException_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/packages/zip/ZipFileAccess.idl b/offapi/com/sun/star/packages/zip/ZipFileAccess.idl
index 1f8cd8efb999..1940b7fa264a 100644
--- a/offapi/com/sun/star/packages/zip/ZipFileAccess.idl
+++ b/offapi/com/sun/star/packages/zip/ZipFileAccess.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_packages_zip_ZipFileAccess_idl__
 #define __com_sun_star_packages_zip_ZipFileAccess_idl__
 
-#ifndef __com_sun_star_packages_zip_XZipFileAccess_idl__
 #include <com/sun/star/packages/zip/XZipFileAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
@@ -54,7 +40,7 @@ module com {  module sun {  module star {   module packages {  module zip {
 
 //=============================================================================
 
-/** allows to get reading access to nonencrypted entries inside zip file.
+/** allows to get reading access to non-encrypted entries inside zip file.
  */
 service ZipFileAccess
 {
diff --git a/offapi/com/sun/star/packages/zip/ZipIOException.idl b/offapi/com/sun/star/packages/zip/ZipIOException.idl
index 8d3edaba4466..511dddfed805 100755..100644
--- a/offapi/com/sun/star/packages/zip/ZipIOException.idl
+++ b/offapi/com/sun/star/packages/zip/ZipIOException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_packages_zip_ZipIOException_idl__
 #define __com_sun_star_packages_zip_ZipIOException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //=============================================================================
 
@@ -38,7 +36,7 @@ module com {  module sun {  module star {   module packages {  module zip {
 //=============================================================================
 
 /** used to indicate that a ZIP exception has occurred.
-    usualy can be thrown from XInputStream interface implementations.
+    Usually can be thrown from XInputStream interface implementations.
     <p>This interface is an IDL version of the Java interface
     <em>java.util.zip.ZipException</em> with some minor adaptations.</p>
 
diff --git a/offapi/com/sun/star/plugin/PluginException.idl b/offapi/com/sun/star/plugin/PluginException.idl
index 2101e0b45c4b..cc42054ac531 100644
--- a/offapi/com/sun/star/plugin/PluginException.idl
+++ b/offapi/com/sun/star/plugin/PluginException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_plugin_PluginException_idl__
 #define __com_sun_star_plugin_PluginException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
@@ -38,7 +36,7 @@
 
 //=============================================================================
 
-/** Indicates that an error occured in an NPN or NPP function call.
+/** Indicates that an error occurred in an NPN or NPP function call.
 
     @see XPlugin
     @see XPluginContext
diff --git a/offapi/com/sun/star/plugin/PluginManager.idl b/offapi/com/sun/star/plugin/PluginManager.idl
index 36421513e5a3..15f166a1f54e 100644
--- a/offapi/com/sun/star/plugin/PluginManager.idl
+++ b/offapi/com/sun/star/plugin/PluginManager.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_plugin_PluginManager_idl__
 #define __com_sun_star_plugin_PluginManager_idl__
 
-#ifndef __com_sun_star_plugin_XPluginManager_idl__
 #include <com/sun/star/plugin/XPluginManager.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/plugin/XPlugin.idl b/offapi/com/sun/star/plugin/XPlugin.idl
index 0cc1d3214a80..fc39548abfaa 100644
--- a/offapi/com/sun/star/plugin/XPlugin.idl
+++ b/offapi/com/sun/star/plugin/XPlugin.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_plugin_XPlugin_idl__
 #define __com_sun_star_plugin_XPlugin_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
 #include <com/sun/star/io/XActiveDataSource.idl>
-#endif
 
-#ifndef __com_sun_star_plugin_PluginException_idl__
 #include <com/sun/star/plugin/PluginException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/plugin/XPluginContext.idl b/offapi/com/sun/star/plugin/XPluginContext.idl
index e70479587a76..c24b142d0e8d 100644
--- a/offapi/com/sun/star/plugin/XPluginContext.idl
+++ b/offapi/com/sun/star/plugin/XPluginContext.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_plugin_XPluginContext_idl__
 #define __com_sun_star_plugin_XPluginContext_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_plugin_XPlugin_idl__
 #include <com/sun/star/plugin/XPlugin.idl>
-#endif
 
-#ifndef __com_sun_star_plugin_PluginVariable_idl__
 #include <com/sun/star/plugin/PluginVariable.idl>
-#endif
 
-#ifndef __com_sun_star_plugin_PluginException_idl__
 #include <com/sun/star/plugin/PluginException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
 #include <com/sun/star/io/XActiveDataSource.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/plugin/XPluginManager.idl b/offapi/com/sun/star/plugin/XPluginManager.idl
index 56a118bfc97a..d7c333c0f917 100644
--- a/offapi/com/sun/star/plugin/XPluginManager.idl
+++ b/offapi/com/sun/star/plugin/XPluginManager.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_plugin_XPluginManager_idl__
 #define __com_sun_star_plugin_XPluginManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_plugin_XPluginContext_idl__
 #include <com/sun/star/plugin/XPluginContext.idl>
-#endif
 
-#ifndef __com_sun_star_plugin_PluginDescription_idl__
 #include <com/sun/star/plugin/PluginDescription.idl>
-#endif
 
-#ifndef __com_sun_star_plugin_XPlugin_idl__
 #include <com/sun/star/plugin/XPlugin.idl>
-#endif
 
-#ifndef __com_sun_star_plugin_PluginException_idl__
 #include <com/sun/star/plugin/PluginException.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XToolkit_idl__
 #include <com/sun/star/awt/XToolkit.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
 #include <com/sun/star/awt/XWindowPeer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/presentation/AnimationEffect.idl b/offapi/com/sun/star/presentation/AnimationEffect.idl
index 8770080783f0..d7c80c503c5a 100644
--- a/offapi/com/sun/star/presentation/AnimationEffect.idl
+++ b/offapi/com/sun/star/presentation/AnimationEffect.idl
@@ -52,7 +52,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_LEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_LEFT
-    /** use the animation effect 'Fade from Left'.
+    /** use the animation effect "Fade from Left".
      */
     FADE_FROM_LEFT,
 
@@ -60,7 +60,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_TOP,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_TOP
-    /** use the animation effect 'Fade from Top'.
+    /** use the animation effect "Fade from Top".
      */
     FADE_FROM_TOP,
 
@@ -68,7 +68,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_RIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_RIGHT
-    /** use the animation effect 'Fade from Right'.
+    /** use the animation effect "Fade from Right".
      */
     FADE_FROM_RIGHT,
 
@@ -76,7 +76,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_BOTTOM,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_BOTTOM
-    /** use the animation effect 'Fade from Bottom'.
+    /** use the animation effect "Fade from Bottom".
      */
     FADE_FROM_BOTTOM,
 
@@ -84,7 +84,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_TO_CENTER,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_TO_CENTER
-    /** use the animation effect 'Fade to Center'.
+    /** use the animation effect "Fade to Center".
      */
     FADE_TO_CENTER,
 
@@ -92,7 +92,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_CENTER,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_CENTER
-    /** use the animation effect 'Fade from Center'.
+    /** use the animation effect "Fade from Center".
      */
     FADE_FROM_CENTER,
 
@@ -100,7 +100,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_LEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_LEFT
-    /** use the animation effect 'Move from Left'.
+    /** use the animation effect "Move from Left".
      */
     MOVE_FROM_LEFT,
 
@@ -108,7 +108,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_TOP,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_TOP
-    /** use the animation effect 'Move from Top'.
+    /** use the animation effect "Move from Top".
      */
     MOVE_FROM_TOP,
 
@@ -116,7 +116,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_RIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_RIGHT
-    /** use the animation effect 'Move from Right'.
+    /** use the animation effect "Move from Right".
      */
     MOVE_FROM_RIGHT,
 
@@ -124,7 +124,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_BOTTOM,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_BOTTOM
-    /** use the animation effect 'Move from Bottom'.
+    /** use the animation effect "Move from Bottom".
      */
     MOVE_FROM_BOTTOM,
 
@@ -132,7 +132,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  VERTICAL_STRIPES,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_STRIPES
-    /** use the animation effect 'Vertical Stripes'.
+    /** use the animation effect "Vertical Stripes".
      */
     VERTICAL_STRIPES,
 
@@ -140,7 +140,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  HORIZONTAL_STRIPES,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_STRIPES
-    /** use the animation effect 'Horizontal Stripes'.
+    /** use the animation effect "Horizontal Stripes".
      */
     HORIZONTAL_STRIPES,
 
@@ -148,7 +148,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  CLOCKWISE,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::CLOCKWISE
-    /** use the animation effect 'Clockwise'.
+    /** use the animation effect "Clockwise".
      */
     CLOCKWISE,
 
@@ -156,7 +156,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  COUNTERCLOCKWISE,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::COUNTERCLOCKWISE
-    /** use the animation effect 'Counter Clockwise'.
+    /** use the animation effect "Counter Clockwise".
      */
     COUNTERCLOCKWISE,
 
@@ -164,7 +164,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_UPPERLEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_UPPERLEFT
-    /** use the animation effect 'Fade from Upper Left'.
+    /** use the animation effect "Fade from Upper Left".
      */
     FADE_FROM_UPPERLEFT,
 
@@ -172,7 +172,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_UPPERRIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_UPPERRIGHT
-    /** use the animation effect 'Fade from Upper Right'.
+    /** use the animation effect "Fade from Upper Right".
      */
     FADE_FROM_UPPERRIGHT,
 
@@ -180,7 +180,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_LOWERLEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_LOWERLEFT
-    /** use the animation effect 'Fade from Lower Left'.
+    /** use the animation effect "Fade from Lower Left".
      */
     FADE_FROM_LOWERLEFT,
 
@@ -188,7 +188,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_LOWERRIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_LOWERRIGHT
-    /** use the animation effect 'Fade from Lower Right'.
+    /** use the animation effect "Fade from Lower Right".
      */
     FADE_FROM_LOWERRIGHT,
 
@@ -196,7 +196,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  CLOSE_VERTICAL,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::CLOSE_VERTICAL
-    /** use the animation effect 'Close Vertical'.
+    /** use the animation effect "Close Vertical".
      */
     CLOSE_VERTICAL,
 
@@ -204,7 +204,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  CLOSE_HORIZONTAL,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::CLOSE_HORIZONTAL
-    /** use the animation effect 'Close Horizontal'.
+    /** use the animation effect "Close Horizontal".
      */
     CLOSE_HORIZONTAL,
 
@@ -212,7 +212,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  OPEN_VERTICAL,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::OPEN_VERTICAL
-    /** use the animation effect 'Open Vertical'.
+    /** use the animation effect "Open Vertical".
      */
     OPEN_VERTICAL,
 
@@ -220,7 +220,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  OPEN_HORIZONTAL,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::OPEN_HORIZONTAL
-    /** use the animation effect 'Open Horizontal'.
+    /** use the animation effect "Open Horizontal".
      */
     OPEN_HORIZONTAL,
 
@@ -228,7 +228,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  PATH,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::PATH
-    /** use the animation effect 'Path'.
+    /** use the animation effect "Path".
      */
     PATH,
 
@@ -236,7 +236,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_LEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_LEFT
-    /** use the animation effect 'Move to Left'.
+    /** use the animation effect "Move to Left".
      */
     MOVE_TO_LEFT,
 
@@ -244,7 +244,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_TOP,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_TOP
-    /** use the animation effect 'Move to Top'.
+    /** use the animation effect "Move to Top".
      */
     MOVE_TO_TOP,
 
@@ -252,7 +252,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_RIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_RIGHT
-    /** use the animation effect 'Move to Right'.
+    /** use the animation effect "Move to Right".
      */
     MOVE_TO_RIGHT,
 
@@ -260,7 +260,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_BOTTOM,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_BOTTOM
-    /** use the animation effect 'Move to Bottom'.
+    /** use the animation effect "Move to Bottom".
      */
     MOVE_TO_BOTTOM,
 
@@ -268,7 +268,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  SPIRALIN_LEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::SPIRALIN_LEFT
-    /** use the animation effect 'Spiral Inward Left'.
+    /** use the animation effect "Spiral Inward Left".
      */
     SPIRALIN_LEFT,
 
@@ -276,7 +276,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  SPIRALIN_RIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::SPIRALIN_RIGHT
-    /** use the animation effect 'Spiral Inward Right'.
+    /** use the animation effect "Spiral Inward Right".
      */
     SPIRALIN_RIGHT,
 
@@ -284,7 +284,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  SPIRALOUT_LEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::SPIRALOUT_LEFT
-    /** use the animation effect 'Spiral Outward Left'.
+    /** use the animation effect "Spiral Outward Left".
      */
     SPIRALOUT_LEFT,
 
@@ -292,7 +292,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  SPIRALOUT_RIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::SPIRALOUT_RIGHT
-    /** use the animation effect 'Spiral Outward Right'.
+    /** use the animation effect "Spiral Outward Right".
      */
     SPIRALOUT_RIGHT,
 
@@ -300,7 +300,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  DISSOLVE,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::DISSOLVE
-    /** use the animation effect 'Spiral Inward Left'.
+    /** use the animation effect "Spiral Inward Left".
      */
     DISSOLVE,
 
@@ -308,7 +308,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  WAVYLINE_FROM_LEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::WAVYLINE_FROM_LEFT
-    /** use the animation effect 'Wavy Line from Left'.
+    /** use the animation effect "Wavy Line from Left".
      */
     WAVYLINE_FROM_LEFT,
 
@@ -316,7 +316,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  WAVYLINE_FROM_TOP,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::WAVYLINE_FROM_TOP
-    /** use the animation effect 'Wavy Line from Top'.
+    /** use the animation effect "Wavy Line from Top".
      */
     WAVYLINE_FROM_TOP,
 
@@ -324,7 +324,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  WAVYLINE_FROM_RIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::WAVYLINE_FROM_RIGHT
-    /** use the animation effect 'Wavy Line from Right'.
+    /** use the animation effect "Wavy Line from Right".
      */
     WAVYLINE_FROM_RIGHT,
 
@@ -332,7 +332,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  WAVYLINE_FROM_BOTTOM,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::WAVYLINE_FROM_BOTTOM
-    /** use the animation effect 'Wavy Line from Button'.
+    /** use the animation effect "Wavy Line from Button".
      */
     WAVYLINE_FROM_BOTTOM,
 
@@ -340,7 +340,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  RANDOM,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::RANDOM
-    /** use the animation effect 'Random'.
+    /** use the animation effect "Random".
      */
     RANDOM,
 
@@ -348,7 +348,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  VERTICAL_LINES,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_LINES
-    /** use the animation effect 'Vertical Lines'.
+    /** use the animation effect "Vertical Lines".
      */
     VERTICAL_LINES,
 
@@ -356,7 +356,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  HORIZONTAL_LINES,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_LINES
-    /** use the animation effect 'Horizontal Lines'.
+    /** use the animation effect "Horizontal Lines".
      */
     HORIZONTAL_LINES,
 
@@ -364,7 +364,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_LEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_LEFT
-    /** use the animation effect 'Wavy Line from Left'.
+    /** use the animation effect "Wavy Line from Left".
      */
     LASER_FROM_LEFT,
 
@@ -372,7 +372,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_TOP,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_TOP
-    /** use the animation effect 'Laser from Top'.
+    /** use the animation effect "Laser from Top".
      */
     LASER_FROM_TOP,
 
@@ -380,7 +380,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_RIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_RIGHT
-    /** use the animation effect 'Laser from Right'.
+    /** use the animation effect "Laser from Right".
      */
     LASER_FROM_RIGHT,
 
@@ -388,7 +388,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_BOTTOM,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_BOTTOM
-    /** use the animation effect 'Laser from Bottom'.
+    /** use the animation effect "Laser from Bottom".
      */
     LASER_FROM_BOTTOM,
 
@@ -396,7 +396,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_UPPERLEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_UPPERLEFT
-    /** use the animation effect 'Laser from Upper Left'.
+    /** use the animation effect "Laser from Upper Left".
      */
     LASER_FROM_UPPERLEFT,
 
@@ -404,7 +404,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_UPPERRIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_UPPERRIGHT
-    /** use the animation effect 'Laser from Upper Right'.
+    /** use the animation effect "Laser from Upper Right".
      */
     LASER_FROM_UPPERRIGHT,
 
@@ -412,7 +412,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_LOWERLEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_LOWERLEFT
-    /** use the animation effect 'Laser from Lower Left'.
+    /** use the animation effect "Laser from Lower Left".
      */
     LASER_FROM_LOWERLEFT,
 
@@ -420,7 +420,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_LOWERRIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_LOWERRIGHT
-    /** use the animation effect 'Laser from Lower Right'.
+    /** use the animation effect "Laser from Lower Right".
      */
     LASER_FROM_LOWERRIGHT,
 
@@ -428,7 +428,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  APPEAR,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::APPEAR
-    /** use the animation effect 'Appear'.
+    /** use the animation effect "Appear".
      */
     APPEAR,
 
@@ -436,7 +436,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  HIDE
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HIDE
-    /** use the animation effect 'Hide'.
+    /** use the animation effect "Hide".
      */
     HIDE,
 
@@ -444,7 +444,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_UPPERLEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_UPPERLEFT
-    /** use the animation effect 'Move from Upper Left'.
+    /** use the animation effect "Move from Upper Left".
      */
     MOVE_FROM_UPPERLEFT,
 
@@ -452,7 +452,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_UPPERRIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_UPPERRIGHT
-    /** use the animation effect 'Move from Upper Right'.
+    /** use the animation effect "Move from Upper Right".
      */
     MOVE_FROM_UPPERRIGHT,
 
@@ -460,7 +460,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_LOWERRIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_LOWERRIGHT
-    /** use the animation effect 'Move from Lower Right'.
+    /** use the animation effect "Move from Lower Right".
      */
     MOVE_FROM_LOWERRIGHT,
 
@@ -468,7 +468,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_LOWERLEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_LOWERLEFT
-    /** use the animation effect 'Move from Lower Left'.
+    /** use the animation effect "Move from Lower Left".
      */
     MOVE_FROM_LOWERLEFT,
 
@@ -476,7 +476,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_UPPERLEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_UPPERLEFT
-    /** use the animation effect 'Move to Upper Left'.
+    /** use the animation effect "Move to Upper Left".
      */
     MOVE_TO_UPPERLEFT,
 
@@ -484,7 +484,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_UPPERRIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_UPPERRIGHT
-    /** use the animation effect 'Move to Upper Right'.
+    /** use the animation effect "Move to Upper Right".
      */
     MOVE_TO_UPPERRIGHT,
 
@@ -492,7 +492,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_LOWERRIGHT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_LOWERRIGHT
-    /** use the animation effect 'Move to Lower Right'.
+    /** use the animation effect "Move to Lower Right".
      */
     MOVE_TO_LOWERRIGHT,
 
@@ -500,7 +500,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_LOWERLEFT,
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_LOWERLEFT
-    /** use the animation effect 'Move to Lower Left'.
+    /** use the animation effect "Move to Lower Left".
      */
     MOVE_TO_LOWERLEFT,
 
@@ -508,7 +508,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_LEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_LEFT
-    /** use the animation effect 'Move Short from Left'.
+    /** use the animation effect "Move Short from Left".
      */
     MOVE_SHORT_FROM_LEFT,
 
@@ -516,7 +516,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_UPPERLEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_UPPERLEFT
-    /** use the animation effect 'Move Short from Upper Left'.
+    /** use the animation effect "Move Short from Upper Left".
      */
     MOVE_SHORT_FROM_UPPERLEFT,
 
@@ -524,7 +524,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_TOP
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_TOP
-    /** use the animation effect 'Move Short from Top'.
+    /** use the animation effect "Move Short from Top".
      */
     MOVE_SHORT_FROM_TOP,
 
@@ -532,7 +532,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_UPPERRIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_UPPERRIGHT
-    /** use the animation effect 'Move Short from Upper Right'.
+    /** use the animation effect "Move Short from Upper Right".
      */
     MOVE_SHORT_FROM_UPPERRIGHT,
 
@@ -540,7 +540,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_RIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_RIGHT
-    /** use the animation effect 'Move Short from Right'.
+    /** use the animation effect "Move Short from Right".
      */
     MOVE_SHORT_FROM_RIGHT,
 
@@ -548,7 +548,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_LOWERRIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_LOWERRIGHT
-    /** use the animation effect 'Move Short from Lower Right'.
+    /** use the animation effect "Move Short from Lower Right".
      */
     MOVE_SHORT_FROM_LOWERRIGHT,
 
@@ -556,7 +556,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_BOTTOM
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_BOTTOM
-    /** use the animation effect 'Move Short from Bottom'.
+    /** use the animation effect "Move Short from Bottom".
      */
     MOVE_SHORT_FROM_BOTTOM,
 
@@ -564,7 +564,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_LOWERLEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_LOWERLEFT
-    /** use the animation effect 'Move Short from Lower Left'.
+    /** use the animation effect "Move Short from Lower Left".
      */
     MOVE_SHORT_FROM_LOWERLEFT,
 
@@ -572,7 +572,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_LEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_LEFT
-    /** use the animation effect 'Move Short to Left'.
+    /** use the animation effect "Move Short to Left".
      */
     MOVE_SHORT_TO_LEFT,
 
@@ -580,7 +580,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_UPPERLEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_UPPERLEFT
-    /** use the animation effect 'Move Short to Upper Left'.
+    /** use the animation effect "Move Short to Upper Left".
      */
     MOVE_SHORT_TO_UPPERLEFT,
 
@@ -588,7 +588,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_TOP
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_TOP
-    /** use the animation effect 'Move Short to Top'.
+    /** use the animation effect "Move Short to Top".
      */
     MOVE_SHORT_TO_TOP,
 
@@ -596,7 +596,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_UPPERRIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_UPPERRIGHT
-    /** use the animation effect 'Move Short to Upper Right'.
+    /** use the animation effect "Move Short to Upper Right".
      */
     MOVE_SHORT_TO_UPPERRIGHT,
 
@@ -604,7 +604,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_RIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_RIGHT
-    /** use the animation effect 'Move Short to Right'.
+    /** use the animation effect "Move Short to Right".
      */
     MOVE_SHORT_TO_RIGHT,
 
@@ -612,7 +612,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_LOWERRIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_LOWERRIGHT
-    /** use the animation effect 'Move Short to Lower Right'.
+    /** use the animation effect "Move Short to Lower Right".
      */
     MOVE_SHORT_TO_LOWERRIGHT,
 
@@ -620,7 +620,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_BOTTOM
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_BOTTOM
-    /** use the animation effect 'Move Short to Bottom'.
+    /** use the animation effect "Move Short to Bottom".
      */
     MOVE_SHORT_TO_BOTTOM,
 
@@ -628,7 +628,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_LOWERLEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_LOWERLEFT
-    /** use the animation effect 'Move Short to Lower Left'.
+    /** use the animation effect "Move Short to Lower Left".
      */
     MOVE_SHORT_TO_LOWERLEFT,
 
@@ -636,7 +636,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  VERTICAL_CHECKERBOARD
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_CHECKERBOARD
-    /** use the animation effect 'Vertical Checkerboard'.
+    /** use the animation effect "Vertical Checkerboard".
      */
     VERTICAL_CHECKERBOARD,
 
@@ -644,7 +644,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  HORIZONTAL_CHECKERBOARD
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_CHECKERBOARD
-    /** use the animation effect 'Horizontal Checkerboard'.
+    /** use the animation effect "Horizontal Checkerboard".
      */
     HORIZONTAL_CHECKERBOARD,
 
@@ -652,7 +652,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  HORIZONTAL_ROTATE
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_ROTATE
-    /** use the animation effect 'Horizontal Rotate'.
+    /** use the animation effect "Horizontal Rotate".
      */
     HORIZONTAL_ROTATE,
 
@@ -660,7 +660,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  VERTICAL_ROTATE
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_ROTATE
-    /** use the animation effect 'Vertical Rotate'.
+    /** use the animation effect "Vertical Rotate".
      */
     VERTICAL_ROTATE,
 
@@ -668,7 +668,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  HORIZONTAL_STRETCH
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_STRETCH
-    /** use the animation effect 'Horizontal Stretch'.
+    /** use the animation effect "Horizontal Stretch".
      */
     HORIZONTAL_STRETCH,
 
@@ -676,7 +676,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  VERTICAL_STRETCH
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_STRETCH
-    /** use the animation effect 'Vertical Stretch'.
+    /** use the animation effect "Vertical Stretch".
      */
     VERTICAL_STRETCH,
 
@@ -684,7 +684,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_LEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_LEFT
-    /** use the animation effect 'Stretch From Left'.
+    /** use the animation effect "Stretch From Left".
      */
     STRETCH_FROM_LEFT,
 
@@ -692,7 +692,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_UPPERLEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_UPPERLEFT
-    /** use the animation effect 'Stretch From Upper Left'.
+    /** use the animation effect "Stretch From Upper Left".
      */
     STRETCH_FROM_UPPERLEFT,
 
@@ -700,7 +700,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_TOP
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_TOP
-    /** use the animation effect 'Stretch From Top'.
+    /** use the animation effect "Stretch From Top".
      */
     STRETCH_FROM_TOP,
 
@@ -708,7 +708,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_UPPERRIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_UPPERRIGHT
-    /** use the animation effect 'Stretch From Upper Right'.
+    /** use the animation effect "Stretch From Upper Right".
      */
     STRETCH_FROM_UPPERRIGHT,
 
@@ -716,7 +716,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_RIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_RIGHT
-    /** use the animation effect 'Stretch From Right'.
+    /** use the animation effect "Stretch From Right".
      */
     STRETCH_FROM_RIGHT,
 
@@ -724,7 +724,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_LOWERRIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_LOWERRIGHT
-    /** use the animation effect 'Stretch From Lower Right'.
+    /** use the animation effect "Stretch From Lower Right".
      */
     STRETCH_FROM_LOWERRIGHT,
 
@@ -732,7 +732,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_BOTTOM
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_BOTTOM
-    /** use the animation effect 'Stretch From Bottom'.
+    /** use the animation effect "Stretch From Bottom".
      */
     STRETCH_FROM_BOTTOM,
 
@@ -740,7 +740,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_LOWERLEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_LOWERLEFT
-    /** use the animation effect 'Stretch From Lower Left'.
+    /** use the animation effect "Stretch From Lower Left".
      */
     STRETCH_FROM_LOWERLEFT,
 
@@ -748,7 +748,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN
-    /** use the animation effect 'Zoom In'.
+    /** use the animation effect "Zoom In".
      */
     ZOOM_IN,
 
@@ -756,7 +756,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_SMALL
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_SMALL
-    /** use the animation effect 'Zoom In Small'.
+    /** use the animation effect "Zoom In Small".
      */
     ZOOM_IN_SMALL,
 
@@ -764,7 +764,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_SPIRAL
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_SPIRAL
-    /** use the animation effect 'Zoom In Spiral'.
+    /** use the animation effect "Zoom In Spiral".
      */
     ZOOM_IN_SPIRAL,
 
@@ -772,7 +772,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT
-    /** use the animation effect 'Zoom Out'.
+    /** use the animation effect "Zoom Out".
      */
     ZOOM_OUT,
 
@@ -780,7 +780,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_SMALL
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_SMALL
-    /** use the animation effect 'Zoom Out Small'.
+    /** use the animation effect "Zoom Out Small".
      */
     ZOOM_OUT_SMALL,
 
@@ -788,7 +788,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_SPIRAL
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_SPIRAL
-    /** use the animation effect 'Zoom Out Spiral'.
+    /** use the animation effect "Zoom Out Spiral".
      */
     ZOOM_OUT_SPIRAL,
 
@@ -796,7 +796,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_LEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_LEFT
-    /** use the animation effect 'Zoom In From Left'.
+    /** use the animation effect "Zoom In From Left".
      */
     ZOOM_IN_FROM_LEFT,
 
@@ -804,7 +804,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_UPPERLEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_UPPERLEFT
-    /** use the animation effect 'Zoom In From Upper Left'.
+    /** use the animation effect "Zoom In From Upper Left".
      */
     ZOOM_IN_FROM_UPPERLEFT,
 
@@ -812,7 +812,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_TOP
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_TOP
-    /** use the animation effect 'Zoom In From Top'.
+    /** use the animation effect "Zoom In From Top".
      */
     ZOOM_IN_FROM_TOP,
 
@@ -820,7 +820,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_UPPERRIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_UPPERRIGHT
-    /** use the animation effect 'Zoom In From Upper Right'.
+    /** use the animation effect "Zoom In From Upper Right".
      */
     ZOOM_IN_FROM_UPPERRIGHT,
 
@@ -828,7 +828,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_RIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_RIGHT
-    /** use the animation effect 'Zoom In From Right'.
+    /** use the animation effect "Zoom In From Right".
      */
     ZOOM_IN_FROM_RIGHT,
 
@@ -836,7 +836,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_LOWERRIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_LOWERRIGHT
-    /** use the animation effect 'Zoom In From Lower Right'.
+    /** use the animation effect "Zoom In From Lower Right".
      */
     ZOOM_IN_FROM_LOWERRIGHT,
 
@@ -844,7 +844,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_BOTTOM
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_BOTTOM
-    /** use the animation effect 'Zoom In From Bottom'.
+    /** use the animation effect "Zoom In From Bottom".
      */
     ZOOM_IN_FROM_BOTTOM,
 
@@ -852,7 +852,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_LOWERLEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_LOWERLEFT
-    /** use the animation effect 'Zoom In From Lower Left'.
+    /** use the animation effect "Zoom In From Lower Left".
      */
     ZOOM_IN_FROM_LOWERLEFT,
 
@@ -860,7 +860,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_CENTER
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_CENTER
-    /** use the animation effect 'Zoom In From Center'.
+    /** use the animation effect "Zoom In From Center".
      */
     ZOOM_IN_FROM_CENTER,
 
@@ -868,7 +868,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_LEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_LEFT
-    /** use the animation effect 'Zoom Out From Left'.
+    /** use the animation effect "Zoom Out From Left".
      */
     ZOOM_OUT_FROM_LEFT,
 
@@ -876,7 +876,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_UPPERLEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_UPPERLEFT
-    /** use the animation effect 'Zoom Out From Upper Left'.
+    /** use the animation effect "Zoom Out From Upper Left".
      */
     ZOOM_OUT_FROM_UPPERLEFT,
 
@@ -884,7 +884,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_TOP
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_TOP
-    /** use the animation effect 'Zoom Out From Top'.
+    /** use the animation effect "Zoom Out From Top".
      */
     ZOOM_OUT_FROM_TOP,
 
@@ -892,7 +892,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_UPPERRIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_UPPERRIGHT
-    /** use the animation effect 'Zoom Out From Upper Right'.
+    /** use the animation effect "Zoom Out From Upper Right".
      */
     ZOOM_OUT_FROM_UPPERRIGHT,
 
@@ -900,7 +900,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_RIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_RIGHT
-    /** use the animation effect 'Zoom Out From Right'.
+    /** use the animation effect "Zoom Out From Right".
      */
     ZOOM_OUT_FROM_RIGHT,
 
@@ -908,7 +908,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_LOWERRIGHT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_LOWERRIGHT
-    /** use the animation effect 'Zoom Out From Lower Right'.
+    /** use the animation effect "Zoom Out From Lower Right".
      */
     ZOOM_OUT_FROM_LOWERRIGHT,
 
@@ -916,7 +916,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_BOTTOM
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_BOTTOM
-    /** use the animation effect 'Zoom Out From Bottom'.
+    /** use the animation effect "Zoom Out From Bottom".
      */
     ZOOM_OUT_FROM_BOTTOM,
 
@@ -924,7 +924,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_LOWERLEFT
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_LOWERLEFT
-    /** use the animation effect 'Zoom Out From Lower Left'.
+    /** use the animation effect "Zoom Out From Lower Left".
      */
     ZOOM_OUT_FROM_LOWERLEFT,
 
@@ -932,7 +932,7 @@ published enum AnimationEffect
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_CENTER
 
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_CENTER
-    /** use the animation effect 'Zoom Out From Center'.
+    /** use the animation effect "Zoom Out From Center".
      */
     ZOOM_OUT_FROM_CENTER
 };
diff --git a/offapi/com/sun/star/presentation/ChartShape.idl b/offapi/com/sun/star/presentation/ChartShape.idl
index 440e28df51b8..4b46a3313ea2 100644
--- a/offapi/com/sun/star/presentation/ChartShape.idl
+++ b/offapi/com/sun/star/presentation/ChartShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_ChartShape_idl__
 #define __com_sun_star_presentation_ChartShape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_OLE2Shape_idl__
 #include <com/sun/star/drawing/OLE2Shape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the chart presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service ChartShape
diff --git a/offapi/com/sun/star/presentation/ClickAction.idl b/offapi/com/sun/star/presentation/ClickAction.idl
index 3ad4d4b5c0d5..03fcd487d7bf 100644
--- a/offapi/com/sun/star/presentation/ClickAction.idl
+++ b/offapi/com/sun/star/presentation/ClickAction.idl
@@ -95,7 +95,7 @@ published enum ClickAction
 
     //-------------------------------------------------------------------------
 
-    /** An ole verb is performed on this object.
+    /** An OLE verb is performed on this object.
      */
     VERB,
 
diff --git a/offapi/com/sun/star/presentation/CustomPresentation.idl b/offapi/com/sun/star/presentation/CustomPresentation.idl
index 68bd79aede66..6b44ded62099 100644
--- a/offapi/com/sun/star/presentation/CustomPresentation.idl
+++ b/offapi/com/sun/star/presentation/CustomPresentation.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_CustomPresentation_idl__
 #define __com_sun_star_presentation_CustomPresentation_idl__
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/presentation/CustomPresentationAccess.idl b/offapi/com/sun/star/presentation/CustomPresentationAccess.idl
index fe23098bfd36..23e41f529b7f 100644
--- a/offapi/com/sun/star/presentation/CustomPresentationAccess.idl
+++ b/offapi/com/sun/star/presentation/CustomPresentationAccess.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_CustomPresentationAccess_idl__
 #define __com_sun_star_presentation_CustomPresentationAccess_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/presentation/DateTimeShape.idl b/offapi/com/sun/star/presentation/DateTimeShape.idl
index c4d68dd3a5b5..6e08cad1fb69 100644
--- a/offapi/com/sun/star/presentation/DateTimeShape.idl
+++ b/offapi/com/sun/star/presentation/DateTimeShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_DateTimeShape_idl__
 #define __com_sun_star_presentation_DateTimeShape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextShape_idl__
 #include <com/sun/star/drawing/TextShape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the date and time presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 service DateTimeShape
diff --git a/offapi/com/sun/star/presentation/DocumentSettings.idl b/offapi/com/sun/star/presentation/DocumentSettings.idl
index c97d205cf3ef..549f3ae27db0 100644
--- a/offapi/com/sun/star/presentation/DocumentSettings.idl
+++ b/offapi/com/sun/star/presentation/DocumentSettings.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_presentation_DocumentSettings_idl__
 #define __com_sun_star_presentation_DocumentSettings_idl__
 
-#ifndef __com_sun_star_document_HeaderFooterSettings_idl__
 #include <com/sun/star/document/HeaderFooterSettings.idl>
-#endif
-
-#ifndef __com_sun_star_document_Settings_idl__
 #include <com/sun/star/document/Settings.idl>
-#endif
 
 //=============================================================================
 
@@ -107,7 +102,7 @@ published service DocumentSettings
     /** If this is true, the distance between two paragraphs is
         the sum of ParaTopMargin of the previous and ParaBottomMargin of
         the next paragraph. If false, only the greater of the two is
-        choosen.
+        chosen.
      */
     [optional, property] boolean ParagraphSummation;
 
diff --git a/offapi/com/sun/star/presentation/DrawPage.idl b/offapi/com/sun/star/presentation/DrawPage.idl
index c939ae0267c3..c1b88f2cb56c 100644
--- a/offapi/com/sun/star/presentation/DrawPage.idl
+++ b/offapi/com/sun/star/presentation/DrawPage.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_presentation_DrawPage_idl__
 #define __com_sun_star_presentation_DrawPage_idl__
 
-#ifndef __com_sun_star_drawing_DrawPage_idl__
 #include <com/sun/star/drawing/DrawPage.idl>
-#endif
 
-#ifndef __com_sun_star_document_LinkTarget_idl__
 #include <com/sun/star/document/LinkTarget.idl>
-#endif
 
-#ifndef __com_sun_star_presentation_FadeEffect_idl__
 #include <com/sun/star/presentation/FadeEffect.idl>
-#endif
 
-#ifndef __com_sun_star_presentation_AnimationSpeed_idl__
 #include <com/sun/star/presentation/AnimationSpeed.idl>
-#endif
 
 
 //=============================================================================
@@ -111,7 +103,7 @@ published service DrawPage
 
     //-------------------------------------------------------------------------
 
-    /** defines the text that is displayd in a header textfield rendered on this
+    /** defines the text that is displayed in a header textfield rendered on this
         page.
     */
     [optional, property] string HeaderText;
@@ -126,7 +118,7 @@ published service DrawPage
 
     //-------------------------------------------------------------------------
 
-    /** defines the text that is displayd in a footer textfield rendered on this
+    /** defines the text that is displayed in a footer textfield rendered on this
         page.
     */
     [optional, property] string FooterText;
@@ -157,7 +149,7 @@ published service DrawPage
 
     //-------------------------------------------------------------------------
 
-    /** defines the text that is displayd in a date and time textfield rendered on this
+    /** defines the text that is displayed in a date and time textfield rendered on this
         page. This value is only used if <code>IsDateTimeFixed</code> is <true/>.
     */
     [optional, property] string DateTimeText;
diff --git a/offapi/com/sun/star/presentation/EffectCommands.idl b/offapi/com/sun/star/presentation/EffectCommands.idl
index dbb5917a756f..1c870a87edcf 100644
--- a/offapi/com/sun/star/presentation/EffectCommands.idl
+++ b/offapi/com/sun/star/presentation/EffectCommands.idl
@@ -42,7 +42,7 @@ constants EffectCommands
     */
     const short CUSTOM = 0;
 
-    /** the command is an ole verb.
+    /** the command is an OLE verb.
         Required parameters are
             "Verb" of type long that specifies the verb to execute.
     */
@@ -51,7 +51,7 @@ constants EffectCommands
     /** the command starts playing on a media object.
         Optional parameters are
             "MediaTime" of type double that specifies the start
-            time in mili seconds. If not given, play continues at
+            time in milliseconds. If not given, play continues at
             last position known.
     */
     const short PLAY = 2;
diff --git a/offapi/com/sun/star/presentation/EffectNodeType.idl b/offapi/com/sun/star/presentation/EffectNodeType.idl
index 27776d66802a..5547badffb93 100644
--- a/offapi/com/sun/star/presentation/EffectNodeType.idl
+++ b/offapi/com/sun/star/presentation/EffectNodeType.idl
@@ -38,8 +38,8 @@
     This is stored with the name <i>node-type</i> inside the
     <member>::com::sun::star::animations::XAnimationNode::UserData</member> sequence.
     <br>
-    This does not manipulate the timing or syncronization.
-    It can be used to quickly identify semantic blocks inside an animation hierachy.
+    This does not manipulate the timing or synchronization.
+    It can be used to quickly identify semantic blocks inside an animation hierarchy.
 
     @see ::com::sun::star::animations::AnimationNode
 */
@@ -61,7 +61,7 @@ constants EffectNodeType
     */
     const short AFTER_PREVIOUS = 3;
 
-    /** This is the main sequence for effects that is automaticaly started.
+    /** This is the main sequence for effects that is automatically started.
     */
     const short MAIN_SEQUENCE = 4;
 
diff --git a/offapi/com/sun/star/presentation/EffectPresetClass.idl b/offapi/com/sun/star/presentation/EffectPresetClass.idl
index e648a17fcb16..7857dde6f635 100644
--- a/offapi/com/sun/star/presentation/EffectPresetClass.idl
+++ b/offapi/com/sun/star/presentation/EffectPresetClass.idl
@@ -38,8 +38,8 @@
     This is stored with the name <i>preset-class</i> inside the
     <member>::com::sun::star::animations::XAnimationNode::UserData</member> sequence.
     <br>
-    This does not manipulate the timing or syncronization.
-    It can be used to quickly identify preset animations inside an animation hierachy.
+    This does not manipulate the timing or synchronization.
+    It can be used to quickly identify preset animations inside an animation hierarchy.
 
     @see ::com::sun::star::animations::AnimationNode
 */
diff --git a/offapi/com/sun/star/presentation/FadeEffect.idl b/offapi/com/sun/star/presentation/FadeEffect.idl
index 08cc018e1084..7eae9795602f 100644
--- a/offapi/com/sun/star/presentation/FadeEffect.idl
+++ b/offapi/com/sun/star/presentation/FadeEffect.idl
@@ -46,337 +46,337 @@ published enum FadeEffect
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Fade from Left'.
+    /** use the fade effect "Fade from Left".
      */
     FADE_FROM_LEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Fade from Top'.
+    /** use the fade effect "Fade from Top".
      */
     FADE_FROM_TOP,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Fade from Right'.
+    /** use the fade effect "Fade from Right".
      */
     FADE_FROM_RIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Fade from Bottom'.
+    /** use the fade effect "Fade from Bottom".
      */
     FADE_FROM_BOTTOM,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Fade to Center'.
+    /** use the fade effect "Fade to Center".
      */
     FADE_TO_CENTER,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Fade from Center'.
+    /** use the fade effect "Fade from Center".
      */
     FADE_FROM_CENTER,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Move from Left'.
+    /** use the fade effect "Move from Left".
      */
     MOVE_FROM_LEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Move from Top'.
+    /** use the fade effect "Move from Top".
      */
     MOVE_FROM_TOP,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Move from Right'.
+    /** use the fade effect "Move from Right".
      */
     MOVE_FROM_RIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Move from Bottom'.
+    /** use the fade effect "Move from Bottom".
      */
     MOVE_FROM_BOTTOM,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Roll from Left'.
+    /** use the fade effect "Roll from Left".
      */
     ROLL_FROM_LEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Roll from Top'.
+    /** use the fade effect "Roll from Top".
      */
     ROLL_FROM_TOP,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Roll from Right'.
+    /** use the fade effect "Roll from Right".
      */
     ROLL_FROM_RIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Roll from Bottom'.
+    /** use the fade effect "Roll from Bottom".
      */
     ROLL_FROM_BOTTOM,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Vertical Stripes'.
+    /** use the fade effect "Vertical Stripes".
      */
     VERTICAL_STRIPES,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Horizontal Stripes'.
+    /** use the fade effect "Horizontal Stripes".
      */
     HORIZONTAL_STRIPES,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Clockwise'.
+    /** use the fade effect "Clockwise".
      */
     CLOCKWISE,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Counter Clockwise'.
+    /** use the fade effect "Counter Clockwise".
      */
     COUNTERCLOCKWISE,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Fade from Upper Left'.
+    /** use the fade effect "Fade from Upper Left".
      */
     FADE_FROM_UPPERLEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Fade from Upper Right'.
+    /** use the fade effect "Fade from Upper Right".
      */
     FADE_FROM_UPPERRIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Fade from Lower Left'.
+    /** use the fade effect "Fade from Lower Left".
      */
     FADE_FROM_LOWERLEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Fade from Lower Right'.
+    /** use the fade effect "Fade from Lower Right".
      */
     FADE_FROM_LOWERRIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Close Vertical'.
+    /** use the fade effect "Close Vertical".
      */
     CLOSE_VERTICAL,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Close Horizontal'.
+    /** use the fade effect "Close Horizontal".
      */
     CLOSE_HORIZONTAL,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Open Vertical'.
+    /** use the fade effect "Open Vertical".
      */
     OPEN_VERTICAL,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Open Horizontal'.
+    /** use the fade effect "Open Horizontal".
      */
     OPEN_HORIZONTAL,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Spiral Inward Left'.
+    /** use the fade effect "Spiral Inward Left".
      */
     SPIRALIN_LEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Spiral Inward Right'.
+    /** use the fade effect "Spiral Inward Right".
      */
     SPIRALIN_RIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Spiral Outward Left'.
+    /** use the fade effect "Spiral Outward Left".
      */
     SPIRALOUT_LEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Spiral Outward Right'.
+    /** use the fade effect "Spiral Outward Right".
      */
     SPIRALOUT_RIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Dissolve'.
+    /** use the fade effect "Dissolve".
      */
     DISSOLVE,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Wavy Line from Left'.
+    /** use the fade effect "Wavy Line from Left".
      */
     WAVYLINE_FROM_LEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Wavy Line from Top'.
+    /** use the fade effect "Wavy Line from Top".
      */
     WAVYLINE_FROM_TOP,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Wavy Line from Right'.
+    /** use the fade effect "Wavy Line from Right".
      */
     WAVYLINE_FROM_RIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Wavy Line from Bottom'.
+    /** use the fade effect "Wavy Line from Bottom".
      */
     WAVYLINE_FROM_BOTTOM,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Random'.
+    /** use the fade effect "Random".
      */
     RANDOM,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Stretch from Left'.
+    /** use the fade effect "Stretch from Left".
      */
     STRETCH_FROM_LEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Stretch from Top'.
+    /** use the fade effect "Stretch from Top".
      */
     STRETCH_FROM_TOP,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Stretch from Right'.
+    /** use the fade effect "Stretch from Right".
      */
     STRETCH_FROM_RIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Stretch from Bottom'.
+    /** use the fade effect "Stretch from Bottom".
      */
     STRETCH_FROM_BOTTOM,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Vertical Lines'.
+    /** use the fade effect "Vertical Lines".
      */
     VERTICAL_LINES,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Horizontal Lines'.
+    /** use the fade effect "Horizontal Lines".
      */
     HORIZONTAL_LINES,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Move from Upper Left'.
+    /** use the fade effect "Move from Upper Left".
      */
     MOVE_FROM_UPPERLEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Move from Upper Right'.
+    /** use the fade effect "Move from Upper Right".
      */
     MOVE_FROM_UPPERRIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Move from Lower Right'.
+    /** use the fade effect "Move from Lower Right".
      */
     MOVE_FROM_LOWERRIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Move from Lower Left'.
+    /** use the fade effect "Move from Lower Left".
      */
     MOVE_FROM_LOWERLEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Uncover to Left'.
+    /** use the fade effect "Uncover to Left".
      */
     UNCOVER_TO_LEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Uncover to Upper Left'.
+    /** use the fade effect "Uncover to Upper Left".
      */
     UNCOVER_TO_UPPERLEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Uncover to Top'.
+    /** use the fade effect "Uncover to Top".
      */
     UNCOVER_TO_TOP,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Uncover to Upper Right'.
+    /** use the fade effect "Uncover to Upper Right".
      */
     UNCOVER_TO_UPPERRIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Uncover to Right'.
+    /** use the fade effect "Uncover to Right".
      */
     UNCOVER_TO_RIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Uncover to Lower Right'.
+    /** use the fade effect "Uncover to Lower Right".
      */
     UNCOVER_TO_LOWERRIGHT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Uncover to Bottom'.
+    /** use the fade effect "Uncover to Bottom".
      */
     UNCOVER_TO_BOTTOM,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Uncover to Lower Left'.
+    /** use the fade effect "Uncover to Lower Left".
      */
     UNCOVER_TO_LOWERLEFT,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Vertical Checkerboard'.
+    /** use the fade effect "Vertical Checkerboard".
      */
     VERTICAL_CHECKERBOARD,
 
     //-------------------------------------------------------------------------
 
-    /** use the fade effect 'Horizontal Checkerboard'.
+    /** use the fade effect "Horizontal Checkerboard".
      */
     HORIZONTAL_CHECKERBOARD
 };
diff --git a/offapi/com/sun/star/presentation/FooterShape.idl b/offapi/com/sun/star/presentation/FooterShape.idl
index 85262e21b072..024304e80e3d 100644
--- a/offapi/com/sun/star/presentation/FooterShape.idl
+++ b/offapi/com/sun/star/presentation/FooterShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_FooterShape_idl__
 #define __com_sun_star_presentation_FooterShape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextShape_idl__
 #include <com/sun/star/drawing/TextShape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the footer presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 service FooterShape
diff --git a/offapi/com/sun/star/presentation/GraphicObjectShape.idl b/offapi/com/sun/star/presentation/GraphicObjectShape.idl
index 3307b856d802..ad3c78d6b904 100644
--- a/offapi/com/sun/star/presentation/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/presentation/GraphicObjectShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_GraphicObjectShape_idl__
 #define __com_sun_star_presentation_GraphicObjectShape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_GraphicObjectShape_idl__
 #include <com/sun/star/drawing/GraphicObjectShape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the graphic presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service GraphicObjectShape
diff --git a/offapi/com/sun/star/presentation/HandoutShape.idl b/offapi/com/sun/star/presentation/HandoutShape.idl
index 609ec9cb39f1..8e4ffc8e996e 100644
--- a/offapi/com/sun/star/presentation/HandoutShape.idl
+++ b/offapi/com/sun/star/presentation/HandoutShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_HandoutShape_idl__
 #define __com_sun_star_presentation_HandoutShape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_PageShape_idl__
 #include <com/sun/star/drawing/PageShape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the handout presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service HandoutShape
diff --git a/offapi/com/sun/star/presentation/HandoutView.idl b/offapi/com/sun/star/presentation/HandoutView.idl
index eb5b81849e47..ff85ecc9e87c 100644
--- a/offapi/com/sun/star/presentation/HandoutView.idl
+++ b/offapi/com/sun/star/presentation/HandoutView.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_HandoutView_idl__
 #define __com_sun_star_presentation_HandoutView_idl__
 
-#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__
 #include <com/sun/star/drawing/DrawingDocumentDrawView.idl>
-#endif
 
 //=============================================================================
 
@@ -37,7 +35,7 @@
 
 //=============================================================================
 
-/** This componend integrates a view to a handout page inside a presentation
+/** This component integrates a view to a handout page inside a presentation
     document into the desktop.
 
     @since OOo 1.1.2
diff --git a/offapi/com/sun/star/presentation/HeaderShape.idl b/offapi/com/sun/star/presentation/HeaderShape.idl
index 5fe1feb94ced..7c9887be30bb 100644
--- a/offapi/com/sun/star/presentation/HeaderShape.idl
+++ b/offapi/com/sun/star/presentation/HeaderShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_HeaderShape_idl__
 #define __com_sun_star_presentation_HeaderShape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextShape_idl__
 #include <com/sun/star/drawing/TextShape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the header presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 service HeaderShape
diff --git a/offapi/com/sun/star/presentation/NotesShape.idl b/offapi/com/sun/star/presentation/NotesShape.idl
index e4961d0a4912..32fa6a188cbc 100644
--- a/offapi/com/sun/star/presentation/NotesShape.idl
+++ b/offapi/com/sun/star/presentation/NotesShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_NotesShape_idl__
 #define __com_sun_star_presentation_NotesShape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextShape_idl__
 #include <com/sun/star/drawing/TextShape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the notes presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service NotesShape
diff --git a/offapi/com/sun/star/presentation/NotesView.idl b/offapi/com/sun/star/presentation/NotesView.idl
index b6eee742de41..631319fa132a 100644
--- a/offapi/com/sun/star/presentation/NotesView.idl
+++ b/offapi/com/sun/star/presentation/NotesView.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_NotesView_idl__
 #define __com_sun_star_presentation_NotesView_idl__
 
-#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__
 #include <com/sun/star/drawing/DrawingDocumentDrawView.idl>
-#endif
 
 //=============================================================================
 
@@ -37,7 +35,7 @@
 
 //=============================================================================
 
-/** This componend integrates a view to a handout page inside a presentation
+/** This component integrates a view to a handout page inside a presentation
     document into the desktop.
 
     @since OOo 1.1.2
diff --git a/offapi/com/sun/star/presentation/OLE2Shape.idl b/offapi/com/sun/star/presentation/OLE2Shape.idl
index 141f5efad901..1af3855df8bb 100644
--- a/offapi/com/sun/star/presentation/OLE2Shape.idl
+++ b/offapi/com/sun/star/presentation/OLE2Shape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_OLE2Shape_idl__
 #define __com_sun_star_presentation_OLE2Shape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_OLE2Shape_idl__
 #include <com/sun/star/drawing/OLE2Shape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the OLE2 presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service OLE2Shape
diff --git a/offapi/com/sun/star/presentation/OutlineView.idl b/offapi/com/sun/star/presentation/OutlineView.idl
index 4552b6777558..703cfa04ce04 100644
--- a/offapi/com/sun/star/presentation/OutlineView.idl
+++ b/offapi/com/sun/star/presentation/OutlineView.idl
@@ -27,29 +27,16 @@
 #ifndef __com_sun_star_presentation_OutlineView_idl__
 #define __com_sun_star_presentation_OutlineView_idl__
 
-#ifndef __com_sun_star_drawing_XDrawView_idl__
 #include <com/sun/star/drawing/XDrawView.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_frame_Controller_idl__
 #include <com/sun/star/frame/Controller.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //=============================================================================
 
@@ -57,11 +44,11 @@
 
 //=============================================================================
 
-/** This componend integrates an outline view to a presentation
+/** This component integrates an outline view to a presentation
     document into the desktop.
 
     In an outline view, the textual contents of presentation text objects
-    from all presentation pages are presentet as a continous outline text.
+    from all presentation pages are presented as a continuous outline text.
 
     @since OOo 1.1.2
  */
diff --git a/offapi/com/sun/star/presentation/OutlinerShape.idl b/offapi/com/sun/star/presentation/OutlinerShape.idl
index bd1b825cd84e..a8ff7c8dcdc0 100644
--- a/offapi/com/sun/star/presentation/OutlinerShape.idl
+++ b/offapi/com/sun/star/presentation/OutlinerShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_OutlinerShape_idl__
 #define __com_sun_star_presentation_OutlinerShape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextShape_idl__
 #include <com/sun/star/drawing/TextShape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the outline presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service OutlinerShape
diff --git a/offapi/com/sun/star/presentation/PageShape.idl b/offapi/com/sun/star/presentation/PageShape.idl
index 722d3e102298..a79f27ce91fd 100644
--- a/offapi/com/sun/star/presentation/PageShape.idl
+++ b/offapi/com/sun/star/presentation/PageShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_PageShape_idl__
 #define __com_sun_star_presentation_PageShape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_PageShape_idl__
 #include <com/sun/star/drawing/PageShape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the page presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service PageShape
diff --git a/offapi/com/sun/star/presentation/ParagraphTarget.idl b/offapi/com/sun/star/presentation/ParagraphTarget.idl
index 755f10d835f0..00adaf7bae1f 100644
--- a/offapi/com/sun/star/presentation/ParagraphTarget.idl
+++ b/offapi/com/sun/star/presentation/ParagraphTarget.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_ParagraphTarget_idl__
 #define __com_sun_star_presentation_ParagraphTarget_idl__
 
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/presentation/Presentation.idl b/offapi/com/sun/star/presentation/Presentation.idl
index e8c220b00ff7..a69fae575e8d 100644
--- a/offapi/com/sun/star/presentation/Presentation.idl
+++ b/offapi/com/sun/star/presentation/Presentation.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_Presentation_idl__
 #define __com_sun_star_presentation_Presentation_idl__
 
-#ifndef __com_sun_star_presentation_XPresentation_idl__
 #include <com/sun/star/presentation/XPresentation.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/presentation/Presentation2.idl b/offapi/com/sun/star/presentation/Presentation2.idl
index 9ed9a9b0dd23..394a8a3a5fe4 100644
--- a/offapi/com/sun/star/presentation/Presentation2.idl
+++ b/offapi/com/sun/star/presentation/Presentation2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_presentation_Presentation2_idl__
 #define __com_sun_star_presentation_Presentation2_idl__
 
-#ifndef __com_sun_star_presentation_Presentation_idl__
 #include <com/sun/star/presentation/Presentation.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XPresentation2_idl__
 #include <com/sun/star/presentation/XPresentation2.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/presentation/PresentationDocument.idl b/offapi/com/sun/star/presentation/PresentationDocument.idl
index 97129cb9f060..803b06325bf1 100644
--- a/offapi/com/sun/star/presentation/PresentationDocument.idl
+++ b/offapi/com/sun/star/presentation/PresentationDocument.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_presentation_PresentationDocument_idl__
 #define __com_sun_star_presentation_PresentationDocument_idl__
 
-#ifndef __com_sun_star_drawing_GenericDrawingDocument_idl__
 #include <com/sun/star/drawing/GenericDrawingDocument.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XPresentationSupplier_idl__
 #include <com/sun/star/presentation/XPresentationSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XCustomPresentationSupplier_idl__
 #include <com/sun/star/presentation/XCustomPresentationSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
 #include <com/sun/star/document/XLinkTargetSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/presentation/PresentationView.idl b/offapi/com/sun/star/presentation/PresentationView.idl
index e989b8b075de..49ecb5111f1a 100644
--- a/offapi/com/sun/star/presentation/PresentationView.idl
+++ b/offapi/com/sun/star/presentation/PresentationView.idl
@@ -27,29 +27,15 @@
 #ifndef __com_sun_star_presentation_PresentationView_idl__
 #define __com_sun_star_presentation_PresentationView_idl__
 
-#ifndef __com_sun_star_drawing_XDrawView_idl__
 #include <com/sun/star/drawing/XDrawView.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_frame_Controller_idl__
 #include <com/sun/star/frame/Controller.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/presentation/PreviewView.idl b/offapi/com/sun/star/presentation/PreviewView.idl
index 943c260b71ae..d4181c0520f1 100644
--- a/offapi/com/sun/star/presentation/PreviewView.idl
+++ b/offapi/com/sun/star/presentation/PreviewView.idl
@@ -27,29 +27,16 @@
 #ifndef __com_sun_star_presentation_PreviewView_idl__
 #define __com_sun_star_presentation_PreviewView_idl__
 
-#ifndef __com_sun_star_drawing_XDrawView_idl__
 #include <com/sun/star/drawing/XDrawView.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_frame_Controller_idl__
 #include <com/sun/star/frame/Controller.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //=============================================================================
 
@@ -57,7 +44,7 @@
 
 //=============================================================================
 
-/** This componend integrates a preview view to a slide show of a presentation
+/** This component integrates a preview view to a slide show of a presentation
     document into the desktop.
 
     @since OOo 1.1.2
diff --git a/offapi/com/sun/star/presentation/Shape.idl b/offapi/com/sun/star/presentation/Shape.idl
index de88ce912445..8744d2b2de15 100644
--- a/offapi/com/sun/star/presentation/Shape.idl
+++ b/offapi/com/sun/star/presentation/Shape.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_presentation_Shape_idl__
 #define __com_sun_star_presentation_Shape_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_AnimationEffect_idl__
 #include <com/sun/star/presentation/AnimationEffect.idl>
-#endif
 
-#ifndef __com_sun_star_presentation_ClickAction_idl__
 #include <com/sun/star/presentation/ClickAction.idl>
-#endif
 
-#ifndef __com_sun_star_presentation_AnimationSpeed_idl__
 #include <com/sun/star/presentation/AnimationSpeed.idl>
-#endif
 
 
 //=============================================================================
@@ -53,7 +44,7 @@
 /** this service is supported from all shapes inside a <type>PresentationDocument</type>.
 
 
-    This usually enahnces objects of type <type scope="com::sun::star::drawing">Shape</type> with
+    This usually enhances objects of type <type scope="com::sun::star::drawing">Shape</type> with
     presentation properties.
 */
 published service Shape
@@ -140,7 +131,7 @@ published service Shape
 
     //-------------------------------------------------------------------------
 
-    /** This is the URL to a soundfile that is played while the animation
+    /** This is the URL to a sound file that is played while the animation
         effect of this shape is running.
      */
     [property] string Sound;
@@ -166,7 +157,7 @@ published service Shape
 
     //-------------------------------------------------------------------------
 
-    /** specifies an "ole2" verb for the ClickAction VERB in
+    /** specifies an "OLE2" verb for the ClickAction VERB in
         the property <member scope="com::sun::star::drawing">Shape::OnClick</member>.
      */
     [property] long Verb;
diff --git a/offapi/com/sun/star/presentation/SlideNumberShape.idl b/offapi/com/sun/star/presentation/SlideNumberShape.idl
index 05e9363318b6..41b27edb1720 100644
--- a/offapi/com/sun/star/presentation/SlideNumberShape.idl
+++ b/offapi/com/sun/star/presentation/SlideNumberShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_SlideNumberShape_idl__
 #define __com_sun_star_presentation_SlideNumberShape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextShape_idl__
 #include <com/sun/star/drawing/TextShape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the slide number presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 service SlideNumberShape
diff --git a/offapi/com/sun/star/presentation/SlidesView.idl b/offapi/com/sun/star/presentation/SlidesView.idl
index 915468c94bdb..ed35eac1285a 100644
--- a/offapi/com/sun/star/presentation/SlidesView.idl
+++ b/offapi/com/sun/star/presentation/SlidesView.idl
@@ -27,29 +27,16 @@
 #ifndef __com_sun_star_presentation_SlidesView_idl__
 #define __com_sun_star_presentation_SlidesView_idl__
 
-#ifndef __com_sun_star_drawing_XDrawView_idl__
 #include <com/sun/star/drawing/XDrawView.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_frame_Controller_idl__
 #include <com/sun/star/frame/Controller.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //=============================================================================
 
@@ -57,7 +44,7 @@
 
 //=============================================================================
 
-/** This componend integrates a slides view to a presentation
+/** This component integrates a slides view to a presentation
     document into the desktop.
 
     In a slides view, the pages of a presentation document are displayed
diff --git a/offapi/com/sun/star/presentation/SubtitleShape.idl b/offapi/com/sun/star/presentation/SubtitleShape.idl
index 025800f0b205..1ea28e800387 100644
--- a/offapi/com/sun/star/presentation/SubtitleShape.idl
+++ b/offapi/com/sun/star/presentation/SubtitleShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_SubtitleShape_idl__
 #define __com_sun_star_presentation_SubtitleShape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextShape_idl__
 #include <com/sun/star/drawing/TextShape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the subtitle presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service SubtitleShape
diff --git a/offapi/com/sun/star/presentation/TitleTextShape.idl b/offapi/com/sun/star/presentation/TitleTextShape.idl
index 190bf5b38d1f..edbc6155f0c8 100644
--- a/offapi/com/sun/star/presentation/TitleTextShape.idl
+++ b/offapi/com/sun/star/presentation/TitleTextShape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_TitleTextShape_idl__
 #define __com_sun_star_presentation_TitleTextShape_idl__
 
-#ifndef __com_sun_star_presentation_Shape_idl__
 #include <com/sun/star/presentation/Shape.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_TextShape_idl__
 #include <com/sun/star/drawing/TextShape.idl>
-#endif
 
 
 //=============================================================================
@@ -45,7 +41,7 @@
 /** This service is implemented by the title and subtitle presentation shape.
 
     <p>Presentation shapes can be used in a presentation
-    page layouts and theire position and size is by default set
+    page layouts and their position and size is by default set
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service TitleTextShape
diff --git a/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl b/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl
index 3949c9157932..e109afcbece7 100644
--- a/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl
+++ b/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_XCustomPresentationSupplier_idl__
 #define __com_sun_star_presentation_XCustomPresentationSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl b/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl
index c55af24981d3..4582fdc1b21c 100644
--- a/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl
+++ b/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_XHandoutMasterSupplier_idl__
 #define __com_sun_star_presentation_XHandoutMasterSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/presentation/XPresentation.idl b/offapi/com/sun/star/presentation/XPresentation.idl
index 16c5715edff9..5a793ccdea42 100644
--- a/offapi/com/sun/star/presentation/XPresentation.idl
+++ b/offapi/com/sun/star/presentation/XPresentation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_XPresentation_idl__
 #define __com_sun_star_presentation_XPresentation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/presentation/XPresentation2.idl b/offapi/com/sun/star/presentation/XPresentation2.idl
index c9609255d4df..920ede40f6e7 100644
--- a/offapi/com/sun/star/presentation/XPresentation2.idl
+++ b/offapi/com/sun/star/presentation/XPresentation2.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_presentation_XPresentation2_idl__
 #define __com_sun_star_presentation_XPresentation2_idl__
 
-#ifndef __com_sun_star_presentation_XPresentation_idl__
 #include <com/sun/star/presentation/XPresentation.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XSlideShowListener_idl__
 #include <com/sun/star/presentation/XSlideShowListener.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XSlideShowController_idl__
 #include <com/sun/star/presentation/XSlideShowController.idl>
-#endif
 
 //=============================================================================
 
@@ -69,26 +55,26 @@ interface XPresentation2
 
     //-------------------------------------------------------------------------
 
-    /** gives access to the properties of the slideshow.
+    /** gives access to the properties of the slide show.
     */
     interface com::sun::star::beans::XPropertySet;
 
     //-------------------------------------------------------------------------
 
-    /** start the slideshow with the given arguments.
-        All arguments overide the values from <service>Presentation</service>
+    /** start the slide show with the given arguments.
+        All arguments override the values from <service>Presentation</service>
     */
     void startWithArguments( [in] sequence< ::com::sun::star::beans::PropertyValue > Arguments );
 
     //-------------------------------------------------------------------------
 
-    /** returns true if the slideshow is currently running */
+    /** returns true if the slide show is currently running */
     boolean isRunning();
 
     //-------------------------------------------------------------------------
 
-    /** if the slideshow is running, this returns a controler object to
-        control the running slideshow. */
+    /** if the slide show is running, this returns a controller object to
+        control the running slide show. */
     XSlideShowController getController();
 };
 
diff --git a/offapi/com/sun/star/presentation/XPresentationPage.idl b/offapi/com/sun/star/presentation/XPresentationPage.idl
index ca41ed35c220..2148a86ff1de 100644
--- a/offapi/com/sun/star/presentation/XPresentationPage.idl
+++ b/offapi/com/sun/star/presentation/XPresentationPage.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_XPresentationPage_idl__
 #define __com_sun_star_presentation_XPresentationPage_idl__
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/presentation/XPresentationSupplier.idl b/offapi/com/sun/star/presentation/XPresentationSupplier.idl
index f014ad9b379e..3b7b080598e5 100644
--- a/offapi/com/sun/star/presentation/XPresentationSupplier.idl
+++ b/offapi/com/sun/star/presentation/XPresentationSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_presentation_XPresentationSupplier_idl__
 #define __com_sun_star_presentation_XPresentationSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_presentation_XPresentation_idl__
 #include <com/sun/star/presentation/XPresentation.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/presentation/XShapeEventListener.idl b/offapi/com/sun/star/presentation/XShapeEventListener.idl
index d2578ea8dfbe..1639bde8967a 100644
--- a/offapi/com/sun/star/presentation/XShapeEventListener.idl
+++ b/offapi/com/sun/star/presentation/XShapeEventListener.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_presentation_XShapeEventListener_idl__
 #define __com_sun_star_presentation_XShapeEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XMouseListener_idl__
 #include <com/sun/star/awt/XMouseListener.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 module com {  module sun {  module star {  module presentation {
 
diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl b/offapi/com/sun/star/presentation/XSlideShow.idl
index 2bbce811c00f..e8fec3b1974b 100644
--- a/offapi/com/sun/star/presentation/XSlideShow.idl
+++ b/offapi/com/sun/star/presentation/XSlideShow.idl
@@ -27,62 +27,38 @@
 #ifndef _com_sun_star_presentation_XSlideShow_idl
 #define _com_sun_star_presentation_XSlideShow_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
 #include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
-#endif
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
 #include <com/sun/star/drawing/XDrawPagesSupplier.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_presentation_XSlideShowView_idl__
 #include <com/sun/star/presentation/XSlideShowView.idl>
-#endif
-#ifndef __com_sun_star_presentation_XSlideShowListener_idl__
 #include <com/sun/star/presentation/XSlideShowListener.idl>
-#endif
-#ifndef __com_sun_star_presentation_XShapeEventListener_idl__
 #include <com/sun/star/presentation/XShapeEventListener.idl>
-#endif
 
 module com {  module sun {  module star {  module presentation {
 
-/** Slideshow interface to perform slideshow presentations.<p>
+/** Slide show interface to perform slide show presentations.<p>
 
     This interface provides the necessary methods to run and control a
-    slideshow from a given set of XDrawPage slides. The slideshow can
+    slide show from a given set of XDrawPage slides. The slide show can
     be displayed simultaneously on multiple targets.<p>
 
-    Note: To controll a running slideshow inside a presentation, please
+    Note: To control a running slide show inside a presentation, please
     use <type>XPresentation2</type> and <type>XSlideShowController</type>.
 
     @since OOo 3.0
  */
 interface XSlideShow : ::com::sun::star::uno::XInterface
 {
-    /** Trigger the next effect of the slideshow.<p>
+    /** Trigger the next effect of the slide show.<p>
 
         This method triggers the next effect on the currently
-        displayed slide. If there is currently no slideshow running,
+        displayed slide. If there is currently no slide show running,
         this method does nothing. If there are no more effects on the
         current slide, a possible slide transition effect is issued
         and the next slide is displayed.<p>
@@ -95,7 +71,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
      */
     boolean nextEffect();
 
-    /** Undo the last effect in the main sequence of the slideshow.<p>
+    /** Undo the last effect in the main sequence of the slide show.<p>
 
         The current slide is displayed as if the last user-triggered effect
         has never been triggered.  If there is no previous effect on the
@@ -103,7 +79,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
         XSlideShowListener objects, which can then trigger a change to the
         previous slide.  Note that this command is executed asynchronously.
         Multiple calls to update() may be necessary to complete its execution.
-        If there is currently no slideshow running, this method does
+        If there is currently no slide show running, this method does
         nothing.<p>
 
         @return <TRUE/>, if the previous effect was successfully
@@ -166,7 +142,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
             <li>name: Prefetch, value: ::com::sun::star::drawing::XDrawPage. When given,
                 this slide is prepared in the background to be displayed next. The next
                 call to displaySlide() with the given slide may be faster if there was
-                enough time for prefatching. If the next call to displaySlide() uses
+                enough time for prefetching. If the next call to displaySlide() uses
                 a different slide, this will still work but will not have any performance
                 improvements
                 </li>
@@ -175,7 +151,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
                 are triggered.  This is typically used when going back one
                 effect leads to the previous slide.  On that slide all
                 effects have to be shown in order to continue the backward
-                travelling.
+                traveling.
                 When <FALSE/>, the default, then no main sequence effect is
                 triggered.
                 </li>
@@ -213,7 +189,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
     /** Query the currently displayed slide.<p>
 
         @return the instance of the current slide. If there's no
-        slideshow running at the moment, this method returns an
+        slide show running at the moment, this method returns an
         empty reference.
      */
     ::com::sun::star::drawing::XDrawPage getCurrentSlide();
@@ -226,7 +202,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
 
     void registerUserPaintPolygons([in] ::com::sun::star::lang::XMultiServiceFactory xDocFactory);
 
-    /** Change a property of the slideshow.<p>
+    /** Change a property of the slide show.<p>
 
         @param aShowProperty
         Property values, which influence the way the slides are
@@ -305,7 +281,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
     /** Add a slide show listener.<p>
 
         This method adds a listener to the slide show, which will get
-        notified when a registerend shape is clicked upon, or a new
+        notified when a registered shape is clicked upon, or a new
         slide is about to be displayed. Note that the listeners will
         <em>not</em> be notified, when the slide change is directly
         requested by one of the nextSlide(), previousSlide() or
diff --git a/offapi/com/sun/star/presentation/XSlideShowController.idl b/offapi/com/sun/star/presentation/XSlideShowController.idl
index 97a670c29486..5f143c061112 100644
--- a/offapi/com/sun/star/presentation/XSlideShowController.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowController.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_presentation_XSlideShowController_idl__
 #define __com_sun_star_presentation_XSlideShowController_idl__
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XSlideShow_idl__
 #include <com/sun/star/presentation/XSlideShow.idl>
-#endif
 
 //=============================================================================
 
@@ -49,7 +38,7 @@
 
 //=============================================================================
 
-/** interface to control a running slideshow.
+/** interface to control a running slide show.
 
     @see XPresentation2
     @since OOo 3.0
@@ -58,9 +47,9 @@ interface XSlideShowController
 {
     //-------------------------------------------------------------------------
 
-    /** returns true if the slideshow is still running.
+    /** returns true if the slide show is still running.
         If this returns false, this component is already disposed.
-        You can start a new slideshow and get a new instance
+        You can start a new slide show and get a new instance
         of <type>XSlideShowController</type> from <type>XPresentation2</type>
     */
     boolean isRunning();
@@ -68,7 +57,7 @@ interface XSlideShowController
     //-------------------------------------------------------------------------
 
     /** @returns
-                the number of slides in this slideshow.
+                the number of slides in this slide show.
 
         @see getSlideByIndex
      */
@@ -76,7 +65,7 @@ interface XSlideShowController
 
     //-------------------------------------------------------------------------
 
-    /** gives access to the slides that will be shown in this slideshow.
+    /** gives access to the slides that will be shown in this slide show.
 
         <p>Slides are returned in the order they will be displayed in the
         presentation which can be different than the orders of slides in
@@ -88,7 +77,7 @@ interface XSlideShowController
 
         @param Index
             specifies the position in the list of slides that are displayed
-            in this slideshow. The first index is 0.
+            in this slide show. The first index is 0.
 
         @throws com::sun::star::lang::IndexOutOfBoundException
             if the index is not valid.
@@ -99,7 +88,7 @@ interface XSlideShowController
 
     //-------------------------------------------------------------------------
 
-    /** addes a listener that recieves events while the slideshow is running. */
+    /** adds a listener that receives events while the slide show is running. */
     void addSlideShowListener( [in] XSlideShowListener Listener );
 
     //-------------------------------------------------------------------------
@@ -131,19 +120,19 @@ interface XSlideShowController
     //-------------------------------------------------------------------------
 
     /** goto and display next slide.
-        <p>Remaining effects on the current slide will be skiped.*/
+        <p>Remaining effects on the current slide will be skipped.*/
     void gotoNextSlide();
 
     //-------------------------------------------------------------------------
 
     /** goto and display previous slide.
-        <p>Remaining effects on the current slide will be skiped.*/
+        <p>Remaining effects on the current slide will be skipped.*/
     void gotoPreviousSlide();
 
     //-------------------------------------------------------------------------
 
     /** goto and display last slide.
-        <p>Remaining effects on the current slide will be skiped.*/
+        <p>Remaining effects on the current slide will be skipped.*/
     void gotoLastSlide();
 
     //-------------------------------------------------------------------------
@@ -154,12 +143,12 @@ interface XSlideShowController
     //-------------------------------------------------------------------------
 
     /** jumps to the given slide.
-        <p>The slide can also be a slide that would normaly not be shown during
-        the current slideshow.
+        <p>The slide can also be a slide that would normally not be shown during
+        the current slide show.
 
         @throws com::sun::star::lang::IllegalArgumentException
             if the given page is not a valid slide of the document for
-            which this slideshow is started. Also not allowed are master,
+            which this slide show is started. Also not allowed are master,
             notes and handout pages.
     */
     void gotoSlide( [in] com::sun::star::drawing::XDrawPage Page )
@@ -178,21 +167,21 @@ interface XSlideShowController
 
     //-------------------------------------------------------------------------
 
-    /** pauses the slideshow. All effects are paused.
-        <p>The slideshow continues on next user input or if
+    /** pauses the slide show. All effects are paused.
+        <p>The slide show continues on next user input or if
         <member>resume</member> is called.
     */
     void pause();
 
     //-------------------------------------------------------------------------
 
-    /** resumes a paused slideshow.
+    /** resumes a paused slide show.
     */
     void resume();
 
     //-------------------------------------------------------------------------
 
-    /** returns <TRUE/> if the slideshow is currently paused.
+    /** returns <TRUE/> if the slide show is currently paused.
 
         @see <member>pause</member>
         @see <member>resume</member>
@@ -201,15 +190,15 @@ interface XSlideShowController
 
     //-------------------------------------------------------------------------
 
-    /** pauses the slideshow and blanks the screen in the given color.
+    /** pauses the slide show and blanks the screen in the given color.
         <p>Change attribute <member>Pause</member> to false to unpause
-        the slideshow.
+        the slide show.
     */
     void blankScreen( [in] long Color );
 
     //-------------------------------------------------------------------------
 
-    /** activates the user interface of this slideshow.
+    /** activates the user interface of this slide show.
 
         @see <member>deactivate()</member>
         @see <member>isActive()</member>
@@ -217,7 +206,7 @@ interface XSlideShowController
     void activate();
 
     //-------------------------------------------------------------------------
-    /** can be called to deactivate the user interface of this slideshow.
+    /** can be called to deactivate the user interface of this slide show.
 
         <p>A deactivated
         @see <member>activate()</member>
@@ -227,10 +216,10 @@ interface XSlideShowController
 
     //-------------------------------------------------------------------------
 
-    /** determines if the slideshow is active.
+    /** determines if the slide show is active.
 
         @return
-            <TRUE/> for UI active slideshow
+            <TRUE/> for UI active slide show
             <br>
             <FALSE/> otherwise
      */
@@ -253,19 +242,19 @@ interface XSlideShowController
 
     //-------------------------------------------------------------------------
 
-    /** returns <TRUE/> if the slideshow was started to run endlessly.
+    /** returns <TRUE/> if the slide show was started to run endlessly.
      */
     boolean isEndless();
 
     //-------------------------------------------------------------------------
 
-    /** Returns <TRUE/> if the slideshow was started in full-screen mode.
+    /** Returns <TRUE/> if the slide show was started in full-screen mode.
      */
     boolean isFullScreen();
 
     //-------------------------------------------------------------------------
 
-    /** If this attribute is set to <TRUE/>, the window of the slideshow is
+    /** If this attribute is set to <TRUE/>, the window of the slide show is
         always on top of all other windows.
      */
     [attribute] boolean AlwaysOnTop;
@@ -273,7 +262,7 @@ interface XSlideShowController
     //-------------------------------------------------------------------------
 
     /** If this attribute is <TRUE/>, the mouse is visible during the
-        slideshow.
+        slide show.
      */
     [attribute] boolean MouseVisible;
 
@@ -292,9 +281,9 @@ interface XSlideShowController
 
     //-------------------------------------------------------------------------
 
-    /** returns the actuall <type>XSlideShow</type> instance that runs the
-        slideshow.
-        <br>Normaly all navigation should be done using this controller and
+    /** returns the actual <type>XSlideShow</type> instance that runs the
+        slide show.
+        <br>Normally all navigation should be done using this controller and
         not the <type>XSlideShow</type> itself. */
     XSlideShow getSlideShow();
 
diff --git a/offapi/com/sun/star/presentation/XSlideShowListener.idl b/offapi/com/sun/star/presentation/XSlideShowListener.idl
index ab051807f4b1..ca17c2aaf8b5 100644
--- a/offapi/com/sun/star/presentation/XSlideShowListener.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_XSlideShowListener_idl__
 #define __com_sun_star_presentation_XSlideShowListener_idl__
 
-#ifndef __com_sun_star_animations_XAnimationListener_idl__
 #include <com/sun/star/animations/XAnimationListener.idl>
-#endif
 
 module com {  module sun {  module star {  module presentation {
 
@@ -51,7 +49,7 @@ published interface XSlideShowListener : ::com::sun::star::animations::XAnimatio
     /** Notify that a new slide starts to become visible. */
     void slideTransitionStarted();
 
-    /** Notify that the slide transtion of the current slide ended. */
+    /** Notify that the slide transition of the current slide ended. */
     void slideTransitionEnded();
 
     /** Notify that the last animation from the main sequence
diff --git a/offapi/com/sun/star/presentation/XSlideShowView.idl b/offapi/com/sun/star/presentation/XSlideShowView.idl
index c60bdea2bef1..c34f2d4d4947 100644
--- a/offapi/com/sun/star/presentation/XSlideShowView.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowView.idl
@@ -27,34 +27,20 @@
 #ifndef __com_sun_star_presentation_XSlideShowView_idl__
 #define __com_sun_star_presentation_XSlideShowView_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
 #include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyListener_idl__
 #include <com/sun/star/util/XModifyListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XPaintListener_idl__
 #include <com/sun/star/awt/XPaintListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XMouseListener_idl__
 #include <com/sun/star/awt/XMouseListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XMouseMotionListener_idl__
 #include <com/sun/star/awt/XMouseMotionListener.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
 
 module com {  module sun {  module star {  module presentation {
 
-/** View interface to display slideshow presentations on.<p>
+/** View interface to display slide show presentations on.<p>
 
     This interface provides the necessary methods to enable an
-    XSlideShow interface to display a presentation. The slideshow can
+    XSlideShow interface to display a presentation. The slide show can
     be displayed simultaneously on multiple views<p>
 
     @since OOo 2.4
@@ -73,8 +59,8 @@ published interface XSlideShowView : ::com::sun::star::uno::XInterface
 
     /** This method clears the whole view area.
 
-        The slideshow uses this method to fully erase the view
-        content. Since the slideshow has no notion of view size, this
+        The slide show uses this method to fully erase the view
+        content. Since the slide show has no notion of view size, this
         is the only reliable way to wholly clear the view.
      */
     void clear();
@@ -91,7 +77,7 @@ published interface XSlideShowView : ::com::sun::star::uno::XInterface
         blow this up to the desired device pixel size (640 times 480,
         or whatever size the output view has). Furthermore, the aspect
         ratio of the scaling should match that of the slides
-        (otherwise, the slides will be scaled anisotrophically).
+        (otherwise, the slides will be scaled anisotropically).
      */
     ::com::sun::star::geometry::AffineMatrix2D getTransformation();
 
@@ -176,7 +162,7 @@ published interface XSlideShowView : ::com::sun::star::uno::XInterface
     void setMouseCursor( [in] short nPointerShape );
 
     /** Get rectangle defining area inside of canvas device which
-    this slideshow view uses.
+    this slide show view uses.
     */
     ::com::sun::star::awt::Rectangle getCanvasArea();
 };
diff --git a/offapi/com/sun/star/presentation/XTransition.idl b/offapi/com/sun/star/presentation/XTransition.idl
index ddd201b05e0b..39f02fc9f5cf 100644
--- a/offapi/com/sun/star/presentation/XTransition.idl
+++ b/offapi/com/sun/star/presentation/XTransition.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_presentation_XTransition_idl__
 #define __com_sun_star_presentation_XTransition_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com {  module sun {  module star {
 
diff --git a/offapi/com/sun/star/presentation/XTransitionFactory.idl b/offapi/com/sun/star/presentation/XTransitionFactory.idl
index 44fc8b89aea4..3f648353fff6 100644
--- a/offapi/com/sun/star/presentation/XTransitionFactory.idl
+++ b/offapi/com/sun/star/presentation/XTransitionFactory.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_presentation_XTransitionFactory_idl__
 #define __com_sun_star_presentation_XTransitionFactory_idl__
 
-#ifndef __com_sun_star_presentation_XTransition_idl__
 #include <com/sun/star/presentation/XTransition.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
 
 
 module com {  module sun {  module star {
@@ -44,7 +40,7 @@ module presentation {
 interface XTransition;
 interface XSlideShowView;
 
-/** TransitionFactory interface to request optional custom Transition instances for slideshow transitions.<p>
+/** TransitionFactory interface to request optional custom Transition instances for slide show transitions.<p>
 
     This interface provides the necessary methods to query and create optional transition effects for a SlideShow<p>
 
@@ -65,7 +61,7 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
         Subtype for the transition (@see ::com::sun::star::animation::TransitionSubType)
 
         @param view
-        Slideshow view to display on
+        Slide show view to display on
 
         @param leavingBitmap
         Bitmap of the slide that's going to leave the screen
@@ -75,7 +71,7 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
 
         @param slideOffset
         Offset in pixel from the top, left edge of the view, such that the
-        slide displays similar to normal slideshow
+        slide displays similar to normal slide show
      */
     XTransition createTransition( [in] short                                 transitionType,
                                   [in] short                                 transitionSubType,
diff --git a/offapi/com/sun/star/rdf/BlankNode.idl b/offapi/com/sun/star/rdf/BlankNode.idl
index 5829a3f02e9f..c093877bf812 100644
--- a/offapi/com/sun/star/rdf/BlankNode.idl
+++ b/offapi/com/sun/star/rdf/BlankNode.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_rdf_BlankNode_idl__
 #define __com_sun_star_rdf_BlankNode_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XBlankNode_idl__
 #include <com/sun/star/rdf/XBlankNode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/FileFormat.idl b/offapi/com/sun/star/rdf/FileFormat.idl
index e5814ca70828..c36aa313c1fe 100644
--- a/offapi/com/sun/star/rdf/FileFormat.idl
+++ b/offapi/com/sun/star/rdf/FileFormat.idl
@@ -67,8 +67,8 @@ constants FileFormat
     /// <a href="http://www.wiwiss.fu-berlin.de/suhl/bizer/TriG/Spec/">TriG</a>
     const short TRIG        = 3;    // "application/x-trig";
 
-    /// <a href="http://sw.nokia.com/trix/TriX.html">TriX</a>
-    const short TRIX        = 4;    // "if only the damn server were up i'd know";
+    /// <a href="http://sw.nokia.com/trix/">TriX</a>
+    const short TRIX        = 4;    // "if only the damn server were up I'd know";
 
     /// <a href="http://www.dajobe.org/2004/01/turtle/">Turtle</a>
     const short TURTLE      = 5;    // "application/turtle";
diff --git a/offapi/com/sun/star/rdf/Literal.idl b/offapi/com/sun/star/rdf/Literal.idl
index 17a197534c65..5ed0823dc181 100644
--- a/offapi/com/sun/star/rdf/Literal.idl
+++ b/offapi/com/sun/star/rdf/Literal.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_rdf_Literal_idl__
 #define __com_sun_star_rdf_Literal_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XLiteral_idl__
 #include <com/sun/star/rdf/XLiteral.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/ParseException.idl b/offapi/com/sun/star/rdf/ParseException.idl
index 4c75afcadc98..00517dd79745 100644
--- a/offapi/com/sun/star/rdf/ParseException.idl
+++ b/offapi/com/sun/star/rdf/ParseException.idl
@@ -28,17 +28,14 @@
 #ifndef __com_sun_star_rdf_ParseException_idl__
 #define __com_sun_star_rdf_ParseException_idl__
 
-#ifndef __com_sun_star_uno_Eception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
 
 //=============================================================================
 
 module com {   module sun {   module star {   module rdf {
 
 //=============================================================================
-/** represents an error condition that is signalled on parsing an RDF file.
+/** represents an error condition that is signaled on parsing an RDF file.
 
     @since OOo 3.0
 
diff --git a/offapi/com/sun/star/rdf/QueryException.idl b/offapi/com/sun/star/rdf/QueryException.idl
index aa446de10012..fa6a739ddb66 100644
--- a/offapi/com/sun/star/rdf/QueryException.idl
+++ b/offapi/com/sun/star/rdf/QueryException.idl
@@ -28,17 +28,14 @@
 #ifndef __com_sun_star_rdf_QueryException_idl__
 #define __com_sun_star_rdf_QueryException_idl__
 
-#ifndef __com_sun_star_uno_Eception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
 
 //=============================================================================
 
 module com {   module sun {   module star {   module rdf {
 
 //=============================================================================
-/** represents an error condition that is signalled on evaluating a query
+/** represents an error condition that is signaled on evaluating a query
     against an RDF Repository.
 
     @since OOo 3.0
diff --git a/offapi/com/sun/star/rdf/Repository.idl b/offapi/com/sun/star/rdf/Repository.idl
index 5911d4dfe473..c2a9fde21403 100644
--- a/offapi/com/sun/star/rdf/Repository.idl
+++ b/offapi/com/sun/star/rdf/Repository.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_Repository_idl__
 #define __com_sun_star_rdf_Repository_idl__
 
-#ifndef __com_sun_star_rdf_XRepository_idl__
 #include <com/sun/star/rdf/XRepository.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/RepositoryException.idl b/offapi/com/sun/star/rdf/RepositoryException.idl
index 8d15b23c943b..6f05c0d1ebb1 100644
--- a/offapi/com/sun/star/rdf/RepositoryException.idl
+++ b/offapi/com/sun/star/rdf/RepositoryException.idl
@@ -28,17 +28,14 @@
 #ifndef __com_sun_star_rdf_RepositoryException_idl__
 #define __com_sun_star_rdf_RepositoryException_idl__
 
-#ifndef __com_sun_star_uno_Eception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
 
 //=============================================================================
 
 module com {   module sun {   module star {   module rdf {
 
 //=============================================================================
-/** represents an error condition that is signalled on accessing an RDF
+/** represents an error condition that is signaled on accessing an RDF
     Repository.
 
     @since OOo 3.0
diff --git a/offapi/com/sun/star/rdf/Statement.idl b/offapi/com/sun/star/rdf/Statement.idl
index 3979103fd4df..b144ca45b39c 100644
--- a/offapi/com/sun/star/rdf/Statement.idl
+++ b/offapi/com/sun/star/rdf/Statement.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_Statement_idl__
 #define __com_sun_star_rdf_Statement_idl__
 
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/URI.idl b/offapi/com/sun/star/rdf/URI.idl
index a0a785c96a65..73d45c97219e 100644
--- a/offapi/com/sun/star/rdf/URI.idl
+++ b/offapi/com/sun/star/rdf/URI.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_rdf_URI_idl__
 #define __com_sun_star_rdf_URI_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XBlankNode.idl b/offapi/com/sun/star/rdf/XBlankNode.idl
index d63a4bd93a00..e1ffe829f446 100644
--- a/offapi/com/sun/star/rdf/XBlankNode.idl
+++ b/offapi/com/sun/star/rdf/XBlankNode.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XBlankNode_idl__
 #define __com_sun_star_rdf_XBlankNode_idl__
 
-#ifndef __com_sun_star_rdf_XResource_idl__
 #include <com/sun/star/rdf/XResource.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl b/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
index f8bbade4ef74..b5410b5218e2 100644
--- a/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
+++ b/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
@@ -28,65 +28,21 @@
 #ifndef __com_sun_star_rdf_XDocumentMetadataAccess_idl__
 #define __com_sun_star_rdf_XDocumentMetadataAccess_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_FileFormat_idl__
 #include <com/sun/star/rdf/FileFormat.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_ParseException_idl__
 #include <com/sun/star/rdf/ParseException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XMetadatable_idl__
 #include <com/sun/star/rdf/XMetadatable.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XRepositorySupplier_idl__
 #include <com/sun/star/rdf/XRepositorySupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XDocumentRepository.idl b/offapi/com/sun/star/rdf/XDocumentRepository.idl
index 215fd89fa954..a4a07165494c 100644
--- a/offapi/com/sun/star/rdf/XDocumentRepository.idl
+++ b/offapi/com/sun/star/rdf/XDocumentRepository.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_rdf_XDocumentRepository_idl__
 #define __com_sun_star_rdf_XDocumentRepository_idl__
 
-#ifndef __com_sun_star_beans_Pair_idl__
 #include <com/sun/star/beans/Pair.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XMetadatable_idl__
 #include <com/sun/star/rdf/XMetadatable.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XRepository_idl__
 #include <com/sun/star/rdf/XRepository.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XLiteral.idl b/offapi/com/sun/star/rdf/XLiteral.idl
index 148809107212..fe06568ce6cb 100644
--- a/offapi/com/sun/star/rdf/XLiteral.idl
+++ b/offapi/com/sun/star/rdf/XLiteral.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XLiteral_idl__
 #define __com_sun_star_rdf_XLiteral_idl__
 
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XMetadatable.idl b/offapi/com/sun/star/rdf/XMetadatable.idl
index 256d74e48549..df35c8e7baf5 100644
--- a/offapi/com/sun/star/rdf/XMetadatable.idl
+++ b/offapi/com/sun/star/rdf/XMetadatable.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_rdf_XMetadatable_idl__
 #define __com_sun_star_rdf_XMetadatable_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
 #include <com/sun/star/beans/StringPair.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XNamedGraph.idl b/offapi/com/sun/star/rdf/XNamedGraph.idl
index d71c5a599e9e..e750f601e437 100644
--- a/offapi/com/sun/star/rdf/XNamedGraph.idl
+++ b/offapi/com/sun/star/rdf/XNamedGraph.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_rdf_XNamedGraph_idl__
 #define __com_sun_star_rdf_XNamedGraph_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_RepositoryException_idl__
 #include <com/sun/star/rdf/RepositoryException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XNode.idl b/offapi/com/sun/star/rdf/XNode.idl
index 9ed8e614fd03..e1added4a868 100644
--- a/offapi/com/sun/star/rdf/XNode.idl
+++ b/offapi/com/sun/star/rdf/XNode.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XNode_idl__
 #define __com_sun_star_rdf_XNode_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XQuerySelectResult.idl b/offapi/com/sun/star/rdf/XQuerySelectResult.idl
index 19ceecaf36d1..b991a4f839a9 100644
--- a/offapi/com/sun/star/rdf/XQuerySelectResult.idl
+++ b/offapi/com/sun/star/rdf/XQuerySelectResult.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XQuerySelectResult_idl__
 #define __com_sun_star_rdf_XQuerySelectResult_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XReifiedStatement.idl b/offapi/com/sun/star/rdf/XReifiedStatement.idl
index 9f697552aa6e..f6ff278e1573 100644
--- a/offapi/com/sun/star/rdf/XReifiedStatement.idl
+++ b/offapi/com/sun/star/rdf/XReifiedStatement.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XReifiedStatement_idl__
 #define __com_sun_star_rdf_XReifiedStatement_idl__
 
-#ifndef __com_sun_star_rdf_Statement_idl__
 #include <com/sun/star/rdf/Statement.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XRepository.idl b/offapi/com/sun/star/rdf/XRepository.idl
index 1b76ff1158a7..75dfcacbbf1a 100644
--- a/offapi/com/sun/star/rdf/XRepository.idl
+++ b/offapi/com/sun/star/rdf/XRepository.idl
@@ -28,73 +28,23 @@
 #ifndef __com_sun_star_rdf_XRepository_idl__
 #define __com_sun_star_rdf_XRepository_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_FileFormat_idl__
 #include <com/sun/star/rdf/FileFormat.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_ParseException_idl__
 #include <com/sun/star/rdf/ParseException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_QueryException_idl__
 #include <com/sun/star/rdf/QueryException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_RepositoryException_idl__
 #include <com/sun/star/rdf/RepositoryException.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XBlankNode_idl__
 #include <com/sun/star/rdf/XBlankNode.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XURI_idl__
 #include <com/sun/star/rdf/XURI.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_Statement_idl__
 #include <com/sun/star/rdf/Statement.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XQuerySelectResult_idl__
 #include <com/sun/star/rdf/XQuerySelectResult.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XNamedGraph_idl__
 #include <com/sun/star/rdf/XNamedGraph.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XRepositorySupplier.idl b/offapi/com/sun/star/rdf/XRepositorySupplier.idl
index 15984a9438d4..91c7ffa4ee98 100644
--- a/offapi/com/sun/star/rdf/XRepositorySupplier.idl
+++ b/offapi/com/sun/star/rdf/XRepositorySupplier.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XRepositorySupplier_idl__
 #define __com_sun_star_rdf_XRepositorySupplier_idl__
 
-#ifndef __com_sun_star_rdf_XRepository_idl__
 #include <com/sun/star/rdf/XRepository.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XResource.idl b/offapi/com/sun/star/rdf/XResource.idl
index b0ce3c505de8..3d50fdf69887 100644
--- a/offapi/com/sun/star/rdf/XResource.idl
+++ b/offapi/com/sun/star/rdf/XResource.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XResource_idl__
 #define __com_sun_star_rdf_XResource_idl__
 
-#ifndef __com_sun_star_rdf_XNode_idl__
 #include <com/sun/star/rdf/XNode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rdf/XURI.idl b/offapi/com/sun/star/rdf/XURI.idl
index d869d4e80c54..7f00e0a29c74 100644
--- a/offapi/com/sun/star/rdf/XURI.idl
+++ b/offapi/com/sun/star/rdf/XURI.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_rdf_XURI_idl__
 #define __com_sun_star_rdf_XURI_idl__
 
-#ifndef __com_sun_star_rdf_XResource_idl__
 #include <com/sun/star/rdf/XResource.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rendering/AnimationAttributes.idl b/offapi/com/sun/star/rendering/AnimationAttributes.idl
index 9a5678176b17..96d6e583da14 100644
--- a/offapi/com/sun/star/rendering/AnimationAttributes.idl
+++ b/offapi/com/sun/star/rendering/AnimationAttributes.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_rendering_AnimationAttributes_idl__
 #define __com_sun_star_rendering_AnimationAttributes_idl__
 
-#ifndef __com_sun_star_geometry_RealSize2D_idl__
 #include <com/sun/star/geometry/RealSize2D.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -47,7 +45,7 @@ published struct AnimationAttributes
     /** Repeat mode of the animation sequence.<p>
 
         This value determines how the [0,1] parameter space of the animation
-        should be sweeped through. Permissible values are given in
+        should be swept through. Permissible values are given in
         <type>AnimationRepeat</type>.<p>
 
         @see AnimationRepeat.
@@ -56,7 +54,7 @@ published struct AnimationAttributes
 
     //-------------------------------------------------------------------------
 
-    /** Size of the untrasnformed animation sequence.<p>
+    /** Size of the untransformed animation sequence.<p>
 
         This value specifies the size of the animation when rendered
         with the identity view transform. This permits
diff --git a/offapi/com/sun/star/rendering/AnimationRepeat.idl b/offapi/com/sun/star/rendering/AnimationRepeat.idl
index 2f72a6b69fbc..fb1080440fac 100644
--- a/offapi/com/sun/star/rendering/AnimationRepeat.idl
+++ b/offapi/com/sun/star/rendering/AnimationRepeat.idl
@@ -39,18 +39,18 @@ module com { module sun { module star { module rendering {
  */
 constants AnimationRepeat
 {
-    /** The [0,1] parameter range is sweeped through exactly once.<p>
+    /** The [0,1] parameter range is swept through exactly once.<p>
 
-        The [0,1] parameter range is sweeped through exactly once,
+        The [0,1] parameter range is swept through exactly once,
         starting with 0 and ending with 1.<p>
     */
     const byte ONE_SHOT=0;
 
     //-------------------------------------------------------------------------
 
-    /** The [0,1] parameter range is sweeped through exactly twice.<p>
+    /** The [0,1] parameter range is swept through exactly twice.<p>
 
-        The [0,1] parameter range is sweeped through exactly twice,
+        The [0,1] parameter range is swept through exactly twice,
         starting with 0, going to 1, and going back to 0. When
         plotting the value over time, this yields a triangle curve.<p>
     */
@@ -58,9 +58,9 @@ constants AnimationRepeat
 
     //-------------------------------------------------------------------------
 
-    /** The [0,1] parameter range is sweeped through infinitely.<p>
+    /** The [0,1] parameter range is swept through infinitely.<p>
 
-        The [0,1] parameter range is sweeped through infinitely,
+        The [0,1] parameter range is swept through infinitely,
         starting with 0, going to 1, and going back to 0, and then
         starting again. When plotting the value over time, this yields
         a repeated triangle curve.<p>
@@ -69,9 +69,9 @@ constants AnimationRepeat
 
     //-------------------------------------------------------------------------
 
-    /** The [0,1] parameter range is sweeped through infinitely.<p>
+    /** The [0,1] parameter range is swept through infinitely.<p>
 
-        The [0,1] parameter range is sweeped through infinitely,
+        The [0,1] parameter range is swept through infinitely,
         starting with 0, going to 1, and starting with 0 again. When
         plotting the value over time, this yields a repeated saw-tooth
         curve.<p>
diff --git a/offapi/com/sun/star/rendering/BlendMode.idl b/offapi/com/sun/star/rendering/BlendMode.idl
index 05d53892877a..05d53892877a 100755..100644
--- a/offapi/com/sun/star/rendering/BlendMode.idl
+++ b/offapi/com/sun/star/rendering/BlendMode.idl
diff --git a/offapi/com/sun/star/rendering/ColorComponentTag.idl b/offapi/com/sun/star/rendering/ColorComponentTag.idl
index 7c49edab6d8c..67a01fd60bff 100644
--- a/offapi/com/sun/star/rendering/ColorComponentTag.idl
+++ b/offapi/com/sun/star/rendering/ColorComponentTag.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module rendering {
 
 /** A collection of tags for the individual components of a color.<p>
 
-    Color components usually corrspond to physical attributes like the
+    Color components usually correspond to physical attributes like the
     amount of red colorant contained in an output color. This constant
     field enumerates the most common ones.
 
@@ -69,7 +69,7 @@ constants ColorComponentTag
     /// Green colorant from hexachrome color space
     const byte CMYKOG_GREEN=9;
 
-    /// Arbitray extra spot color, e.g. pantone
+    /// Arbitrary extra spot color, e.g. Pantone
     const byte SPOT=10;
 
     /// Index into palette
diff --git a/offapi/com/sun/star/rendering/ColorSpaceType.idl b/offapi/com/sun/star/rendering/ColorSpaceType.idl
index 1f60100f7fc3..dde7ae42da3b 100644
--- a/offapi/com/sun/star/rendering/ColorSpaceType.idl
+++ b/offapi/com/sun/star/rendering/ColorSpaceType.idl
@@ -50,7 +50,7 @@ constants ColorSpaceType
     /** CMYK color space.<p>
 
         See <a
-        href="http://en.wikipedia.org/wiki/CMYK">wikipedia</a>
+        href="http://en.wikipedia.org/wiki/CMYK">Wikipedia</a>
         for a thorough explanation.
      */
     const byte CMYK=3;
@@ -58,7 +58,7 @@ constants ColorSpaceType
     /** CMYKOG color space.<p>
 
         See <a
-        href="http://en.wikipedia.org/wiki/Hexachrome">wikipedia</a>
+        href="http://en.wikipedia.org/wiki/Hexachrome">Wikipedia</a>
         for a thorough explanation.
      */
     const byte CMYKOG=4;
@@ -66,7 +66,7 @@ constants ColorSpaceType
     /** Standard CieXYZ color space.<p>
 
         See <a
-        href="http://en.wikipedia.org/wiki/CIE_1931_color_space">wikipedia</a>
+        href="http://en.wikipedia.org/wiki/CIE_1931_color_space">Wikipedia</a>
         for a thorough explanation.
      */
     const byte CIEXYZ=5;
@@ -74,8 +74,8 @@ constants ColorSpaceType
     /** Standard CieLab color space.<p>
 
         See <a
-        href="http://en.wikipedia.org/wiki/Lab_color_space">wikipedia</a>
-        for a thorough explanation. Preferrable over CIEXYZ if
+        href="http://en.wikipedia.org/wiki/Lab_color_space">Wikipedia</a>
+        for a thorough explanation. Preferable over CIEXYZ if
         perceptual uniformity is an issue.
      */
     const byte CIELAB=6;
@@ -83,7 +83,7 @@ constants ColorSpaceType
     /** Standard sRGB color space.<p>
 
         See <a
-        href="http://en.wikipedia.org/wiki/Srgb">wikipedia</a>
+        href="http://en.wikipedia.org/wiki/Srgb">Wikipedia</a>
         for a thorough explanation.
      */
     const byte SRGB=7;
@@ -91,7 +91,7 @@ constants ColorSpaceType
     /** HSV color space.<p>
 
         Hue saturation value. See <a
-        href="http://en.wikipedia.org/wiki/HSV_color_space">wikipedia</a>
+        href="http://en.wikipedia.org/wiki/HSV_color_space">Wikipedia</a>
         for a thorough explanation.
      */
     const byte HSV=8;
@@ -99,14 +99,14 @@ constants ColorSpaceType
     /** HSL color space.<p>
 
         Hue saturation lightness. See <a
-        href="http://en.wikipedia.org/wiki/HSL_color_space">wikipedia</a>
+        href="http://en.wikipedia.org/wiki/HSL_color_space">Wikipedia</a>
         for a thorough explanation
      */
     const byte HSL=9;
 
     /** YCbCr color space.<p>
 
-        See <a href="http://en.wikipedia.org/wiki/YCbCr">wikipedia</a>
+        See <a href="http://en.wikipedia.org/wiki/YCbCr">Wikipedia</a>
         for a thorough explanation. This color space is common for
         digital video.
      */
diff --git a/offapi/com/sun/star/rendering/FillRule.idl b/offapi/com/sun/star/rendering/FillRule.idl
index 0959ab0b297b..3ad5c819491e 100644
--- a/offapi/com/sun/star/rendering/FillRule.idl
+++ b/offapi/com/sun/star/rendering/FillRule.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module rendering {
  */
 published enum FillRule
 {
-    /** Fill every area, where, when travelling along a line, the
+    /** Fill every area, where, when traveling along a line, the
         summed winding number (that is, -1 for a
         counter-clockwise-oriented polygon, and +1 for a
         clockwise-oriented) is non-zero.<p>
@@ -51,7 +51,7 @@ published enum FillRule
 
     //-------------------------------------------------------------------------
 
-    /** Fill every area, where, when travelling along a line, an
+    /** Fill every area, where, when traveling along a line, an
         uneven number of intersections with polygon edges have
         happened.<p>
      */
diff --git a/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl b/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl
index 714a20e8bf3e..a68951de1956 100644
--- a/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl
+++ b/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #define __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 
-#ifndef __com_sun_star_rendering_FloatingPointBitmapFormat_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapFormat.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/FontInfo.idl b/offapi/com/sun/star/rendering/FontInfo.idl
index 16b4714a37e8..2497b6f97bc0 100644
--- a/offapi/com/sun/star/rendering/FontInfo.idl
+++ b/offapi/com/sun/star/rendering/FontInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_rendering_FontInfo_idl__
 #define __com_sun_star_rendering_FontInfo_idl__
 
-#ifndef __com_sun_star_util_TriState_idl__
 #include <com/sun/star/util/TriState.idl>
-#endif
-
-#ifndef __com_sun_star_rendering_Panose_idl__
 #include <com/sun/star/rendering/Panose.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
@@ -57,7 +52,7 @@ published struct FontInfo
         The family name is the one normally associated to a font, such
         as Times New Roman, Thorndale, Andale or Arial.<p>
 
-        Note: outlined fonts are now specified with 'outline' as part
+        Note: outlined fonts are now specified with "outline" as part
         of the family name.<p>
      */
     string                              FamilyName;
@@ -72,10 +67,10 @@ published struct FontInfo
 
     //-------------------------------------------------------------------------
 
-    /** This value specifies which unicode ranges are supported by
+    /** This value specifies which Unicode ranges are supported by
         this font.<p>
 
-        This is to be interpreted as a split-up 128bit value, see <a
+        This is to be interpreted as a split-up 128-bit value, see <a
         href=http://partners.adobe.com/asn/tech/type/opentype/os2.jsp#ur>Adobe's
         OpenType specification</a> for the specific meaning of each
         bit. UnicodeRanges0 contains the least significant bits,
diff --git a/offapi/com/sun/star/rendering/FontMetrics.idl b/offapi/com/sun/star/rendering/FontMetrics.idl
index f7beb681b475..657ddb261161 100644
--- a/offapi/com/sun/star/rendering/FontMetrics.idl
+++ b/offapi/com/sun/star/rendering/FontMetrics.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module rendering {
 
 /** Metrics global to the font, i.e. not specific to single
     glyphs. The font height is defined as
-    ascent+descent+internalLeading, and therefore not explicitely
+    ascent+descent+internalLeading, and therefore not explicitly
     included here.<p>
 
     Please note that when querying FontMetrics from an XCanvasFont
diff --git a/offapi/com/sun/star/rendering/FontRequest.idl b/offapi/com/sun/star/rendering/FontRequest.idl
index a1727c30ed4e..eff0f85a39d7 100644
--- a/offapi/com/sun/star/rendering/FontRequest.idl
+++ b/offapi/com/sun/star/rendering/FontRequest.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_rendering_FontRequest_idl__
 #define __com_sun_star_rendering_FontRequest_idl__
 
-#ifndef __com_sun_star_rendering_FontInfo_idl__
 #include <com/sun/star/rendering/FontInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -109,8 +104,8 @@ published struct FontRequest
         This member supplements the
         <member>FontInfo::UnicodeRange0</member> entry with a specific
         locale; this is e.g. important when selecting between
-        traditional and simplified chinese is necessary (since the
-        letters have the same unicode ranges and character values).<p>
+        traditional and simplified Chinese is necessary (since the
+        letters have the same Unicode ranges and character values).<p>
      */
     ::com::sun::star::lang::Locale  Locale;
 
diff --git a/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl b/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl
index fae628f0d9b6..c51d8edb1b76 100644
--- a/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl
+++ b/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_rendering_IntegerBitmapLayout_idl__
 #define __com_sun_star_rendering_IntegerBitmapLayout_idl__
 
-#ifndef __com_sun_star_rendering_XIntegerBitmapColorSpace_idl__
 #include <com/sun/star/rendering/XIntegerBitmapColorSpace.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmapPalette_idl__
 #include <com/sun/star/rendering/XBitmapPalette.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/InterpolationMode.idl b/offapi/com/sun/star/rendering/InterpolationMode.idl
index 00fc8e7e4cd0..4711d995b73e 100644
--- a/offapi/com/sun/star/rendering/InterpolationMode.idl
+++ b/offapi/com/sun/star/rendering/InterpolationMode.idl
@@ -71,10 +71,10 @@ constants InterpolationMode
 
     //-------------------------------------------------------------------------
 
-    /** Perform a cubic bezier spline interpolation.<p>
+    /** Perform a cubic Bezier spline interpolation.<p>
 
         That is, when interpolating at position t, take the three
-        closest data points v0, v1, and v2, fit a cubic bezier spline
+        closest data points v0, v1, and v2, fit a cubic Bezier spline
         through them, and take the interpolated value from this cubic
         curve.<p>
      */
@@ -82,10 +82,10 @@ constants InterpolationMode
 
     //-------------------------------------------------------------------------
 
-    /** Perform a quadric bezier spline interpolation.<p>
+    /** Perform a quadric Bezier spline interpolation.<p>
 
         That is, when interpolating at position t, take the four
-        closest data points v0, v1, v2, and v3, fit a quadric bezier
+        closest data points v0, v1, v2, and v3, fit a quadric Bezier
         spline through them, and take the interpolated value from this
         quadric curve.<p>
      */
diff --git a/sal/osl/os2/secimpl.h b/offapi/com/sun/star/rendering/MtfRenderer.idl
index 6922a6d3c0ce..af07f0a1d391 100644
--- a/sal/osl/os2/secimpl.h
+++ b/offapi/com/sun/star/rendering/MtfRenderer.idl
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2010 Novell, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -25,26 +25,20 @@
  *
  ************************************************************************/
 
-#ifndef _OSL_SECURITYIMPL_H_
-#define _OSL_SECURITYIMPL_H_
+#ifndef __com_sun_star_rendering_MtfRenderer_idl__
+#define __com_sun_star_rendering_MtfRenderer_idl__
 
-#include <osl/security.h>
+#include <com/sun/star/rendering/XCanvas.idl>
 
-#define PASSWD_BUFFER_SIZE 1024     /* recommended, see 'man getpwnam_r' */
+module com { module sun { module star { module rendering {
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _oslSecurityImpl {
-    int           m_isValid;
-    struct passwd m_pPasswd;
-    sal_Char          m_buffer[PASSWD_BUFFER_SIZE];
-} oslSecurityImpl;
+    interface XMtfRenderer : ::com::sun::star::uno::XInterface
+    {
+        void setMetafile( [in] sequence< byte > aMtf );
+        void draw( [in] double fScaleX, [in] double fScaleY );
+    };
 
-#ifdef __cplusplus
-}
-#endif
+    service MtfRenderer : XMtfRenderer;
+}; }; }; };
 
 #endif
-
diff --git a/offapi/com/sun/star/rendering/RenderState.idl b/offapi/com/sun/star/rendering/RenderState.idl
index 1f0cef7843aa..6b450705bee1 100644
--- a/offapi/com/sun/star/rendering/RenderState.idl
+++ b/offapi/com/sun/star/rendering/RenderState.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_rendering_RenderState_idl__
 #define __com_sun_star_rendering_RenderState_idl__
 
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
 #include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/StrokeAttributes.idl b/offapi/com/sun/star/rendering/StrokeAttributes.idl
index e33276796416..a5c714e22cad 100644
--- a/offapi/com/sun/star/rendering/StrokeAttributes.idl
+++ b/offapi/com/sun/star/rendering/StrokeAttributes.idl
@@ -54,7 +54,7 @@ published struct StrokeAttributes
         This attribute is only used when
         <member>StrokeAttributes::JoinType</member> is set to
         <member>PathJoinType::MITER</member>. Should the length of a
-        corner's diagonal exceed this limit, a bevelled join is used
+        corner's diagonal exceed this limit, a beveled join is used
         instead. This value must be positive (or 0.0, which is
         equivalent to setting
         <member>StrokeAttributes::JoinType</member> to
@@ -72,9 +72,9 @@ published struct StrokeAttributes
     /** Array of ink on and off lengths, measured in user coordinate
         space.<p>
 
-        The first element specifies the length of the first 'on'
+        The first element specifies the length of the first "on"
         segment of the dashing, the second element the length of the
-        first 'off' segment, and so forth. Give zero elements here for
+        first "off" segment, and so forth. Give zero elements here for
         solid strokes. This array always have an even number of
         elements, with zero, as usual, counting as even
         here. Furthermore, each entry in this array must have a value
@@ -93,7 +93,7 @@ published struct StrokeAttributes
         always equal
         <member>StrokeAttributes::StrokeWidth</member>. The first
         element specifies the width of the rightmost line, when
-        travelling from the start point of the path to the end
+        traveling from the start point of the path to the end
         point. The second element specifies the space between the
         first line and the second line, and so forth. If the array
         ends with a spacing, this spacing is included in the total
diff --git a/offapi/com/sun/star/rendering/TextHit.idl b/offapi/com/sun/star/rendering/TextHit.idl
index bd0783e8c1f3..ce4c79b94225 100644
--- a/offapi/com/sun/star/rendering/TextHit.idl
+++ b/offapi/com/sun/star/rendering/TextHit.idl
@@ -55,8 +55,8 @@ published struct TextHit
         edge.<p>
 
         Each character is divided in two halves, the leading and the
-        trailing part. The leading edge is the part of the glyph on
-        encounteres first when reading text of the corresponding
+        trailing part. The leading edge is the part of the glyph
+        encountered first when reading text of the corresponding
         language (i.e. the leading edge of an Arabic glyph is the
         right half of it, whereas it is the left half of a Latin
         character). If the hit was on the leading edge, this member is
diff --git a/offapi/com/sun/star/rendering/Texture.idl b/offapi/com/sun/star/rendering/Texture.idl
index 43addb55e769..618ff9e1cbba 100644
--- a/offapi/com/sun/star/rendering/Texture.idl
+++ b/offapi/com/sun/star/rendering/Texture.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_rendering_Texture_idl__
 #define __com_sun_star_rendering_Texture_idl__
 
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
 #include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_StrokeAttributes_idl__
 #include <com/sun/star/rendering/StrokeAttributes.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/ViewState.idl b/offapi/com/sun/star/rendering/ViewState.idl
index 4791232f5ae4..af699b5b7168 100644
--- a/offapi/com/sun/star/rendering/ViewState.idl
+++ b/offapi/com/sun/star/rendering/ViewState.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_rendering_ViewState_idl__
 #define __com_sun_star_rendering_ViewState_idl__
 
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
 #include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl b/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
index 90517a596c13..177e339d4d1b 100644
--- a/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
+++ b/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #define __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/XAnimatedSprite.idl b/offapi/com/sun/star/rendering/XAnimatedSprite.idl
index 9f2f015e113e..8a2ca31a1bea 100644
--- a/offapi/com/sun/star/rendering/XAnimatedSprite.idl
+++ b/offapi/com/sun/star/rendering/XAnimatedSprite.idl
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_rendering_XAnimatedSprite_idl__
 #define __com_sun_star_rendering_XAnimatedSprite_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSprite_idl__
 #include <com/sun/star/rendering/XSprite.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
@@ -176,7 +164,7 @@ published interface XAnimatedSprite : XSprite
         [0,1] range.
 
         @param bUpdateAnimation
-        Whether this method should implicitely call
+        Whether this method should implicitly call
         <member>XSpriteCanvas::updateAnimation</member> or not.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
diff --git a/offapi/com/sun/star/rendering/XAnimation.idl b/offapi/com/sun/star/rendering/XAnimation.idl
index 861b40c44468..b3cb47c1438a 100644
--- a/offapi/com/sun/star/rendering/XAnimation.idl
+++ b/offapi/com/sun/star/rendering/XAnimation.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_rendering_XAnimation_idl__
 #define __com_sun_star_rendering_XAnimation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_AnimationAttributes_idl__
 #include <com/sun/star/rendering/AnimationAttributes.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
@@ -67,7 +57,7 @@ published interface XAnimation : ::com::sun::star::uno::XInterface
 
         Note that it is perfectly legal to e.g. map t in a nonlinear
         fashion to internal frames, for example to achieve
-        acceleration or decceleration effects. It is required that the
+        acceleration or deceleration effects. It is required that the
         render method has const semantics, i.e. when called with the
         same parameter set, identical output must be generated. This
         is because e.g. a Sprite might decide arbitrarily to render an
diff --git a/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
index 081d516fdcf0..077bc2bc5cec 100644
--- a/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
@@ -27,27 +27,19 @@
 #ifndef __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
 #define __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
 #include <com/sun/star/rendering/XPolyPolygon2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealBezierSegment2D_idl__
 #include <com/sun/star/geometry/RealBezierSegment2D.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
 /** This is a specialized interface for a 2D poly-polygon containing
-    straight line and bezier segments.<p>
+    straight line and Bezier segments.<p>
 
     This poly-polygon can contain polygons consisting of a mixture of
-    cubic bezier curves and straight lines. As the straight line is a
-    special case of a cubic bezier curve (control points collinear
+    cubic Bezier curves and straight lines. As the straight line is a
+    special case of a cubic Bezier curve (control points collinear
     with the line through start and end point), this can be expressed
     uniformly with a sequence of <type>RealBezierSegment2D</type>s.<p>
 
@@ -93,7 +85,7 @@ published interface XBezierPolyPolygon2D : XPolyPolygon2D
 
     //-------------------------------------------------------------------------
 
-    /** Set the specified sequence of bezier segments to the poly-polygon.
+    /** Set the specified sequence of Bezier segments to the poly-polygon.
 
         This method can either set the whole poly-polygon to the new
         data, or insert the segments at the given index
@@ -102,14 +94,14 @@ published interface XBezierPolyPolygon2D : XPolyPolygon2D
         The index of the polygon to start segment insertion with. This
         index must be in the range [0,numPolygons], and the insertion
         will take place <em>before</em> this position (i.e. when
-        specifying 0 here, the given bezier sequence will precede all
+        specifying 0 here, the given Bezier sequence will precede all
         existing polygons already within the poly-polygon). To append
         to a poly-polygon, call setPoints() with
         <member>XBezierPolyPolygon2D::getNumberOfPolygons()</member>
         as the polygon index. If nPolygonIndex is -1, the given
-        bezier sequence <em>replaces</em> the poly-polygon content,
+        Bezier sequence <em>replaces</em> the poly-polygon content,
         such that after this method completes, it contains exactly the
-        specified bezier segment data.
+        specified Bezier segment data.
 
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
         if one of the given values exceed the permissible range.
diff --git a/offapi/com/sun/star/rendering/XBitmap.idl b/offapi/com/sun/star/rendering/XBitmap.idl
index 7ba4471118bf..d60b367fffab 100644
--- a/offapi/com/sun/star/rendering/XBitmap.idl
+++ b/offapi/com/sun/star/rendering/XBitmap.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_rendering_XBitmap_idl__
 #define __com_sun_star_rendering_XBitmap_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerSize2D_idl__
 #include <com/sun/star/geometry/IntegerSize2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealSize2D_idl__
 #include <com/sun/star/geometry/RealSize2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/XBitmapCanvas.idl b/offapi/com/sun/star/rendering/XBitmapCanvas.idl
index 5931741248d6..c5030b99809c 100644
--- a/offapi/com/sun/star/rendering/XBitmapCanvas.idl
+++ b/offapi/com/sun/star/rendering/XBitmapCanvas.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XBitmapCanvas_idl__
 #define __com_sun_star_rendering_XBitmapCanvas_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XBitmapPalette.idl b/offapi/com/sun/star/rendering/XBitmapPalette.idl
index f36629285d9a..23a9ff8a6668 100644
--- a/offapi/com/sun/star/rendering/XBitmapPalette.idl
+++ b/offapi/com/sun/star/rendering/XBitmapPalette.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_rendering_XBitmapPalette_idl__
 #define __com_sun_star_rendering_XBitmapPalette_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XBufferController.idl b/offapi/com/sun/star/rendering/XBufferController.idl
index 735582217412..cbffea6efbf4 100644
--- a/offapi/com/sun/star/rendering/XBufferController.idl
+++ b/offapi/com/sun/star/rendering/XBufferController.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_rendering_XBufferController_idl__
 #define __com_sun_star_rendering_XBufferController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -48,7 +44,7 @@ published interface XBufferController : ::com::sun::star::uno::XInterface
 {
     /** Create the given number of background buffers.<p>
 
-        There's one buffer implicitely available, which is the canvas
+        There's one buffer implicitly available, which is the canvas
         surface itself. Thus, calling <code>createBuffers(1)</code>
         creates a double-buffered object.<p>
 
diff --git a/offapi/com/sun/star/rendering/XCachedPrimitive.idl b/offapi/com/sun/star/rendering/XCachedPrimitive.idl
index 18b18c7133a6..ff029831a395 100644
--- a/offapi/com/sun/star/rendering/XCachedPrimitive.idl
+++ b/offapi/com/sun/star/rendering/XCachedPrimitive.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_rendering_XCachedPrimitive_idl__
 #define __com_sun_star_rendering_XCachedPrimitive_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/XCanvas.idl b/offapi/com/sun/star/rendering/XCanvas.idl
index 5a131ce1fbc6..7d1e4ccce08b 100644
--- a/offapi/com/sun/star/rendering/XCanvas.idl
+++ b/offapi/com/sun/star/rendering/XCanvas.idl
@@ -27,52 +27,21 @@
 #ifndef __com_sun_star_rendering_XCanvas_idl__
 #define __com_sun_star_rendering_XCanvas_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealBezierSegment2D_idl__
 #include <com/sun/star/geometry/RealBezierSegment2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_Matrix2D_idl__
 #include <com/sun/star/geometry/Matrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontRequest_idl__
 #include <com/sun/star/rendering/FontRequest.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontInfo_idl__
 #include <com/sun/star/rendering/FontInfo.idl>
-#endif
-#ifndef __com_sun_star_rendering_Texture_idl__
 #include <com/sun/star/rendering/Texture.idl>
-#endif
-#ifndef __com_sun_star_rendering_StringContext_idl__
 #include <com/sun/star/rendering/StringContext.idl>
-#endif
-#ifndef __com_sun_star_rendering_StrokeAttributes_idl__
 #include <com/sun/star/rendering/StrokeAttributes.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 module com {  module sun {  module star {  module geometry {
@@ -120,7 +89,7 @@ published interface XTextLayout;
     <type>RenderState</type> containing only the local offset (and no
     extra clipping).<p>
 
-    Furtheron, this stateless nature provides easy ways for
+    Further on, this stateless nature provides easy ways for
     caching. Every non-trivial operation on <type>XCanvas</type> can
     return a cache object, which, when called to redraw, renders the
     primitive usually much more quickly than the original method. Note
@@ -166,13 +135,13 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The point to draw.
 
         @param aViewState
-        The viewstate to be used when drawing this point.
+        The view state to be used when drawing this point.
 
         @param aRenderState
-        The renderstate to be used when drawing this point.
+        The render state to be used when drawing this point.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     void                drawPoint( [in] ::com::sun::star::geometry::RealPoint2D aPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
@@ -190,13 +159,13 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The end point of the line to draw.
 
         @param aViewState
-        The viewstate to be used when drawing this line.
+        The view state to be used when drawing this line.
 
         @param aRenderState
-        The renderstate to be used when drawing this line.
+        The render state to be used when drawing this line.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     void                drawLine( [in] ::com::sun::star::geometry::RealPoint2D aStartPoint, [in] ::com::sun::star::geometry::RealPoint2D aEndPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
@@ -204,23 +173,23 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    /** Draw a cubic bezier curve in device resolution width (i.e. one
+    /** Draw a cubic Bezier curve in device resolution width (i.e. one
         device pixel wide).
 
         @param aBezierSegment
-        The start and the two control points of the bezier curve.
+        The start and the two control points of the Bezier curve.
 
         @param aEndPoint
-        The end point of the bezier curve.
+        The end point of the Bezier curve.
 
         @param aViewState
-        The viewstate to be used when drawing this curve.
+        The view state to be used when drawing this curve.
 
         @param aRenderState
-        The renderstate to be used when drawing this curve.
+        The render state to be used when drawing this curve.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     void                drawBezier( [in] ::com::sun::star::geometry::RealBezierSegment2D aBezierSegment, [in] ::com::sun::star::geometry::RealPoint2D aEndPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
@@ -235,15 +204,15 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to draw.
 
         @param aViewState
-        The viewstate to be used when drawing this polygon.
+        The view state to be used when drawing this polygon.
 
         @param aRenderState
-        The renderstate to be used when drawing this polygon.
+        The render state to be used when drawing this polygon.
 
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     XCachedPrimitive    drawPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
@@ -265,10 +234,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when stroking this polygon.
+        The view state to be used when stroking this polygon.
 
         @param aRenderState
-        The renderstate to be used when stroking this polygon.
+        The render state to be used when stroking this polygon.
 
         @param aStrokeAttributes
         Further attributes used to parameterize the stroking.
@@ -276,7 +245,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     XCachedPrimitive    strokePolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
@@ -299,10 +268,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when strokes this polygon.
+        The view state to be used when strokes this polygon.
 
         @param aRenderState
-        The renderstate to be used when stroking this polygon.
+        The render state to be used when stroking this polygon.
 
         @param aTextures
         A sequence of texture definitions, with which to fill the
@@ -314,7 +283,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
@@ -343,10 +312,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when stroking this polygon.
+        The view state to be used when stroking this polygon.
 
         @param aRenderState
-        The renderstate to be used when stroking this polygon.
+        The render state to be used when stroking this polygon.
 
         @param aTextures
         A sequence of texture definitions, with which to fill the
@@ -362,7 +331,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
@@ -387,10 +356,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when generating the outline.
+        The view state to be used when generating the outline.
 
         @param aRenderState
-        The renderstate to be used when generating the outline.
+        The render state to be used when generating the outline.
 
         @param aStrokeAttributes
         Further attributes used to parameterize the stroking.
@@ -399,7 +368,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         area.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     XPolyPolygon2D          queryStrokeShapes( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
@@ -417,15 +386,15 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when filling this polygon.
+        The view state to be used when filling this polygon.
 
         @param aRenderState
-        The renderstate to be used when filling this polygon.
+        The render state to be used when filling this polygon.
 
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     XCachedPrimitive    fillPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
@@ -443,10 +412,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when filling this polygon.
+        The view state to be used when filling this polygon.
 
         @param aRenderState
-        The renderstate to be used when filling this polygon.
+        The render state to be used when filling this polygon.
 
         @param aTextures
         A sequence of texture definitions, with which to fill the
@@ -455,7 +424,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
@@ -479,10 +448,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when filling this polygon.
+        The view state to be used when filling this polygon.
 
         @param aRenderState
-        The renderstate to be used when filling this polygon.
+        The render state to be used when filling this polygon.
 
         @param aTextures
         A sequence of texture definitions, with which to fill the
@@ -495,7 +464,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
@@ -594,10 +563,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         the text.
 
         @param aViewState
-        The viewstate to be used when drawing this text.
+        The view state to be used when drawing this text.
 
         @param aRenderState
-        The renderstate to be used when drawing this text.
+        The render state to be used when drawing this text.
 
         @param nTextDirection
         A value from the <type>TextDirection</type> collection,
@@ -609,7 +578,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     XCachedPrimitive        drawText( [in] StringContext aText, [in] XCanvasFont xFont, [in] ViewState aViewState, [in] RenderState aRenderState, [in] byte nTextDirection )
@@ -624,7 +593,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         layout object's baseline. If the layout contains more than one
         baseline, the baseline of the first strong character in
         logical order is used here (strong in this context means that
-        the character can be unambiguously assigned to a unicode
+        the character can be unambiguously assigned to a Unicode
         script).<p>
 
         @param xLayoutetText
@@ -633,15 +602,15 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         layout already carries intrinsic font information.
 
         @param aViewState
-        The viewstate to be used when drawing this text.
+        The view state to be used when drawing this text.
 
         @param aRenderState
-        The renderstate to be used when drawing this text.
+        The render state to be used when drawing this text.
 
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     XCachedPrimitive        drawTextLayout( [in] XTextLayout xLayoutetText, [in] ViewState aViewState, [in] RenderState aRenderState )
@@ -662,15 +631,15 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The bitmap to render.
 
         @param aViewState
-        The viewstate to be used when drawing this text.
+        The view state to be used when drawing this text.
 
         @param aRenderState
-        The renderstate to be used when drawing this text.
+        The render state to be used when drawing this text.
 
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
@@ -695,11 +664,11 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The bitmap to render.
 
         @param aViewState
-        The viewstate to be used when drawing this text.
+        The view state to be used when drawing this text.
 
         @param aRenderState
-        The renderstate to be used when drawing this text. The device
-        color entry in the renderstate is multiplied with every pixel
+        The render state to be used when drawing this text. The device
+        color entry in the render state is multiplied with every pixel
         color value, and only the result is rendered into the
         canvas. If, for example, the bitmap should be rendered with
         increased global transparency, set all device color channels
@@ -709,7 +678,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
diff --git a/offapi/com/sun/star/rendering/XCanvasFont.idl b/offapi/com/sun/star/rendering/XCanvasFont.idl
index a761c604b18d..77960e7a7ce6 100644
--- a/offapi/com/sun/star/rendering/XCanvasFont.idl
+++ b/offapi/com/sun/star/rendering/XCanvasFont.idl
@@ -27,34 +27,15 @@
 #ifndef __com_sun_star_rendering_XCanvasFont_idl__
 #define __com_sun_star_rendering_XCanvasFont_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontRequest_idl__
 #include <com/sun/star/rendering/FontRequest.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontMetrics_idl__
 #include <com/sun/star/rendering/FontMetrics.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_StringContext_idl__
 #include <com/sun/star/rendering/StringContext.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XColorSpace.idl b/offapi/com/sun/star/rendering/XColorSpace.idl
index 5bfb666b30a1..20a5e669baf0 100644
--- a/offapi/com/sun/star/rendering/XColorSpace.idl
+++ b/offapi/com/sun/star/rendering/XColorSpace.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_rendering_XColorSpace_idl__
 #define __com_sun_star_rendering_XColorSpace_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_rendering_ColorProfile_idl__
 #include <com/sun/star/rendering/ColorProfile.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -85,7 +77,7 @@ published struct ARGBColor
     This interface encapsulates all information that is necessary to
     interpret color data, by defining a describing color space, like
     for example CMYK or sRGB. You can either convert between this and
-    an arbitrary other colorspace, or into the standard RGB or ARGB
+    an arbitrary other color space, or into the standard RGB or ARGB
     formats (because those are so overwhelmingly common in computer
     graphics).<p>
 
@@ -232,7 +224,7 @@ published interface XColorSpace
     /** Convert sRGB color to a representation in this color space.<p>
 
         If this color space conveys alpha information, it is assumed
-        be fully opaque for the given rgb color value.
+        be fully opaque for the given RGB color value.
 
         @param deviceColor Sequence of sRGB color components. Is
         permitted to contain more than one color element, therefore,
diff --git a/offapi/com/sun/star/rendering/XCustomSprite.idl b/offapi/com/sun/star/rendering/XCustomSprite.idl
index 3b6dd45644f4..bbc01238a1c5 100644
--- a/offapi/com/sun/star/rendering/XCustomSprite.idl
+++ b/offapi/com/sun/star/rendering/XCustomSprite.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_rendering_XCustomSprite_idl__
 #define __com_sun_star_rendering_XCustomSprite_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSprite_idl__
 #include <com/sun/star/rendering/XSprite.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/XGraphicDevice.idl b/offapi/com/sun/star/rendering/XGraphicDevice.idl
index 3a4b03236743..8edddb42cb88 100644
--- a/offapi/com/sun/star/rendering/XGraphicDevice.idl
+++ b/offapi/com/sun/star/rendering/XGraphicDevice.idl
@@ -27,30 +27,14 @@
 #ifndef __com_sun_star_rendering_XGraphicDevice_idl__
 #define __com_sun_star_rendering_XGraphicDevice_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerSize2D_idl__
 #include <com/sun/star/geometry/IntegerSize2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealSize2D_idl__
 #include <com/sun/star/geometry/RealSize2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XLinePolyPolygon2D_idl__
 #include <com/sun/star/rendering/XLinePolyPolygon2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
 #include <com/sun/star/rendering/XBezierPolyPolygon2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -103,7 +87,7 @@ published interface XGraphicDevice : ::com::sun::star::uno::XInterface
         millimeter.
 
         A special floating point value of +infinity here indicates
-        'unknown', i.e. at the time of rendering undetermined or
+        "unknown", i.e. at the time of rendering undetermined or
         possibly infinite resolution along the corresponding
         direction.
      */
@@ -114,7 +98,7 @@ published interface XGraphicDevice : ::com::sun::star::uno::XInterface
     /** Query the physical dimensions of the device in millimeter.
 
         A special floating point value of +infinity here indicates
-        'unknown', i.e. at the time of rendering undetermined or
+        "unknown", i.e. at the time of rendering undetermined or
         possibly infinite resolution along the corresponding
         direction.
 
@@ -134,7 +118,7 @@ published interface XGraphicDevice : ::com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    /** Create a bezier poly-polygon which can internally use
+    /** Create a Bezier poly-polygon which can internally use
         device-optimized representations already.
 
         @param points
diff --git a/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl b/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl
index e23ec8420388..df0013f23f65 100644
--- a/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl
+++ b/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XHalfFloatBitmap_idl__
 #define __com_sun_star_rendering_XHalfFloatBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XHalfFloatReadOnlyBitmap_idl__
 #include <com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl
index 166f38425d5c..45b19c9c0207 100644
--- a/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XHalfFloatReadOnlyBitmap_idl__
 #define __com_sun_star_rendering_XHalfFloatReadOnlyBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl b/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl
index bdb8b657e625..382386cdca8e 100644
--- a/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XIeeeDoubleBitmap_idl__
 #define __com_sun_star_rendering_XIeeeDoubleBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XIeeeDoubleReadOnlyBitmap_idl__
 #include <com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl
index 80103467ad1d..1e0a4c4dad54 100644
--- a/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XIeeeDoubleReadOnlyBitmap_idl__
 #define __com_sun_star_rendering_XIeeeDoubleReadOnlyBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
@@ -87,7 +73,7 @@ interface XIeeeDoubleReadOnlyBitmap : XBitmap
 
         @param rect
         A rectangle, within the bounds of the bitmap, to retrieve the
-        contens from.
+        consent from.
 
         @throws <type>VolatileContentDestroyedException</type>
         if the bitmap is volatile, and the content has been destroyed by the system.
diff --git a/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl b/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl
index 6fd9f9552e9b..79b226814064 100644
--- a/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XIeeeFloatBitmap_idl__
 #define __com_sun_star_rendering_XIeeeFloatBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XIeeeFloatReadOnlyBitmap_idl__
 #include <com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl
index 04e5cf0e8865..ec76f0a9c783 100644
--- a/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XIeeeFloatReadOnlyBitmap_idl__
 #define __com_sun_star_rendering_XIeeeFloatReadOnlyBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
@@ -86,7 +72,7 @@ interface XIeeeFloatReadOnlyBitmap : XBitmap
 
         @param rect
         A rectangle, within the bounds of the bitmap, to retrieve the
-        contens from.
+        consent from.
 
         @throws <type>VolatileContentDestroyedException</type>
         if the bitmap is volatile, and the content has been destroyed by the system.
diff --git a/offapi/com/sun/star/rendering/XIntegerBitmap.idl b/offapi/com/sun/star/rendering/XIntegerBitmap.idl
index b416d30debd1..38f5712df9c6 100644
--- a/offapi/com/sun/star/rendering/XIntegerBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIntegerBitmap.idl
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_rendering_XIntegerBitmap_idl__
 #define __com_sun_star_rendering_XIntegerBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_IntegerBitmapLayout_idl__
 #include <com/sun/star/rendering/IntegerBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_rendering_XIntegerReadOnlyBitmap_idl__
 #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
diff --git a/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl b/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl
index f05c7a4b1303..5a40632b1e05 100644
--- a/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl
+++ b/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_rendering_XIntegerBitmapColorSpace_idl__
 #define __com_sun_star_rendering_XIntegerBitmapColorSpace_idl__
 
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -59,7 +57,7 @@ interface XIntegerBitmapColorSpace : XColorSpace
 
     /** Query the number of bits used for each component.<p>
 
-        This method returnes a sequence of integers, each denoting the
+        This method returns a sequence of integers, each denoting the
         number of bits occupied by the respective component. The sum
         of all component bits must be less or equal than the value
         returned from <member>getBitsPerPixel()</member>. If the sum is
@@ -79,7 +77,7 @@ interface XIntegerBitmapColorSpace : XColorSpace
 
     /** Query whether color data bytes need to be swapped.<p>
 
-        @return <TRUE/>, This method returns the endiannes of the color
+        @return <TRUE/>, This method returns the endianness of the color
         data. The value is one of the <type>Endianness</type>
         constants. If color data is represented using more than one
         byte, the actual channel positions are specified using bit
@@ -210,7 +208,7 @@ interface XIntegerBitmapColorSpace : XColorSpace
         space.<p>
 
         If this color space conveys alpha information, it is assumed
-        be fully opaque for the given rgb color value.  Color values
+        be fully opaque for the given RGB color value.  Color values
         are properly rounded and clipped, to be valid in the target
         color space.<p>
 
diff --git a/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl
index a7385aa9973a..92a240ad3fc2 100644
--- a/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_rendering_XIntegerReadOnlyBitmap_idl__
 #define __com_sun_star_rendering_XIntegerReadOnlyBitmap_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_IntegerRectangle2D_idl__
 #include <com/sun/star/geometry/IntegerRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_IntegerBitmapLayout_idl__
 #include <com/sun/star/rendering/IntegerBitmapLayout.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
@@ -96,7 +82,7 @@ interface XIntegerReadOnlyBitmap : XBitmap
 
         @param rect
         A rectangle, within the bounds of the bitmap, to retrieve the
-        contens from.
+        consent from.
 
         @throws <type>VolatileContentDestroyedException</type>
         if the bitmap is volatile, and the content has been destroyed by the system.
diff --git a/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl b/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
index 865faec60b9e..691a1bec3bdd 100644
--- a/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_rendering_XLinePolyPolygon2D_idl__
 #define __com_sun_star_rendering_XLinePolyPolygon2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
 #include <com/sun/star/rendering/XPolyPolygon2D.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
index c000f69fc65b..cd39037502b1 100644
--- a/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_rendering_XParametricPolyPolygon2D_idl__
 #define __com_sun_star_rendering_XParametricPolyPolygon2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
 #include <com/sun/star/rendering/XPolyPolygon2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -61,8 +51,8 @@ published interface XParametricPolyPolygon2D : ::com::sun::star::uno::XInterface
 
         @param t
         Parameter value in the range [0,1]. During painting, this
-        range is sweeped through starting from 0. When using such a
-        parametric polypolygon for gradients, the area covered by the
+        range is swept through starting from 0. When using such a
+        parametric poly-polygon for gradients, the area covered by the
         returned XPolyPolygon2D should be monotonically decreasing
         with t (unless singularities in e.g. the resulting gradient
         are desired).
diff --git a/offapi/com/sun/star/rendering/XPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
index ceeed55ec080..0d7cf339b1fb 100644
--- a/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
 #define __com_sun_star_rendering_XPolyPolygon2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_rendering_FillRule_idl__
 #include <com/sun/star/rendering/FillRule.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -58,7 +48,7 @@ published interface XPolyPolygon2D : ::com::sun::star::uno::XInterface
         that they participate in mutual fill rule calculations like
         the polygons inside a single poly-polygon do. When rendering
         such a poly-polygon without transparency, it will look like the
-        constituing poly-polygons rendered separately on top of
+        constituting poly-polygons rendered separately on top of
         another. Alas, when rendering with transparency, separate
         rendering will combine the alpha of overlapping areas, whereas
         addPolyPolygon results in constant alpha, regardless how many
diff --git a/offapi/com/sun/star/rendering/XSimpleCanvas.idl b/offapi/com/sun/star/rendering/XSimpleCanvas.idl
index 33626853e80a..50c591a86342 100644
--- a/offapi/com/sun/star/rendering/XSimpleCanvas.idl
+++ b/offapi/com/sun/star/rendering/XSimpleCanvas.idl
@@ -27,30 +27,14 @@
 #ifndef __com_sun_star_rendering_XSimpleCanvas_idl__
 #define __com_sun_star_rendering_XSimpleCanvas_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
 #include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_StringContext_idl__
 #include <com/sun/star/rendering/StringContext.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontMetrics_idl__
 #include <com/sun/star/rendering/FontMetrics.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/rendering/XSprite.idl b/offapi/com/sun/star/rendering/XSprite.idl
index d62b93bdeb7e..76348558fef0 100644
--- a/offapi/com/sun/star/rendering/XSprite.idl
+++ b/offapi/com/sun/star/rendering/XSprite.idl
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_rendering_XSprite_idl__
 #define __com_sun_star_rendering_XSprite_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_AffineMatrix2D_idl__
 #include <com/sun/star/geometry/AffineMatrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
@@ -93,13 +81,13 @@ published interface XSprite : ::com::sun::star::uno::XInterface
         The new position, in user coordinate space, to move the sprite to.
 
         @param aViewState
-        The viewstate to be used when interpreting aNewPos.
+        The view state to be used when interpreting aNewPos.
 
         @param aRenderState
-        The renderstate to be used when interpreting aNewPos.
+        The render state to be used when interpreting aNewPos.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     void move( [in] ::com::sun::star::geometry::RealPoint2D aNewPos, [in] ViewState aViewState, [in] RenderState aRenderState )
diff --git a/offapi/com/sun/star/rendering/XSpriteCanvas.idl b/offapi/com/sun/star/rendering/XSpriteCanvas.idl
index 97d2feaee6c5..eeafd90f71df 100644
--- a/offapi/com/sun/star/rendering/XSpriteCanvas.idl
+++ b/offapi/com/sun/star/rendering/XSpriteCanvas.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
 #define __com_sun_star_rendering_XSpriteCanvas_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_rendering_XBitmapCanvas_idl__
 #include <com/sun/star/rendering/XBitmapCanvas.idl>
-#endif
-#ifndef __com_sun_star_rendering_XAnimation_idl__
 #include <com/sun/star/rendering/XAnimation.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/XTextLayout.idl b/offapi/com/sun/star/rendering/XTextLayout.idl
index 04b6c4f0103b..751076749b9b 100644
--- a/offapi/com/sun/star/rendering/XTextLayout.idl
+++ b/offapi/com/sun/star/rendering/XTextLayout.idl
@@ -27,39 +27,17 @@
 #ifndef __com_sun_star_rendering_XTextLayout_idl__
 #define __com_sun_star_rendering_XTextLayout_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealBezierSegment2D_idl__
 #include <com/sun/star/geometry/RealBezierSegment2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_StringContext_idl__
 #include <com/sun/star/rendering/StringContext.idl>
-#endif
-#ifndef __com_sun_star_rendering_TextHit_idl__
 #include <com/sun/star/rendering/TextHit.idl>
-#endif
-#ifndef __com_sun_star_rendering_Caret_idl__
 #include <com/sun/star/rendering/Caret.idl>
-#endif
 
 
 module com { module sun { module star { module rendering {
@@ -110,8 +88,8 @@ published interface XTextLayout : ::com::sun::star::uno::XInterface
         text.<p>
 
         Ink, or tight bounding boxes in this case means that for
-        e.g. an 'a', the bounding box for the
-        <type>XPolyPolygon2D</type> describing the glyph 'a' is
+        e.g. an "a", the bounding box for the
+        <type>XPolyPolygon2D</type> describing the glyph "a" is
         returned, not the logical dimensions of the character in the
         font.<p>
 
@@ -128,7 +106,7 @@ published interface XTextLayout : ::com::sun::star::uno::XInterface
         given text string.<p>
 
         Logical bounding boxes means the space that the font allocates
-        for the given character, which, e.g. for a '.', might be
+        for the given character, which, e.g. for a ".", might be
         significantly broader than the bounds returned via
         <member>XTextLayout::queryInkMeasures()</member>.
 
@@ -170,7 +148,7 @@ published interface XTextLayout : ::com::sun::star::uno::XInterface
         logical character in the input string (<em>not</em> for every
         glyph. There might be multiple glyphs per input character, or
         multiple input characters per glyph). This is useful to
-        explicitely manipulate the exact output positions of
+        explicitly manipulate the exact output positions of
         characters, e.g. relative to a reference output device.<p>
 
         @param aAdvancements
@@ -291,7 +269,7 @@ published interface XTextLayout : ::com::sun::star::uno::XInterface
         @param bExcludeLigatures
         Set this to <TRUE/>, to skip the positions inside ligatures as
         valid caret placements. That means, on cannot e.g. set the
-        caret between the 'f' and the 'i' in a 'fi' ligature.
+        caret between the "f" and the "i" in a "fi" ligature.
 
         @returns the generated Caret structure.
 
diff --git a/offapi/com/sun/star/rendering/XVolatileBitmap.idl b/offapi/com/sun/star/rendering/XVolatileBitmap.idl
index e8a30d6f86cd..4803b3c1ec8c 100644
--- a/offapi/com/sun/star/rendering/XVolatileBitmap.idl
+++ b/offapi/com/sun/star/rendering/XVolatileBitmap.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_rendering_XVolatileBitmap_idl__
 #define __com_sun_star_rendering_XVolatileBitmap_idl__
 
-#ifndef __com_sun_star_rendering_XBitmap_idl__
 #include <com/sun/star/rendering/XBitmap.idl>
-#endif
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/makefile.mk b/offapi/com/sun/star/rendering/makefile.mk
index 6b59d156d35e..888d0b7f9c3f 100644
--- a/offapi/com/sun/star/rendering/makefile.mk
+++ b/offapi/com/sun/star/rendering/makefile.mk
@@ -56,6 +56,7 @@ IDLFILES=\
     FontRequest.idl \
     IntegerBitmapLayout.idl \
     InterpolationMode.idl \
+    MtfRenderer.idl \
     Panose.idl \
     PanoseArmStyle.idl \
     PanoseContrast.idl \
diff --git a/offapi/com/sun/star/report/ForceNewPage.idl b/offapi/com/sun/star/report/ForceNewPage.idl
index 90cfd1f7e5ae..3be6d1aeb4fd 100644
--- a/offapi/com/sun/star/report/ForceNewPage.idl
+++ b/offapi/com/sun/star/report/ForceNewPage.idl
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-/** Specifies if the section will be printed on an separte page.
+/** Specifies if the section will be printed on an separate page.
     <p>This does not apply to page header or page footer.</p>
     @see XSection
  */
diff --git a/offapi/com/sun/star/report/ReportPrintOption.idl b/offapi/com/sun/star/report/ReportPrintOption.idl
index f2e923dc1090..a73db543672c 100644
--- a/offapi/com/sun/star/report/ReportPrintOption.idl
+++ b/offapi/com/sun/star/report/ReportPrintOption.idl
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-/** Specifies wether a page header or footer is printed on the same page as the report header or report footer.
+/** Specifies whether a page header or footer is printed on the same page as the report header or report footer.
  */
 published constants ReportPrintOption
 {
diff --git a/offapi/com/sun/star/report/XFixedLine.idl b/offapi/com/sun/star/report/XFixedLine.idl
index 7dcd6d7208d8..3f01884b1249 100644
--- a/offapi/com/sun/star/report/XFixedLine.idl
+++ b/offapi/com/sun/star/report/XFixedLine.idl
@@ -27,23 +27,12 @@
 #ifndef __com_sun_star_report_XFixedLine_idl__
 #define __com_sun_star_report_XFixedLine_idl__
 
-#ifndef __com_sun_star_report_XReportControlModel_idl__
 #include <com/sun/star/report/XReportControlModel.idl>
-#endif
-#ifndef __com_sun_star_drawing_CircleKind_idl__
 #include <com/sun/star/drawing/CircleKind.idl>
-#endif
-#ifndef __com_sun_star_drawing_LineStyle_idl__
 #include <com/sun/star/drawing/LineStyle.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineDash_idl__
 #include <com/sun/star/drawing/LineDash.idl>
-#endif
 //=============================================================================
 
  module com {  module sun {  module star {  module report {
diff --git a/offapi/com/sun/star/report/XFixedText.idl b/offapi/com/sun/star/report/XFixedText.idl
index 3444aa8d7c5d..88775201b50c 100644
--- a/offapi/com/sun/star/report/XFixedText.idl
+++ b/offapi/com/sun/star/report/XFixedText.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_report_XFixedText_idl__
 #define __com_sun_star_report_XFixedText_idl__
 
-#ifndef __com_sun_star_report_XReportControlModel_idl__
 #include <com/sun/star/report/XReportControlModel.idl>
-#endif
 //=============================================================================
 
  module com {  module sun {  module star {  module report {
diff --git a/offapi/com/sun/star/report/XFormatCondition.idl b/offapi/com/sun/star/report/XFormatCondition.idl
index 340f3a828a80..a89596cbaad2 100644
--- a/offapi/com/sun/star/report/XFormatCondition.idl
+++ b/offapi/com/sun/star/report/XFormatCondition.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_report_XFormatCondition_idl__
 #define __com_sun_star_report_XFormatCondition_idl__
 
-#ifndef __com_sun_star_report_XReportControlFormat_idl__
 #include <com/sun/star/report/XReportControlFormat.idl>
-#endif
 
 //=============================================================================
  module com {  module sun {  module star {  module report {
diff --git a/offapi/com/sun/star/report/XFormattedField.idl b/offapi/com/sun/star/report/XFormattedField.idl
index 3dc102752572..2de7609b81b5 100644
--- a/offapi/com/sun/star/report/XFormattedField.idl
+++ b/offapi/com/sun/star/report/XFormattedField.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_report_XFormattedField_idl__
 #define __com_sun_star_report_XFormattedField_idl__
 
-#ifndef __com_sun_star_report_XReportControlModel_idl__
 #include <com/sun/star/report/XReportControlModel.idl>
-#endif
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/report/XFunction.idl b/offapi/com/sun/star/report/XFunction.idl
index 8a511a29939b..8b5df0737e9e 100644
--- a/offapi/com/sun/star/report/XFunction.idl
+++ b/offapi/com/sun/star/report/XFunction.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_report_XFunction_idl__
 #define __com_sun_star_report_XFunction_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
 #include <com/sun/star/beans/Optional.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 //=============================================================================
  module com {  module sun {  module star {  module report {
 //=============================================================================
@@ -71,11 +63,11 @@ published interface XFunction
     */
     [attribute,bound] string Name;
 
-    /** defines the formular of this function
+    /** defines the formula of this function
     */
     [attribute,bound] string Formula;
 
-    /** defines the formular for the intial value
+    /** defines the formula for the initial value
     */
     [attribute,bound] com::sun::star::beans::Optional<string> InitialFormula;
 };
diff --git a/offapi/com/sun/star/report/XFunctions.idl b/offapi/com/sun/star/report/XFunctions.idl
index 4b23b61b962c..efad49b98fc5 100644
--- a/offapi/com/sun/star/report/XFunctions.idl
+++ b/offapi/com/sun/star/report/XFunctions.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_report_XFunctions_idl__
 #define __com_sun_star_report_XFunctions_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 //=============================================================================
 
  module com {  module sun {  module star {  module report {
diff --git a/offapi/com/sun/star/report/XFunctionsSupplier.idl b/offapi/com/sun/star/report/XFunctionsSupplier.idl
index c9e2e49d8085..8902eba6b1b0 100644
--- a/offapi/com/sun/star/report/XFunctionsSupplier.idl
+++ b/offapi/com/sun/star/report/XFunctionsSupplier.idl
@@ -27,17 +27,13 @@
 #ifndef __com_sun_star_report_XFunctionsSupplier_idl__
 #define __com_sun_star_report_XFunctionsSupplier_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 //=============================================================================
  module com {  module sun {  module star {  module report {
 //=============================================================================
 published interface XFunctions;
-/** specifies the functions supplier which are located in a report defintion or a group.
+/** specifies the functions supplier which are located in a report definition or a group.
 */
 published interface XFunctionsSupplier
 {
diff --git a/offapi/com/sun/star/report/XGroup.idl b/offapi/com/sun/star/report/XGroup.idl
index ac55066fdbf8..a69e55a53b84 100644
--- a/offapi/com/sun/star/report/XGroup.idl
+++ b/offapi/com/sun/star/report/XGroup.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_report_XGroup_idl__
 #define __com_sun_star_report_XGroup_idl__
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_report_XSection_idl__
 #include <com/sun/star/report/XSection.idl>
-#endif
-#ifndef __com_sun_star_report_XGroups_idl__
 #include <com/sun/star/report/XGroups.idl>
-#endif
 #include <com/sun/star/report/XFunctions.idl>
 //=============================================================================
 
diff --git a/offapi/com/sun/star/report/XGroups.idl b/offapi/com/sun/star/report/XGroups.idl
index a166425104ae..d96242e83ef0 100644
--- a/offapi/com/sun/star/report/XGroups.idl
+++ b/offapi/com/sun/star/report/XGroups.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_report_XGroups_idl__
 #define __com_sun_star_report_XGroups_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 //=============================================================================
 
  module com {  module sun {  module star {  module report {
diff --git a/offapi/com/sun/star/report/XImageControl.idl b/offapi/com/sun/star/report/XImageControl.idl
index ea0641455d10..f4d56ff67a37 100644
--- a/offapi/com/sun/star/report/XImageControl.idl
+++ b/offapi/com/sun/star/report/XImageControl.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_report_XImageControl_idl__
 #define __com_sun_star_report_XImageControl_idl__
 
-#ifndef __com_sun_star_report_XReportControlModel_idl__
 #include <com/sun/star/report/XReportControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
 #include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/report/XReportComponent.idl b/offapi/com/sun/star/report/XReportComponent.idl
index 19466f68c243..519f6bc32c95 100644
--- a/offapi/com/sun/star/report/XReportComponent.idl
+++ b/offapi/com/sun/star/report/XReportComponent.idl
@@ -27,30 +27,16 @@
 #ifndef __com_sun_star_report_XReportComponent_idl__
 #define __com_sun_star_report_XReportComponent_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_XCloneable_idl__
 #include <com/sun/star/util/XCloneable.idl>
-#endif
-#ifndef __com_sun_star_awt_XControlModel_idl__
 #include <com/sun/star/awt/XControlModel.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 //=============================================================================
 
@@ -158,7 +144,7 @@ published interface XReportComponent
     /**is used for subreports and contains the names of the columns of the subreport
     which are related to the master fields of the parent report.
     <p>Entries in this sequence can either denote column names in the sub report,
-    or paramater names.<br/>
+    or parameter names.<br/>
     For instance, you could base the report on the SQL statement
     <code>SELECT * FROM invoices WHERE cust_ref = :cid</code>, and add <code>cid</code>
     to the DetailFields property. In this case, the parameter will be filled from
@@ -170,7 +156,7 @@ published interface XReportComponent
     master field.<br/>
     If a string in this property denotes both a column name and a parameter name, it
     is undefined which way it is interpreted, but implementations of the service are required
-    to either decide for the paramter or the column, and proceed as usual.
+    to either decide for the parameter or the column, and proceed as usual.
     </p>
     <p>The columns specified herein typically represent a part of the primary key
     fields or their aliases of the detail report.</p>
@@ -186,7 +172,7 @@ published interface XReportComponent
 
 
     /** Specifies the section where the control belongs to.
-        This is a shortcut to get control hierachy up.
+        This is a shortcut to get control hierarchy up.
         This value is <NULL/> when the control was not inserted in any section.
     */
     [attribute,readonly] com::sun::star::report::XSection Section;
diff --git a/offapi/com/sun/star/report/XReportControlFormat.idl b/offapi/com/sun/star/report/XReportControlFormat.idl
index 74eee2a0035a..dba485f01625 100644
--- a/offapi/com/sun/star/report/XReportControlFormat.idl
+++ b/offapi/com/sun/star/report/XReportControlFormat.idl
@@ -114,7 +114,7 @@ published interface XReportControlFormat
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** determins whether text is formatted in two lines.
+    /** determines whether text is formatted in two lines.
      <p>It is linked to the properties CharCombinePrefix and CharCombineSuffix.</p>
      */
     [attribute,bound] boolean CharCombineIsOn
@@ -189,7 +189,7 @@ published interface XReportControlFormat
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** specifies the percentage of raisement/lowerment of superscript/subscript
+    /** specifies the percentage by which to raise/lower superscript/subscript
         characters.
 
         <p>Negative values denote subscripts and positive values superscripts.</p>
@@ -355,7 +355,7 @@ published interface XReportControlFormat
     };
 
     //-------------------------------------------------------------------------
-    /** determins the type of the strike out of the character.
+    /** determines the type of the strike out of the character.
         @see com.sun.star.awt.FontStrikeout
     */
     [attribute,bound] short CharStrikeout
@@ -373,7 +373,7 @@ published interface XReportControlFormat
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** determins the rotation of a character in degree.
+    /** determines the rotation of a character in degree.
         <p>Depending on the implementation only certain values may be allowed.
         </p>
      */
@@ -384,7 +384,7 @@ published interface XReportControlFormat
     };
     //-------------------------------------------------------------------------
 
-    /** determins the percentage value for scaling the width of characters.
+    /** determines the percentage value for scaling the width of characters.
 
         <p>The value refers to the original width which is denoted by 100,
         and it has to be greater than 0.</p>
diff --git a/offapi/com/sun/star/report/XReportControlModel.idl b/offapi/com/sun/star/report/XReportControlModel.idl
index 3f65afd84964..725c5b4b4893 100644
--- a/offapi/com/sun/star/report/XReportControlModel.idl
+++ b/offapi/com/sun/star/report/XReportControlModel.idl
@@ -27,21 +27,11 @@
 #ifndef __com_sun_star_report_XReportControlModel_idl__
 #define __com_sun_star_report_XReportControlModel_idl__
 
-#ifndef __com_sun_star_report_XReportComponent_idl__
 #include <com/sun/star/report/XReportComponent.idl>
-#endif
-#ifndef __com_sun_star_report_XReportControlFormat_idl__
 #include <com/sun/star/report/XReportControlFormat.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_report_XFormatCondition_idl__
 #include <com/sun/star/report/XFormatCondition.idl>
-#endif
 //=============================================================================
 
  module com {  module sun {  module star {  module report {
diff --git a/offapi/com/sun/star/report/XReportDefinition.idl b/offapi/com/sun/star/report/XReportDefinition.idl
index 6c20ede01305..cadb506f92e3 100644
--- a/offapi/com/sun/star/report/XReportDefinition.idl
+++ b/offapi/com/sun/star/report/XReportDefinition.idl
@@ -27,63 +27,25 @@
 #ifndef __com_sun_star_report_XReportDefinition_idl__
 #define __com_sun_star_report_XReportDefinition_idl__
 
-#ifndef __com_sun_star_report_XReportComponent_idl__
 #include <com/sun/star/report/XReportComponent.idl>
-#endif
-#ifndef __com_sun_star_report_XFunctionsSupplier_idl__
 #include <com/sun/star/report/XFunctionsSupplier.idl>
-#endif
-#ifndef __com_sun_star_view_PaperOrientation_idl__
 #include <com/sun/star/view/PaperOrientation.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_view_PaperFormat_idl__
 #include <com/sun/star/view/PaperFormat.idl>
-#endif
-#ifndef __com_sun_star_util_XClosable_idl__
 #include <com/sun/star/util/XCloseable.idl>
-#endif
-#ifndef __com_sun_star_ui_XUIConfigurationManagerSupplier_idl__
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.idl>
-#endif
-#ifndef __com_sun_star_document_XDocumentSubStorageSupplier_idl__
 #include <com/sun/star/document/XDocumentSubStorageSupplier.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-#ifndef __com_sun_star_document_XViewDataSupplier_idl__
 #include <com/sun/star/document/XViewDataSupplier.idl>
-#endif
-#ifndef __com_sun_star_frame_XLoadable_idl__
 #include <com/sun/star/frame/XLoadable.idl>
-#endif
-#ifndef __com_sun_star_embed_XVisualObject_idl__
 #include <com/sun/star/embed/XVisualObject.idl>
-#endif
-#ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
 #include <com/sun/star/document/XStorageBasedDocument.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_util_XModifiable2_idl__
 #include <com/sun/star/util/XModifiable2.idl>
-#endif
-#ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #include <com/sun/star/document/XEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_lang_DisposedException_idl__
 #include <com/sun/star/lang/DisposedException.idl>
-#endif
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
 
 module com {  module sun {  module star {  module sdbc {
 published interface XConnection;
@@ -117,7 +79,7 @@ published interface XReportDefinition
     */
     interface com::sun::star::frame::XLoadable;
 
-    /** represents common visualisation functionality for the embedded report.
+    /** represents common visualization functionality for the embedded report.
     */
     interface com::sun::star::embed::XVisualObject;
 
@@ -151,7 +113,7 @@ published interface XReportDefinition
 
         <p>
         With this interface it's possible too, to reset the modify state.
-        That can be neccessary to prevent code against problem during closing
+        That can be necessary to prevent code against problem during closing
         of the document without saving any changes.
         </p>
      */
@@ -234,14 +196,14 @@ published interface XReportDefinition
 
         <p><member>Command</member> needs to be interpreted depending on the value of this property.</p>
 
-        <p>This property is only meaningfull together with the <member>Command</member>
+        <p>This property is only meaningful together with the <member>Command</member>
         property, thus either <em>both</em> or <em>none</em> of them are present.</p>
 
         @see com::sun::star::sdb::CommandType
      */
     [attribute,bound] long CommandType;
 
-    /** specifies an addtional filter to optinally use.
+    /** specifies an additional filter to optionally use.
 
         <p>The Filter string has to form a SQL WHERE-clause, <em>without</em> the WHERE-string itself.</p>
 
diff --git a/offapi/com/sun/star/report/XReportEngine.idl b/offapi/com/sun/star/report/XReportEngine.idl
index f364a6a48bf5..fbf6648e2152 100644
--- a/offapi/com/sun/star/report/XReportEngine.idl
+++ b/offapi/com/sun/star/report/XReportEngine.idl
@@ -27,39 +27,17 @@
 #ifndef __com_sun_star_report_XReportEngine_idl__
 #define __com_sun_star_report_XReportEngine_idl__
 
-#ifndef __com_sun_star_report_XReportDefinition_idl__
 #include <com/sun/star/report/XReportDefinition.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
 #include <com/sun/star/task/XStatusIndicator.idl>
-#endif
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XConnection_idl__
 #include <com/sun/star/sdbc/XConnection.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_DisposedException_idl__
 #include <com/sun/star/lang/DisposedException.idl>
-#endif
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module report {
@@ -105,7 +83,7 @@ published interface XReportEngine
         @throws <type scope="com::sun::star::lang">IllegalArgumentException</type>
             If the report definition was not set or is <NULL/>.
 
-        OJ: Has to be discussed if this method is usefull.
+        OJ: Has to be discussed if this method is useful.
     */
     com::sun::star::frame::XModel createDocumentAlive([in] com::sun::star::frame::XFrame frame)
         raises( ::com::sun::star::lang::DisposedException,
diff --git a/offapi/com/sun/star/report/XSection.idl b/offapi/com/sun/star/report/XSection.idl
index 389f9949ebb6..6d35f0791bb0 100644
--- a/offapi/com/sun/star/report/XSection.idl
+++ b/offapi/com/sun/star/report/XSection.idl
@@ -27,30 +27,14 @@
 #ifndef __com_sun_star_report_XSection_idl__
 #define __com_sun_star_report_XSection_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
 #include <com/sun/star/drawing/XShapes.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_report_XReportDefinition_idl__
 #include <com/sun/star/report/XReportDefinition.idl>
-#endif
-#ifndef __com_sun_star_report_XReportComponent_idl__
 #include <com/sun/star/report/XReportComponent.idl>
-#endif
 //=============================================================================
 
  module com {  module sun {  module star {  module report {
@@ -118,7 +102,7 @@ published interface XSection
     */
     [attribute,bound] string ConditionalPrintExpression;
 
-    /** Specifies wether the section is printed on a separate page.
+    /** Specifies whether the section is printed on a separate page.
         <p>Not valid for page header or page footer.</p>
         @see ForceNewPage
     */
@@ -128,7 +112,7 @@ published interface XSection
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** Specifies wether the section is printed in a new row or column within a multi column report.
+    /** Specifies whether the section is printed in a new row or column within a multi column report.
         <p>Not valid for page header or page footer.</p>
         @see ForceNewPage
     */
diff --git a/offapi/com/sun/star/report/XShape.idl b/offapi/com/sun/star/report/XShape.idl
index ca5935422303..039554a50c6a 100644
--- a/offapi/com/sun/star/report/XShape.idl
+++ b/offapi/com/sun/star/report/XShape.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_report_XShape_idl__
 #define __com_sun_star_report_XShape_idl__
 
-#ifndef __com_sun_star_report_XReportControlModel_idl__
 #include <com/sun/star/report/XReportControlModel.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
 #include <com/sun/star/drawing/HomogenMatrix3.idl>
-#endif
 //=============================================================================
 
  module com {  module sun {  module star {  module report {
@@ -54,7 +46,7 @@ published interface XShape
     /** this property lets you get and set the transformation matrix
         for this shape.
 
-        The transformation is a 3x3 homogen matrix and can contain
+        The transformation is a 3x3 homogeneous matrix and can contain
         translation, rotation, shearing and scaling.
      */
     [attribute,bound] com::sun::star::drawing::HomogenMatrix3 Transformation;
diff --git a/offapi/com/sun/star/report/inspection/DataProviderHandler.idl b/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
index 0f410efe3aeb..68bc96a4281a 100644
--- a/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
+++ b/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_report_inspection_DataProviderHandler_idl__
 #define __com_sun_star_report_inspection_DataProviderHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl b/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
index 8f949cbdb953..d0257ab5adbb 100644
--- a/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
+++ b/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_report_inspection__DefaultComponentInspectorModel_idl__
 #define __com_sun_star_report_inspection_DefaultComponentInspectorModel_idl__
 
-#ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
 #include <com/sun/star/inspection/XObjectInspectorModel.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -47,7 +43,7 @@ module com {  module sun {  module star {  module report { module inspection {
     <p>A <type>DefaultComponentInspectorModel</type> provides the following handlers by default:
     <ul><li><type>GeometryHandler</type></li>
         <li><type>ReportComponentHandler</type></li>
-        <li><typescope="com::sun::star::form::inspection">EditPropertyHandler</type></li>
+        <li><type scope="com::sun::star::form::inspection">EditPropertyHandler</type></li>
     </ul></p>
 
     @see com::sun::star::inspection::XObjectInspectorModel::HandlerFactories
diff --git a/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl b/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
index cda25345607e..827e96c48499 100644
--- a/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
+++ b/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_report_inspection_ReportComponentHandler_idl__
 #define __com_sun_star_report_inspection_ReportComponentHandler_idl__
 
-#ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #include <com/sun/star/inspection/XPropertyHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/report/meta/XFunctionCategory.idl b/offapi/com/sun/star/report/meta/XFunctionCategory.idl
index 22e2e4928daa..d60af9d707ae 100644
--- a/offapi/com/sun/star/report/meta/XFunctionCategory.idl
+++ b/offapi/com/sun/star/report/meta/XFunctionCategory.idl
@@ -50,7 +50,7 @@ published interface XFunctionCategory
     interface com::sun::star::container::XIndexAccess;
 
     /** same as getByIndex.
-        @see com.ssun.star.container.XIndexAccess
+        @see com.sun.star.container.XIndexAccess
     */
     XFunctionDescription getFunction([in] long position)
         raises( com::sun::star::lang::IndexOutOfBoundsException,
diff --git a/offapi/com/sun/star/report/meta/XFunctionManager.idl b/offapi/com/sun/star/report/meta/XFunctionManager.idl
index 69078d649277..312313e4edd5 100644
--- a/offapi/com/sun/star/report/meta/XFunctionManager.idl
+++ b/offapi/com/sun/star/report/meta/XFunctionManager.idl
@@ -49,8 +49,8 @@ published interface XFunctionManager
     interface com::sun::star::container::XIndexAccess;
 
     /** same as getByIndex.
-        @param  position    The postion.
-        @see com.ssun.star.container.XIndexAccess
+        @param  position    The position.
+        @see com.sun.star.container.XIndexAccess
     */
     XFunctionCategory getCategory([in] long position)
         raises( com::sun::star::lang::IndexOutOfBoundsException,
diff --git a/offapi/com/sun/star/resource/MissingResourceException.idl b/offapi/com/sun/star/resource/MissingResourceException.idl
index 7453f89c8e96..25046a487f30 100644
--- a/offapi/com/sun/star/resource/MissingResourceException.idl
+++ b/offapi/com/sun/star/resource/MissingResourceException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_resource_MissingResourceException_idl__
 #define __com_sun_star_resource_MissingResourceException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/resource/OfficeResourceLoader.idl b/offapi/com/sun/star/resource/OfficeResourceLoader.idl
index 20178ca533e7..4dd22fa98402 100644
--- a/offapi/com/sun/star/resource/OfficeResourceLoader.idl
+++ b/offapi/com/sun/star/resource/OfficeResourceLoader.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_resource_OfficeResourceLoader_idl__
 #define __com_sun_star_resource_OfficeResourceLoader_idl__
 
-#ifndef __com_sun_star_resource_XResourceBundleLoader_idl__
 #include <com/sun/star/resource/XResourceBundleLoader.idl>
-#endif
 
 //=============================================================================
 module com { module sun { module star { module resource {
@@ -40,12 +38,12 @@ module com { module sun { module star { module resource {
     resource files.
 
     <p>An OpenOffice.org installation comes with a number of resource files in an proprietary
-    format, located insisde the installation's program/resource directory. The <type>OfficeResoureLoader</type>
+    format, located inside the installation's program/resource directory. The <type>OfficeResoureLoader</type>
     singleton (available at a component context as value with the key
     <code>/singletons/com.sun.star.resource.OfficeResourceLoader</code>), provides access to some
     types of resources within those files.</p>
 
-    <p>Clients have to specifiy the resource file base name in the call to
+    <p>Clients have to specify the resource file base name in the call to
     <member>XResourceBundleLoader::loadBundle</member> resp. <member>XResourceBundleLoader::loadBundle_Default</member>
     method. The loader will extent this base name so that the resulting name conforms to the OpenOffice.org
     resource file naming conventions, and look up the respective resource file, for the requested locale,
diff --git a/offapi/com/sun/star/resource/StringResource.idl b/offapi/com/sun/star/resource/StringResource.idl
index 2c53e6a3cdc2..f4b25749537e 100644
--- a/offapi/com/sun/star/resource/StringResource.idl
+++ b/offapi/com/sun/star/resource/StringResource.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_resource_StringResourceManager_idl__
 #define __com_sun_star_resource_StringResourceManager_idl__
 
-#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
 #include <com/sun/star/resource/XStringResourcePersistence.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/resource/StringResourceWithLocation.idl b/offapi/com/sun/star/resource/StringResourceWithLocation.idl
index ea3743106277..089de5469f1f 100644
--- a/offapi/com/sun/star/resource/StringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/StringResourceWithLocation.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_resource_StringResourceWithLocation_idl__
 #define __com_sun_star_resource_StringResourceWithLocation_idl__
 
-#ifndef __com_sun_star_resource_XStringResourceWithLocation_idl__
 #include <com/sun/star/resource/XStringResourceWithLocation.idl>
-#endif
 
 
 //=============================================================================
@@ -63,7 +61,7 @@ published service StringResourceWithLocation : com::sun::star::resource::XString
         @param BaseName
             Base string for the file names used to store the locale data.
             The locale data is stored in Java properties files also following
-            the corresponding naming sceme. The files will be named like this:
+            the corresponding naming scheme. The files will be named like this:
             "[BaseName]_[Language]_[Country].properties",
             e.g. "MyBaseName_en_US.properties"
             If an empty string is passed for BaseName, "strings" will be used
@@ -72,8 +70,8 @@ published service StringResourceWithLocation : com::sun::star::resource::XString
         @param Comment
             Comment stored first in each properties file followed by a line
             feed character. The line feed character is added automatically
-            and hasn't to be part of the comment string. The caller is re-
-            sponsible that the passed string is a valid comment in a Java
+            and hasn't to be part of the comment string. The caller is
+            responsible that the passed string is a valid comment in a Java
             properties file, e.g. "# My strings". The string may be empty.
 
         @param Handler
diff --git a/offapi/com/sun/star/resource/StringResourceWithStorage.idl b/offapi/com/sun/star/resource/StringResourceWithStorage.idl
index 0d8c0678a97a..92b4a9bddbfe 100644
--- a/offapi/com/sun/star/resource/StringResourceWithStorage.idl
+++ b/offapi/com/sun/star/resource/StringResourceWithStorage.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_resource_StringResourceWithStorage_idl__
 #define __com_sun_star_resource_StringResourceWithStorage_idl__
 
-#ifndef __com_sun_star_resource_XStringResourceWithStorage_idl__
 #include <com/sun/star/resource/XStringResourceWithStorage.idl>
-#endif
 
 
 //=============================================================================
@@ -63,7 +61,7 @@ service StringResourceWithStorage : com::sun::star::resource::XStringResourceWit
         @param BaseName
             Base string for the file names used to store the locale data.
             The locale data is stored in Java properties files also following
-            the corresponding naming sceme. The files will be named like this:
+            the corresponding naming scheme. The files will be named like this:
             "[BaseName]_[Language]_[Country].properties",
             e.g. "MyBaseName_en_US.properties"
             If an empty string is passed for BaseName, "strings" will be used
@@ -72,8 +70,8 @@ service StringResourceWithStorage : com::sun::star::resource::XStringResourceWit
         @param Comment
             Comment stored first in each properties file followed by a line
             feed character. The line feed character is added automatically
-            and hasn't to be part of the comment string. The caller is re-
-            sponsible that the passed string is a valid comment in a Java
+            and hasn't to be part of the comment string. The caller is
+            responsible that the passed string is a valid comment in a Java
             properties file, e.g. "# My strings". The string may be empty.
 
         @throws <type scope="com::sun::star::lang">IllegalArgumentException</type>
diff --git a/offapi/com/sun/star/resource/XLocale.idl b/offapi/com/sun/star/resource/XLocale.idl
index 9ae947b1c474..8659e76295a0 100644
--- a/offapi/com/sun/star/resource/XLocale.idl
+++ b/offapi/com/sun/star/resource/XLocale.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_resource_XLocale_idl__
 #define __com_sun_star_resource_XLocale_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
 #include <com/sun/star/resource/MissingResourceException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/resource/XResourceBundle.idl b/offapi/com/sun/star/resource/XResourceBundle.idl
index 15ff639663c3..15936e0e5c0e 100644
--- a/offapi/com/sun/star/resource/XResourceBundle.idl
+++ b/offapi/com/sun/star/resource/XResourceBundle.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_resource_XResourceBundle_idl__
 #define __com_sun_star_resource_XResourceBundle_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/resource/XResourceBundleLoader.idl b/offapi/com/sun/star/resource/XResourceBundleLoader.idl
index 4440dbfdbdb7..ff474650e8bc 100644
--- a/offapi/com/sun/star/resource/XResourceBundleLoader.idl
+++ b/offapi/com/sun/star/resource/XResourceBundleLoader.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_resource_XResourceBundleLoader_idl__
 #define __com_sun_star_resource_XResourceBundleLoader_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_resource_XResourceBundle_idl__
 #include <com/sun/star/resource/XResourceBundle.idl>
-#endif
 
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
 #include <com/sun/star/resource/MissingResourceException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/resource/XStringResourceManager.idl b/offapi/com/sun/star/resource/XStringResourceManager.idl
index d367e499be36..df13f2b18e0b 100644
--- a/offapi/com/sun/star/resource/XStringResourceManager.idl
+++ b/offapi/com/sun/star/resource/XStringResourceManager.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_resource_XStringResourceManager_idl__
 #define __com_sun_star_resource_XStringResourceManager_idl__
 
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
 #include <com/sun/star/resource/MissingResourceException.idl>
-#endif
-
-#ifndef __com_sun_star_resource_XStringResourceResolver_idl__
 #include <com/sun/star/resource/XStringResourceResolver.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/resource/XStringResourcePersistence.idl b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
index 085613f1d058..38efb3249334 100644
--- a/offapi/com/sun/star/resource/XStringResourcePersistence.idl
+++ b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
 #define __com_sun_star_resource_XStringResourcePersistence_idl__
 
-#ifndef __com_sun_star_resource_XStringResourceManager_idl__
 #include <com/sun/star/resource/XStringResourceManager.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 
 //=============================================================================
@@ -48,7 +40,7 @@ module com { module sun { module star { module resource {
 /**
     Interface derived from XStringResourceManager containing
     basic persistence functionality limited to operations that
-    are independend from a associated location or storage.
+    are independent from a associated location or storage.
 
     @see <type>XStringResourceManager</type>.
 */
@@ -64,12 +56,12 @@ published interface XStringResourcePersistence: com::sun::star::resource::XStrin
         <type>StringResourceWithLocation</type> and
         <type>StringResourceWithStorage</type>
 
-        The StringResourceWithLocation is initialised with an URL
+        The StringResourceWithLocation is initialized with an URL
         specifying a location used to load data from and store data to,
         see <type>StringResourceWithLocation</type>.
 
-        The StringResourceWithStorage is initialised with an in-
-        stance of <type scope="com::sun::star::embed">XStorage</type>
+        The StringResourceWithStorage is initialized with an instance
+        of <type scope="com::sun::star::embed">XStorage</type>
         used to load data from and store data to,
         see <type>StringResourceWithStorage</type>.
 
@@ -83,7 +75,7 @@ published interface XStringResourcePersistence: com::sun::star::resource::XStrin
         not handled by a previously specified
         <type scope="com::sun::star::task">XInteractionHandler</type>.
         The handler to be used for the store operation can be specified
-        during initialisation of <type>StringResourceWithLocation</type>.
+        during initialization of <type>StringResourceWithLocation</type>.
 
         @throws <type scope="com::sun::star::lang">NoSupportException</type>
             if no URL or no valid storage are provided.
@@ -109,15 +101,15 @@ published interface XStringResourcePersistence: com::sun::star::resource::XStrin
         Sets the comment stored first in each locale data file.
 
         This interface method can be used to overwrite the comment used
-        during initialisation of the services
+        during initialization of the services
         <type>StringResourceWithLocation</type> or
         <type>StringResourceWithStorage</type>
 
         @param Comment
             Comment stored first in each properties file followed by a line
             feed character. The line feed character is added automatically
-            and hasn't to be part of the comment string. The caller is re-
-            sponsible that the passed string is a valid comment in a Java
+            and hasn't to be part of the comment string. The caller is
+            responsible that the passed string is a valid comment in a Java
             properties file, e.g. "# My strings". The string may be empty.
     */
     void setComment( [in] string Comment );
@@ -128,7 +120,7 @@ published interface XStringResourcePersistence: com::sun::star::resource::XStrin
 
         Calling this method does not affect the association with a location
         (in case of a <type>StringResourceWithLocation</type> instance)
-        repectively with a storage (in case of a
+        respectively with a storage (in case of a
         <type>StringResourceWithStorage</type> instance).
         The modified state isn't affected either.
 
@@ -142,7 +134,7 @@ published interface XStringResourcePersistence: com::sun::star::resource::XStrin
         @param BaseName
             Base string for the file names used to store the locale data.
             The locale data is stored in Java properties files also following
-            the corresponding naming sceme. The files will be named like this:
+            the corresponding naming scheme. The files will be named like this:
             "[BaseName]_[Language]_[Country].properties",
             e.g. "MyBaseName_en_US.properties"
             If an empty string is passed for BaseName, "strings" will be used
@@ -166,7 +158,7 @@ published interface XStringResourcePersistence: com::sun::star::resource::XStrin
 
         Calling this method does not affect the association with a location
         (in case of a <type>StringResourceWithLocation</type> instance)
-        repectively with a storage (in case of a
+        respectively with a storage (in case of a
         <type>StringResourceWithStorage</type> instance).
         The modified state isn't affected either.
 
@@ -179,7 +171,7 @@ published interface XStringResourcePersistence: com::sun::star::resource::XStrin
         @param BaseName
             Base string for the file names used to store the locale data.
             The locale data is stored in Java properties files also following
-            the corresponding naming sceme. The files will be named like this:
+            the corresponding naming scheme. The files will be named like this:
             "[BaseName]_[Language]_[Country].properties",
             e.g. "MyBaseName_en_US.properties"
             If an empty string is passed for BaseName, "strings" will be used
diff --git a/offapi/com/sun/star/resource/XStringResourceResolver.idl b/offapi/com/sun/star/resource/XStringResourceResolver.idl
index 716b40341881..f10b6d711a18 100644
--- a/offapi/com/sun/star/resource/XStringResourceResolver.idl
+++ b/offapi/com/sun/star/resource/XStringResourceResolver.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_resource_XStringResourceResolver_idl__
 #define __com_sun_star_resource_XStringResourceResolver_idl__
 
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
 #include <com/sun/star/resource/MissingResourceException.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
@@ -64,7 +56,7 @@ published interface XStringResourceResolver: com::sun::star::util::XModifyBroadc
 {
     /**
         Resolves the passed ResoureID for the current locale. This
-        locale is set during initalisation of the object implementing
+        locale is set during initialization of the object implementing
         this interface or - in case that also the interface
         <type scope="com::sun::star::resource">XStringResourceManager</type>
         is supported - by using the <code>XStringResourceManager::setLocale</code>
diff --git a/offapi/com/sun/star/resource/XStringResourceSupplier.idl b/offapi/com/sun/star/resource/XStringResourceSupplier.idl
index 1c56010b8ca2..b1e5231e9ca9 100644
--- a/offapi/com/sun/star/resource/XStringResourceSupplier.idl
+++ b/offapi/com/sun/star/resource/XStringResourceSupplier.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_resource_XStringResourceSupplier_idl__
 #define __com_sun_star_resource_XStringResourceSupplier_idl__
 
-#ifndef __com_sun_star_resource_XStringResourceResolver_idl__
 #include <com/sun/star/resource/XStringResourceResolver.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
index d6e616a9a2ee..6c66f78c294f 100644
--- a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_resource_XStringResourceWithLocation_idl__
 #define __com_sun_star_resource_XStringResourceWithLocation_idl__
 
-#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
 #include <com/sun/star/resource/XStringResourcePersistence.idl>
-#endif
 
 
 //=============================================================================
@@ -71,7 +69,7 @@ published interface XStringResourceWithLocation: com::sun::star::resource::XStri
         location before releasing it. The StringResourceManager will
         be modified after calling this method as the data isn't stored
         to the new location yet. <member>storeAsURL</member> should
-        be prefered as it directly stores the data to the new location
+        be preferred as it directly stores the data to the new location
         and afterwards this location is in sync with the resource data.
         </p>
 
diff --git a/offapi/com/sun/star/resource/XStringResourceWithStorage.idl b/offapi/com/sun/star/resource/XStringResourceWithStorage.idl
index b4e5dd803efa..b4dffbb9ccdf 100644
--- a/offapi/com/sun/star/resource/XStringResourceWithStorage.idl
+++ b/offapi/com/sun/star/resource/XStringResourceWithStorage.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_resource_XStringResourceWithStorage_idl__
 #define __com_sun_star_resource_XStringResourceWithStorage_idl__
 
-#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
 #include <com/sun/star/resource/XStringResourcePersistence.idl>
-#endif
 
 
 //=============================================================================
@@ -70,7 +68,7 @@ interface XStringResourceWithStorage: com::sun::star::resource::XStringResourceP
         force the implementation to reload data from the previous storage
         before releasing it. The StringResourceManager will be modified
         after calling this method as the data isn't stored to the new
-        storage yet. <member>storeAsStorage</member> should be prefered
+        storage yet. <member>storeAsStorage</member> should be preferred
         as it directly stores the data to the new storage and afterwards
         this storage is in sync with the resource data.
         </p>
diff --git a/offapi/com/sun/star/scanner/ScanError.idl b/offapi/com/sun/star/scanner/ScanError.idl
index ecb9544df3a4..041fd916ecd5 100644
--- a/offapi/com/sun/star/scanner/ScanError.idl
+++ b/offapi/com/sun/star/scanner/ScanError.idl
@@ -39,7 +39,7 @@ published enum ScanError
 {
     //-------------------------------------------------------------------------
     // DOCUMENTATION CHANGED FOR ScanError::    ScanErrorNone,
-    /** ScanErrorNone: no error occured
+    /** ScanErrorNone: no error occurred
      */
     ScanErrorNone,
 
@@ -51,7 +51,7 @@ published enum ScanError
 
     //-------------------------------------------------------------------------
     // DOCUMENTATION CHANGED FOR ScanError::    ScanFailed,
-    /** ScanFailed: an error occured during scanning
+    /** ScanFailed: an error occurred during scanning
      */
     ScanFailed,
 
diff --git a/offapi/com/sun/star/scanner/ScannerException.idl b/offapi/com/sun/star/scanner/ScannerException.idl
index a3b78111ca8d..ae0f0fb948b1 100644
--- a/offapi/com/sun/star/scanner/ScannerException.idl
+++ b/offapi/com/sun/star/scanner/ScannerException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_scanner_ScannerException_idl__
 #define __com_sun_star_scanner_ScannerException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_scanner_ScanError_idl__
 #include <com/sun/star/scanner/ScanError.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/scanner/ScannerManager.idl b/offapi/com/sun/star/scanner/ScannerManager.idl
index 950b0c8dcb0d..ad06759c89a0 100644
--- a/offapi/com/sun/star/scanner/ScannerManager.idl
+++ b/offapi/com/sun/star/scanner/ScannerManager.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_scanner_ScannerManager_idl__
 #define __com_sun_star_scanner_ScannerManager_idl__
 
-#ifndef __com_sun_star_scanner_XScannerManager_idl__
 #include <com/sun/star/scanner/XScannerManager.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/scanner/XScannerManager.idl b/offapi/com/sun/star/scanner/XScannerManager.idl
index ac933dd3cbb5..71da4ede2ff7 100644
--- a/offapi/com/sun/star/scanner/XScannerManager.idl
+++ b/offapi/com/sun/star/scanner/XScannerManager.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_scanner_XScannerManager_idl__
 #define __com_sun_star_scanner_XScannerManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_scanner_ScannerContext_idl__
 #include <com/sun/star/scanner/ScannerContext.idl>
-#endif
-
-#ifndef __com_sun_star_scanner_ScannerException_idl__
 #include <com/sun/star/scanner/ScannerException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_scanner_ScanError_idl__
 #include <com/sun/star/scanner/ScanError.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
-#endif
 
 
 //=============================================================================
@@ -63,7 +46,7 @@ published interface XScannerManager: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     // DOCUMENTATION CHANGED FOR XScannerManager::getAvailableScanners
-    /** returns all avilable scanner devices
+    /** returns all available scanner devices
      */
     sequence<com::sun::star::scanner::ScannerContext> getAvailableScanners();
 
@@ -79,7 +62,7 @@ published interface XScannerManager: com::sun::star::uno::XInterface
     /**start the scanning process
         listener will be called when scan is complete
         the EventObject of the disposing call will contain
-        the ScannerManager if the scan was successfull,
+        the ScannerManager if the scan was successful,
         an empty interface otherwise
     */
     void startScan( [in] com::sun::star::scanner::ScannerContext scanner_context,
diff --git a/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl b/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl
index 7dcb64bbdc0c..e05ae01e447b 100644
--- a/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl
+++ b/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_script_DocumentDialogLibraryContainer_idl__
 #define __com_sun_star_script_DocumentDialogLibraryContainer_idl__
 
-#ifndef __com_sun_star_script_XStorageBasedLibraryContainer_idl__
 #include <com/sun/star/script/XStorageBasedLibraryContainer.idl>
-#endif
-#ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
 #include <com/sun/star/document/XStorageBasedDocument.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl b/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl
index 4bb6838af681..0afbde900f97 100644
--- a/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl
+++ b/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_script_DocumentScriptLibraryContainer_idl__
 #define __com_sun_star_script_DocumentScriptLibraryContainer_idl__
 
-#ifndef __com_sun_star_script_XStorageBasedLibraryContainer_idl__
 #include <com/sun/star/script/XStorageBasedLibraryContainer.idl>
-#endif
-#ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
 #include <com/sun/star/document/XStorageBasedDocument.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/script/LibraryNotLoadedException.idl b/offapi/com/sun/star/script/LibraryNotLoadedException.idl
index 8a825fe7ce09..92c60516615a 100644
--- a/offapi/com/sun/star/script/LibraryNotLoadedException.idl
+++ b/offapi/com/sun/star/script/LibraryNotLoadedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_LibraryNotLoadedException_idl__
 #define __com_sun_star_script_LibraryNotLoadedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/script/ModuleInfo.idl b/offapi/com/sun/star/script/ModuleInfo.idl
index f9f3b3639c14..eda04ea91f91 100644
--- a/offapi/com/sun/star/script/ModuleInfo.idl
+++ b/offapi/com/sun/star/script/ModuleInfo.idl
@@ -1,36 +1,36 @@
 /*************************************************************************
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- * OpenOffice.org - a multi-platform office productivity suite
  *
- * This file is part of OpenOffice.org.
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
  ************************************************************************/
 
 #ifndef __com_sun_star_script_ModuleInfo_idl__
 #define __com_sun_star_script_ModuleInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star { module script {
diff --git a/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl b/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
index 44c0702b74d5..c66f60ac2747 100644
--- a/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
+++ b/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
@@ -27,16 +27,14 @@
 #ifndef __com_sun_star_document_ModuleSizeExceededRequest_idl__
 #define __com_sun_star_document_ModuleSizeExceededRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module script {
 
 //=============================================================================
-/** Is used for interaction handle in case password protected modules exceed the size that can be stored in Openoffice 2.x, 1.x formats
+/** Is used for interaction handle in case password protected modules exceed the size that can be stored in OpenOffice 2.x, 1.x formats
 
 */
 exception ModuleSizeExceededRequest : ::com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/script/ModuleType.idl b/offapi/com/sun/star/script/ModuleType.idl
index fb0b08692219..cb957ee0ebc2 100644
--- a/offapi/com/sun/star/script/ModuleType.idl
+++ b/offapi/com/sun/star/script/ModuleType.idl
@@ -1,27 +1,29 @@
 /*************************************************************************
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- * OpenOffice.org - a multi-platform office productivity suite
  *
- * This file is part of OpenOffice.org.
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
  ************************************************************************/
 
@@ -34,27 +36,11 @@ module com {  module sun {  module star { module script {
 
 published constants ModuleType
 {
-    // ------------------------------------------------------------------------
-
     const long UNKNOWN = 0;
-
-    // ------------------------------------------------------------------------
-
     const long NORMAL = 1;
-
-    // ------------------------------------------------------------------------
-
     const long CLASS = 2;
-
-    // ------------------------------------------------------------------------
-
     const long FORM = 3;
-
-    // ------------------------------------------------------------------------
-
     const long DOCUMENT = 4;
-
-    // ------------------------------------------------------------------------
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/script/NativeObjectWrapper.idl b/offapi/com/sun/star/script/NativeObjectWrapper.idl
index 93281a061d6e..93281a061d6e 100755..100644
--- a/offapi/com/sun/star/script/NativeObjectWrapper.idl
+++ b/offapi/com/sun/star/script/NativeObjectWrapper.idl
diff --git a/offapi/com/sun/star/script/XLibraryContainer.idl b/offapi/com/sun/star/script/XLibraryContainer.idl
index 3974aaa436da..92761e1fa84a 100644
--- a/offapi/com/sun/star/script/XLibraryContainer.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer.idl
@@ -27,36 +27,20 @@
 #ifndef __com_sun_star_script_XLibraryContainer_idl__
 #define __com_sun_star_script_XLibraryContainer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/script/XLibraryContainer2.idl b/offapi/com/sun/star/script/XLibraryContainer2.idl
index 2d315ca3a88f..b8918086f4ed 100644
--- a/offapi/com/sun/star/script/XLibraryContainer2.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_XLibraryContainer2_idl__
 #define __com_sun_star_script_XLibraryContainer2_idl__
 
-#ifndef __com_sun_star_script_XLibraryContainer_idl__
 #include <com/sun/star/script/XLibraryContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/script/XLibraryContainer3.idl b/offapi/com/sun/star/script/XLibraryContainer3.idl
index 1045fc7a295c..602fcd648053 100644
--- a/offapi/com/sun/star/script/XLibraryContainer3.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer3.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_XLibraryContainer3_idl__
 #define __com_sun_star_script_XLibraryContainer3_idl__
 
-#ifndef __com_sun_star_script_XLibraryContainer2_idl__
 #include <com/sun/star/script/XLibraryContainer2.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/script/XLibraryContainerExport.idl b/offapi/com/sun/star/script/XLibraryContainerExport.idl
index cdaa975f8d5e..1dfe24345373 100644
--- a/offapi/com/sun/star/script/XLibraryContainerExport.idl
+++ b/offapi/com/sun/star/script/XLibraryContainerExport.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_script_XLibraryContainerExport_idl__
 #define __com_sun_star_script_XLibraryContainerExport_idl__
 
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/script/XLibraryContainerPassword.idl b/offapi/com/sun/star/script/XLibraryContainerPassword.idl
index 26cb1d211993..76a1f2223886 100644
--- a/offapi/com/sun/star/script/XLibraryContainerPassword.idl
+++ b/offapi/com/sun/star/script/XLibraryContainerPassword.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_script_XLibraryContainerPassword_idl__
 #define __com_sun_star_script_XLibraryContainerPassword_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/sal/osl/w32/libutil.c b/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
index e00aef2e158d..4fee0054e2a4 100644
--- a/sal/osl/w32/libutil.c
+++ b/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -24,31 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_script_XLibraryQueryExecutable_idl__
+#define __com_sun_star_script_XLibraryQueryExecutable_idl__
 
-#ifdef _MSC_VER
-#pragma warning(push,1) /* disable warnings within system headers */
-#endif
-#include <windows.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+#include <com/sun/star/uno/XInterface.idl>
 
-static BOOL  g_bInit = FALSE;
-static DWORD g_dwPlatformId = VER_PLATFORM_WIN32_WINDOWS;
+//=============================================================================
 
-DWORD GetPlatformId()
+module com {  module sun {  module star {  module script {
+
+interface XLibraryQueryExecutable: com::sun::star::uno::XInterface
 {
+    boolean HasExecutableCode( [in] string name );
+};
 
-    if (!g_bInit)
-    {
-        OSVERSIONINFO aInfo;
+//=============================================================================
 
-        aInfo.dwOSVersionInfoSize = sizeof(aInfo);
-        if (GetVersionEx(&aInfo))
-            g_dwPlatformId = aInfo.dwPlatformId;
 
-        g_bInit = TRUE;
-    }
+}; }; }; };
 
-    return g_dwPlatformId;
-}
+#endif
diff --git a/offapi/com/sun/star/script/XPersistentLibraryContainer.idl b/offapi/com/sun/star/script/XPersistentLibraryContainer.idl
index 200bd1d164ca..c4642b8d9b1f 100644
--- a/offapi/com/sun/star/script/XPersistentLibraryContainer.idl
+++ b/offapi/com/sun/star/script/XPersistentLibraryContainer.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_script_XPersistentLibraryContainer_idl__
 #define __com_sun_star_script_XPersistentLibraryContainer_idl__
 
-#ifndef __com_sun_star_util_XModifiable_idl__
 #include <com/sun/star/util/XModifiable.idl>
-#endif
-#ifndef __com_sun_star_script_XLibraryContainer2_idl__
 #include <com/sun/star/script/XLibraryContainer2.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl b/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl
index 13c9ab990d44..f5a1460ee681 100644
--- a/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl
+++ b/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl
@@ -29,12 +29,8 @@
 #ifndef __com_sun_star_script_XStorageBasedLibraryContainer_idl__
 #define __com_sun_star_script_XStorageBasedLibraryContainer_idl__
 
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
-#ifndef __com_sun_star_script_XPersistentLibraryContainer_idl__
 #include <com/sun/star/script/XPersistentLibraryContainer.idl>
-#endif
 
 //=============================================================================
 
@@ -65,7 +61,7 @@ interface XStorageBasedLibraryContainer
         <p>You should only <em>set</em> this attribute to a new value if you previously
         called storeLibrariesToStorage with the same storage. Setting this attribute
         to a storage into which the container has not been stored previously might
-        result in unexpected behaviour.</p>
+        result in unexpected behavior.</p>
     */
     [attribute] ::com::sun::star::embed::XStorage RootStorage
     {
@@ -74,7 +70,7 @@ interface XStorageBasedLibraryContainer
 
     /** stores the libraries to a storage other than the current container storage
 
-        <p>Note that the library continer is not automatically associated with the
+        <p>Note that the library container is not automatically associated with the
         new root storage. Instead, you need to manually set the <type>RootStroage</type>
         attribute afterwards. This separation allows for Save-To as well Save-As
         operations.</p>
diff --git a/offapi/com/sun/star/script/browse/BrowseNode.idl b/offapi/com/sun/star/script/browse/BrowseNode.idl
index 502f16f5799a..a834469dc58b 100755..100644
--- a/offapi/com/sun/star/script/browse/BrowseNode.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNode.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_script_browse_BrowseNode_idl__
 #define __com_sun_star_script_browse_BrowseNode_idl__
 
-#ifndef __com_sun_star_script_browse_XBrowseNode_idl__
 #include <com/sun/star/script/browse/XBrowseNode.idl>
-#endif
-#ifndef __com_sun_star_script_XInvocation_idl__
 #include <com/sun/star/script/XInvocation.idl>
-#endif
 
 module com {
  module sun {
diff --git a/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl b/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
index 92897a44080a..0c57cabafa7d 100755..100644
--- a/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_script_browse_BrowseNodeFactory_idl__
 #define __com_sun_star_script_browse_BrowseNodeFactory_idl__
 
-#ifndef __com_sun_star_script_browse_XBrowseNodeFactory_idl__
 #include <com/sun/star/script/browse/XBrowseNodeFactory.idl>
-#endif
 
 module com { module sun { module star { module script { module browse {
 
diff --git a/offapi/com/sun/star/script/browse/BrowseNodeFactoryViewTypes.idl b/offapi/com/sun/star/script/browse/BrowseNodeFactoryViewTypes.idl
index 84ef8e8e1733..84ef8e8e1733 100755..100644
--- a/offapi/com/sun/star/script/browse/BrowseNodeFactoryViewTypes.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNodeFactoryViewTypes.idl
diff --git a/offapi/com/sun/star/script/browse/BrowseNodeTypes.idl b/offapi/com/sun/star/script/browse/BrowseNodeTypes.idl
index f790541cb8a7..f790541cb8a7 100755..100644
--- a/offapi/com/sun/star/script/browse/BrowseNodeTypes.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNodeTypes.idl
diff --git a/offapi/com/sun/star/script/browse/XBrowseNode.idl b/offapi/com/sun/star/script/browse/XBrowseNode.idl
index da493f604abb..ecb6f989d4c5 100755..100644
--- a/offapi/com/sun/star/script/browse/XBrowseNode.idl
+++ b/offapi/com/sun/star/script/browse/XBrowseNode.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_script_browse_XBrowseNode_idl__
 #define __com_sun_star_script_browse_XBrowseNode_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module script { module browse {
 //==============================================================================
@@ -39,7 +37,7 @@ module com { module sun { module star { module script { module browse {
     available scripts.
     Objects implementing this interface are expected to also implement
     com.sun.star.beans.XPropertySet and, optionally,
-    com.sun.star.script.XInvocation (see the Developers' Guide for
+    com.sun.star.script.XInvocation (see the Developer's Guide for
     more details).
 */
 interface XBrowseNode : ::com::sun::star::uno::XInterface
@@ -73,7 +71,7 @@ interface XBrowseNode : ::com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------
     /** the type of the node.
-        @returns A <atom>short</atom> reresenting the type of this node.
+        @returns A <atom>short</atom> representing the type of this node.
     */
     short getType();
 
diff --git a/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl b/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
index 41ef7e038bde..2f724aa9af5a 100644
--- a/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
+++ b/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_script_provider_XBrowseNodeFactory_idl__
 #define __com_sun_star_script_provider_XBrowseNodeFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_browse_XBrowseNode_idl__
 #include <com/sun/star/script/browse/XBrowseNode.idl>
-#endif
-#ifndef __com_sun_star_script_browse_BrowseNodeFactoryViewTypes_idl__
 #include <com/sun/star/script/browse/BrowseNodeFactoryViewTypes.idl>
-#endif
 
 //===========================================================================
 
@@ -44,7 +38,7 @@ module com { module sun { module star { module script { module browse {
 
 //===========================================================================
 /**
-    This interface provides a factory for obtaining objects implmenting the
+    This interface provides a factory for obtaining objects implementing the
     XBrowseNode interface.
 */
 interface XBrowseNodeFactory : ::com::sun::star::uno::XInterface {
diff --git a/offapi/com/sun/star/script/makefile.mk b/offapi/com/sun/star/script/makefile.mk
index 9c0a38fa44c2..53c95e99782f 100644
--- a/offapi/com/sun/star/script/makefile.mk
+++ b/offapi/com/sun/star/script/makefile.mk
@@ -48,6 +48,7 @@ IDLFILES=\
     XLibraryContainerExport.idl\
     XPersistentLibraryContainer.idl\
     XStorageBasedLibraryContainer.idl\
+	XLibraryQueryExecutable.idl \
     ModuleSizeExceededRequest.idl\
     ModuleInfo.idl\
     ModuleType.idl\
diff --git a/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl b/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl
index 8072416c62f1..1430d3639bd6 100755..100644
--- a/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
 #define __com_sun_star_script_provider_LanguageScriptProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_ScriptProvider_idl__
 #include <com/sun/star/script/provider/ScriptProvider.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/MasterScriptProvider.idl b/offapi/com/sun/star/script/provider/MasterScriptProvider.idl
index 7a2bb02a194c..be69bd16aed6 100755..100644
--- a/offapi/com/sun/star/script/provider/MasterScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/MasterScriptProvider.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_MasterScriptProvider_idl__
 #define __com_sun_star_script_provider_MasterScriptProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_ScriptProvider_idl__
 #include <com/sun/star/script/provider/ScriptProvider.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl b/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl
index bbc5f74ff011..b3a6e40424c7 100755..100644
--- a/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl
+++ b/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl
@@ -29,9 +29,7 @@
 #define __com_sun_star_script_provider_MasterScriptProviderFactory_idl__
 
 
-#ifndef __com_sun_star_script_provider_XScriptProviderFactory_idl__
 #include <com/sun/star/script/provider/XScriptProviderFactory.idl>
-#endif
 
 module com { module sun { module star { module script { module provider {
 
diff --git a/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl b/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl
index 72fac1b09749..beca40a2ec82 100644
--- a/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl
+++ b/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_script_provider_ScriptErrorRaisedException_idl__
 #define __com_sun_star_script_provider_ScriptErrorRaisedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //===========================================================================
 
@@ -42,13 +40,13 @@ module com { module sun { module star { module script { module provider {
         by a LanguageScriptProvider whilst executing a script
 */
 exception ScriptErrorRaisedException : com::sun::star::uno::Exception {
-    /** Name of script where error occured
+    /** Name of script where error occurred
      */
     string scriptName;
     /** Scripting language of script that generated exception
      */
     string language;
-    /** line number where error occured.
+    /** line number where error occurred.
      */
     long lineNum;
 };
diff --git a/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl b/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl
index c7cc7b6f88f3..9eb081b6f3d9 100644
--- a/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl
+++ b/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl
@@ -25,12 +25,10 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_script_provider_ScriptExceptionRaisedException_idlR__
+#ifndef __com_sun_star_script_provider_ScriptExceptionRaisedException_idl__
 #define __com_sun_star_script_provider_ScriptExceptionRaisedException_idl__
 
-#ifndef __com_sun_star_script_provider_ScriptErrorRaisedException_idlR__
 #include <com/sun/star/script/provider/ScriptErrorRaisedException.idl>
-#endif
 
 //===========================================================================
 
@@ -42,7 +40,7 @@ module com { module sun { module star { module script { module provider {
         thrown by a LanguageScriptProvider whilst executing a script
 */
 exception ScriptExceptionRaisedException : ::com::sun::star::script::provider::ScriptErrorRaisedException {
-    /** Name of script where error occured
+    /** Name of script where error occurred
      */
     string exceptionType;
 };
diff --git a/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl b/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl
index 6444e1f92b62..0e09d133ef82 100644
--- a/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl
+++ b/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_script_provider_ScriptFrameworkErrorException_idl__
 #define __com_sun_star_script_provider_ScriptFrameworkErrorException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //===========================================================================
 
@@ -42,7 +40,7 @@ module com { module sun { module star { module script { module provider {
         by the Scripting Framework whilst executing a script
 */
 exception ScriptFrameworkErrorException : com::sun::star::uno::Exception {
-    /** Name of script where error occured
+    /** Name of script where error occurred
      */
     string scriptName;
     /** Scripting language of script that generated exception
diff --git a/offapi/com/sun/star/script/provider/ScriptProvider.idl b/offapi/com/sun/star/script/provider/ScriptProvider.idl
index a133301e392a..64fe6c32db64 100755..100644
--- a/offapi/com/sun/star/script/provider/ScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProvider.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_script_provider_ScriptProvider_idl__
 #define __com_sun_star_script_provider_ScriptProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_XScriptProvider_idl__
 #include <com/sun/star/script/provider/XScriptProvider.idl>
-#endif
-
-#ifndef __com_sun_star_script_browse_BrowseNode_idl__
 #include <com/sun/star/script/browse/BrowseNode.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl b/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl
index 97541eb0e863..0c18072b53fe 100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_ScriptProviderForBasic_idl__
 #define __com_sun_star_script_provider_ScriptProviderForBasic_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
 #include <com/sun/star/script/provider/LanguageScriptProvider.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl b/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl
index e9c2d7dd8241..205d12b9305b 100755..100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_ScriptProviderForBeanShell_idl__
 #define __com_sun_star_script_provider_ScriptProviderForBeanShell_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
 #include <com/sun/star/script/provider/LanguageScriptProvider.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl b/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl
index 6d171c305dac..8b61cd29e79a 100755..100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_ScriptProviderForJava_idl__
 #define __com_sun_star_script_provider_ScriptProviderForJava_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
 #include <com/sun/star/script/provider/LanguageScriptProvider.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl b/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl
index e64067084beb..6748c7deb862 100755..100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_ScriptProviderForJavaScript_idl__
 #define __com_sun_star_script_provider_ScriptProviderForJavaScript_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_provider_LanguageScriptProvider_idl__
 #include <com/sun/star/script/provider/LanguageScriptProvider.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/ScriptURIHelper.idl b/offapi/com/sun/star/script/provider/ScriptURIHelper.idl
index 111a65cb4a26..82a29d762094 100755..100644
--- a/offapi/com/sun/star/script/provider/ScriptURIHelper.idl
+++ b/offapi/com/sun/star/script/provider/ScriptURIHelper.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_script_provider_ScriptURIHelper_idl__
 #define __com_sun_star_script_provider_ScriptURIHelper_idl__
 
-#ifndef __com_sun_star_script_provider_XScriptURIHelper_idl__
 #include <com/sun/star/script/provider/XScriptURIHelper.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/XScript.idl b/offapi/com/sun/star/script/provider/XScript.idl
index a96629fe9c68..eca2a38766c3 100644
--- a/offapi/com/sun/star/script/provider/XScript.idl
+++ b/offapi/com/sun/star/script/provider/XScript.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_script_provider_XScript_idl__
 #define __com_sun_star_script_provider_XScript_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_script_CannotConvertException_idl__
 #include <com/sun/star/script/CannotConvertException.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
 #include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
-
-#ifndef  __com_sun_star_script_provider_ScriptFrameworkErrorException_idl__
 #include <com/sun/star/script/provider/ScriptFrameworkErrorException.idl>
-#endif
 
 //===========================================================================
 
@@ -64,7 +50,7 @@ interface XScript : ::com::sun::star::uno::XInterface {
             object
 
         @param aParams
-            all parameters; pure, out params are undefined in sequence,
+            all parameters; pure, out parameters are undefined in sequence,
             i.e., the value has to be ignored by the callee
         @param aOutParamIndex
             out indices, indicating the position of the out or inout
@@ -85,7 +71,7 @@ interface XScript : ::com::sun::star::uno::XInterface {
             the value returned from the function being invoked
 
         @throws ::com::sun::star::reflection::InvocationTargetException
-            if and error occurs while attempting to invoke a script the information is captured. If the error or exception is generated by the script itself it is wrapped as either ScriptErrorRaisedException or ScriptExceptionRaisedException or ScriptingFrameworkErrorException are wrapped as ScriptFrameworkErrorExceptions.
+            if and error occurs while attempting to invoke a script the information is captured. If the error or exception is generated by the script itself it is wrapped as either ScriptErrorRaisedException or ScriptExceptionRaisedException or ScriptFrameworkErrorException are wrapped as ScriptFrameworkErrorExceptions.
     */
     any invoke(
         [in] sequence<any> aParams,
diff --git a/offapi/com/sun/star/script/provider/XScriptContext.idl b/offapi/com/sun/star/script/provider/XScriptContext.idl
index f673b18716d7..ca4858d15202 100644
--- a/offapi/com/sun/star/script/provider/XScriptContext.idl
+++ b/offapi/com/sun/star/script/provider/XScriptContext.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_script_provider_XScriptContext_idl__
 #define __com_sun_star_script_provider_XScriptContext_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDesktop_idl__
 #include <com/sun/star/frame/XDesktop.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XComponentContext_idl__
 #include <com/sun/star/uno/XComponentContext.idl>
-#endif
 
 
 module com { module sun { module star { module document {
diff --git a/offapi/com/sun/star/script/provider/XScriptProvider.idl b/offapi/com/sun/star/script/provider/XScriptProvider.idl
index 944a37532251..2a397fc8b7d0 100644
--- a/offapi/com/sun/star/script/provider/XScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProvider.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_script_provider_XScriptProvider_idl__
 #define __com_sun_star_script_provider_XScriptProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_provider_XScript_idl__
 #include <com/sun/star/script/provider/XScript.idl>
-#endif
-#ifndef __com_sun_star_script_provider_ScriptFrameworkErrorException_idl__
 #include <com/sun/star/script/provider/ScriptFrameworkErrorException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //===========================================================================
 
@@ -47,7 +39,7 @@ module com { module sun { module star { module script { module provider {
 
 //===========================================================================
 /**
-    This interface provides a factory for obtaining objects implmenting the
+    This interface provides a factory for obtaining objects implementing the
     XScript interface.
 */
 interface XScriptProvider : ::com::sun::star::uno::XInterface {
diff --git a/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl b/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl
index 3663d6188420..f7b6a801712c 100644
--- a/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_script_provider_XScriptProviderFactory_idl__
 #define __com_sun_star_script_provider_XScriptProviderFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_provider_XScriptProvider_idl__
 #include <com/sun/star/script/provider/XScriptProvider.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //===========================================================================
 
@@ -44,7 +38,7 @@ module com { module sun { module star { module script { module provider {
 
 //===========================================================================
 /**
-    This interface provides a factory for obtaining objects implmenting the
+    This interface provides a factory for obtaining objects implementing the
     XScriptProvider interface.
 */
 interface XScriptProviderFactory : ::com::sun::star::uno::XInterface {
diff --git a/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl b/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl
index 6fa088c85a32..5ff92cc23f8a 100644
--- a/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_script_provider_XScriptProviderSupplier_idl__
 #define __com_sun_star_script_provider_XScriptProviderSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_script_provider_XScriptProvider_idl__
 #include <com/sun/star/script/provider/XScriptProvider.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //===========================================================================
 
diff --git a/offapi/com/sun/star/script/provider/XScriptURIHelper.idl b/offapi/com/sun/star/script/provider/XScriptURIHelper.idl
index 1790df0a4a08..09e98959a5e6 100644
--- a/offapi/com/sun/star/script/provider/XScriptURIHelper.idl
+++ b/offapi/com/sun/star/script/provider/XScriptURIHelper.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_script_provider_XScriptURIHelper_idl__
 #define __com_sun_star_script_provider_XScriptURIHelper_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //===========================================================================
diff --git a/offapi/com/sun/star/script/provider/makefile.mk b/offapi/com/sun/star/script/provider/makefile.mk
index 488944ff7e62..488944ff7e62 100755..100644
--- a/offapi/com/sun/star/script/provider/makefile.mk
+++ b/offapi/com/sun/star/script/provider/makefile.mk
diff --git a/offapi/com/sun/star/script/vba/VBAEventId.idl b/offapi/com/sun/star/script/vba/VBAEventId.idl
index 18b84b5ef14d..18b84b5ef14d 100755..100644
--- a/offapi/com/sun/star/script/vba/VBAEventId.idl
+++ b/offapi/com/sun/star/script/vba/VBAEventId.idl
diff --git a/offapi/com/sun/star/script/vba/VBAEventProcessor.idl b/offapi/com/sun/star/script/vba/VBAEventProcessor.idl
index d993b37ae250..d993b37ae250 100755..100644
--- a/offapi/com/sun/star/script/vba/VBAEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/VBAEventProcessor.idl
diff --git a/offapi/com/sun/star/script/vba/VBAMacroResolver.idl b/offapi/com/sun/star/script/vba/VBAMacroResolver.idl
index 62f6e8ce0c2a..62f6e8ce0c2a 100755..100644
--- a/offapi/com/sun/star/script/vba/VBAMacroResolver.idl
+++ b/offapi/com/sun/star/script/vba/VBAMacroResolver.idl
diff --git a/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl b/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl
index ce202da4f54c..ce202da4f54c 100755..100644
--- a/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl
diff --git a/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl b/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl
index fd3c7f895d8d..fd3c7f895d8d 100755..100644
--- a/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl
diff --git a/offapi/com/sun/star/script/vba/XVBACompatibility.idl b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
index 9c77046b1159..194f54d5452a 100644
--- a/offapi/com/sun/star/script/vba/XVBACompatibility.idl
+++ b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
@@ -40,6 +40,7 @@ interface XVBACompatibility
     //-------------------------------------------------------------------------
 
     [attribute] boolean VBACompatibilityMode;
+    [attribute ] string  ProjectName;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
index 1bc139243493..1bc139243493 100755..100644
--- a/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
diff --git a/offapi/com/sun/star/script/vba/XVBAMacroResolver.idl b/offapi/com/sun/star/script/vba/XVBAMacroResolver.idl
index 378219268010..378219268010 100755..100644
--- a/offapi/com/sun/star/script/vba/XVBAMacroResolver.idl
+++ b/offapi/com/sun/star/script/vba/XVBAMacroResolver.idl
diff --git a/offapi/com/sun/star/script/vba/makefile.mk b/offapi/com/sun/star/script/vba/makefile.mk
index 6f13245f7d1e..6f13245f7d1e 100755..100644
--- a/offapi/com/sun/star/script/vba/makefile.mk
+++ b/offapi/com/sun/star/script/vba/makefile.mk
diff --git a/offapi/com/sun/star/sdb/BooleanComparisonMode.idl b/offapi/com/sun/star/sdb/BooleanComparisonMode.idl
index 018658dc47e7..51f92da1980b 100644
--- a/offapi/com/sun/star/sdb/BooleanComparisonMode.idl
+++ b/offapi/com/sun/star/sdb/BooleanComparisonMode.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module sdb {
 
 //=============================================================================
 
-/** specifies different modi how boolean comparison predicates are to be generated
+/** specifies different mode how boolean comparison predicates are to be generated
     by a <type>SingleSelectQueryComposer</type>.
  */
 constants BooleanComparisonMode
diff --git a/offapi/com/sun/star/sdb/CallableStatement.idl b/offapi/com/sun/star/sdb/CallableStatement.idl
index 151ada30313f..46866d530090 100644
--- a/offapi/com/sun/star/sdb/CallableStatement.idl
+++ b/offapi/com/sun/star/sdb/CallableStatement.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_CallableStatement_idl__
 #define __com_sun_star_sdb_CallableStatement_idl__
 
-#ifndef __com_sun_star_sdbc_CallableStatement_idl__
 #include <com/sun/star/sdbc/CallableStatement.idl>
-#endif
 
-#ifndef __com_sun_star_sdb_PreparedStatement_idl__
 #include <com/sun/star/sdb/PreparedStatement.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/Column.idl b/offapi/com/sun/star/sdb/Column.idl
index 982dfccbab49..ef9c79b4878b 100644
--- a/offapi/com/sun/star/sdb/Column.idl
+++ b/offapi/com/sun/star/sdb/Column.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_Column_idl__
 #define __com_sun_star_sdb_Column_idl__
 
-#ifndef __com_sun_star_sdbcx_Column_idl__
 #include <com/sun/star/sdbcx/Column.idl>
-#endif
 
-#ifndef __com_sun_star_sdb_ColumnSettings_idl__
 #include <com/sun/star/sdb/ColumnSettings.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl b/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
index c28c615b2284..560990a386e9 100644
--- a/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
+++ b/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_ColumnDescriptorControl_idl__
 #define __com_sun_star_sdb_ColumnDescriptorControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
 #include <com/sun/star/awt/UnoControl.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl b/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
index a1ba82c14b55..7e55bf0913a3 100644
--- a/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
+++ b/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_ColumnDescriptorControlModel_idl__
 #define __com_sun_star_sdb_ColumnDescriptorControlModel_idl__
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
 #include <com/sun/star/awt/UnoControlModel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sdb/ColumnSettings.idl b/offapi/com/sun/star/sdb/ColumnSettings.idl
index 196373e3ede1..0fff088b1aa3 100644
--- a/offapi/com/sun/star/sdb/ColumnSettings.idl
+++ b/offapi/com/sun/star/sdb/ColumnSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_ColumnSettings_idl__
 #define __com_sun_star_sdb_ColumnSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
@@ -51,7 +49,7 @@ published service ColumnSettings
         <p>
         If the value is
         <void/>
-        , a default numberformat should be used according to the datatype of the column.
+        , a default number format should be used according to the datatype of the column.
         </p>
 
     */
@@ -102,7 +100,7 @@ published service ColumnSettings
     [property] boolean Hidden;
 
 
-    /** indicates a control model whichs defines the settings for layouting.
+    /** indicates a control model which defines the settings for layouting.
         The default is
         <NULL/>
         .
diff --git a/offapi/com/sun/star/sdb/Connection.idl b/offapi/com/sun/star/sdb/Connection.idl
index 66edbbf01b9d..29b7deeb4746 100644
--- a/offapi/com/sun/star/sdb/Connection.idl
+++ b/offapi/com/sun/star/sdb/Connection.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdb_Connection_idl__
 #define __com_sun_star_sdb_Connection_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_Connection_idl__
 #include <com/sun/star/sdbc/Connection.idl>
-#endif
 
-#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__
 #include <com/sun/star/sdbcx/DatabaseDefinition.idl>
-#endif
 
 module com {  module sun {  module star {  module lang {
      published interface XMultiServiceFactory;
diff --git a/offapi/com/sun/star/sdb/ContentLoader.idl b/offapi/com/sun/star/sdb/ContentLoader.idl
index 1322c6ba3197..8dbcd1df6283 100644
--- a/offapi/com/sun/star/sdb/ContentLoader.idl
+++ b/offapi/com/sun/star/sdb/ContentLoader.idl
@@ -29,9 +29,7 @@
 #ifndef __com_sun_star_sdb_ContentLoader_idl__
 #define __com_sun_star_sdb_ContentLoader_idl__
 
-#ifndef __com_sun_star_frame_Frame_idl__
 #include <com/sun/star/frame/FrameLoader.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb {
 
@@ -89,7 +87,7 @@ published service ContentLoader
 
         The parameters passed to the
         <member scope="com::sun::star::frame">XFrameLoader::load()</member>
-        are forwarded to the object beeing created,
+        are forwarded to the object being created,
         in particular to it's
         <type scope="com::sun::star::lang">XInitialization</type>
         interface.
diff --git a/offapi/com/sun/star/sdb/DataAccessDescriptor.idl b/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
index 10f9432b498b..3e3039777520 100644
--- a/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
+++ b/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
@@ -28,27 +28,16 @@
 #ifndef __com_sun_star_sdb_DataAccessDescriptor_idl__
 #define __com_sun_star_sdb_DataAccessDescriptor_idl__
 
-#ifndef __com_sun_star_sdbc_Connection_idl__
 #include <com/sun/star/sdbc/Connection.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
 #include <com/sun/star/sdbc/ResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb {
 
 /** descriptor for accessing basic data access objects.
 
-    <p>Various components interacting with the database access world require to specify (or provide themself) an object
+    <p>Various components interacting with the database access world require to specify (or provide themselves) an object
     such as a query, a table, a result set, a connection to a data source, a column within a table, and so on.<br/>
     All of these objects are usually not specified with a single property, but with a set of properties, and for
     various objects, various (but not always different) properties are needed.<br/>
@@ -66,7 +55,7 @@ published service DataAccessDescriptor
     /** specifies the name of the datasource to access.
 
         <p>This data source is usually used to create a <type>Connection</type>. If no DataSourceName is given
-        and the <member>DatabaseLocation</member> and the <member>ConnectionResource</member> are emtpy, then an <member>ActiveConnection</member>
+        and the <member>DatabaseLocation</member> and the <member>ConnectionResource</member> are empty, then an <member>ActiveConnection</member>
         is required.</p>
 
         @see com::sun::star::sdb::DatabaseContext
@@ -77,7 +66,7 @@ published service DataAccessDescriptor
     /** specifies the URL of the database file.
 
         <p>This database location is usually used to create a <type>Connection</type>. If no DatabaseLocation is given
-        and the <member>ConnectionResource</member> is emtpy, then an <member>ActiveConnection</member> is reuqired.</p>
+        and the <member>ConnectionResource</member> is empty, then an <member>ActiveConnection</member> is required.</p>
 
         @see com::sun::star::sdb::DatabaseContext
         @see ActiveConnection
@@ -87,7 +76,7 @@ published service DataAccessDescriptor
     /** specifies the database URL which locates a database driver.
 
         <p>This database URL is usually used to create a <type>Connection</type>. If no ConnectionResource is given,
-        then an <member>ActiveConnection</member> is reuqired.</p>
+        then an <member>ActiveConnection</member> is required.</p>
 
         @see com::sun::star::sdb::DatabaseContext
         @see ActiveConnection
@@ -134,14 +123,14 @@ published service DataAccessDescriptor
 
         <p><member>Command</member> needs to be interpreted depending on the value of this property.</p>
 
-        <p>This property is only meaningfull together with the <member>Command</member>
+        <p>This property is only meaningful together with the <member>Command</member>
         property, thus either <em>both</em> or <em>none</em> of them are present.</p>
 
         @see com::sun::star::sdb::CommandType
      */
     [optional, property] long CommandType;
 
-    /** specifies an addtional filter to optionally use.
+    /** specifies an additional filter to optionally use.
 
         <p>The Filter string has to form a <code>WHERE</code>-clause, <em>without</em> the
         <code>WHERE</code>-string itself.</p>
@@ -195,7 +184,7 @@ published service DataAccessDescriptor
 
         <p>Usually, you use the properties <member>DataSourceName</member> (alternatively
         <member>ActiveConnection</member>), <member>Command</member> and <member>CommandType</member> to specify
-        how to <em>obtain</em> a result set. However, in scenarious where the provider of a DataAccessDescriptor
+        how to <em>obtain</em> a result set. However, in scenarios where the provider of a DataAccessDescriptor
         has access to an already existent result set, it can pass it along for reusage. This is encouraged
         to increase performance.</p>
 
diff --git a/offapi/com/sun/star/sdb/DataColumn.idl b/offapi/com/sun/star/sdb/DataColumn.idl
index 8e5bc34924a1..15698d6886c5 100644
--- a/offapi/com/sun/star/sdb/DataColumn.idl
+++ b/offapi/com/sun/star/sdb/DataColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_DataColumn_idl__
 #define __com_sun_star_sdb_DataColumn_idl__
 
-#ifndef __com_sun_star_sdb_ResultColumn_idl__
 #include <com/sun/star/sdb/ResultColumn.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/DataSettings.idl b/offapi/com/sun/star/sdb/DataSettings.idl
index 978a2cd9a5d9..d4cfd8a64c33 100644
--- a/offapi/com/sun/star/sdb/DataSettings.idl
+++ b/offapi/com/sun/star/sdb/DataSettings.idl
@@ -27,24 +27,17 @@
 #ifndef __com_sun_star_sdb_DataSettings_idl__
 #define __com_sun_star_sdb_DataSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
 
 /** extends the
     <type scope="com::sun::star::sdbcx">Table</type>
-    with additional display information, sorting and filtering criterias.
+    with additional display information, sorting and filtering criteria.
 
     */
 published service DataSettings
diff --git a/offapi/com/sun/star/sdb/DataSource.idl b/offapi/com/sun/star/sdb/DataSource.idl
index 3b4594715532..9c78b742c9fa 100644
--- a/offapi/com/sun/star/sdb/DataSource.idl
+++ b/offapi/com/sun/star/sdb/DataSource.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_sdb_DataSource_idl__
 #define __com_sun_star_sdb_DataSource_idl__
 
-#ifndef __com_sun_star_io_XPersistObject_idl__
 #include <com/sun/star/io/XPersistObject.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_util_XFlushable_idl__
 #include <com/sun/star/util/XFlushable.idl>
-#endif
 
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
 
 
  module com {  module sun {  module star {  module sdbc {
@@ -144,11 +134,11 @@ published service DataSource
                 whether the <type scope="com::sun::star::sdbc">XDriver</type> which is to provide
                 the connection supports a setting with the respective name, using its
                 <member scope="com::sun::star::sdbc">XDriver::getPropertyInfo<member> method.br/>
-                If so, the settings is passed to the drivers's
+                If so, the settings is passed to the driver's
                 <member scope="com::sun::star::sdbc">XDriver::connect<member> method. If not,
                 the setting is ignored.</li>
             <li>External components may use the settings to carry arbitrary information with
-                the data source. Usually, this is used to control the behaviour of components
+                the data source. Usually, this is used to control the behavior of components
                 working with the data source.</li>
         </ul>
     */
@@ -170,7 +160,7 @@ published service DataSource
         <p>Additionally, the property bag supports default values of properties, and thus the
         <type scope="com::sun::star::beans">XPropertyState</type> interface. If you add an own property to
         the bag using <member scope="com::sun::star::beans">XPropertyContainer::addProperty</member>, you need
-        to specifiy an initial value, which is also used as default value (exceptions see below).</p>
+        to specify an initial value, which is also used as default value (exceptions see below).</p>
 
         <p>Effectively, the property bag represented by <code>Settings</code> contains two classes of properties:
         Pre-defined ones and user-defined ones.</p>
@@ -179,25 +169,25 @@ published service DataSource
         application UI for the data source, or a particular backend driver employed by the data source. There's
         a large set of such properties, no all of them are effectively used for a concrete data source, nonetheless,
         they're all present in the <code>Settings</code>.<br/>
-        Such properties are not removeable from the bag, that is, their
+        Such properties are not removable from the bag, that is, their
         <member scope="com::sun::star::beans">PropertyAttribute::REMOVEABLE</member> attribute is <em>not</em> set.<br/>
         Usually, you'll find that all of this properties have the
         <member scope="com::sun::star::beans::">PropertyState::PropertyState_DEFAULT_VALUE</member> state.</p>
 
         <p><em>User-defined</em> properties are the ones which are added at runtime by any instance. They might or might
-        not be removeable, this depends on whether or not the code adding them specifies the
+        not be removable, this depends on whether or not the code adding them specifies the
         <member scope="com::sun::star::beans">PropertyAttribute::REMOVEABLE</member> attribute. Also, they might
         or might not have a default value, determined by the
         <member scope="com::sun::star::beans">PropertyAttribute::MAYBEDEFAULT</member> attribute at the time they're added
         to the bag.</p>
 
-        <p>When a data source is made persistent, then properties which are not removeable (which are assumed to be the
+        <p>When a data source is made persistent, then properties which are not removable (which are assumed to be the
         pre-defined properties) are ignored when they are in <code>DEFAULT</code> state. All other properties are
         always made persistent, except when an explicit
         <member scope="com::sun::star::beans">PropertyAttribute::TRANSIENT</member> attribute prohibits this.</p>
 
         <p>Similar, when you obtain the <member>Info</member> property of a <code>DataSource</code>, the
-        <code>Settings</code> bag is asked for all its property values, and the ones which are removeable and
+        <code>Settings</code> bag is asked for all its property values, and the ones which are removable and
         in state default are stripped, and <em>not</em> returned in the <code>Info</code> sequence.</p>
     */
     [property, readonly, optional] com::sun::star::beans::XPropertySet Settings;
diff --git a/offapi/com/sun/star/sdb/DataSourceBrowser.idl b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
index feaf0262e26d..6785421cd0c6 100644
--- a/offapi/com/sun/star/sdb/DataSourceBrowser.idl
+++ b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
@@ -29,21 +29,11 @@
 #ifndef __com_sun_star_sdb_DataSourceBrowser_idl__
 #define __com_sun_star_sdb_DataSourceBrowser_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__
 #include <com/sun/star/form/FormController.idl>
-#endif
-#ifndef __com_sun_star_ui_XContextMenuInterception_idl__
 #include <com/sun/star/ui/XContextMenuInterception.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb {
 
@@ -76,7 +66,7 @@ module com {  module sun {  module star {  module sdb {
     </p>
 
     <p>
-    Some aspects of the browser can be controlled from outside, eg.,
+    Some aspects of the browser can be controlled from outside, e.g.,
     it is possible to dispatch a sort or filter
     request, if a table or query is being displayed.
     </p>
@@ -88,19 +78,19 @@ module com {  module sun {  module star {  module sdb {
     <type scope="com::sun::star::frame">XDispatchProvider</type>
     interface the service exports (Please see below for more details on this).
     <br/>
-    The way <em>out</em> works in another way. There are several URL's which an external
+    The way <em>out</em> works in another way. There are several URLs which an external
     instance can provide dispatches for (usually by implementing a
     <type scope="com::sun::star::frame">XDispatchProviderInterceptor</type>
     for the parent frame of the browser), thus indicating that the browser should provide special functionality.
     <br/>
     In this case, the browser displays and maintains some additional slots (to be more concrete: toolbox items), which,
     upon triggering, call the
-    <member scope="com::sun::star::frame">XDispatch::dispatch()</member>methodoftheobject
+    <member scope="com::sun::star::frame">XDispatch::dispatch()</member> method of the object
     provided by the external instance.
     </p>
 
     <p>
-        In particular, the supported URL's for communicating to an external instance are:
+        In particular, the supported URLs for communicating to an external instance are:
         <ul>
             <li><b>.uno:DataSourceBrowser/InsertColumns</b>
             <br/>
@@ -129,7 +119,7 @@ module com {  module sun {  module star {  module sdb {
             <li><b>.uno:DataSourceBrowser/FormLetter</b>
             <br/>
             Available whenever an external instance provides a dispatcher (
-            <type scope="com::sun::star::frame">XDispatch</type>)forthisURL.
+            <type scope="com::sun::star::frame">XDispatch</type>) for this URL.
             <br/>
             It is the task of the external instance to provide functionality for this URL, but usually it is used
             to implement some kind of "Form Letter" functionality.
@@ -137,7 +127,7 @@ module com {  module sun {  module star {  module sdb {
             </li>
         </ul>
     </p>
-    <p>For all kinds of URL's, the parameters supplied during dispatching build up a <type>DataAccessDescriptor</type>,
+    <p>For all kinds of URLs, the parameters supplied during dispatching build up a <type>DataAccessDescriptor</type>,
     where the following properties are present:
     <ul>
         <li><member>DataAccessDescriptor::DataSourceName</member></li>
@@ -169,7 +159,7 @@ published service DataSourceBrowser
             </li>
             <li>the data form used for displaying objects. As always for components implementing this service,
             the object returned by
-            <method scope="com::sun::star::awt">XTabController::getModel</method>is a dataform.
+            <method scope="com::sun::star::awt">XTabController::getModel</method> is a dataform.
             </li>
         </ul>
         </p>
@@ -272,7 +262,7 @@ published service DataSourceBrowser
 
     /** allows to intercept user-triggered context menus in the data source browser
 
-        <p>Context menu interception is currently supported only for the brower control where the registered
+        <p>Context menu interception is currently supported only for the browser control where the registered
         data sources and all their tables and queries are displayed in a tree view.</p>
 
         <p>The selection supplied by <member scope="com::sun::star::ui">ContextMenuExecuteEvent::Selection</member>,
diff --git a/offapi/com/sun/star/sdb/DatabaseAccess.idl b/offapi/com/sun/star/sdb/DatabaseAccess.idl
index 8eb187384f35..06882bec93b0 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccess.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccess.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdb_DatabaseAccess_idl__
 #define __com_sun_star_sdb_DatabaseAccess_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
 
 
  module com {  module sun {  module star {  module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl b/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
index 4eb54d7db00a..a1be8caccef1 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdb_DatabaseAccessConnection_idl__
 #define __com_sun_star_sdb_DatabaseAccessConnection_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
-#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__
 #include <com/sun/star/sdbcx/DatabaseDefinition.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_Connection_idl__
 #include <com/sun/star/sdbc/Connection.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessContext.idl b/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
index 34922be1cdec..11763f6e3d78 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdb_DatabaseAccessContext_idl__
 #define __com_sun_star_sdb_DatabaseAccessContext_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
-#ifndef __com_sun_star_util_XLocalizedAliases_idl__
 #include <com/sun/star/util/XLocalizedAliases.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XLocalizable_idl__
 #include <com/sun/star/lang/XLocalizable.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl b/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
index 2b133c83b832..e23c97b3ece1 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
@@ -27,27 +27,16 @@
 #ifndef __com_sun_star_sdb_DatabaseAccessDataSource_idl__
 #define __com_sun_star_sdb_DatabaseAccessDataSource_idl__
 
-#ifndef __com_sun_star_io_XPersistObject_idl__
 #include <com/sun/star/io/XPersistObject.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_RememberAuthentication_idl__
 #include <com/sun/star/ucb/RememberAuthentication.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
 #include <com/sun/star/sdbc/XDataSource.idl>
-#endif
 
 module com { module sun { module star { module sdb {
 
  published interface XCompletedConnection;
 
-/** is a factory to create data access beans. Data access beans are shared amoung
+/** is a factory to create data access beans. Data access beans are shared among
     components, so if an already existing bean is requested, the existing one is returned.
 
     @deprecated
diff --git a/offapi/com/sun/star/sdb/DatabaseContext.idl b/offapi/com/sun/star/sdb/DatabaseContext.idl
index ac990e02c709..6d8d081d1cd9 100644
--- a/offapi/com/sun/star/sdb/DatabaseContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseContext.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_sdb_DatabaseContext_idl__
 #define __com_sun_star_sdb_DatabaseContext_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
-#ifndef __com_sun_star_uno_XNamingService_idl__
 #include <com/sun/star/uno/XNamingService.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/DatabaseDocument.idl b/offapi/com/sun/star/sdb/DatabaseDocument.idl
index 6690c2929de4..96ca66877ff3 100644
--- a/offapi/com/sun/star/sdb/DatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/DatabaseDocument.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_DatabaseDocument_idl__
 #define __com_sun_star_sdb_DatabaseDocument_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_util_XProtectable_idl__
 #include <com/sun/star/util/XProtectable.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
  published interface XDataDescriptorFactory;
diff --git a/offapi/com/sun/star/sdb/DatabaseEnvironment.idl b/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
index 72af2c84e7e8..5a26ca1394ed 100644
--- a/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
+++ b/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_DatabaseEnvironment_idl__
 #define __com_sun_star_sdb_DatabaseEnvironment_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
 
 
  module com {  module sun {  module star {  module sdb {
diff --git a/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl b/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
index 891929514826..2fce9b0fcd28 100644
--- a/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
+++ b/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: InteractionHandler.idl,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl b/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
index 79d5b31e6cbf..070d0aaa005d 100644
--- a/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
+++ b/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sdb_DatasourceAdministrationDialog_idl__
 #define __com_sun_star_sdb_DatasourceAdministrationDialog_idl__
 
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/DefinitionContent.idl b/offapi/com/sun/star/sdb/DefinitionContent.idl
index d5ce22d9ff09..589e810d1532 100644
--- a/offapi/com/sun/star/sdb/DefinitionContent.idl
+++ b/offapi/com/sun/star/sdb/DefinitionContent.idl
@@ -52,7 +52,7 @@ service DefinitionContent
         <ul>
             <li><strong>getPropertyValues</strong></li>
             <li><strong>setPropertyValues</strong></li>
-            <li><strong>getPropertysetInfo</strong></li>
+            <li><strong>getPropertySetInfo</strong></li>
         </ul>
         </p>
 
diff --git a/offapi/com/sun/star/sdb/Document.idl b/offapi/com/sun/star/sdb/Document.idl
index c442929d4572..156a5a27ba29 100644
--- a/offapi/com/sun/star/sdb/Document.idl
+++ b/offapi/com/sun/star/sdb/Document.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_DocumentDefinition_idl__
 #define __com_sun_star_sdb_DocumentDefinition_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 module com { module sun { module star { module sdb {
 
diff --git a/offapi/com/sun/star/sdb/DocumentContainer.idl b/offapi/com/sun/star/sdb/DocumentContainer.idl
index 31a7128022c7..6013d4ade741 100644
--- a/offapi/com/sun/star/sdb/DocumentContainer.idl
+++ b/offapi/com/sun/star/sdb/DocumentContainer.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdb_DocumentContainer_idl__
 #define __com_sun_star_sdb_DocumentContainer_idl__
 
-#ifndef __com_sun_star_sdb_DefinitionContainer_idl__
 #include <com/sun/star/sdb/DefinitionContainer.idl>
-#endif
-#ifndef __com_sun_star_sdb_DefinitionContent_idl__
 #include <com/sun/star/sdb/DefinitionContent.idl>
-#endif
 
 
  module com {  module sun {  module star {  module lang {
diff --git a/offapi/com/sun/star/sdb/DocumentDataSource.idl b/offapi/com/sun/star/sdb/DocumentDataSource.idl
index 818d7645b2a0..79be69f078d5 100644
--- a/offapi/com/sun/star/sdb/DocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/DocumentDataSource.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_sdb_DocumentDataSource_idl__
 #define __com_sun_star_sdb_DocumentDataSource_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
-#ifndef __com_sun_star_sdb_XDocumentDataSource_idl__
 #include <com/sun/star/sdb/XDocumentDataSource.idl>
-#endif
-#ifndef __com_sun_star_sdb_DataSource_idl__
 #include <com/sun/star/sdb/DataSource.idl>
-#endif
 //=============================================================================
 
  module com {  module sun {  module star {  module sdb {
diff --git a/offapi/com/sun/star/sdb/DocumentDefinition.idl b/offapi/com/sun/star/sdb/DocumentDefinition.idl
index c8f07fb69a18..0a1d9e22dc78 100644
--- a/offapi/com/sun/star/sdb/DocumentDefinition.idl
+++ b/offapi/com/sun/star/sdb/DocumentDefinition.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdb_DocumentDefinition2_idl__
 #define __com_sun_star_sdb_DocumentDefinition2_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_sdb_DefinitionContent_idl__
 #include <com/sun/star/sdb/DefinitionContent.idl>
-#endif
 
 module com { module sun { module star { module sdb {
 
@@ -68,7 +64,7 @@ service DocumentDefinition
             <li><strong>close</strong>: closes the sub document, if it had previously been opened
                 using either the <code>open</code> or <code>openDesign</code> command. The return value
                 of the <code>execute</code> command is a <code>boolean</code> value indicating whether
-                the sub document could be closed. Reasons for not closing the document include vetos by
+                the sub document could be closed. Reasons for not closing the document include vetoes by
                 third parties, for instance, because the user opened a dialog modal to the sub document,
                 or a long-running task such as printing is currently running.</li>
             <li><strong>show</strong>: shows the sub document. This is useful if you previously opened the
diff --git a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
index a2a579fc47ac..48e4531692c4 100644
--- a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
+++ b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdb_DocumentSaveRequest_idl__
 #define __com_sun_star_sdb_DocumentSaveRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/ErrorCondition.idl b/offapi/com/sun/star/sdb/ErrorCondition.idl
index 5336d05d52c1..ec50fdf15a63 100644
--- a/offapi/com/sun/star/sdb/ErrorCondition.idl
+++ b/offapi/com/sun/star/sdb/ErrorCondition.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module sdb {
 
     <p>Core components of OpenOffice.org will use those error conditions
     as error codes (<member scope="com::sun::star::sdbc">SQLException::ErrorCode</member>)
-    whereever possible.<br/>
+    wherever possible.<br/>
     That is, if an <code>SQLException</code> is raised by
     such a component, caused by an error condition which is included in the
     <type>ErrorCondition</type> group, then the respective <em>negative</em> value
@@ -166,7 +166,7 @@ constants ErrorCondition
         <code>DATA_CANNOT_SELECT_UNFILTERED</code>.</p>
 
         <p>It is also legitimate for the driver to report this error condition as warning, and provide
-        an empty result set, instead of ungracefull failing.</p>
+        an empty result set, instead of ungraceful failing.</p>
     */
     const long DATA_CANNOT_SELECT_UNFILTERED = 550;
 };
diff --git a/offapi/com/sun/star/sdb/ErrorMessageDialog.idl b/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
index 07f3514a4ca8..bb25adf93691 100644
--- a/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
+++ b/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sdb_ErrorMessageDialog_idl__
 #define __com_sun_star_sdb_ErrorMessageDialog_idl__
 
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -152,7 +141,7 @@ published service ErrorMessageDialog
             </li>
             <li><b>SQLException</b><br/>
                 <type scope="com::sun::star::sdbc">SQLException</type>
-                describing the error which is beeing displayed.<br/>
+                describing the error which is being displayed.<br/>
                 When initializing this value, you may use any derivative of
                 <type scope="com::sun::star::sdbc">SQLException</type>
                 .
diff --git a/offapi/com/sun/star/sdb/Forms.idl b/offapi/com/sun/star/sdb/Forms.idl
index 42d2f0dd3330..d72f88f87617 100644
--- a/offapi/com/sun/star/sdb/Forms.idl
+++ b/offapi/com/sun/star/sdb/Forms.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_Forms_idl__
 #define __com_sun_star_sdb_Forms_idl__
 
-#ifndef __com_sun_star_sdb_DocumentContainer_idl__
 #include <com/sun/star/sdb/DocumentContainer.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
index 1d12f2dca011..72e066ed4ba2 100644
--- a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_sdb_OfficeDatabaseDocument_idl__
 #define __com_sun_star_sdb_OfficeDatabaseDocument_idl__
 
-#ifndef __com_sun_star_document_OfficeDocument_idl__
 #include <com/sun/star/document/OfficeDocument.idl>
-#endif
-#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.idl>
-#endif
-#ifndef __com_sun_star_document_XDocumentEventBroadcaster_idl__
 #include <com/sun/star/document/XDocumentEventBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_script_provider_XScriptProviderSupplier_idl__
 #include <com/sun/star/script/provider/XScriptProviderSupplier.idl>
-#endif
-#ifndef __com_sun_star_frame_XLoadable_idl__
 #include <com/sun/star/frame/XLoadable.idl>
-#endif
-#ifndef __com_sun_star_util_XCloseable_idl__
 #include <com/sun/star/util/XCloseable.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb {
 
@@ -140,7 +128,7 @@ service OfficeDatabaseDocument
                     <td align="center">yes</td>
                 </tr>
                 <tr><td valign="top"><em>OnSaveDone</em></td>
-                    <td>saving the document succeeeded.</td>
+                    <td>saving the document succeeded.</td>
                     <td align="center">no</td>
                 </tr>
                 <tr><td valign="top"><em>OnSaveFailed</em></td>
@@ -152,7 +140,7 @@ service OfficeDatabaseDocument
                     <td align="center">yes</td>
                 </tr>
                 <tr><td valign="top"><em>OnSaveAsDone</em></td>
-                    <td>saving the document under a new name succeeeded.</td>
+                    <td>saving the document under a new name succeeded.</td>
                     <td align="center">no</td>
                 </tr>
                 <tr><td valign="top"><em>OnSaveAsFailed</em></td>
@@ -165,7 +153,7 @@ service OfficeDatabaseDocument
                     <td align="center">yes</td>
                 </tr>
                 <tr><td valign="top"><em>OnSaveToDone</em></td>
-                    <td>saving the document to a different location succeeeded.</td>
+                    <td>saving the document to a different location succeeded.</td>
                     <td align="center">no</td>
                 </tr>
                 <tr><td valign="top"><em>OnSaveToFailed</em></td>
diff --git a/offapi/com/sun/star/sdb/OrderColumn.idl b/offapi/com/sun/star/sdb/OrderColumn.idl
index baaaa4ae1416..420d685a8e20 100644
--- a/offapi/com/sun/star/sdb/OrderColumn.idl
+++ b/offapi/com/sun/star/sdb/OrderColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_OrderColumn_idl__
 #define __com_sun_star_sdb_OrderColumn_idl__
 
-#ifndef __com_sun_star_sdbcx_Column_idl__
 #include <com/sun/star/sdbcx/Column.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/ParametersRequest.idl b/offapi/com/sun/star/sdb/ParametersRequest.idl
index 547c49e7fd4b..f4e7c6a65a33 100644
--- a/offapi/com/sun/star/sdb/ParametersRequest.idl
+++ b/offapi/com/sun/star/sdb/ParametersRequest.idl
@@ -27,16 +27,10 @@
 #ifndef __com_sun_star_sdb_ParametersRequest_idl__
 #define __com_sun_star_sdb_ParametersRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XConnection_idl__
 #include <com/sun/star/sdbc/XConnection.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/PreparedStatement.idl b/offapi/com/sun/star/sdb/PreparedStatement.idl
index 1ff4883e12df..06af4ef11f83 100644
--- a/offapi/com/sun/star/sdb/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdb/PreparedStatement.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_PreparedStatement_idl__
 #define __com_sun_star_sdb_PreparedStatement_idl__
 
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__
 #include <com/sun/star/sdbc/PreparedStatement.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
  published interface XColumnsSupplier;
diff --git a/offapi/com/sun/star/sdb/Query.idl b/offapi/com/sun/star/sdb/Query.idl
index d5fbe5e3579c..c0f4da4e5e19 100644
--- a/offapi/com/sun/star/sdb/Query.idl
+++ b/offapi/com/sun/star/sdb/Query.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_Query_idl__
 #define __com_sun_star_sdb_Query_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
  published interface XDataDescriptorFactory;
@@ -37,13 +35,9 @@
  published interface XRename;
 };};};};
 
-#ifndef __com_sun_star_sdb_DataSettings_idl__
 #include <com/sun/star/sdb/DataSettings.idl>
-#endif
 
-#ifndef __com_sun_star_sdb_QueryDefinition_idl__
 #include <com/sun/star/sdb/QueryDefinition.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/QueryDefinition.idl b/offapi/com/sun/star/sdb/QueryDefinition.idl
index 8c995a64aba2..f5091787ca99 100644
--- a/offapi/com/sun/star/sdb/QueryDefinition.idl
+++ b/offapi/com/sun/star/sdb/QueryDefinition.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_QueryDefinition_idl__
 #define __com_sun_star_sdb_QueryDefinition_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/QueryDescriptor.idl b/offapi/com/sun/star/sdb/QueryDescriptor.idl
index 89845599c309..4e1410a43632 100644
--- a/offapi/com/sun/star/sdb/QueryDescriptor.idl
+++ b/offapi/com/sun/star/sdb/QueryDescriptor.idl
@@ -27,18 +27,14 @@
 #ifndef __com_sun_star_sdb_QueryDescriptor_idl__
 #define __com_sun_star_sdb_QueryDescriptor_idl__
 
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
 #include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
  published interface XDataDescriptorFactory;
  published interface XColumnsSupplier;
 };};};};
 
-#ifndef __com_sun_star_sdb_DataSettings_idl__
 #include <com/sun/star/sdb/DataSettings.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/QueryDesign.idl b/offapi/com/sun/star/sdb/QueryDesign.idl
index 539961bd6a00..548875299182 100644
--- a/offapi/com/sun/star/sdb/QueryDesign.idl
+++ b/offapi/com/sun/star/sdb/QueryDesign.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_sdb_QueryDesign_idl__
 #define __com_sun_star_sdb_QueryDesign_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__
 #include <com/sun/star/form/FormController.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb {
 
@@ -50,7 +42,7 @@ module com {  module sun {  module star {  module sdb {
 
     <p>The design view of the QueryDesign is divided into two parts. The first part contains the table windows
     where columns can be selected for the SQL statement. The second part contains the columns which should appear
-    in the selection of the SQL statement or criterias which narrow the query.</p>
+    in the selection of the SQL statement or criteria which narrow the query.</p>
 
     <h3>Operation Modes</h3>
 
@@ -97,7 +89,7 @@ module com {  module sun {  module star {  module sdb {
 
         <li><a name="active_connection"></a><b>ActiveConnection</b><br/>
         specifies the connection to work with.<br/>
-        May be ommitted if and only if a valid <a href="#data_source">DataSourceName</a> parameter is supplied.
+        May be omitted if and only if a valid <a href="#data_source">DataSourceName</a> parameter is supplied.
         </li>
 
         <li><a name="command"></a><b>Command</b><br/>
diff --git a/offapi/com/sun/star/sdb/RelationDesign.idl b/offapi/com/sun/star/sdb/RelationDesign.idl
index 7b69a335ae31..218c400840c5 100644
--- a/offapi/com/sun/star/sdb/RelationDesign.idl
+++ b/offapi/com/sun/star/sdb/RelationDesign.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_sdb_RelationDesign_idl__
 #define __com_sun_star_sdb_RelationDesign_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__
 #include <com/sun/star/form/FormController.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/Reports.idl b/offapi/com/sun/star/sdb/Reports.idl
index 0951768c231b..41c927d12de9 100644
--- a/offapi/com/sun/star/sdb/Reports.idl
+++ b/offapi/com/sun/star/sdb/Reports.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_Reports_idl__
 #define __com_sun_star_sdb_Reports_idl__
 
-#ifndef __com_sun_star_sdb_DocumentContainer_idl__
 #include <com/sun/star/sdb/DocumentContainer.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/sdb/ResultColumn.idl b/offapi/com/sun/star/sdb/ResultColumn.idl
index 1ba3d261bc6c..ad83cb435842 100644
--- a/offapi/com/sun/star/sdb/ResultColumn.idl
+++ b/offapi/com/sun/star/sdb/ResultColumn.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_ResultColumn_idl__
 #define __com_sun_star_sdb_ResultColumn_idl__
 
-#ifndef __com_sun_star_sdbcx_Column_idl__
 #include <com/sun/star/sdbcx/Column.idl>
-#endif
 
-#ifndef __com_sun_star_sdb_ColumnSettings_idl__
 #include <com/sun/star/sdb/ColumnSettings.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/ResultSet.idl b/offapi/com/sun/star/sdb/ResultSet.idl
index 2ca4e304ebcf..0cfb3ae18f81 100644
--- a/offapi/com/sun/star/sdb/ResultSet.idl
+++ b/offapi/com/sun/star/sdb/ResultSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_ResultSet_idl__
 #define __com_sun_star_sdb_ResultSet_idl__
 
-#ifndef __com_sun_star_sdbcx_ResultSet_idl__
 #include <com/sun/star/sdbcx/ResultSet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
  published interface XColumnsSupplier;
diff --git a/offapi/com/sun/star/sdb/RowChangeEvent.idl b/offapi/com/sun/star/sdb/RowChangeEvent.idl
index a04eb97e0003..42881aba69c5 100644
--- a/offapi/com/sun/star/sdb/RowChangeEvent.idl
+++ b/offapi/com/sun/star/sdb/RowChangeEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_RowChangeEvent_idl__
 #define __com_sun_star_sdb_RowChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/RowSet.idl b/offapi/com/sun/star/sdb/RowSet.idl
index d52b6cf0cc39..3c5d1567ffdd 100644
--- a/offapi/com/sun/star/sdb/RowSet.idl
+++ b/offapi/com/sun/star/sdb/RowSet.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdb_RowSet_idl__
 #define __com_sun_star_sdb_RowSet_idl__
 
-#ifndef __com_sun_star_sdbc_RowSet_idl__
 #include <com/sun/star/sdbc/RowSet.idl>
-#endif
 
 module com {  module sun {  module star {  module sdbc {
 published interface XConnection;
 };};};};
-
-#ifndef __com_sun_star_sdb_ResultSet_idl__
 #include <com/sun/star/sdb/ResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
 #include <com/sun/star/sdb/XCompletedExecution.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 published interface XDeleteRows;
@@ -55,9 +47,9 @@ published interface XParametersSupplier;
 
 
 /** is a client side RowSet, which use retrieves is data based on a database table,
-    a query or a SQL command or by a rowset reader, who mustn't support SQL.
-    The connection of the rowset is typically a named DataSource or a DataAccess component
-    or a previous instanciated connection.
+    a query or a SQL command or by a row set reader, who mustn't support SQL.
+    The connection of the row set is typically a named DataSource or a DataAccess component
+    or a previous instantiated connection.
     <p>
     Depending on the
     <type scope="com::sun::star::sdbc">ResultSetConcurrency</type>
@@ -89,7 +81,7 @@ published interface XParametersSupplier;
             </td>
         </tr>
         <tr><td valign="top"><em>column values</em></td>
-            <td valign="top">If the opration includes changes in the values of the columns of the row set, then these are
+            <td valign="top">If the operation includes changes in the values of the columns of the row set, then these are
             notified before anything else (except requests for approval).
             @see ResultSet
             @see com::sun::star::sdbcx::XColumnsSupplier
@@ -167,7 +159,7 @@ published interface XParametersSupplier;
     <type>RowSet</type>. This deleted row then doesn't vanish immediately, but is still present, and subsequent calls to
     <member scope="com::sun::star::sdbc">XResultSet::rowDeleted</member> will return <TRUE/>. The deleted row "vanishes" from
     the <type>RowSet</type> as soon as the cursor is moved away from it.<br/>
-    As a consequence, the behaviour of several other methods is affected:<br/>
+    As a consequence, the behavior of several other methods is affected:<br/>
     <dl>
         <dt><member scope="com::sun::star::sdbc">XResultSet::getRow</member></dt>
         <dd>returns the position of the cursor, which has not been changed by the deletion.</dd>
@@ -223,9 +215,9 @@ published service RowSet
     */
     interface com::sun::star::sdb::XCompletedExecution;
 
-    /** approving of actions performed on the rowset.
+    /** approving of actions performed on the row set.
 
-        <p>The support of this interface implies a sematical extension to the <type scope="com::sun::star::sdbc">XResultSetUpdate</type>
+        <p>The support of this interface implies a semantical extension to the <type scope="com::sun::star::sdbc">XResultSetUpdate</type>
         interface which is supported via the <type scope="com::sun::star::sdbc">ResultSet</type>.</p>
 
         @see XResultSetUpdate
@@ -237,7 +229,7 @@ published service RowSet
         <p>The optional support of this interface is already implied with the support of the <type scope="com::sun::star::sdbc">ResultSet</type> service.</p>
 
         <p>However, note that the additional support of the <type>XRowSetApproveBroadcaster</type> interface results
-        in a sematical extension: the methods <member scope="com::sun::star::sdbc">XResultSetUpdate::insertRow</member>,
+        in a semantical extension: the methods <member scope="com::sun::star::sdbc">XResultSetUpdate::insertRow</member>,
         <member scope="com::sun::star::sdbc">XResultSetUpdate::updateRow</member> and <member scope="com::sun::star::sdbc">XResultSetUpdate::deleteRow</member>
         will now throw the <type>RowSetVetoException</type> if the action which is to be performed was vetoed
         by one of the <type>XRowSetApproveListener</type>'s.</p>
@@ -249,7 +241,7 @@ published service RowSet
         <p>The optional support of this interface is already implied with the support of the <type scope="com::sun::star::sdbcx">ResultSet</type> service.</p>
 
         <p>However, note that the additional support of the <type>XRowSetApproveBroadcaster</type> interface results
-        in a sematical extension: the method <member scope="com::sun::star::sdbcx">XDeleteRows::deleteRows</member>
+        in a semantical extension: the method <member scope="com::sun::star::sdbcx">XDeleteRows::deleteRows</member>
         will now throw the <type>RowSetVetoException</type> if the deletion was vetoed
         by one of the <type>XRowSetApproveListener</type>'s.</p>
      */
@@ -327,7 +319,7 @@ published service RowSet
     [property] boolean IgnoreResult;
 
 
-    /** additional filter for a rowset.
+    /** additional filter for a row set.
      */
     [property] string Filter;
 
@@ -345,7 +337,7 @@ published service RowSet
      */
     [optional,property] string GroupBy;
 
-    /** is a additional sort order definition for a rowset.
+    /** is a additional sort order definition for a row set.
      */
     [property] string Order;
 
@@ -371,7 +363,7 @@ published service RowSet
     [readonly, property] long RowCount;
 
 
-    /** indicates that all rows of te row set have been counted.
+    /** indicates that all rows of the row set have been counted.
      */
     [readonly, property] boolean IsRowCountFinal;
 
diff --git a/offapi/com/sun/star/sdb/RowSetVetoException.idl b/offapi/com/sun/star/sdb/RowSetVetoException.idl
index 66d27428f4c6..8e199ae83565 100644
--- a/offapi/com/sun/star/sdb/RowSetVetoException.idl
+++ b/offapi/com/sun/star/sdb/RowSetVetoException.idl
@@ -27,14 +27,12 @@
 #ifndef __com_sun_star_sdb_RowSetVetoException_idl__
 #define __com_sun_star_sdb_RowSetVetoException_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
 
-/** is an exception fired whenever a rowset operation was cancelled because of
+/** is an exception fired whenever a row set operation was cancelled because of
     of a veto of an approved listener.
     @see com::sun::star::sdb::XRowSetApproveListener
  */
diff --git a/offapi/com/sun/star/sdb/RowsChangeEvent.idl b/offapi/com/sun/star/sdb/RowsChangeEvent.idl
index 90bb50f4bf84..659c7716645e 100644
--- a/offapi/com/sun/star/sdb/RowsChangeEvent.idl
+++ b/offapi/com/sun/star/sdb/RowsChangeEvent.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: RowsChangeEvent.idl,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/offapi/com/sun/star/sdb/SQLContext.idl b/offapi/com/sun/star/sdb/SQLContext.idl
index 1cf7d389d56f..c5f7f94873cf 100644
--- a/offapi/com/sun/star/sdb/SQLContext.idl
+++ b/offapi/com/sun/star/sdb/SQLContext.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_SQLContext_idl__
 #define __com_sun_star_sdb_SQLContext_idl__
 
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__
 #include <com/sun/star/sdbc/SQLWarning.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
@@ -48,7 +46,7 @@ published exception SQLContext: com::sun::star::sdbc::SQLWarning
 {
     /** provides special info about the details where a
         <type scope="com::sun::star::sdbc">SQLException</type>
-        occured.
+        occurred.
         As usual for SQLExceptions, several SQLContext-objects may be chained, then the
         most recent context is appended to the list's tail
      */
diff --git a/offapi/com/sun/star/sdb/SQLErrorEvent.idl b/offapi/com/sun/star/sdb/SQLErrorEvent.idl
index 2be91d65a3dd..1037506879a1 100644
--- a/offapi/com/sun/star/sdb/SQLErrorEvent.idl
+++ b/offapi/com/sun/star/sdb/SQLErrorEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_SQLErrorEvent_idl__
 #define __com_sun_star_sdb_SQLErrorEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
  module com {  module sun {  module star {  module sdb {
diff --git a/offapi/com/sun/star/sdb/SQLFilterOperator.idl b/offapi/com/sun/star/sdb/SQLFilterOperator.idl
index e8aa55694462..d8c935d13a03 100644
--- a/offapi/com/sun/star/sdb/SQLFilterOperator.idl
+++ b/offapi/com/sun/star/sdb/SQLFilterOperator.idl
@@ -51,10 +51,10 @@ constants SQLFilterOperator
     /// greater than
     const long GREATER          = 4;
 
-    /// less or eqal than
+    /// less or equal than
     const long LESS_EQUAL       = 5;
 
-    /// greater or eqal than
+    /// greater or equal than
     const long GREATER_EQUAL    = 6;
 
     /// like
diff --git a/offapi/com/sun/star/sdb/SQLQueryComposer.idl b/offapi/com/sun/star/sdb/SQLQueryComposer.idl
index 440011d8611a..cf030cb02a19 100644
--- a/offapi/com/sun/star/sdb/SQLQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/SQLQueryComposer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_SQLQueryComposer_idl__
 #define __com_sun_star_sdb_SQLQueryComposer_idl__
 
-#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__
 #include <com/sun/star/sdb/XSQLQueryComposer.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
  published interface XTablesSupplier;
diff --git a/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
index 160e537c3e89..85584a9543a0 100644
--- a/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__
 #define __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__
 
-#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
 #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 interface XTablesSupplier;
diff --git a/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
index 73a5ed241243..08f203e222cf 100644
--- a/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdb_SingleSelectQueryComposer_idl__
 #define __com_sun_star_sdb_SingleSelectQueryComposer_idl__
 
-#ifndef __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__
 #include <com/sun/star/sdb/SingleSelectQueryAnalyzer.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb {
 
@@ -59,7 +55,7 @@ service SingleSelectQueryComposer
 
     interface XSingleSelectQueryComposer;
 
-    /** is the orignal SQL statement set with the interface <type scope="com::sun::star::sdb">XSingleSelectQueryAnalyzer</type>.
+    /** is the original SQL statement set with the interface <type scope="com::sun::star::sdb">XSingleSelectQueryAnalyzer</type>.
     */
     [readonly, property] string Original;
 };
diff --git a/offapi/com/sun/star/sdb/Table.idl b/offapi/com/sun/star/sdb/Table.idl
index 71d4865db809..9b0c78a6159c 100644
--- a/offapi/com/sun/star/sdb/Table.idl
+++ b/offapi/com/sun/star/sdb/Table.idl
@@ -27,20 +27,16 @@
 #ifndef __com_sun_star_sdb_Table_idl__
 #define __com_sun_star_sdb_Table_idl__
 
-#ifndef __com_sun_star_sdbcx_Table_idl__
 #include <com/sun/star/sdbcx/Table.idl>
-#endif
 
-#ifndef __com_sun_star_sdb_DataSettings_idl__
 #include <com/sun/star/sdb/DataSettings.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
 
 /** extends the service
     <type scope="com::sun::star::sdbcx">Table</type>
-    with additional display information, sorting, and filtering criterias.
+    with additional display information, sorting, and filtering criteria.
  */
 published service Table
 {
diff --git a/offapi/com/sun/star/sdb/TableDescriptor.idl b/offapi/com/sun/star/sdb/TableDescriptor.idl
index 99fc7a056e36..4a03a9bb4102 100644
--- a/offapi/com/sun/star/sdb/TableDescriptor.idl
+++ b/offapi/com/sun/star/sdb/TableDescriptor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_TableDescriptor_idl__
 #define __com_sun_star_sdb_TableDescriptor_idl__
 
-#ifndef __com_sun_star_sdbcx_TableDescriptor_idl__
 #include <com/sun/star/sdbcx/TableDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_sdb_DataSettings_idl__
 #include <com/sun/star/sdb/DataSettings.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/TableDesign.idl b/offapi/com/sun/star/sdb/TableDesign.idl
index a9ca8702f00b..814895e4bcbf 100644
--- a/offapi/com/sun/star/sdb/TableDesign.idl
+++ b/offapi/com/sun/star/sdb/TableDesign.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_sdb_TableDesign_idl__
 #define __com_sun_star_sdb_TableDesign_idl__
 
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
 #include <com/sun/star/frame/XDispatchProvider.idl>
-#endif
-#ifndef __com_sun_star_form_FormController_idl__
 #include <com/sun/star/form/FormController.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/XAlterQuery.idl b/offapi/com/sun/star/sdb/XAlterQuery.idl
index 39d328d68074..83008f5450ee 100644
--- a/offapi/com/sun/star/sdb/XAlterQuery.idl
+++ b/offapi/com/sun/star/sdb/XAlterQuery.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XAlterQuery_idl__
 #define __com_sun_star_sdb_XAlterQuery_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/XBookmarksSupplier.idl b/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
index fdb0e8adc7e0..e7f8a9875338 100644
--- a/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
+++ b/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XBookmarksSupplier_idl__
 #define __com_sun_star_sdb_XBookmarksSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sdb/XColumn.idl b/offapi/com/sun/star/sdb/XColumn.idl
index 7cb25c0e78dd..94ce6d7f453c 100644
--- a/offapi/com/sun/star/sdb/XColumn.idl
+++ b/offapi/com/sun/star/sdb/XColumn.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_sdb_XColumn_idl__
 #define __com_sun_star_sdb_XColumn_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
-#ifndef __com_sun_star_util_Date_idl__
 #include <com/sun/star/util/Date.idl>
-#endif
 
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
-#ifndef __com_sun_star_util_Time_idl__
 #include <com/sun/star/util/Time.idl>
-#endif
 
  module com {  module sun {  module star {  module io {
  published interface XInputStream;
diff --git a/offapi/com/sun/star/sdb/XColumnUpdate.idl b/offapi/com/sun/star/sdb/XColumnUpdate.idl
index cecad2439698..eecc71f034c6 100644
--- a/offapi/com/sun/star/sdb/XColumnUpdate.idl
+++ b/offapi/com/sun/star/sdb/XColumnUpdate.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_sdb_XColumnUpdate_idl__
 #define __com_sun_star_sdb_XColumnUpdate_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
-#ifndef __com_sun_star_util_Date_idl__
 #include <com/sun/star/util/Date.idl>
-#endif
 
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
-#ifndef __com_sun_star_util_Time_idl__
 #include <com/sun/star/util/Time.idl>
-#endif
 
  module com {  module sun {  module star {  module io {
  published interface XInputStream;
diff --git a/offapi/com/sun/star/sdb/XCommandPreparation.idl b/offapi/com/sun/star/sdb/XCommandPreparation.idl
index 25bed38357cd..d49a14278b9c 100644
--- a/offapi/com/sun/star/sdb/XCommandPreparation.idl
+++ b/offapi/com/sun/star/sdb/XCommandPreparation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_XCommandPreparation_idl__
 #define __com_sun_star_sdb_XCommandPreparation_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
  published interface XPreparedStatement;
diff --git a/offapi/com/sun/star/sdb/XCompletedConnection.idl b/offapi/com/sun/star/sdb/XCompletedConnection.idl
index c40a4069c092..02d797dcb15f 100644
--- a/offapi/com/sun/star/sdb/XCompletedConnection.idl
+++ b/offapi/com/sun/star/sdb/XCompletedConnection.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XCompletedConnection_idl__
 #define __com_sun_star_sdb_XCompletedConnection_idl__
 
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
  published interface XConnection;
diff --git a/offapi/com/sun/star/sdb/XCompletedExecution.idl b/offapi/com/sun/star/sdb/XCompletedExecution.idl
index 395598e1e70e..eb6002299cdf 100644
--- a/offapi/com/sun/star/sdb/XCompletedExecution.idl
+++ b/offapi/com/sun/star/sdb/XCompletedExecution.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XCompletedExecution_idl__
 #define __com_sun_star_sdb_XCompletedExecution_idl__
 
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl b/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
index 76680df46bec..ca0966f225be 100644
--- a/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
+++ b/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sdb_XDataAccessDescriptorFactory_idl__
 #define __com_sun_star_sdb_XDataAccessDescriptorFactory_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/XDatabaseAccess.idl b/offapi/com/sun/star/sdb/XDatabaseAccess.idl
index 9339d3efcac1..d22db49f3baa 100644
--- a/offapi/com/sun/star/sdb/XDatabaseAccess.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseAccess.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdb_XDatabaseAccess_idl__
 #define __com_sun_star_sdb_XDatabaseAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
 #include <com/sun/star/sdbc/XDataSource.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module task {
  published interface XInteractionHandler;
diff --git a/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl b/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
index 6826d9354a29..c153acb7b9f4 100644
--- a/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_XDatabaseAccessListener_idl__
 #define __com_sun_star_sdb_XDatabaseAccessListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl b/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
index bf244d52c0ba..f32d0108812a 100644
--- a/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdb_XDatabaseEnvironment_idl__
 #define __com_sun_star_sdb_XDatabaseEnvironment_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_XDriverManager_idl__
 #include <com/sun/star/sdbc/XDriverManager.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/XDocumentDataSource.idl b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
index 6acb441bd7a5..04fda8584eb0 100644
--- a/offapi/com/sun/star/sdb/XDocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_XDocumentDataSource_idl__
 #define __com_sun_star_sdb_XDocumentDataSource_idl__
 
-#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
index fa28e15ebc75..e47b1f8dec15 100644
--- a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XFormDocumentsSupplier_idl__
 #define __com_sun_star_sdb_XFormDocumentsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
index 4d89d66a6ca4..f9d9691dede3 100644
--- a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
+++ b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdb_XInteractionDocumentSave_idl__
 #define __com_sun_star_sdb_XInteractionDocumentSave_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl b/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
index 56bed78ff8fe..6554452f63b6 100644
--- a/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
+++ b/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdb_XInteractionSupplyParameters_idl__
 #define __com_sun_star_sdb_XInteractionSupplyParameters_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
index d0f79a4ab348..7440c62476dd 100644
--- a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
 #define __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
 
-#ifndef __com_sun_star_sdb_XFormDocumentsSupplier_idl__
 #include <com/sun/star/sdb/XFormDocumentsSupplier.idl>
-#endif
-#ifndef __com_sun_star_sdb_XReportDocumentsSupplier_idl__
 #include <com/sun/star/sdb/XReportDocumentsSupplier.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
 #include <com/sun/star/sdbc/XDataSource.idl>
-#endif
-#ifndef __com_sun_star_document_XDocumentSubStorageSupplier_idl__
 #include <com/sun/star/document/XDocumentSubStorageSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/XParametersSupplier.idl b/offapi/com/sun/star/sdb/XParametersSupplier.idl
index c5179eb02d7e..564396312e57 100644
--- a/offapi/com/sun/star/sdb/XParametersSupplier.idl
+++ b/offapi/com/sun/star/sdb/XParametersSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XParametersSupplier_idl__
 #define __com_sun_star_sdb_XParametersSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/XQueriesSupplier.idl b/offapi/com/sun/star/sdb/XQueriesSupplier.idl
index a447b8fa598c..e191fcf41b80 100644
--- a/offapi/com/sun/star/sdb/XQueriesSupplier.idl
+++ b/offapi/com/sun/star/sdb/XQueriesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XQueriesSupplier_idl__
 #define __com_sun_star_sdb_XQueriesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl b/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
index e56d2fbafa56..4588e1c8835e 100644
--- a/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XQueryDefinitionsSupplier_idl__
 #define __com_sun_star_sdb_XQueryDefinitionsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
index 691c745160e3..d0489cf544f7 100644
--- a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XReportDocumentsSupplier_idl__
 #define __com_sun_star_sdb_XReportDocumentsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/XResultSetAccess.idl b/offapi/com/sun/star/sdb/XResultSetAccess.idl
index a0c388e9374a..1aefdc9b821f 100644
--- a/offapi/com/sun/star/sdb/XResultSetAccess.idl
+++ b/offapi/com/sun/star/sdb/XResultSetAccess.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XResultSetAccess_idl__
 #define __com_sun_star_sdb_XResultSetAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl b/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
index 76a6251d1d39..fb1d49b2c763 100644
--- a/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
 #define __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
@@ -37,7 +35,7 @@
 
 
 /** provides the possibility of reviving an event before changing the content
-    of a rowset.
+    of a row set.
  */
 published interface XRowSetApproveBroadcaster: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/sdb/XRowSetApproveListener.idl b/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
index 04d06b90fb56..095b04af83ca 100644
--- a/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
+++ b/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
@@ -27,25 +27,21 @@
 #ifndef __com_sun_star_sdb_XRowSetApproveListener_idl__
 #define __com_sun_star_sdb_XRowSetApproveListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_sdb_RowChangeEvent_idl__
 #include <com/sun/star/sdb/RowChangeEvent.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
 
-/** is used for approving the moving and changing of rowset actions.
+/** is used for approving the moving and changing of row set actions.
  */
 published interface XRowSetApproveListener: com::sun::star::lang::XEventListener
 {
 
-    /** is called before a rowset's cursor is moved.
+    /** is called before a row set's cursor is moved.
         @param event
-            the event which happend
+            the event which happened
         @returns <TRUE/> when moving is allowed, otherwise <FALSE/>
      */
     boolean approveCursorMove([in]com::sun::star::lang::EventObject event);
@@ -53,16 +49,16 @@ published interface XRowSetApproveListener: com::sun::star::lang::XEventListener
 
     /** is called before a row is inserted, updated, or deleted.
         @param event
-            the event which happend
+            the event which happened
         @returns <TRUE/> when changing is allowed, otherwise <FALSE/>
      */
     boolean approveRowChange([in]RowChangeEvent event);
     //-------------------------------------------------------------------------
 
-    /** is called before a rowset is changed, or in other words
-        before a rowset is reexecuted.
+    /** is called before a row set is changed, or in other words
+        before a row set is reexecuted.
         @param event
-            the event which happend
+            the event which happened
         @returns <TRUE/> when changing is allowed, otherwise <FALSE/>
     */
     boolean approveRowSetChange([in]com::sun::star::lang::EventObject event);
diff --git a/offapi/com/sun/star/sdb/XRowSetSupplier.idl b/offapi/com/sun/star/sdb/XRowSetSupplier.idl
index 7c7e2ab9ec42..45fa3c662cac 100644
--- a/offapi/com/sun/star/sdb/XRowSetSupplier.idl
+++ b/offapi/com/sun/star/sdb/XRowSetSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XRowSetSupplier_idl__
 #define __com_sun_star_sdb_XRowSetSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_XRowSet_idl__
 #include <com/sun/star/sdbc/XRowSet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/XRowsChangeBroadcaster.idl b/offapi/com/sun/star/sdb/XRowsChangeBroadcaster.idl
index feb8191c44d9..9d05adb7ae57 100644
--- a/offapi/com/sun/star/sdb/XRowsChangeBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XRowsChangeBroadcaster.idl
@@ -5,10 +5,6 @@
 *
 * OpenOffice.org - a multi-platform office productivity suite
 *
-* $RCSfile: code,v $
-*
-* $Revision: 1.3 $
-*
 * This file is part of OpenOffice.org.
 *
 * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/offapi/com/sun/star/sdb/XRowsChangeListener.idl b/offapi/com/sun/star/sdb/XRowsChangeListener.idl
index 995636e95e3f..6c7d65f46fa3 100644
--- a/offapi/com/sun/star/sdb/XRowsChangeListener.idl
+++ b/offapi/com/sun/star/sdb/XRowsChangeListener.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XRowsChangeListener.idl,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,16 +27,14 @@
 #ifndef __com_sun_star_sdb_XRowsChangeListener_idl__
 #define __com_sun_star_sdb_XRowsChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 #include <com/sun/star/sdb/RowsChangeEvent.idl>
 
  module com {  module sun {  module star {  module sdb {
 
 
 /** is used for receiving "rowsChanged" events
-    posted by, for example, a rowset.
+    posted by, for example, a row set.
  */
 interface XRowsChangeListener: com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl b/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
index 2583428ba6ee..002d553033c7 100644
--- a/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
 #define __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdb_XSQLErrorListener_idl__
 #include <com/sun/star/sdb/XSQLErrorListener.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
@@ -46,7 +42,7 @@
 published interface XSQLErrorBroadcaster: com::sun::star::uno::XInterface
 {
 
-    /** adds the specified listener to receive the event "errorOccured"
+    /** adds the specified listener to receive the event "errorOccurred"
         @param com::sun::star::sdb::XSQLErrorListener
      */
     [oneway] void addSQLErrorListener(
diff --git a/offapi/com/sun/star/sdb/XSQLErrorListener.idl b/offapi/com/sun/star/sdb/XSQLErrorListener.idl
index 109e9b5043e1..ec94ab656d58 100644
--- a/offapi/com/sun/star/sdb/XSQLErrorListener.idl
+++ b/offapi/com/sun/star/sdb/XSQLErrorListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdb_XSQLErrorListener_idl__
 #define __com_sun_star_sdb_XSQLErrorListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_sdb_SQLErrorEvent_idl__
 #include <com/sun/star/sdb/SQLErrorEvent.idl>
-#endif
 
  module com {  module sun {  module star {  module sdb {
 
@@ -48,7 +44,7 @@ published interface XSQLErrorListener: com::sun::star::lang::XEventListener
         <type scope="com::sun::star::sdbc">SQLException</type>
         is thrown to the application.
         @param aEvent
-            the event which occured
+            the event which occurred
      */
     void errorOccured([in]com::sun::star::sdb::SQLErrorEvent aEvent);
 };
diff --git a/offapi/com/sun/star/sdb/XSQLQueryComposer.idl b/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
index bdfd321c2b09..0ba2746afa55 100644
--- a/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__
 #define __com_sun_star_sdb_XSQLQueryComposer_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 //=============================================================================
 
@@ -73,7 +67,7 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
             raises (com::sun::star::sdbc::SQLException);
     //-------------------------------------------------------------------------
 
-    /** returns the query composed with filters and sort criterias.
+    /** returns the query composed with filters and sort criteria.
         @returns
             the composed query
      */
@@ -95,7 +89,7 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
     /** returns the currently used filter.
              <p>
              The filter criteria is split into levels. Each level represents the
-             OR criterias. Within each level, the filters are provided as an AND criteria
+             OR criteria. Within each level, the filters are provided as an AND criteria
              with the name of the column and the filter condition. The filter condition
              is of type string.
              </p>
@@ -155,7 +149,7 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
             raises (com::sun::star::sdbc::SQLException);
     //-------------------------------------------------------------------------
 
-    /** makes it possibile to set a sort condition for the query.
+    /** makes it possible to set a sort condition for the query.
         @param order
             the order part to set
         @throws com::sun::star::sdbc::SQLException
diff --git a/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl b/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
index 1382966f264c..157ad0b1a7d2 100644
--- a/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
+++ b/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdb_XSQLQueryComposerFactory_idl__
 #define __com_sun_star_sdb_XSQLQueryComposerFactory_idl__
 
-#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__
 #include <com/sun/star/sdb/XSQLQueryComposer.idl>
-#endif
 
 //=============================================================================
  module com {  module sun {  module star {  module sdb {
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
index 3df97e9fac5c..b00af59a7c35 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
 #define __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 module com {  module sun {  module star {  module container {
 published interface XIndexAccess;
@@ -95,7 +87,7 @@ published interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface
     /** returns the currently used filter.
              <p>
              The filter criteria is split into levels. Each level represents the
-             OR criterias. Within each level, the filters are provided as an AND criteria
+             OR criteria. Within each level, the filters are provided as an AND criteria
              with the name of the column and the filter condition. The filter condition
              is of type string. The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
              </p>
@@ -147,7 +139,7 @@ published interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface
     /** returns the currently used HAVING filter.
              <p>
              The HAVING filter criteria is split into levels. Each level represents the
-             OR criterias. Within each level, the filters are provided as an AND criteria
+             OR criteria. Within each level, the filters are provided as an AND criteria
              with the name of the column and the filter condition. The filter condition
              is of type string. The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
              </p>
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
index 9439959f180e..f3af1cd777af 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdb_XSingleSelectQueryComposer_idl__
 #define __com_sun_star_sdb_XSingleSelectQueryComposer_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
-#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
 #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl>
-#endif
 
 //=============================================================================
 
@@ -70,7 +62,7 @@ published interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
         @throws com::sun::star::sdbc::SQLException
             if a database access error occurs
             or the statement isn't valid
-            or the statement isn't parseable.
+            or the statement isn't parsable.
      */
     void setFilter([in] string filter)
             raises (com::sun::star::sdbc::SQLException);
@@ -79,7 +71,7 @@ published interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
     /** appends a new set of filter criteria which is split into levels.
         @param filter
             The filter criteria is split into levels. Each level represents the
-            OR criterias. Within each level, the filters are provided as an AND criteria
+            OR criteria. Within each level, the filters are provided as an AND criteria
             with the name of the column and the filter condition. The filter condition
             is of type string. The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
 
@@ -113,13 +105,13 @@ published interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
     //-------------------------------------------------------------------------
 
 
-    /** makes it possibile to set a group for the query.
+    /** makes it possible to set a group for the query.
         @param group
             the group part to set
         @throws com::sun::star::sdbc::SQLException
             if a database access error occurs
             or the statement isn't valid
-            or the statement isn't parseable..
+            or the statement isn't parsable.
      */
     void setGroup([in] string group)
             raises (com::sun::star::sdbc::SQLException);
@@ -146,7 +138,7 @@ published interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
         @throws com::sun::star::sdbc::SQLException
             if a database access error occurs
             or the statement isn't valid
-            or the statement isn't parseable.
+            or the statement isn't parsable.
      */
     void setHavingClause([in] string filter)
             raises (com::sun::star::sdbc::SQLException);
@@ -156,7 +148,7 @@ published interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
     /** appends a new set of HAVING filter criteria which is split into levels.
         @param filter
             The HAVING filter criteria is split into levels. Each level represents the
-            OR criterias. Within each level, the filters are provided as an AND criteria
+            OR criteria. Within each level, the filters are provided as an AND criteria
             with the name of the column and the filter condition. The filter condition
             is of type string. The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
 
@@ -188,13 +180,13 @@ published interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
     // ORDER BY
     //-------------------------------------------------------------------------
 
-    /** makes it possibile to set a sort condition for the query.
+    /** makes it possible to set a sort condition for the query.
         @param order
             the order part to set
         @throws com::sun::star::sdbc::SQLException
             if a database access error occurs
             or the order isn't valid
-            or the statement isn't parseable.
+            or the statement isn't parsable.
      */
     void setOrder([in] string order)
             raises (com::sun::star::sdbc::SQLException);
@@ -215,7 +207,7 @@ published interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
             raises (com::sun::star::sdbc::SQLException);
 
     //-------------------------------------------------------------------------
-    // culmulative composing
+    // cumulative composing
     //-------------------------------------------------------------------------
 
     /** sets a new elementary query for the composer
@@ -232,7 +224,7 @@ published interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
         <member>XSingleSelectQueryAnalyzer::getQueryWithSubstitution</member>, which always returns
         the complete composed query.</p>
 
-        <p>As a result, you can use the composer to build culmulative filter expressions. That
+        <p>As a result, you can use the composer to build cumulative filter expressions. That
         is, you can set <member>ElementaryQuery</member> to a statement already containing
         filters, and then use <member>setFilter</member> to append additional filters.</p>
 
diff --git a/offapi/com/sun/star/sdb/application/CopyTableContinuation.idl b/offapi/com/sun/star/sdb/application/CopyTableContinuation.idl
index 7b8bad2cc841..5f0eb18bc5b8 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableContinuation.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableContinuation.idl
@@ -54,7 +54,7 @@ constants CopyTableContinuation
 
     /** asks the user how the handle the error.
 
-        <p>The user can choose between ignoring the error and cancelling the copy
+        <p>The user can choose between ignoring the error and canceling the copy
         operation.</p>
     */
     const short AskUser         = 3;
diff --git a/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl b/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
index 9a9fc8761d02..75b6a6270199 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sdb_application_CopyTableRowEvent_idl__
 #define __com_sun_star_sdb_application_CopyTableRowEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/CopyTableWizard.idl b/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
index f294c9f69d2c..c4c31ec4ae23 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_sdb_application_CopyTableWizard_idl__
 #define __com_sun_star_sdb_application_CopyTableWizard_idl__
 
-#ifndef __com_sun_star_sdb_application_XCopyTableWizard_idl__
 #include <com/sun/star/sdb/application/XCopyTableWizard.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/DatabaseObject.idl b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
index 46f9f95a7500..762dc7ecdc88 100644
--- a/offapi/com/sun/star/sdb/application/DatabaseObject.idl
+++ b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sdb_application_DatabaseObject_idl__
 #define __com_sun_star_sdb_application_DatabaseObject_idl__
 
-#ifndef __com_sun_star_sdb_CommandType_idl__
 #include <com/sun/star/sdb/CommandType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/DefaultViewController.idl b/offapi/com/sun/star/sdb/application/DefaultViewController.idl
index f46c74467dc3..09ea4700416b 100644
--- a/offapi/com/sun/star/sdb/application/DefaultViewController.idl
+++ b/offapi/com/sun/star/sdb/application/DefaultViewController.idl
@@ -54,7 +54,7 @@ service DefaultViewController
         <p>The <member scope="::com::sun::star::ui">ContextMenuExecuteEvent::Selection</member> member
         of the event passed to an interceptor will <em>not</em> be the controller itself
         (though the controller also supports the <a href="#XSelectionSupplier"><code>XSelectionSupplier</code></a>
-        interface), but a component which descrbes the current selection of the very window where the context
+        interface), but a component which describes the current selection of the very window where the context
         menu was requested.</p>
 
         <p>In OpenOffice.org's database application, database objects such as tables, queries, forms,
diff --git a/offapi/com/sun/star/sdb/application/XCopyTableListener.idl b/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
index d53f399b281c..ef64f3f71537 100644
--- a/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
+++ b/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sdb_application_XCopyTableListener_idl__
 #define __com_sun_star_sdb_application_XCopyTableListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_sdb_application_CopyTableRowEvent_idl__
 #include <com/sun/star/sdb/application/CopyTableRowEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl b/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
index 216c9fb45023..8fd404489f07 100644
--- a/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
+++ b/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sdb_application_XCopyTableWizard_idl__
 #define __com_sun_star_sdb_application_XCopyTableWizard_idl__
 
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_Optional_idl__
 #include <com/sun/star/beans/Optional.idl>
-#endif
 
 //=============================================================================
 
@@ -85,7 +79,7 @@ interface XCopyTableWizard : ::com::sun::star::ui::dialogs::XExecutableDialog
         set raises ( ::com::sun::star::lang::IllegalArgumentException );
     };
 
-    /** specfies the name of the table in the destination database.
+    /** specifies the name of the table in the destination database.
 
         <p>At initialization time, you can use this attribute to control the
         initial table name as suggested to the user.</p>
diff --git a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
index 1a5c5ed03077..527186f4046b 100644
--- a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
+++ b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
@@ -60,9 +60,9 @@ published interface XDatabaseDocumentUI
     */
     [attribute, readonly] com::sun::star::sdbc::XDataSource DataSource;
 
-    /** provides access to the applicatio's main window
+    /** provides access to the application's main window
 
-        <p>Note that reading this atttribute is equivalent to querying the component
+        <p>Note that reading this attribute is equivalent to querying the component
         for the <type scope="com::sun::star::frame">XController</type> interface,
         asking the controller for its frame, and asking this frame for its
         container window.</p>
@@ -76,7 +76,7 @@ published interface XDatabaseDocumentUI
 
         <p>Note that the connection returned here is really the working connection
         of the application. Clients should not misuse it, in particular, closing
-        the connection can yield unexpected results and should definately be
+        the connection can yield unexpected results and should definitely be
         avoided. If you need a separate connection to the data source, use
         <member scope="com::sun::star::sdbc">XDataSource::getConnection</member>.</p>
     */
@@ -127,7 +127,7 @@ published interface XDatabaseDocumentUI
             a record describing the sub component. The first element of the returned pair is the type
             of the component, denoted by one of the <type>DatabaseObject</type> constants. The second
             element is the name of the component. For object types which support nested structures (forms
-            and reports, actually), this might be a hierachical name. If the sub component has been newly created,
+            and reports, actually), this might be a hierarchical name. If the sub component has been newly created,
             and not yet saved, this name is empty.
 
         @throws ::com::sun::star::lang::IllegalArgumentException
@@ -187,7 +187,7 @@ published interface XDatabaseDocumentUI
             constants.
 
         @param ObjectName
-            specifies the name of the object. In case hierachical objects are supported
+            specifies the name of the object. In case hierarchical objects are supported
             (as is the case form forms and reports), hierarchical names are supported here, too.
 
         @param ForEditing
diff --git a/offapi/com/sun/star/sdb/application/XTableUIProvider.idl b/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
index 85333795d8d2..9c0c7bca28f4 100644
--- a/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
+++ b/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
@@ -76,7 +76,7 @@ interface XTableUIProvider
         @param DocumentUI
             provides access to the UI in which the database document is
             currently displayed.<br/>
-            In particular, this paramter provides access to the application's main
+            In particular, this parameter provides access to the application's main
             window, which is needed in case the table editor should be a dialog.
 
         @param TableName
@@ -105,7 +105,7 @@ interface XTableUIProvider
             if the given <arg>TableName</arg> does not denote an existing table
 
         @throws ::com::sun::star::lang::WrappedTargetException
-            if an error occures while creating the table editor component.
+            if an error occurs while creating the table editor component.
     */
     com::sun::star::uno::XInterface getTableEditor(
         [in] XDatabaseDocumentUI DocumentUI,
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
index c0ec570ccf60..e581792227c0 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XConnectionSupplier.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,12 +29,8 @@
 #define __com_sun_star_sdb_tools_XConnectionSupplier_idl__
 
 #include <com/sun/star/sdbc/XConnection.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
index ab9e308fcc5c..2f35b5a84fda 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sdb_tools_XConnectionTools_idl__
 #define __com_sun_star_sdb_tools_XConnectionTools_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 module com {  module sun {  module star {
     module container {
@@ -73,14 +69,14 @@ published interface XConnectionTools
     /** creates an instance supporting the <type>XTableName</type> interface,
         which can be used to manipulate table names for various purposes.
 
-        <p>The returned object is guanrateed to not be <NULL/>.</p>
+        <p>The returned object is guaranteed to not be <NULL/>.</p>
     */
     XTableName      createTableName();
 
     /** returns an instance supporting the <type>XObjectNames</type> interface,
         which provides access to functionality around table and query names.
 
-        <p>The returned object is guanrateed to not be <NULL/>.</p>
+        <p>The returned object is guaranteed to not be <NULL/>.</p>
     */
     XObjectNames    getObjectNames();
 
diff --git a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
index 726b7d712771..a7c7daad4083 100644
--- a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
+++ b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sdb_tools_XDataSourceMetaData_idl__
 #define __com_sun_star_sdb_tools_XDataSourceMetaData_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
index fdc7ce517ca8..bc6ebc4f146e 100644
--- a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XIndexAlteration.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,16 +28,10 @@
 #ifndef __com_sun_star_sdb_tools_XIndexAlteration_idl__
 #define __com_sun_star_sdb_tools_XIndexAlteration_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 #include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
index 44389dfe64fd..f2a00d23c58f 100644
--- a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XKeyAlteration.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,16 +28,10 @@
 #ifndef __com_sun_star_sdb_tools_XKeyAlteration_idl__
 #define __com_sun_star_sdb_tools_XKeyAlteration_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 #include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XObjectNames.idl b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
index 1925c74f752f..3fcf6a207bf7 100644
--- a/offapi/com/sun/star/sdb/tools/XObjectNames.idl
+++ b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sdb_tools_XObjectNames_idl__
 #define __com_sun_star_sdb_tools_XObjectNames_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
@@ -46,12 +41,12 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     <p>The most important task fulfilled by this instance is that it hides
     different naming restrictions from you, which are caused by server-side
-    or client side specialities.</p>
+    or client side specialties.</p>
 
     <p>For instance, it can validate names against
     the characters allowed in the object names of a connection. Also, it
     relieves you from caring whether a database supports queries in a <code>SELECT</code>
-    statment's <code>FROM</code> part (known as "queries in queries"). In such
+    statement's <code>FROM</code> part (known as "queries in queries"). In such
     databases, query and table names share a common namespace, thus they must be
     unique. Using this interface, you can easily ensure this uniqueness.</p>
 
@@ -59,7 +54,7 @@ module com {  module sun {  module star {  module sdb { module tools {
     thus it entry point for obtaining it is a <type scope="com::sun::star::sdb">Connection</type>
     service.</p>
 
-    <p>The component itself does not have life-time control mechanimns, i.e. you
+    <p>The component itself does not have life-time control mechanisms, i.e. you
     cannot explicitly dispose it (<member scope="com::sun::star::lang">XComponent::dispose</member>),
     and you cannot be notified when it dies.<br/>
     However, if your try to access any of its methods or attributes, after the
@@ -79,7 +74,7 @@ published interface XObjectNames
 
         <p>Note that in an multi-threaded environment, the name you obtain here is not absolutely
         guaranteed to be unique. It is unique at the very moment the function returns to you.
-        But already when you evaluate the returned value, it might not be uniquey anymore, if
+        But already when you evaluate the returned value, it might not be unique anymore, if
         another process or thread created a query or table with this name.</p>
 
         <p>This implies that you cannot rely on the name's uniqueness, but you can use it as
diff --git a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
index fe0fe494fead..9fed4c25d635 100644
--- a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XTableAlteration.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,16 +28,10 @@
 #ifndef __com_sun_star_sdb_tools_XTableAlteration_idl__
 #define __com_sun_star_sdb_tools_XTableAlteration_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 #include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XTableName.idl b/offapi/com/sun/star/sdb/tools/XTableName.idl
index dfddb75a9933..935e03bec32a 100644
--- a/offapi/com/sun/star/sdb/tools/XTableName.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableName.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sdb_tools_XTableName_idl__
 #define __com_sun_star_sdb_tools_XTableName_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
@@ -59,7 +51,7 @@ module com {  module sun {  module star {  module sdb { module tools {
     <p>The <type>XTableName</type> interface eases this and other, similar tasks around table
     names.</p>
 
-    <p>The component itself does not have life-time control mechanimns, i.e. you
+    <p>The component itself does not have life-time control mechanisms, i.e. you
     cannot explicitly dispose it (<member scope="com::sun::star::lang">XComponent::dispose</member>),
     and you cannot be notified when it dies.<br/>
     However, if your try to access any of its methods or attributes, after the
@@ -88,7 +80,7 @@ published interface XTableName
     [attribute] string  TableName;
 
     /** returns the composed table name, including the catalog and schema name,
-        respecting the databases's quoting requirements, plus
+        respecting the database's quoting requirements, plus
 
         @param Type
             the type of name composition to be used.
diff --git a/offapi/com/sun/star/sdb/tools/XTableRename.idl b/offapi/com/sun/star/sdb/tools/XTableRename.idl
index f61d736bae8c..50bcb4c52beb 100644
--- a/offapi/com/sun/star/sdb/tools/XTableRename.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableRename.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XTableRename.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,16 +28,10 @@
 #ifndef __com_sun_star_sdb_tools_XTableRename_idl__
 #define __com_sun_star_sdb_tools_XTableRename_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 #include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdb/tools/XViewAccess.idl b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
index e64727341e81..41f8c39c57c7 100644
--- a/offapi/com/sun/star/sdb/tools/XViewAccess.idl
+++ b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XViewAccess.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,16 +28,10 @@
 #ifndef __com_sun_star_sdb_tools_XViewAccess_idl__
 #define __com_sun_star_sdb_tools_XViewAccess_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 #include <com/sun/star/sdb/tools/XConnectionSupplier.idl>
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sdb { module tools {
diff --git a/offapi/com/sun/star/sdbc/BatchUpdateException.idl b/offapi/com/sun/star/sdbc/BatchUpdateException.idl
index b3ef24879004..8baa053a84c4 100644
--- a/offapi/com/sun/star/sdbc/BatchUpdateException.idl
+++ b/offapi/com/sun/star/sdbc/BatchUpdateException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_BatchUpdateException_idl__
 #define __com_sun_star_sdbc_BatchUpdateException_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/CallableStatement.idl b/offapi/com/sun/star/sdbc/CallableStatement.idl
index c0e8a49c1144..a52fe89c870e 100644
--- a/offapi/com/sun/star/sdbc/CallableStatement.idl
+++ b/offapi/com/sun/star/sdbc/CallableStatement.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_CallableStatement_idl__
 #define __com_sun_star_sdbc_CallableStatement_idl__
 
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__
 #include <com/sun/star/sdbc/PreparedStatement.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/ChangeEvent.idl b/offapi/com/sun/star/sdbc/ChangeEvent.idl
index 563d722bc3ee..db970cd7c2e4 100644
--- a/offapi/com/sun/star/sdbc/ChangeEvent.idl
+++ b/offapi/com/sun/star/sdbc/ChangeEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_ChangeEvent_idl__
 #define __com_sun_star_sdbc_ChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 module com { module sun { module star { module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/Connection.idl b/offapi/com/sun/star/sdbc/Connection.idl
index d71e37e79f58..dcad58ef98a9 100644
--- a/offapi/com/sun/star/sdbc/Connection.idl
+++ b/offapi/com/sun/star/sdbc/Connection.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_Connection_idl__
 #define __com_sun_star_sdbc_Connection_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/ConnectionProperties.idl b/offapi/com/sun/star/sdbc/ConnectionProperties.idl
index 5d7a2a702441..b3ca65825e35 100644
--- a/offapi/com/sun/star/sdbc/ConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/ConnectionProperties.idl
@@ -37,7 +37,7 @@
     <member scope="com::sun::star::sdbc">XDriverManager::getConnectionWithInfo()</member>.
 
     <p>
-    The properties for a connection contain additonal information about how to connect to a database and
+    The properties for a connection contain additional information about how to connect to a database and
     how to control the behavior of the resulting connection should be.
 
     </p>
diff --git a/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl b/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl
index 338e799e498c..9eb7764fe8f4 100644
--- a/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_DBASEConnectionProperties_idl__
 #define __com_sun_star_sdbc_DBASEConnectionProperties_idl__
 
-#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__
 #include <com/sun/star/sdbc/FILEConnectionProperties.idl>
-#endif
 
 module com {  module sun {  module star {  module sdbc {
 
@@ -39,7 +37,7 @@ module com {  module sun {  module star {  module sdbc {
     <member scope="com::sun::star::sdbc">XDriverManager::getConnectionWithInfo()</member>.
 
     <p>
-    The properties for a connection contain additonal information about how to connect to a database and
+    The properties for a connection contain additional information about how to connect to a database and
     how to control the behavior of the resulting connection should be.
 
     </p>
diff --git a/offapi/com/sun/star/sdbc/DataTruncation.idl b/offapi/com/sun/star/sdbc/DataTruncation.idl
index e200867014d0..d717762ef4e8 100644
--- a/offapi/com/sun/star/sdbc/DataTruncation.idl
+++ b/offapi/com/sun/star/sdbc/DataTruncation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_DataTruncation_idl__
 #define __com_sun_star_sdbc_DataTruncation_idl__
 
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__
 #include <com/sun/star/sdbc/SQLWarning.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/DataType.idl b/offapi/com/sun/star/sdbc/DataType.idl
index 9d3bb20e5c7b..cc5c33cf028a 100644
--- a/offapi/com/sun/star/sdbc/DataType.idl
+++ b/offapi/com/sun/star/sdbc/DataType.idl
@@ -37,7 +37,7 @@
         The actual type constant values are equivalent to those in the X/Open CLI.
         </p>
         <p>
-        Precise information about the specfic types can be got from
+        Precise information about the specific types can be got from
         <member>XDatabaseMetaData::getTypeInfo()</member>
         .</p>
  */
diff --git a/offapi/com/sun/star/sdbc/DriverManager.idl b/offapi/com/sun/star/sdbc/DriverManager.idl
index 4324ea7da7d3..1107ee6775bf 100644
--- a/offapi/com/sun/star/sdbc/DriverManager.idl
+++ b/offapi/com/sun/star/sdbc/DriverManager.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_DriverManager_idl__
 #define __com_sun_star_sdbc_DriverManager_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl b/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
index 55bc9090bed3..9341524f20e9 100644
--- a/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__
 #define __com_sun_star_sdbc_FILEConnectionProperties_idl__
 
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__
 #include <com/sun/star/sdbc/ConnectionProperties.idl>
-#endif
 
 module com {  module sun {  module star {  module sdbc {
 
@@ -39,7 +37,7 @@ module com {  module sun {  module star {  module sdbc {
     <member scope="com::sun::star::sdbc">XDriverManager::getConnectionWithInfo()</member>.
 
     <p>
-    The properties for a connection contain additonal information about how to connect to a database and
+    The properties for a connection contain additional information about how to connect to a database and
     how to control the behavior of the resulting connection should be.
 
     </p>
diff --git a/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl b/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl
index 7af8aca4e6a1..8e36417bcfee 100644
--- a/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_FLATConnectionProperties_idl__
 #define __com_sun_star_sdbc_FLATConnectionProperties_idl__
 
-#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__
 #include <com/sun/star/sdbc/FILEConnectionProperties.idl>
-#endif
 
 module com {  module sun {  module star {  module sdbc {
 
@@ -39,7 +37,7 @@ module com {  module sun {  module star {  module sdbc {
     <member scope="com::sun::star::sdbc">XDriverManager::getConnectionWithInfo()</member>.
 
     <p>
-    The properties for a connection contain additonal information about how to connect to a database and
+    The properties for a connection contain additional information about how to connect to a database and
     how to control the behavior of the resulting connection should be.
 
     </p>
@@ -55,19 +53,19 @@ service FLATConnectionProperties
     */
     [optional, property] boolean HeaderLine;
 
-    /** A one character delimiter to seperate the fields.
+    /** A one character delimiter to separate the fields.
     */
     [optional, property] string FieldDelimiter;
 
-    /** A one character delimiter to seperate the strings.
+    /** A one character delimiter to separate the strings.
     */
     [optional, property] string StringDelimiter;
 
-    /** A one character delimiter to seperate the decimal.
+    /** A one character delimiter to separate the decimal.
     */
     [optional, property] string DecimalDelimiter;
 
-    /** A one character delimiter to seperate the thousands.
+    /** A one character delimiter to separate the thousands.
     */
     [optional, property] string ThousandDelimiter;
 
diff --git a/offapi/com/sun/star/sdbc/FetchDirection.idl b/offapi/com/sun/star/sdbc/FetchDirection.idl
index e171a2311d40..d4a99a4d6f4b 100644
--- a/offapi/com/sun/star/sdbc/FetchDirection.idl
+++ b/offapi/com/sun/star/sdbc/FetchDirection.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module sdbc {
 
 
-/** indicates in which direction a resultset should fetch next, just for
+/** indicates in which direction a result set should fetch next, just for
      optimization.
  */
 published constants FetchDirection
diff --git a/offapi/com/sun/star/sdbc/IndexType.idl b/offapi/com/sun/star/sdbc/IndexType.idl
index 2a3a00923ba5..70aa96e4e8aa 100644
--- a/offapi/com/sun/star/sdbc/IndexType.idl
+++ b/offapi/com/sun/star/sdbc/IndexType.idl
@@ -43,7 +43,7 @@ published constants IndexType
             <member scope="com::sun::star::sdbc">XDatabaseMetaData::getIndexInfo()</member>
             .
             <P>
-            Indentifies table statistics that are returned in conjunction
+            Identifies table statistics that are returned in conjunction
             with a table's index description.
             </P>
      */
diff --git a/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl b/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
index cb59fe15eac6..01f8cd751ac1 100644
--- a/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdbc_JDBCConnectionProperties_idl__
 #define __com_sun_star_sdbc_JDBCConnectionProperties_idl__
 
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__
 #include <com/sun/star/sdbc/ConnectionProperties.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 module com {  module sun {  module star {  module sdbc {
 
@@ -42,7 +38,7 @@ module com {  module sun {  module star {  module sdbc {
     <member scope="com::sun::star::sdbc">XDriverManager::getConnectionWithInfo()</member>.
 
     <p>
-    The properties for a connection contain additonal information about how to connect to a database and
+    The properties for a connection contain additional information about how to connect to a database and
     how to control the behavior of the resulting connection should be.
 
     </p>
@@ -54,7 +50,7 @@ service JDBCConnectionProperties
 {
     service com::sun::star::sdbc::ConnectionProperties;
 
-    /** which jdbc driver class should be loaded to create the connection.
+    /** which JDBC driver class should be loaded to create the connection.
 
         @see com::sun::star::sdbc::JDBCConnectionProperties::JavaDriverClassPath
     */
diff --git a/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl b/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl
index 19d6fb0fd6aa..0ba6cce52057 100644
--- a/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_ODBCConnectionProperties_idl__
 #define __com_sun_star_sdbc_ODBCConnectionProperties_idl__
 
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__
 #include <com/sun/star/sdbc/ConnectionProperties.idl>
-#endif
 
 module com {  module sun {  module star {  module sdbc {
 
@@ -39,7 +37,7 @@ module com {  module sun {  module star {  module sdbc {
     <member scope="com::sun::star::sdbc">XDriverManager::getConnectionWithInfo()</member>.
 
     <p>
-    The properties for a connection contain additonal information about how to connect to a database and
+    The properties for a connection contain additional information about how to connect to a database and
     how to control the behavior of the resulting connection should be.
 
     </p>
@@ -50,7 +48,7 @@ module com {  module sun {  module star {  module sdbc {
 service ODBCConnectionProperties
 {
     service com::sun::star::sdbc::ConnectionProperties;
-    /** should the parameter '?' in prepared statement be substituated with an distinct name
+    /** should the parameter "?" in prepared statement be substituted with an distinct name
     */
     [optional, property] boolean ParameterNameSubstitution;
 
diff --git a/offapi/com/sun/star/sdbc/PreparedStatement.idl b/offapi/com/sun/star/sdbc/PreparedStatement.idl
index 43bb4992fdda..fbd2c0156816 100644
--- a/offapi/com/sun/star/sdbc/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdbc/PreparedStatement.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbc_PreparedStatement_idl__
 #define __com_sun_star_sdbc_PreparedStatement_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_util_XCancellable_idl__
 #include <com/sun/star/util/XCancellable.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
@@ -105,7 +99,7 @@ published service PreparedStatement
     [optional] interface com::sun::star::lang::XComponent;
 
 
-    /** freeing all resources of a statement. A related resultset will be
+    /** freeing all resources of a statement. A related result set will be
              freed as well.
      */
     interface XCloseable;
@@ -113,7 +107,7 @@ published service PreparedStatement
     // gives access to the properties.
     interface com::sun::star::beans::XPropertySet;
 
-    /** could be used for cancelling the execution of SQL statements, if both
+    /** could be used for canceling the execution of SQL statements, if both
              the DBMS and the driver support aborting an SQL statement.
              The implementation is optional.
      */
@@ -209,7 +203,7 @@ published service PreparedStatement
              the database does not support positioned update/delete, this property is
              a noop. To insure that a cursor has the proper isolation level to support
              updates, the cursor's SELECT statement should be of the form
-             'select for update ...'. If the 'for update' phrase is omitted,
+             "select for update ...". If the "for update" phrase is omitted,
              positioned updates may fail.
              </p>
              <P>
diff --git a/offapi/com/sun/star/sdbc/ResultSet.idl b/offapi/com/sun/star/sdbc/ResultSet.idl
index 1c19621e7e17..33e7ac9de49b 100644
--- a/offapi/com/sun/star/sdbc/ResultSet.idl
+++ b/offapi/com/sun/star/sdbc/ResultSet.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbc_ResultSet_idl__
 #define __com_sun_star_sdbc_ResultSet_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_util_XCancellable_idl__
 #include <com/sun/star/util/XCancellable.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
@@ -60,7 +54,7 @@
     <p>
     A ResultSet maintains a cursor pointing to its current row of
     data. Initially the cursor is positioned before the first row.
-    The 'next' method moves the cursor to the next row.
+    The "next" method moves the cursor to the next row.
     </p>
     <p>
     The getXXX methods retrieve column values for the current
@@ -186,7 +180,7 @@ published service ResultSet
         the database doesn't support positioned update/delete, this property is
         a noop. To insure that a cursor has the proper isolation level to support
         updates, the cursor's SELECT statement should be of the form
-        'select for update ...'. If the 'for update' phrase is omitted,
+        "select for update ...". If the "for update" phrase is omitted,
         positioned updates may fail.
         </p>
         <p>
diff --git a/offapi/com/sun/star/sdbc/RowSet.idl b/offapi/com/sun/star/sdbc/RowSet.idl
index 5c79c7a2076b..468f8b5124c3 100644
--- a/offapi/com/sun/star/sdbc/RowSet.idl
+++ b/offapi/com/sun/star/sdbc/RowSet.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sdbc_RowSet_idl__
 #define __com_sun_star_sdbc_RowSet_idl__
 
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
 #include <com/sun/star/sdbc/ResultSet.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XColumnLocate_idl__
 #include <com/sun/star/sdbc/XColumnLocate.idl>
-#endif
 
  module com {  module sun {  module star {  module container {
  published interface XNameAccess;
@@ -61,7 +57,7 @@
     <p>
     On the one hand, a RowSet can be used as a short cut to retrieve the data of a DataSource.
     You don't have to establish a connection, create a Statement, and then create
-    a ResultSet. On the other hand, a rowset can be used to implement capabilties for
+    a ResultSet. On the other hand, a row set can be used to implement capabilities for
     a result set, which are not supported by a driver result set, like caching
     strategies or update capabilities.
     </p>
@@ -80,7 +76,7 @@ published service RowSet
     // used to set parameters.
     interface XParameters;
 
-    /** allows locating columns which's name is known only.
+    /** allows locating columns whose name is known only.
     */
     interface XColumnLocate;
 
diff --git a/offapi/com/sun/star/sdbc/SQLException.idl b/offapi/com/sun/star/sdbc/SQLException.idl
index 11d66fb3fd57..d1b931f6baa6 100644
--- a/offapi/com/sun/star/sdbc/SQLException.idl
+++ b/offapi/com/sun/star/sdbc/SQLException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_SQLException_idl__
 #define __com_sun_star_sdbc_SQLException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/SQLWarning.idl b/offapi/com/sun/star/sdbc/SQLWarning.idl
index 3be1a07cef87..c6d66fd7f781 100644
--- a/offapi/com/sun/star/sdbc/SQLWarning.idl
+++ b/offapi/com/sun/star/sdbc/SQLWarning.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_SQLWarning_idl__
 #define __com_sun_star_sdbc_SQLWarning_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/Statement.idl b/offapi/com/sun/star/sdbc/Statement.idl
index fc66d2cdac32..06aeb47a9a96 100644
--- a/offapi/com/sun/star/sdbc/Statement.idl
+++ b/offapi/com/sun/star/sdbc/Statement.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbc_Statement_idl__
 #define __com_sun_star_sdbc_Statement_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_util_XCancellable_idl__
 #include <com/sun/star/util/XCancellable.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
@@ -68,7 +62,7 @@ published service Statement
     [optional] interface com::sun::star::lang::XComponent;
 
 
-    /** freeing all resources of a statement. A related resultset will be
+    /** freeing all resources of a statement. A related result set will be
              freed as well.
      */
     interface XCloseable;
@@ -76,7 +70,7 @@ published service Statement
     // gives access to the properties.
     interface com::sun::star::beans::XPropertySet;
 
-    /** could be used for cancelling the execution of SQL statements if both
+    /** could be used for canceling the execution of SQL statements if both
              the DBMS and the driver support aborting an SQL statement.
              The implementation is optional.
      */
@@ -163,7 +157,7 @@ published service Statement
         the database does not support positioned update/delete, this property is
         a noop. To insure that a cursor has the proper isolation level to support
         updates, the cursor's SELECT statement should be of the form
-        'select for update ...'. If the 'for update' phrase is omitted,
+        "select for update ...". If the "for update" phrase is omitted,
         positioned updates may fail.
         </p>
         <p>
diff --git a/offapi/com/sun/star/sdbc/XArray.idl b/offapi/com/sun/star/sdbc/XArray.idl
index c9cb8656370d..d35250c28ae1 100644
--- a/offapi/com/sun/star/sdbc/XArray.idl
+++ b/offapi/com/sun/star/sdbc/XArray.idl
@@ -27,17 +27,13 @@
 #ifndef __com_sun_star_sdbc_XArray_idl__
 #define __com_sun_star_sdbc_XArray_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
  module com {  module sun {  module star {  module container {
  published interface XNameAccess;
 };};};};
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XBatchExecution.idl b/offapi/com/sun/star/sdbc/XBatchExecution.idl
index 98bcc10514be..03bd0fe04dc6 100644
--- a/offapi/com/sun/star/sdbc/XBatchExecution.idl
+++ b/offapi/com/sun/star/sdbc/XBatchExecution.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XBatchExecution_idl__
 #define __com_sun_star_sdbc_XBatchExecution_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
@@ -45,7 +41,7 @@
 published interface XBatchExecution: com::sun::star::uno::XInterface
 {
 
-    /** adds a SQL command to the current batch of commmands for the statement
+    /** adds a SQL command to the current batch of commands for the statement
         object.
         @param sql
             the SQL statement which should be appended to the batch.
diff --git a/offapi/com/sun/star/sdbc/XBlob.idl b/offapi/com/sun/star/sdbc/XBlob.idl
index ef42045662b5..298db245ac49 100644
--- a/offapi/com/sun/star/sdbc/XBlob.idl
+++ b/offapi/com/sun/star/sdbc/XBlob.idl
@@ -27,17 +27,13 @@
 #ifndef __com_sun_star_sdbc_XBlob_idl__
 #define __com_sun_star_sdbc_XBlob_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
  module com {  module sun {  module star {  module io {
  published interface XInputStream;
 };};};};
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XClob.idl b/offapi/com/sun/star/sdbc/XClob.idl
index 8eec6d9e1645..c68ffe960825 100644
--- a/offapi/com/sun/star/sdbc/XClob.idl
+++ b/offapi/com/sun/star/sdbc/XClob.idl
@@ -27,17 +27,13 @@
 #ifndef __com_sun_star_sdbc_XClob_idl__
 #define __com_sun_star_sdbc_XClob_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
  module com {  module sun {  module star {  module io {
  published interface XInputStream;
 };};};};
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XCloseable.idl b/offapi/com/sun/star/sdbc/XCloseable.idl
index 13f92f238f82..20986e9b8bc2 100644
--- a/offapi/com/sun/star/sdbc/XCloseable.idl
+++ b/offapi/com/sun/star/sdbc/XCloseable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XCloseable_idl__
 #define __com_sun_star_sdbc_XCloseable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XColumnLocate.idl b/offapi/com/sun/star/sdbc/XColumnLocate.idl
index ec0e03624540..216ff0873e06 100644
--- a/offapi/com/sun/star/sdbc/XColumnLocate.idl
+++ b/offapi/com/sun/star/sdbc/XColumnLocate.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XColumnLocate_idl__
 #define __com_sun_star_sdbc_XColumnLocate_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
@@ -56,7 +52,7 @@
 published interface XColumnLocate: com::sun::star::uno::XInterface
 {
 
-    /** maps the given Resultset column name to its ResultSet column index.
+    /** maps the given ResultSet column name to its ResultSet column index.
         @param columnName
             the name of the column
         @returns
diff --git a/offapi/com/sun/star/sdbc/XConnection.idl b/offapi/com/sun/star/sdbc/XConnection.idl
index 37af3c7e43f9..9702f6e74c6f 100644
--- a/offapi/com/sun/star/sdbc/XConnection.idl
+++ b/offapi/com/sun/star/sdbc/XConnection.idl
@@ -27,21 +27,15 @@
 #ifndef __com_sun_star_sdbc_XConnection_idl__
 #define __com_sun_star_sdbc_XConnection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
  module com {  module sun {  module star {  module container {
  published interface XNameAccess;
 };};};};
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_XCloseable_idl__
 #include <com/sun/star/sdbc/XCloseable.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
@@ -137,7 +131,7 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
         </p>
 
         @param sql
-            a SQL statement that may contain one or more '?' IN parameter placeholders
+            a SQL statement that may contain one or more "?" IN parameter placeholders
         @returns
             a new PreparedStatement object containing the pre-compiled statement
         @throws SQLException
@@ -174,7 +168,7 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
         </p>
 
         @param sql
-            a SQL statement that may contain one or more '?' IN parameter placeholders
+            a SQL statement that may contain one or more "?" IN parameter placeholders
         @returns
             a new PreparedStatement object containing the pre-compiled statement
         @throws SQLException
@@ -189,7 +183,7 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
         native form of the statement that the driver would have sent.
 
         @param sql
-            a SQL statement that may contain one or more '?' parameter placeholders
+            a SQL statement that may contain one or more "?" parameter placeholders
         @returns
             the native form of this statement
         @throws SQLException
diff --git a/offapi/com/sun/star/sdbc/XDataSource.idl b/offapi/com/sun/star/sdbc/XDataSource.idl
index 2c2f4f13323e..e68c7d61ca41 100644
--- a/offapi/com/sun/star/sdbc/XDataSource.idl
+++ b/offapi/com/sun/star/sdbc/XDataSource.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XDataSource_idl__
 #define __com_sun_star_sdbc_XDataSource_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
index 085b2ed966e4..20dc8b379cfe 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XDatabaseMetaData_idl__
 #define __com_sun_star_sdbc_XDatabaseMetaData_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 
  module com {  module sun {  module star {  module sdbc {
@@ -58,7 +54,7 @@
     <type scope="com::sun::star::sdbc">SQLException</type>
     .
     That a value of <type scope="com::sun::star::sdbc">XResultSet</type> is <NULL/>
-    can be chaked with the method <member scope="com::sun::star::sdbc">XResultSet::wasNull()</member>.
+    can be checked with the method <member scope="com::sun::star::sdbc">XResultSet::wasNull()</member>.
     In the text only "(may be <NULL/>)" is mentioned for this case.
     </p>
     <p>Some of these methods take arguments that are String patterns. These
@@ -207,7 +203,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
     boolean usesLocalFilePerTable() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    /** use the database 'mixed case unquoted SQL identifiers' case sensitive.
+    /** use the database "mixed case unquoted SQL identifiers" case sensitive.
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -349,15 +345,15 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     /** gets the string that can be used to escape wildcard characters.
-        This is the string that can be used to escape '_' or '%' in
+        This is the string that can be used to escape "_" or "%" in
         the string pattern style catalog search parameters.
 
 
         <p>
-        The '_' character represents any single character.
+        The "_" character represents any single character.
         </p>
         <p>
-        The '%' character represents any sequence of zero or
+        The "%" character represents any sequence of zero or
         more characters.
         </p>
         @returns
@@ -829,7 +825,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
     boolean supportsSubqueriesInComparisons() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    /** Are subqueries in 'exists' expressions supported?
+    /** Are subqueries in "exists" expressions supported?
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -838,7 +834,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
     boolean supportsSubqueriesInExists() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    /** Are subqueries in 'in' statements supported?
+    /** Are subqueries in "in" statements supported?
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -1514,7 +1510,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         <ul>
         <li> NO_NULLS - might not allow NULL values
         </li>
-        <li> NULABLE - definitely allows NULL values
+        <li> NULLABLE - definitely allows NULL values
         </li>
         <li> NULLABLE_UNKNOWN - nullability unknown
         </li>
@@ -1571,7 +1567,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         Only privileges matching the column name criteria are
         returned. They are ordered by COLUMN_NAME and PRIVILEGE.
         </p>
-        <p>Each privilige description has the following columns:
+        <p>Each privilege description has the following columns:
         </p>
         <ol>
         <li>
@@ -1587,7 +1583,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         <b>COLUMN_NAME</b> string => column name
         </li>
         <li>
-        <b>GRANTOR</b> => grantor of access (may be <NULL/>)
+        <b>GRANTOR</b> => granter of access (may be <NULL/>)
         </li>
         <li>
         <b>GRANTEE</b> string => grantee of access
@@ -1621,7 +1617,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
     /** gets a description of the access rights for each table available
         in a catalog. Note that a table privilege applies to one or
         more columns in the table. It would be wrong to assume that
-        this priviledge applies to all columns (this may be <TRUE/> for
+        this privilege applies to all columns (this may be <TRUE/> for
         some systems but is not <TRUE/> for all.)
 
 
@@ -1629,7 +1625,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         criteria are returned. They are ordered by TABLE_SCHEM,
         TABLE_NAME, and PRIVILEGE.
         </p>
-        <p>Each privilige description has the following columns:
+        <p>Each privilege description has the following columns:
         </p>
         <ol>
         <li>
@@ -1642,7 +1638,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         <b>TABLE_NAME</b> string => table name
         </li>
         <li>
-        <b>GRANTOR</b> => grantor of access (may be <NULL/>)
+        <b>GRANTOR</b> => granter of access (may be <NULL/>)
         </li>
         <li>
         <b>GRANTEE</b> string => grantee of access
@@ -2323,7 +2319,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         <b>TYPE</b> short => index type:
         <ul>
         <li> 0 - this identifies table statistics that are
-        returned in conjuction with a table's index descriptions
+        returned in conjunction with a table's index descriptions
         </li>
         <li> CLUSTERED - this is a clustered index
         </li>
@@ -2384,7 +2380,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
     /** Does the database support the given result set type?
         @param setType
             defined in
-            <type scop="com::sun::star::sdbc">ResultSetType</type>
+            <type scope="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -2397,10 +2393,10 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         with the given result set type?
         @param setType
             defined in
-            <type scop="com::sun::star::sdbc">ResultSetType</type>
+            <type scope="com::sun::star::sdbc">ResultSetType</type>
         @param concurrency
             defined in
-            <type scop="com::sun::star::sdbc">ResultSetConcurrency</type>
+            <type scope="com::sun::star::sdbc">ResultSetConcurrency</type>
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -2414,7 +2410,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
     /** indicates whether a result set's own updates are visible.
         @param setType
             defined in
-            <type scop="com::sun::star::sdbc">ResultSetType</type>
+            <type scope="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -2426,7 +2422,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
     /** indicates whether a result set's own deletes are visible.
         @param setType
             defined in
-            <type scop="com::sun::star::sdbc">ResultSetType</type>
+            <type scope="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -2438,7 +2434,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
     /** indicates whether a result set's own inserts are visible.
         @param setType
             defined in
-            <type scop="com::sun::star::sdbc">ResultSetType</type>
+            <type scope="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -2450,7 +2446,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
     /** indicates whether updates made by others are visible.
         @param setType
             defined in
-            <type scop="com::sun::star::sdbc">ResultSetType</type>
+            <type scope="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -2462,7 +2458,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
     /** indicates whether deletes made by others are visible.
         @param setType
             defined in
-            <type scop="com::sun::star::sdbc">ResultSetType</type>
+            <type scope="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -2474,7 +2470,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
     /** indicates whether inserts made by others are visible.
         @param setType
             defined in
-            <type scop="com::sun::star::sdbc">ResultSetType</type>
+            <type scope="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -2488,7 +2484,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         <code>XResultSet.rowUpdated</code>.
         @param setType
             defined in
-            <type scop="com::sun::star::sdbc">ResultSetType</type>
+            <type scope="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -2504,7 +2500,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         returns <FALSE/>, then deleted rows are removed from the result set.
         @param setType
             defined in
-            <type scop="com::sun::star::sdbc">ResultSetType</type>
+            <type scope="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
         @throws SQLException
@@ -2518,7 +2514,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         <member scope="com::sun::star::sdbc">XResultSet::rowInserted().</member>
         @param setType
             defined in
-            <type scop="com::sun::star::sdbc">ResultSetType</type>
+            <type scope="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
         @throws SQLException
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl
index f6a5040d8415..c2ed6e31bfd1 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sdbc_XDatabaseMetaData2_idl__
 #define __com_sun_star_sdbc_XDatabaseMetaData2_idl__
 
-#ifndef __com_sun_star_sdbc_XDatabaseMetaData_idl__
 #include <com/sun/star/sdbc/XDatabaseMetaData.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdbc/XDriver.idl b/offapi/com/sun/star/sdbc/XDriver.idl
index 623c232ceb2b..7329f15dbfa5 100644
--- a/offapi/com/sun/star/sdbc/XDriver.idl
+++ b/offapi/com/sun/star/sdbc/XDriver.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdbc_XDriver_idl__
 #define __com_sun_star_sdbc_XDriver_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_DriverPropertyInfo_idl__
 #include <com/sun/star/sdbc/DriverPropertyInfo.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XDriverAccess.idl b/offapi/com/sun/star/sdbc/XDriverAccess.idl
index 112921f04e15..820860bbe1cd 100644
--- a/offapi/com/sun/star/sdbc/XDriverAccess.idl
+++ b/offapi/com/sun/star/sdbc/XDriverAccess.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_XDriverAccess_idl__
 #define __com_sun_star_sdbc_XDriverAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XDriverManager.idl b/offapi/com/sun/star/sdbc/XDriverManager.idl
index 896d8a59deea..176cd0120aef 100644
--- a/offapi/com/sun/star/sdbc/XDriverManager.idl
+++ b/offapi/com/sun/star/sdbc/XDriverManager.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbc_XDriverManager_idl__
 #define __com_sun_star_sdbc_XDriverManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl b/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl
index edc6e4ab7c81..a910d7ec66af 100644
--- a/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl
+++ b/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XGeneratedResultSet_idl__
 #define __com_sun_star_sdbc_XGeneratedResultSet_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XIsolatedConnection.idl b/offapi/com/sun/star/sdbc/XIsolatedConnection.idl
index 5f34df8e84ce..bb06e9deaf85 100644
--- a/offapi/com/sun/star/sdbc/XIsolatedConnection.idl
+++ b/offapi/com/sun/star/sdbc/XIsolatedConnection.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XIsolatedConnection_idl__
 #define __com_sun_star_sdbc_XIsolatedConnection_idl__
 
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XMultipleResults.idl b/offapi/com/sun/star/sdbc/XMultipleResults.idl
index 9bda09c36145..21d7b08e1d10 100644
--- a/offapi/com/sun/star/sdbc/XMultipleResults.idl
+++ b/offapi/com/sun/star/sdbc/XMultipleResults.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XMultipleResults_idl__
 #define __com_sun_star_sdbc_XMultipleResults_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XOutParameters.idl b/offapi/com/sun/star/sdbc/XOutParameters.idl
index a9047e958633..efe184de0bf6 100644
--- a/offapi/com/sun/star/sdbc/XOutParameters.idl
+++ b/offapi/com/sun/star/sdbc/XOutParameters.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XOutParameters_idl__
 #define __com_sun_star_sdbc_XOutParameters_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XParameters.idl b/offapi/com/sun/star/sdbc/XParameters.idl
index 173e71789c5c..e768cfba526d 100644
--- a/offapi/com/sun/star/sdbc/XParameters.idl
+++ b/offapi/com/sun/star/sdbc/XParameters.idl
@@ -27,29 +27,19 @@
 #ifndef __com_sun_star_sdbc_XParameters_idl__
 #define __com_sun_star_sdbc_XParameters_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_Date_idl__
 #include <com/sun/star/util/Date.idl>
-#endif
 
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
-#ifndef __com_sun_star_util_Time_idl__
 #include <com/sun/star/util/Time.idl>
-#endif
 
  module com {  module sun {  module star {  module io {
  published interface XInputStream;
 };};};};
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XPooledConnection.idl b/offapi/com/sun/star/sdbc/XPooledConnection.idl
index 5b7b2389676a..9b75ca3265be 100644
--- a/offapi/com/sun/star/sdbc/XPooledConnection.idl
+++ b/offapi/com/sun/star/sdbc/XPooledConnection.idl
@@ -28,17 +28,11 @@
 #ifndef __com_sun_star_sdbc_XPooledConnection_idl__
 #define __com_sun_star_sdbc_XPooledConnection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl b/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
index 7b610ce10f56..05bbd2ef9e64 100644
--- a/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
+++ b/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XPreparedBatchExecution_idl__
 #define __com_sun_star_sdbc_XPreparedBatchExecution_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XPreparedStatement.idl b/offapi/com/sun/star/sdbc/XPreparedStatement.idl
index f43ca9b8919c..91663dceb6ac 100644
--- a/offapi/com/sun/star/sdbc/XPreparedStatement.idl
+++ b/offapi/com/sun/star/sdbc/XPreparedStatement.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XPreparedStatement_idl__
 #define __com_sun_star_sdbc_XPreparedStatement_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
@@ -41,7 +37,7 @@
  published interface XResultSet;
 
 
-/** provides the possibilty of executing a precompiled SQL statement.
+/** provides the possibility of executing a precompiled SQL statement.
 
 
     <p>
diff --git a/offapi/com/sun/star/sdbc/XRef.idl b/offapi/com/sun/star/sdbc/XRef.idl
index e14e30db6e3f..51724d4d8f92 100644
--- a/offapi/com/sun/star/sdbc/XRef.idl
+++ b/offapi/com/sun/star/sdbc/XRef.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XRef_idl__
 #define __com_sun_star_sdbc_XRef_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XResultSet.idl b/offapi/com/sun/star/sdbc/XResultSet.idl
index cf908ca0760b..ab474c933f01 100644
--- a/offapi/com/sun/star/sdbc/XResultSet.idl
+++ b/offapi/com/sun/star/sdbc/XResultSet.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XResultSet_idl__
 #define __com_sun_star_sdbc_XResultSet_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
@@ -50,7 +46,7 @@
     <p>
     A ResultSet maintains a cursor pointing to its current row of
     data. Initially the cursor is positioned before the first row.
-    The 'next' method moves the cursor to the next row.
+    The "next" method moves the cursor to the next row.
     </p>
  */
 published interface XResultSet: com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/sdbc/XResultSetMetaData.idl b/offapi/com/sun/star/sdbc/XResultSetMetaData.idl
index c0f7ff78364f..eb100fdcf065 100644
--- a/offapi/com/sun/star/sdbc/XResultSetMetaData.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetMetaData.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XResultSetMetaData_idl__
 #define __com_sun_star_sdbc_XResultSetMetaData_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl b/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
index 55af74460126..8bac6ea0c5d0 100644
--- a/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__
 #define __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XResultSetUpdate.idl b/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
index ea3075bf622b..fed315c9d1a7 100644
--- a/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
@@ -27,18 +27,14 @@
 #ifndef __com_sun_star_sdbc_XResultSetUpdate_idl__
 #define __com_sun_star_sdbc_XResultSetUpdate_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
 
-/** provides the possiblity to write changes made on a result set back to
+/** provides the possibility to write changes made on a result set back to
     database.
  */
 published interface XResultSetUpdate: com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/sdbc/XRow.idl b/offapi/com/sun/star/sdbc/XRow.idl
index 72ab3fba1885..f367dba54c74 100644
--- a/offapi/com/sun/star/sdbc/XRow.idl
+++ b/offapi/com/sun/star/sdbc/XRow.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdbc_XRow_idl__
 #define __com_sun_star_sdbc_XRow_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_Date_idl__
 #include <com/sun/star/util/Date.idl>
-#endif
 
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
-#ifndef __com_sun_star_util_Time_idl__
 #include <com/sun/star/util/Time.idl>
-#endif
 
  module com {  module sun {  module star {  module io {
  published interface XInputStream;
@@ -51,9 +43,7 @@
  published interface XNameAccess;
 };};};};
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XRowSet.idl b/offapi/com/sun/star/sdbc/XRowSet.idl
index ebdc0022f5ad..14ad392bebc8 100644
--- a/offapi/com/sun/star/sdbc/XRowSet.idl
+++ b/offapi/com/sun/star/sdbc/XRowSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbc_XRowSet_idl__
 #define __com_sun_star_sdbc_XRowSet_idl__
 
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XRowSetListener.idl b/offapi/com/sun/star/sdbc/XRowSetListener.idl
index d4aba4ab71ac..1af58f47b00d 100644
--- a/offapi/com/sun/star/sdbc/XRowSetListener.idl
+++ b/offapi/com/sun/star/sdbc/XRowSetListener.idl
@@ -27,20 +27,18 @@
 #ifndef __com_sun_star_sdbc_XRowSetListener_idl__
 #define __com_sun_star_sdbc_XRowSetListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
 
 /** is used for receiving "cursorMoved", "rowChanged", and "rowSetChanged" events
-    posted by, for example, a rowset.
+    posted by, for example, a row set.
  */
 published interface XRowSetListener: com::sun::star::lang::XEventListener
 {
 
-    /** is called when a rowset's cursor is moved.
+    /** is called when a row set's cursor is moved.
         @param event
             contains information about the event
      */
diff --git a/offapi/com/sun/star/sdbc/XRowUpdate.idl b/offapi/com/sun/star/sdbc/XRowUpdate.idl
index e61286e11605..b28a6b4c7b1a 100644
--- a/offapi/com/sun/star/sdbc/XRowUpdate.idl
+++ b/offapi/com/sun/star/sdbc/XRowUpdate.idl
@@ -27,29 +27,19 @@
 #ifndef __com_sun_star_sdbc_XRowUpdate_idl__
 #define __com_sun_star_sdbc_XRowUpdate_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_Date_idl__
 #include <com/sun/star/util/Date.idl>
-#endif
 
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
-#ifndef __com_sun_star_util_Time_idl__
 #include <com/sun/star/util/Time.idl>
-#endif
 
  module com {  module sun {  module star {  module io {
  published interface XInputStream;
 };};};};
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XSQLData.idl b/offapi/com/sun/star/sdbc/XSQLData.idl
index f26a09e283fd..c7421b8dbd79 100644
--- a/offapi/com/sun/star/sdbc/XSQLData.idl
+++ b/offapi/com/sun/star/sdbc/XSQLData.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XSQLData_idl__
 #define __com_sun_star_sdbc_XSQLData_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XSQLInput.idl b/offapi/com/sun/star/sdbc/XSQLInput.idl
index 4ae68b82aa6d..02159d875586 100644
--- a/offapi/com/sun/star/sdbc/XSQLInput.idl
+++ b/offapi/com/sun/star/sdbc/XSQLInput.idl
@@ -27,29 +27,19 @@
 #ifndef __com_sun_star_sdbc_XSQLInput_idl__
 #define __com_sun_star_sdbc_XSQLInput_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_Date_idl__
 #include <com/sun/star/util/Date.idl>
-#endif
 
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
-#ifndef __com_sun_star_util_Time_idl__
 #include <com/sun/star/util/Time.idl>
-#endif
 
  module com {  module sun {  module star {  module io {
  published interface XInputStream;
 };};};};
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
@@ -208,7 +198,7 @@ published interface XSQLInput: com::sun::star::uno::XInterface
     com::sun::star::io::XInputStream readBinaryStream() raises (SQLException);
     //-------------------------------------------------------------------------
 
-    /** reads the next attribute in the stream as a unicode string.
+    /** reads the next attribute in the stream as a Unicode string.
         @returns
             the attribute; if the value is SQL NULL, return null.
         @throws SQLException
diff --git a/offapi/com/sun/star/sdbc/XSQLOutput.idl b/offapi/com/sun/star/sdbc/XSQLOutput.idl
index e383dbbfe0b4..9c329abcd96f 100644
--- a/offapi/com/sun/star/sdbc/XSQLOutput.idl
+++ b/offapi/com/sun/star/sdbc/XSQLOutput.idl
@@ -27,29 +27,19 @@
 #ifndef __com_sun_star_sdbc_XSQLOutput_idl__
 #define __com_sun_star_sdbc_XSQLOutput_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_Date_idl__
 #include <com/sun/star/util/Date.idl>
-#endif
 
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
-#ifndef __com_sun_star_util_Time_idl__
 #include <com/sun/star/util/Time.idl>
-#endif
 
  module com {  module sun {  module star {  module io {
  published interface XInputStream;
 };};};};
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
@@ -211,7 +201,7 @@ published interface XSQLOutput: com::sun::star::uno::XInterface
         raises (SQLException);
       //-------------------------------------------------------------------------
 
-    /** writes the next attribute to the stream as a stream of unicode string.
+    /** writes the next attribute to the stream as a stream of Unicode string.
         @param x
             the value to pass to the database.
         @throws SQLException
diff --git a/offapi/com/sun/star/sdbc/XStatement.idl b/offapi/com/sun/star/sdbc/XStatement.idl
index c07288c00c85..3bd87f2782a3 100644
--- a/offapi/com/sun/star/sdbc/XStatement.idl
+++ b/offapi/com/sun/star/sdbc/XStatement.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XStatement_idl__
 #define __com_sun_star_sdbc_XStatement_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XStruct.idl b/offapi/com/sun/star/sdbc/XStruct.idl
index a31535decf46..7a3cebb9222f 100644
--- a/offapi/com/sun/star/sdbc/XStruct.idl
+++ b/offapi/com/sun/star/sdbc/XStruct.idl
@@ -27,17 +27,13 @@
 #ifndef __com_sun_star_sdbc_XStruct_idl__
 #define __com_sun_star_sdbc_XStruct_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
  module com {  module sun {  module star {  module container {
  published interface XNameAccess;
 };};};};
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbc/XWarningsSupplier.idl b/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
index c19f977a8273..3f59f3523c9e 100644
--- a/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
+++ b/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbc_XWarningsSupplier_idl__
 #define __com_sun_star_sdbc_XWarningsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__
 #include <com/sun/star/sdbc/SQLWarning.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
 
diff --git a/offapi/com/sun/star/sdbcx/Column.idl b/offapi/com/sun/star/sdbcx/Column.idl
index fd2fa91c6e3e..56a69e251127 100644
--- a/offapi/com/sun/star/sdbcx/Column.idl
+++ b/offapi/com/sun/star/sdbcx/Column.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Column_idl__
 #define __com_sun_star_sdbcx_Column_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl b/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl
index 03d1b6c81204..73e97b78b765 100644
--- a/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_ColumnDescriptor_idl__
 #define __com_sun_star_sdbcx_ColumnDescriptor_idl__
 
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
 #include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
@@ -95,7 +93,7 @@ published service ColumnDescriptor
      */
     [optional, property] string DefaultValue;
 
-    /** specifies how to create an autoincrement column.
+    /** specifies how to create an auto-increment column.
      */
     [optional, property] string AutoIncrementCreation;
 };
diff --git a/offapi/com/sun/star/sdbcx/CompareBookmark.idl b/offapi/com/sun/star/sdbcx/CompareBookmark.idl
index 383f3b45554d..4d949609394c 100644
--- a/offapi/com/sun/star/sdbcx/CompareBookmark.idl
+++ b/offapi/com/sun/star/sdbcx/CompareBookmark.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module sdbcx {
 
 
-/** describes the result of a comparision of two bookmarks.
+/** describes the result of a comparison of two bookmarks.
  */
 published constants CompareBookmark
 {
diff --git a/offapi/com/sun/star/sdbcx/DatabaseDefinition.idl b/offapi/com/sun/star/sdbcx/DatabaseDefinition.idl
index 7ba296809655..b7035ab3b327 100644
--- a/offapi/com/sun/star/sdbcx/DatabaseDefinition.idl
+++ b/offapi/com/sun/star/sdbcx/DatabaseDefinition.idl
@@ -42,7 +42,7 @@
     <p>
     It may be implemented by a database driver provider, to encapsulate the
     complexity of data definition, and to give a common way for data definition as
-    the DDL of most DBMS's differs.
+    the DDL of most DBMS differs.
     </p>
     <p>
     At least, the access to the tables of a database should be implemented.
diff --git a/offapi/com/sun/star/sdbcx/Descriptor.idl b/offapi/com/sun/star/sdbcx/Descriptor.idl
index 0dba8ade4e3c..b990be127baa 100644
--- a/offapi/com/sun/star/sdbcx/Descriptor.idl
+++ b/offapi/com/sun/star/sdbcx/Descriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Descriptor_idl__
 #define __com_sun_star_sdbcx_Descriptor_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
@@ -40,10 +38,10 @@
     A descriptor is commonly created by the container of a specific object, such as, tables or views.
     After the creation of the descriptor the properties have to be filled.
     Afterwards, you append the descriptor to the container and the container creates a new object based
-    on the informations of the descriptor. The descriptor can be used to create serveral objects.
+    on the informations of the descriptor. The descriptor can be used to create several objects.
     </p>
     <p>
-    A descriptor containes at least the informations of the name of an object.
+    A descriptor contains at least the informations of the name of an object.
     </p>
     @see com::sun::star::sdbcx::XAppend
  */
diff --git a/offapi/com/sun/star/sdbcx/Driver.idl b/offapi/com/sun/star/sdbcx/Driver.idl
index 0388a4f3e063..a7e0ac679ec7 100644
--- a/offapi/com/sun/star/sdbcx/Driver.idl
+++ b/offapi/com/sun/star/sdbcx/Driver.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Driver_idl__
 #define __com_sun_star_sdbcx_Driver_idl__
 
-#ifndef __com_sun_star_sdbc_Driver_idl__
 #include <com/sun/star/sdbc/Driver.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/Group.idl b/offapi/com/sun/star/sdbcx/Group.idl
index 51e528d16837..208c8fd82781 100644
--- a/offapi/com/sun/star/sdbcx/Group.idl
+++ b/offapi/com/sun/star/sdbcx/Group.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Group_idl__
 #define __com_sun_star_sdbcx_Group_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/GroupDescriptor.idl b/offapi/com/sun/star/sdbcx/GroupDescriptor.idl
index 1b5386db3e5f..8400f4fcae8f 100644
--- a/offapi/com/sun/star/sdbcx/GroupDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/GroupDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_GroupDescriptor_idl__
 #define __com_sun_star_sdbcx_GroupDescriptor_idl__
 
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
 #include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
  module com {  module sun {  module star {  module sdbcx {
 
 /** is used to create a new group in a database.
diff --git a/offapi/com/sun/star/sdbcx/Index.idl b/offapi/com/sun/star/sdbcx/Index.idl
index 3fab8da51b63..e628915e3f12 100644
--- a/offapi/com/sun/star/sdbcx/Index.idl
+++ b/offapi/com/sun/star/sdbcx/Index.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Index_idl__
 #define __com_sun_star_sdbcx_Index_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/IndexColumn.idl b/offapi/com/sun/star/sdbcx/IndexColumn.idl
index 4aba576e4b38..dba84f6e0972 100644
--- a/offapi/com/sun/star/sdbcx/IndexColumn.idl
+++ b/offapi/com/sun/star/sdbcx/IndexColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_IndexColumn_idl__
 #define __com_sun_star_sdbcx_IndexColumn_idl__
 
-#ifndef __com_sun_star_sdbcx_Column_idl__
 #include <com/sun/star/sdbcx/Column.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl b/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl
index 7c8fb976b984..adf0df972ff5 100644
--- a/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_IndexColumnDescriptor_idl__
 #define __com_sun_star_sdbcx_IndexColumnDescriptor_idl__
 
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
 #include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/IndexDescriptor.idl b/offapi/com/sun/star/sdbcx/IndexDescriptor.idl
index 4d7564c54abc..312e804ca1ac 100644
--- a/offapi/com/sun/star/sdbcx/IndexDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/IndexDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_IndexDescriptor_idl__
 #define __com_sun_star_sdbcx_IndexDescriptor_idl__
 
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
 #include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/Key.idl b/offapi/com/sun/star/sdbcx/Key.idl
index f28a05933639..3d403edc1ad4 100644
--- a/offapi/com/sun/star/sdbcx/Key.idl
+++ b/offapi/com/sun/star/sdbcx/Key.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Key_idl__
 #define __com_sun_star_sdbcx_Key_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/KeyColumn.idl b/offapi/com/sun/star/sdbcx/KeyColumn.idl
index f62c3f571206..b7dfda32af04 100644
--- a/offapi/com/sun/star/sdbcx/KeyColumn.idl
+++ b/offapi/com/sun/star/sdbcx/KeyColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_KeyColumn_idl__
 #define __com_sun_star_sdbcx_KeyColumn_idl__
 
-#ifndef __com_sun_star_sdbcx_Column_idl__
 #include <com/sun/star/sdbcx/Column.idl>
-#endif
 
 module com { module sun { module star { module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl b/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl
index 4ae8ce69a27f..657a3c2190f0 100644
--- a/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_KeyColumnDescriptor_idl__
 #define __com_sun_star_sdbcx_KeyColumnDescriptor_idl__
 
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
 #include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/KeyDescriptor.idl b/offapi/com/sun/star/sdbcx/KeyDescriptor.idl
index 21386156af08..8a143416cac4 100644
--- a/offapi/com/sun/star/sdbcx/KeyDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/KeyDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_KeyDescriptor_idl__
 #define __com_sun_star_sdbcx_KeyDescriptor_idl__
 
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
 #include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
 
 module com { module sun { module star { module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/PreparedStatement.idl b/offapi/com/sun/star/sdbcx/PreparedStatement.idl
index 84458026e486..0348dd12db0f 100644
--- a/offapi/com/sun/star/sdbcx/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdbcx/PreparedStatement.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_PreparedStatement_idl__
 #define __com_sun_star_sdbcx_PreparedStatement_idl__
 
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__
 #include <com/sun/star/sdbc/PreparedStatement.idl>
-#endif
 
 module com { module sun { module star { module sdbcx {
 
@@ -44,7 +42,7 @@ published service PreparedStatement
 {
     service com::sun::star::sdbc::PreparedStatement;
     /**
-     returns if a resultset should allow the navigation with bookmarks
+     returns if a result set should allow the navigation with bookmarks
      or not. The default is
      <FALSE/>
      .
diff --git a/offapi/com/sun/star/sdbcx/Privilege.idl b/offapi/com/sun/star/sdbcx/Privilege.idl
index f8cb811223a7..ef6da03a1540 100644
--- a/offapi/com/sun/star/sdbcx/Privilege.idl
+++ b/offapi/com/sun/star/sdbcx/Privilege.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module sdbcx {
 
 
-/** defines a list of flags (bitmaps) which determines the accessrights of a
+/** defines a list of flags (bitmaps) which determines the access rights of a
      user or a user group. This list may grow in the future.
  */
 published constants Privilege
diff --git a/offapi/com/sun/star/sdbcx/PrivilegeObject.idl b/offapi/com/sun/star/sdbcx/PrivilegeObject.idl
index d627f362f21a..9f14cc55d3e5 100644
--- a/offapi/com/sun/star/sdbcx/PrivilegeObject.idl
+++ b/offapi/com/sun/star/sdbcx/PrivilegeObject.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module sdbcx {
 
 
-/** defines the list of objects for which a user may have accessrights or not.
+/** defines the list of objects for which a user may have access rights or not.
         This list may grow in the future.
  */
 published constants PrivilegeObject
diff --git a/offapi/com/sun/star/sdbcx/ReferenceColumn.idl b/offapi/com/sun/star/sdbcx/ReferenceColumn.idl
index 14bc4c75e344..5df52fa59063 100644
--- a/offapi/com/sun/star/sdbcx/ReferenceColumn.idl
+++ b/offapi/com/sun/star/sdbcx/ReferenceColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_ReferenceColumn_idl__
 #define __com_sun_star_sdbcx_ReferenceColumn_idl__
 
-#ifndef __com_sun_star_sdbcx_Column_idl__
 #include <com/sun/star/sdbcx/Column.idl>
-#endif
 
 
  module com {  module sun {  module star {  module sdbcx {
diff --git a/offapi/com/sun/star/sdbcx/ResultSet.idl b/offapi/com/sun/star/sdbcx/ResultSet.idl
index 94a9e6c1b8d7..8307cd9ed3f5 100644
--- a/offapi/com/sun/star/sdbcx/ResultSet.idl
+++ b/offapi/com/sun/star/sdbcx/ResultSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_ResultSet_idl__
 #define __com_sun_star_sdbcx_ResultSet_idl__
 
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
 #include <com/sun/star/sdbc/ResultSet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
@@ -37,7 +35,7 @@
  published interface XDeleteRows;
 
 
-/** extends the SDBC ResultSet by the possibility of bookmark positioning, cancelling
+/** extends the SDBC ResultSet by the possibility of bookmark positioning, canceling
     the positioning, and updating of rows.
  */
 published service ResultSet
@@ -45,7 +43,7 @@ published service ResultSet
     service com::sun::star::sdbc::ResultSet;
 
 
-    /** could be used for cancelling the execution of SQL statements if both
+    /** could be used for canceling the execution of SQL statements if both
  the DBMS and the driver support aborting of navigation commands.
  The implementation is optional.
      */
@@ -63,12 +61,12 @@ published service ResultSet
     [optional] interface XDeleteRows;
 
 
-    /** returns if the resultset supports bookmark navigation.
+    /** returns if the result set supports bookmark navigation.
      */
     [readonly, property] boolean IsBookmarkable;
 
 
-    /** returns whether the resultset supports updating of newly inserted rows.
+    /** returns whether the result set supports updating of newly inserted rows.
         This may not work, as the result set may contain automatic generated data
         which is used as key information.
      */
diff --git a/offapi/com/sun/star/sdbcx/Statement.idl b/offapi/com/sun/star/sdbcx/Statement.idl
index 7e012db03cc5..315eb6eac2b7 100644
--- a/offapi/com/sun/star/sdbcx/Statement.idl
+++ b/offapi/com/sun/star/sdbcx/Statement.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Statement_idl__
 #define __com_sun_star_sdbcx_Statement_idl__
 
-#ifndef __com_sun_star_sdbc_Statement_idl__
 #include <com/sun/star/sdbc/Statement.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
@@ -47,7 +45,7 @@ published service Statement
 
     /** returns
         <TRUE/>
-        if a resultset should allow navigation with bookmarks or not.
+        if a result set should allow navigation with bookmarks or not.
         The default is
         <FALSE/>
         .
diff --git a/offapi/com/sun/star/sdbcx/Table.idl b/offapi/com/sun/star/sdbcx/Table.idl
index b5c0b25e34ca..0048bd158335 100644
--- a/offapi/com/sun/star/sdbcx/Table.idl
+++ b/offapi/com/sun/star/sdbcx/Table.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_Table_idl__
 #define __com_sun_star_sdbcx_Table_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/TableDescriptor.idl b/offapi/com/sun/star/sdbcx/TableDescriptor.idl
index f3b14df2d953..104c9ccf6d69 100644
--- a/offapi/com/sun/star/sdbcx/TableDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/TableDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_TableDescriptor_idl__
 #define __com_sun_star_sdbcx_TableDescriptor_idl__
 
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
 #include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
@@ -73,7 +71,7 @@ published service TableDescriptor
     [property] string SchemaName;
 
 
-    /** supplies a comment on the table, Could be emtpy if not supported by
+    /** supplies a comment on the table, Could be empty if not supported by
         the driver.
      */
     [property] string Description;
diff --git a/offapi/com/sun/star/sdbcx/User.idl b/offapi/com/sun/star/sdbcx/User.idl
index 6ffc5bfbe9a1..f54d4eac8940 100644
--- a/offapi/com/sun/star/sdbcx/User.idl
+++ b/offapi/com/sun/star/sdbcx/User.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_User_idl__
 #define __com_sun_star_sdbcx_User_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/UserDescriptor.idl b/offapi/com/sun/star/sdbcx/UserDescriptor.idl
index 4c9d7bbe3e55..678d2743a4d4 100644
--- a/offapi/com/sun/star/sdbcx/UserDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/UserDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_UserDescriptor_idl__
 #define __com_sun_star_sdbcx_UserDescriptor_idl__
 
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
 #include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/View.idl b/offapi/com/sun/star/sdbcx/View.idl
index b84fad819f92..96f6cc40d973 100644
--- a/offapi/com/sun/star/sdbcx/View.idl
+++ b/offapi/com/sun/star/sdbcx/View.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_View_idl__
 #define __com_sun_star_sdbcx_View_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/ViewDescriptor.idl b/offapi/com/sun/star/sdbcx/ViewDescriptor.idl
index dd481c3891d3..41316496542f 100644
--- a/offapi/com/sun/star/sdbcx/ViewDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/ViewDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_ViewDescriptor_idl__
 #define __com_sun_star_sdbcx_ViewDescriptor_idl__
 
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
 #include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XAlterTable.idl b/offapi/com/sun/star/sdbcx/XAlterTable.idl
index 63363b7b309f..2f2a53a17685 100644
--- a/offapi/com/sun/star/sdbcx/XAlterTable.idl
+++ b/offapi/com/sun/star/sdbcx/XAlterTable.idl
@@ -27,25 +27,14 @@
 #ifndef __com_sun_star_sdbcx_XAlterTable_idl__
 #define __com_sun_star_sdbcx_XAlterTable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
  module com {  module sun {  module star {  module beans {
  published interface XPropertySet;
 };};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XAlterView.idl b/offapi/com/sun/star/sdbcx/XAlterView.idl
index d234562b3914..d76c2538177a 100644
--- a/offapi/com/sun/star/sdbcx/XAlterView.idl
+++ b/offapi/com/sun/star/sdbcx/XAlterView.idl
@@ -28,9 +28,7 @@
 #ifndef __offapi_com_sun_star_sdbcx_XAlterView_idl__
 #define __offapi_com_sun_star_sdbcx_XAlterView_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdbcx/XAppend.idl b/offapi/com/sun/star/sdbcx/XAppend.idl
index ed3ce7c483af..7dbf054efb91 100644
--- a/offapi/com/sun/star/sdbcx/XAppend.idl
+++ b/offapi/com/sun/star/sdbcx/XAppend.idl
@@ -27,21 +27,15 @@
 #ifndef __com_sun_star_sdbcx_XAppend_idl__
 #define __com_sun_star_sdbcx_XAppend_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
  module com {  module sun {  module star {  module beans {
  published interface XPropertySet;
 };};};};
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XAuthorizable.idl b/offapi/com/sun/star/sdbcx/XAuthorizable.idl
index c83018643ed4..fde5e84c99f1 100644
--- a/offapi/com/sun/star/sdbcx/XAuthorizable.idl
+++ b/offapi/com/sun/star/sdbcx/XAuthorizable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XAuthorizable_idl__
 #define __com_sun_star_sdbcx_XAuthorizable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl b/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
index d97a10b477e4..3aefa572892a 100644
--- a/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbcx_XColumnsSupplier_idl__
 #define __com_sun_star_sdbcx_XColumnsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
@@ -49,7 +43,7 @@ published interface XColumnsSupplier: com::sun::star::uno::XInterface
 {
 
     /** returns the container of columns.
-        @rerurns
+        @returns
             the columns
      */
     com::sun::star::container::XNameAccess getColumns();
diff --git a/offapi/com/sun/star/sdbcx/XCreateCatalog.idl b/offapi/com/sun/star/sdbcx/XCreateCatalog.idl
index ca4f7be00b99..9aaf2b117112 100644
--- a/offapi/com/sun/star/sdbcx/XCreateCatalog.idl
+++ b/offapi/com/sun/star/sdbcx/XCreateCatalog.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdbcx_XCreateCatalog_idl__
 #define __com_sun_star_sdbcx_XCreateCatalog_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
@@ -51,7 +43,7 @@
 published interface XCreateCatalog: com::sun::star::uno::XInterface
 {
 
-    /** creates the catolog by using a sequence of property values. The kind
+    /** creates the catalog by using a sequence of property values. The kind
         of properties depends on the provider.
 
         @param info
diff --git a/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl b/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl
index 3a1ad1010d99..778372b192c6 100644
--- a/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbcx_XDataDefinitionSupplier_idl__
 #define __com_sun_star_sdbcx_XDataDefinitionSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbc {
  published interface XConnection;
diff --git a/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl b/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl
index 9b4356a6366f..c11115f5af4e 100644
--- a/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl
+++ b/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_XDataDescriptorFactory_idl__
 #define __com_sun_star_sdbcx_XDataDescriptorFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
  module com {  module sun {  module star {  module beans {
  published interface XPropertySet;
diff --git a/offapi/com/sun/star/sdbcx/XDeleteRows.idl b/offapi/com/sun/star/sdbcx/XDeleteRows.idl
index 03c772ce01ae..ea89327d9ce5 100644
--- a/offapi/com/sun/star/sdbcx/XDeleteRows.idl
+++ b/offapi/com/sun/star/sdbcx/XDeleteRows.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XDeleteRows_idl__
 #define __com_sun_star_sdbcx_XDeleteRows_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
@@ -51,7 +47,7 @@ published interface XDeleteRows: com::sun::star::uno::XInterface
                  row. The array is ordered according to the order in
                 which bookmarks were given.
              @throws com::sun::star::sdbc::SQLException
-                if a fatal error occurs, for intance, the connection gets lost if bookmarks
+                if a fatal error occurs, for instance, the connection gets lost if bookmarks
                 are used which do not belong to the according result set.
      */
     sequence<long> deleteRows([in]sequence<any> rows)
diff --git a/offapi/com/sun/star/sdbcx/XDrop.idl b/offapi/com/sun/star/sdbcx/XDrop.idl
index d7e7520852a9..948fe8cb8d35 100644
--- a/offapi/com/sun/star/sdbcx/XDrop.idl
+++ b/offapi/com/sun/star/sdbcx/XDrop.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdbcx_XDrop_idl__
 #define __com_sun_star_sdbcx_XDrop_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XDropCatalog.idl b/offapi/com/sun/star/sdbcx/XDropCatalog.idl
index 8091d914aa86..82e1d4251095 100644
--- a/offapi/com/sun/star/sdbcx/XDropCatalog.idl
+++ b/offapi/com/sun/star/sdbcx/XDropCatalog.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_sdbcx_XDropCatalog_idl__
 #define __com_sun_star_sdbcx_XDropCatalog_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl b/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl
index e2bbae67c8b3..28f8611e5c70 100644
--- a/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XGroupsSupplier_idl__
 #define __com_sun_star_sdbcx_XGroupsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl b/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl
index 666d02104201..3bb6cfdd8604 100644
--- a/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XIndexesSupplier_idl__
 #define __com_sun_star_sdbcx_XIndexesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XKeysSupplier.idl b/offapi/com/sun/star/sdbcx/XKeysSupplier.idl
index 1954bd2056d6..657dc0590138 100644
--- a/offapi/com/sun/star/sdbcx/XKeysSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XKeysSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XKeysSupplier_idl__
 #define __com_sun_star_sdbcx_XKeysSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XRename.idl b/offapi/com/sun/star/sdbcx/XRename.idl
index 41e8807232a9..53a2cce37839 100644
--- a/offapi/com/sun/star/sdbcx/XRename.idl
+++ b/offapi/com/sun/star/sdbcx/XRename.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbcx_XRename_idl__
 #define __com_sun_star_sdbcx_XRename_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XRowLocate.idl b/offapi/com/sun/star/sdbcx/XRowLocate.idl
index 6d87b7faae92..4136c5852bf1 100644
--- a/offapi/com/sun/star/sdbcx/XRowLocate.idl
+++ b/offapi/com/sun/star/sdbcx/XRowLocate.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XRowLocate_idl__
 #define __com_sun_star_sdbcx_XRowLocate_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
@@ -67,7 +63,7 @@ published interface XRowLocate: com::sun::star::uno::XInterface
         after the last record.
         <br/>
         If the bookmark is invalid, or not generated by the current result set, then
-        the behaviour is not defined, even an abnormal termination is possible.
+        the behavior is not defined, even an abnormal termination is possible.
         </p>
         @param bookmark
             the bookmark where to move
@@ -88,7 +84,7 @@ published interface XRowLocate: com::sun::star::uno::XInterface
         after the last record.
         <br/>
         If the bookmark is invalid, or not generated by the current result set, then
-        the behaviour is not defined, even an abnormal termination is possible.
+        the behavior is not defined, even an abnormal termination is possible.
         </p>
         @param bookmark
             the bookmark where to move
diff --git a/offapi/com/sun/star/sdbcx/XTablesSupplier.idl b/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
index 58b441b2acde..cb3a32e31cb3 100644
--- a/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XTablesSupplier_idl__
 #define __com_sun_star_sdbcx_XTablesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XUser.idl b/offapi/com/sun/star/sdbcx/XUser.idl
index f99cbe1e5107..c5d4e3d2b16f 100644
--- a/offapi/com/sun/star/sdbcx/XUser.idl
+++ b/offapi/com/sun/star/sdbcx/XUser.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sdbcx_XUser_idl__
 #define __com_sun_star_sdbcx_XUser_idl__
 
-#ifndef __com_sun_star_sdbcx_XAuthorizable_idl__
 #include <com/sun/star/sdbcx/XAuthorizable.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XUsersSupplier.idl b/offapi/com/sun/star/sdbcx/XUsersSupplier.idl
index c1c77fddaf9c..1b4872246f07 100644
--- a/offapi/com/sun/star/sdbcx/XUsersSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XUsersSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sdbcx_XUsersSupplier_idl__
 #define __com_sun_star_sdbcx_XUsersSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/sdbcx/XViewsSupplier.idl b/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
index f0988c1c8bb1..1043e4ea544b 100644
--- a/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sdbcx_XViewsSupplier_idl__
 #define __com_sun_star_sdbcx_XViewsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
  module com {  module sun {  module star {  module sdbcx {
 
diff --git a/offapi/com/sun/star/security/CertificateCharacters.idl b/offapi/com/sun/star/security/CertificateCharacters.idl
index 4185759a2a95..4a359bdbb44d 100644
--- a/offapi/com/sun/star/security/CertificateCharacters.idl
+++ b/offapi/com/sun/star/security/CertificateCharacters.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for xml security module
 
 /** -- idl definition -- **/
 
@@ -38,7 +38,7 @@
 module com { module sun { module star { module security {
 
 /**
- * Constant definiton of a certificate characters.
+ * Constant definition of a certificate characters.
  *
  * The certificate characters will be defined as bit-wise constants.
  */
diff --git a/offapi/com/sun/star/security/CertificateContainer.idl b/offapi/com/sun/star/security/CertificateContainer.idl
index 5974aefa3a7f..b6ffcd30dbaf 100644
--- a/offapi/com/sun/star/security/CertificateContainer.idl
+++ b/offapi/com/sun/star/security/CertificateContainer.idl
@@ -30,7 +30,6 @@
 
 #include <com/sun/star/security/XCertificateContainer.idl>
 #include <com/sun/star/uno/XInterface.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/security/CertificateContainerStatus.idl b/offapi/com/sun/star/security/CertificateContainerStatus.idl
index 6ca4c43bd571..f1765e5f8002 100644
--- a/offapi/com/sun/star/security/CertificateContainerStatus.idl
+++ b/offapi/com/sun/star/security/CertificateContainerStatus.idl
@@ -34,7 +34,7 @@
 module com { module sun { module star { module security {
 
 /**
- * Constant definiton of a certificate container status.
+ * Constant definition of a certificate container status.
  *
  */
 published enum CertificateContainerStatus
diff --git a/offapi/com/sun/star/security/CertificateException.idl b/offapi/com/sun/star/security/CertificateException.idl
index 3c4c16ad4a86..f5b930909019 100644
--- a/offapi/com/sun/star/security/CertificateException.idl
+++ b/offapi/com/sun/star/security/CertificateException.idl
@@ -25,16 +25,14 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for xml security module
 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_CertificateException_idl__
 #define __com_sun_star_security_CertificateException_idl__
 
-#ifndef __com_sun_star_uno_SecurityException_idl__
 #include <com/sun/star/uno/SecurityException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/security/CertificateValidity.idl b/offapi/com/sun/star/security/CertificateValidity.idl
index 3130a72ca713..02aef68dcc96 100644
--- a/offapi/com/sun/star/security/CertificateValidity.idl
+++ b/offapi/com/sun/star/security/CertificateValidity.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for xml security module
 
 /** -- idl definition -- **/
 
@@ -38,7 +38,7 @@
 module com { module sun { module star { module security {
 
 /**
- * Constant definiton of a certificate characters.
+ * Constant definition of a certificate characters.
  *
  * The certificate characters will be defined as bit-wise constants.
  */
diff --git a/offapi/com/sun/star/security/CryptographyException.idl b/offapi/com/sun/star/security/CryptographyException.idl
index d45ca6f76931..ad1b7d81e53e 100644
--- a/offapi/com/sun/star/security/CryptographyException.idl
+++ b/offapi/com/sun/star/security/CryptographyException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_security_CryptographyException_idl__
 #define __com_sun_star_security_CryptographyException_idl__
 
-#ifndef __com_sun_star_uno_SecurityException_idl__
 #include <com/sun/star/uno/SecurityException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/security/DocumentDigitalSignatures.idl b/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
index 64ad581602c4..2a65dfd4fe54 100644
--- a/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
+++ b/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
@@ -32,10 +32,8 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include "XDocumentDigitalSignatures.idl"
 
 module com { module sun { module star { module security {
diff --git a/offapi/com/sun/star/security/DocumentSignatureInformation.idl b/offapi/com/sun/star/security/DocumentSignatureInformation.idl
index c57c68b05932..2dc7758454c7 100644
--- a/offapi/com/sun/star/security/DocumentSignatureInformation.idl
+++ b/offapi/com/sun/star/security/DocumentSignatureInformation.idl
@@ -66,7 +66,7 @@ struct DocumentSignatureInformation
         applied to the files in the root of the document, except mimetype, the
         Pictures and ObjectReplacements/Objects folder. That is, macros
         were not part of the document signature.
-        OOo 3.0 signed everthing, execept mimetype and the META-INF folder.
+        OOo 3.0 signed everything, except mimetype and the META-INF folder.
         <p>
         If PartialDocumentSignature is true, then the signature was created by OOo
         with a version less then 3.2. In this case, not all files are signed. The
diff --git a/offapi/com/sun/star/security/EncryptionException.idl b/offapi/com/sun/star/security/EncryptionException.idl
index 64e17bf5d260..e386931dac5b 100644
--- a/offapi/com/sun/star/security/EncryptionException.idl
+++ b/offapi/com/sun/star/security/EncryptionException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_security_EncryptionException_idl__
 #define __com_sun_star_security_EncryptionException_idl__
 
-#ifndef __com_sun_star_security_CryptographyException_idl__
 #include <com/sun/star/security/CryptographyException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/security/KeyException.idl b/offapi/com/sun/star/security/KeyException.idl
index f323def3b585..0c2a4d68e36f 100644
--- a/offapi/com/sun/star/security/KeyException.idl
+++ b/offapi/com/sun/star/security/KeyException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_security_KeyException_idl__
 #define __com_sun_star_security_KeyException_idl__
 
-#ifndef __com_sun_star_uno_SecurityException_idl__
 #include <com/sun/star/uno/SecurityException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/security/NoPasswordException.idl b/offapi/com/sun/star/security/NoPasswordException.idl
index b11abbaf6cba..7ae79c18ceaa 100644
--- a/offapi/com/sun/star/security/NoPasswordException.idl
+++ b/offapi/com/sun/star/security/NoPasswordException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_security_NoPasswordException_idl__
 #define __com_sun_star_security_NoPasswordException_idl__
 
-#ifndef __com_sun_star_uno_SecurityException_idl__
 #include <com/sun/star/uno/SecurityException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/security/SecurityInfrastructureException.idl b/offapi/com/sun/star/security/SecurityInfrastructureException.idl
index 71cb0e18aa8b..fef5c4e10f7b 100644
--- a/offapi/com/sun/star/security/SecurityInfrastructureException.idl
+++ b/offapi/com/sun/star/security/SecurityInfrastructureException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_security_SecurityInfrastructureException_idl__
 #define __com_sun_star_security_SecurityInfrastructureException_idl__
 
-#ifndef __com_sun_star_uno_SecurityException_idl__
 #include <com/sun/star/uno/SecurityException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/security/SignatureException.idl b/offapi/com/sun/star/security/SignatureException.idl
index d7bf72eb43cc..28fd76986e48 100644
--- a/offapi/com/sun/star/security/SignatureException.idl
+++ b/offapi/com/sun/star/security/SignatureException.idl
@@ -32,9 +32,7 @@
 #ifndef __com_sun_star_security_SignatureException_idl__
 #define __com_sun_star_security_SignatureException_idl__
 
-#ifndef __com_sun_star_security_CryptographyException_idl__
 #include <com/sun/star/security/CryptographyException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/security/XCertificate.idl b/offapi/com/sun/star/security/XCertificate.idl
index 0c4eaa1ddfc7..d9bfe0c896a2 100644
--- a/offapi/com/sun/star/security/XCertificate.idl
+++ b/offapi/com/sun/star/security/XCertificate.idl
@@ -107,7 +107,7 @@ published interface XCertificate : com::sun::star::uno::XInterface
     [attribute, readonly] string SignatureAlgorithm;
 
     /**
-     * the SHA1 thumbprint
+     * the SHA-1 thumbprint
      */
     [attribute, readonly] sequence< byte > SHA1Thumbprint;
 
diff --git a/offapi/com/sun/star/security/XCertificateContainer.idl b/offapi/com/sun/star/security/XCertificateContainer.idl
index 605916c45fdc..21eec4c97763 100644
--- a/offapi/com/sun/star/security/XCertificateContainer.idl
+++ b/offapi/com/sun/star/security/XCertificateContainer.idl
@@ -49,7 +49,7 @@ published interface XCertificateContainer
     boolean addCertificate( [in] string url,
                               [in] string cert, [in] boolean trust );
 
-    /** Sheck if a certificate was stored earlier before.
+    /** Check if a certificate was stored earlier before.
         @param url
         @param cert
         @return CertificateContainerStatus
diff --git a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
index aadcbe061912..b14c769ed2f9 100644
--- a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
+++ b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
@@ -44,7 +44,7 @@ module com { module sun { module star { module security {
 /** interface for signing and verifying digital signatures in office documents
 
     <p>
-    This interface can be used to digitaly sign different content in a office document.
+    This interface can be used to digitally sign different content in a office document.
     It can also be used to verify digital signatures.
     </p>
  */
@@ -103,7 +103,7 @@ interface XDocumentDigitalSignatures : com::sun::star::uno::XInterface
      */
     string getScriptingContentSignatureDefaultStreamName();
 
-    /** signs the full Package, which means everything in the storage excecpt the content of META-INF
+    /** signs the full Package, which means everything in the storage except the content of META-INF
      */
     boolean signPackage( [in] ::com::sun::star::embed::XStorage Storage,
                          [in] ::com::sun::star::io::XStream xSignStream);
@@ -131,7 +131,7 @@ interface XDocumentDigitalSignatures : com::sun::star::uno::XInterface
     void showCertificate( [in] com::sun::star::security::XCertificate Certificate );
 
 
-       /** manages trusted sources (Authors and pathes )
+       /** manages trusted sources (Authors and paths )
      */
 
     void    manageTrustedSources();
diff --git a/offapi/com/sun/star/setup/BaseAction.idl b/offapi/com/sun/star/setup/BaseAction.idl
index f3edc68d8859..cdd301887769 100644
--- a/offapi/com/sun/star/setup/BaseAction.idl
+++ b/offapi/com/sun/star/setup/BaseAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_BaseAction_idl__
 #define __com_sun_star_setup_BaseAction_idl__
 
-#ifndef __com_sun_star_setup_ActionType_idl__
 #include <com/sun/star/setup/ActionType.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/CopyFileAction.idl b/offapi/com/sun/star/setup/CopyFileAction.idl
index b7d8e8e900ea..e909e80683e5 100644
--- a/offapi/com/sun/star/setup/CopyFileAction.idl
+++ b/offapi/com/sun/star/setup/CopyFileAction.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_setup_CopyFileAction_idl__
 #define __com_sun_star_setup_CopyFileAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/DeleteDirAction.idl b/offapi/com/sun/star/setup/DeleteDirAction.idl
index 59f358c1a76c..6c143cceb1a7 100644
--- a/offapi/com/sun/star/setup/DeleteDirAction.idl
+++ b/offapi/com/sun/star/setup/DeleteDirAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_DeleteDirAction_idl__
 #define __com_sun_star_setup_DeleteDirAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/DeleteFileAction.idl b/offapi/com/sun/star/setup/DeleteFileAction.idl
index dc58ef733277..5993c37a0336 100644
--- a/offapi/com/sun/star/setup/DeleteFileAction.idl
+++ b/offapi/com/sun/star/setup/DeleteFileAction.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_setup_DeleteFileAction_idl__
 #define __com_sun_star_setup_DeleteFileAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/DeleteFolderAction.idl b/offapi/com/sun/star/setup/DeleteFolderAction.idl
index 2a5a1c56568f..2ce53b25bf55 100644
--- a/offapi/com/sun/star/setup/DeleteFolderAction.idl
+++ b/offapi/com/sun/star/setup/DeleteFolderAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_DeleteFolderAction_idl__
 #define __com_sun_star_setup_DeleteFolderAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/DeleteFolderItemAction.idl b/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
index d17f39bcf135..01e83790c535 100644
--- a/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
+++ b/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_DeleteFolderItemAction_idl__
 #define __com_sun_star_setup_DeleteFolderItemAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/DownloadAction.idl b/offapi/com/sun/star/setup/DownloadAction.idl
index c83739715086..fcf13a342ddf 100644
--- a/offapi/com/sun/star/setup/DownloadAction.idl
+++ b/offapi/com/sun/star/setup/DownloadAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_DownloadAction_idl__
 #define __com_sun_star_setup_DownloadAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/FontAction.idl b/offapi/com/sun/star/setup/FontAction.idl
index 5b8e54a3bc49..2eb110ecb43b 100644
--- a/offapi/com/sun/star/setup/FontAction.idl
+++ b/offapi/com/sun/star/setup/FontAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_FontAction_idl__
 #define __com_sun_star_setup_FontAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/MakeDirAction.idl b/offapi/com/sun/star/setup/MakeDirAction.idl
index 3d2dd8a250ea..8956723463d1 100644
--- a/offapi/com/sun/star/setup/MakeDirAction.idl
+++ b/offapi/com/sun/star/setup/MakeDirAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_MakeDirAction_idl__
 #define __com_sun_star_setup_MakeDirAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/MakeFolderAction.idl b/offapi/com/sun/star/setup/MakeFolderAction.idl
index 679c498703c2..f9b208aa8af7 100644
--- a/offapi/com/sun/star/setup/MakeFolderAction.idl
+++ b/offapi/com/sun/star/setup/MakeFolderAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_MakeFolderAction_idl__
 #define __com_sun_star_setup_MakeFolderAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/MakeFolderItemAction.idl b/offapi/com/sun/star/setup/MakeFolderItemAction.idl
index d1de33a11a49..e0199164c557 100644
--- a/offapi/com/sun/star/setup/MakeFolderItemAction.idl
+++ b/offapi/com/sun/star/setup/MakeFolderItemAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_MakeFolderItemAction_idl__
 #define __com_sun_star_setup_MakeFolderItemAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/MakeShortcutAction.idl b/offapi/com/sun/star/setup/MakeShortcutAction.idl
index 15c2bbcde561..9c072a761bbf 100644
--- a/offapi/com/sun/star/setup/MakeShortcutAction.idl
+++ b/offapi/com/sun/star/setup/MakeShortcutAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_MakeShortcutAction_idl__
 #define __com_sun_star_setup_MakeShortcutAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/OSType.idl b/offapi/com/sun/star/setup/OSType.idl
index eab1505194d7..738ab7e73112 100644
--- a/offapi/com/sun/star/setup/OSType.idl
+++ b/offapi/com/sun/star/setup/OSType.idl
@@ -28,8 +28,8 @@
 #define __com_sun_star_setup_OSType_idl__
 
 // dear porters: please do not apply any patches for new platforms here
-//               it depricated anyway and any patches will cause API
-//       incompatibity errors  mh
+//               it deprecated anyway and any patches will cause API
+//       incompatibility errors  mh
 
 module com {  module sun {  module star {  module setup {
 
@@ -43,9 +43,6 @@ published enum OSType
     WIN,
 
     // DocMerge: empty anyway
-    OS2,
-
-    // DocMerge: empty anyway
     MAC,
 
     // DocMerge: empty anyway
diff --git a/offapi/com/sun/star/setup/ProductRegistration.idl b/offapi/com/sun/star/setup/ProductRegistration.idl
index 9f684b810fbe..72d8d694a1bb 100644
--- a/offapi/com/sun/star/setup/ProductRegistration.idl
+++ b/offapi/com/sun/star/setup/ProductRegistration.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_setup_ProductRegistration_idl__
 #define __com_sun_star_setup_ProductRegistration_idl__
 
-#ifndef __com_sun_star_task_JobExecutor_idl__
 #include <com/sun/star/task/JobExecutor.idl>
-#endif
-
-#ifndef __com_sun_star_task_XJob_idl__
 #include <com/sun/star/task/XJob.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/ProfileItemAction.idl b/offapi/com/sun/star/setup/ProfileItemAction.idl
index 68d432d2022f..5a7679bad7cc 100644
--- a/offapi/com/sun/star/setup/ProfileItemAction.idl
+++ b/offapi/com/sun/star/setup/ProfileItemAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_ProfileItemAction_idl__
 #define __com_sun_star_setup_ProfileItemAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/Setup.idl b/offapi/com/sun/star/setup/Setup.idl
index b6012bc46ed8..5ff9e56408b1 100644
--- a/offapi/com/sun/star/setup/Setup.idl
+++ b/offapi/com/sun/star/setup/Setup.idl
@@ -24,14 +24,11 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_setup_Setup_idl__
+#define __com_sun_star_setup_Setup_idl__
 
-#ifndef __com_sun_star_setup_XSetup_idl__
 #include <com/sun/star/setup/XSetup.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
@@ -46,4 +43,4 @@ published service Setup
     };
 
 }; }; }; };
-
+#endif
diff --git a/offapi/com/sun/star/setup/UnzipAction.idl b/offapi/com/sun/star/setup/UnzipAction.idl
index 034de904d5d2..9777d1f91e89 100644
--- a/offapi/com/sun/star/setup/UnzipAction.idl
+++ b/offapi/com/sun/star/setup/UnzipAction.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_setup_UnzipAction_idl__
 #define __com_sun_star_setup_UnzipAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/WindowsRegistryAction.idl b/offapi/com/sun/star/setup/WindowsRegistryAction.idl
index 33e9f839be3c..e37d67c5ba8d 100644
--- a/offapi/com/sun/star/setup/WindowsRegistryAction.idl
+++ b/offapi/com/sun/star/setup/WindowsRegistryAction.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_setup_WindowsRegistryAction_idl__
 #define __com_sun_star_setup_WindowsRegistryAction_idl__
 
-#ifndef __com_sun_star_setup_BaseAction_idl__
 #include <com/sun/star/setup/BaseAction.idl>
-#endif
 
 module com {  module sun {  module star {  module setup {
 
diff --git a/offapi/com/sun/star/setup/XSetup.idl b/offapi/com/sun/star/setup/XSetup.idl
index 68f35cda76ae..4c2b309be293 100644
--- a/offapi/com/sun/star/setup/XSetup.idl
+++ b/offapi/com/sun/star/setup/XSetup.idl
@@ -27,10 +27,7 @@
 #ifndef __com_sun_star_setup_XSetup_idl__
 #define __com_sun_star_setup_XSetup_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
 #include <com/sun/star/setup/OSType.idl>
 #include <com/sun/star/setup/UpdateType.idl>
 #include <com/sun/star/setup/ModuleInfo.idl>
diff --git a/offapi/com/sun/star/sheet/AccessibleCell.idl b/offapi/com/sun/star/sheet/AccessibleCell.idl
index 014b5c84b82f..52ca2a603eec 100644
--- a/offapi/com/sun/star/sheet/AccessibleCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCell.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_sheet_AccessibleCell_idl__
 #define __com_sun_star_sheet_AccessibleCell_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
index 10e77f7bcbc6..29492a7971cb 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_AccessibleCsvCell_idl__
 #define __com_sun_star_sheet_AccessibleCsvCell_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
index 1ee7df9ddba1..86562c70345b 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_AccessibleCsvRuler_idl__
 #define __com_sun_star_sheet_AccessibleCsvRuler_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
index 95f4a91bdf6a..ca8e9a7ee553 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_AccessibleCsvTable_idl__
 #define __com_sun_star_sheet_AccessibleCsvTable_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
 #include <com/sun/star/accessibility/XAccessibleTable.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
index df8e41e875e1..aa290fc7f388 100644
--- a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
+++ b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_sheet_AccessiblePageHeaderFooterAreasView_idl__
 #define __com_sun_star_sheet_AccessiblePageHeaderFooterAreasView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 //=============================================================================
 
@@ -77,7 +69,7 @@ published service AccessiblePageHeaderFooterAreasView
         </ul>
         <p>The following rules apply to the children order.</p>
         <ul>
-            <li>The first is the left area, than the centre area and the last
+            <li>The first is the left area, than the center area and the last
             is the right area.</li>
         </ul>
         <li>The description is ???.</li>
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
index 5d703ebe0a0d..9d01b98dd6db 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_sheet_AccessibleSpreadsheet_idl__
 #define __com_sun_star_sheet_AccessibleSpreadsheet_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
 #include <com/sun/star/accessibility/XAccessibleTable.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 //=============================================================================
 
@@ -86,7 +72,7 @@ published service AccessibleSpreadsheet
             the order on the screen. This means that the first cell is the
             cell in the left top edge of the table and the last one is the
             cell in the right bottom edge of the table. The second is the
-            cell in the first row and second xolumn and so on.</li>
+            cell in the first row and second column and so on.</li>
         </ul>
         <li>The description is ???.</li>
         <li>The name is the given table name.</li>
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
index 3070a71d6443..f72dc383b649 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
 #define __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 //=============================================================================
 
@@ -61,7 +50,7 @@ published service AccessibleSpreadsheetDocumentView
 
     <ul>
         <li>The parent returned by <method>getAccessibleParent</method>
-            is the window wich contains the view of these document.</li>
+            is the window which contains the view of these document.</li>
         <li>The children returned by <method>getAccessibleChild</method> all
             support the interface XAccessible. Calling
             <method>getAccessibleContext</method> for these children returns
@@ -99,7 +88,7 @@ published service AccessibleSpreadsheetDocumentView
             is also the last child.</p>
         <ul>
             <li>Graphics, embedded objects and shapes appear
-                before the other childs if they are painted in the
+                before the other children if they are painted in the
                 background. Their order reflects the z order.</li>
             <li>The current table is painted after the background and so it
                 comes after all background objects.</li>
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
index bc676463c47b..a06526caf73f 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_sheet_AccessibleSpreadsheetPageView_idl__
 #define __com_sun_star_sheet_AccessibleSpreadsheetPageView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 //=============================================================================
 
@@ -59,7 +51,7 @@ published service AccessibleSpreadsheetPageView
         <li>The parent returned by
             <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleParent</method>
-            is the window wich contains the view of these page preview.</li>
+            is the window which contains the view of these page preview.</li>
         <li>The children returned by
             <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleChild</method> all
diff --git a/offapi/com/sun/star/sheet/ActivationEvent.idl b/offapi/com/sun/star/sheet/ActivationEvent.idl
index f53c3509874b..136932433380 100644
--- a/offapi/com/sun/star/sheet/ActivationEvent.idl
+++ b/offapi/com/sun/star/sheet/ActivationEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_ActivationEvent_idl__
 #define __com_sun_star_sheet_ActivationEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
 #include <com/sun/star/sheet/XSpreadsheet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/AddIn.idl b/offapi/com/sun/star/sheet/AddIn.idl
index 8f76f268416e..8a7bbaf5125d 100644
--- a/offapi/com/sun/star/sheet/AddIn.idl
+++ b/offapi/com/sun/star/sheet/AddIn.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_AddIn_idl__
 #define __com_sun_star_sheet_AddIn_idl__
 
-#ifndef __com_sun_star_lang_XServiceName_idl__
 #include <com/sun/star/lang/XServiceName.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XAddIn_idl__
 #include <com/sun/star/sheet/XAddIn.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCompatibilityNames_idl__
 #include <com/sun/star/sheet/XCompatibilityNames.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAnnotation.idl b/offapi/com/sun/star/sheet/CellAnnotation.idl
index 16c2f3620639..b29c11763166 100644
--- a/offapi/com/sun/star/sheet/CellAnnotation.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotation.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_CellAnnotation_idl__
 #define __com_sun_star_sheet_CellAnnotation_idl__
 
-#ifndef __com_sun_star_sheet_XSheetAnnotation_idl__
 #include <com/sun/star/sheet/XSheetAnnotation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotationShapeSupplier_idl__
 #include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_text_XSimpleText_idl__
 #include <com/sun/star/text/XSimpleText.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAnnotationShape.idl b/offapi/com/sun/star/sheet/CellAnnotationShape.idl
index 1d5cc467f299..77d84bfd42c4 100644
--- a/offapi/com/sun/star/sheet/CellAnnotationShape.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotationShape.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_CellAnnotationShape_idl__
 #define __com_sun_star_sheet_CellAnnotationShape_idl__
 
-#ifndef __com_sun_star_drawing_CaptionShape_idl__
 #include <com/sun/star/drawing/CaptionShape.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAnnotations.idl b/offapi/com/sun/star/sheet/CellAnnotations.idl
index 5831655d4634..81b705cc41e1 100644
--- a/offapi/com/sun/star/sheet/CellAnnotations.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotations.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_CellAnnotations_idl__
 #define __com_sun_star_sheet_CellAnnotations_idl__
 
-#ifndef __com_sun_star_sheet_XSheetAnnotations_idl__
 #include <com/sun/star/sheet/XSheetAnnotations.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl b/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
index 1e70eb30c5c3..a54f2562e718 100644
--- a/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_CellAnnotationsEnumeration_idl__
 #define __com_sun_star_sheet_CellAnnotationsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAreaLink.idl b/offapi/com/sun/star/sheet/CellAreaLink.idl
index 90e51f941eb8..f251511b2484 100644
--- a/offapi/com/sun/star/sheet/CellAreaLink.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLink.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_CellAreaLink_idl__
 #define __com_sun_star_sheet_CellAreaLink_idl__
 
-#ifndef __com_sun_star_sheet_XAreaLink_idl__
 #include <com/sun/star/sheet/XAreaLink.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAreaLinks.idl b/offapi/com/sun/star/sheet/CellAreaLinks.idl
index 62b601752c10..ff822d1535fd 100644
--- a/offapi/com/sun/star/sheet/CellAreaLinks.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLinks.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sheet_CellAreaLinks_idl__
 #define __com_sun_star_sheet_CellAreaLinks_idl__
 
-#ifndef __com_sun_star_sheet_XAreaLinks_idl__
 #include <com/sun/star/sheet/XAreaLinks.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl b/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
index 6fda9e4f824d..f7bd7a421d7e 100644
--- a/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_CellAreaLinksEnumeration_idl__
 #define __com_sun_star_sheet_CellAreaLinksEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellFormatRanges.idl b/offapi/com/sun/star/sheet/CellFormatRanges.idl
index c3002e1c80f6..7a7541fa42c6 100644
--- a/offapi/com/sun/star/sheet/CellFormatRanges.idl
+++ b/offapi/com/sun/star/sheet/CellFormatRanges.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_CellFormatRanges_idl__
 #define __com_sun_star_sheet_CellFormatRanges_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl b/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
index ef945a036225..4cfd44edb5c0 100644
--- a/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_CellFormatRangesEnumeration_idl__
 #define __com_sun_star_sheet_CellFormatRangesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/Cells.idl b/offapi/com/sun/star/sheet/Cells.idl
index 125c42f516c2..45eecae78733 100644
--- a/offapi/com/sun/star/sheet/Cells.idl
+++ b/offapi/com/sun/star/sheet/Cells.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_Cells_idl__
 #define __com_sun_star_sheet_Cells_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/CellsEnumeration.idl b/offapi/com/sun/star/sheet/CellsEnumeration.idl
index 53e7a59a86e1..7315a4cd28e0 100644
--- a/offapi/com/sun/star/sheet/CellsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_CellsEnumeration_idl__
 #define __com_sun_star_sheet_CellsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/ComplexReference.idl b/offapi/com/sun/star/sheet/ComplexReference.idl
index 22cb225bab73..12aad66da972 100644
--- a/offapi/com/sun/star/sheet/ComplexReference.idl
+++ b/offapi/com/sun/star/sheet/ComplexReference.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_ComplexReference_idl__
 #define __com_sun_star_sheet_ComplexReference_idl__
 
-#ifndef __com_sun_star_sheet_SingleReference_idl__
 #include <com/sun/star/sheet/SingleReference.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/ConditionOperator2.idl b/offapi/com/sun/star/sheet/ConditionOperator2.idl
new file mode 100644
index 000000000000..5092bb353487
--- /dev/null
+++ b/offapi/com/sun/star/sheet/ConditionOperator2.idl
@@ -0,0 +1,120 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *                       Novell, Inc.
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Muthu Subramanian <sumuthu@novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __com_sun_star_sheet_ConditionOperator2_idl__
+#define __com_sun_star_sheet_ConditionOperator2_idl__
+
+//=============================================================================
+
+module com {  module sun {  module star {  module sheet {
+
+//=============================================================================
+
+/** is used to specify the type of <type>XSheetCondition2</type>.
+ */
+constants ConditionOperator2
+{
+    //-------------------------------------------------------------------------
+
+    /** no condition is specified.
+     */
+    const long NONE = 0;
+
+    //-------------------------------------------------------------------------
+
+    /** value has to be equal to the specified value.
+     */
+    const long EQUAL = 1;
+
+    //-------------------------------------------------------------------------
+
+    /** the value must not be equal to the specified value.
+     */
+    const long NOT_EQUAL = 2;
+
+    //-------------------------------------------------------------------------
+
+    /** the value has to be greater than the specified value.
+     */
+    const long GREATER = 3;
+
+    //-------------------------------------------------------------------------
+
+    /** the value has to be greater than or equal to the specified value.
+     */
+    const long GREATER_EQUAL = 4;
+
+    //-------------------------------------------------------------------------
+
+    /** the value has to be less than the specified value.
+     */
+    const long LESS = 5;
+
+    //-------------------------------------------------------------------------
+
+    /** the value has to be less than or equal to the specified value.
+     */
+    const long LESS_EQUAL = 6;
+
+    //-------------------------------------------------------------------------
+
+    /** the value has to be between the two specified values.
+     */
+    const long BETWEEN = 7;
+
+    //-------------------------------------------------------------------------
+
+    /** the value has to be outside of the two specified values.
+     */
+    const long NOT_BETWEEN = 8;
+
+    //-------------------------------------------------------------------------
+
+    /** the specified formula has to give a non-zero result.
+     */
+    const long FORMULA = 9;
+
+    //-------------------------------------------------------------------------
+
+    /** Conditionally format duplicate values
+     */
+    const long DUPLICATE = 10;
+
+    //-------------------------------------------------------------------------
+
+    /** Conditionally format non-duplicate values
+     */
+    const long NOT_DUPLICATE = 11;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl b/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
index 7c070b721ee4..07c0f742ddee 100644
--- a/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
+++ b/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_ConsolidationDescriptor_idl__
 #define __com_sun_star_sheet_ConsolidationDescriptor_idl__
 
-#ifndef __com_sun_star_sheet_XConsolidationDescriptor_idl__
 #include <com/sun/star/sheet/XConsolidationDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DDELink.idl b/offapi/com/sun/star/sheet/DDELink.idl
index 0ef60285ed3c..b8673a8135be 100644
--- a/offapi/com/sun/star/sheet/DDELink.idl
+++ b/offapi/com/sun/star/sheet/DDELink.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_DDELink_idl__
 #define __com_sun_star_sheet_DDELink_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDDELink_idl__
 #include <com/sun/star/sheet/XDDELink.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDDELinkResults_idl__
 #include <com/sun/star/sheet/XDDELinkResults.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DDELinkInfo.idl b/offapi/com/sun/star/sheet/DDELinkInfo.idl
index 96c4b8e5c244..d81168556d6d 100644
--- a/offapi/com/sun/star/sheet/DDELinkInfo.idl
+++ b/offapi/com/sun/star/sheet/DDELinkInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_DDELinkInfo_idl__
 #define __com_sun_star_sheet_DDELinkInfo_idl__
 
-#ifndef __com_sun_star_sheet_DDEItemInfo_idl__
 #include <com/sun/star/sheet/DDEItemInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DDELinks.idl b/offapi/com/sun/star/sheet/DDELinks.idl
index 8a8d8b093756..4b01686b2317 100644
--- a/offapi/com/sun/star/sheet/DDELinks.idl
+++ b/offapi/com/sun/star/sheet/DDELinks.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_sheet_DDELinks_idl__
 #define __com_sun_star_sheet_DDELinks_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_sheet_XDDELinks_idl__
 #include <com/sun/star/sheet/XDDELinks.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DDELinksEnumeration.idl b/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
index 93a19a052c88..559d5d097395 100644
--- a/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DDELinksEnumeration_idl__
 #define __com_sun_star_sheet_DDELinksEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
index c01f450676dc..678ff64be369 100644
--- a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_DataPilotTableDescriptor_idl__
 #define __com_sun_star_sheet_DataPilotTableDescriptor_idl__
 
-#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
 #include <com/sun/star/sheet/XDataPilotDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotDataLayoutFieldSupplier_idl__
 #include <com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotField.idl b/offapi/com/sun/star/sheet/DataPilotField.idl
index d558f0a86f50..486e5aaf16c2 100644
--- a/offapi/com/sun/star/sheet/DataPilotField.idl
+++ b/offapi/com/sun/star/sheet/DataPilotField.idl
@@ -28,49 +28,17 @@
 #ifndef __com_sun_star_sheet_DataPilotField_idl__
 #define __com_sun_star_sheet_DataPilotField_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotField_idl__
 #include <com/sun/star/sheet/XDataPilotField.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotFieldGrouping_idl__
 #include <com/sun/star/sheet/XDataPilotFieldGrouping.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldOrientation_idl__
 #include <com/sun/star/sheet/DataPilotFieldOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
 #include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldReference_idl__
 #include <com/sun/star/sheet/DataPilotFieldReference.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldLayoutInfo_idl__
 #include <com/sun/star/sheet/DataPilotFieldLayoutInfo.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldAutoShowInfo_idl__
 #include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldSortInfo_idl__
 #include <com/sun/star/sheet/DataPilotFieldSortInfo.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
 #include <com/sun/star/sheet/DataPilotFieldGroupInfo.idl>
-#endif
 
 //=============================================================================
 
@@ -81,7 +49,7 @@ module com {  module sun {  module star {  module sheet {
 /** represents a single field in a data pilot table.
 
     <p>If the data pilot table is based on a spreadsheet cell range, a field
-    is representred by a column of the range and is named using the topmost
+    is represented by a column of the range and is named using the topmost
     cell of the column.</p>
  */
 published service DataPilotField
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
index da07a768a57d..b0d48dfd7c17 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldGroup_idl__
 #define __com_sun_star_sheet_DataPilotFieldGroup_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupBy.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupBy.idl
index a08826022609..965f4fc5fdfd 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupBy.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupBy.idl
@@ -81,7 +81,7 @@ published constants DataPilotFieldGroupBy
         <p>Examples:
         <ul>
         <li>Calendar day grouping: The group <em>Jan 03</em> will contain all
-        members that contain the january 3rd, regardless of the year or time
+        members that contain the January 3rd, regardless of the year or time
         of the member, e.g. <em>2002-Jan-03 00:00:00</em> or
         <em>1999-Jan-03 02:12:45</em>.</li>
 
@@ -100,7 +100,7 @@ published constants DataPilotFieldGroupBy
         by their month.
 
         <p>Example: The group <em>Jan</em> will contain all members with a
-        date in the month january, regardless of the year, day, or time of the
+        date in the month January, regardless of the year, day, or time of the
         member, e.g. <em>2002-Jan-03 00:00:00</em> or
         <em>1999-Jan-02 02:12:45</em>.</p>
      */
@@ -111,8 +111,8 @@ published constants DataPilotFieldGroupBy
         by their quarter.
 
         <p>Example: The group <em>Q1</em> will contain all members with a
-        date in the first quarter of a year (i.e. the months january,
-        february, and march), regardless of the year, day, or time of the
+        date in the first quarter of a year (i.e. the months January,
+        February, and march), regardless of the year, day, or time of the
         member, e.g. <em>2002-Jan-03 00:00:00</em> or
         <em>1999-Mar-02 02:12:45</em>.</p>
      */
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
index f486cb0d689a..97ab46ca8505 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldGroupEnumeration_idl__
 #define __com_sun_star_sheet_DataPilotFieldGroupEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
index 380dab374dc5..1c8bd723e61b 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
 #define __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
 
-#ifndef __com_sun_star_sheet_XDataPilotField_idl__
 #include <com/sun/star/sheet/XDataPilotField.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
index 40a65552aa99..8753f2ea5e7a 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldGroupItem_idl__
 #define __com_sun_star_sheet_DataPilotFieldGroupItem_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
index 544863db4d4b..0b7df0436660 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldGroups_idl__
 #define __com_sun_star_sheet_DataPilotFieldGroups_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
index 6b94a42df494..366eb173bbe0 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldGroupsEnumeration_idl__
 #define __com_sun_star_sheet_DataPilotFieldGroupsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldReference.idl b/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
index 163917c79b78..f094cbcd8993 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldReference_idl__
 #define __com_sun_star_sheet_DataPilotFieldReference_idl__
 
-#ifndef __com_sun_star_sheet_DataPilotFieldReferenceItemType_idl__
 #include <com/sun/star/sheet/DataPilotFieldReferenceItemType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
index b024613d6e51..0758eb4f29f0 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldSortInfo_idl__
 #define __com_sun_star_sheet_DataPilotFieldSortInfo_idl__
 
-#ifndef __com_sun_star_sheet_DataPilotFieldSortMode_idl__
 #include <com/sun/star/sheet/DataPilotFieldSortMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldSortMode.idl b/offapi/com/sun/star/sheet/DataPilotFieldSortMode.idl
index a167ab14244f..03a492bad7bd 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldSortMode.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldSortMode.idl
@@ -64,7 +64,7 @@ constants DataPilotFieldSortMode
 
     //-------------------------------------------------------------------------
 
-    /** the field ist sorted by the data in the given field
+    /** the field is sorted by the data in the given field
 
     @see com::sun::star::sheet::DataPilotFieldSortInfo
 
diff --git a/offapi/com/sun/star/sheet/DataPilotFields.idl b/offapi/com/sun/star/sheet/DataPilotFields.idl
index aba253280da7..32197631e138 100644
--- a/offapi/com/sun/star/sheet/DataPilotFields.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFields.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_DataPilotFields_idl__
 #define __com_sun_star_sheet_DataPilotFields_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
@@ -47,7 +41,7 @@ module com {  module sun {  module star {  module sheet {
 /** represents a collection of fields in a data pilot table.
 
     <p>If the data pilot table is based on a spreadsheet cell range, the
-    fields are representred by the columns of the range and are named using
+    fields are represented by the columns of the range and are named using
     the first row of the range.</p>
 
     @see com::sun::star::sheet::DataPilotField
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
index e96099eae8f7..e5f554f19ac9 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotFieldsEnumeration_idl__
 #define __com_sun_star_sheet_DataPilotFieldsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotItem.idl b/offapi/com/sun/star/sheet/DataPilotItem.idl
index 84be9bdc879a..6b6e0b94eb3e 100644
--- a/offapi/com/sun/star/sheet/DataPilotItem.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItem.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_DataPilotItem_idl__
 #define __com_sun_star_sheet_DataPilotItem_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotItems.idl b/offapi/com/sun/star/sheet/DataPilotItems.idl
index edc3bd474e04..832fdda81046 100644
--- a/offapi/com/sun/star/sheet/DataPilotItems.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItems.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_DataPilotItems_idl__
 #define __com_sun_star_sheet_DataPilotItems_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
index 074beb4e6215..526691277d81 100644
--- a/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotItemsEnumeration_idl__
 #define __com_sun_star_sheet_DataPilotItemsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSource.idl b/offapi/com/sun/star/sheet/DataPilotSource.idl
index 3629d48fd756..4e5a000343c3 100644
--- a/offapi/com/sun/star/sheet/DataPilotSource.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSource.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_DataPilotSource_idl__
 #define __com_sun_star_sheet_DataPilotSource_idl__
 
-#ifndef __com_sun_star_sheet_XDimensionsSupplier_idl__
 #include <com/sun/star/sheet/XDimensionsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotResults_idl__
 #include <com/sun/star/sheet/XDataPilotResults.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
index 9f5961731a05..82d4294a5636 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceDimension_idl__
 #define __com_sun_star_sheet_DataPilotSourceDimension_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XHierarchiesSupplier_idl__
 #include <com/sun/star/sheet/XHierarchiesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloneable_idl__
 #include <com/sun/star/util/XCloneable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldOrientation_idl__
 #include <com/sun/star/sheet/DataPilotFieldOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
 #include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TableFilterField_idl__
 #include <com/sun/star/sheet/TableFilterField.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl b/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
index 080f529e90e4..ebb58eda79f3 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceDimensions_idl__
 #define __com_sun_star_sheet_DataPilotSourceDimensions_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl b/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
index f283e157c8e1..83d907bc6800 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceHierarchies_idl__
 #define __com_sun_star_sheet_DataPilotSourceHierarchies_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl b/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
index ad300f8845e6..f228b9908e70 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceHierarchy_idl__
 #define __com_sun_star_sheet_DataPilotSourceHierarchy_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XLevelsSupplier_idl__
 #include <com/sun/star/sheet/XLevelsSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl b/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
index c94880508a2c..a20a193e068b 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceLevel_idl__
 #define __com_sun_star_sheet_DataPilotSourceLevel_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XMembersSupplier_idl__
 #include <com/sun/star/sheet/XMembersSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotMemberResults_idl__
 #include <com/sun/star/sheet/XDataPilotMemberResults.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
 #include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl b/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
index 5e09f51de346..9c00787bdfab 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceLevels_idl__
 #define __com_sun_star_sheet_DataPilotSourceLevels_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceMember.idl b/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
index c83f1031e57a..56ddd6250d1a 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceMember_idl__
 #define __com_sun_star_sheet_DataPilotSourceMember_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl b/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
index 02a93be58504..668e2fabb2d1 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotSourceMembers_idl__
 #define __com_sun_star_sheet_DataPilotSourceMembers_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotTable.idl b/offapi/com/sun/star/sheet/DataPilotTable.idl
index 19c5b143a952..0a1c07985ec6 100644
--- a/offapi/com/sun/star/sheet/DataPilotTable.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTable.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_DataPilotTable_idl__
 #define __com_sun_star_sheet_DataPilotTable_idl__
 
-#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
 #include <com/sun/star/sheet/XDataPilotDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTable_idl__
 #include <com/sun/star/sheet/XDataPilotTable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotTables.idl b/offapi/com/sun/star/sheet/DataPilotTables.idl
index f8dc00fa8e27..bdb3192d1564 100644
--- a/offapi/com/sun/star/sheet/DataPilotTables.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTables.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sheet_DataPilotTables_idl__
 #define __com_sun_star_sheet_DataPilotTables_idl__
 
-#ifndef __com_sun_star_sheet_XDataPilotTables_idl__
 #include <com/sun/star/sheet/XDataPilotTables.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
index a8b52e65425c..72b8f67c47a7 100644
--- a/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DataPilotTablesEnumeration_idl__
 #define __com_sun_star_sheet_DataPilotTablesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl b/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
index 0044b8801a03..d6ef37d58fc7 100644
--- a/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DatabaseImportDescriptor_idl__
 #define __com_sun_star_sheet_DatabaseImportDescriptor_idl__
 
-#ifndef __com_sun_star_sheet_DataImportMode_idl__
 #include <com/sun/star/sheet/DataImportMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DatabaseRange.idl b/offapi/com/sun/star/sheet/DatabaseRange.idl
index 09ea307c1b90..a906198a7fda 100644
--- a/offapi/com/sun/star/sheet/DatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRange.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_sheet_DatabaseRange_idl__
 #define __com_sun_star_sheet_DatabaseRange_idl__
 
-#ifndef __com_sun_star_sheet_XDatabaseRange_idl__
 #include <com/sun/star/sheet/XDatabaseRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
 #include <com/sun/star/sheet/XCellRangeReferrer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 
 //=============================================================================
@@ -123,7 +106,7 @@ published service DatabaseRange
 
     //-------------------------------------------------------------------------
 
-    /** specifies the range where the filter can find the filter criterias.
+    /** specifies the range where the filter can find the filter criteria.
         <p>This is only used if <member>SheetFilterDescriptor::UseFilterCriteriaSource</member> is <TRUE/>.</p>
 
         @since OOo 1.1.2
diff --git a/offapi/com/sun/star/sheet/DatabaseRanges.idl b/offapi/com/sun/star/sheet/DatabaseRanges.idl
index aed4f86aa308..68a12a622bbe 100644
--- a/offapi/com/sun/star/sheet/DatabaseRanges.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRanges.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_DatabaseRanges_idl__
 #define __com_sun_star_sheet_DatabaseRanges_idl__
 
-#ifndef __com_sun_star_sheet_XDatabaseRanges_idl__
 #include <com/sun/star/sheet/XDatabaseRanges.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl b/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
index 56dde2367734..2e2cc1725312 100644
--- a/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_DatabaseRangesEnumeration_idl__
 #define __com_sun_star_sheet_DatabaseRangesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/DocumentSettings.idl b/offapi/com/sun/star/sheet/DocumentSettings.idl
index 4d7d6fdf3c81..62f8f0dc6f53 100644
--- a/offapi/com/sun/star/sheet/DocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/DocumentSettings.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_sheet_DocumentSettings_idl__
 #define __com_sun_star_sheet_DocumentSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_document_Settings_idl__
 #include <com/sun/star/document/Settings.idl>
-#endif
 
 //=============================================================================
 
@@ -114,7 +106,7 @@ published service DocumentSettings
      */
     [optional, property] long RasterResolutionY;
 
-    /** specifies the number of subdivisions between two horiontal
+    /** specifies the number of subdivisions between two horizontal
         grid elements.
      */
     [optional, property] long RasterSubdivisionX;
diff --git a/offapi/com/sun/star/sheet/ExternalLinkInfo.idl b/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
index 0ad8d6dadeb4..9abac7c24def 100644
--- a/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
+++ b/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_ExternalLinkInfo_idl__
 #define __com_sun_star_sheet_ExternalLinkInfo_idl__
 
-#ifndef __com_sun_star_sheet_ExternalLinkType_idl__
 #include <com/sun/star/sheet/ExternalLinkType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/FillDateMode.idl b/offapi/com/sun/star/sheet/FillDateMode.idl
index 5cd9dff07dab..1e860ee60195 100644
--- a/offapi/com/sun/star/sheet/FillDateMode.idl
+++ b/offapi/com/sun/star/sheet/FillDateMode.idl
@@ -48,7 +48,7 @@ published enum FillDateMode
 
     //-------------------------------------------------------------------------
 
-    /** for evey new value a single day is added, but Saturdays and
+    /** for every new value a single day is added, but Saturdays and
         Sundays are skipped.
      */
     FILL_DATE_WEEKDAY,
diff --git a/offapi/com/sun/star/sheet/FormulaLanguage.idl b/offapi/com/sun/star/sheet/FormulaLanguage.idl
index 658273c524ac..74c1fe9d4b14 100644
--- a/offapi/com/sun/star/sheet/FormulaLanguage.idl
+++ b/offapi/com/sun/star/sheet/FormulaLanguage.idl
@@ -60,6 +60,11 @@ constants FormulaLanguage
      */
     const long NATIVE   = 3;
 
+    /** Function names and operators as used in the English version of
+        Excel.  This formula language is also used in VBA formulas and
+        OOXML import/export.
+     */
+    const long XL_ENGLISH = 4;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl b/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl
index 90edc6b22200..b5e18cd84f8e 100644
--- a/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl
+++ b/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl
@@ -90,9 +90,9 @@ constants FormulaMapGroupSpecialOffset
         used in formulas.
 
         <p>The <member>FormulaToken::Data</member> member shall contain a
-        <atom>string</atom> with the programmatical name of the function, e.g.
+        <atom>string</atom> with the programmatic name of the function, e.g.
         "com.sun.star.sheet.addin.Analysis.getEomonth" for the EOMONTH
-        function from the Analsysis add-in.</p>
+        function from the Analysis add-in.</p>
      */
     const long EXTERNAL = 3;
 
diff --git a/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl b/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
index e49a9185fc62..4fbd54f81d15 100644
--- a/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
+++ b/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
 #define __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
 
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
 #include <com/sun/star/sheet/FormulaToken.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/FormulaParser.idl b/offapi/com/sun/star/sheet/FormulaParser.idl
index acf4eca4910b..8fac32c8bd31 100644
--- a/offapi/com/sun/star/sheet/FormulaParser.idl
+++ b/offapi/com/sun/star/sheet/FormulaParser.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_sheet_FormulaParser_idl__
 #define __com_sun_star_sheet_FormulaParser_idl__
 
-#ifndef __com_sun_star_beans_PropertySet_idl__
 #include <com/sun/star/beans/PropertySet.idl>
-#endif
-#ifndef __com_sun_star_sheet_XFormulaParser_idl__
 #include <com/sun/star/sheet/XFormulaParser.idl>
-#endif
-#ifndef __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.idl>
-#endif
-#ifndef __com_sun_star_sheet_ExternalLinkInfo_idl__
 #include <com/sun/star/sheet/ExternalLinkInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/FunctionAccess.idl b/offapi/com/sun/star/sheet/FunctionAccess.idl
index 0bce84d3627d..e9ab212f001c 100644
--- a/offapi/com/sun/star/sheet/FunctionAccess.idl
+++ b/offapi/com/sun/star/sheet/FunctionAccess.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_FunctionAccess_idl__
 #define __com_sun_star_sheet_FunctionAccess_idl__
 
-#ifndef __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
 #include <com/sun/star/sheet/SpreadsheetDocumentSettings.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XFunctionAccess_idl__
 #include <com/sun/star/sheet/XFunctionAccess.idl>
-#endif
 
 //=============================================================================
 
@@ -48,7 +43,7 @@ published service FunctionAccess
 {
     //-------------------------------------------------------------------------
 
-    /** contributes properties to control the behaviour of some functions
+    /** contributes properties to control the behavior of some functions
         (i.e. NullDate, IgnoreCase, RegularExpressions).
      */
     service com::sun::star::sheet::SpreadsheetDocumentSettings;
diff --git a/offapi/com/sun/star/sheet/FunctionDescription.idl b/offapi/com/sun/star/sheet/FunctionDescription.idl
index 2e36034ea76b..31f57d0aa969 100644
--- a/offapi/com/sun/star/sheet/FunctionDescription.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_FunctionDescription_idl__
 #define __com_sun_star_sheet_FunctionDescription_idl__
 
-#ifndef __com_sun_star_sheet_FunctionArgument_idl__
 #include <com/sun/star/sheet/FunctionArgument.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl b/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
index 6749ea019903..0fd69f684c49 100644
--- a/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_FunctionDescriptionEnumeration_idl__
 #define __com_sun_star_sheet_FunctionDescriptionEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/FunctionDescriptions.idl b/offapi/com/sun/star/sheet/FunctionDescriptions.idl
index 842979bb4d1e..18fa549f3c7c 100644
--- a/offapi/com/sun/star/sheet/FunctionDescriptions.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescriptions.idl
@@ -28,16 +28,9 @@
 #ifndef __com_sun_star_sheet_FunctionDescriptions_idl__
 #define __com_sun_star_sheet_FunctionDescriptions_idl__
 
-#ifndef __com_sun_star_sheet_XFunctionDescriptions_idl__
 #include <com/sun/star/sheet/XFunctionDescriptions.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/GlobalSheetSettings.idl b/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
index 508992fd1785..ec6cbdaaee2f 100644
--- a/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
+++ b/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_GlobalSheetSettings_idl__
 #define __com_sun_star_sheet_GlobalSheetSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/HeaderFooterContent.idl b/offapi/com/sun/star/sheet/HeaderFooterContent.idl
index 39c551c0880c..0ce900c9b1c5 100644
--- a/offapi/com/sun/star/sheet/HeaderFooterContent.idl
+++ b/offapi/com/sun/star/sheet/HeaderFooterContent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_HeaderFooterContent_idl__
 #define __com_sun_star_sheet_HeaderFooterContent_idl__
 
-#ifndef __com_sun_star_sheet_XHeaderFooterContent_idl__
 #include <com/sun/star/sheet/XHeaderFooterContent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/LabelRange.idl b/offapi/com/sun/star/sheet/LabelRange.idl
index a5e1b98302a2..62781cc7771a 100644
--- a/offapi/com/sun/star/sheet/LabelRange.idl
+++ b/offapi/com/sun/star/sheet/LabelRange.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_LabelRange_idl__
 #define __com_sun_star_sheet_LabelRange_idl__
 
-#ifndef __com_sun_star_sheet_XLabelRange_idl__
 #include <com/sun/star/sheet/XLabelRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/LabelRanges.idl b/offapi/com/sun/star/sheet/LabelRanges.idl
index d8659f7a625b..83510c6141ab 100644
--- a/offapi/com/sun/star/sheet/LabelRanges.idl
+++ b/offapi/com/sun/star/sheet/LabelRanges.idl
@@ -28,16 +28,9 @@
 #ifndef __com_sun_star_sheet_LabelRanges_idl__
 #define __com_sun_star_sheet_LabelRanges_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XLabelRanges_idl__
 #include <com/sun/star/sheet/XLabelRanges.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl b/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
index 18817df0d228..00830e32aba0 100644
--- a/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_LabelRangesEnumeration_idl__
 #define __com_sun_star_sheet_LabelRangesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/LocalizedName.idl b/offapi/com/sun/star/sheet/LocalizedName.idl
index 1f8a7a8eebf6..1d6c7b7d2ead 100644
--- a/offapi/com/sun/star/sheet/LocalizedName.idl
+++ b/offapi/com/sun/star/sheet/LocalizedName.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_LocalizedName_idl__
 #define __com_sun_star_sheet_LocalizedName_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/NamedRange.idl b/offapi/com/sun/star/sheet/NamedRange.idl
index 445bf984c7e6..8dd4a7727b93 100644
--- a/offapi/com/sun/star/sheet/NamedRange.idl
+++ b/offapi/com/sun/star/sheet/NamedRange.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_NamedRange_idl__
 #define __com_sun_star_sheet_NamedRange_idl__
 
-#ifndef __com_sun_star_sheet_XNamedRange_idl__
 #include <com/sun/star/sheet/XNamedRange.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
 #include <com/sun/star/sheet/XCellRangeReferrer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/NamedRanges.idl b/offapi/com/sun/star/sheet/NamedRanges.idl
index e7be40c8c6e5..2f062d84016d 100644
--- a/offapi/com/sun/star/sheet/NamedRanges.idl
+++ b/offapi/com/sun/star/sheet/NamedRanges.idl
@@ -28,22 +28,11 @@
 #ifndef __com_sun_star_sheet_NamedRanges_idl__
 #define __com_sun_star_sheet_NamedRanges_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XNamedRanges_idl__
 #include <com/sun/star/sheet/XNamedRanges.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_document_XActionLockable_idl__
 #include <com/sun/star/document/XActionLockable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl b/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
index 9bfeea931a01..0c369730cc9a 100644
--- a/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_NamedRangesEnumeration_idl__
 #define __com_sun_star_sheet_NamedRangesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/NoConvergenceException.idl b/offapi/com/sun/star/sheet/NoConvergenceException.idl
index b427b67f28ea..f4edee3fad01 100644
--- a/offapi/com/sun/star/sheet/NoConvergenceException.idl
+++ b/offapi/com/sun/star/sheet/NoConvergenceException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_NoConvergenceException_idl__
 #define __com_sun_star_sheet_NoConvergenceException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/RangeSelectionEvent.idl b/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
index 859466b51d5d..b1789b764ab1 100644
--- a/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
+++ b/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__
 #define __com_sun_star_sheet_RangeSelectionEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/RecentFunctions.idl b/offapi/com/sun/star/sheet/RecentFunctions.idl
index 636a0bcf8f31..588b2b671641 100644
--- a/offapi/com/sun/star/sheet/RecentFunctions.idl
+++ b/offapi/com/sun/star/sheet/RecentFunctions.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_RecentFunctions_idl__
 #define __com_sun_star_sheet_RecentFunctions_idl__
 
-#ifndef __com_sun_star_sheet_XRecentFunctions_idl__
 #include <com/sun/star/sheet/XRecentFunctions.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/ResultEvent.idl b/offapi/com/sun/star/sheet/ResultEvent.idl
index 3fc5184da6ae..ed77a0710244 100644
--- a/offapi/com/sun/star/sheet/ResultEvent.idl
+++ b/offapi/com/sun/star/sheet/ResultEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_ResultEvent_idl__
 #define __com_sun_star_sheet_ResultEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/Scenario.idl b/offapi/com/sun/star/sheet/Scenario.idl
index a47b2c3df484..bb9632b04698 100644
--- a/offapi/com/sun/star/sheet/Scenario.idl
+++ b/offapi/com/sun/star/sheet/Scenario.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_Scenario_idl__
 #define __com_sun_star_sheet_Scenario_idl__
 
-#ifndef __com_sun_star_sheet_XScenario_idl__
 #include <com/sun/star/sheet/XScenario.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XScenarioEnhanced_idl__
 #include <com/sun/star/sheet/XScenarioEnhanced.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/Scenarios.idl b/offapi/com/sun/star/sheet/Scenarios.idl
index 31f3da181f0b..b20438c9af53 100644
--- a/offapi/com/sun/star/sheet/Scenarios.idl
+++ b/offapi/com/sun/star/sheet/Scenarios.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_Scenarios_idl__
 #define __com_sun_star_sheet_Scenarios_idl__
 
-#ifndef __com_sun_star_sheet_XScenariosSupplier_idl__
 #include <com/sun/star/sheet/XScenariosSupplier.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/ScenariosEnumeration.idl b/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
index ca6c0a7b8335..fc6090d1e8f1 100644
--- a/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
+++ b/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_ScenariosEnumeration_idl__
 #define __com_sun_star_sheet_ScenariosEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/Shape.idl b/offapi/com/sun/star/sheet/Shape.idl
index 0aca01b81b52..38c6f29171df 100644
--- a/offapi/com/sun/star/sheet/Shape.idl
+++ b/offapi/com/sun/star/sheet/Shape.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_sheet_Shape_idl__
 #define __com_sun_star_sheet_Shape_idl__
 
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetCell.idl b/offapi/com/sun/star/sheet/SheetCell.idl
index 3e9f8066a059..7b82aa8c4c35 100644
--- a/offapi/com/sun/star/sheet/SheetCell.idl
+++ b/offapi/com/sun/star/sheet/SheetCell.idl
@@ -29,95 +29,32 @@
 #define __com_sun_star_sheet_SheetCell_idl__
 
 
-#ifndef __com_sun_star_table_Cell_idl__
 #include <com/sun/star/table/Cell.idl>
-#endif
-
-#ifndef __com_sun_star_text_Text_idl__
 #include <com/sun/star/text/Text.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
 #include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
 #include <com/sun/star/sheet/SheetRangesQuery.idl>
-#endif
 
 
-#ifndef __com_sun_star_document_XActionLockable_idl__
 #include <com/sun/star/document/XActionLockable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XReplaceable_idl__
 #include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XIndent_idl__
 #include <com/sun/star/util/XIndent.idl>
-#endif
-
-#ifndef __com_sun_star_table_XColumnRowRange_idl__
 #include <com/sun/star/table/XColumnRowRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellAddressable_idl__
 #include <com/sun/star/sheet/XCellAddressable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotationAnchor_idl__
 #include <com/sun/star/sheet/XSheetAnnotationAnchor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFieldsSupplier_idl__
 #include <com/sun/star/text/XTextFieldsSupplier.idl>
-#endif
 
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
 #include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
 #include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
 
 //=============================================================================
 
@@ -199,7 +136,7 @@ published service SheetCell
         <p>The property
         <member scope="com::sun::star::util">SearchDescriptor::SearchWords</member>
         has a different meaning in spreadsheets: If set to <TRUE/>, the
-        spreadsheet searches for cells containing the serch text only.</p>
+        spreadsheet searches for cells containing the search text only.</p>
      */
     interface com::sun::star::util::XReplaceable;
 
@@ -327,7 +264,7 @@ published service SheetCell
 
     //-------------------------------------------------------------------------
 
-    /** Returns the absolute adress of the range as string, e.g. "$Sheet1.$B$2".
+    /** Returns the absolute address of the range as string, e.g. "$Sheet1.$B$2".
      */
     [optional, readonly, property] string AbsoluteName;
 };
diff --git a/offapi/com/sun/star/sheet/SheetCellCursor.idl b/offapi/com/sun/star/sheet/SheetCellCursor.idl
index 23724f423174..eaaa9e2682f8 100644
--- a/offapi/com/sun/star/sheet/SheetCellCursor.idl
+++ b/offapi/com/sun/star/sheet/SheetCellCursor.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_SheetCellCursor_idl__
 #define __com_sun_star_sheet_SheetCellCursor_idl__
 
-#ifndef __com_sun_star_table_CellCursor_idl__
 #include <com/sun/star/table/CellCursor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetCellRange_idl__
 #include <com/sun/star/sheet/SheetCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellCursor_idl__
 #include <com/sun/star/sheet/XSheetCellCursor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XUsedAreaCursor_idl__
 #include <com/sun/star/sheet/XUsedAreaCursor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetCellRange.idl b/offapi/com/sun/star/sheet/SheetCellRange.idl
index d6b42ffa7cef..a275751feca9 100644
--- a/offapi/com/sun/star/sheet/SheetCellRange.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRange.idl
@@ -29,135 +29,42 @@
 #define __com_sun_star_sheet_SheetCellRange_idl__
 
 
-#ifndef __com_sun_star_table_CellRange_idl__
 #include <com/sun/star/table/CellRange.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
 #include <com/sun/star/sheet/SheetRangesQuery.idl>
-#endif
 
 
-#ifndef __com_sun_star_util_XReplaceable_idl__
 #include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XMergeable_idl__
 #include <com/sun/star/util/XMergeable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XIndent_idl__
 #include <com/sun/star/util/XIndent.idl>
-#endif
-
-#ifndef __com_sun_star_table_XColumnRowRange_idl__
 #include <com/sun/star/table/XColumnRowRange.idl>
-#endif
-
-#ifndef __com_sun_star_table_XAutoFormattable_idl__
 #include <com/sun/star/table/XAutoFormattable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
 #include <com/sun/star/sheet/XSheetCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
 #include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeFormula_idl__
 #include <com/sun/star/sheet/XCellRangeFormula.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeAddressable_idl__
 #include <com/sun/star/sheet/XCellRangeAddressable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetOperation_idl__
 #include <com/sun/star/sheet/XSheetOperation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellSeries_idl__
 #include <com/sun/star/sheet/XCellSeries.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XArrayFormulaRange_idl__
 #include <com/sun/star/sheet/XArrayFormulaRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XMultipleOperation_idl__
 #include <com/sun/star/sheet/XMultipleOperation.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
 #include <com/sun/star/util/XSortable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XImportable_idl__
 #include <com/sun/star/util/XImportable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSubTotalCalculatable_idl__
 #include <com/sun/star/sheet/XSubTotalCalculatable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterableEx_idl__
 #include <com/sun/star/sheet/XSheetFilterableEx.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellFormatRangesSupplier_idl__
 #include <com/sun/star/sheet/XCellFormatRangesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XUniqueCellFormatRangesSupplier_idl__
 #include <com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
 #include <com/sun/star/chart/XChartDataArray.idl>
-#endif
 
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
 #include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
 #include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
 
 //=============================================================================
 
@@ -216,7 +123,7 @@ published service SheetCellRange
         <p>The property
         <member scope="com::sun::star::util">SearchDescriptor::SearchWords</member>
         has a different meaning in spreadsheets: If set to <TRUE/>, the
-        spreadsheet searches for cells containing the serch text only.</p>
+        spreadsheet searches for cells containing the search text only.</p>
      */
     interface com::sun::star::util::XReplaceable;
 
@@ -421,7 +328,7 @@ published service SheetCellRange
 
     //-------------------------------------------------------------------------
 
-    /** Returns the absolute adress of the range as string, e.g. "$Sheet1.$B$2:$D$5".
+    /** Returns the absolute address of the range as string, e.g. "$Sheet1.$B$2:$D$5".
      */
     [optional, readonly, property] string AbsoluteName;
 };
diff --git a/offapi/com/sun/star/sheet/SheetCellRanges.idl b/offapi/com/sun/star/sheet/SheetCellRanges.idl
index 020521203af5..14272aa36e36 100644
--- a/offapi/com/sun/star/sheet/SheetCellRanges.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRanges.idl
@@ -29,67 +29,25 @@
 #define __com_sun_star_sheet_SheetCellRanges_idl__
 
 
-#ifndef __com_sun_star_table_CellProperties_idl__
 #include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
 #include <com/sun/star/sheet/SheetRangesQuery.idl>
-#endif
 
 
-#ifndef __com_sun_star_util_XReplaceable_idl__
 #include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XIndent_idl__
 #include <com/sun/star/util/XIndent.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetOperation_idl__
 #include <com/sun/star/sheet/XSheetOperation.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
 #include <com/sun/star/chart/XChartDataArray.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRangeContainer_idl__
 #include <com/sun/star/sheet/XSheetCellRangeContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
 #include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -146,7 +104,7 @@ published service SheetCellRanges
         <p>The property
         <member scope="com::sun::star::util">SearchDescriptor::SearchWords</member>
         has a different meaning in spreadsheets: If set to <TRUE/>, the
-        spreadsheet searches for cells containing the serch text only.</p>
+        spreadsheet searches for cells containing the search text only.</p>
      */
     interface com::sun::star::util::XReplaceable;
 
@@ -244,7 +202,7 @@ published service SheetCellRanges
 
     //-------------------------------------------------------------------------
 
-    /** Returns the absolute adress of the ranges as string, e.g. "$Sheet1.$B$2:$D$5".
+    /** Returns the absolute address of the ranges as string, e.g. "$Sheet1.$B$2:$D$5".
      */
     [optional, readonly, property] string AbsoluteName;
 };
diff --git a/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl b/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
index f0989e3cffd2..173c4b180de5 100644
--- a/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SheetCellRangesEnumeration_idl__
 #define __com_sun_star_sheet_SheetCellRangesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl b/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl
index cd4a12abde76..66c20dc151e3 100644
--- a/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl
@@ -43,7 +43,7 @@ module com {  module sun {  module star {  module sheet {
 /** represents a description of how a cell range is to be filtered.
 
     <p>The descriptor contains properties and a collection of filter
-    conditions (filter fields) which control the behaviour of a filter
+    conditions (filter fields) which control the behavior of a filter
     operation.</p>
  */
 published service SheetFilterDescriptor
diff --git a/offapi/com/sun/star/sheet/SheetLink.idl b/offapi/com/sun/star/sheet/SheetLink.idl
index b81b79ce19be..4dd3ce69c0b6 100644
--- a/offapi/com/sun/star/sheet/SheetLink.idl
+++ b/offapi/com/sun/star/sheet/SheetLink.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_SheetLink_idl__
 #define __com_sun_star_sheet_SheetLink_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetLinks.idl b/offapi/com/sun/star/sheet/SheetLinks.idl
index ee960b37e57c..5f9d7e603361 100644
--- a/offapi/com/sun/star/sheet/SheetLinks.idl
+++ b/offapi/com/sun/star/sheet/SheetLinks.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_SheetLinks_idl__
 #define __com_sun_star_sheet_SheetLinks_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl b/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
index 85749701c85a..02cc2696b21b 100644
--- a/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SheetLinksEnumeration_idl__
 #define __com_sun_star_sheet_SheetLinkssEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetRangesQuery.idl b/offapi/com/sun/star/sheet/SheetRangesQuery.idl
index 623220a1df20..adae1442e915 100644
--- a/offapi/com/sun/star/sheet/SheetRangesQuery.idl
+++ b/offapi/com/sun/star/sheet/SheetRangesQuery.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_SheetRangesQuery_idl__
 #define __com_sun_star_sheet_SheetRangesQuery_idl__
 
-#ifndef __com_sun_star_sheet_XCellRangesQuery_idl__
 #include <com/sun/star/sheet/XCellRangesQuery.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XFormulaQuery_idl__
 #include <com/sun/star/sheet/XFormulaQuery.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetSortDescriptor.idl b/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
index 64e1e240434c..36cdf79f2e9d 100644
--- a/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_SheetSortDescriptor_idl__
 #define __com_sun_star_sheet_SheetSortDescriptor_idl__
 
-#ifndef __com_sun_star_table_TableSortDescriptor_idl__
 #include <com/sun/star/table/TableSortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl b/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
index 6c0723c06d55..5a694cd93468 100644
--- a/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
+++ b/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_SheetSortDescriptor2_idl__
 #define __com_sun_star_sheet_SheetSortDescriptor2_idl__
 
-#ifndef __com_sun_star_table_TableSortDescriptor2_idl__
 #include <com/sun/star/table/TableSortDescriptor2.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/Solver.idl b/offapi/com/sun/star/sheet/Solver.idl
index 25fb5ac92f41..11aad514ae5d 100644
--- a/offapi/com/sun/star/sheet/Solver.idl
+++ b/offapi/com/sun/star/sheet/Solver.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_Solver_idl__
 #define __com_sun_star_sheet_Solver_idl__
 
-#ifndef __com_sun_star_sheet_XSolver_idl__
 #include <com/sun/star/sheet/XSolver.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SolverConstraint.idl b/offapi/com/sun/star/sheet/SolverConstraint.idl
index 10d735f92a15..cff56823c253 100644
--- a/offapi/com/sun/star/sheet/SolverConstraint.idl
+++ b/offapi/com/sun/star/sheet/SolverConstraint.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_SolverConstraint_idl__
 #define __com_sun_star_sheet_SolverConstraint_idl__
 
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SolverConstraintOperator_idl__
 #include <com/sun/star/sheet/SolverConstraintOperator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/Spreadsheet.idl b/offapi/com/sun/star/sheet/Spreadsheet.idl
index 0b21a050d099..4458b83ec1f3 100644
--- a/offapi/com/sun/star/sheet/Spreadsheet.idl
+++ b/offapi/com/sun/star/sheet/Spreadsheet.idl
@@ -28,74 +28,23 @@
 #ifndef __com_sun_star_sheet_Spreadsheet_idl__
 #define __com_sun_star_sheet_Spreadsheet_idl__
 
-#ifndef __com_sun_star_sheet_SheetCellRange_idl__
 #include <com/sun/star/sheet/SheetCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
 #include <com/sun/star/sheet/XSpreadsheet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_util_XProtectable_idl__
 #include <com/sun/star/util/XProtectable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTablesSupplier_idl__
 #include <com/sun/star/sheet/XDataPilotTablesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XScenariosSupplier_idl__
 #include <com/sun/star/sheet/XScenariosSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotationsSupplier_idl__
 #include <com/sun/star/sheet/XSheetAnnotationsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPageSupplier_idl__
 #include <com/sun/star/drawing/XDrawPageSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableChartsSupplier_idl__
 #include <com/sun/star/table/XTableChartsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeMovement_idl__
 #include <com/sun/star/sheet/XCellRangeMovement.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XPrintAreas_idl__
 #include <com/sun/star/sheet/XPrintAreas.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetPageBreak_idl__
 #include <com/sun/star/sheet/XSheetPageBreak.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetOutline_idl__
 #include <com/sun/star/sheet/XSheetOutline.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAuditing_idl__
 #include <com/sun/star/sheet/XSheetAuditing.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetLinkable_idl__
 #include <com/sun/star/sheet/XSheetLinkable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_Scenario_idl__
 #include <com/sun/star/sheet/Scenario.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XExternalSheetName_idl__
 #include <com/sun/star/sheet/XExternalSheetName.idl>
-#endif
-
 #include <com/sun/star/util/Color.idl>
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocument.idl b/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
index 3c5ad45d7942..b3a479b9c5dc 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
@@ -28,91 +28,31 @@
 #ifndef __com_sun_star_sheet_SpreadsheetDocument_idl__
 #define __com_sun_star_sheet_SpreadsheetDocument_idl__
 
-#ifndef __com_sun_star_document_OfficeDocument_idl__
 #include <com/sun/star/document/OfficeDocument.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
 #include <com/sun/star/sheet/SpreadsheetDocumentSettings.idl>
-#endif
 
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_document_XActionLockable_idl__
 #include <com/sun/star/document/XActionLockable.idl>
-#endif
-
-#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
 #include <com/sun/star/document/XLinkTargetSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XProtectable_idl__
 #include <com/sun/star/util/XProtectable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheetDocument_idl__
 #include <com/sun/star/sheet/XSpreadsheetDocument.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCalculatable_idl__
 #include <com/sun/star/sheet/XCalculatable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDocumentAuditing_idl__
 #include <com/sun/star/sheet/XDocumentAuditing.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XConsolidatable_idl__
 #include <com/sun/star/sheet/XConsolidatable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XGoalSeek_idl__
 #include <com/sun/star/sheet/XGoalSeek.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
 #include <com/sun/star/drawing/XDrawPagesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
 
 
-#ifndef __com_sun_star_sheet_XNamedRanges_idl__
 #include <com/sun/star/sheet/XNamedRanges.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDatabaseRanges_idl__
 #include <com/sun/star/sheet/XDatabaseRanges.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XLabelRanges_idl__
 #include <com/sun/star/sheet/XLabelRanges.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XAreaLinks_idl__
 #include <com/sun/star/sheet/XAreaLinks.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XExternalDocLinks_idl__
 #include <com/sun/star/sheet/XExternalDocLinks.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
index e89ae136053b..fddd8255e90a 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
 #define __com_sun_star_sheet_SpreadsheetDocumentSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Date_idl__
 #include <com/sun/star/util/Date.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
 #include <com/sun/star/i18n/XForbiddenCharacters.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDevice_idl__
 #include <com/sun/star/awt/XDevice.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
index 75b685071eb9..29102eb10ea6 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_sheet_SpreadsheetDrawPage_idl__
 #define __com_sun_star_sheet_SpreadsheetDrawPage_idl__
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapeGrouper_idl__
 #include <com/sun/star/drawing/XShapeGrouper.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetView.idl b/offapi/com/sun/star/sheet/SpreadsheetView.idl
index 40ade27fedad..ea0a9e1462ae 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetView.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetView.idl
@@ -27,53 +27,18 @@
 #ifndef __com_sun_star_sheet_SpreadsheetView_idl__
 #define __com_sun_star_sheet_SpreadsheetView_idl__
 
-#ifndef __com_sun_star_frame_Controller_idl__
 #include <com/sun/star/frame/Controller.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SpreadsheetViewSettings_idl__
 #include <com/sun/star/sheet/SpreadsheetViewSettings.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SpreadsheetViewPane_idl__
 #include <com/sun/star/sheet/SpreadsheetViewPane.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheetView_idl__
 #include <com/sun/star/sheet/XSpreadsheetView.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XViewSplitable_idl__
 #include <com/sun/star/sheet/XViewSplitable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XViewFreezable_idl__
 #include <com/sun/star/sheet/XViewFreezable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XRangeSelection_idl__
 #include <com/sun/star/sheet/XRangeSelection.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XActivationBroadcaster_idl__
 #include <com/sun/star/sheet/XActivationBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XEnhancedMouseClickBroadcaster_idl__
 #include <com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewObjectsMode.idl b/offapi/com/sun/star/sheet/SpreadsheetViewObjectsMode.idl
index d672dd8931e9..d672dd8931e9 100755..100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewObjectsMode.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewObjectsMode.idl
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl b/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
index 254601559a16..71c0796ea822 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_sheet_SpreadsheetViewPane_idl__
 #define __com_sun_star_sheet_SpreadsheetViewPane_idl__
 
-#ifndef __com_sun_star_sheet_XViewPane_idl__
 #include <com/sun/star/sheet/XViewPane.idl>
-#endif
 
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
 #include <com/sun/star/sheet/XCellRangeReferrer.idl>
-#endif
 
-#ifndef __com_sun_star_view_XControlAccess_idl__
 #include <com/sun/star/view/XControlAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl b/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
index de2d6c70fc8c..e9e6736cedf7 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SpreadsheetViewPanesEnumeration_idl__
 #define __com_sun_star_sheet_SpreadsheetViewPanesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
index c1b56ff7ffc6..208d7ac71b3a 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
@@ -28,13 +28,9 @@
 #ifndef __com_sun_star_sheet_SpreadsheetViewSettings_idl__
 #define __com_sun_star_sheet_SpreadsheetViewSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/Spreadsheets.idl b/offapi/com/sun/star/sheet/Spreadsheets.idl
index 0e04297f1a99..8b7b19236690 100644
--- a/offapi/com/sun/star/sheet/Spreadsheets.idl
+++ b/offapi/com/sun/star/sheet/Spreadsheets.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_Spreadsheets_idl__
 #define __com_sun_star_sheet_Spreadsheets_idl__
 
-#ifndef __com_sun_star_sheet_XSpreadsheets_idl__
 #include <com/sun/star/sheet/XSpreadsheets.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangesAccess_idl__
 #include <com/sun/star/sheet/XCellRangesAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl b/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
index e42bb9d9d93b..306e005efa02 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SpreadsheetsEnumeration_idl__
 #define __com_sun_star_sheet_SpreadsheetsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SubTotalColumn.idl b/offapi/com/sun/star/sheet/SubTotalColumn.idl
index 45ebf2b9853e..65401eee335a 100644
--- a/offapi/com/sun/star/sheet/SubTotalColumn.idl
+++ b/offapi/com/sun/star/sheet/SubTotalColumn.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SubTotalColumn_idl__
 #define __com_sun_star_sheet_SubTotalColumn_idl__
 
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
 #include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SubTotalDescriptor.idl b/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
index 399cb5b1d7d1..24ad58d8e0cb 100644
--- a/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
@@ -28,19 +28,10 @@
 #ifndef __com_sun_star_sheet_SubTotalDescriptor_idl__
 #define __com_sun_star_sheet_SubTotalDescriptor_idl__
 
-#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
 #include <com/sun/star/sheet/XSubTotalDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
@@ -51,7 +42,7 @@ module com {  module sun {  module star {  module sheet {
 /** represents a description of how subtotals are created.
 
     <p>The descriptor contains properties and a collection of subtotal fields
-    which control the behaviour of operation.</p>
+    which control the behavior of operation.</p>
  */
 published service SubTotalDescriptor
 {
@@ -78,7 +69,7 @@ published service SubTotalDescriptor
     //-------------------------------------------------------------------------
 
 //!published service PropertySet
-    /** procides access to the properties.
+    /** provides access to the properties.
      */
     interface com::sun::star::beans::XPropertySet;
 
diff --git a/offapi/com/sun/star/sheet/SubTotalField.idl b/offapi/com/sun/star/sheet/SubTotalField.idl
index bbec0c9706e8..c5dfe04f2b98 100644
--- a/offapi/com/sun/star/sheet/SubTotalField.idl
+++ b/offapi/com/sun/star/sheet/SubTotalField.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SubTotalField_idl__
 #define __com_sun_star_sheet_SubTotalField_idl__
 
-#ifndef __com_sun_star_sheet_XSubTotalField_idl__
 #include <com/sun/star/sheet/XSubTotalField.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl b/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
index 49d6523a9d93..1f57de84cc97 100644
--- a/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_SubTotalFieldsEnumeration_idl__
 #define __com_sun_star_sheet_SubTotalFieldsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableAutoFormat.idl b/offapi/com/sun/star/sheet/TableAutoFormat.idl
index 8f9af3b41ef7..90e11602b7f2 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormat.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormat.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_TableAutoFormat_idl__
 #define __com_sun_star_sheet_TableAutoFormat_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl b/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
index 636ca5d6e856..fe72e1ca2990 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_TableAutoFormatEnumeration_idl__
 #define __com_sun_star_sheet_TableAutoFormatEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatField.idl b/offapi/com/sun/star/sheet/TableAutoFormatField.idl
index 90ae519a4c51..9e172bde844b 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatField.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatField.idl
@@ -28,41 +28,15 @@
 #ifndef __com_sun_star_sheet_TableAutoFormatField_idl__
 #define __com_sun_star_sheet_TableAutoFormatField_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontSlant_idl__
 #include <com/sun/star/awt/FontSlant.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellHoriJustify_idl__
 #include <com/sun/star/table/CellHoriJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellVertJustify_idl__
 #include <com/sun/star/table/CellVertJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellOrientation_idl__
 #include <com/sun/star/table/CellOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableBorder_idl__
 #include <com/sun/star/table/TableBorder.idl>
-#endif
 
 //=============================================================================
 
@@ -88,7 +62,7 @@ published service TableAutoFormatField
      */
     [property] string CharFontName;
 
-    /** specifies the name of the asian font.
+    /** specifies the name of the Asian font.
      */
     [optional, property] string CharFontNameAsian;
 
@@ -102,7 +76,7 @@ published service TableAutoFormatField
      */
     [property] string CharFontStyleName;
 
-    /** specifies the name of the asian font style.
+    /** specifies the name of the Asian font style.
      */
     [optional, property] string CharFontStyleNameAsian;
 
@@ -116,7 +90,7 @@ published service TableAutoFormatField
      */
     [property] string CharFontCharSet;
 
-    /** contains the value of the character set of the asian font.
+    /** contains the value of the character set of the Asian font.
      */
     [optional, property] string CharFontCharSetAsian;
 
@@ -130,7 +104,7 @@ published service TableAutoFormatField
      */
     [property] string CharFontFamily;
 
-    /** contains the value of the asian font family.
+    /** contains the value of the Asian font family.
      */
     [optional, property] string CharFontFamilyAsian;
 
@@ -144,7 +118,7 @@ published service TableAutoFormatField
      */
     [property] string CharFontPitch;
 
-    /** contains the value of the pitch of the asian font.
+    /** contains the value of the pitch of the Asian font.
      */
     [optional, property] string CharFontPitchAsian;
 
@@ -158,7 +132,7 @@ published service TableAutoFormatField
      */
     [property] float CharHeight;
 
-    /** contains the height of characters of the asian font in point.
+    /** contains the height of characters of the Asian font in point.
      */
     [optional, property] float CharHeightAsian;
 
@@ -172,7 +146,7 @@ published service TableAutoFormatField
      */
     [property] float CharWeight;
 
-    /** contains the value for the weight of characters of the asian font.
+    /** contains the value for the weight of characters of the Asian font.
      */
     [optional, property] float CharWeightAsian;
 
@@ -186,11 +160,11 @@ published service TableAutoFormatField
      */
     [property] com::sun::star::awt::FontSlant CharPosture;
 
-    /** contains the value of the posture of characters of the asian font.
+    /** contains the value of the posture of characters of the Asian font.
      */
     [optional, property] com::sun::star::awt::FontSlant CharPostureAsian;
 
-    /** contains the value of the posture of characters of the comlex font.
+    /** contains the value of the posture of characters of the complex font.
      */
     [optional, property] com::sun::star::awt::FontSlant CharPostureComplex;
 
@@ -278,7 +252,7 @@ published service TableAutoFormatField
 
     //-------------------------------------------------------------------------
 
-    /** contains the reference egde of the cell rotation.
+    /** contains the reference edge of the cell rotation.
      */
     [optional, property] com::sun::star::table::CellVertJustify RotateReference;
 
diff --git a/offapi/com/sun/star/sheet/TableAutoFormats.idl b/offapi/com/sun/star/sheet/TableAutoFormats.idl
index bffc1cdccbb2..5099c2d590ea 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormats.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormats.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_TableAutoFormats_idl__
 #define __com_sun_star_sheet_TableAutoFormats_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl b/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
index 3d7b19ed411c..035144825ddf 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_TableAutoFormatsEnumeration_idl__
 #define __com_sun_star_sheet_TableAutoFormatsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableCellStyle.idl b/offapi/com/sun/star/sheet/TableCellStyle.idl
index 94559721145a..4273637f6ff5 100644
--- a/offapi/com/sun/star/sheet/TableCellStyle.idl
+++ b/offapi/com/sun/star/sheet/TableCellStyle.idl
@@ -28,29 +28,12 @@
 #ifndef __com_sun_star_sheet_TableCellStyle_idl__
 #define __com_sun_star_sheet_TableCellStyle_idl__
 
-#ifndef __com_sun_star_table_CellProperties_idl__
 #include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CellStyle_idl__
 #include <com/sun/star/style/CellStyle.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableConditionalEntry.idl b/offapi/com/sun/star/sheet/TableConditionalEntry.idl
index d0a10cd8f4fc..9888a9dd2753 100644
--- a/offapi/com/sun/star/sheet/TableConditionalEntry.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalEntry.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_TableConditionalEntry_idl__
 #define __com_sun_star_sheet_TableConditionalEntry_idl__
 
-#ifndef __com_sun_star_sheet_XSheetCondition_idl__
 #include <com/sun/star/sheet/XSheetCondition.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetConditionalEntry_idl__
 #include <com/sun/star/sheet/XSheetConditionalEntry.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl b/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
index 815563a4aa93..2100a715a1c9 100644
--- a/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_TableConditionalEntryEnumeration_idl__
 #define __com_sun_star_sheet_TableConditionalEntryEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableConditionalFormat.idl b/offapi/com/sun/star/sheet/TableConditionalFormat.idl
index 4c21a61ce712..4780e1424c42 100644
--- a/offapi/com/sun/star/sheet/TableConditionalFormat.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalFormat.idl
@@ -28,16 +28,9 @@
 #ifndef __com_sun_star_sheet_TableConditionalFormat_idl__
 #define __com_sun_star_sheet_TableConditionalFormat_idl__
 
-#ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
 #include <com/sun/star/sheet/XSheetConditionalEntries.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TablePageStyle.idl b/offapi/com/sun/star/sheet/TablePageStyle.idl
index 686fb113d62c..8e3ae763bcb8 100644
--- a/offapi/com/sun/star/sheet/TablePageStyle.idl
+++ b/offapi/com/sun/star/sheet/TablePageStyle.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_TablePageStyle_idl__
 #define __com_sun_star_sheet_TablePageStyle_idl__
 
-#ifndef __com_sun_star_style_PageStyle_idl__
 #include <com/sun/star/style/PageStyle.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XHeaderFooterContent_idl__
 #include <com/sun/star/sheet/XHeaderFooterContent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/TableValidation.idl b/offapi/com/sun/star/sheet/TableValidation.idl
index f71ab2b1e6aa..09e866fab371 100644
--- a/offapi/com/sun/star/sheet/TableValidation.idl
+++ b/offapi/com/sun/star/sheet/TableValidation.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_TableValidation_idl__
 #define __com_sun_star_sheet_TableValidation_idl__
 
-#ifndef __com_sun_star_sheet_XSheetCondition_idl__
 #include <com/sun/star/sheet/XSheetCondition.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ValidationType_idl__
 #include <com/sun/star/sheet/ValidationType.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ValidationAlertStyle_idl__
 #include <com/sun/star/sheet/ValidationAlertStyle.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl b/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
index d8edb544e2d9..43a19c3bd4d1 100644
--- a/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
+++ b/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_UniqueCellFormatRanges_idl__
 #define __com_sun_star_sheet_UniqueCellFormatRanges_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl b/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
index ebfda93bf203..181a9b654e21 100644
--- a/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_UniqueCellFormatRangesEnumeration_idl__
 #define __com_sun_star_sheet_UniqueCellFormatRangesEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/ValidationType.idl b/offapi/com/sun/star/sheet/ValidationType.idl
index 0c6d7a433570..c0139181fa4c 100644
--- a/offapi/com/sun/star/sheet/ValidationType.idl
+++ b/offapi/com/sun/star/sheet/ValidationType.idl
@@ -82,7 +82,7 @@ published enum ValidationType
 
     //-------------------------------------------------------------------------
 
-    /** The specified formula detemines which contents are valid.
+    /** The specified formula determines which contents are valid.
      */
     CUSTOM
 
diff --git a/offapi/com/sun/star/sheet/VolatileResult.idl b/offapi/com/sun/star/sheet/VolatileResult.idl
index 791416855998..ebadf4b0ffba 100644
--- a/offapi/com/sun/star/sheet/VolatileResult.idl
+++ b/offapi/com/sun/star/sheet/VolatileResult.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_VolatileResult_idl__
 #define __com_sun_star_sheet_VolatileResult_idl__
 
-#ifndef __com_sun_star_sheet_XVolatileResult_idl__
 #include <com/sun/star/sheet/XVolatileResult.idl>
-#endif
 
 //=============================================================================
 
@@ -50,7 +48,7 @@ published service VolatileResult
 {
     // ------------------------------------------------------------------------
 
-    /** porovides handling with a volatile function result.
+    /** provides handling with a volatile function result.
      */
     interface com::sun::star::sheet::XVolatileResult;
 
diff --git a/offapi/com/sun/star/sheet/XActivationBroadcaster.idl b/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
index e49a97e21d33..dad59c19f2a1 100644
--- a/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
+++ b/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XActivationBroadcaster_idl__
 #define __com_sun_star_sheet_XActivationBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XActivationEventListener_idl__
 #include <com/sun/star/sheet/XActivationEventListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XActivationEventListener.idl b/offapi/com/sun/star/sheet/XActivationEventListener.idl
index 7a129c0ae5df..42537aa2ce09 100644
--- a/offapi/com/sun/star/sheet/XActivationEventListener.idl
+++ b/offapi/com/sun/star/sheet/XActivationEventListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XActivationEventListener_idl__
 #define __com_sun_star_sheet_XActivationEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ActivationEvent_idl__
 #include <com/sun/star/sheet/ActivationEvent.idl>
-#endif
 
 
 //=============================================================================
@@ -58,7 +53,7 @@ published interface XActivationEventListener: com::sun::star::lang::XEventListen
             the event that gives further information on which Spreadsheet is active now.
 
         @see ActivationEvent
-        @see XSpreadsheetViewEventProvieder
+        @see XSpreadsheetViewEventProvider
 
         @since OOo 2.0
 
diff --git a/offapi/com/sun/star/sheet/XAddIn.idl b/offapi/com/sun/star/sheet/XAddIn.idl
index f506de2e5587..fc7ef5b167d9 100644
--- a/offapi/com/sun/star/sheet/XAddIn.idl
+++ b/offapi/com/sun/star/sheet/XAddIn.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XAddIn_idl__
 #define __com_sun_star_sheet_XAddIn_idl__
 
-#ifndef __com_sun_star_lang_XLocalizable_idl__
 #include <com/sun/star/lang/XLocalizable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XAreaLink.idl b/offapi/com/sun/star/sheet/XAreaLink.idl
index 9d92564945c0..097c9ca786fc 100644
--- a/offapi/com/sun/star/sheet/XAreaLink.idl
+++ b/offapi/com/sun/star/sheet/XAreaLink.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XAreaLink_idl__
 #define __com_sun_star_sheet_XAreaLink_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XAreaLinks.idl b/offapi/com/sun/star/sheet/XAreaLinks.idl
index aca3f2ac57ed..4a66e3e883b8 100644
--- a/offapi/com/sun/star/sheet/XAreaLinks.idl
+++ b/offapi/com/sun/star/sheet/XAreaLinks.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XAreaLinks_idl__
 #define __com_sun_star_sheet_XAreaLinks_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XArrayFormulaRange.idl b/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
index 6941b8c5808d..8e5bce814cff 100644
--- a/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
+++ b/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XArrayFormulaRange_idl__
 #define __com_sun_star_sheet_XArrayFormulaRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl b/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
index 6761606bc4dd..fe3e4e4a0506 100644
--- a/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XArrayFormulaTokens_idl__
 #define __com_sun_star_sheet_XArrayFormulaTokens_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
 #include <com/sun/star/sheet/FormulaToken.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCalculatable.idl b/offapi/com/sun/star/sheet/XCalculatable.idl
index 4c46f8b5829a..82546ba41ec8 100644
--- a/offapi/com/sun/star/sheet/XCalculatable.idl
+++ b/offapi/com/sun/star/sheet/XCalculatable.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XCalculatable_idl__
 #define __com_sun_star_sheet_XCalculatable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellAddressable.idl b/offapi/com/sun/star/sheet/XCellAddressable.idl
index b057301da9fd..8b7a2ac3820f 100644
--- a/offapi/com/sun/star/sheet/XCellAddressable.idl
+++ b/offapi/com/sun/star/sheet/XCellAddressable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XCellAddressable_idl__
 #define __com_sun_star_sheet_XCellAddressable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl b/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
index f2c660513fdd..4325aa901053 100644
--- a/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XCellFormatRangesSupplier_idl__
 #define __com_sun_star_sheet_XCellFormatRangesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellRangeAddressable.idl b/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
index f0391fafd856..f2287d3954c9 100644
--- a/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XCellRangeAddressable_idl__
 #define __com_sun_star_sheet_XCellRangeAddressable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellRangeData.idl b/offapi/com/sun/star/sheet/XCellRangeData.idl
index 3e08587a3aa3..4931573da986 100644
--- a/offapi/com/sun/star/sheet/XCellRangeData.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeData.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_XCellRangeData_idl__
 #define __com_sun_star_sheet_XCellRangeData_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module sheet {
diff --git a/offapi/com/sun/star/sheet/XCellRangeFormula.idl b/offapi/com/sun/star/sheet/XCellRangeFormula.idl
index 3de2eba0ddde..96e590477433 100644
--- a/offapi/com/sun/star/sheet/XCellRangeFormula.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeFormula.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XCellRangeFormula_idl__
 #define __com_sun_star_sheet_XCellRangeFormula_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellRangeMovement.idl b/offapi/com/sun/star/sheet/XCellRangeMovement.idl
index 230c3606b845..1362c94f4f3e 100644
--- a/offapi/com/sun/star/sheet/XCellRangeMovement.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeMovement.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_sheet_XCellRangeMovement_idl__
 #define __com_sun_star_sheet_XCellRangeMovement_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_CellInsertMode_idl__
 #include <com/sun/star/sheet/CellInsertMode.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_CellDeleteMode_idl__
 #include <com/sun/star/sheet/CellDeleteMode.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellRangeReferrer.idl b/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
index 95ba302b90fe..cc8a27081641 100644
--- a/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
 #define __com_sun_star_sheet_XCellRangeReferrer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellRangesAccess.idl b/offapi/com/sun/star/sheet/XCellRangesAccess.idl
index d22d2a4c6e6e..c82dfd7d521c 100644
--- a/offapi/com/sun/star/sheet/XCellRangesAccess.idl
+++ b/offapi/com/sun/star/sheet/XCellRangesAccess.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_sheet_XCellRangesAccess_idl__
 #define __com_sun_star_sheet_XCellRangesAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellRangesQuery.idl b/offapi/com/sun/star/sheet/XCellRangesQuery.idl
index 44c9b8b4053b..0a772c707d35 100644
--- a/offapi/com/sun/star/sheet/XCellRangesQuery.idl
+++ b/offapi/com/sun/star/sheet/XCellRangesQuery.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_XCellRangesQuery_idl__
 #define __com_sun_star_sheet_XCellRangesQuery_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
 #include <com/sun/star/sheet/XSheetCellRanges.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCellSeries.idl b/offapi/com/sun/star/sheet/XCellSeries.idl
index 27e6794b6eec..489b0bd8c613 100644
--- a/offapi/com/sun/star/sheet/XCellSeries.idl
+++ b/offapi/com/sun/star/sheet/XCellSeries.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_XCellSeries_idl__
 #define __com_sun_star_sheet_XCellSeries_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FillDirection_idl__
 #include <com/sun/star/sheet/FillDirection.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FillMode_idl__
 #include <com/sun/star/sheet/FillMode.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FillDateMode_idl__
 #include <com/sun/star/sheet/FillDateMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XCompatibilityNames.idl b/offapi/com/sun/star/sheet/XCompatibilityNames.idl
index 28170f8eadc8..e7a6ae15fad2 100644
--- a/offapi/com/sun/star/sheet/XCompatibilityNames.idl
+++ b/offapi/com/sun/star/sheet/XCompatibilityNames.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XCompatibilityNames_idl__
 #define __com_sun_star_sheet_XCompatibilityNames_idl__
 
-#ifndef __com_sun_star_sheet_LocalizedName_idl__
 #include <com/sun/star/sheet/LocalizedName.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XConsolidatable.idl b/offapi/com/sun/star/sheet/XConsolidatable.idl
index ba02e0741480..8d8b7426f768 100644
--- a/offapi/com/sun/star/sheet/XConsolidatable.idl
+++ b/offapi/com/sun/star/sheet/XConsolidatable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XConsolidatable_idl__
 #define __com_sun_star_sheet_XConsolidatable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XConsolidationDescriptor_idl__
 #include <com/sun/star/sheet/XConsolidationDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl b/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
index e23069c57a84..25d981b81f70 100644
--- a/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_XConsolidationDescriptor_idl__
 #define __com_sun_star_sheet_XConsolidationDescriptor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
 #include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDDELink.idl b/offapi/com/sun/star/sheet/XDDELink.idl
index 3f2a71ed4cbd..b23bbd6ad6ce 100644
--- a/offapi/com/sun/star/sheet/XDDELink.idl
+++ b/offapi/com/sun/star/sheet/XDDELink.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XDDELink_idl__
 #define __com_sun_star_sheet_XDDELink_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDDELinkResults.idl b/offapi/com/sun/star/sheet/XDDELinkResults.idl
index b0ca1afd5205..aaab7f4f83bf 100644
--- a/offapi/com/sun/star/sheet/XDDELinkResults.idl
+++ b/offapi/com/sun/star/sheet/XDDELinkResults.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XDDELinkResults_idl__
 #define __com_sun_star_sheet_XDDELinkResults_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDDELinks.idl b/offapi/com/sun/star/sheet/XDDELinks.idl
index 6863a4432c8c..59c9cccb7e03 100644
--- a/offapi/com/sun/star/sheet/XDDELinks.idl
+++ b/offapi/com/sun/star/sheet/XDDELinks.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XDDELinks_idl__
 #define __com_sun_star_sheet_XDDELinks_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDDELink_idl__
 #include <com/sun/star/sheet/XDDELink.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DDELinkMode_idl__
 #include <com/sun/star/sheet/DDELinkMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl b/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
index 06d74a921077..26fa3f7dc2fe 100644
--- a/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XDataPilotDataLayoutFieldSupplier_idl__
 #define __com_sun_star_sheet_XDataPilotDataLayoutFieldSupplier_idl__
 
-#ifndef __com_sun_star_sheet_XDataPilotField_idl__
 #include <com/sun/star/sheet/XDataPilotField.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl b/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
index ab86bf29e05a..e3466071c838 100644
--- a/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
 #define __com_sun_star_sheet_XDataPilotDescriptor_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
 #include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotField.idl b/offapi/com/sun/star/sheet/XDataPilotField.idl
index 43f98d55f029..a56745f98179 100644
--- a/offapi/com/sun/star/sheet/XDataPilotField.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDataPilotField_idl__
 #define __com_sun_star_sheet_XDataPilotField_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl b/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
index 43ab69bb99d5..3da01a1b4d59 100644
--- a/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
@@ -28,16 +28,9 @@
 #ifndef __com_sun_star_sheet_XDataPilotFieldGrouping_idl__
 #define __com_sun_star_sheet_XDataPilotFieldGrouping_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldGroupInfo_idl__
 #include <com/sun/star/sheet/DataPilotFieldGroupInfo.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -89,7 +82,7 @@ published interface XDataPilotFieldGrouping: com::sun::star::uno::XInterface
 
         <p>If this field is already grouped by dates, a new DataPilot field
         will be created and returned. If this field is not grouped at all, the
-        date grouping is perfomed inside of this field (no new field will be
+        date grouping is performed inside of this field (no new field will be
         created). There must not be any other grouping (by member names or by
         numeric ranges), otherwise an exception is thrown.</p>
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl b/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
index b8f51d27cfcd..d9701b077d9a 100644
--- a/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDataPilotMemberResults_idl__
 #define __com_sun_star_sheet_XDataPilotMemberResults_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_MemberResult_idl__
 #include <com/sun/star/sheet/MemberResult.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotResults.idl b/offapi/com/sun/star/sheet/XDataPilotResults.idl
index 38e4c2ec6886..ec6950670d17 100644
--- a/offapi/com/sun/star/sheet/XDataPilotResults.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotResults.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDataPilotResults_idl__
 #define __com_sun_star_sheet_XDataPilotResults_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataResult_idl__
 #include <com/sun/star/sheet/DataResult.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotTable.idl b/offapi/com/sun/star/sheet/XDataPilotTable.idl
index 00aae3780bd9..2a6c4e66bb6b 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTable.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDataPilotTable_idl__
 #define __com_sun_star_sheet_XDataPilotTable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotTable2.idl b/offapi/com/sun/star/sheet/XDataPilotTable2.idl
index a0fbd5934e8d..ed6dde8a1426 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTable2.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTable2.idl
@@ -28,30 +28,12 @@
 #ifndef __com_sun_star_sheet_XDataPilotTable2_idl__
 #define __com_sun_star_sheet_XDataPilotTable2_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTable_idl__
 #include <com/sun/star/sheet/XDataPilotTable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotOutputRangeType_idl__
 #include <com/sun/star/sheet/DataPilotOutputRangeType.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldFilter_idl__
 #include <com/sun/star/sheet/DataPilotFieldFilter.idl>
-#endif
-
 #include <com/sun/star/sheet/DataPilotTablePositionData.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotTables.idl b/offapi/com/sun/star/sheet/XDataPilotTables.idl
index f4706cdb223c..77e4daf23043 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTables.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTables.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XDataPilotTables_idl__
 #define __com_sun_star_sheet_XDataPilotTables_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotDescriptor_idl__
 #include <com/sun/star/sheet/XDataPilotDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl b/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
index 1df209f6d669..285d03b4dbe8 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDataPilotTablesSupplier_idl__
 #define __com_sun_star_sheet_XDataPilotTablesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XDataPilotTables_idl__
 #include <com/sun/star/sheet/XDataPilotTables.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDatabaseRange.idl b/offapi/com/sun/star/sheet/XDatabaseRange.idl
index 9826ab8278e6..608a652112eb 100644
--- a/offapi/com/sun/star/sheet/XDatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/XDatabaseRange.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_sheet_XDatabaseRange_idl__
 #define __com_sun_star_sheet_XDatabaseRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
 #include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
 #include <com/sun/star/sheet/XSubTotalDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDatabaseRanges.idl b/offapi/com/sun/star/sheet/XDatabaseRanges.idl
index 1794f3c7eb42..b986915a71cb 100644
--- a/offapi/com/sun/star/sheet/XDatabaseRanges.idl
+++ b/offapi/com/sun/star/sheet/XDatabaseRanges.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDatabaseRanges_idl__
 #define __com_sun_star_sheet_XDatabaseRanges_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDimensionsSupplier.idl b/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
index 309fdee4c522..50576e87d039 100644
--- a/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XDimensionsSupplier_idl__
 #define __com_sun_star_sheet_XDimensionsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDocumentAuditing.idl b/offapi/com/sun/star/sheet/XDocumentAuditing.idl
index 25a82ffb6970..da8da2723005 100644
--- a/offapi/com/sun/star/sheet/XDocumentAuditing.idl
+++ b/offapi/com/sun/star/sheet/XDocumentAuditing.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XDocumentAuditing_idl__
 #define __com_sun_star_sheet_XDocumentAuditing_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl b/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
index f63d99a65aa1..58b7ff5c9d48 100644
--- a/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XDrillDownDataSupplier_idl__
 #define __com_sun_star_sheet_XDrillDownDataSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_DataPilotFieldFilter_idl__
 #include <com/sun/star/sheet/DataPilotFieldFilter.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
@@ -52,7 +44,7 @@ module com {  module sun {  module star {  module sheet {
     interface to allow drill-down of result data.  The method this interface provides
     is used internally when calling <method>XDataPilotTable2::getDrillDownData</method>
     or <method>XDataPilotTable2::insertDrillDownSheet</method>.  If the data source
-    service does not implement this interface, then the aformentioned two methods
+    service does not implement this interface, then the aforementioned two methods
     will have no effect.
 
     @see com::sun::star::sheet::DataPilotSource
@@ -66,7 +58,7 @@ interface XDrillDownDataSupplier: com::sun::star::uno::XInterface
 
         @param aFilters filtering criteria
 
-        @returns a filtered subset of the origintal source data as 2-dimensional
+        @returns a filtered subset of the original source data as 2-dimensional
         sequences of <type scope="com::sun::star::uno">Any</any>.  The first row
         must be the header row.  Each <type scope="com::sun::star::uno">Any</type>
         instance must contain either <type>double</type> value for a numeric cell, or
diff --git a/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl b/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
index 16de0542a669..809b05371ea2 100644
--- a/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
+++ b/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XEnhancedMouseClickBroadcaster_idl__
 #define __com_sun_star_sheet_XEnhancedMouseClickBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XEnhancedMouseClickHandler_idl__
 #include <com/sun/star/awt/XEnhancedMouseClickHandler.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XExternalSheetName.idl b/offapi/com/sun/star/sheet/XExternalSheetName.idl
index dd0cc73c67ec..eb5d3f692a99 100644
--- a/offapi/com/sun/star/sheet/XExternalSheetName.idl
+++ b/offapi/com/sun/star/sheet/XExternalSheetName.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XExternalSheetName_idl__
 #define __com_sun_star_sheet_XExternalSheetName_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XFillAcrossSheet.idl b/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
index b00ccb8158c6..0d416d6f1190 100644
--- a/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
+++ b/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XFillAcrossSheet_idl__
 #define __com_sun_star_sheet_XFillAcrossSheet_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
index 39760501214e..1a52b3439110 100644
--- a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
+++ b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XFormulaOpCodeMapper_idl__
 #define __com_sun_star_sheet_XFormulaOpCodeMapper_idl__
 
-#ifndef __com_sun_star_sheet_FormulaOpCodeMapEntry_idl__
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -52,7 +47,7 @@ published interface XFormulaOpCodeMapper
 
         <p>Needed to be able to identify which of the function names map to an
         Add-In implementation where this OpCode is used in the returned
-        mapping and the programmatical name is available as additional
+        mapping and the programmatic name is available as additional
         information.</p>
      */
     [attribute, readonly] long OpCodeExternal;
@@ -102,7 +97,7 @@ published interface XFormulaOpCodeMapper
             <p>Additional information in <member>FormulaToken::Data</member>
             is returned for:
             <ul>
-            <li>Add-in names: the programmatical name. The OpCode value used
+            <li>Add-in names: the programmatic name. The OpCode value used
             for add-ins can be queried with the <member>OpCodeExternal</member>
             getter method.</li>
             </ul></p>
diff --git a/offapi/com/sun/star/sheet/XFormulaQuery.idl b/offapi/com/sun/star/sheet/XFormulaQuery.idl
index 9188332dd184..9b4dd11976a9 100644
--- a/offapi/com/sun/star/sheet/XFormulaQuery.idl
+++ b/offapi/com/sun/star/sheet/XFormulaQuery.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XFormulaQuery_idl__
 #define __com_sun_star_sheet_XFormulaQuery_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
 #include <com/sun/star/sheet/XSheetCellRanges.idl>
-#endif
 
 //=============================================================================
 
@@ -61,7 +56,7 @@ published interface XFormulaQuery: com::sun::star::uno::XInterface
 
         @param bRecursive
             <FALSE/> = queries cells dependent from the original range(s),
-            <TRUE/> = repeates query with all found cells
+            <TRUE/> = repeats query with all found cells
             (finds dependents of dependents, and so on).
 
         @return
@@ -80,7 +75,7 @@ published interface XFormulaQuery: com::sun::star::uno::XInterface
 
         @param bRecursive
             <FALSE/> = queries precedent cells of the original range(s),
-            <TRUE/> = repeates query with all found cells
+            <TRUE/> = repeats query with all found cells
             (finds precedents of precedents, and so on).
 
         @return
diff --git a/offapi/com/sun/star/sheet/XFormulaTokens.idl b/offapi/com/sun/star/sheet/XFormulaTokens.idl
index 0e7cb93482f1..3bf172e86ee9 100644
--- a/offapi/com/sun/star/sheet/XFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XFormulaTokens.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XFormulaTokens_idl__
 #define __com_sun_star_sheet_XFormulaTokens_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
 #include <com/sun/star/sheet/FormulaToken.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XFunctionAccess.idl b/offapi/com/sun/star/sheet/XFunctionAccess.idl
index c12401421b35..a5ce77a21e22 100644
--- a/offapi/com/sun/star/sheet/XFunctionAccess.idl
+++ b/offapi/com/sun/star/sheet/XFunctionAccess.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XFunctionAccess_idl__
 #define __com_sun_star_sheet_XFunctionAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XFunctionDescriptions.idl b/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
index 6346de137820..944a512cdc07 100644
--- a/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
+++ b/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XFunctionDescriptions_idl__
 #define __com_sun_star_sheet_XFunctionDescriptions_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XGoalSeek.idl b/offapi/com/sun/star/sheet/XGoalSeek.idl
index a6e627574f88..cbe74b24d9d2 100644
--- a/offapi/com/sun/star/sheet/XGoalSeek.idl
+++ b/offapi/com/sun/star/sheet/XGoalSeek.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XGoalSeek_idl__
 #define __com_sun_star_sheet_XGoalSeek_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GoalResult_idl__
 #include <com/sun/star/sheet/GoalResult.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XHeaderFooterContent.idl b/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
index 6b491fadabf0..61a66d169852 100644
--- a/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
+++ b/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XHeaderFooterContent_idl__
 #define __com_sun_star_sheet_XHeaderFooterContent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl b/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
index 8b96a2888a04..9695363931c7 100644
--- a/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XHierarchiesSupplier_idl__
 #define __com_sun_star_sheet_XHierarchiesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XLabelRange.idl b/offapi/com/sun/star/sheet/XLabelRange.idl
index 0fc837e8d244..b12a4cb078b4 100644
--- a/offapi/com/sun/star/sheet/XLabelRange.idl
+++ b/offapi/com/sun/star/sheet/XLabelRange.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XLabelRange_idl__
 #define __com_sun_star_sheet_XLabelRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XLabelRanges.idl b/offapi/com/sun/star/sheet/XLabelRanges.idl
index b1cf0aaeac09..a33d75cf9b36 100644
--- a/offapi/com/sun/star/sheet/XLabelRanges.idl
+++ b/offapi/com/sun/star/sheet/XLabelRanges.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XLabelRanges_idl__
 #define __com_sun_star_sheet_XLabelRanges_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XLevelsSupplier.idl b/offapi/com/sun/star/sheet/XLevelsSupplier.idl
index ec867a5ecf94..e0941d2cbe5c 100644
--- a/offapi/com/sun/star/sheet/XLevelsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XLevelsSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XLevelsSupplier_idl__
 #define __com_sun_star_sheet_XLevelsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XMembersSupplier.idl b/offapi/com/sun/star/sheet/XMembersSupplier.idl
index 44c9669bc247..5bd7dde0f01e 100644
--- a/offapi/com/sun/star/sheet/XMembersSupplier.idl
+++ b/offapi/com/sun/star/sheet/XMembersSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XMembersSupplier_idl__
 #define __com_sun_star_sheet_XMembersSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl b/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
index eb6ade5c3883..7cf55b7b1f15 100644
--- a/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XMultiFormulaTokens_idl__
 #define __com_sun_star_sheet_XMultiFormulaTokens_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_FormulaToken_idl__
 #include <com/sun/star/sheet/FormulaToken.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XMultipleOperation.idl b/offapi/com/sun/star/sheet/XMultipleOperation.idl
index c0ba09d28674..550f0d41ac89 100644
--- a/offapi/com/sun/star/sheet/XMultipleOperation.idl
+++ b/offapi/com/sun/star/sheet/XMultipleOperation.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_XMultipleOperation_idl__
 #define __com_sun_star_sheet_XMultipleOperation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TableOperationMode_idl__
 #include <com/sun/star/sheet/TableOperationMode.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XNamedRange.idl b/offapi/com/sun/star/sheet/XNamedRange.idl
index 678594c41d15..34312e316e3e 100644
--- a/offapi/com/sun/star/sheet/XNamedRange.idl
+++ b/offapi/com/sun/star/sheet/XNamedRange.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XNamedRange_idl__
 #define __com_sun_star_sheet_XNamedRange_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XNamedRanges.idl b/offapi/com/sun/star/sheet/XNamedRanges.idl
index 36fb40485ce6..a1919ed7f32c 100644
--- a/offapi/com/sun/star/sheet/XNamedRanges.idl
+++ b/offapi/com/sun/star/sheet/XNamedRanges.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_sheet_XNamedRanges_idl__
 #define __com_sun_star_sheet_XNamedRanges_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_Border_idl__
 #include <com/sun/star/sheet/Border.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XPrintAreas.idl b/offapi/com/sun/star/sheet/XPrintAreas.idl
index 78a0bf352512..d0008b9c4139 100644
--- a/offapi/com/sun/star/sheet/XPrintAreas.idl
+++ b/offapi/com/sun/star/sheet/XPrintAreas.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XPrintAreas_idl__
 #define __com_sun_star_sheet_XPrintAreas_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
@@ -132,7 +127,7 @@ published interface XPrintAreas: com::sun::star::uno::XInterface
     /** returns the range that is specified as title rows range.
 
         <p>Title rows can be automatically repeated on all subsequent
-        print pages to the bootom, using
+        print pages to the bottom, using
         <member>XPrintAreas::setPrintTitleRows</member>.</p>
 
         @returns
diff --git a/offapi/com/sun/star/sheet/XRangeSelection.idl b/offapi/com/sun/star/sheet/XRangeSelection.idl
index e5a43d211a15..b1cda9c73961 100644
--- a/offapi/com/sun/star/sheet/XRangeSelection.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelection.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XRangeSelection_idl__
 #define __com_sun_star_sheet_XRangeSelection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl b/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
index b67d55f72728..6c9a99403ce4 100644
--- a/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XRangeSelectionChangeListener_idl__
 #define __com_sun_star_sheet_XRangeSelectionChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__
 #include <com/sun/star/sheet/RangeSelectionEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XRangeSelectionListener.idl b/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
index 41e9755127e2..7b1072bb591b 100644
--- a/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XRangeSelectionListener_idl__
 #define __com_sun_star_sheet_XRangeSelectionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__
 #include <com/sun/star/sheet/RangeSelectionEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XRecentFunctions.idl b/offapi/com/sun/star/sheet/XRecentFunctions.idl
index 91a3436f9bb9..40b7c91bff81 100644
--- a/offapi/com/sun/star/sheet/XRecentFunctions.idl
+++ b/offapi/com/sun/star/sheet/XRecentFunctions.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XRecentFunctions_idl__
 #define __com_sun_star_sheet_XRecentFunctions_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XResultListener.idl b/offapi/com/sun/star/sheet/XResultListener.idl
index 7f72f0fd0a35..5c80e01cf28d 100644
--- a/offapi/com/sun/star/sheet/XResultListener.idl
+++ b/offapi/com/sun/star/sheet/XResultListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XResultListener_idl__
 #define __com_sun_star_sheet_XResultListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ResultEvent_idl__
 #include <com/sun/star/sheet/ResultEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XScenario.idl b/offapi/com/sun/star/sheet/XScenario.idl
index 4ff1ad532d6a..9904e3a4f830 100644
--- a/offapi/com/sun/star/sheet/XScenario.idl
+++ b/offapi/com/sun/star/sheet/XScenario.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XScenario_idl__
 #define __com_sun_star_sheet_XScenario_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XScenarioEnhanced.idl b/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
index e61f6103e3b9..c2d3e850699c 100644
--- a/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
+++ b/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XScenarioEnhanced_idl__
 #define __com_sun_star_sheet_XScenarioEnhanced_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XScenarios.idl b/offapi/com/sun/star/sheet/XScenarios.idl
index d294bdf72b42..c2318fde074d 100644
--- a/offapi/com/sun/star/sheet/XScenarios.idl
+++ b/offapi/com/sun/star/sheet/XScenarios.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XScenarios_idl__
 #define __com_sun_star_sheet_XScenarios_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XScenariosSupplier.idl b/offapi/com/sun/star/sheet/XScenariosSupplier.idl
index f04770fe08aa..6187a03b7505 100644
--- a/offapi/com/sun/star/sheet/XScenariosSupplier.idl
+++ b/offapi/com/sun/star/sheet/XScenariosSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XScenariosSupplier_idl__
 #define __com_sun_star_sheet_XScenariosSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XScenarios_idl__
 #include <com/sun/star/sheet/XScenarios.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotation.idl b/offapi/com/sun/star/sheet/XSheetAnnotation.idl
index a999cf8f32b8..08dcf3473150 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotation.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotation.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetAnnotation_idl__
 #define __com_sun_star_sheet_XSheetAnnotation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl b/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
index e53477080bea..580988fbf6a2 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetAnnotationAnchor_idl__
 #define __com_sun_star_sheet_XSheetAnnotationAnchor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotation_idl__
 #include <com/sun/star/sheet/XSheetAnnotation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl b/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
index 5075cc2f52b4..17c634af3802 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetAnnotationShapeSupplier_idl__
 #define __com_sun_star_sheet_XSheetAnnotationShapeSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotations.idl b/offapi/com/sun/star/sheet/XSheetAnnotations.idl
index c3fa31ac674e..5dd306679398 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotations.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotations.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetAnnotations_idl__
 #define __com_sun_star_sheet_XSheetAnnotations_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
@@ -58,7 +53,7 @@ published interface XSheetAnnotations: com::sun::star::container::XIndexAccess
         specified cell and inserts it into the collection.</p>
 
         @param aPosition
-            contains the address of the cell thta will contain the
+            contains the address of the cell that will contain the
             annotation.
 
         @param aText
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl b/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
index 9b696060a977..d565c651ad77 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetAnnotationsSupplier_idl__
 #define __com_sun_star_sheet_XSheetAnnotationsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetAnnotations_idl__
 #include <com/sun/star/sheet/XSheetAnnotations.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetAuditing.idl b/offapi/com/sun/star/sheet/XSheetAuditing.idl
index 43342f5a6f6b..27b22679292b 100644
--- a/offapi/com/sun/star/sheet/XSheetAuditing.idl
+++ b/offapi/com/sun/star/sheet/XSheetAuditing.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetAuditing_idl__
 #define __com_sun_star_sheet_XSheetAuditing_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetCellCursor.idl b/offapi/com/sun/star/sheet/XSheetCellCursor.idl
index 3141231437cd..9be7548ed8b7 100644
--- a/offapi/com/sun/star/sheet/XSheetCellCursor.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellCursor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XSheetCellCursor_idl__
 #define __com_sun_star_sheet_XSheetCellCursor_idl__
 
-#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
 #include <com/sun/star/sheet/XSheetCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetCellRange.idl b/offapi/com/sun/star/sheet/XSheetCellRange.idl
index f025a44e3e25..adb62b1f720a 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRange.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRange.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XSheetCellRange_idl__
 #define __com_sun_star_sheet_XSheetCellRange_idl__
 
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl b/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
index b063b2ed3f95..c0f3bcf9cc84 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XSheetCellRangeContainer_idl__
 #define __com_sun_star_sheet_XSheetCellRangeContainer_idl__
 
-#ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
 #include <com/sun/star/sheet/XSheetCellRanges.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetCellRanges.idl b/offapi/com/sun/star/sheet/XSheetCellRanges.idl
index 7b87269d779f..9f283dc0678d 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRanges.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRanges.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XSheetCellRanges_idl__
 #define __com_sun_star_sheet_XSheetCellRanges_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetCondition.idl b/offapi/com/sun/star/sheet/XSheetCondition.idl
index 3fc4635f9b4a..46aef18e092c 100644
--- a/offapi/com/sun/star/sheet/XSheetCondition.idl
+++ b/offapi/com/sun/star/sheet/XSheetCondition.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XSheetCondition_idl__
 #define __com_sun_star_sheet_XSheetCondition_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_ConditionOperator_idl__
 #include <com/sun/star/sheet/ConditionOperator.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetCondition2.idl b/offapi/com/sun/star/sheet/XSheetCondition2.idl
new file mode 100644
index 000000000000..d03a79f0c964
--- /dev/null
+++ b/offapi/com/sun/star/sheet/XSheetCondition2.idl
@@ -0,0 +1,71 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *                       Novell, Inc.
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Muthu Subramanian <sumuthu@novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __com_sun_star_sheet_XSheetCondition2_idl__
+#define __com_sun_star_sheet_XSheetCondition2_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/sheet/ConditionOperator2.idl>
+#include <com/sun/star/sheet/XSheetCondition.idl>
+#include <com/sun/star/table/CellAddress.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module sheet {
+
+//=============================================================================
+
+/** provides methods to access the settings of a condition in a
+    conditional format or data validation.
+
+    @see com::sun::star::sheet::TableConditionalEntry
+    @see com::sun::star::sheet::TableValidation
+    @see com::sun::star::sheet::XSheetCondition
+ */
+interface XSheetCondition2: com::sun::star::sheet::XSheetCondition
+{
+    //-------------------------------------------------------------------------
+
+    /** returns the operator in the condition (new interface).
+     */
+    long getConditionOperator();
+
+    //-------------------------------------------------------------------------
+
+    /** sets the operator in the condition (new interface).
+     */
+    void setConditionOperator(
+            [in] long nOperator );
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl b/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
index 8e8b10af5e14..c12b6a80b0a7 100644
--- a/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
+++ b/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetConditionalEntries_idl__
 #define __com_sun_star_sheet_XSheetConditionalEntries_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl b/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
index 2ecc635393b6..e09afd1fe85b 100644
--- a/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
+++ b/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XSheetConditionalEntry_idl__
 #define __com_sun_star_sheet_XSheetConditionalEntry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetFilterable.idl b/offapi/com/sun/star/sheet/XSheetFilterable.idl
index 0dbdca51a94f..676e263501e8 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterable.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetFilterable_idl__
 #define __com_sun_star_sheet_XSheetFilterable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
 #include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
 
 //=============================================================================
 
@@ -42,7 +37,7 @@ module com {  module sun {  module star {  module sheet {
 
 //=============================================================================
 
-/** represents something that can be filtered using an XSheetFilterDesriptor.
+/** represents something that can be filtered using an XSheetFilterDescriptor.
 
     @see com::sun::star::sheet::XSheetFilterableEx
  */
@@ -62,7 +57,7 @@ published interface XSheetFilterable: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    /** performa a filter operation, using the settings of the passed filter
+    /** performs a filter operation, using the settings of the passed filter
         descriptor.
 
         @param xDescriptor
diff --git a/offapi/com/sun/star/sheet/XSheetFilterableEx.idl b/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
index 591e9b18ed72..5df55bb8ed1f 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_sheet_XSheetFilterableEx_idl__
 #define __com_sun_star_sheet_XSheetFilterableEx_idl__
 
-#ifndef __com_sun_star_sheet_XSheetFilterable_idl__
 #include <com/sun/star/sheet/XSheetFilterable.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSheetFilterDescriptor_idl__
 #include <com/sun/star/sheet/XSheetFilterDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSheetLinkable.idl b/offapi/com/sun/star/sheet/XSheetLinkable.idl
index 159176dce9d3..f13d34e2281a 100644
--- a/offapi/com/sun/star/sheet/XSheetLinkable.idl
+++ b/offapi/com/sun/star/sheet/XSheetLinkable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetLinkable_idl__
 #define __com_sun_star_sheet_XSheetLinkable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SheetLinkMode_idl__
 #include <com/sun/star/sheet/SheetLinkMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetOperation.idl b/offapi/com/sun/star/sheet/XSheetOperation.idl
index a547cfa66e91..32a8f1f86868 100644
--- a/offapi/com/sun/star/sheet/XSheetOperation.idl
+++ b/offapi/com/sun/star/sheet/XSheetOperation.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XSheetOperation_idl__
 #define __com_sun_star_sheet_XSheetOperation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_GeneralFunction_idl__
 #include <com/sun/star/sheet/GeneralFunction.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetOutline.idl b/offapi/com/sun/star/sheet/XSheetOutline.idl
index 0f3de869d980..85466ed15180 100644
--- a/offapi/com/sun/star/sheet/XSheetOutline.idl
+++ b/offapi/com/sun/star/sheet/XSheetOutline.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_sheet_XSheetOutline_idl__
 #define __com_sun_star_sheet_XSheetOutline_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableOrientation_idl__
 #include <com/sun/star/table/TableOrientation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetPageBreak.idl b/offapi/com/sun/star/sheet/XSheetPageBreak.idl
index 7d590f18eac0..f948cdbb541e 100644
--- a/offapi/com/sun/star/sheet/XSheetPageBreak.idl
+++ b/offapi/com/sun/star/sheet/XSheetPageBreak.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSheetPageBreak_idl__
 #define __com_sun_star_sheet_XSheetPageBreak_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_TablePageBreakData_idl__
 #include <com/sun/star/sheet/TablePageBreakData.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSheetPastable.idl b/offapi/com/sun/star/sheet/XSheetPastable.idl
index db2053f83273..3b0c6b812cae 100644
--- a/offapi/com/sun/star/sheet/XSheetPastable.idl
+++ b/offapi/com/sun/star/sheet/XSheetPastable.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_sheet_XSheetPastable_idl__
 #define __com_sun_star_sheet_XSheetPastable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_PasteOperation_idl__
 #include <com/sun/star/sheet/PasteOperation.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_CellInsertMode_idl__
 #include <com/sun/star/sheet/CellInsertMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSolver.idl b/offapi/com/sun/star/sheet/XSolver.idl
index aaf54ddb7586..26a28e40fcae 100644
--- a/offapi/com/sun/star/sheet/XSolver.idl
+++ b/offapi/com/sun/star/sheet/XSolver.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSolver_idl__
 #define __com_sun_star_sheet_XSolver_idl__
 
-#ifndef __com_sun_star_sheet_XSpreadsheetDocument_idl__
 #include <com/sun/star/sheet/XSpreadsheetDocument.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SolverConstraint_idl__
 #include <com/sun/star/sheet/SolverConstraint.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSolverDescription.idl b/offapi/com/sun/star/sheet/XSolverDescription.idl
index 0efe1e202e94..808a6d6f0bda 100644
--- a/offapi/com/sun/star/sheet/XSolverDescription.idl
+++ b/offapi/com/sun/star/sheet/XSolverDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XSolverDescription_idl__
 #define __com_sun_star_sheet_XSolverDescription_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSpreadsheet.idl b/offapi/com/sun/star/sheet/XSpreadsheet.idl
index 3f7628ad5a4a..10b35b31d6f6 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheet.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XSpreadsheet_idl__
 #define __com_sun_star_sheet_XSpreadsheet_idl__
 
-#ifndef __com_sun_star_sheet_XSheetCellRange_idl__
 #include <com/sun/star/sheet/XSheetCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl b/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
index a60248d22b75..8b49166999ed 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSpreadsheetDocument_idl__
 #define __com_sun_star_sheet_XSpreadsheetDocument_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheets_idl__
 #include <com/sun/star/sheet/XSpreadsheets.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSpreadsheetView.idl b/offapi/com/sun/star/sheet/XSpreadsheetView.idl
index baefdb2359c7..92926e9e1f4c 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheetView.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheetView.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sheet_XSpreadsheetView_idl__
 #define __com_sun_star_sheet_XSpreadsheetView_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
 #include <com/sun/star/sheet/XSpreadsheet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XSpreadsheets.idl b/offapi/com/sun/star/sheet/XSpreadsheets.idl
index f50157768667..293dd45ffb15 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheets.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheets.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XSpreadsheets_idl__
 #define __com_sun_star_sheet_XSpreadsheets_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl b/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
index c1c1524a14a5..4ca801521920 100644
--- a/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSubTotalCalculatable_idl__
 #define __com_sun_star_sheet_XSubTotalCalculatable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
 #include <com/sun/star/sheet/XSubTotalDescriptor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl b/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
index 2a2d0afe1293..469083172320 100644
--- a/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSubTotalDescriptor_idl__
 #define __com_sun_star_sheet_XSubTotalDescriptor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SubTotalColumn_idl__
 #include <com/sun/star/sheet/SubTotalColumn.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XSubTotalField.idl b/offapi/com/sun/star/sheet/XSubTotalField.idl
index 3af87e72df3c..5b12e0944358 100644
--- a/offapi/com/sun/star/sheet/XSubTotalField.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalField.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XSubTotalField_idl__
 #define __com_sun_star_sheet_XSubTotalField_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_SubTotalColumn_idl__
 #include <com/sun/star/sheet/SubTotalColumn.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl b/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
index 73e758af6539..39d3e08bd522 100644
--- a/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XUniqueCellFormatRangesSupplier_idl__
 #define __com_sun_star_sheet_XUniqueCellFormatRangesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XUnnamedDatabaseRanges.idl b/offapi/com/sun/star/sheet/XUnnamedDatabaseRanges.idl
new file mode 100644
index 000000000000..3a535617f1de
--- /dev/null
+++ b/offapi/com/sun/star/sheet/XUnnamedDatabaseRanges.idl
@@ -0,0 +1,78 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Markus Mohrhard <markus.mohrhard@googlemail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Major Contributor(s):
+ * Markus Mohrhard <markus.mohrhard@googlemail.com>
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __com_sun_star_sheet_XUnnamedDatabaseRanges_idl__
+#define __com_sun_star_sheet_XUnnamedDatabaseRanges_idl__
+
+#ifndef __com_sun_star_table_CellRangeAddress_idl__
+#include <com/sun/star/table/CellRangeAddress.idl>
+#endif
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_container_NoSuchElementException_idl__
+#include <com/sun/star/container/NoSuchElementException.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module sheet {
+
+//=============================================================================
+
+/** provides functions to manage the sheet local databases
+ */
+
+interface XUnnamedDatabaseRanges: com::sun::star::uno::XInterface
+ {
+    void setByTable( [in] com::sun::star::table::CellRangeAddress aRange )
+        raises( com::sun::star::lang::IndexOutOfBoundsException );
+
+    any getByTable( [in] long nTab )
+        raises( com::sun::star::container::NoSuchElementException,
+                com::sun::star::lang::IndexOutOfBoundsException );
+
+    boolean hasByTable ( [in] long nTab )
+        raises( com::sun::star::lang::IndexOutOfBoundsException );
+
+ };
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/sheet/XUsedAreaCursor.idl b/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
index 528b55c07a5c..4d7cf0c1de8c 100644
--- a/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
+++ b/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sheet_XUsedAreaCursor_idl__
 #define __com_sun_star_sheet_XUsedAreaCursor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XViewFreezable.idl b/offapi/com/sun/star/sheet/XViewFreezable.idl
index 46464036e704..ffa8a0249435 100644
--- a/offapi/com/sun/star/sheet/XViewFreezable.idl
+++ b/offapi/com/sun/star/sheet/XViewFreezable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_XViewFreezable_idl__
 #define __com_sun_star_sheet_XViewFreezable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XViewPane.idl b/offapi/com/sun/star/sheet/XViewPane.idl
index 41f441e6a803..46a115fe7f5c 100644
--- a/offapi/com/sun/star/sheet/XViewPane.idl
+++ b/offapi/com/sun/star/sheet/XViewPane.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_sheet_XViewPane_idl__
 #define __com_sun_star_sheet_XViewPane_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XViewPanesSupplier.idl b/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
index 130498695c6e..79e99faeb42c 100644
--- a/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XViewPanesSupplier_idl__
 #define __com_sun_star_sheet_XViewPanesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XViewSplitable.idl b/offapi/com/sun/star/sheet/XViewSplitable.idl
index d5145addb9ee..0b0d1aa073d4 100644
--- a/offapi/com/sun/star/sheet/XViewSplitable.idl
+++ b/offapi/com/sun/star/sheet/XViewSplitable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_sheet_XViewSplitable_idl__
 #define __com_sun_star_sheet_XViewSplitable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/XVolatileResult.idl b/offapi/com/sun/star/sheet/XVolatileResult.idl
index 9378e09472f0..665e546367d5 100644
--- a/offapi/com/sun/star/sheet/XVolatileResult.idl
+++ b/offapi/com/sun/star/sheet/XVolatileResult.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_sheet_XVolatileResult_idl__
 #define __com_sun_star_sheet_XVolatileResult_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XResultListener_idl__
 #include <com/sun/star/sheet/XResultListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/makefile.mk b/offapi/com/sun/star/sheet/makefile.mk
index c5b15a5b07af..10bb43d23173 100644
--- a/offapi/com/sun/star/sheet/makefile.mk
+++ b/offapi/com/sun/star/sheet/makefile.mk
@@ -66,6 +66,7 @@ IDLFILES=\
     CellsEnumeration.idl\
     ComplexReference.idl\
     ConditionOperator.idl\
+    ConditionOperator2.idl\
     ConsolidationDescriptor.idl\
     DDEItemInfo.idl\
     DDELink.idl\
@@ -315,6 +316,7 @@ IDLFILES=\
     XSheetCellRangeContainer.idl\
     XSheetCellRanges.idl\
     XSheetCondition.idl\
+    XSheetCondition2.idl\
     XSheetConditionalEntries.idl\
     XSheetConditionalEntry.idl\
     XSheetFilterDescriptor.idl\
@@ -336,6 +338,7 @@ IDLFILES=\
     XSubTotalDescriptor.idl\
     XSubTotalField.idl\
     XUniqueCellFormatRangesSupplier.idl\
+    XUnnamedDatabaseRanges.idl\
     XUsedAreaCursor.idl\
     XViewFreezable.idl\
     XViewPane.idl\
diff --git a/offapi/com/sun/star/smarttags/XSmartTagAction.idl b/offapi/com/sun/star/smarttags/XSmartTagAction.idl
index 696f7cdccfc0..5a591bff6d40 100644
--- a/offapi/com/sun/star/smarttags/XSmartTagAction.idl
+++ b/offapi/com/sun/star/smarttags/XSmartTagAction.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_smarttags_XSmartTagAction_idl__
 #define __com_sun_star_smarttags_XSmartTagAction_idl__
 
-#ifndef __com_sun_star_container_XStringKeyMap_idl__
 #include <com/sun/star/container/XStringKeyMap.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -144,7 +124,7 @@ interface XSmartTagAction: com::sun::star::lang::XInitialization
 
 
     //-------------------------------------------------------------------------
-    /** obtains the number of actions provided for a specifiy smart tag
+    /** obtains the number of actions provided for a specify smart tag
         type.
 
         @param aSmartTagName
@@ -234,7 +214,7 @@ interface XSmartTagAction: com::sun::star::lang::XInitialization
 
 
     //-------------------------------------------------------------------------
-    /** obtains a language independant name of an action.
+    /** obtains a language independent name of an action.
 
         @param nActionID
                 The identifier of the requested action.
@@ -243,7 +223,7 @@ interface XSmartTagAction: com::sun::star::lang::XInitialization
                 The current controller of the document.
 
         @return
-                the language independant name of the specified action.
+                the language independent name of the specified action.
 
         @throws com::sun::star::lang::IllegalArgumentException
                 if the ActionID is not recognized.
diff --git a/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl b/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
index 9c51e4a5ad0e..481bbf86bab0 100644
--- a/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
+++ b/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_smarttags_XSmartTagRecognizer_idl__
 #define __com_sun_star_smarttags_XSmartTagRecognizer_idl__
 
-#ifndef __com_sun_star_uno_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_i18n_XBreakIterator_idl__
 #include <com/sun/star/i18n/XBreakIterator.idl>
-#endif
-
-#ifndef __com_sun_star_smarttags_SmartTagRecognizerMode_idl__
 #include <com/sun/star/smarttags/SmartTagRecognizerMode.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextMarkup_idl__
 #include <com/sun/star/text/XTextMarkup.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XController_idl__
 #include <com/sun/star/frame/XController.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 //=============================================================================
 
@@ -145,7 +125,7 @@ interface XSmartTagRecognizer: com::sun::star::lang::XInitialization
 
         @param aText
                 The text that should be scanned by the recognizer. aText
-                is UFT16 encoded.
+                is UTF-16 encoded.
 
         @param nStart
                 Denotes the start position of the region to scan.
diff --git a/offapi/com/sun/star/style/CellStyle.idl b/offapi/com/sun/star/style/CellStyle.idl
index d0bb6ac2ce2c..4410d37caf03 100644
--- a/offapi/com/sun/star/style/CellStyle.idl
+++ b/offapi/com/sun/star/style/CellStyle.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_style_CellStyle_idl__
 #define __com_sun_star_style_CellStyle_idl__
 
-#ifndef __com_sun_star_style_Style_idl__
 #include <com/sun/star/style/Style.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/style/CharacterProperties.idl b/offapi/com/sun/star/style/CharacterProperties.idl
index fb6556b508ae..a5788c0005f5 100644
--- a/offapi/com/sun/star/style/CharacterProperties.idl
+++ b/offapi/com/sun/star/style/CharacterProperties.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_style_CharacterProperties_idl__
 #define __com_sun_star_style_CharacterProperties_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontSlant_idl__
 #include <com/sun/star/awt/FontSlant.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 
 //=============================================================================
@@ -99,7 +88,7 @@ published service CharacterProperties
 
     //-------------------------------------------------------------------------
 
-    /** specifies the percentage of raisement/lowerment of superscript/subscript
+    /** specifies the percentage by which to raise/lower superscript/subscript
         characters.
 
         <p>Negative values denote subscripts and positive values superscripts.</p>
@@ -181,7 +170,7 @@ published service CharacterProperties
 
     //-------------------------------------------------------------------------
 
-    /** This property determins the type of the strike out of the character.
+    /** This property determines the type of the strike out of the character.
         @see com::sun::star::awt::FontStrikeout
     */
     [optional, property] short CharStrikeout;
@@ -256,7 +245,7 @@ published service CharacterProperties
 
     //-------------------------------------------------------------------------
 
-    /** This optional property determins whether text is formatted in two lines.
+    /** This optional property determines whether text is formatted in two lines.
 
         <p>It is linked to the properties CharCombinePrefix and CharCombineSuffix.</p>
      */
@@ -302,7 +291,7 @@ published service CharacterProperties
 
     //-------------------------------------------------------------------------
 
-    /** This optional property determins the adjustment of the ruby .
+    /** This optional property determines the adjustment of the ruby .
         @see com::sun::star::text::RubyAdjust
      */
     [optional, property] short RubyAdjust;
@@ -316,14 +305,14 @@ published service CharacterProperties
 
     //-------------------------------------------------------------------------
 
-    /** This optional property determins whether the ruby text is printed
+    /** This optional property determines whether the ruby text is printed
         above/left or below/right of the text.
      */
     [optional, property] boolean RubyIsAbove;
 
     //-------------------------------------------------------------------------
 
-    /** This optional property determins the rotation of a character in tenths
+    /** This optional property determines the rotation of a character in tenths
         of a degree.
 
        <p>Depending on the implementation only certain values may be allowed.</p>
@@ -332,14 +321,14 @@ published service CharacterProperties
 
     //-------------------------------------------------------------------------
 
-    /** This optional property determins whether the text formatting tries to
+    /** This optional property determines whether the text formatting tries to
         fit rotated text into the surrounded line height.
      */
     [optional, property] boolean CharRotationIsFitToLine;
 
     //-------------------------------------------------------------------------
 
-    /** This optional property determins the percentage value for scaling the
+    /** This optional property determines the percentage value for scaling the
         width of characters.
 
         <p>The value refers to the original width which is denoted by 100,
diff --git a/offapi/com/sun/star/style/CharacterPropertiesAsian.idl b/offapi/com/sun/star/style/CharacterPropertiesAsian.idl
index 844bf2038e1b..9ae2c02af330 100644
--- a/offapi/com/sun/star/style/CharacterPropertiesAsian.idl
+++ b/offapi/com/sun/star/style/CharacterPropertiesAsian.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #define __com_sun_star_style_CharacterPropertiesAsian_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_awt_FontSlant_idl__
 #include <com/sun/star/awt/FontSlant.idl>
-#endif
 
 
 //=============================================================================
@@ -40,7 +36,7 @@
  module com {  module sun {  module star {  module style {
 
 //=============================================================================
-/** This is a set of properties to describe the style of characters in asian texts.
+/** This is a set of properties to describe the style of characters in Asian texts.
  */
 published service CharacterPropertiesAsian
 {
diff --git a/offapi/com/sun/star/style/CharacterPropertiesComplex.idl b/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
index 12f7dab0d4a4..db8d513ca16e 100644
--- a/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
+++ b/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_style_CharacterProperties_Complex_idl__
 #define __com_sun_star_style_CharacterProperties_Complex_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_awt_FontSlant_idl__
 #include <com/sun/star/awt/FontSlant.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/style/CharacterStyle.idl b/offapi/com/sun/star/style/CharacterStyle.idl
index 568cb2fda40e..f56efd01d220 100644
--- a/offapi/com/sun/star/style/CharacterStyle.idl
+++ b/offapi/com/sun/star/style/CharacterStyle.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_style_CharacterStyle_idl__
 #define __com_sun_star_style_CharacterStyle_idl__
 
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_Style_idl__
 #include <com/sun/star/style/Style.idl>
-#endif
 
 //=============================================================================
 
@@ -41,7 +36,7 @@
 
 //=============================================================================
 
-/** specifies a stylesheet for characters within a
+/** specifies a style sheet for characters within a
     <type scope="com::sun::star::text">Text</type>.
  */
 published service CharacterStyle
diff --git a/offapi/com/sun/star/style/FootnoteLineStyle.idl b/offapi/com/sun/star/style/FootnoteLineStyle.idl
new file mode 100644
index 000000000000..100e27f1cb41
--- /dev/null
+++ b/offapi/com/sun/star/style/FootnoteLineStyle.idl
@@ -0,0 +1,44 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       [ Novell Inc. ]
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Cedric Bosdonnat <cbosdonnat@novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef __com_sun_star_text_FootnoteLineStyle_idl__
+#define __com_sun_star_text_FootnoteLineStyle_idl__
+
+module com {  module sun {  module star {  module text {
+
+published constants FootnoteLineStyle
+{
+    const short NONE = 0;
+
+    const short SOLID = 1;
+
+    const short DOTTED = 2;
+
+    const short DASHED = 3;
+};
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/style/NumberingAlignment.idl b/offapi/com/sun/star/style/NumberingAlignment.idl
index 8792b04101a5..1b75be91b8d4 100644
--- a/offapi/com/sun/star/style/NumberingAlignment.idl
+++ b/offapi/com/sun/star/style/NumberingAlignment.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_style_NumberingAlignment_idl__
 #define __com_sun_star_style_NumberingAlignment_idl__
 
-#ifndef __com_sun_star_style_HorizontalAlignment_idl__
 #include <com/sun/star/style/HorizontalAlignment.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/NumberingRule.idl b/offapi/com/sun/star/style/NumberingRule.idl
index 72555e5d1913..bfcfd0f7ac69 100644
--- a/offapi/com/sun/star/style/NumberingRule.idl
+++ b/offapi/com/sun/star/style/NumberingRule.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_NumberingRule_idl__
 #define __com_sun_star_style_NumberingRule_idl__
 
-#ifndef __com_sun_star_style_NumberingAlignment_idl__
 #include <com/sun/star/style/NumberingAlignment.idl>
-#endif
 
-#ifndef __com_sun_star_style_NumberingLevel_idl__
 #include <com/sun/star/style/NumberingLevel.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/NumberingType.idl b/offapi/com/sun/star/style/NumberingType.idl
index 21196a8cafb0..da9a9865b6dc 100644
--- a/offapi/com/sun/star/style/NumberingType.idl
+++ b/offapi/com/sun/star/style/NumberingType.idl
@@ -98,13 +98,13 @@ published constants NumberingType
 
     //-------------------------------------------------------------------------
     /** A transliteration module will be used to produce numbers in
-        chinese, japanese, etc.
+        Chinese, Japanese, etc.
      */
 
     const short TRANSLITERATION = 11;
 
     //-------------------------------------------------------------------------
-    /** The nativenumbersupplier service will be called to produce numbers in
+    /** The NativeNumberSupplier service will be called to produce numbers in
         native languages.
      */
     const short NATIVE_NUMBERING = 12;
@@ -179,7 +179,7 @@ published constants NumberingType
     const short NUMBER_UPPER_KO = 25;
 
     //-------------------------------------------------------------------------
-    /** Numbering for Korean hangul number
+    /** Numbering for Korean Hangul number
         as "일,이,삼..."
      */
     const short NUMBER_HANGUL_KO = 26;
@@ -471,6 +471,20 @@ published constants NumberingType
       */
     const short CHARS_CYRILLIC_LOWER_LETTER_N_SR = 51;
 
+    //-------------------------------------------------------------------------
+    /** Numbering in Greek alphabet upper case letters
+
+        @since OOo 3.3
+     */
+    const short CHARS_GREEK_UPPER_LETTER = 52;
+
+    //-------------------------------------------------------------------------
+    /** Numbering in Greek alphabet lower case letters
+
+        @since OOo 3.3
+     */
+    const short CHARS_GREEK_LOWER_LETTER = 53;
+
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/PageProperties.idl b/offapi/com/sun/star/style/PageProperties.idl
index 2ace32f8cc73..3ebacf25e909 100644
--- a/offapi/com/sun/star/style/PageProperties.idl
+++ b/offapi/com/sun/star/style/PageProperties.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_style_PageProperties_idl__
 #define __com_sun_star_style_PageProperties_idl__
 
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-
-#ifndef __com_sun_star_style_PageStyleLayout_idl__
 #include <com/sun/star/style/PageStyleLayout.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextColumns_idl__
 #include <com/sun/star/text/XTextColumns.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_text_WritingMode2_idl__
 #include <com/sun/star/text/WritingMode2.idl>
-#endif
 
 //=============================================================================
 
@@ -94,30 +65,30 @@ published service PageProperties
  */
 [property] string BackGraphicFilter;
 //-----------------------------------------------------------------------------
-/** determins the location of the background graphic.
+/** determines the location of the background graphic.
  */
 [property] com::sun::star::style::GraphicLocation BackGraphicLocation;
 //-----------------------------------------------------------------------------
-/** determins if the background color is transparent.
+/** determines if the background color is transparent.
 
     <p>If this property is set to <TRUE/>,
     <member>PageStyle::BackColor</member> will not be used.</p>
  */
 [property] boolean BackTransparent;
 //-----------------------------------------------------------------------------
-/** determins the left margin of the page.
+/** determines the left margin of the page.
  */
 [property] long LeftMargin;
 //-----------------------------------------------------------------------------
-/** determins the right margin of the page.
+/** determines the right margin of the page.
  */
 [property] long RightMargin;
 //-----------------------------------------------------------------------------
-/** determins the top margin of the page.
+/** determines the top margin of the page.
  */
 [property] long TopMargin;
 //-----------------------------------------------------------------------------
-/** determins the bottom margin of the page.
+/** determines the bottom margin of the page.
  */
 [property] long BottomMargin;
 //-----------------------------------------------------------------------------
@@ -137,35 +108,35 @@ published service PageProperties
  */
 [property] com::sun::star::table::BorderLine BottomBorder;
 //-----------------------------------------------------------------------------
-/** determins the left border distance of the page.
+/** determines the left border distance of the page.
  */
 [property] long LeftBorderDistance;
 //-----------------------------------------------------------------------------
-/** determins the right border distance of the page.
+/** determines the right border distance of the page.
  */
 [property] long RightBorderDistance;
 //-----------------------------------------------------------------------------
-/** determins the top border distance of the page.
+/** determines the top border distance of the page.
  */
 [property] long TopBorderDistance;
 //-----------------------------------------------------------------------------
-/** determins the bottom border distance of the page.
+/** determines the bottom border distance of the page.
  */
 [property] long BottomBorderDistance;
 //-----------------------------------------------------------------------------
-/** determins the shadow of the page.
+/** determines the shadow of the page.
  */
 [property] com::sun::star::table::ShadowFormat ShadowFormat;
 //-----------------------------------------------------------------------------
-/** determins if the page format is landscape.
+/** determines if the page format is landscape.
  */
 [property] boolean IsLandscape;
 //-----------------------------------------------------------------------------
-/** determins the default numbering type for this page.
+/** determines the default numbering type for this page.
  */
 [property] short NumberingType;
 //-----------------------------------------------------------------------------
-/** determins the layout of the page.
+/** determines the layout of the page.
  */
 [property] com::sun::star::style::PageStyleLayout PageStyleLayout;
 //-----------------------------------------------------------------------------
@@ -173,7 +144,7 @@ published service PageProperties
  */
 [property] string PrinterPaperTray;
 //-----------------------------------------------------------------------------
-/** determins if the register mode is active on that page.
+/** determines if the register mode is active on that page.
  */
 [optional, property] boolean RegisterModeActive;
 //-----------------------------------------------------------------------------
@@ -424,6 +395,13 @@ of the current page is used as limit.
  */
 [optional,property] short FootnoteLineWeight;
 //-----------------------------------------------------------------------------
+/** contains the style of the separator line between the text and the footnote area.
+
+    @see com::sun::star::style::FootnoteLineStyle
+        for the possible values.
+ */
+[optional,property] short FootnoteLineStyle;
+//-----------------------------------------------------------------------------
 /** contains the color of the separator line between the text and the footnote area..
  */
 [optional,property] com::sun::star::util::Color FootnoteLineColor;
diff --git a/offapi/com/sun/star/style/PageStyle.idl b/offapi/com/sun/star/style/PageStyle.idl
index 9810198a3257..b80991031111 100644
--- a/offapi/com/sun/star/style/PageStyle.idl
+++ b/offapi/com/sun/star/style/PageStyle.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_style_PageStyle_idl__
 #define __com_sun_star_style_PageStyle_idl__
 
-#ifndef __com_sun_star_style_Style_idl__
 #include <com/sun/star/style/Style.idl>
-#endif
-
-#ifndef __com_sun_star_style_PageProperties_idl__
 #include <com/sun/star/style/PageProperties.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/PageStyleLayout.idl b/offapi/com/sun/star/style/PageStyleLayout.idl
index 6c91d53c3215..ca8dafafa52e 100644
--- a/offapi/com/sun/star/style/PageStyleLayout.idl
+++ b/offapi/com/sun/star/style/PageStyleLayout.idl
@@ -34,7 +34,7 @@ module com {  module sun {  module star {  module style {
 
 //=============================================================================
 
-/** spefifies the pages for which a page layout is valid.
+/** specifies the pages for which a page layout is valid.
  */
 published enum PageStyleLayout
 {
diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl b/offapi/com/sun/star/style/ParagraphProperties.idl
index 65e24f2fa895..f177f725cc37 100644
--- a/offapi/com/sun/star/style/ParagraphProperties.idl
+++ b/offapi/com/sun/star/style/ParagraphProperties.idl
@@ -27,45 +27,17 @@
 #ifndef __com_sun_star_style_ParagraphProperties_idl__
 #define __com_sun_star_style_ParagraphProperties_idl__
 
-#ifndef __com_sun_star_style_ParagraphAdjust_idl__
 #include <com/sun/star/style/ParagraphAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_style_LineSpacing_idl__
 #include <com/sun/star/style/LineSpacing.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-
-#ifndef __com_sun_star_style_TabStop_idl__
 #include <com/sun/star/style/TabStop.idl>
-#endif
-
-#ifndef __com_sun_star_style_DropCapFormat_idl__
 #include <com/sun/star/style/DropCapFormat.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_style_BreakType_idl__
 #include <com/sun/star/style/BreakType.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
@@ -220,7 +192,7 @@ published service ParagraphProperties
 
     //-------------------------------------------------------------------------
 
-    /** specifies the positions and kinds of thei tab stops within this
+    /** specifies the positions and kinds of the tab stops within this
                 paragraph.
      */
     [optional, property] sequence<com::sun::star::style::TabStop> ParaTabStops;
@@ -365,7 +337,7 @@ published service ParagraphProperties
         [property, optional] long BottomBorderDistance;
 
     //-------------------------------------------------------------------------
-        /** determins the type of break that is applied at the beginning of the table.
+        /** determines the type of break that is applied at the beginning of the table.
             @see com.sun.star.style.BreakType
          */
         [optional, property] com::sun::star::style::BreakType BreakType;
diff --git a/offapi/com/sun/star/style/ParagraphPropertiesAsian.idl b/offapi/com/sun/star/style/ParagraphPropertiesAsian.idl
index 48e513acd65b..ce32a1a7f6ea 100644
--- a/offapi/com/sun/star/style/ParagraphPropertiesAsian.idl
+++ b/offapi/com/sun/star/style/ParagraphPropertiesAsian.idl
@@ -44,7 +44,7 @@ published service ParagraphPropertiesAsian
          */
         [property] boolean ParaIsHangingPunctuation;
         //-------------------------------------------------------------------------
-        /** determines if a distance between asian text, western text or complex text is set.
+        /** determines if a distance between Asian text, western text or complex text is set.
          */
         [property] boolean ParaIsCharacterDistance;
         //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/style/ParagraphStyle.idl b/offapi/com/sun/star/style/ParagraphStyle.idl
index 66836a9454ef..c61b08ffb709 100644
--- a/offapi/com/sun/star/style/ParagraphStyle.idl
+++ b/offapi/com/sun/star/style/ParagraphStyle.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_style_ParagraphStyle_idl__
 #define __com_sun_star_style_ParagraphStyle_idl__
 
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_Style_idl__
 #include <com/sun/star/style/Style.idl>
-#endif
-
-#ifndef _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl>
-#endif
 
 //=============================================================================
 
@@ -45,7 +37,7 @@
 
 //=============================================================================
 
-/** specifies a stylesheet for paragraphs within a
+/** specifies a style sheet for paragraphs within a
     <type scope="com::sun::star::text">Text</type>.
  */
 published service ParagraphStyle
diff --git a/offapi/com/sun/star/style/Style.idl b/offapi/com/sun/star/style/Style.idl
index e19a7f82c005..78fba0e855bc 100644
--- a/offapi/com/sun/star/style/Style.idl
+++ b/offapi/com/sun/star/style/Style.idl
@@ -27,25 +27,12 @@
 #ifndef __com_sun_star_style_Style_idl__
 #define __com_sun_star_style_Style_idl__
 
-#ifndef __com_sun_star_style_XStyle_idl__
 #include <com/sun/star/style/XStyle.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XMultiPropertyStates_idl__
 #include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 
 //=============================================================================
@@ -73,8 +60,8 @@ published service Style
 
         [optional] interface com::sun::star::beans::XMultiPropertySet;
 
-    /* This optional interface is available as an optimisation, allowing users
-       to use 'setAllPropertiesToDefault', for example. */
+    /* This optional interface is available as an optimization, allowing users
+       to use "setAllPropertiesToDefault", for example. */
     //-------------------------------------------------------------------------
 
     [optional] interface com::sun::star::beans::XMultiPropertyStates;
@@ -101,7 +88,7 @@ published service Style
     /** contains the name of the style as it is displayed in the user interface.
 
         <p> The names of the styles at the API are language independent. The user interface
-        names are localised.</p>
+        names are localized.</p>
      */
     [optional, readonly, property] string DisplayName;
     //-------------------------------------------------------------------------
@@ -127,7 +114,7 @@ published service Style
         <p>Assigning an empty string to the style name will disable
         the conditional style for that context.</p>
 
-        <p>The alowed strings (contexts) for the name part of an entry
+        <p>The allowed strings (contexts) for the name part of an entry
         of the sequence are:</p>
 
         <ul>
diff --git a/offapi/com/sun/star/style/StyleFamilies.idl b/offapi/com/sun/star/style/StyleFamilies.idl
index 5dd1afad2d39..375c6a370c8f 100644
--- a/offapi/com/sun/star/style/StyleFamilies.idl
+++ b/offapi/com/sun/star/style/StyleFamilies.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_StyleFamilies_idl__
 #define __com_sun_star_style_StyleFamilies_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/StyleFamily.idl b/offapi/com/sun/star/style/StyleFamily.idl
index ae4e1be0cad7..36c276e4bfcb 100644
--- a/offapi/com/sun/star/style/StyleFamily.idl
+++ b/offapi/com/sun/star/style/StyleFamily.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_StyleFamily_idl__
 #define __com_sun_star_style_StyleFamily_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/TabStop.idl b/offapi/com/sun/star/style/TabStop.idl
index 37a8eb47e2d7..ca3d1c3b829e 100644
--- a/offapi/com/sun/star/style/TabStop.idl
+++ b/offapi/com/sun/star/style/TabStop.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_style_TabStop_idl__
 #define __com_sun_star_style_TabStop_idl__
 
-#ifndef __com_sun_star_style_TabAlign_idl__
 #include <com/sun/star/style/TabAlign.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/XAutoStyle.idl b/offapi/com/sun/star/style/XAutoStyle.idl
index 41d40ce80af7..d188e387a9b4 100644
--- a/offapi/com/sun/star/style/XAutoStyle.idl
+++ b/offapi/com/sun/star/style/XAutoStyle.idl
@@ -27,25 +27,12 @@
 #ifndef __com_sun_star_style_XAutoStyle_idl__
 #define __com_sun_star_style_XAutoStyle_idl__
 
-#ifndef __com_sun_star_style_XStyle_idl__
 #include <com/sun/star/style/XStyle.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XMultiPropertyStates_idl__
 #include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/style/XAutoStyleFamily.idl b/offapi/com/sun/star/style/XAutoStyleFamily.idl
index 9a448b6392a9..bf7c403d6af0 100644
--- a/offapi/com/sun/star/style/XAutoStyleFamily.idl
+++ b/offapi/com/sun/star/style/XAutoStyleFamily.idl
@@ -26,16 +26,10 @@
  ************************************************************************/
 #ifndef __com_sun_star_style_XAutoStyleFamily_idl__
 #define __com_sun_star_style_XAutoStyleFamily_idl__
-#ifndef __com_sun_star_style_XAutoStyle_idl__
 #include <com/sun/star/style/XAutoStyle.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/style/XAutoStyles.idl b/offapi/com/sun/star/style/XAutoStyles.idl
index 4293ab6cab65..29d2dc4dc8e1 100644
--- a/offapi/com/sun/star/style/XAutoStyles.idl
+++ b/offapi/com/sun/star/style/XAutoStyles.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_XAutoStyles_idl__
 #define __com_sun_star_style_XAutoStyles_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/XAutoStylesSupplier.idl b/offapi/com/sun/star/style/XAutoStylesSupplier.idl
index 2c4a3dc4f724..86238bfb2a33 100644
--- a/offapi/com/sun/star/style/XAutoStylesSupplier.idl
+++ b/offapi/com/sun/star/style/XAutoStylesSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_style_XAutoStylesSupplier_idl__
 #define __com_sun_star_style_XAutoStylesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_style_XAutoStyles_idl__
 #include <com/sun/star/style/XAutoStyles.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/style/XDefaultsSupplier.idl b/offapi/com/sun/star/style/XDefaultsSupplier.idl
index 2ece9ece2a31..db7e166486e0 100644
--- a/offapi/com/sun/star/style/XDefaultsSupplier.idl
+++ b/offapi/com/sun/star/style/XDefaultsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_XDefaultsSupplier_idl__
 #define __com_sun_star_style_XDefaultsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/XStyle.idl b/offapi/com/sun/star/style/XStyle.idl
index 0117bf5167a5..a50a483b931d 100644
--- a/offapi/com/sun/star/style/XStyle.idl
+++ b/offapi/com/sun/star/style/XStyle.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_XStyle_idl__
 #define __com_sun_star_style_XStyle_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/XStyleCondition.idl b/offapi/com/sun/star/style/XStyleCondition.idl
index e74f3f01a2df..67226eb8843d 100644
--- a/offapi/com/sun/star/style/XStyleCondition.idl
+++ b/offapi/com/sun/star/style/XStyleCondition.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_style_XStyleCondition_idl__
 #define __com_sun_star_style_XStyleCondition_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl b/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
index 8d26373ce6a6..ebaa9e25f6cb 100644
--- a/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
+++ b/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
 #define __com_sun_star_style_XStyleFamiliesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/XStyleLoader.idl b/offapi/com/sun/star/style/XStyleLoader.idl
index 5fbc1d6588a4..387bde6b6e1b 100644
--- a/offapi/com/sun/star/style/XStyleLoader.idl
+++ b/offapi/com/sun/star/style/XStyleLoader.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_style_XStyleLoader_idl__
 #define __com_sun_star_style_XStyleLoader_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/style/makefile.mk b/offapi/com/sun/star/style/makefile.mk
index 969f0589d9c3..b9077b14109c 100644
--- a/offapi/com/sun/star/style/makefile.mk
+++ b/offapi/com/sun/star/style/makefile.mk
@@ -46,6 +46,7 @@ IDLFILES=\
     CharacterPropertiesComplex.idl\
     CharacterStyle.idl\
     DropCapFormat.idl\
+    FootnoteLineStyle.idl\
     GraphicLocation.idl\
     HorizontalAlignment.idl\
     LineNumberPosition.idl\
diff --git a/offapi/com/sun/star/svg/XSVGPrinter.idl b/offapi/com/sun/star/svg/XSVGPrinter.idl
index 059da696ac83..dd5a480c8d1e 100644
--- a/offapi/com/sun/star/svg/XSVGPrinter.idl
+++ b/offapi/com/sun/star/svg/XSVGPrinter.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sync_XSVGPrinter_idl__
 #define __com_sun_star_sync_XSVGPrinter_idl__
 
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/svg/XSVGWriter.idl b/offapi/com/sun/star/svg/XSVGWriter.idl
index d4ff549a8c53..7066773c5dd3 100644
--- a/offapi/com/sun/star/svg/XSVGWriter.idl
+++ b/offapi/com/sun/star/svg/XSVGWriter.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sync_XSVGWriter_idl__
 #define __com_sun_star_sync_XSVGWriter_idl__
 
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sync/SyncCollector.idl b/offapi/com/sun/star/sync/SyncCollector.idl
index b174c87052ed..b984cb7319a1 100644
--- a/offapi/com/sun/star/sync/SyncCollector.idl
+++ b/offapi/com/sun/star/sync/SyncCollector.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sync_SyncCollector_idl__
 #define __com_sun_star_sync_SyncCollector_idl__
 
-#ifndef __com_sun_star_sync_XSyncCollector_idl__
 #include <com/sun/star/sync/XSyncCollector.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sync/SyncInfo.idl b/offapi/com/sun/star/sync/SyncInfo.idl
index b5400ee3a446..ab8c7804d0ee 100644
--- a/offapi/com/sun/star/sync/SyncInfo.idl
+++ b/offapi/com/sun/star/sync/SyncInfo.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sync_SyncInfo_idl__
 #define __com_sun_star_sync_SyncInfo_idl__
 
-#ifndef __com_sun_star_sync_SyncScheme_idl__
 #include <com/sun/star/sync/SyncScheme.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sync/SyncScheme.idl b/offapi/com/sun/star/sync/SyncScheme.idl
index 727479a74384..b637d0573d7b 100644
--- a/offapi/com/sun/star/sync/SyncScheme.idl
+++ b/offapi/com/sun/star/sync/SyncScheme.idl
@@ -34,7 +34,7 @@
 
 /** contains the scheme name of this SyncScheme
 
-    @derepcated
+    @deprecated
  */
 published struct SyncScheme
 {
diff --git a/offapi/com/sun/star/sync/Synchronizer.idl b/offapi/com/sun/star/sync/Synchronizer.idl
index fd705bae00f1..df40661e0c0a 100644
--- a/offapi/com/sun/star/sync/Synchronizer.idl
+++ b/offapi/com/sun/star/sync/Synchronizer.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sync_Synchronizer_idl__
 #define __com_sun_star_sync_Synchronizer_idl__
 
-#ifndef __com_sun_star_sync_XSynchronizer_idl__
 #include <com/sun/star/sync/XSynchronizer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sync/XSyncCollector.idl b/offapi/com/sun/star/sync/XSyncCollector.idl
index 08dcf21c5ae0..367f18664697 100644
--- a/offapi/com/sun/star/sync/XSyncCollector.idl
+++ b/offapi/com/sun/star/sync/XSyncCollector.idl
@@ -28,21 +28,11 @@
 #ifndef __com_sun_star_sync_XSyncCollector_idl__
 #define __com_sun_star_sync_XSyncCollector_idl__
 
-#ifndef __com_sun_star_ucb_XContentProviderManager_idl__
 #include <com/sun/star/ucb/XContentProviderManager.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-#ifndef __com_sun_star_sync_SyncScheme_idl__
 #include <com/sun/star/sync/SyncScheme.idl>
-#endif
-#ifndef __com_sun_star_sync_SyncInfo_idl__
 #include <com/sun/star/sync/SyncInfo.idl>
-#endif
-#ifndef __com_sun_star_sync_SyncElement_idl__
 #include <com/sun/star/sync/SyncElement.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sync/XSynchronizer.idl b/offapi/com/sun/star/sync/XSynchronizer.idl
index 906a0cb78607..d2df6b683d3e 100644
--- a/offapi/com/sun/star/sync/XSynchronizer.idl
+++ b/offapi/com/sun/star/sync/XSynchronizer.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_sync_XSynchronizer_idl__
 #define __com_sun_star_sync_XSynchronizer_idl__
 
-#ifndef __com_sun_star_sync_XSyncCollector_idl__
 #include <com/sun/star/sync/XSyncCollector.idl>
-#endif
-#ifndef __com_sun_star_sync_SyncInfo_idl__
 #include <com/sun/star/sync/SyncInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sync2/BadPartnershipException.idl b/offapi/com/sun/star/sync2/BadPartnershipException.idl
index 1fcfad42f633..2155275552b4 100644
--- a/offapi/com/sun/star/sync2/BadPartnershipException.idl
+++ b/offapi/com/sun/star/sync2/BadPartnershipException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_sync2_BadPartnershipException_idl__
 #define __com_sun_star_sync2_BadPartnershipException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include "com/sun/star/uno/Exception.idl"
-#endif
 
 module com { module sun { module star { module sync2 {
 
diff --git a/offapi/com/sun/star/system/ProxySettings.idl b/offapi/com/sun/star/system/ProxySettings.idl
index 826cf2ea4faf..31dd970090d2 100644
--- a/offapi/com/sun/star/system/ProxySettings.idl
+++ b/offapi/com/sun/star/system/ProxySettings.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_system_ProxySettings_idl__
 #define __com_sun_star_system_ProxySettings_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SOffice52ProxySettings.idl b/offapi/com/sun/star/system/SOffice52ProxySettings.idl
index a745ed7a4bc1..da87b40548e1 100644
--- a/offapi/com/sun/star/system/SOffice52ProxySettings.idl
+++ b/offapi/com/sun/star/system/SOffice52ProxySettings.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_system_SOffice52ProxySettings_idl__
 #define __com_sun_star_system_SOffice52ProxySettings_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_system_ProxySettings_idl__
 #include <com/sun/star/system/ProxySettings.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SimpleCommandMail.idl b/offapi/com/sun/star/system/SimpleCommandMail.idl
index 7d2ee1833f3a..f850efb8db3d 100644
--- a/offapi/com/sun/star/system/SimpleCommandMail.idl
+++ b/offapi/com/sun/star/system/SimpleCommandMail.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_system_SimpleCommandMail_idl__
 #define __com_sun_star_system_SimpleCommandMail_idl__
 
-#ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
 #include <com/sun/star/configuration/ConfigurationProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SimpleSystemMail.idl b/offapi/com/sun/star/system/SimpleSystemMail.idl
index 4fe46be81d0a..373580451f64 100644
--- a/offapi/com/sun/star/system/SimpleSystemMail.idl
+++ b/offapi/com/sun/star/system/SimpleSystemMail.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_system_SimpleSystemMail_idl__
 #define __com_sun_star_system_SimpleSystemMail_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SystemProxySettings.idl b/offapi/com/sun/star/system/SystemProxySettings.idl
index 9093afe1f7cb..6bd93d6a9757 100644
--- a/offapi/com/sun/star/system/SystemProxySettings.idl
+++ b/offapi/com/sun/star/system/SystemProxySettings.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_system_SystemProxySettings_idl__
 #define __com_sun_star_system_SystemProxySettings_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_system_ProxySettings_idl__
 #include <com/sun/star/system/ProxySettings.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SystemShellExecute.idl b/offapi/com/sun/star/system/SystemShellExecute.idl
index 2440c9c2492b..ef0a0f21d260 100644
--- a/offapi/com/sun/star/system/SystemShellExecute.idl
+++ b/offapi/com/sun/star/system/SystemShellExecute.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_system_SystemShellExecute_idl__
 #define __com_sun_star_system_SystemShellExecute_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SystemShellExecuteException.idl b/offapi/com/sun/star/system/SystemShellExecuteException.idl
index f001a877e0ff..1c22e3224f92 100644
--- a/offapi/com/sun/star/system/SystemShellExecuteException.idl
+++ b/offapi/com/sun/star/system/SystemShellExecuteException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_system_SystemShellExecuteException_idl__
 #define __com_sun_star_system_SystemShellExecuteException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
@@ -46,7 +44,7 @@ module com { module sun { module star { module system {
 published exception SystemShellExecuteException: com::sun::star::uno::Exception
 {
     //=========================================================================
-    /** A Posix conforming error code or -1 for unknown errors.
+    /** A POSIX conforming error code or -1 for unknown errors.
     */
     long PosixError;
 };
diff --git a/offapi/com/sun/star/system/XProxySettings.idl b/offapi/com/sun/star/system/XProxySettings.idl
index 711bac5b907e..7b1e6a41837d 100644
--- a/offapi/com/sun/star/system/XProxySettings.idl
+++ b/offapi/com/sun/star/system/XProxySettings.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_system_XProxySettings_idl__
 #define __com_sun_star_system_XProxySettings_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -50,16 +45,16 @@ module com { module sun { module star { module system {
 published interface XProxySettings: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Access to the Ftp proxy address.
+    /** Access to the FTP proxy address.
         @returns
-        The address of the ftp proxy server, if any has been specified.
+        The address of the FTP proxy server, if any has been specified.
     */
     string getFtpProxyAddress( );
 
     //-------------------------------------------------------------------------
-    /** Access to the Ftp proxy port.
+    /** Access to the FTP proxy port.
         @returns
-        The port of the ftp proxy server, if any has been specified.
+        The port of the FTP proxy server, if any has been specified.
     */
     string getFtpProxyPort( );
 
@@ -92,16 +87,16 @@ published interface XProxySettings: com::sun::star::uno::XInterface
     string getHttpProxyPort( );
 
     //-------------------------------------------------------------------------
-    /** Access to the Https proxy address.
+    /** Access to the HTTPS proxy address.
         @returns
-        The address of the https proxy server, if any has been specified.
+        The address of the HTTPS proxy server, if any has been specified.
     */
     string getHttpsProxyAddress( );
 
     //-------------------------------------------------------------------------
-    /** Access to the Https proxy port.
+    /** Access to the HTTPS proxy port.
         @returns
-        The port of the https proxy server, if any has been specified.
+        The port of the HTTPS proxy server, if any has been specified.
     */
     string getHttpsProxyPort( );
 
@@ -122,7 +117,7 @@ published interface XProxySettings: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** Access to the Proxy-Bypass address.
         @returns
-        A string of ';' separated addresses for which no proxy server
+        A string of ";" separated addresses for which no proxy server
         should be used.
     */
     string getProxyBypassAddress( );
diff --git a/offapi/com/sun/star/system/XSimpleMailClient.idl b/offapi/com/sun/star/system/XSimpleMailClient.idl
index f768cf67c070..0e92cee08ccc 100644
--- a/offapi/com/sun/star/system/XSimpleMailClient.idl
+++ b/offapi/com/sun/star/system/XSimpleMailClient.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_system_XSimpleMailClient_idl__
 #define __com_sun_star_system_XSimpleMailClient_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_system_XSimpleMailMessage_idl__
 #include <com/sun/star/system/XSimpleMailMessage.idl>
-#endif
-
-#ifndef __com_sun_star_system_SimpleMailClientFlags_idl__
 #include <com/sun/star/system/SimpleMailClientFlags.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl b/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
index fce041b2892b..ed6ac0109176 100644
--- a/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
+++ b/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_system_XSimpleMailClientSupplier_idl__
 #define __com_sun_star_system_XSimpleMailClientSupplier_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_system_XSimpleMailClient_idl__
 #include <com/sun/star/system/XSimpleMailClient.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/XSimpleMailMessage.idl b/offapi/com/sun/star/system/XSimpleMailMessage.idl
index 2ec696ec942e..af08605221b0 100644
--- a/offapi/com/sun/star/system/XSimpleMailMessage.idl
+++ b/offapi/com/sun/star/system/XSimpleMailMessage.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_system_XSimpleMailMessage_idl__
 #define __com_sun_star_system_XSimpleMailMessage_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -87,18 +79,18 @@ published interface XSimpleMailMessage: com::sun::star::uno::XInterface
     sequence< string > getCcRecipient( );
 
     //-------------------------------------------------------------------------
-    /** To set the bcc recipient of a simple mail message.
+    /** To set the BCC recipient of a simple mail message.
         @param aBccRecipient
-        A sequence with the email addresses of one or more bcc recipients. An empty
-        sequence means there are no bcc recipients.</p>
+        A sequence with the email addresses of one or more BCC recipients. An empty
+        sequence means there are no BCC recipients.</p>
     */
     void setBccRecipient( [in] sequence< string > aBccRecipient );
 
     //-------------------------------------------------------------------------
-    /** To get the bcc recipients of a simple mail message.
+    /** To get the BCC recipients of a simple mail message.
         @returns
-        A sequence with the email addresses of one or more bcc recipients.
-        <p>If no bcc recipients have been specified an empty sequence will be returned.</p>
+        A sequence with the email addresses of one or more BCC recipients.
+        <p>If no BCC recipients have been specified an empty sequence will be returned.</p>
     */
     sequence< string > getBccRecipient( );
 
diff --git a/offapi/com/sun/star/system/XSystemShellExecute.idl b/offapi/com/sun/star/system/XSystemShellExecute.idl
index f11e54c5b894..4440b045cba4 100644
--- a/offapi/com/sun/star/system/XSystemShellExecute.idl
+++ b/offapi/com/sun/star/system/XSystemShellExecute.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_system_XSystemShellExecute_idl__
 #define __com_sun_star_system_XSystemShellExecute_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_system_SystemShellExecuteException_idl__
 #include <com/sun/star/system/SystemShellExecuteException.idl>
-#endif
 
 //=============================================================================
 
@@ -56,7 +45,7 @@ module com { module sun { module star { module system {
 published interface XSystemShellExecute: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Executes an abitrary system command.
+    /** Executes an arbitrary system command.
 
         @param aCommand
         Specifies the command to execute. This may be an executable file or a
diff --git a/offapi/com/sun/star/table/AccessibleCellView.idl b/offapi/com/sun/star/table/AccessibleCellView.idl
index 8f42e9227c3a..27795cde2df2 100644
--- a/offapi/com/sun/star/table/AccessibleCellView.idl
+++ b/offapi/com/sun/star/table/AccessibleCellView.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
 #define __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #include <com/sun/star/accessibility/XAccessibleValue.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
 #include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/table/AccessibleTableView.idl b/offapi/com/sun/star/table/AccessibleTableView.idl
index 54d41dcb499b..8113843d5501 100644
--- a/offapi/com/sun/star/table/AccessibleTableView.idl
+++ b/offapi/com/sun/star/table/AccessibleTableView.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
 #define __com_sun_star_sheet_AccessibleSpreadsheetDocumentView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
 #include <com/sun/star/accessibility/XAccessibleTable.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
@@ -71,7 +57,7 @@ published service AccessibleTableView
             <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleParent</method>
             is the accessible text document view, a page of the accessible
-            text documenent page preview, or the accessible spreadsheet
+            text document page preview, or the accessible spreadsheet
             page preview.</li>
         <li>The children returned by
             <method scope="::com::sun::star::accessibility"
@@ -92,7 +78,7 @@ published service AccessibleTableView
             the order on the screen. This means that the first cell is the
             cell in the left top edge of the table and the last one is the
             cell in the right bottom edge of the table. The second is the
-            cell in the first row and second xolumn and so on.</li>
+            cell in the first row and second column and so on.</li>
         </ul>
         <li>The description is ???.</li>
         <li>The name is the given table name and a number to make it non-ambiguous.</li>
@@ -107,7 +93,7 @@ published service AccessibleTableView
                     >AccessibleStateType::DEFUNC</const> is always false if the
                     table is not deleted, the document is open. Also it is
                     false if the table was showed in a page preview and the
-                    page preview is allready opend, otherwise it is true.</li>
+                    page preview is already opened, otherwise it is true.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::EDITABLE</const> is false if the
                     table is showed in a page preview or the table is
diff --git a/offapi/com/sun/star/table/BorderLine.idl b/offapi/com/sun/star/table/BorderLine.idl
index 81e71b42dbf9..0344e63ad1ce 100644
--- a/offapi/com/sun/star/table/BorderLine.idl
+++ b/offapi/com/sun/star/table/BorderLine.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_BorderLine_idl__
 #define __com_sun_star_table_BorderLine_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 //=============================================================================
 
@@ -58,7 +56,7 @@ published struct BorderLine
 
     //-------------------------------------------------------------------------
 
-    /** contaions the width of a single line or the width of outer part of
+    /** contains the width of a single line or the width of outer part of
         a double line (in 1/100 mm).
 
         <p>If this value is zero, no line is drawn.</p>
@@ -71,7 +69,6 @@ published struct BorderLine
         double line (in 1/100 mm).
      */
     short LineDistance;
-
 };
 
 //=============================================================================
diff --git a/sal/osl/os2/sockimpl.h b/offapi/com/sun/star/table/BorderLine2.idl
index 38fc26bf0d22..c1ae0f80a122 100644
--- a/sal/osl/os2/sockimpl.h
+++ b/offapi/com/sun/star/table/BorderLine2.idl
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -25,56 +25,38 @@
  *
  ************************************************************************/
 
-#ifndef _OSL_SOCKETIMPL_H_
-#define _OSL_SOCKETIMPL_H_
+#ifndef __com_sun_star_table_BorderLine2_idl__
+#define __com_sun_star_table_BorderLine2_idl__
 
-#include <osl/pipe.h>
-#include <osl/socket.h>
-#include <osl/interlck.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <com/sun/star/table/BorderLine.idl>
+#include <com/sun/star/table/BorderLineStyle.idl>
 
-typedef void* (*oslCloseCallback) (void*);
+//=============================================================================
 
-struct oslSocketImpl {
-    int                 m_Socket;
-    int                 m_nLastError;
-    oslCloseCallback    m_CloseCallback;
-    void*               m_CallbackArg;
-    oslInterlockedCount m_nRefCount;
-#if defined(LINUX)
-    sal_Bool            m_bIsAccepting;
-    sal_Bool            m_bIsInShutdown;
-#endif
-};
+module com {  module sun {  module star {  module table {
 
-struct oslSocketAddrImpl
-{
-    sal_Int32 m_nRefCount;
-    struct sockaddr m_sockaddr;
-};
+//=============================================================================
 
-/*
-struct oslPipeImpl {
-    int  m_Socket;
-    sal_Char m_Name[PATH_MAX + 1];
-    oslInterlockedCount m_nRefCount;
-    sal_Bool m_bClosed;
-#if defined(LINUX)
-    sal_Bool m_bIsAccepting;
-    sal_Bool m_bIsInShutdown;
-#endif
+struct BorderLine2 : BorderLine
+{
+    /** Style of the border. @see BorderLineStyle
+     */
+    short LineStyle;
+
+    /** Width of the border, this is the base to compute all the lines
+        and gaps widths. These widths computations are based on the
+        LineStyle property
+
+        This property is prevailing on the old Out, In and Dist width
+        from BorderLine. If this property is set to 0, then the other
+        widths will be used to guess the border width.
+     */
+    unsigned long LineWidth;
 };
-*/
 
-oslSocket __osl_createSocketImpl(int Socket);
-void __osl_destroySocketImpl(oslSocket pImpl);
+//=============================================================================
 
-#ifdef __cplusplus
-}
-#endif
+}; }; }; };
 
 #endif
-
diff --git a/offapi/com/sun/star/table/BorderLineStyle.idl b/offapi/com/sun/star/table/BorderLineStyle.idl
new file mode 100644
index 000000000000..1d2408a74644
--- /dev/null
+++ b/offapi/com/sun/star/table/BorderLineStyle.idl
@@ -0,0 +1,109 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_table_BorderLineStyle_idl__
+#define __com_sun_star_table_BorderLineStyle_idl__
+
+//=============================================================================
+
+module com {  module sun {  module star {  module table {
+
+//=============================================================================
+
+constants BorderLineStyle
+{
+    /** No border line
+     */
+    const short NONE = 0x7FFF;
+
+    /** Solid border line.
+     */
+    const short SOLID = 0;
+
+    /** Dotted border line.
+     */
+    const short DOTTED = 1;
+
+    /** Dashed border line.
+     */
+    const short DASHED = 2;
+
+    /** Double border line.
+     */
+    const short DOUBLE = 3;
+
+    /** Double border line with a thin line outside and a thick line
+        inside separated by a small gap.
+     */
+    const short THINTHICK_SMALLGAP = 4;
+
+    /** Double border line with a thin line outside and a thick line
+        inside separated by a medium gap.
+     */
+    const short THINTHICK_MEDIUMGAP = 5;
+
+    /** Double border line with a thin line outside and a thick line
+        inside separated by a large gap.
+     */
+    const short THINTHICK_LARGEGAP = 6;
+
+    /** Double border line with a thick line outside and a thin line
+        inside separated by a small gap.
+     */
+    const short THICKTHIN_SMALLGAP = 7;
+
+    /** Double border line with a thick line outside and a thin line
+        inside separated by a medium gap.
+     */
+    const short THICKTHIN_MEDIUMGAP = 8;
+
+    /** Double border line with a thick line outside and a thin line
+        inside separated by a large gap.
+     */
+    const short THICKTHIN_LARGEGAP = 9;
+
+    /** 3D embossed border line.
+     */
+    const short EMBOSSED = 10;
+
+    /** 3D engraved border line.
+     */
+    const short ENGRAVED = 11;
+
+    /** Outset border line.
+     */
+    const short OUTSET = 12;
+
+    /** Inset border line.
+     */
+    const short INSET = 13;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/table/Cell.idl b/offapi/com/sun/star/table/Cell.idl
index 9cd81fb80fce..845a328fd39d 100644
--- a/offapi/com/sun/star/table/Cell.idl
+++ b/offapi/com/sun/star/table/Cell.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_Cell_idl__
 #define __com_sun_star_table_Cell_idl__
 
-#ifndef __com_sun_star_table_CellProperties_idl__
 #include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/CellCursor.idl b/offapi/com/sun/star/table/CellCursor.idl
index 996f1d80e75c..2f1016806ac1 100644
--- a/offapi/com/sun/star/table/CellCursor.idl
+++ b/offapi/com/sun/star/table/CellCursor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_CellCursor_idl__
 #define __com_sun_star_table_CellCursor_idl__
 
-#ifndef __com_sun_star_table_XCellCursor_idl__
 #include <com/sun/star/table/XCellCursor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/CellJustifyMethod.idl b/offapi/com/sun/star/table/CellJustifyMethod.idl
new file mode 100644
index 000000000000..a14fd0d857a2
--- /dev/null
+++ b/offapi/com/sun/star/table/CellJustifyMethod.idl
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_table_CellJustifyMethod_idl__
+#define __com_sun_star_table_CellJustifyMethod_idl__
+
+//=============================================================================
+
+module com {  module sun {  module star {  module table {
+
+//=============================================================================
+
+/** Specifies how text inside a cell is justified.  The justification methods
+    closely follow the methods described under the text-justify property of the
+    CSS Text Level 3 specification.  The latest version of the aforementioned
+    specification is found here http://www.w3.org/TR/css3-text/.
+ */
+constants CellJustifyMethod
+{
+    //-------------------------------------------------------------------------
+
+    /** Automatic.
+     */
+    const long AUTO = 0;
+
+    //-------------------------------------------------------------------------
+
+    /** When applied in the direction of text flow, characters in each line are
+        distributed at equal intervals so that the ends of each line are aligned
+        with the start and end edges of the cell.  When applied in the
+        perpendicular direction of text flow, the lines are distributed at equal
+        intervals so that the first and last lines are aligned with the start and
+        end edges of the cell.
+     */
+    const long DISTRIBUTE = 1;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/table/CellProperties.idl b/offapi/com/sun/star/table/CellProperties.idl
index 0528415bdea3..c54f478244f8 100644
--- a/offapi/com/sun/star/table/CellProperties.idl
+++ b/offapi/com/sun/star/table/CellProperties.idl
@@ -28,45 +28,16 @@
 #ifndef __com_sun_star_table_CellProperties_idl__
 #define __com_sun_star_table_CellProperties_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellHoriJustify_idl__
 #include <com/sun/star/table/CellHoriJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellVertJustify_idl__
 #include <com/sun/star/table/CellVertJustify.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellOrientation_idl__
 #include <com/sun/star/table/CellOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_util_CellProtection_idl__
 #include <com/sun/star/util/CellProtection.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableBorder_idl__
 #include <com/sun/star/table/TableBorder.idl>
-#endif
-
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
@@ -250,7 +221,7 @@ published service CellProperties
 
     //-------------------------------------------------------------------------
 
-    /** is <TRUE/>, if the cell content will be shrinked to fit in the cell.
+    /** is <TRUE/>, if the cell content will be shrunk to fit in the cell.
      */
     [optional, property] boolean ShrinkToFit;
 
diff --git a/offapi/com/sun/star/table/CellRange.idl b/offapi/com/sun/star/table/CellRange.idl
index 3b1387f859f3..be521e10fa9c 100644
--- a/offapi/com/sun/star/table/CellRange.idl
+++ b/offapi/com/sun/star/table/CellRange.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_CellRange_idl__
 #define __com_sun_star_table_CellRange_idl__
 
-#ifndef __com_sun_star_table_CellProperties_idl__
 #include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/CellRangeListSource.idl b/offapi/com/sun/star/table/CellRangeListSource.idl
index c6c5d710b8fe..c4e6b1e1312a 100644
--- a/offapi/com/sun/star/table/CellRangeListSource.idl
+++ b/offapi/com/sun/star/table/CellRangeListSource.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_sheet_CellRangeListSource_idl__
 #define __com_sun_star_sheet_CellRangeListSource_idl__
 
-#ifndef __com_sun_star_form_binding_ListEntrySource_idl__
 #include <com/sun/star/form/binding/ListEntrySource.idl>
-#endif
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
@@ -45,7 +39,7 @@ module com {  module sun {  module star {  module table {
 
 //=============================================================================
 
-/** defines the a source of list entries coming from a cell range in a tbale document
+/** defines the a source of list entries coming from a cell range in a table document
 
     <p>The component cannot be instantiated at a global service factory, instead
     it's usually provided by a document instance.</p>
@@ -74,7 +68,7 @@ service CellRangeListSource
         method must be instances of <type scope="com::sun::star::beans">NamedValue</type>, where
         the <member scope"com::sun::star::beans">NamedValue::Name</member> denotes the type of information
         to initialize, and the <member scope"com::sun::star::beans">NamedValue::Value</member>
-        the inital value.</p>
+        the initial value.</p>
 
         <p>The following aspects of the components can be initialized:<br/>
             <ul><li><b>CellRange</b><br/>
diff --git a/offapi/com/sun/star/table/CellValueBinding.idl b/offapi/com/sun/star/table/CellValueBinding.idl
index 3115a8834f5f..573904893615 100644
--- a/offapi/com/sun/star/table/CellValueBinding.idl
+++ b/offapi/com/sun/star/table/CellValueBinding.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_table_CellValueBinding_idl__
 #define __com_sun_star_table_CellValueBinding_idl__
 
-#ifndef __com_sun_star_form_binding_ValueBinding_idl__
 #include <com/sun/star/form/binding/ValueBinding.idl>
-#endif
-#ifndef __com_sun_star_table_CellAddress_idl__
 #include <com/sun/star/table/CellAddress.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
@@ -87,7 +81,7 @@ service CellValueBinding
         method must be instances of <type scope="com::sun::star::beans">NamedValue</type>, where
         the <member scope"com::sun::star::beans">NamedValue::Name</member> denotes the type of information
         to initialize, and the <member scope"com::sun::star::beans">NamedValue::Value</member>
-        the inital value.</p>
+        the initial value.</p>
 
         <p>The following aspects of the components can be initialized:<br/>
             <ul><li><b>BoundCell</b><br/>
diff --git a/offapi/com/sun/star/table/CellVertJustify2.idl b/offapi/com/sun/star/table/CellVertJustify2.idl
new file mode 100644
index 000000000000..1be41c821fe5
--- /dev/null
+++ b/offapi/com/sun/star/table/CellVertJustify2.idl
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_table_CellVertJustify_idl__
+#define __com_sun_star_table_CellVertJustify_idl__
+
+//=============================================================================
+
+module com {  module sun {  module star {  module table {
+
+//=============================================================================
+
+/** specifies how cell contents are aligned vertically.
+ */
+constants CellVertJustify2
+{
+    //-------------------------------------------------------------------------
+
+    /** default alignment is used.
+     */
+    const long STANDARD = 0;
+
+    //-------------------------------------------------------------------------
+
+    /** contents are aligned with the upper edge of the cell.
+     */
+    const long TOP = 1;
+
+    //-------------------------------------------------------------------------
+
+    /** contents are aligned to the vertical middle of the cell.
+     */
+    const long CENTER = 2;
+
+    //-------------------------------------------------------------------------
+
+    /** contents are aligned to the lower edge of the cell.
+     */
+    const long BOTTOM = 3;
+
+    //-------------------------------------------------------------------------
+
+    /** contents are justified to the cell height.
+     */
+    const long BLOCK = 4;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/table/ListPositionCellBinding.idl b/offapi/com/sun/star/table/ListPositionCellBinding.idl
index 5058a30d870c..373c42a3de77 100644
--- a/offapi/com/sun/star/table/ListPositionCellBinding.idl
+++ b/offapi/com/sun/star/table/ListPositionCellBinding.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_ListPositionCellBinding_idl__
 #define __com_sun_star_table_ListPositionCellBinding_idl__
 
-#ifndef __com_sun_star_table_CellValueBinding_idl__
 #include <com/sun/star/table/CellValueBinding.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/ShadowFormat.idl b/offapi/com/sun/star/table/ShadowFormat.idl
index d88445d4a18d..a52c160b15bd 100644
--- a/offapi/com/sun/star/table/ShadowFormat.idl
+++ b/offapi/com/sun/star/table/ShadowFormat.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_ShadowFormat_idl__
 #define __com_sun_star_table_ShadowFormat_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowLocation_idl__
 #include <com/sun/star/table/ShadowLocation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableBorder.idl b/offapi/com/sun/star/table/TableBorder.idl
index 8688e6c8a3f0..93478ae8c21a 100644
--- a/offapi/com/sun/star/table/TableBorder.idl
+++ b/offapi/com/sun/star/table/TableBorder.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_TableBorder_idl__
 #define __com_sun_star_table_TableBorder_idl__
 
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableBorderDistances.idl b/offapi/com/sun/star/table/TableBorderDistances.idl
index 86db15d99b64..3078d04fc19d 100644
--- a/offapi/com/sun/star/table/TableBorderDistances.idl
+++ b/offapi/com/sun/star/table/TableBorderDistances.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_TableBorderDistances_idl__
 #define __com_sun_star_table_TableBorderDistances_idl__
 
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableChart.idl b/offapi/com/sun/star/table/TableChart.idl
index c12262019785..22b4d0527a87 100644
--- a/offapi/com/sun/star/table/TableChart.idl
+++ b/offapi/com/sun/star/table/TableChart.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_TableChart_idl__
 #define __com_sun_star_table_TableChart_idl__
 
-#ifndef __com_sun_star_table_XTableChart_idl__
 #include <com/sun/star/table/XTableChart.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__
 #include <com/sun/star/document/XEmbeddedObjectSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableCharts.idl b/offapi/com/sun/star/table/TableCharts.idl
index f2c646f6233b..d962fcee3150 100644
--- a/offapi/com/sun/star/table/TableCharts.idl
+++ b/offapi/com/sun/star/table/TableCharts.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_TableCharts_idl__
 #define __com_sun_star_table_TableCharts_idl__
 
-#ifndef __com_sun_star_table_XTableCharts_idl__
 #include <com/sun/star/table/XTableCharts.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableChartsEnumeration.idl b/offapi/com/sun/star/table/TableChartsEnumeration.idl
index c29e3abbae46..180215c37a67 100644
--- a/offapi/com/sun/star/table/TableChartsEnumeration.idl
+++ b/offapi/com/sun/star/table/TableChartsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_TableChartsEnumeration_idl__
 #define __com_sun_star_table_TableChartsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableColumn.idl b/offapi/com/sun/star/table/TableColumn.idl
index 985cc3f7c401..f655d83a854a 100644
--- a/offapi/com/sun/star/table/TableColumn.idl
+++ b/offapi/com/sun/star/table/TableColumn.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_TableColumn_idl__
 #define __com_sun_star_table_TableColumn_idl__
 
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableColumns.idl b/offapi/com/sun/star/table/TableColumns.idl
index 9a3a32c062a1..6dbaff8283b5 100644
--- a/offapi/com/sun/star/table/TableColumns.idl
+++ b/offapi/com/sun/star/table/TableColumns.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_TableColumns_idl__
 #define __com_sun_star_table_TableColumns_idl__
 
-#ifndef __com_sun_star_table_XTableColumns_idl__
 #include <com/sun/star/table/XTableColumns.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableColumnsEnumeration.idl b/offapi/com/sun/star/table/TableColumnsEnumeration.idl
index b43bf7d320e6..07187b4560be 100644
--- a/offapi/com/sun/star/table/TableColumnsEnumeration.idl
+++ b/offapi/com/sun/star/table/TableColumnsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_TableColumnsEnumeration_idl__
 #define __com_sun_star_table_TableColumnsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableRow.idl b/offapi/com/sun/star/table/TableRow.idl
index f3f87e7258a9..e4db9eaea420 100644
--- a/offapi/com/sun/star/table/TableRow.idl
+++ b/offapi/com/sun/star/table/TableRow.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_TableRow_idl__
 #define __com_sun_star_table_TableRow_idl__
 
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableRows.idl b/offapi/com/sun/star/table/TableRows.idl
index dfb7db26c84b..7fe5ea2dca4d 100644
--- a/offapi/com/sun/star/table/TableRows.idl
+++ b/offapi/com/sun/star/table/TableRows.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_TableRows_idl__
 #define __com_sun_star_table_TableRows_idl__
 
-#ifndef __com_sun_star_table_XTableRows_idl__
 #include <com/sun/star/table/XTableRows.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableRowsEnumeration.idl b/offapi/com/sun/star/table/TableRowsEnumeration.idl
index 1ff0c074bd6f..5c5fed232eb7 100644
--- a/offapi/com/sun/star/table/TableRowsEnumeration.idl
+++ b/offapi/com/sun/star/table/TableRowsEnumeration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_TableRowsEnumeration_idl__
 #define __com_sun_star_table_TableRowsEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableSortDescriptor.idl b/offapi/com/sun/star/table/TableSortDescriptor.idl
index 9e2277389be0..ffc2c859cfa3 100644
--- a/offapi/com/sun/star/table/TableSortDescriptor.idl
+++ b/offapi/com/sun/star/table/TableSortDescriptor.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_TableSortDescriptor_idl__
 #define __com_sun_star_table_TableSortDescriptor_idl__
 
-#ifndef __com_sun_star_util_SortDescriptor_idl__
 #include <com/sun/star/util/SortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_util_SortField_idl__
 #include <com/sun/star/util/SortField.idl>
-#endif
-
-#ifndef __com_sun_star_table_TableOrientation_idl__
 #include <com/sun/star/table/TableOrientation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableSortDescriptor2.idl b/offapi/com/sun/star/table/TableSortDescriptor2.idl
index ff62fa490f18..d092a9ddd027 100644
--- a/offapi/com/sun/star/table/TableSortDescriptor2.idl
+++ b/offapi/com/sun/star/table/TableSortDescriptor2.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_table_TableSortDescriptor2_idl__
 #define __com_sun_star_table_TableSortDescriptor2_idl__
 
-#ifndef __com_sun_star_util_SortDescriptor2_idl__
 #include <com/sun/star/util/SortDescriptor2.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_table_TableSortField_idl__
 #include <com/sun/star/table/TableSortField.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/TableSortField.idl b/offapi/com/sun/star/table/TableSortField.idl
index 3fb8d718b588..ad0225dc95cd 100644
--- a/offapi/com/sun/star/table/TableSortField.idl
+++ b/offapi/com/sun/star/table/TableSortField.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_table_TableSortField_idl__
 #define __com_sun_star_table_TableSortField_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_table_TableSortFieldType_idl__
 #include <com/sun/star/table/TableSortFieldType.idl>
-#endif
 
 
 //=============================================================================
@@ -72,14 +68,14 @@ published struct TableSortField
         <member scope="com::sun::star::table::TableSortFieldType">AUTOMATIC</member>
         the algorithm used for sorting is application specific.
         Especially it may or may not use the values given by
-        'CollatorLocale' and 'CollatorAlgorithm'.</p>
+        "CollatorLocale" and "CollatorAlgorithm".</p>
      */
     com::sun::star::table::TableSortFieldType FieldType;
 
     //-------------------------------------------------------------------------
     /** the locale used by the collator when comparing/sorting text.
 
-        <p>This property will not be used when the 'FieldType' is
+        <p>This property will not be used when the "FieldType" is
         <member scope="com::sun::star::table::TableSortFieldType">NUMERIC</member>
         </p>
 
@@ -90,7 +86,7 @@ published struct TableSortField
     //-------------------------------------------------------------------------
     /** the algorithm used by the collator when comparing/sorting text.
 
-        <p>This property will not be used when the 'FieldType' is
+        <p>This property will not be used when the "FieldType" is
         <member scope="com::sun::star::table::TableSortFieldType">NUMERIC</member>
         </p>
 
diff --git a/offapi/com/sun/star/table/XAutoFormattable.idl b/offapi/com/sun/star/table/XAutoFormattable.idl
index 113c3a17de0a..4916f1d67770 100644
--- a/offapi/com/sun/star/table/XAutoFormattable.idl
+++ b/offapi/com/sun/star/table/XAutoFormattable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_XAutoFormattable_idl__
 #define __com_sun_star_table_XAutoFormattable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XCell.idl b/offapi/com/sun/star/table/XCell.idl
index 7bc0fdffcafa..90145c54b3c1 100644
--- a/offapi/com/sun/star/table/XCell.idl
+++ b/offapi/com/sun/star/table/XCell.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_XCell_idl__
 #define __com_sun_star_table_XCell_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellContentType_idl__
 #include <com/sun/star/table/CellContentType.idl>
-#endif
 
 //=============================================================================
 
@@ -76,7 +71,7 @@ published interface XCell: com::sun::star::uno::XInterface
 
     /** returns the floating point value of the cell.
 
-        <p>For a <em>value cell</em> the value is returnd, for a
+        <p>For a <em>value cell</em> the value is returned, for a
         <em>string cell</em> zero is returned and for a <em>formula cell</em>
         the result value of a formula is returned.</p>
      */
diff --git a/offapi/com/sun/star/table/XCellCursor.idl b/offapi/com/sun/star/table/XCellCursor.idl
index e2b1a195ed98..ec22b1a89bf3 100644
--- a/offapi/com/sun/star/table/XCellCursor.idl
+++ b/offapi/com/sun/star/table/XCellCursor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_XCellCursor_idl__
 #define __com_sun_star_table_XCellCursor_idl__
 
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XCellRange.idl b/offapi/com/sun/star/table/XCellRange.idl
index 433d1173865f..e12f59116f50 100644
--- a/offapi/com/sun/star/table/XCellRange.idl
+++ b/offapi/com/sun/star/table/XCellRange.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_XCellRange_idl__
 #define __com_sun_star_table_XCellRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XColumnRowRange.idl b/offapi/com/sun/star/table/XColumnRowRange.idl
index b72e583495d5..6c452b0f7e5d 100644
--- a/offapi/com/sun/star/table/XColumnRowRange.idl
+++ b/offapi/com/sun/star/table/XColumnRowRange.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_XColumnRowRange_idl__
 #define __com_sun_star_table_XColumnRowRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableColumns_idl__
 #include <com/sun/star/table/XTableColumns.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableRows_idl__
 #include <com/sun/star/table/XTableRows.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XMergeableCell.idl b/offapi/com/sun/star/table/XMergeableCell.idl
index 6f1158f4a80f..829929c3c2a7 100644
--- a/offapi/com/sun/star/table/XMergeableCell.idl
+++ b/offapi/com/sun/star/table/XMergeableCell.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_XMergeableCell_idl__
 #define __com_sun_star_table_XMergeableCell_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XMergeableCellRange.idl b/offapi/com/sun/star/table/XMergeableCellRange.idl
index 51bf1cbc1a74..bb8fa2b30b4d 100644
--- a/offapi/com/sun/star/table/XMergeableCellRange.idl
+++ b/offapi/com/sun/star/table/XMergeableCellRange.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_table_XMergeableCellRange_idl__
 #define __com_sun_star_table_XMergeableCellRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 //=============================================================================
 
@@ -61,7 +53,7 @@ interface XMergeableCellRange : com::sun::star::uno::XInterface
 
     /** splits the cells in this range.
         This will be done by inserting rows and columns if needed or unmerging
-        cells taht are already splitted.
+        cells that are already split.
 
         @param Columns
             this is the number of columns that will be added to each cell. Zero
diff --git a/offapi/com/sun/star/table/XTable.idl b/offapi/com/sun/star/table/XTable.idl
index 51e33324a797..fd30489cd957 100644
--- a/offapi/com/sun/star/table/XTable.idl
+++ b/offapi/com/sun/star/table/XTable.idl
@@ -28,41 +28,15 @@
 #ifndef __com_sun_star_table_XTable_idl__
 #define __com_sun_star_table_XTable_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_table_XColumnRowRange_idl__
 #include <com/sun/star/table/XColumnRowRange.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCellCursor_idl__
 #include <com/sun/star/table/XCellCursor.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifiable_idl__
 #include <com/sun/star/util/XModifiable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
 #include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XTableChart.idl b/offapi/com/sun/star/table/XTableChart.idl
index 745efea0e973..de0a1ab1e032 100644
--- a/offapi/com/sun/star/table/XTableChart.idl
+++ b/offapi/com/sun/star/table/XTableChart.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_XTableChart_idl__
 #define __com_sun_star_table_XTableChart_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XTableCharts.idl b/offapi/com/sun/star/table/XTableCharts.idl
index 6e7a5ea679bc..3b49110f996c 100644
--- a/offapi/com/sun/star/table/XTableCharts.idl
+++ b/offapi/com/sun/star/table/XTableCharts.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_XTableCharts_idl__
 #define __com_sun_star_table_XTableCharts_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
 #include <com/sun/star/table/CellRangeAddress.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XTableChartsSupplier.idl b/offapi/com/sun/star/table/XTableChartsSupplier.idl
index 351557fbf1a9..462acc14e965 100644
--- a/offapi/com/sun/star/table/XTableChartsSupplier.idl
+++ b/offapi/com/sun/star/table/XTableChartsSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_XTableChartsSupplier_idl__
 #define __com_sun_star_table_XTableChartsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableCharts_idl__
 #include <com/sun/star/table/XTableCharts.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XTableColumns.idl b/offapi/com/sun/star/table/XTableColumns.idl
index a6a81b49f96a..75915dc45f23 100644
--- a/offapi/com/sun/star/table/XTableColumns.idl
+++ b/offapi/com/sun/star/table/XTableColumns.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_XTableColumns_idl__
 #define __com_sun_star_table_XTableColumns_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/XTableRows.idl b/offapi/com/sun/star/table/XTableRows.idl
index bd05abfc2a8f..f518bf8849f3 100644
--- a/offapi/com/sun/star/table/XTableRows.idl
+++ b/offapi/com/sun/star/table/XTableRows.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_table_XTableRows_idl__
 #define __com_sun_star_table_XTableRows_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/table/makefile.mk b/offapi/com/sun/star/table/makefile.mk
index 8b78c4b989b7..9b7e18582336 100644
--- a/offapi/com/sun/star/table/makefile.mk
+++ b/offapi/com/sun/star/table/makefile.mk
@@ -41,16 +41,20 @@ IDLFILES=\
     AccessibleCellView.idl      \
     AccessibleTableView.idl	\
     BorderLine.idl\
+    BorderLine2.idl\
+    BorderLineStyle.idl\
     Cell.idl\
     CellAddress.idl\
     CellContentType.idl\
     CellCursor.idl\
     CellHoriJustify.idl\
+    CellJustifyMethod.idl\
     CellOrientation.idl\
     CellProperties.idl\
     CellRange.idl\
     CellRangeAddress.idl\
     CellVertJustify.idl\
+    CellVertJustify2.idl\
     ShadowFormat.idl\
     ShadowLocation.idl\
     TableBorder.idl\
diff --git a/offapi/com/sun/star/task/AsyncJob.idl b/offapi/com/sun/star/task/AsyncJob.idl
index eed753549b75..56e676ca01c8 100644
--- a/offapi/com/sun/star/task/AsyncJob.idl
+++ b/offapi/com/sun/star/task/AsyncJob.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_task_AsyncJob_idl__
 #define __com_sun_star_task_AsyncJob_idl__
 
-#ifndef __com_sun_star_task_XAsyncJob_idl__
 #include <com/sun/star/task/XAsyncJob.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseable_idl__
 #include <com/sun/star/util/XCloseable.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl b/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
index fdd98037d6b3..25344b095946 100644
--- a/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
+++ b/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #define __com_sun_star_task_ClassifiedInteractionRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
-#ifndef __com_sun_star_task_InteractionClassification_idl__
 #include <com/sun/star/task/InteractionClassification.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
index 1d453e41aa29..68d026ebb444 100644
--- a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_task_DocumentMSPasswordRequest_idl__
 #define __com_sun_star_task_DocumentMSPasswordRequest_idl__
 
-#ifndef __com_sun_star_task_PasswordRequest_idl__
 #include <com/sun/star/task/PasswordRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl b/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl
index 94ce75683dea..b88c6ced5436 100755..100644
--- a/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl
+++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl
@@ -7,9 +7,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DocumentMSPasswordRequest.idl,v $
- * $Revision: 1.0 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@ module com { module sun { module star { module task {
 exception DocumentMSPasswordRequest2 : DocumentMSPasswordRequest
 {
     //-------------------------------------------------------------------------
-    /** specifies if the requested password is for opening a document or for mofiying it.
+    /** specifies if the requested password is for opening a document or for modifying it.
     */
     boolean     IsRequestPasswordToModify;
 
diff --git a/offapi/com/sun/star/task/DocumentPasswordRequest.idl b/offapi/com/sun/star/task/DocumentPasswordRequest.idl
index 5520dc14f0ba..ad5b39117467 100644
--- a/offapi/com/sun/star/task/DocumentPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentPasswordRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_DocumentPasswordRequest_idl__
 #define __com_sun_star_task_DocumentPasswordRequest_idl__
 
-#ifndef __com_sun_star_task_PasswordRequest_idl__
 #include <com/sun/star/task/PasswordRequest.idl>
-#endif
 
 
 //=============================================================================
@@ -37,7 +35,7 @@
 module com { module sun { module star { module task {
 
 //=============================================================================
-/** this request specifies the mode in wich the password should be asked
+/** this request specifies the mode in which the password should be asked
 
     <P>
     It is supported by <type>InteractionHandler</type> service, and can
diff --git a/offapi/com/sun/star/task/DocumentPasswordRequest2.idl b/offapi/com/sun/star/task/DocumentPasswordRequest2.idl
index 0f49e29255f0..df5b8915a65d 100755..100644
--- a/offapi/com/sun/star/task/DocumentPasswordRequest2.idl
+++ b/offapi/com/sun/star/task/DocumentPasswordRequest2.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DocumentPasswordRequest.idl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@ module com { module sun { module star { module task {
 exception DocumentPasswordRequest2 : DocumentPasswordRequest
 {
     //-------------------------------------------------------------------------
-    /** specifies if the requested password is for opening a document or for mofiying it.
+    /** specifies if the requested password is for opening a document or for modifying it.
     */
     boolean     IsRequestPasswordToModify;
 
diff --git a/offapi/com/sun/star/task/ErrorCodeIOException.idl b/offapi/com/sun/star/task/ErrorCodeIOException.idl
index 9600483fcf32..4e2752933524 100644
--- a/offapi/com/sun/star/task/ErrorCodeIOException.idl
+++ b/offapi/com/sun/star/task/ErrorCodeIOException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_ErrorCodeIOException_idl__
 #define __com_sun_star_task_ErrorCodeIOException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/task/ErrorCodeRequest.idl b/offapi/com/sun/star/task/ErrorCodeRequest.idl
index fb594a8b5944..bbaf0cd74ab6 100644
--- a/offapi/com/sun/star/task/ErrorCodeRequest.idl
+++ b/offapi/com/sun/star/task/ErrorCodeRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_ErrorCodeRequest_idl__
 #define __com_sun_star_task_ErrorCodeRequest_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
@@ -39,7 +37,7 @@
 
 /** represents a general error exception.
     It can be used to transport the error code information.
-    E.g. that can be usefull for interactions.
+    E.g. that can be useful for interactions.
 
     @since OOo 1.1.2
  */
diff --git a/offapi/com/sun/star/task/InteractionHandler.idl b/offapi/com/sun/star/task/InteractionHandler.idl
index f772754d6d56..43ea8ae08315 100644
--- a/offapi/com/sun/star/task/InteractionHandler.idl
+++ b/offapi/com/sun/star/task/InteractionHandler.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module task {
 //============================================================================
 /** An interaction request handler that lets the user handle requests via GUI dialogs.
 
-    <p>The interaction handler service has a numerof of <a href="#built_in_handler">built-in handlers</a>, responsible
+    <p>The interaction handler service has a number of <a href="#built_in_handler">built-in handlers</a>, responsible
     for a lot of well known interactions. Additionally, there's a configuration module which allows to
     <a href="#configuring_handlers">configure additional handlers</a>, responsible for arbitrary requests.</a></p>
 
@@ -127,7 +127,7 @@ module com { module sun { module star { module task {
 
         <DT><code>"Folder"</code></DT>
         <DD><const scope="com::sun::star::ucb">IOErrorCode::CANT_CREATE</const>
-        only.  The name of the foler in which a resource cannot be created (a
+        only.  The name of the folder in which a resource cannot be created (a
         <atom>string</atom>).</DD>
 
         <DT><code>"Volume"</code> and <code>"OtherVolume"</code></DT>
@@ -137,7 +137,7 @@ module com { module sun { module star { module task {
     </DL></P>
 
     <a name="configuring_handlers"></a>
-    <h3>Configurating additional Handlers</h3>
+    <h3>Configuring additional Handlers</h3>
 
     <p>It is possible to configure additional interaction handlers, to which certain requests can be delegated. The
     configuration node <code>/org.openoffice.Interaction/InteractionHandlers</code> is evaluated and respected
@@ -147,12 +147,12 @@ module com { module sun { module star { module task {
     by full-qualified type name. Also, for each type, it can specify whether it is responsible for only this particular
     type, or all possibly existent derived types.</p>
 
-    <p>Whenever the <code>InteractionHandler</code> encounteres a request it cannot fulfill itself, it will examine
+    <p>Whenever the <code>InteractionHandler</code> encounters a request it cannot fulfill itself, it will examine
     the configuration, to find a handler implementation for the request, and delegate it to the first matching
     handler.</p>
 
-    <p>If multiple custom interaction handlers declare themself responsible for the same request type, it is not
-    defined which handler will actully be invoked. Thus, when deploying a custom interaction handler, ensure
+    <p>If multiple custom interaction handlers declare themselves responsible for the same request type, it is not
+    defined which handler will actually be invoked. Thus, when deploying a custom interaction handler, ensure
     that the types you specify are general enough to cover all requests you want to handle, but also specific
     enough to not cover requests which other handlers might be interested in.</p>
  */
diff --git a/offapi/com/sun/star/task/Job.idl b/offapi/com/sun/star/task/Job.idl
index 7d55dea68b56..e62fdc72b76c 100644
--- a/offapi/com/sun/star/task/Job.idl
+++ b/offapi/com/sun/star/task/Job.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_task_Job_idl__
 #define __com_sun_star_task_Job_idl__
 
-#ifndef __com_sun_star_task_XJob_idl__
 #include <com/sun/star/task/XJob.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseable_idl__
 #include <com/sun/star/util/XCloseable.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/task/JobExecutor.idl b/offapi/com/sun/star/task/JobExecutor.idl
index 7f6a9581e0ab..f428076ddceb 100644
--- a/offapi/com/sun/star/task/JobExecutor.idl
+++ b/offapi/com/sun/star/task/JobExecutor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_task_JobExecutor_idl__
 #define __com_sun_star_task_JobExecutor_idl__
 
-#ifndef __com_sun_star_task_XJobExecutor_idl__
 #include <com/sun/star/task/XJobExecutor.idl>
-#endif
 
 //============================================================================
 
@@ -42,7 +40,7 @@ module com { module sun { module star { module task {
     <p>
     Can start registered uno services on triggered events and handle there
     own configuration and there lifetime. Such events are simple strings
-    wich meaning doesn't matter for any real service implementation of this
+    which meaning doesn't matter for any real service implementation of this
     specification. But triggered events must be available inside the
     configuration and some <type>Job</type>s or <type>AsyncJob</type>s must be registered for that.
     </p>
diff --git a/offapi/com/sun/star/task/MasterPasswordRequest.idl b/offapi/com/sun/star/task/MasterPasswordRequest.idl
index 734c4e00c1e4..3bf90b307fbd 100644
--- a/offapi/com/sun/star/task/MasterPasswordRequest.idl
+++ b/offapi/com/sun/star/task/MasterPasswordRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_MasterPasswordRequest_idl__
 #define __com_sun_star_task_MasterPasswordRequest_idl__
 
-#ifndef __com_sun_star_task_PasswordRequest_idl__
 #include <com/sun/star/task/PasswordRequest.idl>
-#endif
 
 
 //=============================================================================
@@ -37,7 +35,7 @@
 module com { module sun { module star { module task {
 
 //=============================================================================
-/** this request specifies the mode in wich the password should be asked
+/** this request specifies the mode in which the password should be asked
 
     <P>
     It is supported by <type>InteractionHandler</type> service, and can
diff --git a/offapi/com/sun/star/task/NoMasterException.idl b/offapi/com/sun/star/task/NoMasterException.idl
index 03440309db9d..d44963375ef1 100644
--- a/offapi/com/sun/star/task/NoMasterException.idl
+++ b/offapi/com/sun/star/task/NoMasterException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_MasterPasswordRequest_idl__
 #define __com_sun_star_task_MasterPasswordRequest_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_task_PasswordRequestMode_idl__
 #include <com/sun/star/task/PasswordRequestMode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/PDFExportException.idl b/offapi/com/sun/star/task/PDFExportException.idl
index 8547aea76418..d73c91d98452 100644
--- a/offapi/com/sun/star/task/PDFExportException.idl
+++ b/offapi/com/sun/star/task/PDFExportException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_PDFExportException_idl__
 #define __com_sun_star_task_PDFExportException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
  module com {  module sun {  module star {  module task {
 
diff --git a/offapi/com/sun/star/task/PasswordContainer.idl b/offapi/com/sun/star/task/PasswordContainer.idl
index e0bebf68f77d..565c3f835541 100644
--- a/offapi/com/sun/star/task/PasswordContainer.idl
+++ b/offapi/com/sun/star/task/PasswordContainer.idl
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module task {
     <p>
     A password can be stored for the session period or persistently.
     The persistent way is only possible if configuration allows to use storage.
-    It stores passwords encripted with a super password. An interaction
+    It stores passwords encrypted with a super password. An interaction
     is used to ask a user for a super password.
     To allow such an interaction, an object that implements <type>XInteractionHandler</type>
     interface should be provided. For this purpose <type>InteractionHandler</type>
@@ -54,7 +54,7 @@ module com {  module sun {  module star {  module task {
     for the session period. In case an interaction handler is provided, but
     the super password interaction does not return super password ( for any reason ),
     <type>NoMasterException</type> exception is thrown to let user use
-    nonpersistent way explicitly.
+    non-persistent way explicitly.
     </p>
 */
 published service PasswordContainer
diff --git a/offapi/com/sun/star/task/PasswordRequest.idl b/offapi/com/sun/star/task/PasswordRequest.idl
index e9f32c86f72b..62cda2850f41 100644
--- a/offapi/com/sun/star/task/PasswordRequest.idl
+++ b/offapi/com/sun/star/task/PasswordRequest.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_PasswordRequest_idl__
 #define __com_sun_star_task_PasswordRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_task_PasswordRequestMode_idl__
 #include <com/sun/star/task/PasswordRequestMode.idl>
-#endif
 
 
 //=============================================================================
@@ -41,7 +36,7 @@
 module com { module sun { module star { module task {
 
 //=============================================================================
-/** this request specifies the mode in wich the password should be asked
+/** this request specifies the mode in which the password should be asked
 
     <P>
     It is supported by <type>InteractionHandler</type> service, and can
diff --git a/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl b/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl
index ac5358fbd002..8bc8eae7d39b 100644
--- a/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl
+++ b/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_UnsupportedOverwriteRequest_idl__
 #define __com_sun_star_task_UnsupportedOverwriteRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/UrlRecord.idl b/offapi/com/sun/star/task/UrlRecord.idl
index 84a856a87510..a628a38898b1 100644
--- a/offapi/com/sun/star/task/UrlRecord.idl
+++ b/offapi/com/sun/star/task/UrlRecord.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_UrlRecord_idl__
 #define __com_sun_star_task_UrlRecord_idl__
 
-#ifndef __com_sun_star_task_UserRecord_idl__
 #include <com/sun/star/task/UserRecord.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XAsyncJob.idl b/offapi/com/sun/star/task/XAsyncJob.idl
index 96dfe0365d9f..68cdfc97c2b3 100644
--- a/offapi/com/sun/star/task/XAsyncJob.idl
+++ b/offapi/com/sun/star/task/XAsyncJob.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_task_XAsyncJob_idl__
 #define __com_sun_star_task_XAsyncJob_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -52,7 +44,7 @@ module com {  module sun {  module star {  module task {
     <p>
     Instead of <type>XJob</type> the implementation of this interface
     must be aware, that execution can be made real asynchronous (e.g. by using
-    threads). Because the environment whish to have creation and using of threads
+    threads). Because the environment wish to have creation and using of threads
     under control, it's not allowed for a real job implementation to use such mechanism
     by itself. The outside code decide, if it's possible and how it can be made
     asynchronous. In some special cases it can be, that asynchronous jobs will be executed
diff --git a/offapi/com/sun/star/task/XInteractionApprove.idl b/offapi/com/sun/star/task/XInteractionApprove.idl
index be39a0b21b2f..d503eba5a035 100644
--- a/offapi/com/sun/star/task/XInteractionApprove.idl
+++ b/offapi/com/sun/star/task/XInteractionApprove.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XInteractionApprove_idl__
 #define __com_sun_star_task_XInteractionApprove_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 
 //=============================================================================
@@ -39,7 +37,7 @@
 //=============================================================================
 
 // DocMerge from xml: interface com::sun::star::task::XInteractionApprove
-/** An intearaction continuation specifing 'approval'.
+/** An interaction continuation specifying "approval".
  */
 published interface XInteractionApprove: com::sun::star::task::XInteractionContinuation
 {
diff --git a/offapi/com/sun/star/task/XInteractionDisapprove.idl b/offapi/com/sun/star/task/XInteractionDisapprove.idl
index f4a21cc1c2b0..de373737681b 100644
--- a/offapi/com/sun/star/task/XInteractionDisapprove.idl
+++ b/offapi/com/sun/star/task/XInteractionDisapprove.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XInteractionDisapprove_idl__
 #define __com_sun_star_task_XInteractionDisapprove_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 
 //=============================================================================
@@ -39,7 +37,7 @@
 //=============================================================================
 
 // DocMerge from xml: interface com::sun::star::task::XInteractionDisapprove
-/** An interaction continuation specifing 'disapproval'.
+/** An interaction continuation specifying "disapproval".
  */
 published interface XInteractionDisapprove: com::sun::star::task::XInteractionContinuation
 {
diff --git a/offapi/com/sun/star/task/XInteractionPassword.idl b/offapi/com/sun/star/task/XInteractionPassword.idl
index 95309ccf5623..e8c55b13faed 100644
--- a/offapi/com/sun/star/task/XInteractionPassword.idl
+++ b/offapi/com/sun/star/task/XInteractionPassword.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XInteractionPassword_idl__
 #define __com_sun_star_task_XInteractionPassword_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XInteractionPassword2.idl b/offapi/com/sun/star/task/XInteractionPassword2.idl
index 925f96f30e5a..ac4e1c2c2311 100644
--- a/offapi/com/sun/star/task/XInteractionPassword2.idl
+++ b/offapi/com/sun/star/task/XInteractionPassword2.idl
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XInteractionPassword.idl,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,9 +27,7 @@
 #ifndef __com_sun_star_task_XInteractionPassword2_idl__
 #define __com_sun_star_task_XInteractionPassword2_idl__
 
-#ifndef __com_sun_star_task_XInteractionPassword_idl__
 #include <com/sun/star/task/XInteractionPassword.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl b/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
index f41bbcbddb93..47f03a10817d 100644
--- a/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
+++ b/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_task_XInteractionRequestStringResolver_idl__
 #define __com_sun_star_task_XInteractionRequestStringResolver_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_Optional_idl__
 #include <com/sun/star/beans/Optional.idl>
-#endif
 
-#ifndef __com_sun_star_task_XInteractionRequest_idl__
 #include <com/sun/star/task/XInteractionRequest.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XJob.idl b/offapi/com/sun/star/task/XJob.idl
index 759d7ca223c1..e33898b35bdf 100644
--- a/offapi/com/sun/star/task/XJob.idl
+++ b/offapi/com/sun/star/task/XJob.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_task_XJob_idl__
 #define __com_sun_star_task_XJob_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //============================================================================
 
@@ -49,7 +41,7 @@ module com {  module sun {  module star {  module task {
 
     <p>
     Instead of <type>XAsyncJob</type> the implementation of this interface
-    will be executed synchronously everytimes. That means: they can be shure that the
+    will be executed synchronously everytime. That means: they can be sure that the
     current stack context will be blocked till this job finish it's work.
     </p>
 
@@ -82,8 +74,8 @@ published interface XJob : com::sun::star::uno::XInterface
             was corrupt so the service couldn't work correctly
 
         @throws com::sun::star::uno::Exception
-            to notify the excutor about faild operation; otherwise the return value
-            indicates a successfull finishing.
+            to notify the executor about failed operation; otherwise the return value
+            indicates a successful finishing.
     */
     any execute(
         [in] sequence< com::sun::star::beans::NamedValue > Arguments )
diff --git a/offapi/com/sun/star/task/XJobExecutor.idl b/offapi/com/sun/star/task/XJobExecutor.idl
index d4ef207235e7..a29b55d21858 100644
--- a/offapi/com/sun/star/task/XJobExecutor.idl
+++ b/offapi/com/sun/star/task/XJobExecutor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_task_XJobExecutor_idl__
 #define __com_sun_star_task_XJobExecutor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -57,7 +55,7 @@ published interface XJobExecutor : com::sun::star::uno::XInterface
 
         <p>
         Jobs are registered in configuration and will be started by executor
-        automaticly, if they are registered for triggered event.
+        automatically, if they are registered for triggered event.
         The meaning of given string <var>Event</var> mustn't be known. Because
         for the executor it's enough to use it for searching a registered job
         inside his own configuration. So no special events will be defined here.
diff --git a/offapi/com/sun/star/task/XJobListener.idl b/offapi/com/sun/star/task/XJobListener.idl
index d4f27b69bd8f..a23085e97ca4 100644
--- a/offapi/com/sun/star/task/XJobListener.idl
+++ b/offapi/com/sun/star/task/XJobListener.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_task_XJobListener_idl__
 #define __com_sun_star_task_XJobListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XMasterPasswordHandling.idl b/offapi/com/sun/star/task/XMasterPasswordHandling.idl
index bd0637210052..6d3641a1968f 100644
--- a/offapi/com/sun/star/task/XMasterPasswordHandling.idl
+++ b/offapi/com/sun/star/task/XMasterPasswordHandling.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_XMasterPasswordHandling_idl__
 #define __com_sun_star_task_XMasterPasswordHandling_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 
 //=============================================================================
@@ -54,7 +49,7 @@ published interface XMasterPasswordHandling : com::sun::star::uno::XInterface
         </p>
 
         <p>
-        The call will use the standard interactin handler service
+        The call will use the standard interaction handler service
         <type>InteractionHandler</type> if no handler is provided.
         </p>
 
diff --git a/offapi/com/sun/star/task/XMasterPasswordHandling2.idl b/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
index 201ed9081cdb..1f38b696cb8a 100644
--- a/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
+++ b/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_XMasterPasswordHandling2_idl__
 #define __com_sun_star_task_XMasterPasswordHandling2_idl__
 
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_task_XMasterPasswordHandling_idl__
 #include <com/sun/star/task/XMasterPasswordHandling.idl>
-#endif
 
 //=============================================================================
 
@@ -49,7 +44,7 @@ interface XMasterPasswordHandling2 : XMasterPasswordHandling
 
         <p>
         Please use this method with care. Using of default master password let
-        the passwords be stored nonencrypted. If a masterpassword is predefined
+        the passwords be stored non-encrypted. If a master password is predefined
         in the algorithm it is no more an encryption, it is just an encoding.
         </p>
     */
diff --git a/offapi/com/sun/star/task/XPasswordContainer.idl b/offapi/com/sun/star/task/XPasswordContainer.idl
index 20aaf752a8e5..093d9f88445e 100644
--- a/offapi/com/sun/star/task/XPasswordContainer.idl
+++ b/offapi/com/sun/star/task/XPasswordContainer.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_task_XPasswordContainer_idl__
 #define __com_sun_star_task_XPasswordContainer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_UrlRecord_idl__
 #include <com/sun/star/task/UrlRecord.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 
 //=============================================================================
@@ -59,7 +51,7 @@ published interface XPasswordContainer : com::sun::star::uno::XInterface
 
         @param Passwords  The password-list.
 
-        @param Handler    The handler to get superpassword to en/decript passwords
+        @param Handler    The handler to get super password to en/decrypt passwords
 
 
     */
@@ -75,7 +67,7 @@ published interface XPasswordContainer : com::sun::star::uno::XInterface
 
         @param Passwords  The password-list.
 
-        @param Handler    The handler to get superpassword to en/decript passwords
+        @param Handler    The handler to get super password to en/decrypt passwords
 
 
     */
@@ -86,7 +78,7 @@ published interface XPasswordContainer : com::sun::star::uno::XInterface
 
         @param Url     URL-pattern to retrieve password for.
 
-        @param Handler    The handler to get superpassword to en/decript passwords
+        @param Handler    The handler to get super password to en/decrypt passwords
 
         @returns       Best matched url-pattern with user-records list.
     */
@@ -99,7 +91,7 @@ published interface XPasswordContainer : com::sun::star::uno::XInterface
 
         @param UserName Username to retrieve passwords for.
 
-        @param Handler    The handler to get superpassword to en/decript passwords
+        @param Handler    The handler to get super password to en/decrypt passwords
 
         @returns        Best matched url-pattern for the username.
     */
diff --git a/offapi/com/sun/star/task/XRestartManager.idl b/offapi/com/sun/star/task/XRestartManager.idl
index c53d0954b415..e1869ae23432 100644
--- a/offapi/com/sun/star/task/XRestartManager.idl
+++ b/offapi/com/sun/star/task/XRestartManager.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_task_XRestartManager_idl__
 #define __com_sun_star_task_XRestartManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //============================================================================
 
diff --git a/offapi/com/sun/star/task/XStatusIndicator.idl b/offapi/com/sun/star/task/XStatusIndicator.idl
index d3a222d51a36..5dae0e6527fd 100644
--- a/offapi/com/sun/star/task/XStatusIndicator.idl
+++ b/offapi/com/sun/star/task/XStatusIndicator.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XStatusIndicator_idl__
 #define __com_sun_star_task_XStatusIndicator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -51,7 +49,7 @@ published interface XStatusIndicator: com::sun::star::uno::XInterface
     /** initialize and start the progress
 
         <p>
-        It activates a new created or reactivate an already used inidicator
+        It activates a new created or reactivate an already used indicator
         (must be finished by calling <member>XStatusIndicator::end()</member>
         before!). By the way it's possible to set first progress description
         and the possible range of progress value. That means that a progress
@@ -63,7 +61,7 @@ published interface XStatusIndicator: com::sun::star::uno::XInterface
             Value can be updated by calling <member>XStatusIndicator::setText()</member>.
 
         @param Range
-            mewns the maximum value of the progress which can be setted by
+            means the maximum value of the progress which can be set by
             calling <member>XStatusIndicator::setValue()</member>.
      */
     [oneway] void start(
@@ -104,7 +102,7 @@ published interface XStatusIndicator: com::sun::star::uno::XInterface
 
         <p>
         Wrong values must be ignored and stopped indicators must ignore this
-        call generaly.
+        call generally.
         </p>
 
         @param Value
diff --git a/offapi/com/sun/star/task/XStatusIndicatorFactory.idl b/offapi/com/sun/star/task/XStatusIndicatorFactory.idl
index b7f6b0ea62c1..e7fbed1f6f35 100644
--- a/offapi/com/sun/star/task/XStatusIndicatorFactory.idl
+++ b/offapi/com/sun/star/task/XStatusIndicatorFactory.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_XStatusIndicatorFactory_idl__
 #define __com_sun_star_task_XStatusIndicatorFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
 #include <com/sun/star/task/XStatusIndicator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl b/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl
index c7e8630e55eb..8e1faa6eb909 100644
--- a/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl
+++ b/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_XStatusIndicatorSupplier_idl__
 #define __com_sun_star_task_XStatusIndicatorSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XStatusIndicator_idl__
 #include <com/sun/star/task/XStatusIndicator.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/XUrlContainer.idl b/offapi/com/sun/star/task/XUrlContainer.idl
index 9a20a3e9238d..a2e4c10dc821 100644
--- a/offapi/com/sun/star/task/XUrlContainer.idl
+++ b/offapi/com/sun/star/task/XUrlContainer.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_task_XUrlContainer_idl__
 #define __com_sun_star_task_XUrlContainer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 
 //=============================================================================
@@ -76,7 +71,7 @@ published interface XUrlContainer : com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** Get all URLs.
 
-        @param OnlyPersistent Only URLs taht are stored persistently shall
+        @param OnlyPersistent Only URLs that are stored persistently shall
                         be returned.
         @returns        List of URLs.
     */
diff --git a/offapi/com/sun/star/text/AccessibleEndnoteView.idl b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
index c242c3c806e1..d082a6d1eda5 100644
--- a/offapi/com/sun/star/text/AccessibleEndnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_AccessibleEndnoteView_idl__
 #define __com_sun_star_text_AccessibleEndnoteView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
@@ -116,7 +108,7 @@ published service AccessibleEndnoteView
                         >AccessibleStateType::VISIBLE</const>
                 </ul>
             <li>Depending of the application's region setting, the locale is
-                the western, asian or complex default language of the document.
+                the western, Asian or complex default language of the document.
         </ul>
 
      */
diff --git a/offapi/com/sun/star/text/AccessibleFootnoteView.idl b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
index 06f0f02aaba0..9c7f2623b237 100644
--- a/offapi/com/sun/star/text/AccessibleFootnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_AccessibleFootnoteView_idl__
 #define __com_sun_star_text_AccessibleFootnoteView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
@@ -116,7 +108,7 @@ published service AccessibleFootnoteView
                         >AccessibleStateType::VISIBLE</const>
                 </ul>
             <li>Depending of the application's region setting, the locale is
-                the western, asian or complex default language of the document.
+                the western, Asian or complex default language of the document.
         </ul>
 
      */
diff --git a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
index 5e2252352ed9..9d8c229256f5 100644
--- a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
+++ b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_AccessibleHeaderFooterView_idl__
 #define __com_sun_star_text_AccessibleHeaderFooterView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
@@ -77,7 +69,7 @@ published service AccessibleHeaderFooterView
                         A child of this kind is returned for every paragraph
                         that is contained in the document body and
                         is at least partially visible. The child always
-                        represents a whole paragarph (and not a fragment only),
+                        represents a whole paragraph (and not a fragment only),
                         because there are no page breaks within headers and
                         footers.
                     <li><type scope="::com::sun::star::table"
@@ -121,7 +113,7 @@ published service AccessibleHeaderFooterView
                         >AccessibleStateType::VISIBLE</const>
                 </ul>
             <li>Depending of the application's region setting, the locale is
-                the western, asian or complex default language of the document.
+                the western, Asian or complex default language of the document.
         </ul>
 
      */
diff --git a/offapi/com/sun/star/text/AccessiblePageView.idl b/offapi/com/sun/star/text/AccessiblePageView.idl
index 8b05d62b1ce2..cb087c093c70 100644
--- a/offapi/com/sun/star/text/AccessiblePageView.idl
+++ b/offapi/com/sun/star/text/AccessiblePageView.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_AccessibleEndnoteView_idl__
 #define __com_sun_star_text_AccessibleEndnoteView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
@@ -46,7 +38,7 @@ module com {  module sun {  module star {  module text {
 
 //=============================================================================
 
-/** The accessible view of pagees.
+/** The accessible view of pages.
 
 
      @since OOo 1.1.2
@@ -78,15 +70,15 @@ published service AccessiblePageView
                     <li><type scope="::com::sun::star::text"
                         >AccessibleHeaderFooterView</type>:
                         A child of this kind is returned for every header
-                        and footer that is conatined in the page.
+                        and footer that is contained in the page.
                     <li><type scope="::com::sun::star::text"
                         >AccessibleFootnoteView</type>:
                         A child of this kind is returned for every footnote
-                        that is conatined in the page.
+                        that is contained in the page.
                     <li><type scope="::com::sun::star::text"
                         >AccessibleEndnoteView</type>:
                         A child of this kind is returned for every endnote
-                        that is conatined in the page.
+                        that is contained in the page.
                     <li><type scope="::com::sun::star::text"
                         >AccessibleParagraphView</type>:
                         A child of this kind is returned for every paragraph
@@ -102,12 +94,12 @@ published service AccessiblePageView
                     <li><type scope="::com::sun::star::text"
                         >AccessibleTextFrameView</type>:
                         A child of this kind is returned for every text
-                        frame that is conrtained in the page. These objects
+                        frame that is contained in the page. These objects
                         are children of the <type>AccessiblePageView</type>
                         regardless whether they are bound to the page, a
-                        paragarph, a frame, or a character. The only
+                        paragraph, a frame, or a character. The only
                         exception are text frames that are bound as
-                        character.  They are childen of the paragraph they
+                        character.  They are children of the paragraph they
                         are contained in.
                     <li><type scope="::com::sun::star::text"
                         >AccessibleTextGraphicObject</type>:
@@ -117,15 +109,15 @@ published service AccessiblePageView
                         regardless whether they are bound to a page, paragraph,
                         a frame or a character. The only exception
                         are text frames that are bound as character. They are
-                        childen of the paragraph they are contained in.
+                        children of the paragraph they are contained in.
                     <li><type scope="::com::sun::star::text"
                         >AccessibleTextEmbeddedObject</type>:
                         A child of this kind is returned for every embedded
-                        object that is conatained in the page.
+                        object that is contained in the page.
                         These objects are children of the
                         <type>AccessibleTextDocumentView</type> regardless
-                        whether they are bound to a page, a paragarph, a frame,
-                        or a character.  They are childen of the paragraph they
+                        whether they are bound to a page, a paragraph, a frame,
+                        or a character.  They are children of the paragraph they
                         are contained in.
                     <li><type scope="::com::sun::star::drawing"
                         >AccessibleShape</type>:
diff --git a/offapi/com/sun/star/text/AccessibleParagraphView.idl b/offapi/com/sun/star/text/AccessibleParagraphView.idl
index 431882d7c4d2..db3975c09552 100644
--- a/offapi/com/sun/star/text/AccessibleParagraphView.idl
+++ b/offapi/com/sun/star/text/AccessibleParagraphView.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_text_AccessibleParagraphView_idl__
 #define __com_sun_star_text_AccessibleParagraphView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
 #include <com/sun/star/accessibility/XAccessibleEditableText.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleTextAttributes_idl__
 #include <com/sun/star/accessibility/XAccessibleTextAttributes.idl>
-#endif
 
 //=============================================================================
 
@@ -126,7 +112,7 @@ published service AccessibleParagraphView
                         >AccessibleStateType::FOCUSED</const>
                 </ul>
             <li>Depending of the application's region setting, the locale is
-                the western, asian or complex language of the paragraph.
+                the western, Asian or complex language of the paragraph.
         </ul>
 
      */
@@ -149,8 +135,8 @@ published service AccessibleParagraphView
         >XAccessibleText::getCharacterAttributes</method>
         are a sub set of the properties described by the service
         <type scope="::com::sun::star::style">CharacterProperties</type>. For
-        properties that have asian and complex counterparts, the value that
-        is visible is returned. This can be in fact the western, asian or
+        properties that have Asian and complex counterparts, the value that
+        is visible is returned. This can be in fact the western, Asian or
         complex value.  Its not possible to change the value of any property
         by using
         <method scope="::com::sun::star::accessibility"
@@ -176,8 +162,8 @@ published service AccessibleParagraphView
         >XAccessibleText::getCharacterAttributes</method> are a sub set of the properties
         described by the service
         <type scope="::com::sun::star::style">CharacterProperties</type>. For
-        properties that have asian and complex counterparts, the value that
-        is visible is returned. This can be in fact the western, asian or
+        properties that have Asian and complex counterparts, the value that
+        is visible is returned. This can be in fact the western, Asian or
         complex value.
         <p><em>TODO: If there is a demand, some attributes might be added
         that tells whether the character at a certain index is changeable or
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
index 1f85b2cc9a77..8378416afb8e 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_text_AccessibleTextDocumentPageView_idl__
 #define __com_sun_star_text_AccessibleTextDocumentPageView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
index d3a06d098579..271a5fc0cccc 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_text_AccessibleTextDocumentView_idl__
 #define __com_sun_star_text_AccessibleTextDocumentView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #include <com/sun/star/accessibility/XAccessibleSelection.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
@@ -79,7 +68,7 @@ published service AccessibleTextDocumentView
                         >AccessibleFootnoteView</type>:
                         A child of this kind is returned for every footnote
                         that is at least partially visible.
-                    <li><type scoep="::com::sun::star::text"
+                    <li><type scope="::com::sun::star::text"
                         >AccessibleEndnoteView</type>:
                         A child of this kind is returned for every endnote
                         that is at least partially visible.
@@ -102,9 +91,9 @@ published service AccessibleTextDocumentView
                         least partially visible. These objects are children
                         of the
                         <type>AccessibleTextDocumentView</type> regardless
-                        whether they are bound to a page, a paragarph, a
+                        whether they are bound to a page, a paragraph, a
                         frame, or a character. The only exception are text
-                        frames that are bound as character. They are childen
+                        frames that are bound as character. They are children
                         of the paragraph they are contained in.
                     <li><type scope="::com::sun::star::text"
                         >AccessibleTextGraphicObject</type>:
@@ -114,15 +103,15 @@ published service AccessibleTextDocumentView
                         regardless whether they are bound to a page, paragraph,
                         a frame or a character. The only exception
                         are text frames that are bound as character. They are
-                        childen of the paragraph they are contained in.
+                        children of the paragraph they are contained in.
                     <li><type scope="::com::sun::star::text"
                         >AccessibleTextEmbeddedObject</type>:
                         A child of this kind is returned for every embedded
                         object that is at least partially visible.
                         These objects are children of the
                         <type>AccessibleTextDocumentView</type> regardless
-                        whether they are bound to a page, a paragarph, a frame,
-                        or a character.  They are childen of the paragraph they
+                        whether they are bound to a page, a paragraph, a frame,
+                        or a character.  They are children of the paragraph they
                         are contained in.
                     <li><type scope="::com::sun::star::drawing"
                         >AccessibleShape</type>: A child of this kind (or a
@@ -189,7 +178,7 @@ published service AccessibleTextDocumentView
                         >AccessibleStateType::VISIBLE</const>
                 </ul>
             <li>Depending of the application's region setting, the locale is
-                the western, asian or complex default language of the document.
+                the western, Asian or complex default language of the document.
         </ul>
 
     */
diff --git a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
index 3053acea669d..15462af83ec5 100644
--- a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_text_AccessibleTextEmbeddedObjectView_idl__
 #define __com_sun_star_text_AccessibleTextEmbeddedObjectView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
 #include <com/sun/star/accessibility/XAccessibleImage.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 
@@ -55,7 +44,7 @@ module com {  module sun {  module star {  module text {
     object gets active, the active document gets an accessible object
     tree of its own. This tree is not a subtree of the object that supports
     this service but of the document service itself. The tree exist only
-    until the ovject is deactivated.
+    until the object is deactivated.
 
      @since OOo 1.1.2
  */
diff --git a/offapi/com/sun/star/text/AccessibleTextFrameView.idl b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
index a11fef5a4f19..6ade4dec43bf 100644
--- a/offapi/com/sun/star/text/AccessibleTextFrameView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
@@ -27,18 +27,11 @@
 #ifndef __com_sun_star_text_AccessibleTextFrameView_idl__
 #define __com_sun_star_text_AccessibleTextFrameView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
 
 
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
index b9ee6ce4b199..eb04fc45ecd0 100644
--- a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_text_AccessibleTextGraphicObjectView_idl__
 #define __com_sun_star_text_AccessibleTextGraphicObjectView_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleContext_idl__
 #include <com/sun/star/accessibility/XAccessibleContext.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #include <com/sun/star/accessibility/XAccessibleComponent.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
 #include <com/sun/star/accessibility/XAccessibleImage.idl>
-#endif
-
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.idl>
-#endif
 
 
 //=============================================================================
@@ -65,7 +54,7 @@ published service AccessibleTextGraphicObject
                 accessible view of a paragraph if the graphic is bound as
                 character, and the accessible view of the document (or of a
                 page in the page preview) in any other case.
-            <li>There are no chidren returned by
+            <li>There are no children returned by
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</method>.
             <li>The role is <const scope="::com::sun::star::accessibility"
diff --git a/offapi/com/sun/star/text/AdvancedTextDocument.idl b/offapi/com/sun/star/text/AdvancedTextDocument.idl
index b45c8998e419..d194b5eae5c0 100644
--- a/offapi/com/sun/star/text/AdvancedTextDocument.idl
+++ b/offapi/com/sun/star/text/AdvancedTextDocument.idl
@@ -27,45 +27,25 @@
 #ifndef __com_sun_star_text_AdvancedTextDocument_idl__
 #define __com_sun_star_text_AdvancedTextDocument_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
-#ifndef __com_sun_star_text_HypertextDocument_idl__
 #include <com/sun/star/text/HypertextDocument.idl>
-#endif
 
-#ifndef __com_sun_star_text_XFootnotesSupplier_idl__
 #include <com/sun/star/text/XFootnotesSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_text_XEndnotesSupplier_idl__
 #include <com/sun/star/text/XEndnotesSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_util_XReplaceable_idl__
 #include <com/sun/star/util/XReplaceable.idl>
-#endif
 
-#ifndef __com_sun_star_text_XPagePrintable_idl__
 #include <com/sun/star/text/XPagePrintable.idl>
-#endif
 
-#ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__
 #include <com/sun/star/text/XReferenceMarksSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_text_XLineNumberingSupplier_idl__
 #include <com/sun/star/text/XLineNumberingSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__
 #include <com/sun/star/text/XChapterNumberingSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
@@ -147,7 +127,7 @@ published service AdvancedTextDocument
 
 
 
-        <p> I.e., slash and backslash. Whitespaces (tab stop,
+        <p> I.e., slash and backslash. Whitespace (tab stop,
         space, paragraph break, or line break) always separate
         words.</p>@see WordCount
      */
diff --git a/offapi/com/sun/star/text/AutoTextContainer.idl b/offapi/com/sun/star/text/AutoTextContainer.idl
index e9ef091ff59c..7185dc1d002c 100644
--- a/offapi/com/sun/star/text/AutoTextContainer.idl
+++ b/offapi/com/sun/star/text/AutoTextContainer.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_AutoTextContainer_idl__
 #define __com_sun_star_text_AutoTextContainer_idl__
 
-#ifndef __com_sun_star_text_XAutoTextContainer_idl__
 #include <com/sun/star/text/XAutoTextContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/AutoTextEntry.idl b/offapi/com/sun/star/text/AutoTextEntry.idl
index 2bed15210757..38706b8615fc 100644
--- a/offapi/com/sun/star/text/AutoTextEntry.idl
+++ b/offapi/com/sun/star/text/AutoTextEntry.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_AutoTextEntry_idl__
 #define __com_sun_star_text_AutoTextEntry_idl__
 
-#ifndef __com_sun_star_text_XAutoTextEntry_idl__
 #include <com/sun/star/text/XAutoTextEntry.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/AutoTextGroup.idl b/offapi/com/sun/star/text/AutoTextGroup.idl
index 1094649bfbb1..886a97d61d34 100644
--- a/offapi/com/sun/star/text/AutoTextGroup.idl
+++ b/offapi/com/sun/star/text/AutoTextGroup.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_text_AutoTextGroup_idl__
 #define __com_sun_star_text_AutoTextGroup_idl__
 
-#ifndef __com_sun_star_text_XAutoTextGroup_idl__
 #include <com/sun/star/text/XAutoTextGroup.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/BaseFrame.idl b/offapi/com/sun/star/text/BaseFrame.idl
index 8864cfb14654..f227de1372f2 100644
--- a/offapi/com/sun/star/text/BaseFrame.idl
+++ b/offapi/com/sun/star/text/BaseFrame.idl
@@ -27,37 +27,15 @@
 #ifndef __com_sun_star_text_BaseFrame_idl__
 #define __com_sun_star_text_BaseFrame_idl__
 
-#ifndef __com_sun_star_text_BaseFrameProperties_idl__
 #include <com/sun/star/text/BaseFrameProperties.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_text_XTextFrame_idl__
 #include <com/sun/star/text/XTextFrame.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/BaseFrameProperties.idl b/offapi/com/sun/star/text/BaseFrameProperties.idl
index cac2ea15296b..57cb6a42624b 100644
--- a/offapi/com/sun/star/text/BaseFrameProperties.idl
+++ b/offapi/com/sun/star/text/BaseFrameProperties.idl
@@ -27,30 +27,14 @@
 #ifndef __com_sun_star_text_BaseFrameProperties_idl__
 #define __com_sun_star_text_BaseFrameProperties_idl__
 
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_text_XTextFrame_idl__
 #include <com/sun/star/text/XTextFrame.idl>
-#endif
-#ifndef __com_sun_star_text_WrapTextMode_idl__
 #include <com/sun/star/text/WrapTextMode.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 //=============================================================================
 
@@ -207,11 +191,11 @@ published service BaseFrameProperties
      */
     [property] short RelativeWidth;
     //-------------------------------------------------------------------------
-    /** determins whether the width follows the height.
+    /** determines whether the width follows the height.
      */
     [property] boolean IsSyncWidthToHeight;
     //-------------------------------------------------------------------------
-    /** determins whether the height follows the width.
+    /** determines whether the height follows the width.
      */
     [property] boolean IsSyncHeightToWidth;
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/text/BaseIndex.idl b/offapi/com/sun/star/text/BaseIndex.idl
index 0b40ec0e17f4..a15366fa5a83 100644
--- a/offapi/com/sun/star/text/BaseIndex.idl
+++ b/offapi/com/sun/star/text/BaseIndex.idl
@@ -29,29 +29,13 @@
 #ifndef __com_sun_star_text_BaseIndex_idl__
 #define __com_sun_star_text_BaseIndex_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDocumentIndex_idl__
 #include <com/sun/star/text/XDocumentIndex.idl>
-#endif
-#ifndef _com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
-#ifndef _com_sun_star_text_XTextColumns_idl__
 #include <com/sun/star/text/XTextColumns.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef _com_sun_star_text_XTextSection_idl__
 #include <com/sun/star/text/XTextSection.idl>
-#endif
-
 
 //=============================================================================
 
@@ -77,7 +61,7 @@ published service BaseIndex
 
     // DocMerge: empty anyway
     [property] string Title;
-    /** determins if the index is protected.*/
+    /** determines if the index is protected.*/
 
     // DocMerge: empty anyway
     [property] boolean IsProtected;
@@ -165,7 +149,7 @@ published service BaseIndex
      */
     // DocMerge: empty anyway
     [optional, property] com::sun::star::container::XIndexReplace LevelFormat;
-    /** determins if the content of the document index is created from the
+    /** determines if the content of the document index is created from the
          complete document content or from the current chapter only.
      <p> It is not available in the bibliography</p>*/
     [optional, property] boolean CreateFromChapter;
diff --git a/offapi/com/sun/star/text/BaseIndexMark.idl b/offapi/com/sun/star/text/BaseIndexMark.idl
index 97632664ae27..29b1714cafc1 100644
--- a/offapi/com/sun/star/text/BaseIndexMark.idl
+++ b/offapi/com/sun/star/text/BaseIndexMark.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_BaseIndexMark_idl__
 #define __com_sun_star_text_BaseIndexMark_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/BibliographyDataType.idl b/offapi/com/sun/star/text/BibliographyDataType.idl
index 072e8910b44b..2f924e49c5db 100644
--- a/offapi/com/sun/star/text/BibliographyDataType.idl
+++ b/offapi/com/sun/star/text/BibliographyDataType.idl
@@ -55,7 +55,7 @@ published constants BibliographyDataType
     const short BOOKLET         = 2;
 
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CONFERENCE
-    /** An article in the proceedings of a conference. This entry is identical to the 'inproceedings'
+    /** An article in the proceedings of a conference. This entry is identical to the "inproceedings"
     entry and is included for compatibility with BiBTex.
      */
     const short CONFERENCE      = 3;
diff --git a/offapi/com/sun/star/text/Bookmark.idl b/offapi/com/sun/star/text/Bookmark.idl
index d0e2f26db724..70b790600582 100644
--- a/offapi/com/sun/star/text/Bookmark.idl
+++ b/offapi/com/sun/star/text/Bookmark.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_Bookmark_idl__
 #define __com_sun_star_text_Bookmark_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/Bookmarks.idl b/offapi/com/sun/star/text/Bookmarks.idl
index 537133ca68be..dd5fd3233b0b 100644
--- a/offapi/com/sun/star/text/Bookmarks.idl
+++ b/offapi/com/sun/star/text/Bookmarks.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_Bookmarks_idl__
 #define __com_sun_star_text_Bookmarks_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/Cell.idl b/offapi/com/sun/star/text/Cell.idl
index f1161117e8b2..d4e35bb6d4c6 100644
--- a/offapi/com/sun/star/text/Cell.idl
+++ b/offapi/com/sun/star/text/Cell.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_text_Cell_idl__
 #define __com_sun_star_text_Cell_idl__
 
-#ifndef __com_sun_star_text_CellProperties_idl__
 #include <com/sun/star/text/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellProperties_idl__
 #include <com/sun/star/table/CellProperties.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
 //=============================================================================
 
@@ -64,7 +53,7 @@ service Cell
     //-------------------------------------------------------------------------
     /** contains properties from table cells.
 
-        <p>All of these properties are either already availbale in the
+        <p>All of these properties are either already available in the
         service
         <type scope="com::sun::star::text">CellProperties</type>,
         or get matched against one of those or are implemented
@@ -73,8 +62,8 @@ service Cell
         <p>The complete list is as follows:</p>
         <ul>
             <li>CellStyle: optional property, not implemented.</li>
-            <li>CellBackColor: matched to 'BackColor'.</li>
-            <li>IsCellBackgroundTransparent: matched to 'BackTransparent'.</li>
+            <li>CellBackColor: matched to "BackColor".</li>
+            <li>IsCellBackgroundTransparent: matched to "BackTransparent".</li>
             <li>HoriJustify: non-functional implementation.</li>
             <li>VertJustify: non-functional implementation.</li>
             <li>IsTextWrapped: non-functional implementation.</li>
diff --git a/offapi/com/sun/star/text/CellProperties.idl b/offapi/com/sun/star/text/CellProperties.idl
index e108f96c3cf5..47454bed6661 100644
--- a/offapi/com/sun/star/text/CellProperties.idl
+++ b/offapi/com/sun/star/text/CellProperties.idl
@@ -27,29 +27,13 @@
 #ifndef __com_sun_star_text_CellProperties_idl__
 #define __com_sun_star_text_CellProperties_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextSection_idl__
 #include <com/sun/star/text/XTextSection.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 
 //=============================================================================
@@ -98,7 +82,7 @@ published service CellProperties
     [property] string BackGraphicFilter;
 
     //-------------------------------------------------------------------------
-    /** determins the position of the background graphic.
+    /** determines the position of the background graphic.
      */
     [property] com::sun::star::style::GraphicLocation BackGraphicLocation;
 
@@ -108,7 +92,7 @@ published service CellProperties
     [property] long NumberFormat;
 
     //-------------------------------------------------------------------------
-    /** determins whether the background is transparent.
+    /** determines whether the background is transparent.
      */
     [property] boolean BackTransparent;
 
@@ -158,7 +142,7 @@ published service CellProperties
     [readonly, property]com::sun::star::text::XTextSection TextSection;
 
     //-------------------------------------------------------------------------
-    /** determins whether the cell is write protected or not.
+    /** determines whether the cell is write protected or not.
      */
     [property] boolean IsProtected;
 
diff --git a/offapi/com/sun/star/text/CellRange.idl b/offapi/com/sun/star/text/CellRange.idl
index b16e88e211a6..78a6b01d0d79 100644
--- a/offapi/com/sun/star/text/CellRange.idl
+++ b/offapi/com/sun/star/text/CellRange.idl
@@ -27,49 +27,19 @@
 #ifndef __com_sun_star_text_CellRange_idl__
 #define __com_sun_star_text_CellRange_idl__
 
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
 #include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
 #include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_Complex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
 #include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
 #include <com/sun/star/chart/XChartDataArray.idl>
-#endif
 
 //=============================================================================
 
@@ -115,7 +85,7 @@ published service CellRange
 
     //-----------------------------------------------------------------------------
 
-    /** determins the location of the background graphic.
+    /** determines the location of the background graphic.
      */
     [property] com::sun::star::style::GraphicLocation BackGraphicLocation;
 
@@ -127,20 +97,20 @@ published service CellRange
 
     //-----------------------------------------------------------------------------
 
-    /** determins if the background color is transparent.
+    /** determines if the background color is transparent.
      */
     [property] boolean BackTransparent;
 
     //-----------------------------------------------------------------------------
 
-    /** determins if the first column of the table should be treated as
+    /** determines if the first column of the table should be treated as
         axis labels when a chart is to be created.
      */
     [property] boolean ChartColumnAsLabel;
 
     //-----------------------------------------------------------------------------
 
-    /** determins if the first row of the table should be treated as
+    /** determines if the first row of the table should be treated as
         axis labels when a chart is to be created.
      */
     [property] boolean ChartRowAsLabel;
diff --git a/offapi/com/sun/star/text/ChainedTextFrame.idl b/offapi/com/sun/star/text/ChainedTextFrame.idl
index 2fea57dcb5c8..ccaaf38b6381 100644
--- a/offapi/com/sun/star/text/ChainedTextFrame.idl
+++ b/offapi/com/sun/star/text/ChainedTextFrame.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_ChainedTextFrame_idl__
 #define __com_sun_star_text_ChainedTextFrame_idl__
 
-#ifndef __com_sun_star_text_TextFrame_idl__
 #include <com/sun/star/text/TextFrame.idl>
-#endif
 
-#ifndef __com_sun_star_util_XChainable_idl__
 #include <com/sun/star/util/XChainable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/ChapterNumberingRule.idl b/offapi/com/sun/star/text/ChapterNumberingRule.idl
index 1fac8ee733d5..15d597dda8a3 100644
--- a/offapi/com/sun/star/text/ChapterNumberingRule.idl
+++ b/offapi/com/sun/star/text/ChapterNumberingRule.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_ChapterNumberingRule_idl__
 #define __com_sun_star_text_ChapterNumberingRule_idl__
 
-#ifndef __com_sun_star_style_NumberingRule_idl__
 #include <com/sun/star/style/NumberingRule.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/CharacterCompressionType.idl b/offapi/com/sun/star/text/CharacterCompressionType.idl
index 23abfd810d44..ea44883d0966 100644
--- a/offapi/com/sun/star/text/CharacterCompressionType.idl
+++ b/offapi/com/sun/star/text/CharacterCompressionType.idl
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-/** These constants define character compression in asian text.
+/** These constants define character compression in Asian text.
  */
 published constants CharacterCompressionType
 {
@@ -49,7 +49,7 @@ published constants CharacterCompressionType
     const short PUNCTUATION_ONLY = 1;
 
     //-------------------------------------------------------------------------
-    /** punctuation and japanese kana are compressed.
+    /** punctuation and Japanese Kana are compressed.
      */
     const short PUNCTUATION_AND_KANA = 2;
 
diff --git a/offapi/com/sun/star/text/ColumnSeparatorStyle.idl b/offapi/com/sun/star/text/ColumnSeparatorStyle.idl
new file mode 100644
index 000000000000..5aa40af89f57
--- /dev/null
+++ b/offapi/com/sun/star/text/ColumnSeparatorStyle.idl
@@ -0,0 +1,46 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       [ Novell Inc. ]
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Cedric Bosdonnat <cbosdonnat@novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef __com_sun_star_text_ColumnSeparatorStyle_idl__
+#define __com_sun_star_text_ColumnSeparatorStyle_idl__
+
+module com {  module sun {  module star {  module text {
+
+published constants ColumnSeparatorStyle
+{
+    const short NONE = 0;
+
+    const short SOLID = 1;
+
+    const short DOTTED = 2;
+
+    const short DASHED = 3;
+};
+
+}; }; }; };
+
+
+#endif
diff --git a/offapi/com/sun/star/text/ContentIndex.idl b/offapi/com/sun/star/text/ContentIndex.idl
index b3a4c34ef630..6157b77f8c3b 100644
--- a/offapi/com/sun/star/text/ContentIndex.idl
+++ b/offapi/com/sun/star/text/ContentIndex.idl
@@ -44,12 +44,12 @@ published service ContentIndex
     // DocMerge: empty anyway
     service  com::sun::star::text::BaseIndex;
 
-    /** determins the depth of outline levels that are included into the content index.*/
+    /** determines the depth of outline levels that are included into the content index.*/
 
     /// @missing
     [optional, property] short Level;
 
-    /** determins if the document index is created from outlines.
+    /** determines if the document index is created from outlines.
     */
     [optional, property] boolean CreateFromOutline;
 
diff --git a/offapi/com/sun/star/text/ContentIndexMark.idl b/offapi/com/sun/star/text/ContentIndexMark.idl
index 6ad0b8981f80..17c6ae0dac0a 100644
--- a/offapi/com/sun/star/text/ContentIndexMark.idl
+++ b/offapi/com/sun/star/text/ContentIndexMark.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_ContentIndexMark_idl__
 #define __com_sun_star_text_ContentIndexMark_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_text_BaseIndexMark_idl__
 #include <com/sun/star/text/BaseIndexMark.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/Defaults.idl b/offapi/com/sun/star/text/Defaults.idl
index f8e8c6a56de1..12da8259adec 100644
--- a/offapi/com/sun/star/text/Defaults.idl
+++ b/offapi/com/sun/star/text/Defaults.idl
@@ -27,28 +27,13 @@
 #ifndef __com_sun_star_text_Defaults_idl__
 #define __com_sun_star_text_Defaults_idl__
 
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
 #include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/DependentTextField.idl b/offapi/com/sun/star/text/DependentTextField.idl
index b98d07a865f4..ee1146fe17d0 100644
--- a/offapi/com/sun/star/text/DependentTextField.idl
+++ b/offapi/com/sun/star/text/DependentTextField.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_DependentTextField_idl__
 #define __com_sun_star_text_DependentTextField_idl__
 
-#ifndef __com_sun_star_text_TextField_idl__
 #include <com/sun/star/text/TextField.idl>
-#endif
 
-#ifndef __com_sun_star_text_XDependentTextField_idl__
 #include <com/sun/star/text/XDependentTextField.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/DocumentIndex.idl b/offapi/com/sun/star/text/DocumentIndex.idl
index 8cee39a2327e..8276b79f21ef 100644
--- a/offapi/com/sun/star/text/DocumentIndex.idl
+++ b/offapi/com/sun/star/text/DocumentIndex.idl
@@ -30,9 +30,7 @@
 #define __com_sun_star_text_DocumentIndex_idl__
 
 #include <com/sun/star/text/BaseIndex.idl>
-#ifndef __com_sun_star_text_XDocumentIndexMark_idl__
 #include <com/sun/star/text/XDocumentIndexMark.idl>
-#endif
 
 //=============================================================================
 
@@ -46,35 +44,35 @@ published service DocumentIndex
 {
     service  com::sun::star::text::BaseIndex;
 
-    /** determins if alphabetical separators are genererated.
+    /** determines if alphabetical separators are generated.
      */
     [optional, property] boolean UseAlphabeticalSeparators;
 
-    /** determins if a index entry is generated for each primary/secondary key.
+    /** determines if a index entry is generated for each primary/secondary key.
      */
     [optional, property] boolean UseKeyAsEntry;
 
-    /** determins if same entries on different pages are combined into one index entry.
+    /** determines if same entries on different pages are combined into one index entry.
      */
     [optional, property] boolean UseCombinedEntries;
 
-    /** determins if the similarity of index entries is checked case sensitively.
+    /** determines if the similarity of index entries is checked case sensitively.
      */
     [optional, property] boolean IsCaseSensitive;
 
-    /** determins if following page numbers are displayed using a 'pp.'.
+    /** determines if following page numbers are displayed using a "pp.".
      */
     [optional, property] boolean UsePP;
 
-    /** determins if if following page numbers are displayed using a dash.
+    /** determines if if following page numbers are displayed using a dash.
      */
     [optional, property] boolean UseDash;
 
-    /** determins if all entries start with a capital letter.
+    /** determines if all entries start with a capital letter.
      */
     [optional, property] boolean UseUpperCase;
 
-    /** determins the name of the character style that is applied to the number
+    /** determines the name of the character style that is applied to the number
      of a page where main index entry is located.
      */
     [optional, property] string MainEntryCharacterStyleName;
diff --git a/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl b/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
index 059a3edab680..f6d97462e988 100644
--- a/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
+++ b/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_DocumentIndex_idl__
 #define __com_sun_star_text_DocumentIndex_idl__
 
-#ifndef _com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/DocumentIndexMark.idl b/offapi/com/sun/star/text/DocumentIndexMark.idl
index 97de1d2584f2..d0a7b0ede2ac 100644
--- a/offapi/com/sun/star/text/DocumentIndexMark.idl
+++ b/offapi/com/sun/star/text/DocumentIndexMark.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_DocumentIndexMark_idl__
 #define __com_sun_star_text_DocumentIndexMark_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_text_BaseIndexMark_idl__
 #include <com/sun/star/text/BaseIndexMark.idl>
-#endif
 
 
 //=============================================================================
@@ -61,7 +57,7 @@ published service DocumentIndexMark
      */
     [property] string SecondaryKey;
     //-------------------------------------------------------------------------
-    /** determins if this entry is a main entry. In a document index this entry will
+    /** determines if this entry is a main entry. In a document index this entry will
         be emphasized by assigning a character style to it.
      */
     [property] boolean IsMainEntry;
diff --git a/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl b/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
index c9e6eeb18c30..ffd6e8988297 100644
--- a/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
+++ b/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_DocumentIndex_idl__
 #define __com_sun_star_text_DocumentIndex_idl__
 
-#ifndef _com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/DocumentIndexes.idl b/offapi/com/sun/star/text/DocumentIndexes.idl
index d47a9c6bdfd4..8e624eea9b1e 100644
--- a/offapi/com/sun/star/text/DocumentIndexes.idl
+++ b/offapi/com/sun/star/text/DocumentIndexes.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_DocumentIndexes_idl__
 #define __com_sun_star_text_DocumentIndexes_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/DocumentSettings.idl b/offapi/com/sun/star/text/DocumentSettings.idl
index 0917cb46768d..a89f5caba75b 100644
--- a/offapi/com/sun/star/text/DocumentSettings.idl
+++ b/offapi/com/sun/star/text/DocumentSettings.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_text_TextDocumentSettings_idl__
 #define __com_sun_star_text_TextDocumentSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_document_Settings_idl__
 #include <com/sun/star/document/Settings.idl>
-#endif
-
-#ifndef __com_sun_star_text_PrintSettings_idl__
 #include <com/sun/star/text/PrintSettings.idl>
-#endif
-
-#ifndef __com_sun_star_text_PrintPreviewSettings_idl__
 #include <com/sun/star/text/PrintPreviewSettings.idl>
-#endif
 
 //=============================================================================
 
@@ -68,7 +57,7 @@ published service DocumentSettings
 
     /** specifies if charts in text documents are updated automatically.
 
-        This has no effect if 'FieldAutoUpdate' is <FALSE/>.
+        This has no effect if "FieldAutoUpdate" is <FALSE/>.
     */
     [optional, property] boolean ChartAutoUpdate;
 
@@ -78,7 +67,7 @@ published service DocumentSettings
         <p>If between two paragraphs, two tables, or a paragraph and a
         table, you have defined spacing above and below each object,
         usually only the larger one of the two spaces is used.  If the
-        spacing between hte objects are to be added this property has
+        spacing between the objects are to be added this property has
         to be <TRUE/>.</p>
     */
     [optional, property] boolean AddParaTableSpacing;
@@ -211,4 +200,4 @@ published service DocumentSettings
 
 }; }; }; };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/offapi/com/sun/star/text/Endnote.idl b/offapi/com/sun/star/text/Endnote.idl
index 0e4c64fdc2a9..e9a3fdd9c0a4 100644
--- a/offapi/com/sun/star/text/Endnote.idl
+++ b/offapi/com/sun/star/text/Endnote.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_Endnote_idl__
 #define __com_sun_star_text_Endnote_idl__
 
-#ifndef __com_sun_star_text_Footnote_idl__
 #include <com/sun/star/text/Footnote.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/EndnoteSettings.idl b/offapi/com/sun/star/text/EndnoteSettings.idl
index d64f55850a75..ae2b9aabfdea 100644
--- a/offapi/com/sun/star/text/EndnoteSettings.idl
+++ b/offapi/com/sun/star/text/EndnoteSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_EndnoteSettings_idl__
 #define __com_sun_star_text_EndnoteSettings_idl__
 
-#ifndef __com_sun_star_text_FootnoteSettings_idl__
 #include <com/sun/star/text/FootnoteSettings.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/FontEmphasis.idl b/offapi/com/sun/star/text/FontEmphasis.idl
index 2953afb80a60..af68c97dd298 100644
--- a/offapi/com/sun/star/text/FontEmphasis.idl
+++ b/offapi/com/sun/star/text/FontEmphasis.idl
@@ -33,7 +33,7 @@
  module com {  module sun {  module star {  module text {
 
 //=============================================================================
-/**  Determins the type and position of an emphasis mark in asian texts.
+/**  Determines the type and position of an emphasis mark in Asian texts.
  */
 published constants FontEmphasis
 {
diff --git a/offapi/com/sun/star/text/FontRelief.idl b/offapi/com/sun/star/text/FontRelief.idl
index 96020038322c..c5d66d611d14 100644
--- a/offapi/com/sun/star/text/FontRelief.idl
+++ b/offapi/com/sun/star/text/FontRelief.idl
@@ -33,7 +33,7 @@
  module com {  module sun {  module star {  module text {
 
 //=============================================================================
-/**  Determins the relief type of a font.
+/**  Determines the relief type of a font.
  */
 published constants FontRelief
 {
diff --git a/offapi/com/sun/star/text/Footnote.idl b/offapi/com/sun/star/text/Footnote.idl
index 3e23ff718f3c..cebca552d7ff 100644
--- a/offapi/com/sun/star/text/Footnote.idl
+++ b/offapi/com/sun/star/text/Footnote.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_Footnote_idl__
 #define __com_sun_star_text_Footnote_idl__
 
-#ifndef __com_sun_star_text_XFootnote_idl__
 #include <com/sun/star/text/XFootnote.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/Footnotes.idl b/offapi/com/sun/star/text/Footnotes.idl
index d43811059d09..ebec4b05b023 100644
--- a/offapi/com/sun/star/text/Footnotes.idl
+++ b/offapi/com/sun/star/text/Footnotes.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_Footnotes_idl__
 #define __com_sun_star_text_Footnotes_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/GenericTextDocument.idl b/offapi/com/sun/star/text/GenericTextDocument.idl
index 7a7e06ce5f34..9e95d496a9d3 100644
--- a/offapi/com/sun/star/text/GenericTextDocument.idl
+++ b/offapi/com/sun/star/text/GenericTextDocument.idl
@@ -27,97 +27,29 @@
 #ifndef __com_sun_star_text_GenericTextDocument_idl__
 #define __com_sun_star_text_GenericTextDocument_idl__
 
-#ifndef __com_sun_star_document_OfficeDocument_idl__
 #include <com/sun/star/document/OfficeDocument.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextDocument_idl__
 #include <com/sun/star/text/XTextDocument.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSearchable_idl__
 #include <com/sun/star/util/XSearchable.idl>
-#endif
-
-#ifndef _com_sun_star_util_XRefreshable_idl_
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFootnotesSupplier_idl__
 #include <com/sun/star/text/XFootnotesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XEndnotesSupplier_idl__
 #include <com/sun/star/text/XEndnotesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XReplaceable_idl__
 #include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XPagePrintable_idl__
 #include <com/sun/star/text/XPagePrintable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__
 #include <com/sun/star/text/XReferenceMarksSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XLineNumberingSupplier_idl__
 #include <com/sun/star/text/XLineNumberingSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__
 #include <com/sun/star/text/XChapterNumberingSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__
 #include <com/sun/star/text/XTextGraphicObjectsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__
 #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextTablesSupplier_idl__
 #include <com/sun/star/text/XTextTablesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XBookmarksSupplier_idl__
 #include <com/sun/star/text/XBookmarksSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDocumentIndexesSupplier_idl__
 #include <com/sun/star/text/XDocumentIndexesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFieldsSupplier_idl__
 #include <com/sun/star/text/XTextFieldsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFramesSupplier_idl__
 #include <com/sun/star/text/XTextFramesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextSectionsSupplier_idl__
 #include <com/sun/star/text/XTextSectionsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
@@ -234,7 +166,7 @@ published service GenericTextDocument
 
 
 
-        <p> I.e. slash and backslash. Whitespaces (tab stop,
+        <p> I.e. slash and backslash. Whitespace (tab stop,
         space, paragraph break, line break) always separate
         words.</p>@see WordCount
      */
diff --git a/offapi/com/sun/star/text/GlobalDocument.idl b/offapi/com/sun/star/text/GlobalDocument.idl
index 480887d64b0f..a4ffd1584bae 100644
--- a/offapi/com/sun/star/text/GlobalDocument.idl
+++ b/offapi/com/sun/star/text/GlobalDocument.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_GlobalDocument_idl__
 #define __com_sun_star_text_GlobalDocument_idl__
 
-#ifndef __com_sun_star_text_GenericTextDocument_idl__
 #include <com/sun/star/text/GenericTextDocument.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/GlobalSettings.idl b/offapi/com/sun/star/text/GlobalSettings.idl
index b0948f4a3f7b..75d2a40aa00e 100644
--- a/offapi/com/sun/star/text/GlobalSettings.idl
+++ b/offapi/com/sun/star/text/GlobalSettings.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_BaseFrame_idl__
 #define __com_sun_star_text_BaseFrame_idl__
 
-#ifndef __com_sun_star_view_XPrintSettingsSupplier_idl__
 #include <com/sun/star/view/XPrintSettingsSupplier.idl>
-#endif
-#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__
 #include <com/sun/star/view/XViewSettingsSupplier.idl>
-#endif
 
 
 
@@ -42,7 +38,7 @@
 
 //=============================================================================
 
-/** specifies a service that provides acces to the settings of a text module.
+/** specifies a service that provides access to the settings of a text module.
  */
 published service GlobalSettings
 {
diff --git a/offapi/com/sun/star/text/HypertextDocument.idl b/offapi/com/sun/star/text/HypertextDocument.idl
index 57e4ad874c38..50ce05428524 100644
--- a/offapi/com/sun/star/text/HypertextDocument.idl
+++ b/offapi/com/sun/star/text/HypertextDocument.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_text_HypertextDocument_idl__
 #define __com_sun_star_text_HypertextDocument_idl__
 
-#ifndef __com_sun_star_text_TextDocument_idl__
 #include <com/sun/star/text/TextDocument.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__
 #include <com/sun/star/text/XTextGraphicObjectsSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__
 #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextTablesSupplier_idl__
 #include <com/sun/star/text/XTextTablesSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/IllustrationsIndex.idl b/offapi/com/sun/star/text/IllustrationsIndex.idl
index 004fbd356e21..e8b3fe015ef6 100644
--- a/offapi/com/sun/star/text/IllustrationsIndex.idl
+++ b/offapi/com/sun/star/text/IllustrationsIndex.idl
@@ -42,13 +42,13 @@ published service IllustrationsIndex
 {
     service  com::sun::star::text::BaseIndex;
 
-    /* determins if the name or the label of an object is used to create the index.
+    /* determines if the name or the label of an object is used to create the index.
      */
     [optional, property] boolean CreateFromLabels; //tables, illustrations
-    /* determins the name of the sequence field that is evaluated to create the index.
+    /* determines the name of the sequence field that is evaluated to create the index.
      */
     [optional, property] string LabelCategory; //tables, illustrations
-    /* determins the way the paragraph containing a label is included in the index.
+    /* determines the way the paragraph containing a label is included in the index.
         @see ChapterFormat*/
     [optional, property] short LabelDisplayType;//tables, illustrations
 };
diff --git a/offapi/com/sun/star/text/InContentMetadata.idl b/offapi/com/sun/star/text/InContentMetadata.idl
index 5eac10714576..5e80c49ddaf4 100755..100644
--- a/offapi/com/sun/star/text/InContentMetadata.idl
+++ b/offapi/com/sun/star/text/InContentMetadata.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_text_InContentMetadata_idl__
 #define __com_sun_star_text_InContentMetadata_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XMetadatable_idl__
 #include <com/sun/star/rdf/XMetadatable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/InvalidTextContentException.idl b/offapi/com/sun/star/text/InvalidTextContentException.idl
index 08dba3fb86c8..0f0381caf562 100644
--- a/offapi/com/sun/star/text/InvalidTextContentException.idl
+++ b/offapi/com/sun/star/text/InvalidTextContentException.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_InvalidTextContentException_idl__
 #define __com_sun_star_text_InvalidTextContentException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/LineNumberingProperties.idl b/offapi/com/sun/star/text/LineNumberingProperties.idl
index b91d82dbc1bb..605fee295848 100644
--- a/offapi/com/sun/star/text/LineNumberingProperties.idl
+++ b/offapi/com/sun/star/text/LineNumberingProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_LineNumberingProperties_idl__
 #define __com_sun_star_text_LineNumberingProperties_idl__
 
-#ifndef __com_sun_star_text_XLineNumberingProperties_idl__
 #include <com/sun/star/text/XLineNumberingProperties.idl>
-#endif
 
 //=============================================================================
 
@@ -101,7 +99,7 @@ published service LineNumberingProperties
     /** specifies if the line numbering should start from the
         beginning at each page.
 
-        <p>If set to <FALSE/> the line numbering will be continous.</p>
+        <p>If set to <FALSE/> the line numbering will be continuous.</p>
 
         @since OOo 2.0
      */
diff --git a/offapi/com/sun/star/text/MailMerge.idl b/offapi/com/sun/star/text/MailMerge.idl
index beb4fedf3d26..d84c7eb2ab9f 100644
--- a/offapi/com/sun/star/text/MailMerge.idl
+++ b/offapi/com/sun/star/text/MailMerge.idl
@@ -27,27 +27,13 @@
 #ifndef __com_sun_star_text_MailMerge_idl__
 #define __com_sun_star_text_MailMerge_idl__
 
-#ifndef __com_sun_star_task_XJob_idl__
 #include <com/sun/star/task/XJob.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XConnection_idl__
 #include <com/sun/star/sdbc/XConnection.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_text_XMailMergeBroadcaster_idl__
 #include <com/sun/star/text/XMailMergeBroadcaster.idl>
-#endif
-#ifndef __com_sun_star_sdb_DataAccessDescriptor_idl__
 #include <com/sun/star/sdb/DataAccessDescriptor.idl>
-#endif
 
 //=============================================================================
 
@@ -273,7 +259,7 @@ published service MailMerge
     //=============================================================================
 
     /** Contains the password of the incoming mail server. It is necessary to set this
-        if the mail server configuration is set to 'SMTP after POP' authentication and
+        if the mail server configuration is set to "SMTP after POP" authentication and
         the password is not already stored in the configuration for security reasons.
 
         <p>This property is only evaluated for e-Mail output.</p>
@@ -304,7 +290,7 @@ published service MailMerge
     //=============================================================================
 
     /** determines that the created mail merge document is sent as body in HTML format.
-        This property is only valid if the propery "SendAsAttachment" is set to <false/>.
+        This property is only valid if the property "SendAsAttachment" is set to <false/>.
 
         <p>This property is only evaluated for e-Mail output.</p>
 
diff --git a/offapi/com/sun/star/text/MailMergeEvent.idl b/offapi/com/sun/star/text/MailMergeEvent.idl
index 564ff0bfcf07..935810f756e7 100644
--- a/offapi/com/sun/star/text/MailMergeEvent.idl
+++ b/offapi/com/sun/star/text/MailMergeEvent.idl
@@ -29,12 +29,8 @@
 
 
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/NumberingLevel.idl b/offapi/com/sun/star/text/NumberingLevel.idl
index 9443a9a2740e..70d11f871502 100644
--- a/offapi/com/sun/star/text/NumberingLevel.idl
+++ b/offapi/com/sun/star/text/NumberingLevel.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_text_NumberingLevel_idl__
 #define __com_sun_star_text_NumberingLevel_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/NumberingRules.idl b/offapi/com/sun/star/text/NumberingRules.idl
index 352c58d2cf40..d6537e668def 100644
--- a/offapi/com/sun/star/text/NumberingRules.idl
+++ b/offapi/com/sun/star/text/NumberingRules.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_NumberingRules_idl__
 #define __com_sun_star_text_NumberingRules_idl__
 
-#ifndef __com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
@@ -60,19 +56,19 @@ published service NumberingRules
     [optional] interface com::sun::star::beans::XPropertySet;
     //-------------------------------------------------------------------------
 
-    /** determins if the margins are absolute or relative
-        to the preceeding numbering level.
+    /** determines if the margins are absolute or relative
+        to the preceding numbering level.
      */
     [optional, property] boolean  IsAbsoluteMargins;
     //-------------------------------------------------------------------------
 
-    /** determins if the numbering rules are automatically created
+    /** determines if the numbering rules are automatically created
         as opposed to numbering rules that are part of a numbering style.
      */
     [optional, property] boolean IsAutomatic;
     //-------------------------------------------------------------------------
 
-    /** determins if the numbering levels are counted coninuously  or if
+    /** determines if the numbering levels are counted continuously  or if
         each numbering level is counted separately.
      */
     [optional, property] boolean IsContinuousNumbering;
@@ -89,7 +85,7 @@ published service NumberingRules
         [optional, property] boolean    NumberingIsOutline;
         //-------------------------------------------------------------------------
 
-        /** the type of numbering (arabic, characters, roman numbers, etc.).
+        /** the type of numbering (Arabic, characters, roman numbers, etc.).
          */
         [optional, property] short    NumberingType;
         //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/text/NumberingStyle.idl b/offapi/com/sun/star/text/NumberingStyle.idl
index 53573c606ade..9cda21074fbb 100644
--- a/offapi/com/sun/star/text/NumberingStyle.idl
+++ b/offapi/com/sun/star/text/NumberingStyle.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_style_NumberingStyle_idl__
 #define __com_sun_star_style_NumberingStyle_idl__
 
-#ifndef __com_sun_star_style_Style_idl__
 #include <com/sun/star/style/Style.idl>
-#endif
-#ifndef __com_sun_star_text_NumberingRules_idl__
 #include <com/sun/star/text/NumberingRules.idl>
-#endif
 
 //=============================================================================
 
@@ -40,7 +36,7 @@ module com {  module sun {  module star {  module text {
 
 //=============================================================================
 
-/** specifies a stylesheet numberings within a
+/** specifies a style sheet numberings within a
     <type scope="com::sun::star::text">Text</type>.
  */
 published service NumberingStyle
diff --git a/offapi/com/sun/star/text/PageFootnoteInfo.idl b/offapi/com/sun/star/text/PageFootnoteInfo.idl
index e8f1931cc95a..24f892dc54b4 100644
--- a/offapi/com/sun/star/text/PageFootnoteInfo.idl
+++ b/offapi/com/sun/star/text/PageFootnoteInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_PageFootnoteInfo_idl__
 #define __com_sun_star_text_PageFootnoteInfo_idl__
 
-#ifndef __com_sun_star_text_HorizontalAdjust_idl__
 #include <com/sun/star/text/HorizontalAdjust.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/Paragraph.idl b/offapi/com/sun/star/text/Paragraph.idl
index ee75fed06ca6..e756f4a455da 100644
--- a/offapi/com/sun/star/text/Paragraph.idl
+++ b/offapi/com/sun/star/text/Paragraph.idl
@@ -27,49 +27,18 @@
 #ifndef __com_sun_star_text_Paragraph_idl__
 #define __com_sun_star_text_Paragraph_idl__
 
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
 #include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
 #include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextTable_idl__
 #include <com/sun/star/text/TextTable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/ParagraphEnumeration.idl b/offapi/com/sun/star/text/ParagraphEnumeration.idl
index 9e2ec8253e34..f678085251d7 100644
--- a/offapi/com/sun/star/text/ParagraphEnumeration.idl
+++ b/offapi/com/sun/star/text/ParagraphEnumeration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_ParagraphEnumeration_idl__
 #define __com_sun_star_text_ParagraphEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/ParagraphVertAlign.idl b/offapi/com/sun/star/text/ParagraphVertAlign.idl
index 65d1a5b69dc2..fa0d52964789 100644
--- a/offapi/com/sun/star/text/ParagraphVertAlign.idl
+++ b/offapi/com/sun/star/text/ParagraphVertAlign.idl
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-/** These enumeration values are used to specify the vertical alignment of paragaphs.
+/** These enumeration values are used to specify the vertical alignment of paragraphs.
  */
 published constants ParagraphVertAlign
 {
diff --git a/offapi/com/sun/star/text/PrintPreviewSettings.idl b/offapi/com/sun/star/text/PrintPreviewSettings.idl
index e282cf76536f..be972b8c9247 100755..100644
--- a/offapi/com/sun/star/text/PrintPreviewSettings.idl
+++ b/offapi/com/sun/star/text/PrintPreviewSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_PrintPreviewSettings_idl__
 #define __com_sun_star_text_PrintPreviewSettings_idl__
 
-#ifndef __com_sun_star_text_NotePrintMode_idl__
 #include <com/sun/star/text/NotePrintMode.idl>
-#endif
 
 
 //=============================================================================
@@ -44,7 +42,7 @@
  */
 published service PrintPreviewSettings
 {
-    /** All properties have the property attribute 'maybevoid'
+    /** All properties have the property attribute "maybevoid"
     meaning: if none of them have been set, they all will return a void value, if any
     one of them has been set, then none of them will be void any longer */
 
diff --git a/offapi/com/sun/star/text/PrintSettings.idl b/offapi/com/sun/star/text/PrintSettings.idl
index 82f55f3bc2b6..7cfd33f74127 100644
--- a/offapi/com/sun/star/text/PrintSettings.idl
+++ b/offapi/com/sun/star/text/PrintSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_PrintSettings_idl__
 #define __com_sun_star_text_PrintSettings_idl__
 
-#ifndef __com_sun_star_text_NotePrintMode_idl__
 #include <com/sun/star/text/NotePrintMode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/RedlinePortion.idl b/offapi/com/sun/star/text/RedlinePortion.idl
index c399d976e04a..0ec41a9f1397 100644
--- a/offapi/com/sun/star/text/RedlinePortion.idl
+++ b/offapi/com/sun/star/text/RedlinePortion.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_text_RedlinePortion_idl__
 #define __com_sun_star_text_RedlinePortion_idl__
 
-#ifndef __com_sun_star_text_TextPortion_idl__
 #include <com/sun/star/text/TextPortion.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/ReferenceFieldPart.idl b/offapi/com/sun/star/text/ReferenceFieldPart.idl
index ab7bb5ac3c00..f18e1d24f211 100644
--- a/offapi/com/sun/star/text/ReferenceFieldPart.idl
+++ b/offapi/com/sun/star/text/ReferenceFieldPart.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module text {
 published constants ReferenceFieldPart
 {
     //-------------------------------------------------------------------------
-    /** The page number is displayed using arabic numbers.
+    /** The page number is displayed using Arabic numbers.
     */
     const short PAGE = 0;
 
@@ -82,7 +82,7 @@ published constants ReferenceFieldPart
     */
     const short ONLY_SEQUENCE_NUMBER = 7;
         //-------------------------------------------------------------------------
-        /** The numbering label and depending of the reference field context numbering lables of
+        /** The numbering label and depending of the reference field context numbering labels of
             superior list levels of the reference are displayed.
 
             <p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>
@@ -112,7 +112,7 @@ published constants ReferenceFieldPart
         */
         const short NUMBER_NO_CONTEXT = 9;
         //-------------------------------------------------------------------------
-        /** The numbering label and numbering lables of superior list levels of the reference are displayed.
+        /** The numbering label and numbering labels of superior list levels of the reference are displayed.
 
             <p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>
             <p>The contents of the list label of the paragraph, at which the bookmark respectively the
diff --git a/offapi/com/sun/star/text/ReferenceMark.idl b/offapi/com/sun/star/text/ReferenceMark.idl
index 1dc073beacdb..76d9740b8a2a 100644
--- a/offapi/com/sun/star/text/ReferenceMark.idl
+++ b/offapi/com/sun/star/text/ReferenceMark.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_ReferenceMark_idl__
 #define __com_sun_star_text_ReferenceMark_idl__
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/ReferenceMarks.idl b/offapi/com/sun/star/text/ReferenceMarks.idl
index bbc38ec21eef..9551ad920212 100644
--- a/offapi/com/sun/star/text/ReferenceMarks.idl
+++ b/offapi/com/sun/star/text/ReferenceMarks.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_ReferenceMarks_idl__
 #define __com_sun_star_text_ReferenceMarks_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/Shape.idl b/offapi/com/sun/star/text/Shape.idl
index a7fe22ae5935..a5d34fa1ddec 100644
--- a/offapi/com/sun/star/text/Shape.idl
+++ b/offapi/com/sun/star/text/Shape.idl
@@ -27,24 +27,12 @@
 #ifndef __com_sun_star_text_Shape_idl__
 #define __com_sun_star_text_Shape_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_text_XTextFrame_idl__
 #include <com/sun/star/text/XTextFrame.idl>
-#endif
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
-#ifndef __com_sun_star_drawing_Shape_idl__
 #include <com/sun/star/drawing/Shape.idl>
-#endif
-#ifndef __com_sun_star_text_TextContentAnchorType_idl__
 #include <com/sun/star/text/TextContentAnchorType.idl>
-#endif
-#ifndef __com_sun_star_text_WrapTextMode_idl__
 #include <com/sun/star/text/WrapTextMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/SizeType.idl b/offapi/com/sun/star/text/SizeType.idl
index 879e75b11523..b4032e8db272 100644
--- a/offapi/com/sun/star/text/SizeType.idl
+++ b/offapi/com/sun/star/text/SizeType.idl
@@ -46,13 +46,13 @@
 published constants SizeType
 {
     //-------------------------------------------------------------------------
-    // The height of the object is determind by the content only.
+    // The height of the object is determined by the content only.
 
     // DocMerge: empty anyway
     const short VARIABLE = 0;
 
     //-------------------------------------------------------------------------
-    // The height property determins the height of the object.
+    // The height property determines the height of the object.
 
     // DocMerge: empty anyway
     const short FIX = 1;
diff --git a/offapi/com/sun/star/text/TableColumns.idl b/offapi/com/sun/star/text/TableColumns.idl
index bb83142f18ee..b7d7a9923772 100644
--- a/offapi/com/sun/star/text/TableColumns.idl
+++ b/offapi/com/sun/star/text/TableColumns.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_table_TableColumns_idl__
 #define __com_sun_star_table_TableColumns_idl__
 
-#ifndef __com_sun_star_table_XTableColumns_idl__
 #include <com/sun/star/table/XTableColumns.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TableRows.idl b/offapi/com/sun/star/text/TableRows.idl
index f3989d11a891..e0d539a76bbc 100644
--- a/offapi/com/sun/star/text/TableRows.idl
+++ b/offapi/com/sun/star/text/TableRows.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_table_TableRows_idl__
 #define __com_sun_star_table_TableRows_idl__
 
-#ifndef __com_sun_star_table_XTableRows_idl__
 #include <com/sun/star/table/XTableRows.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/Text.idl b/offapi/com/sun/star/text/Text.idl
index bf3b26d0f943..c6a6edf3b4fa 100644
--- a/offapi/com/sun/star/text/Text.idl
+++ b/offapi/com/sun/star/text/Text.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_text_Text_idl__
 #define __com_sun_star_text_Text_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
 
 
 //=============================================================================
@@ -75,7 +69,7 @@ published service Text
 
 //=============================================================================
 
-    /** optional interface to compare postions of <type>TextRange</type>
+    /** optional interface to compare positions of <type>TextRange</type>
                 instances within this text.
      */
     [optional] interface XTextRangeCompare;
@@ -111,7 +105,7 @@ published service Text
         <LI><P>boolean MergeLastPara        </P></LI>
         <LI><P>[maybevoid] com::sun::star::text::XText RedlineText  (maybevoid)</P></LI>
         <LI><P>com::sun::star::beans::PropertyValues RedlineSuccessorData
-            (contains the same properties except for the RedlineSuccessorData</P></LI>
+            (contains the same properties except for the RedlineSuccessorData)</P></LI>
     </UL>
      @see EndRedline
      */
@@ -132,7 +126,7 @@ published service Text
         <LI><P>boolean MergeLastPara        </P></LI>
         <LI><P>[maybevoid] com::sun::star::text::XText RedlineText  (maybevoid)</P></LI>
         <LI><P>com::sun::star::beans::PropertyValues RedlineSuccessorData
-            (contains the same properties except for the RedlineSuccessorData</P></LI>
+            (contains the same properties except for the RedlineSuccessorData)</P></LI>
     </UL>
      @see StartRedline
      */
diff --git a/offapi/com/sun/star/text/TextColumnSequence.idl b/offapi/com/sun/star/text/TextColumnSequence.idl
index f580489f89ad..c43d9cd1b6ed 100644
--- a/offapi/com/sun/star/text/TextColumnSequence.idl
+++ b/offapi/com/sun/star/text/TextColumnSequence.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextColumnSequence_idl__
 #define __com_sun_star_text_TextColumnSequence_idl__
 
-#ifndef __com_sun_star_text_TextColumn_idl__
 #include <com/sun/star/text/TextColumn.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextColumns.idl b/offapi/com/sun/star/text/TextColumns.idl
index b233348277d0..d4cfbfee8f09 100644
--- a/offapi/com/sun/star/text/TextColumns.idl
+++ b/offapi/com/sun/star/text/TextColumns.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_TextColumns_idl__
 #define __com_sun_star_text_TextColumns_idl__
 
-#ifndef __com_sun_star_text_XTextColumns_idl__
 #include <com/sun/star/text/XTextColumns.idl>
-#endif
-
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 //=============================================================================
 
@@ -84,6 +76,12 @@ published service TextColumns
      */
     [property]  boolean SeparatorLineIsOn;
     //------------------------------------------------------------------------
+    /** determines the style of the separator lines between the columns.
+        @see com::sun::star::text:ColumnSeparatorStyle
+            for the possible values.
+     */
+    [property, optional]  short SeparatorLineStyle;
+    //------------------------------------------------------------------------
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextContent.idl b/offapi/com/sun/star/text/TextContent.idl
index 4efab8af7377..8635c20c4dad 100644
--- a/offapi/com/sun/star/text/TextContent.idl
+++ b/offapi/com/sun/star/text/TextContent.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_TextContent_idl__
 #define __com_sun_star_text_TextContent_idl__
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContentAnchorType_idl__
 #include <com/sun/star/text/TextContentAnchorType.idl>
-#endif
-
-#ifndef __com_sun_star_text_WrapTextMode_idl__
 #include <com/sun/star/text/WrapTextMode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextContentCollection.idl b/offapi/com/sun/star/text/TextContentCollection.idl
index 602a6adb1fdb..044d0409016d 100644
--- a/offapi/com/sun/star/text/TextContentCollection.idl
+++ b/offapi/com/sun/star/text/TextContentCollection.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_TextContentCollection_idl__
 #define __com_sun_star_text_TextContentCollection_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextCursor.idl b/offapi/com/sun/star/text/TextCursor.idl
index 2882fd5ab2fa..70566c29754c 100644
--- a/offapi/com/sun/star/text/TextCursor.idl
+++ b/offapi/com/sun/star/text/TextCursor.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_text_TextCursor_idl__
 #define __com_sun_star_text_TextCursor_idl__
 
-#ifndef __com_sun_star_text_TextRange_idl__
 #include <com/sun/star/text/TextRange.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextCursor_idl__
 #include <com/sun/star/text/XTextCursor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XWordCursor_idl__
 #include <com/sun/star/text/XWordCursor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XSentenceCursor_idl__
 #include <com/sun/star/text/XSentenceCursor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XParagraphCursor_idl__
 #include <com/sun/star/text/XParagraphCursor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertyStates_idl__
 #include <com/sun/star/beans/XMultiPropertyStates.idl>
-#endif
-
-#ifndef __com_sun_star_document_XDocumentInsertable_idl__
 #include <com/sun/star/document/XDocumentInsertable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
 #include <com/sun/star/util/XSortable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextDocument.idl b/offapi/com/sun/star/text/TextDocument.idl
index 586fc917e6f3..86ef725ed266 100644
--- a/offapi/com/sun/star/text/TextDocument.idl
+++ b/offapi/com/sun/star/text/TextDocument.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextDocument_idl__
 #define __com_sun_star_text_TextDocument_idl__
 
-#ifndef __com_sun_star_text_GenericTextDocument_idl__
 #include <com/sun/star/text/GenericTextDocument.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextDocumentView.idl b/offapi/com/sun/star/text/TextDocumentView.idl
index cd87a4f31404..5bf5d12f915e 100644
--- a/offapi/com/sun/star/text/TextDocumentView.idl
+++ b/offapi/com/sun/star/text/TextDocumentView.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_text_TextDocumentView_idl__
 #define __com_sun_star_text_TextDocumentView_idl__
 
-#ifndef __com_sun_star_view_OfficeDocumentView_idl__
 #include <com/sun/star/view/OfficeDocumentView.idl>
-#endif
 
-#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__
 #include <com/sun/star/view/XViewSettingsSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextViewCursorSupplier_idl__
 #include <com/sun/star/text/XTextViewCursorSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -97,7 +89,7 @@ published service TextDocumentView
     [optional, property, readonly] long LineCount;
 
     //-------------------------------------------------------------------------
-    /** specifies if spellchecking should be done while typing.
+    /** specifies if spell checking should be done while typing.
 
         @since OOo 2.0
      */
diff --git a/offapi/com/sun/star/text/TextEmbeddedObject.idl b/offapi/com/sun/star/text/TextEmbeddedObject.idl
index 6a94586377fb..4e9d7a4d17a5 100644
--- a/offapi/com/sun/star/text/TextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/TextEmbeddedObject.idl
@@ -27,16 +27,9 @@
 #ifndef __com_sun_star_text_TextEmbeddedObject_idl__
 #define __com_sun_star_text_TextEmbeddedObject_idl__
 
-#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__
 #include <com/sun/star/document/XEmbeddedObjectSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_BaseFrame_idl__
 #include <com/sun/star/text/BaseFrame.idl>
-#endif
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
 
 //=============================================================================
@@ -51,7 +44,7 @@
 published service TextEmbeddedObject
 {
     /** contains the definition of interfaces and properties that are supported by text frames,
-     graphic objects and embeddedobjects.
+     graphic objects and embedded objects.
      */
     service BaseFrame;
     // DocMerge: empty anyway
@@ -65,7 +58,7 @@ published service TextEmbeddedObject
         //-------------------------------------------------------------------------
 
         /** This is the model for the OLE2 object.
-            <p>This property if void if the ole2 is not an
+            <p>This property if void if the OLE2 is not an
             Office component.</p>
 
         */
diff --git a/offapi/com/sun/star/text/TextEmbeddedObjects.idl b/offapi/com/sun/star/text/TextEmbeddedObjects.idl
index 61d76be3db50..eaf5cb70e1bb 100644
--- a/offapi/com/sun/star/text/TextEmbeddedObjects.idl
+++ b/offapi/com/sun/star/text/TextEmbeddedObjects.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_TextEmbeddedObjects_idl__
 #define __com_sun_star_text_TextEmbeddedObjects_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextField.idl b/offapi/com/sun/star/text/TextField.idl
index af0973009223..4f80d16d72ac 100644
--- a/offapi/com/sun/star/text/TextField.idl
+++ b/offapi/com/sun/star/text/TextField.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_TextField_idl__
 #define __com_sun_star_text_TextField_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextField_idl__
 #include <com/sun/star/text/XTextField.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextFieldEnumeration.idl b/offapi/com/sun/star/text/TextFieldEnumeration.idl
index 5502559aa0d1..022de0658afe 100644
--- a/offapi/com/sun/star/text/TextFieldEnumeration.idl
+++ b/offapi/com/sun/star/text/TextFieldEnumeration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextFieldEnumeration_idl__
 #define __com_sun_star_text_TextFieldEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextFieldMaster.idl b/offapi/com/sun/star/text/TextFieldMaster.idl
index 0bb13d5373c0..a86796df25bf 100644
--- a/offapi/com/sun/star/text/TextFieldMaster.idl
+++ b/offapi/com/sun/star/text/TextFieldMaster.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_TextFieldMaster_idl__
 #define __com_sun_star_text_TextFieldMaster_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_text_XDependentTextField_idl__
 #include <com/sun/star/text/XDependentTextField.idl>
-#endif
 
 //=============================================================================
 
@@ -50,7 +46,7 @@ published service TextFieldMaster
      */
     [optional] interface com::sun::star::beans::XPropertySet;
     //------------------------------------------------------------------------
-    /** determins the name of the field master. The name is void as long as the
+    /** determines the name of the field master. The name is void as long as the
      instance is not member of the document structure. When the value is being set
      the instance is inserted into the document and the name cannot be changed afterwards.
      That does not apply to the Database text field master.
diff --git a/offapi/com/sun/star/text/TextFieldMasters.idl b/offapi/com/sun/star/text/TextFieldMasters.idl
index e176b13fbcdb..f7a0f5902808 100644
--- a/offapi/com/sun/star/text/TextFieldMasters.idl
+++ b/offapi/com/sun/star/text/TextFieldMasters.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextFieldMasters_idl__
 #define __com_sun_star_text_TextFieldMasters_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextFields.idl b/offapi/com/sun/star/text/TextFields.idl
index c791be596186..34e76aeada1f 100644
--- a/offapi/com/sun/star/text/TextFields.idl
+++ b/offapi/com/sun/star/text/TextFields.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_TextFields_idl__
 #define __com_sun_star_text_TextFields_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
 #include <com/sun/star/util/XRefreshable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextFrame.idl b/offapi/com/sun/star/text/TextFrame.idl
index e43b3d79197c..9ef5a9e1ee6c 100644
--- a/offapi/com/sun/star/text/TextFrame.idl
+++ b/offapi/com/sun/star/text/TextFrame.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_TextFrame_idl__
 #define __com_sun_star_text_TextFrame_idl__
 
-#ifndef __com_sun_star_text_XTextFrame_idl__
 #include <com/sun/star/text/XTextFrame.idl>
-#endif
-
-#ifndef __com_sun_star_text_BaseFrame_idl__
 #include <com/sun/star/text/BaseFrame.idl>
-#endif
 
 //=============================================================================
 
@@ -64,7 +59,7 @@
 published service TextFrame
 {
     /** contains the definition of interfaces and properties that are supported by text frames,
-     graphic objects and embeddedobjects.
+     graphic objects and embedded objects.
      */
     service BaseFrame;
 
@@ -158,7 +153,7 @@ published service TextFrame
         in the page header then the document page, the page header is on, determines
         the page area.
         An exception of this interpretation rule is applied, if the anchor resides
-        in a table cell. In this situation the page area is always detemined by
+        in a table cell. In this situation the page area is always determined by
         the table cell.</p>
      */
     [optional, property] boolean IsFollowingTextFlow;
diff --git a/offapi/com/sun/star/text/TextFrames.idl b/offapi/com/sun/star/text/TextFrames.idl
index b6be445057ea..3fe3a6f2b5a7 100644
--- a/offapi/com/sun/star/text/TextFrames.idl
+++ b/offapi/com/sun/star/text/TextFrames.idl
@@ -27,16 +27,9 @@
 #ifndef __com_sun_star_text_TextFrames_idl__
 #define __com_sun_star_text_TextFrames_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextGraphicObject.idl b/offapi/com/sun/star/text/TextGraphicObject.idl
index e3f88c0331ed..0ad45d0a633c 100644
--- a/offapi/com/sun/star/text/TextGraphicObject.idl
+++ b/offapi/com/sun/star/text/TextGraphicObject.idl
@@ -27,26 +27,12 @@
 #ifndef __com_sun_star_text_TextGraphicObject_idl__
 #define __com_sun_star_text_TextGraphicObject_idl__
 
-#ifndef __com_sun_star_text_BaseFrame_idl__
 #include <com/sun/star/text/BaseFrame.idl>
-#endif
-
-#ifndef __com_sun_star_text_GraphicCrop_idl__
 #include <com/sun/star/text/GraphicCrop.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
 #include <com/sun/star/drawing/PointSequenceSequence.idl>
-#endif
-#ifndef __com_sun_star_drawing_ColorMode_idl__
 #include <com/sun/star/drawing/ColorMode.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_graphic_XGraphic_idl__
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
 
 //=============================================================================
 
@@ -59,7 +45,7 @@
 published service TextGraphicObject
 {
     /** contains the definition of interfaces and properties that are supported by text frames,
-     graphic objects and embeddedobjects.
+     graphic objects and embedded objects.
      */
     service BaseFrame;
     //-------------------------------------------------------------------------
@@ -148,11 +134,11 @@ published service TextGraphicObject
      */
     [property] short AdjustBlue;
     //-------------------------------------------------------------------------
-    /** determins the gamma value of the graphic.
+    /** determines the gamma value of the graphic.
      */
     [property] double Gamma;
     //-------------------------------------------------------------------------
-    /** determins if the graphic is display in inverted colors.
+    /** determines if the graphic is display in inverted colors.
          It contains percentage values between -100 and +100.
      */
     [property] boolean GraphicIsInverted;
diff --git a/offapi/com/sun/star/text/TextGraphicObjects.idl b/offapi/com/sun/star/text/TextGraphicObjects.idl
index 3aff7dbdce59..b8fde4b0d5b2 100644
--- a/offapi/com/sun/star/text/TextGraphicObjects.idl
+++ b/offapi/com/sun/star/text/TextGraphicObjects.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_TextGraphicObjects_idl__
 #define __com_sun_star_text_TextGraphicObjects_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextLayoutCursor.idl b/offapi/com/sun/star/text/TextLayoutCursor.idl
index 0849204150fa..4b5fa9a1c95d 100644
--- a/offapi/com/sun/star/text/TextLayoutCursor.idl
+++ b/offapi/com/sun/star/text/TextLayoutCursor.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_TextLayoutCursor_idl__
 #define __com_sun_star_text_TextLayoutCursor_idl__
 
-#ifndef __com_sun_star_text_TextCursor_idl__
 #include <com/sun/star/text/TextCursor.idl>
-#endif
-
-#ifndef __com_sun_star_text_XPageCursor_idl__
 #include <com/sun/star/text/XPageCursor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextMarkupDescriptor.idl b/offapi/com/sun/star/text/TextMarkupDescriptor.idl
index d6f2ba9c059e..5921ae31e7d3 100644
--- a/offapi/com/sun/star/text/TextMarkupDescriptor.idl
+++ b/offapi/com/sun/star/text/TextMarkupDescriptor.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_text_TextMarkupDescriptor_idl__
 #define __com_sun_star_text_TextMarkupDescriptor_idl__
 
-#ifndef __com_sun_star_container_XStringKeyMap_idl__
 #include <com/sun/star/container/XStringKeyMap.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextMarkupType_idl__
 #include <com/sun/star/text/TextMarkupType.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextMarkupType.idl b/offapi/com/sun/star/text/TextMarkupType.idl
index c752004d4687..429199a5fdc1 100644
--- a/offapi/com/sun/star/text/TextMarkupType.idl
+++ b/offapi/com/sun/star/text/TextMarkupType.idl
@@ -72,4 +72,4 @@ constants TextMarkupType
 };
 
 }; }; }; };
-#endif
\ No newline at end of file
+#endif
diff --git a/offapi/com/sun/star/text/TextPageStyle.idl b/offapi/com/sun/star/text/TextPageStyle.idl
index 781483ecd181..63bf484c91a0 100644
--- a/offapi/com/sun/star/text/TextPageStyle.idl
+++ b/offapi/com/sun/star/text/TextPageStyle.idl
@@ -28,34 +28,15 @@
 #ifndef __com_sun_star_text_TextPageStyle_idl__
 #define __com_sun_star_text_TextPageStyle_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_table_BorderLine_idl__
 #include <com/sun/star/table/BorderLine.idl>
-#endif
-#ifndef __com_sun_star_style_PageStyleLayout_idl__
 #include <com/sun/star/style/PageStyleLayout.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
-#ifndef __com_sun_star_text_XTextColumns_idl__
 #include <com/sun/star/text/XTextColumns.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
@@ -73,7 +54,7 @@ published service TextPageStyle
 {
     //-------------------------------------------------------------------------
 
-    /** determins whether the register mode is active on that page.
+    /** determines whether the register mode is active on that page.
       */
     [property] boolean RegisterModeActive;
 
diff --git a/offapi/com/sun/star/text/TextPortion.idl b/offapi/com/sun/star/text/TextPortion.idl
index 3bfc745d97da..6791f0ead82a 100644
--- a/offapi/com/sun/star/text/TextPortion.idl
+++ b/offapi/com/sun/star/text/TextPortion.idl
@@ -28,29 +28,12 @@
 #define __com_sun_star_text_TextPortion_idl__
 
 
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
 #include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__
 #include <com/sun/star/container/XContentEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextRange_idl__
 #include <com/sun/star/text/TextRange.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextField_idl__
 #include <com/sun/star/text/XTextField.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFootnote_idl__
 #include <com/sun/star/text/XFootnote.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextPortionEnumeration.idl b/offapi/com/sun/star/text/TextPortionEnumeration.idl
index 0472a874d260..abd556b7740b 100644
--- a/offapi/com/sun/star/text/TextPortionEnumeration.idl
+++ b/offapi/com/sun/star/text/TextPortionEnumeration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextPortionEnumeration_idl__
 #define __com_sun_star_text_TextPortionEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextRange.idl b/offapi/com/sun/star/text/TextRange.idl
index 7fe5d2ed37c5..2ecd9c22e047 100644
--- a/offapi/com/sun/star/text/TextRange.idl
+++ b/offapi/com/sun/star/text/TextRange.idl
@@ -27,40 +27,16 @@
 #ifndef __com_sun_star_text_TextRange_idl__
 #define __com_sun_star_text_TextRange_idl__
 
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
 #include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
 #include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__
 #include <com/sun/star/container/XContentEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/TextRangeContentProperties.idl b/offapi/com/sun/star/text/TextRangeContentProperties.idl
index 74acb67cf9ed..c425dbbe3273 100644
--- a/offapi/com/sun/star/text/TextRangeContentProperties.idl
+++ b/offapi/com/sun/star/text/TextRangeContentProperties.idl
@@ -28,37 +28,14 @@
 #ifndef __com_sun_star_text_TextRangeContentProperties_idl__
 #define __com_sun_star_text_TextRangeContentProperties_idl__
 
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDocumentIndex_idl__
 #include <com/sun/star/text/XDocumentIndex.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextTable_idl__
 #include <com/sun/star/text/XTextTable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextFrame_idl__
 #include <com/sun/star/text/XTextFrame.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextSection_idl__
 #include <com/sun/star/text/XTextSection.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDocumentIndexMark_idl__
 #include <com/sun/star/text/XDocumentIndexMark.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFootnote_idl__
 #include <com/sun/star/text/XFootnote.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextRanges.idl b/offapi/com/sun/star/text/TextRanges.idl
index 38ecb4c18662..31513ce52245 100644
--- a/offapi/com/sun/star/text/TextRanges.idl
+++ b/offapi/com/sun/star/text/TextRanges.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextRanges_idl__
 #define __com_sun_star_text_TextRanges_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextSection.idl b/offapi/com/sun/star/text/TextSection.idl
index b253f73868e4..d266dd0987bb 100644
--- a/offapi/com/sun/star/text/TextSection.idl
+++ b/offapi/com/sun/star/text/TextSection.idl
@@ -27,38 +27,15 @@
 #ifndef __com_sun_star_text_TextSection_idl__
 #define __com_sun_star_text_TextSection_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextSection_idl__
 #include <com/sun/star/text/XTextSection.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_text_SectionFileLink_idl__
 #include <com/sun/star/text/SectionFileLink.idl>
-#endif
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_text_XTextColumns_idl__
 #include <com/sun/star/text/XTextColumns.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 
 //=============================================================================
@@ -158,90 +135,90 @@ published service TextSection
         @see GraphicLocation
     */
     [property] com::sun::star::style::GraphicLocation BackGraphicLocation;
-    /** determins whether footnotes inside the section are displayed at the end of the
+    /** determines whether footnotes inside the section are displayed at the end of the
      section text.
     */
     [property] boolean FootnoteIsCollectAtTextEnd;
     //-------------------------------------------------------------------------
-    /** determins whether the footnotes numbering restarts within the section.
+    /** determines whether the footnotes numbering restarts within the section.
      This is only valid if <code>FootnoteIsRestartNumbering</code> is set.
     */
     [property] boolean FootnoteIsRestartNumbering;
     //-------------------------------------------------------------------------
-    /** determins at which number the footnote numbering inside of the section starts.
+    /** determines at which number the footnote numbering inside of the section starts.
      This is only valid if <code>FootnoteIsRestartNumbering</code> is set.
     */
     [property] short FootnoteRestartNumberingAt;
     //-------------------------------------------------------------------------
-    /** determins whether the footnotes within the section use an own numbering format.
+    /** determines whether the footnotes within the section use an own numbering format.
      This is only valid if <code>FootnoteIsRestartNumbering</code> is set.
     */
     [property] boolean FootnoteIsOwnNumbering;
     //-------------------------------------------------------------------------
-    /** determins the numbering type of the footnote numbering as a value of
+    /** determines the numbering type of the footnote numbering as a value of
      <type scope="com::sun::star::style">NumberingType</type>.
      This is only valid if <code>FootnoteIsOwnNumbering</code> is set.
     */
     [property] short FootnoteNumberingType;
     //-------------------------------------------------------------------------
-    /** determins the prefix that is display before the footnote number.
+    /** determines the prefix that is display before the footnote number.
      This is only valid if <code>FootnoteIsOwnNumbering</code> is set.
     */
     [property] string FootnoteNumberingPrefix;
     //-------------------------------------------------------------------------
-    /** determins the suffix that is display after of the footnote number.
+    /** determines the suffix that is display after of the footnote number.
      This is only valid if <code>FootnoteIsOwnNumbering</code> is set.
     */
     [property] string FootnoteNumberingSuffix;
     //-------------------------------------------------------------------------
-    /** determins whether endnotes inside the section are displayed at the end of the
+    /** determines whether endnotes inside the section are displayed at the end of the
      section text.
     */
     [property] boolean EndnoteIsCollectAtTextEnd;
     //-------------------------------------------------------------------------
-    /** determins whether the endnotes numbering restarts within the section.
+    /** determines whether the endnotes numbering restarts within the section.
      This is only valid if <code>EndnoteIsRestartNumbering</code> is set.
     */
     [property] boolean EndnoteIsRestartNumbering;
     //-------------------------------------------------------------------------
-    /** determins at which number the endnote numbering inside of the section starts.
+    /** determines at which number the endnote numbering inside of the section starts.
      This is only valid if <code>EndnoteIsRestartNumbering</code> is set.
     */
     [property] short EndnoteRestartNumberingAt;
     //-------------------------------------------------------------------------
-    /** determins whether the endnotes within the section use an own numbering format.
+    /** determines whether the endnotes within the section use an own numbering format.
      This is only valid if <code>EndnoteIsRestartNumbering</code> is set.
     */
     [property] boolean EndnoteIsOwnNumbering;
     //-------------------------------------------------------------------------
-    /** determins the numbering type of the endnote numbering as a value of
+    /** determines the numbering type of the endnote numbering as a value of
      <type scope="com::sun::star::style">NumberingType</type>.
      This is only valid if <code>EndoteIsOwnNumbering</code> is set.
     */
     [property] short EndnoteNumberingType;
     //-------------------------------------------------------------------------
-    /** determins the prefix that is display before the endnote number.
+    /** determines the prefix that is display before the endnote number.
      This is only valid if <code>EndnoteIsOwnNumbering</code> is set.
     */
     [property] string EndnoteNumberingPrefix;
     //-------------------------------------------------------------------------
-    /** determins the suffix that is display after the endnote number.
+    /** determines the suffix that is display after the endnote number.
      This is only valid if <code>EndnoteIsOwnNumbering</code> is set.
     */
     [property] string EndnoteNumberingSuffix;
     //-------------------------------------------------------------------------
-    /** determins if a DDE link is updated automatically.
+    /** determines if a DDE link is updated automatically.
     */
     [property] boolean IsAutomaticUpdate;
     //-------------------------------------------------------------------------
     /** allows columns to be set into the text section
     */
     [property] com::sun::star::text::XTextColumns TextColumns;
-    /** determins the left margin of the section
+    /** determines the left margin of the section
      */
     [optional, property] long SectionLeftMargin;
     //-------------------------------------------------------------------------
-    /** determins the left margin of the section
+    /** determines the left margin of the section
      */
     [optional, property] long SectionRightMargin;
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/text/TextSections.idl b/offapi/com/sun/star/text/TextSections.idl
index de333df8afeb..52f721db65e0 100644
--- a/offapi/com/sun/star/text/TextSections.idl
+++ b/offapi/com/sun/star/text/TextSections.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_TextSections_idl__
 #define __com_sun_star_text_TextSections_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextSortDescriptor.idl b/offapi/com/sun/star/text/TextSortDescriptor.idl
index 19993c5fc442..3c578eb5efc0 100644
--- a/offapi/com/sun/star/text/TextSortDescriptor.idl
+++ b/offapi/com/sun/star/text/TextSortDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_TextSortDescriptor_idl__
 #define __com_sun_star_text_TextSortDescriptor_idl__
 
-#ifndef __com_sun_star_util_SortDescriptor_idl__
 #include <com/sun/star/util/SortDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextSortDescriptor2.idl b/offapi/com/sun/star/text/TextSortDescriptor2.idl
index 1805272b368c..ea78db37d665 100644
--- a/offapi/com/sun/star/text/TextSortDescriptor2.idl
+++ b/offapi/com/sun/star/text/TextSortDescriptor2.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_text_TextSortDescriptor2_idl__
 #define __com_sun_star_text_TextSortDescriptor2_idl__
 
-#ifndef __com_sun_star_table_TableSortDescriptor2_idl__
 #include <com/sun/star/table/TableSortDescriptor2.idl>
-#endif
-#ifndef __com_sun_star_table_TableSortField_idl__
 #include <com/sun/star/table/TableSortField.idl>
-#endif
-#ifndef __com_sun_star_table_TableSortFieldType_idl__
 #include <com/sun/star/table/TableSortFieldType.idl>
-#endif
 
 
 //=============================================================================
@@ -44,7 +38,7 @@
 
 //=============================================================================
 
-/** describes sort criterias for sorting paragraphs or table contents in
+/** describes sort criteria for sorting paragraphs or table contents in
     a text document.
 
     @since OOo 1.1.2
diff --git a/offapi/com/sun/star/text/TextSortable.idl b/offapi/com/sun/star/text/TextSortable.idl
index f4c7cccc7d29..e1c2ba907bb5 100644
--- a/offapi/com/sun/star/text/TextSortable.idl
+++ b/offapi/com/sun/star/text/TextSortable.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_TextSortable_idl__
 #define __com_sun_star_util_TextSortable_idl__
 
-#ifndef __com_sun_star_text_TextSortDescriptor_idl__
 #include <com/sun/star/text/TextSortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
 #include <com/sun/star/util/XSortable.idl>
-#endif
 
 
 //=============================================================================
@@ -51,9 +46,9 @@ module com {  module sun {  module star {  module text {
  */
 published service TextSortable
 {
-        /** the properties returned by a call to the 'createSortDescriptor' method
+        /** the properties returned by a call to the "createSortDescriptor" method
             of this interfaces implementation are those of the
-            'com.sun.star.text.TextSortDescriptor' service.
+            "com.sun.star.text.TextSortDescriptor" service.
 
            @see <type scope="com::sun::star::text">TextSortDescriptor</type>
          */
diff --git a/offapi/com/sun/star/text/TextTable.idl b/offapi/com/sun/star/text/TextTable.idl
index eea848cb4f64..aac02f469e0b 100644
--- a/offapi/com/sun/star/text/TextTable.idl
+++ b/offapi/com/sun/star/text/TextTable.idl
@@ -27,59 +27,22 @@
 #ifndef __com_sun_star_text_TextTable_idl__
 #define __com_sun_star_text_TextTable_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextTable_idl__
 #include <com/sun/star/text/XTextTable.idl>
-#endif
-#ifndef __com_sun_star_text_TableColumnSeparator_idl__
 #include <com/sun/star/text/TableColumnSeparator.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-#ifndef __com_sun_star_style_BreakType_idl__
 #include <com/sun/star/style/BreakType.idl>
-#endif
-#ifndef __com_sun_star_table_ShadowFormat_idl__
 #include <com/sun/star/table/ShadowFormat.idl>
-#endif
-#ifndef __com_sun_star_table_TableBorder_idl__
 #include <com/sun/star/table/TableBorder.idl>
-#endif
-#ifndef __com_sun_star_table_XCellRange_idl__
 #include <com/sun/star/table/XCellRange.idl>
-#endif
-#ifndef __com_sun_star_table_XAutoFormattable_idl__
 #include <com/sun/star/table/XAutoFormattable.idl>
-#endif
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
 #include <com/sun/star/chart/XChartDataArray.idl>
-#endif
-#ifndef __com_sun_star_util_XSortable_idl__
 #include <com/sun/star/util/XSortable.idl>
-#endif
-#ifndef __com_sun_star_sheet_XCellRangeData_idl__
 #include <com/sun/star/sheet/XCellRangeData.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 
 //=============================================================================
@@ -139,7 +102,7 @@ published service TextTable
 
     [optional] interface com::sun::star::sheet::XCellRangeData;
 
-    /** determins the type of break that is applied at the beginning of the table.@see com.sun.star.style.BreakType
+    /** determines the type of break that is applied at the beginning of the table.@see com.sun.star.style.BreakType
      */
     [property] com::sun::star::style::BreakType BreakType;
     //-------------------------------------------------------------------------
@@ -183,40 +146,40 @@ published service TextTable
     [property] string PageDescName;
     //-------------------------------------------------------------------------
 
-    /** determins the width of the table relative to its environment.
+    /** determines the width of the table relative to its environment.
      */
     [property] short RelativeWidth;
     //-------------------------------------------------------------------------
-    /** determins if the value of the relative width is valid.
+    /** determines if the value of the relative width is valid.
      */
     [property] boolean IsWidthRelative;
     //-------------------------------------------------------------------------
 
-    /** determins if the first row of the table is repeated on every new page.
+    /** determines if the first row of the table is repeated on every new page.
      */
     [property] boolean RepeatHeadline;
         //-------------------------------------------------------------------------
-        /** determins the number of rows of the table repeated on every new page.
+        /** determines the number of rows of the table repeated on every new page.
          */
         [optional, property] long HeaderRowCount;
         //-------------------------------------------------------------------------
 
-    /** determins the type, color and size of the shadow.@see com.sun.star.table.ShadowFormat
+    /** determines the type, color and size of the shadow.@see com.sun.star.table.ShadowFormat
      */
     [property] com::sun::star::table::ShadowFormat ShadowFormat;
     //-------------------------------------------------------------------------
 
-    /** determins the top margin.
+    /** determines the top margin.
      */
     [property] long TopMargin;
     //-------------------------------------------------------------------------
 
-    /** determins the bottom margin.
+    /** determines the bottom margin.
      */
     [property] long BottomMargin;
     //-------------------------------------------------------------------------
 
-    /** determins if the background color is transparent.
+    /** determines if the background color is transparent.
      */
     [property] boolean BackTransparent;
     //-------------------------------------------------------------------------
@@ -230,13 +193,13 @@ published service TextTable
     [property] long Width;
     //-------------------------------------------------------------------------
 
-    /** determins if the first row of the table should be treated as
+    /** determines if the first row of the table should be treated as
         axis labels when a chart is to be created.
      */
     [property] boolean ChartRowAsLabel;
     //-------------------------------------------------------------------------
 
-    /** determins if the first column of the table should be treated as
+    /** determines if the first column of the table should be treated as
         axis labels when a chart is to be created.
      */
     [property] boolean ChartColumnAsLabel;
@@ -281,7 +244,7 @@ published service TextTable
 
     //-------------------------------------------------------------------------
 
-    /** determines whether borders of neighbouring table cells are
+    /** determines whether borders of neighboring table cells are
      * collapsed into one
      */
     [optional, property] boolean CollapsingBorders;
diff --git a/offapi/com/sun/star/text/TextTableCursor.idl b/offapi/com/sun/star/text/TextTableCursor.idl
index b5b108ef3a72..c69f7caf70a2 100644
--- a/offapi/com/sun/star/text/TextTableCursor.idl
+++ b/offapi/com/sun/star/text/TextTableCursor.idl
@@ -27,28 +27,13 @@
 #ifndef __com_sun_star_text_TextTableCursor_idl__
 #define __com_sun_star_text_TextTableCursor_idl__
 
-#ifndef __com_sun_star_text_XTextTableCursor_idl__
 #include <com/sun/star/text/XTextTableCursor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterProperties_idl__
 #include <com/sun/star/style/CharacterProperties.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
 #include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
 #include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributesSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextTableRow.idl b/offapi/com/sun/star/text/TextTableRow.idl
index b1eca1467b89..79cc8e933575 100644
--- a/offapi/com/sun/star/text/TextTableRow.idl
+++ b/offapi/com/sun/star/text/TextTableRow.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_text_TextTableRow_idl__
 #define __com_sun_star_text_TextTableRow_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
-#endif
-
-#ifndef __com_sun_star_text_TableColumnSeparator_idl__
 #include <com/sun/star/text/TableColumnSeparator.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextTables.idl b/offapi/com/sun/star/text/TextTables.idl
index 55daffa1a074..1af924802b2e 100644
--- a/offapi/com/sun/star/text/TextTables.idl
+++ b/offapi/com/sun/star/text/TextTables.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_TextTables_idl__
 #define __com_sun_star_text_TextTables_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextViewCursor.idl b/offapi/com/sun/star/text/TextViewCursor.idl
index 119d13cf78c1..3224c8f219cb 100644
--- a/offapi/com/sun/star/text/TextViewCursor.idl
+++ b/offapi/com/sun/star/text/TextViewCursor.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_TextViewCursor_idl__
 #define __com_sun_star_text_TextViewCursor_idl__
 
-#ifndef __com_sun_star_text_TextLayoutCursor_idl__
 #include <com/sun/star/text/TextLayoutCursor.idl>
-#endif
-
-#ifndef __com_sun_star_view_XScreenCursor_idl__
 #include <com/sun/star/view/XScreenCursor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/UserDefinedIndex.idl b/offapi/com/sun/star/text/UserDefinedIndex.idl
index 95da34ddeaaa..950a0e9b9e7b 100644
--- a/offapi/com/sun/star/text/UserDefinedIndex.idl
+++ b/offapi/com/sun/star/text/UserDefinedIndex.idl
@@ -30,9 +30,7 @@
 #define __com_sun_star_text_UserDefinedIndex_idl__
 
 #include <com/sun/star/text/BaseIndex.idl>
-#ifndef __com_sun_star_text_XDocumentIndexMark_idl__
 #include <com/sun/star/text/XDocumentIndexMark.idl>
-#endif
 
 //=============================================================================
 
@@ -52,27 +50,27 @@ published service UserDefinedIndex
      */
     [optional, property] com::sun::star::container::XIndexReplace LevelParagraphStyles;
 
-    /** determins if the document index marks are included in this index.
+    /** determines if the document index marks are included in this index.
      */
     [optional, property] boolean CreateFromMarks;
 
-    /** determins if the outline level of the location of the indexed object is
+    /** determines if the outline level of the location of the indexed object is
      used as index level of the index entry.*/
     [optional, property] boolean UseLevelFromSource;
 
-    /** determins if tables are included in the index.
+    /** determines if tables are included in the index.
      */
     [optional, property] boolean CreateFromTables;
 
-    /** determins if text frames are included in the index.
+    /** determines if text frames are included in the index.
      */
     [optional, property] boolean CreateFromTextFrames;
 
-    /** determins if graphic objects are included in the index.
+    /** determines if graphic objects are included in the index.
      */
     [optional, property] boolean CreateFromGraphicObjects;
 
-    /** determins if embedded objects are included in the index.
+    /** determines if embedded objects are included in the index.
      */
     [optional, property] boolean CreateFromEmbeddedObjects;
 
diff --git a/offapi/com/sun/star/text/UserIndex.idl b/offapi/com/sun/star/text/UserIndex.idl
index e284251122a2..313ecc0c0f44 100644
--- a/offapi/com/sun/star/text/UserIndex.idl
+++ b/offapi/com/sun/star/text/UserIndex.idl
@@ -48,27 +48,27 @@ published service UserIndex
      */
     [optional, property] com::sun::star::container::XIndexReplace LevelParagraphStyles;
 
-    /** determins if the document index marks are included in this index.
+    /** determines if the document index marks are included in this index.
      */
     [optional, property] boolean CreateFromMarks;
 
-    /** determins if the outline level of the location of the indexed object is
+    /** determines if the outline level of the location of the indexed object is
      used as index level of the index entry.*/
     [optional, property] boolean UseLevelFromSource;
 
-    /** determins if tables are included in the index.
+    /** determines if tables are included in the index.
      */
     [optional, property] boolean CreateFromTables;
 
-    /** determins if text frames are included in the index.
+    /** determines if text frames are included in the index.
      */
     [optional, property] boolean CreateFromTextFrames;
 
-    /** determins if graphic objects are included in the index.
+    /** determines if graphic objects are included in the index.
      */
     [optional, property] boolean CreateFromGraphicObjects;
 
-    /** determins if embedded objects are included in the index.
+    /** determines if embedded objects are included in the index.
      */
     [optional, property] boolean CreateFromEmbeddedObjects;
     /** contains the name of the user index.
diff --git a/offapi/com/sun/star/text/UserIndexMark.idl b/offapi/com/sun/star/text/UserIndexMark.idl
index 140adc1487ed..5ac9f3a9c70b 100644
--- a/offapi/com/sun/star/text/UserIndexMark.idl
+++ b/offapi/com/sun/star/text/UserIndexMark.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_UserIndexMark_idl__
 #define __com_sun_star_text_UserIndexMark_idl__
 
-#ifndef __com_sun_star_text_TextContent_idl__
 #include <com/sun/star/text/TextContent.idl>
-#endif
-#ifndef __com_sun_star_text_BaseIndexMark_idl__
 #include <com/sun/star/text/BaseIndexMark.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/ViewSettings.idl b/offapi/com/sun/star/text/ViewSettings.idl
index 102ab0c1dc1c..3ffa73d17a66 100644
--- a/offapi/com/sun/star/text/ViewSettings.idl
+++ b/offapi/com/sun/star/text/ViewSettings.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_text_ViewSettings_idl__
 #define __com_sun_star_text_ViewSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_view_DocumentZoomType_idl__
 #include <com/sun/star/view/DocumentZoomType.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -97,7 +91,7 @@ published service ViewSettings
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: property com::sun::star::text::ViewSettings::ShowHiddenParagraphs
-    /** If this property is <TRUE/>, hidden paragraghs are displayed.
+    /** If this property is <TRUE/>, hidden paragraphs are displayed.
      */
     [property] boolean ShowHiddenParagraphs;
 
@@ -329,7 +323,7 @@ published service ViewSettings
      */
     [optional, property] boolean ShowHiddenCharacters;
     //-------------------------------------------------------------------------
-    /** If this proeperty is <TRUE/>, the settings of nonprinting characters are applied.
+    /** If this property is <TRUE/>, the settings of non-printing characters are applied.
 
         <p>This option controls the use of the settings ShowHiddenCharacters,
         ShowTabstops, ShowSpaces, ShowBreaks and ShowParaBreaks </p>
diff --git a/offapi/com/sun/star/text/WebDocument.idl b/offapi/com/sun/star/text/WebDocument.idl
index fd4f1b66aef6..4570ecd81051 100644
--- a/offapi/com/sun/star/text/WebDocument.idl
+++ b/offapi/com/sun/star/text/WebDocument.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_WebDocument_idl__
 #define __com_sun_star_text_WebDocument_idl__
 
-#ifndef __com_sun_star_text_GenericTextDocument_idl__
 #include <com/sun/star/text/GenericTextDocument.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/WritingMode2.idl b/offapi/com/sun/star/text/WritingMode2.idl
index a74dff328ba8..6ea8edbc5316 100644
--- a/offapi/com/sun/star/text/WritingMode2.idl
+++ b/offapi/com/sun/star/text/WritingMode2.idl
@@ -71,7 +71,7 @@ published constants WritingMode2
     //-------------------------------------------------------------------------
 
     /** text within a line is written top-to-bottom. Lines and blocks are
-        placed left-ro-right.
+        placed left-to-right.
         <p>
         Typically, this writing mode is used in Mongolian text.
      */
diff --git a/offapi/com/sun/star/text/XAutoTextContainer.idl b/offapi/com/sun/star/text/XAutoTextContainer.idl
index 9f091683c014..bbdc80abf75c 100644
--- a/offapi/com/sun/star/text/XAutoTextContainer.idl
+++ b/offapi/com/sun/star/text/XAutoTextContainer.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_text_XAutoTextContainer_idl__
 #define __com_sun_star_text_XAutoTextContainer_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
-#ifndef __com_sun_star_text_XAutoTextGroup_idl__
 #include <com/sun/star/text/XAutoTextGroup.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XAutoTextEntry.idl b/offapi/com/sun/star/text/XAutoTextEntry.idl
index 89178464a4f4..93e31d60cad2 100644
--- a/offapi/com/sun/star/text/XAutoTextEntry.idl
+++ b/offapi/com/sun/star/text/XAutoTextEntry.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XAutoTextEntry_idl__
 #define __com_sun_star_text_XAutoTextEntry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XAutoTextGroup.idl b/offapi/com/sun/star/text/XAutoTextGroup.idl
index b9f33cb71fb8..ff448855d922 100644
--- a/offapi/com/sun/star/text/XAutoTextGroup.idl
+++ b/offapi/com/sun/star/text/XAutoTextGroup.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_text_XAutoTextGroup_idl__
 #define __com_sun_star_text_XAutoTextGroup_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
-#ifndef __com_sun_star_text_XAutoTextEntry_idl__
 #include <com/sun/star/text/XAutoTextEntry.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XBookmarkInsertTool.idl b/offapi/com/sun/star/text/XBookmarkInsertTool.idl
index c519407336ee..23513c442bd7 100644
--- a/offapi/com/sun/star/text/XBookmarkInsertTool.idl
+++ b/offapi/com/sun/star/text/XBookmarkInsertTool.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_text_XBookmarkInsertTool_idl__
 #define __com_sun_star_text_XBookmarkInsertTool_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XBookmarksSupplier.idl b/offapi/com/sun/star/text/XBookmarksSupplier.idl
index 46b841bfa649..1345fab7b811 100644
--- a/offapi/com/sun/star/text/XBookmarksSupplier.idl
+++ b/offapi/com/sun/star/text/XBookmarksSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XBookmarksSupplier_idl__
 #define __com_sun_star_text_XBookmarksSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XChapterNumberingSupplier.idl b/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
index de7ced8fa668..8cd9dea9455e 100644
--- a/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
+++ b/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__
 #define __com_sun_star_text_XChapterNumberingSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XDefaultNumberingProvider.idl b/offapi/com/sun/star/text/XDefaultNumberingProvider.idl
index 354d79d882c8..cce947fa9f8f 100644
--- a/offapi/com/sun/star/text/XDefaultNumberingProvider.idl
+++ b/offapi/com/sun/star/text/XDefaultNumberingProvider.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_text_XDefaultNumberingProvider_idl__
 #define __com_sun_star_text_XDefaultNumberingProvider_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
 
 module com { module sun { module star { module text {
 
diff --git a/offapi/com/sun/star/text/XDependentTextField.idl b/offapi/com/sun/star/text/XDependentTextField.idl
index 3b659669a2ea..6d3f8f319742 100644
--- a/offapi/com/sun/star/text/XDependentTextField.idl
+++ b/offapi/com/sun/star/text/XDependentTextField.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_text_XDependentTextField_idl__
 #define __com_sun_star_text_XDependentTextField_idl__
 
-#ifndef __com_sun_star_text_XTextField_idl__
 #include <com/sun/star/text/XTextField.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XDocumentIndex.idl b/offapi/com/sun/star/text/XDocumentIndex.idl
index eda4fa42dfb9..2cc73f5a9bd4 100644
--- a/offapi/com/sun/star/text/XDocumentIndex.idl
+++ b/offapi/com/sun/star/text/XDocumentIndex.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XDocumentIndex_idl__
 #define __com_sun_star_text_XDocumentIndex_idl__
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
 
 
 //=============================================================================
@@ -69,7 +67,7 @@ published interface XDocumentIndex: com::sun::star::text::XTextContent
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::text::XDocumentIndex::update
-    /** initiates an upate to the document index.
+    /** initiates an update to the document index.
      */
     void update();
 
diff --git a/offapi/com/sun/star/text/XDocumentIndexMark.idl b/offapi/com/sun/star/text/XDocumentIndexMark.idl
index d643eb15cd39..96d83dec792b 100644
--- a/offapi/com/sun/star/text/XDocumentIndexMark.idl
+++ b/offapi/com/sun/star/text/XDocumentIndexMark.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XDocumentIndexMark_idl__
 #define __com_sun_star_text_XDocumentIndexMark_idl__
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl b/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
index 6005771299b8..65a4ed4f5c55 100644
--- a/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
+++ b/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XDocumentIndexesSupplier_idl__
 #define __com_sun_star_text_XDocumentIndexesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl b/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
index 51bb77195aae..ba05e346dcc3 100644
--- a/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
+++ b/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XEndnotesSettingsSupplier_idl__
 #define __com_sun_star_text_XEndnotesSettingsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XEndnotesSupplier.idl b/offapi/com/sun/star/text/XEndnotesSupplier.idl
index 62d962aa6573..8ecbb976e8fc 100644
--- a/offapi/com/sun/star/text/XEndnotesSupplier.idl
+++ b/offapi/com/sun/star/text/XEndnotesSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_text_XEndnotesSupplier_idl__
 #define __com_sun_star_text_XEndnotesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XFlatParagraph.idl b/offapi/com/sun/star/text/XFlatParagraph.idl
index d9e5143a860f..d9cb0b91ddaf 100644
--- a/offapi/com/sun/star/text/XFlatParagraph.idl
+++ b/offapi/com/sun/star/text/XFlatParagraph.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_text_XFlatParagraph_idl__
 #define __com_sun_star_text_XFlatParagraph_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextMarkup_idl__
 #include <com/sun/star/text/XTextMarkup.idl>
-#endif
 
 //=============================================================================
 
@@ -80,8 +66,8 @@ interface XFlatParagraph: com::sun::star::text::XTextMarkup
     boolean isModified();
 
     //-------------------------------------------------------------------------
-    /** change the 'checked' flag of the respective text node, i.e., mark the
-        text node as 'processed'
+    /** change the "checked" flag of the respective text node, i.e., mark the
+        text node as "processed"
 
         @param nType
                 type, see <type>TextMarkupType</type>.
diff --git a/offapi/com/sun/star/text/XFlatParagraphIterator.idl b/offapi/com/sun/star/text/XFlatParagraphIterator.idl
index dd90fe398cb8..854eb8be26b6 100644
--- a/offapi/com/sun/star/text/XFlatParagraphIterator.idl
+++ b/offapi/com/sun/star/text/XFlatParagraphIterator.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_text_XFlatParagraphIterator_idl__
 #define __com_sun_star_text_XFlatParagraphIterator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraph_idl__
 #include <com/sun/star/text/XFlatParagraph.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl b/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
index b57187603548..30f02341c42e 100644
--- a/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
+++ b/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_text_XFlatParagraphIteratorProvider_idl__
 #define __com_sun_star_text_XFlatParagraphIteratorProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFlatParagraphIterator_idl__
 #include <com/sun/star/text/XFlatParagraphIterator.idl>
-#endif
 
 //---------------------------------------Note----------------------------------
 //    allows for different iterators for grammar checking and smart tags,
diff --git a/offapi/com/sun/star/text/XFootnote.idl b/offapi/com/sun/star/text/XFootnote.idl
index dc01b8955cf1..e1d052e87f2e 100644
--- a/offapi/com/sun/star/text/XFootnote.idl
+++ b/offapi/com/sun/star/text/XFootnote.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XFootnote_idl__
 #define __com_sun_star_text_XFootnote_idl__
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl b/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
index 41b68e586903..34450cf21eff 100644
--- a/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
+++ b/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XFootnotesSettingsSupplier_idl__
 #define __com_sun_star_text_XFootnotesSettingsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XFootnotesSupplier.idl b/offapi/com/sun/star/text/XFootnotesSupplier.idl
index 91630c7275df..f477d06d6526 100644
--- a/offapi/com/sun/star/text/XFootnotesSupplier.idl
+++ b/offapi/com/sun/star/text/XFootnotesSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_text_XFootnotesSupplier_idl__
 #define __com_sun_star_text_XFootnotesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XHeaderFooter.idl b/offapi/com/sun/star/text/XHeaderFooter.idl
index 048e32cc8118..05af56cb8fc3 100644
--- a/offapi/com/sun/star/text/XHeaderFooter.idl
+++ b/offapi/com/sun/star/text/XHeaderFooter.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_XHeaderFooter_idl__
 #define __com_sun_star_text_XHeaderFooter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl b/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
index 8cd1479f5df1..84e8108f826e 100644
--- a/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
+++ b/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_XHeaderFooterPageStyle_idl__
 #define __com_sun_star_text_XHeaderFooterPageStyle_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XHeaderFooter_idl__
 #include <com/sun/star/text/XHeaderFooter.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XLineNumberingProperties.idl b/offapi/com/sun/star/text/XLineNumberingProperties.idl
index af52294119a0..c07db262147b 100644
--- a/offapi/com/sun/star/text/XLineNumberingProperties.idl
+++ b/offapi/com/sun/star/text/XLineNumberingProperties.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_XLineNumberingProperties_idl__
 #define __com_sun_star_text_XLineNumberingProperties_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XLineNumberingSupplier.idl b/offapi/com/sun/star/text/XLineNumberingSupplier.idl
index e12b433a5572..bb1a815b88e8 100644
--- a/offapi/com/sun/star/text/XLineNumberingSupplier.idl
+++ b/offapi/com/sun/star/text/XLineNumberingSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XLineNumberingSupplier_idl__
 #define __com_sun_star_text_XLineNumberingSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XMailMergeBroadcaster.idl b/offapi/com/sun/star/text/XMailMergeBroadcaster.idl
index a4a0d0aa1192..e1c57f0db092 100644
--- a/offapi/com/sun/star/text/XMailMergeBroadcaster.idl
+++ b/offapi/com/sun/star/text/XMailMergeBroadcaster.idl
@@ -28,12 +28,8 @@
 #define __com_sun_star_text_XMailMergeBroadcaster_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_text_XMailMergeListener_idl__
 #include <com/sun/star/text/XMailMergeListener.idl>
-#endif
 
 //module com { module sun { module star { module text {
 //     published interface XMailMergeListener;
diff --git a/offapi/com/sun/star/text/XMailMergeListener.idl b/offapi/com/sun/star/text/XMailMergeListener.idl
index 1bc0a85a4504..24705e14b8e7 100644
--- a/offapi/com/sun/star/text/XMailMergeListener.idl
+++ b/offapi/com/sun/star/text/XMailMergeListener.idl
@@ -28,12 +28,8 @@
 #define __com_sun_star_text_XMailMergeListener_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_text_MailMergeEvent_idl__
 #include <com/sun/star/text/MailMergeEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XModule.idl b/offapi/com/sun/star/text/XModule.idl
index 49d0d38085b9..3a249db3e7e9 100644
--- a/offapi/com/sun/star/text/XModule.idl
+++ b/offapi/com/sun/star/text/XModule.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XModule_idl__
 #define __com_sun_star_text_XModule_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XMultiTextMarkup.idl b/offapi/com/sun/star/text/XMultiTextMarkup.idl
index 27fdefb0472e..33cfa2ba830c 100644
--- a/offapi/com/sun/star/text/XMultiTextMarkup.idl
+++ b/offapi/com/sun/star/text/XMultiTextMarkup.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_text_XMultiTextMarkup_idl__
 #define __com_sun_star_text_XMultiTextMarkup_idl__
 
-#ifndef __com_sun_star_container_XStringKeyMap_idl__
 #include <com/sun/star/container/XStringKeyMap.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextMarkupDescriptor_idl__
 #include <com/sun/star/text/TextMarkupDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XNumberingFormatter.idl b/offapi/com/sun/star/text/XNumberingFormatter.idl
index 2b86fc6b24c0..5f0a56b93334 100644
--- a/offapi/com/sun/star/text/XNumberingFormatter.idl
+++ b/offapi/com/sun/star/text/XNumberingFormatter.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_text_XNumberingFormatter_idl__
 #define __com_sun_star_text_XNumberingFormatter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 module com { module sun { module star { module text {
 /**
diff --git a/offapi/com/sun/star/text/XNumberingRulesSupplier.idl b/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
index 818533169c2e..7585d1bdca1d 100644
--- a/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
+++ b/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_XNumberingRulesSupplier_idl__
 #define __com_sun_star_text_XNumberingRulesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XNumberingTypeInfo.idl b/offapi/com/sun/star/text/XNumberingTypeInfo.idl
index c2705268915f..49d02f5edf90 100644
--- a/offapi/com/sun/star/text/XNumberingTypeInfo.idl
+++ b/offapi/com/sun/star/text/XNumberingTypeInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XNumberingTypeInfo_idl__
 #define __com_sun_star_text_XNumberingTypeInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module text {
 
@@ -50,10 +48,10 @@ published interface XNumberingTypeInfo : com::sun::star::uno::XInterface
     /** returns the corresponding numbering type to an identifier.
     */
     short   getNumberingType([in]string NumberingIdentifier);
-    /** determins whether an identifier is supported.
+    /** determines whether an identifier is supported.
     */
     boolean hasNumberingType([in]string NumberingIdentifier);
-    /** returns the corresponding identifiert to a numbering type.
+    /** returns the corresponding identifier to a numbering type.
     */
     string  getNumberingIdentifier([in]short NumberingType);
 };
diff --git a/offapi/com/sun/star/text/XPageCursor.idl b/offapi/com/sun/star/text/XPageCursor.idl
index 1cfc0dbcfa8c..d1c03cd046eb 100644
--- a/offapi/com/sun/star/text/XPageCursor.idl
+++ b/offapi/com/sun/star/text/XPageCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XPageCursor_idl__
 #define __com_sun_star_text_XPageCursor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XPagePrintable.idl b/offapi/com/sun/star/text/XPagePrintable.idl
index 7a590613ec8a..876790e537ed 100644
--- a/offapi/com/sun/star/text/XPagePrintable.idl
+++ b/offapi/com/sun/star/text/XPagePrintable.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_XPagePrintable_idl__
 #define __com_sun_star_text_XPagePrintable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
@@ -64,7 +56,7 @@ published interface XPagePrintable: com::sun::star::uno::XInterface
                 <LI><P>long BottomMargin - bottom margin of the page</P>
                 <LI><P>long HoriMargin  - margin between rows of pages</P>
                 <LI><P>long VertMargin  - margin between columns of pages</P>
-                <LI><P>boolean IsLandscape - determins if the output page is printed in landscape format</P>
+                <LI><P>boolean IsLandscape - determines if the output page is printed in landscape format</P>
             </UL>
              </p>
      */
@@ -79,7 +71,7 @@ published interface XPagePrintable: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::text::XPagePrintable::printPages
-    /** prints the pages according to the <typ>PagePrintSettings</type>.
+    /** prints the pages according to the <type>PagePrintSettings</type>.
 
     @see com::sun::star::view::PrintOptions
      */
diff --git a/offapi/com/sun/star/text/XParagraphAppend.idl b/offapi/com/sun/star/text/XParagraphAppend.idl
index 60d41b489693..040c83a12d4e 100644
--- a/offapi/com/sun/star/text/XParagraphAppend.idl
+++ b/offapi/com/sun/star/text/XParagraphAppend.idl
@@ -27,25 +27,13 @@
 #ifndef __com_sun_star_text_XParagraphAppend_idl__
 #define __com_sun_star_text_XParagraphAppend_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
 
 //=============================================================================
 
@@ -73,7 +61,7 @@ interface XParagraphAppend : com::sun::star::uno::XInterface
                                        com::sun::star::beans::UnknownPropertyException );
          /** appends a new and empty paragraph at the end of the text.
 
-                <p>The properties are applied to the last paragraph before the new pargraph is inserted.
+                <p>The properties are applied to the last paragraph before the new paragraph is inserted.
                 </p>
 
         @param
diff --git a/offapi/com/sun/star/text/XParagraphCursor.idl b/offapi/com/sun/star/text/XParagraphCursor.idl
index 7e83557674f2..0865de948c93 100644
--- a/offapi/com/sun/star/text/XParagraphCursor.idl
+++ b/offapi/com/sun/star/text/XParagraphCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XParagraphCursor_idl__
 #define __com_sun_star_text_XParagraphCursor_idl__
 
-#ifndef __com_sun_star_text_XTextCursor_idl__
 #include <com/sun/star/text/XTextCursor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XRedline.idl b/offapi/com/sun/star/text/XRedline.idl
index e11607871f21..e2cb1af6cfa7 100644
--- a/offapi/com/sun/star/text/XRedline.idl
+++ b/offapi/com/sun/star/text/XRedline.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_XRedline_idl__
 #define __com_sun_star_text_XRedline_idl__
 
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XReferenceMarksSupplier.idl b/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
index dae6f4963e14..9f015819ce3e 100644
--- a/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
+++ b/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__
 #define __com_sun_star_text_XReferenceMarksSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XRelativeTextContentInsert.idl b/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
index 9272ad9281d2..b4a74684704b 100644
--- a/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
+++ b/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_XRelativeTextContentInsert_idl__
 #define __com_sun_star_text_XRelativeTextContentInsert_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -71,7 +67,7 @@ published interface XRelativeTextContentInsert: com::sun::star::uno::XInterface
     // DocMerge from xml: method com::sun::star::text::XRelativeTextContentInsert::insertTextContentAfter
     /** inserts text the new text content after the predecessor argument.
 
-        <p> This is helpful to insert paragraphs after text tables escpecially in
+        <p> This is helpful to insert paragraphs after text tables especially in
         headers, footers or text frames. </p>
      */
     void insertTextContentAfter(
diff --git a/offapi/com/sun/star/text/XRelativeTextContentRemove.idl b/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
index da108323613f..e9450dd3780c 100644
--- a/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
+++ b/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_XRelativeTextContentRemove_idl__
 #define __com_sun_star_text_XRelativeTextContentRemove_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -57,7 +53,7 @@ published interface XRelativeTextContentRemove: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: method com::sun::star::text::XRelativeTextContentRemove::removeTextContentBefore
-    /** removes the text content that preceeds the argument.
+    /** removes the text content that precedes the argument.
 
         <p> This is helpful to remove empty paragraphs before text tables. </p>
      */
@@ -69,7 +65,7 @@ published interface XRelativeTextContentRemove: com::sun::star::uno::XInterface
     // DocMerge from xml: method com::sun::star::text::XRelativeTextContentRemove::removeTextContentAfter
     /** removes the text content that follows the argument.
 
-        <p> This is helpful to remove empty paragraphs followin text tables espacially in
+        <p> This is helpful to remove empty paragraphs following text tables especially in
         headers, footers or text frames. </p>
      */
     void removeTextContentAfter(
diff --git a/offapi/com/sun/star/text/XRubySelection.idl b/offapi/com/sun/star/text/XRubySelection.idl
index 156f501ec4ba..e583f93045ec 100644
--- a/offapi/com/sun/star/text/XRubySelection.idl
+++ b/offapi/com/sun/star/text/XRubySelection.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_text_XRubySelection_idl__
 #define __com_sun_star_text_XRubySelection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/text/XSentenceCursor.idl b/offapi/com/sun/star/text/XSentenceCursor.idl
index af9534972b69..e10f24680704 100644
--- a/offapi/com/sun/star/text/XSentenceCursor.idl
+++ b/offapi/com/sun/star/text/XSentenceCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XSentenceCursor_idl__
 #define __com_sun_star_text_XSentenceCursor_idl__
 
-#ifndef __com_sun_star_text_XTextCursor_idl__
 #include <com/sun/star/text/XTextCursor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XSimpleText.idl b/offapi/com/sun/star/text/XSimpleText.idl
index f39c8ab334ab..24a7f245c46e 100644
--- a/offapi/com/sun/star/text/XSimpleText.idl
+++ b/offapi/com/sun/star/text/XSimpleText.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_text_XSimpleText_idl__
 #define __com_sun_star_text_XSimplText_idl__
 
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextCursor_idl__
 #include <com/sun/star/text/XTextCursor.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XText.idl b/offapi/com/sun/star/text/XText.idl
index f0eee780802f..622345ed5924 100644
--- a/offapi/com/sun/star/text/XText.idl
+++ b/offapi/com/sun/star/text/XText.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_text_XText_idl__
 #define __com_sun_star_text_XText_idl__
 
-#ifndef __com_sun_star_text_XSimpleText_idl__
 #include <com/sun/star/text/XSimpleText.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextCursor_idl__
 #include <com/sun/star/text/XTextCursor.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextAppend.idl b/offapi/com/sun/star/text/XTextAppend.idl
index 8e562fcf4ab3..14137136143b 100644
--- a/offapi/com/sun/star/text/XTextAppend.idl
+++ b/offapi/com/sun/star/text/XTextAppend.idl
@@ -28,15 +28,9 @@
 #define __com_sun_star_text_XTextAppend_idl__
 
 
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
-#ifndef __com_sun_star_text_XTextPortionAppend_idl__
 #include <com/sun/star/text/XTextPortionAppend.idl>
-#endif
-#ifndef __com_sun_star_text_XParagraphAppend_idl__
 #include <com/sun/star/text/XParagraphAppend.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XTextAppendAndConvert.idl b/offapi/com/sun/star/text/XTextAppendAndConvert.idl
index 48869f4303f8..1184a4750588 100644
--- a/offapi/com/sun/star/text/XTextAppendAndConvert.idl
+++ b/offapi/com/sun/star/text/XTextAppendAndConvert.idl
@@ -28,15 +28,9 @@
 #define __com_sun_star_text_XTextAppendAndConvert_idl__
 
 
-#ifndef __com_sun_star_text_XTextAppend_idl__
 #include <com/sun/star/text/XTextAppend.idl>
-#endif
-#ifndef __com_sun_star_text_XTextContentAppend_idl__
 #include <com/sun/star/text/XTextContentAppend.idl>
-#endif
-#ifndef __com_sun_star_text_XTextConvert_idl__
 #include <com/sun/star/text/XTextConvert.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XTextColumns.idl b/offapi/com/sun/star/text/XTextColumns.idl
index 8afc1c2cfceb..760bfc0e6be2 100644
--- a/offapi/com/sun/star/text/XTextColumns.idl
+++ b/offapi/com/sun/star/text/XTextColumns.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextColumns_idl__
 #define __com_sun_star_text_XTextColumns_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_text_TextColumn_idl__
 #include <com/sun/star/text/TextColumn.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextContent.idl b/offapi/com/sun/star/text/XTextContent.idl
index 70b6a0be9f13..7166d9b7af1a 100644
--- a/offapi/com/sun/star/text/XTextContent.idl
+++ b/offapi/com/sun/star/text/XTextContent.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_XTextContent_idl__
 #define __com_sun_star_text_XTextContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
@@ -69,7 +61,7 @@ published interface XTextContent: com::sun::star::lang::XComponent
         </p>
         <p>Both text objects and text content objects may only be connected
         to each other if they are created by the same component. When
-        implementing new components, this behaviour is deprecated.</p>
+        implementing new components, this behavior is deprecated.</p>
      */
     void attach( [in] com::sun::star::text::XTextRange xTextRange )
             raises( com::sun::star::lang::IllegalArgumentException );
diff --git a/offapi/com/sun/star/text/XTextContentAppend.idl b/offapi/com/sun/star/text/XTextContentAppend.idl
index 472e922a80f1..8a32527ebf79 100644
--- a/offapi/com/sun/star/text/XTextContentAppend.idl
+++ b/offapi/com/sun/star/text/XTextContentAppend.idl
@@ -27,25 +27,12 @@
 #ifndef __com_sun_star_text_XTextContentAppend_idl__
 #define __com_sun_star_text_XTextContentAppend_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XTextConvert.idl b/offapi/com/sun/star/text/XTextConvert.idl
index d80f7fec9305..4a118209f677 100644
--- a/offapi/com/sun/star/text/XTextConvert.idl
+++ b/offapi/com/sun/star/text/XTextConvert.idl
@@ -27,31 +27,14 @@
 #ifndef __com_sun_star_text_XTextConvert_idl__
 #define __com_sun_star_text_XTextConvert_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
-#ifndef __com_sun_star_text_XTextTable_idl__
 #include <com/sun/star/text/XTextTable.idl>
-#endif
 
 
 
@@ -90,7 +73,7 @@ interface XTextConvert : com::sun::star::uno::XInterface
 
 
         @param TableRanges contains the TextRange interfaces of the paragraphs, cells and rows of the table.
-            <p>The innter sequence contains the start and end paragraphs of each table cell.
+            <p>The inner sequence contains the start and end paragraphs of each table cell.
             The next sequence groups the cells to a row and the outer sequence groups the rows of the table.</p>
 
         @param CellProperties contains the properties of each cell.
diff --git a/offapi/com/sun/star/text/XTextCopy.idl b/offapi/com/sun/star/text/XTextCopy.idl
index 5e1d91e5e82d..af3a6aa3c0ec 100644
--- a/offapi/com/sun/star/text/XTextCopy.idl
+++ b/offapi/com/sun/star/text/XTextCopy.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XText_idl__
 #define __com_sun_star_text_XText_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XTextCursor.idl b/offapi/com/sun/star/text/XTextCursor.idl
index eda255e16ea5..f716f6a8d4c6 100644
--- a/offapi/com/sun/star/text/XTextCursor.idl
+++ b/offapi/com/sun/star/text/XTextCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XTextCursor_idl__
 #define __com_sun_star_text_XTextCursor_idl__
 
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextDocument.idl b/offapi/com/sun/star/text/XTextDocument.idl
index c1d8d04ed4ce..536285d8120e 100644
--- a/offapi/com/sun/star/text/XTextDocument.idl
+++ b/offapi/com/sun/star/text/XTextDocument.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextDocument_idl__
 #define __com_sun_star_text_XTextDocument_idl__
 
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
 
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextEmbeddedObject.idl b/offapi/com/sun/star/text/XTextEmbeddedObject.idl
index c11d16f22969..f83d3ccde96e 100644
--- a/offapi/com/sun/star/text/XTextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/XTextEmbeddedObject.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextEmbeddedObject_idl__
 #define __com_sun_star_text_XTextEmbeddedObject_idl__
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl b/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
index 93c12aa1ad2d..6f5146acb3a4 100644
--- a/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__
 #define __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextField.idl b/offapi/com/sun/star/text/XTextField.idl
index 08060bef9d61..55a3d73479bd 100644
--- a/offapi/com/sun/star/text/XTextField.idl
+++ b/offapi/com/sun/star/text/XTextField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XTextField_idl__
 #define __com_sun_star_text_XTextField_idl__
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextFieldsSupplier.idl b/offapi/com/sun/star/text/XTextFieldsSupplier.idl
index 14f0fc79569c..97e49f880a4e 100644
--- a/offapi/com/sun/star/text/XTextFieldsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextFieldsSupplier.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_text_XTextFieldsSupplier_idl__
 #define __com_sun_star_text_XTextFieldsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextFrame.idl b/offapi/com/sun/star/text/XTextFrame.idl
index 0435e60cb86c..0c7772d96ede 100644
--- a/offapi/com/sun/star/text/XTextFrame.idl
+++ b/offapi/com/sun/star/text/XTextFrame.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_text_XTextFrame_idl__
 #define __com_sun_star_text_XTextFrame_idl__
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextFramesSupplier.idl b/offapi/com/sun/star/text/XTextFramesSupplier.idl
index ae7b3bf65f1e..a6120f70e6ec 100644
--- a/offapi/com/sun/star/text/XTextFramesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextFramesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextFramesSupplier_idl__
 #define __com_sun_star_text_XTextFramesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl b/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
index 5320f80e1b48..9123f2ae8958 100644
--- a/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__
 #define __com_sun_star_text_XTextGraphicObjectsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextMarkup.idl b/offapi/com/sun/star/text/XTextMarkup.idl
index 877e31c7377f..8a9bc4e4140a 100644
--- a/offapi/com/sun/star/text/XTextMarkup.idl
+++ b/offapi/com/sun/star/text/XTextMarkup.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_text_XTextMarkup_idl__
 #define __com_sun_star_text_XTextMarkup_idl__
 
-#ifndef __com_sun_star_container_XStringKeyMap_idl__
 #include <com/sun/star/container/XStringKeyMap.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextMarkupType_idl__
 #include <com/sun/star/text/TextMarkupType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XTextPortionAppend.idl b/offapi/com/sun/star/text/XTextPortionAppend.idl
index 84b121163e72..a09b167cd94d 100644
--- a/offapi/com/sun/star/text/XTextPortionAppend.idl
+++ b/offapi/com/sun/star/text/XTextPortionAppend.idl
@@ -27,25 +27,12 @@
 #ifndef __com_sun_star_text_XTextPortionAppend_idl__
 #define __com_sun_star_text_XTextPortionAppend_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XTextRange.idl b/offapi/com/sun/star/text/XTextRange.idl
index 58a59b33b09e..34cacc306190 100644
--- a/offapi/com/sun/star/text/XTextRange.idl
+++ b/offapi/com/sun/star/text/XTextRange.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XTextRange_idl__
 #define __com_sun_star_text_XTextRange_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XTextRangeCompare.idl b/offapi/com/sun/star/text/XTextRangeCompare.idl
index 5f15feab1905..7d87a18c2619 100644
--- a/offapi/com/sun/star/text/XTextRangeCompare.idl
+++ b/offapi/com/sun/star/text/XTextRangeCompare.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextRangeCompare_idl__
 #define __com_sun_star_text_XTextRangeCompare_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/text/XTextRangeMover.idl b/offapi/com/sun/star/text/XTextRangeMover.idl
index 59381de38854..0220e01aea04 100644
--- a/offapi/com/sun/star/text/XTextRangeMover.idl
+++ b/offapi/com/sun/star/text/XTextRangeMover.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextRangeMover_idl__
 #define __com_sun_star_text_XTextRangeMover_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextRange_idl__
 #include <com/sun/star/text/XTextRange.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextSection.idl b/offapi/com/sun/star/text/XTextSection.idl
index 2a35e2bf0edb..e2544488e080 100644
--- a/offapi/com/sun/star/text/XTextSection.idl
+++ b/offapi/com/sun/star/text/XTextSection.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XTextSection_idl__
 #define __com_sun_star_text_XTextSection_idl__
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextSectionsSupplier.idl b/offapi/com/sun/star/text/XTextSectionsSupplier.idl
index 0425534c275b..15e96e52f6a4 100644
--- a/offapi/com/sun/star/text/XTextSectionsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextSectionsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextSectionsSupplier_idl__
 #define __com_sun_star_text_XTextSectionsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextShapesSupplier.idl b/offapi/com/sun/star/text/XTextShapesSupplier.idl
index 838e74a00110..48b4b88bdeb7 100644
--- a/offapi/com/sun/star/text/XTextShapesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextShapesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextShapesSupplier_idl__
 #define __com_sun_star_text_XTextShapesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextTable.idl b/offapi/com/sun/star/text/XTextTable.idl
index 44b18be77648..9042e4d6dd61 100644
--- a/offapi/com/sun/star/text/XTextTable.idl
+++ b/offapi/com/sun/star/text/XTextTable.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_text_XTextTable_idl__
 #define __com_sun_star_text_XTextTable_idl__
 
-#ifndef __com_sun_star_text_XTextContent_idl__
 #include <com/sun/star/text/XTextContent.idl>
-#endif
 
-#ifndef __com_sun_star_table_XTableRows_idl__
 #include <com/sun/star/table/XTableRows.idl>
-#endif
 
-#ifndef __com_sun_star_table_XTableColumns_idl__
 #include <com/sun/star/table/XTableColumns.idl>
-#endif
 
-#ifndef __com_sun_star_table_XCell_idl__
 #include <com/sun/star/table/XCell.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextTableCursor_idl__
 #include <com/sun/star/text/XTextTableCursor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextTableCursor.idl b/offapi/com/sun/star/text/XTextTableCursor.idl
index 54559fb89dc3..d88b45f9b99a 100644
--- a/offapi/com/sun/star/text/XTextTableCursor.idl
+++ b/offapi/com/sun/star/text/XTextTableCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XTextTableCursor_idl__
 #define __com_sun_star_text_XTextTableCursor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -38,7 +36,7 @@ module com {  module sun {  module star {  module text {
 
 //=============================================================================
 
-/** The TextTableCursor provide methods to navigate throught the table structure, to merge and split cells
+/** The TextTableCursor provide methods to navigate through the table structure, to merge and split cells
 
     @see com::sun::star::text::TextTable
     @see com::sun::star::text::TextTableCursor
@@ -52,7 +50,7 @@ published interface XTextTableCursor: com::sun::star::uno::XInterface
     /** @returns
                 the name of the cell range that is selected by this cursor.
                 <p>The name is the cell name of the top left table cell of the range
-                 contatenated by ':' with the table cell name of the bottom left table cell of the cell range.
+                 concatenated by ":" with the table cell name of the bottom left table cell of the cell range.
                 If the range consists of one table cell only then the name of that table cell is returned.
              </p>
         @see com::sun:star::text::CellRange
@@ -67,7 +65,7 @@ published interface XTextTableCursor: com::sun::star::uno::XInterface
             specifies the name of the cell to go to.
 
         @param bExpand
-            determines wether the selection is to be expanded.
+            determines whether the selection is to be expanded.
 
         @see com::sun::star::text::Cell
      */
@@ -82,7 +80,7 @@ published interface XTextTableCursor: com::sun::star::uno::XInterface
             the number of cells to move.
 
         @param bExpand
-            determines wether the selection is to be expanded.
+            determines whether the selection is to be expanded.
      */
     boolean goLeft( [in] short nCount,
              [in] boolean bExpand );
@@ -95,7 +93,7 @@ published interface XTextTableCursor: com::sun::star::uno::XInterface
             the number of cells to move.
 
         @param bExpand
-            determines wether the selection is to be expanded.
+            determines whether the selection is to be expanded.
      */
     boolean goRight( [in] short nCount,
              [in] boolean bExpand );
@@ -108,7 +106,7 @@ published interface XTextTableCursor: com::sun::star::uno::XInterface
             the number of cells to move.
 
         @param bExpand
-            determines wether the selection is to be expanded.
+            determines whether the selection is to be expanded.
      */
     boolean goUp( [in] short nCount,
              [in] boolean bExpand );
@@ -121,7 +119,7 @@ published interface XTextTableCursor: com::sun::star::uno::XInterface
             the number of cells to move.
 
         @param bExpand
-            determines wether the selection is to be expanded.
+            determines whether the selection is to be expanded.
      */
     boolean goDown( [in] short nCount,
              [in] boolean bExpand );
@@ -131,7 +129,7 @@ published interface XTextTableCursor: com::sun::star::uno::XInterface
     /** moves the cursor to the top left cell of the table.
 
         @param bExpand
-            determines wether the selection is to be expanded.
+            determines whether the selection is to be expanded.
      */
     void gotoStart( [in] boolean bExpand );
 
@@ -140,7 +138,7 @@ published interface XTextTableCursor: com::sun::star::uno::XInterface
     /** moves the cursor to the bottom right cell of the table.
 
         @param bExpand
-            determines wether the selection is to be expanded.
+            determines whether the selection is to be expanded.
      */
     void gotoEnd( [in] boolean bExpand );
 
diff --git a/offapi/com/sun/star/text/XTextTablesSupplier.idl b/offapi/com/sun/star/text/XTextTablesSupplier.idl
index b1c192ccd316..593ca0fe74ef 100644
--- a/offapi/com/sun/star/text/XTextTablesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextTablesSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextTablesSupplier_idl__
 #define __com_sun_star_text_XTextTablesSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextViewCursor.idl b/offapi/com/sun/star/text/XTextViewCursor.idl
index b06b8bfbb481..5345df4d99e0 100644
--- a/offapi/com/sun/star/text/XTextViewCursor.idl
+++ b/offapi/com/sun/star/text/XTextViewCursor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextViewCursor_idl__
 #define __com_sun_star_text_XTextViewCursor_idl__
 
-#ifndef __com_sun_star_text_XTextCursor_idl__
 #include <com/sun/star/text/XTextCursor.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XTextViewCursorSupplier.idl b/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
index 55f66b58395b..822df600cec2 100644
--- a/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
+++ b/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_text_XTextViewCursorSupplier_idl__
 #define __com_sun_star_text_XTextViewCursorSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_text_XTextViewCursor_idl__
 #include <com/sun/star/text/XTextViewCursor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/XWordCursor.idl b/offapi/com/sun/star/text/XWordCursor.idl
index 89da3ed370c0..adfdfe356567 100644
--- a/offapi/com/sun/star/text/XWordCursor.idl
+++ b/offapi/com/sun/star/text/XWordCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_text_XWordCursor_idl__
 #define __com_sun_star_text_XWordCursor_idl__
 
-#ifndef __com_sun_star_text_XTextCursor_idl__
 #include <com/sun/star/text/XTextCursor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/fieldmaster/Bibliography.idl b/offapi/com/sun/star/text/fieldmaster/Bibliography.idl
index 844b01785500..5c2147a2f095 100644
--- a/offapi/com/sun/star/text/fieldmaster/Bibliography.idl
+++ b/offapi/com/sun/star/text/fieldmaster/Bibliography.idl
@@ -45,37 +45,37 @@ published service Bibliography
     service  com::sun::star::text::TextFieldMaster;
 
     //------------------------------------------------------------------------
-    /** determins whether the bibiliography text fields are numbered. If <FALSE/> the
+    /** determines whether the bibliography text fields are numbered. If <FALSE/> the
      short name of the bibliography entry is displayed instead.
      */
     [property] boolean IsNumberEntries;
     //------------------------------------------------------------------------
-    /** determins whether the bibliography entries in a bibliography index are sorted
-     by the document position. If <FALSE/> the SortKey property determins the
+    /** determines whether the bibliography entries in a bibliography index are sorted
+     by the document position. If <FALSE/> the SortKey property determines the
      sorting of the entries.
      */
     [property] boolean IsSortByPosition;
     //------------------------------------------------------------------------
-    /** determins the opening bracket used to display the bibliography text fields.
+    /** determines the opening bracket used to display the bibliography text fields.
      */
     [property] string BracketBefore;
     //------------------------------------------------------------------------
-    /** determins the closing bracket used to display the bibliography text fields.
+    /** determines the closing bracket used to display the bibliography text fields.
      */
     [property] string BracketAfter;
     //------------------------------------------------------------------------
-    /** determins the sorting of the bibliography entries in a bibliography index.
+    /** determines the sorting of the bibliography entries in a bibliography index.
         This property is used if the property IsSortByPosition is not set.
         Each contained element of the sequence is a sequence of the following
         two properties:
         <UL>
             <LI><P>[property] short SortKey;</P>
             <UL>
-                <LI><P>Determins the bibliography field that is used to sort by.</P>
+                <LI><P>Determines the bibliography field that is used to sort by.</P>
             </UL>
             <LI><P>[property] boolean IsSortAscending;</P>
             <UL>
-                <LI><P>Determins wheter the sorting is ascending or descending.
+                <LI><P>Determines whether the sorting is ascending or descending.
                  It uses the type <type scope="com::sun::star::text">BibliographyDataField</type></P>
             </UL>
         </UL>
diff --git a/offapi/com/sun/star/text/fieldmaster/DDE.idl b/offapi/com/sun/star/text/fieldmaster/DDE.idl
index 1f33ef5dac1d..e51ad6f01f59 100644
--- a/offapi/com/sun/star/text/fieldmaster/DDE.idl
+++ b/offapi/com/sun/star/text/fieldmaster/DDE.idl
@@ -56,7 +56,7 @@ published service DDE
      */
     [property]  string DDECommandType;
     //------------------------------------------------------------------------
-    /** determins whether DDE link is updated automatically.
+    /** determines whether DDE link is updated automatically.
      */
     [property]  boolean IsAutomaticUpdate;
     //------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/text/fieldmaster/SetExpression.idl b/offapi/com/sun/star/text/fieldmaster/SetExpression.idl
index 1c6276205f3b..f939029bf26e 100644
--- a/offapi/com/sun/star/text/fieldmaster/SetExpression.idl
+++ b/offapi/com/sun/star/text/fieldmaster/SetExpression.idl
@@ -44,17 +44,17 @@ published service SetExpression
     service  com::sun::star::text::TextFieldMaster;
 
     //------------------------------------------------------------------------
-    /** determins the number of the chapter. This values is used if the field master
+    /** determines the number of the chapter. This values is used if the field master
      is set as number sequence.
      */
     [property]  byte ChapterNumberingLevel;
     //------------------------------------------------------------------------
-    /** determins the numbering separator string if the field master
+    /** determines the numbering separator string if the field master
      is set as number sequence.
      */
     [property]  string NumberingSeparator;
     //------------------------------------------------------------------------
-    /** determins the type of the field as <type scope="com::sun::star::text"SetVariableType</type>
+    /** determines the type of the field as <type scope="com::sun::star::text"SetVariableType</type>
      */
     [property]  short SubType;
 };
diff --git a/offapi/com/sun/star/text/fieldmaster/User.idl b/offapi/com/sun/star/text/fieldmaster/User.idl
index 555e93cfb0d1..a0821e3d112b 100644
--- a/offapi/com/sun/star/text/fieldmaster/User.idl
+++ b/offapi/com/sun/star/text/fieldmaster/User.idl
@@ -44,7 +44,7 @@ published service User
     service  com::sun::star::text::TextFieldMaster;
 
     //------------------------------------------------------------------------
-    /** determins whether the field contains an expression.
+    /** determines whether the field contains an expression.
      */
     [property]  boolean IsExpression;
     //------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/text/textfield/Author.idl b/offapi/com/sun/star/text/textfield/Author.idl
index 5650963b701f..a85dc66affe2 100644
--- a/offapi/com/sun/star/text/textfield/Author.idl
+++ b/offapi/com/sun/star/text/textfield/Author.idl
@@ -43,7 +43,7 @@ published service Author
     service  com::sun::star::text::TextField;
 
     /** If this flag is set to false the author
-        will be overiden by the current author
+        will be overridden by the current author
         each time the document is saved.
      */
     [optional, property] boolean IsFixed;
@@ -57,7 +57,7 @@ published service Author
     */
     [optional, property] short AuthorFormat;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [optional, property]string CurrentPresentation;
     /** determines whether the full name of the author is displayed rather than
diff --git a/offapi/com/sun/star/text/textfield/Chapter.idl b/offapi/com/sun/star/text/textfield/Chapter.idl
index 819a4ff22b98..ccfa08dadcb8 100644
--- a/offapi/com/sun/star/text/textfield/Chapter.idl
+++ b/offapi/com/sun/star/text/textfield/Chapter.idl
@@ -41,11 +41,11 @@ module com { module sun { module star { module text { module textfield {
 published service Chapter
 {
     service  com::sun::star::text::TextField;
-    /** determins how the chapter should be displayed as described in
+    /** determines how the chapter should be displayed as described in
         <type scope="com::sun::star::text">ChapterFormat</type>.
      */
     [property]short ChapterFormat;
-    /** determins which chapter level should be used. The highest chapter
+    /** determines which chapter level should be used. The highest chapter
      level has the value 0.
      */
     [property]byte Level;
diff --git a/offapi/com/sun/star/text/textfield/ConditionalText.idl b/offapi/com/sun/star/text/textfield/ConditionalText.idl
index c13f367948bf..ea01b7ea7514 100644
--- a/offapi/com/sun/star/text/textfield/ConditionalText.idl
+++ b/offapi/com/sun/star/text/textfield/ConditionalText.idl
@@ -57,7 +57,7 @@ published service ConditionalText
      */
     [property] boolean IsConditionTrue;
     /** contains the current content of the text field.
-                <p> This property is escpecially usefull for import/export purposes. </p>
+                <p> This property is especially useful for import/export purposes. </p>
          */
     [optional, property]string CurrentPresentation;
 };
diff --git a/offapi/com/sun/star/text/textfield/Database.idl b/offapi/com/sun/star/text/textfield/Database.idl
index f602db5977f9..016ecf5a9080 100644
--- a/offapi/com/sun/star/text/textfield/Database.idl
+++ b/offapi/com/sun/star/text/textfield/Database.idl
@@ -44,14 +44,14 @@ published service Database
     service  com::sun::star::text::DependentTextField;
 
     /** contains the database content that was merged in the last database merge action.
-     Initially it contains the colum name in parenthesis (<>).
+     Initially it contains the column name in parenthesis (<>).
      */
     [property]string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
-    /** determins whether the number format is number display format is read
+    /** determines whether the number format is number display format is read
      from the database settings.
      */
     [property]boolean DataBaseFormat;
diff --git a/offapi/com/sun/star/text/textfield/DatabaseName.idl b/offapi/com/sun/star/text/textfield/DatabaseName.idl
index 92c5dc5d8a8f..a883a69e83e5 100644
--- a/offapi/com/sun/star/text/textfield/DatabaseName.idl
+++ b/offapi/com/sun/star/text/textfield/DatabaseName.idl
@@ -36,7 +36,7 @@
 module com { module sun { module star { module text { module textfield {
 
 //=============================================================================
-/** specifies service of text field that displayes the name of a database.
+/** specifies service of text field that displays the name of a database.
     @see com::sun::star::text::TextField
 
     Only one of the properties <member>DataBaseName</member>,
diff --git a/offapi/com/sun/star/text/textfield/DatabaseNextSet.idl b/offapi/com/sun/star/text/textfield/DatabaseNextSet.idl
index a9b593e1ef49..2ec05ef45a63 100644
--- a/offapi/com/sun/star/text/textfield/DatabaseNextSet.idl
+++ b/offapi/com/sun/star/text/textfield/DatabaseNextSet.idl
@@ -61,7 +61,7 @@ published service DatabaseNextSet
      */
     [property] string DataTableName;
 
-    /** determins whether the database selection is set to the next position or not.
+    /** determines whether the database selection is set to the next position or not.
      */
     [property] string Condition;
 
diff --git a/offapi/com/sun/star/text/textfield/DatabaseNumberOfSet.idl b/offapi/com/sun/star/text/textfield/DatabaseNumberOfSet.idl
index ea5c54b0f131..71eb29b89cf4 100644
--- a/offapi/com/sun/star/text/textfield/DatabaseNumberOfSet.idl
+++ b/offapi/com/sun/star/text/textfield/DatabaseNumberOfSet.idl
@@ -62,11 +62,11 @@ published service DatabaseNumberOfSet
      */
     [property] string DataTableName;
 
-    /** contains the conditions that determins whether the SetNumber is applied or not.
+    /** contains the conditions that determines whether the SetNumber is applied or not.
      */
     [property] string Condition;
 
-    /** cotains the set number that is to be applied.
+    /** contains the set number that is to be applied.
      */
     [property] long SetNumber;
 
diff --git a/offapi/com/sun/star/text/textfield/DropDown.idl b/offapi/com/sun/star/text/textfield/DropDown.idl
index c70f1a1db499..a3ead677e642 100644
--- a/offapi/com/sun/star/text/textfield/DropDown.idl
+++ b/offapi/com/sun/star/text/textfield/DropDown.idl
@@ -54,7 +54,7 @@ published service DropDown
 
     /**
        The selected item. If no item is selected this property
-       contains an emtpy string. If this property is set to a value
+       contains an empty string. If this property is set to a value
        not present in the items of the dropdown field it is
        invalidated, i.e. it is set to an empty string.
     */
diff --git a/offapi/com/sun/star/text/textfield/ExtendedUser.idl b/offapi/com/sun/star/text/textfield/ExtendedUser.idl
index ae464dd579ed..5e0a904ff81a 100644
--- a/offapi/com/sun/star/text/textfield/ExtendedUser.idl
+++ b/offapi/com/sun/star/text/textfield/ExtendedUser.idl
@@ -46,7 +46,7 @@ published service ExtendedUser
      */
     [property]string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to <FALSE/> the content is regularly updated.
diff --git a/offapi/com/sun/star/text/textfield/FileName.idl b/offapi/com/sun/star/text/textfield/FileName.idl
index 062fb1255292..70e106732512 100644
--- a/offapi/com/sun/star/text/textfield/FileName.idl
+++ b/offapi/com/sun/star/text/textfield/FileName.idl
@@ -43,10 +43,10 @@ published service FileName
 {
     service  com::sun::star::text::TextField;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
-    /** determins the format the file name is displayed as specified in
+    /** determines the format the file name is displayed as specified in
         <type scope="com::sun::star::text">FilenameDisplayFormat</type>.
       */
     [property]short FileFormat;
diff --git a/offapi/com/sun/star/text/textfield/GetExpression.idl b/offapi/com/sun/star/text/textfield/GetExpression.idl
index 9e95ceb46473..3d14a22b941f 100644
--- a/offapi/com/sun/star/text/textfield/GetExpression.idl
+++ b/offapi/com/sun/star/text/textfield/GetExpression.idl
@@ -45,7 +45,7 @@ published service GetExpression
      */
     [property]string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** this is the number format for this field.
@@ -56,10 +56,10 @@ published service GetExpression
         <type scope="com::sun::star::style">NumberingType</type>
      */
     [property]short NumberingType;
-    /** determins whether the content is displayed or evaluated.
+    /** determines whether the content is displayed or evaluated.
      */
     [property]boolean IsShowFormula;
-    /** determins the type of the variable as described in
+    /** determines the type of the variable as described in
         <type scope="com::sun::star::text">SetVariableType</type>
      */
     [property]short SubType;
diff --git a/offapi/com/sun/star/text/textfield/GetReference.idl b/offapi/com/sun/star/text/textfield/GetReference.idl
index 27e38613d3dd..91f9da08cb91 100644
--- a/offapi/com/sun/star/text/textfield/GetReference.idl
+++ b/offapi/com/sun/star/text/textfield/GetReference.idl
@@ -43,7 +43,7 @@ published service GetReference
     service  com::sun::star::text::TextField;
 
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property] string CurrentPresentation;
     /** contains the source of the reference.
diff --git a/offapi/com/sun/star/text/textfield/JumpEdit.idl b/offapi/com/sun/star/text/textfield/JumpEdit.idl
index 1ad1b8a6e00a..1f882ae6aa5b 100644
--- a/offapi/com/sun/star/text/textfield/JumpEdit.idl
+++ b/offapi/com/sun/star/text/textfield/JumpEdit.idl
@@ -41,13 +41,13 @@ module com { module sun { module star { module text { module textfield {
 published service JumpEdit
 {
     service  com::sun::star::text::TextField;
-    /** determins a hint that is displayed at the user interface as tip.
+    /** determines a hint that is displayed at the user interface as tip.
      */
     [property]string Hint;
-    /** determins the text of the place holder.
+    /** determines the text of the place holder.
      */
     [property]string PlaceHolder;
-    /** determins the type of the place holder as described in
+    /** determines the type of the place holder as described in
         <type scope="com::sun::star::text">PlaceholderType</type>.
      */
     [property]short PlaceHolderType;
diff --git a/offapi/com/sun/star/text/textfield/MetadataField.idl b/offapi/com/sun/star/text/textfield/MetadataField.idl
index b3d585c0d32c..2424b3aca755 100755..100644
--- a/offapi/com/sun/star/text/textfield/MetadataField.idl
+++ b/offapi/com/sun/star/text/textfield/MetadataField.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_text_textfield_MetadataField_idl__
 #define __com_sun_star_text_textfield_MetadataField_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextField_idl__
 #include <com/sun/star/text/TextField.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
 #include <com/sun/star/text/XText.idl>
-#endif
-
-#ifndef __com_sun_star_rdf_XMetadatable_idl__
 #include <com/sun/star/rdf/XMetadatable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/textfield/PageNumber.idl b/offapi/com/sun/star/text/textfield/PageNumber.idl
index b6a45ae60619..adf814ff2c87 100644
--- a/offapi/com/sun/star/text/textfield/PageNumber.idl
+++ b/offapi/com/sun/star/text/textfield/PageNumber.idl
@@ -43,15 +43,15 @@ published service PageNumber
 {
     service  com::sun::star::text::TextField;
 
-    /** determins the type of the numbering.
+    /** determines the type of the numbering.
      @see <const scope="com::sun::star::style">NumberingType</const>
      */
     [property] short NumberingType;
 
-    /** determins an offset value to show a different page number.
+    /** determines an offset value to show a different page number.
      */
     [property] short Offset;
-    /** determins which page the field refers to.
+    /** determines which page the field refers to.
         @see <const scope="com::sun::star::text">PageNumberType</const>
      */
     [property] PageNumberType SubType;
diff --git a/offapi/com/sun/star/text/textfield/ReferencePageSet.idl b/offapi/com/sun/star/text/textfield/ReferencePageSet.idl
index dd12db2a42f0..967ee65bfcb9 100644
--- a/offapi/com/sun/star/text/textfield/ReferencePageSet.idl
+++ b/offapi/com/sun/star/text/textfield/ReferencePageSet.idl
@@ -42,10 +42,10 @@ module com { module sun { module star { module text { module textfield {
 published service ReferencePageSet
 {
     service  com::sun::star::text::TextField;
-    /** determins an offset value to change the displayed value of a ReferencePageGet text field.
+    /** determines an offset value to change the displayed value of a ReferencePageGet text field.
      */
     [property]short Offset;
-    /** determins whether the ReferencePageGet text fields are displayed or not.
+    /** determines whether the ReferencePageGet text fields are displayed or not.
      */
     [property]boolean NameOn;
 
diff --git a/offapi/com/sun/star/text/textfield/Script.idl b/offapi/com/sun/star/text/textfield/Script.idl
index b5e6baf501d6..ccf197a1dc32 100644
--- a/offapi/com/sun/star/text/textfield/Script.idl
+++ b/offapi/com/sun/star/text/textfield/Script.idl
@@ -48,7 +48,7 @@ published service Script
     /** contains the name of the script type (i.e. JavaScript)
      */
     [property]string ScriptType;
-    /** determins whether the property Content contains a URL or a script.
+    /** determines whether the property Content contains a URL or a script.
      */
     [property]boolean URLContent;
 
diff --git a/offapi/com/sun/star/text/textfield/SetExpression.idl b/offapi/com/sun/star/text/textfield/SetExpression.idl
index cd727b6af827..78c2e3fc6b71 100644
--- a/offapi/com/sun/star/text/textfield/SetExpression.idl
+++ b/offapi/com/sun/star/text/textfield/SetExpression.idl
@@ -47,7 +47,7 @@ published service SetExpression
      */
     [property]string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
 
@@ -59,7 +59,7 @@ published service SetExpression
         <type scope="com::sun::star::style">NumberingType</type>
      */
     [property]short NumberingType;
-    /** determins whether the content is displayed or evaluated.
+    /** determines whether the content is displayed or evaluated.
      */
     [property]boolean IsShowFormula;
     /** contains an informational text that is displayed at the user
@@ -75,7 +75,7 @@ published service SetExpression
     /** contains the sequence value when this field is used as sequence field.
      */
     [property]short SequenceValue;
-    /** determins the type of the variable as described in
+    /** determines the type of the variable as described in
         <type scope="com::sun::star::text">SetVariableType</type>
      */
     [property]short SubType;
diff --git a/offapi/com/sun/star/text/textfield/TableFormula.idl b/offapi/com/sun/star/text/textfield/TableFormula.idl
index f9013595a578..bbeca1b6b750 100644
--- a/offapi/com/sun/star/text/textfield/TableFormula.idl
+++ b/offapi/com/sun/star/text/textfield/TableFormula.idl
@@ -47,11 +47,11 @@ published service TableFormula
     [property] string Formula;
 
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property] string CurrentPresentation;
 
-    /** determins whether the formula displayed as text or evaluated.
+    /** determines whether the formula displayed as text or evaluated.
     */
     [property] boolean IsShowFormula;
     /** this is the number format for this field.
diff --git a/offapi/com/sun/star/text/textfield/TemplateName.idl b/offapi/com/sun/star/text/textfield/TemplateName.idl
index 03b466ea5e06..90ddd207a364 100644
--- a/offapi/com/sun/star/text/textfield/TemplateName.idl
+++ b/offapi/com/sun/star/text/textfield/TemplateName.idl
@@ -42,7 +42,7 @@ module com { module sun { module star { module text { module textfield {
 published service TemplateName
 {
     service com::sun::star::text::TextField;
-    /** determins the format the template file name is displayed as specified in
+    /** determines the format the template file name is displayed as specified in
         <type scope="com::sun::star::text">FilenameDisplayFormat</type>.
       */
     [property]short FileFormat;
diff --git a/offapi/com/sun/star/text/textfield/URL.idl b/offapi/com/sun/star/text/textfield/URL.idl
index 16961361e177..8e975fdd202d 100644
--- a/offapi/com/sun/star/text/textfield/URL.idl
+++ b/offapi/com/sun/star/text/textfield/URL.idl
@@ -43,7 +43,7 @@ published service URL
 {
     service  com::sun::star::text::TextField;
 
-    /** Speciefies how the URL is formated on output.
+    /** Specifies how the URL is formated on output.
     */
     [property] short Format;
 
diff --git a/offapi/com/sun/star/text/textfield/User.idl b/offapi/com/sun/star/text/textfield/User.idl
index ba22607e6e37..c0089cccd954 100644
--- a/offapi/com/sun/star/text/textfield/User.idl
+++ b/offapi/com/sun/star/text/textfield/User.idl
@@ -44,11 +44,11 @@ published service User
 {
     service  com::sun::star::text::DependentTextField;
 
-    /** determins if the content is shown as text rather than as value.
+    /** determines if the content is shown as text rather than as value.
      */
     [optional, property] boolean IsShowFormula;
 
-    /** determins if the field is visible.
+    /** determines if the field is visible.
      */
     [optional, property] boolean IsVisible;
 
diff --git a/offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl b/offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl
index 6ae2b010fb3a..acb23444bcff 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl
@@ -48,11 +48,11 @@ published service ChangeAuthor
      */
     [property]string Author;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to false the author
-        will be overiden by the current author
+        will be overridden by the current author
         each time the document is saved.
      */
     [optional, property] boolean IsFixed;
diff --git a/offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl b/offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl
index 20d8cc5afcb2..665162e6f9a1 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl
@@ -44,11 +44,11 @@ published service ChangeDateTime
 {
     service  com::sun::star::text::TextField;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to false the author
-        will be overiden by the current author
+        will be overridden by the current author
         each time the document is saved.
      */
     /** If this flag is set to <FALSE/> the date or time
diff --git a/offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl b/offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl
index 5f95be467f0d..441d913e9509 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl
@@ -48,11 +48,11 @@ published service CreateAuthor
      */
     [property]string Author;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to false the author
-        will be overiden by the current author
+        will be overridden by the current author
         each time the document is saved.
      */
     [optional, property] boolean IsFixed;
diff --git a/offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl b/offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl
index b783517befdb..56c35b88ecbc 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl
@@ -44,11 +44,11 @@ published service CreateDateTime
 {
     service  com::sun::star::text::TextField;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to false the author
-        will be overiden by the current author
+        will be overridden by the current author
         each time the document is saved.
      */
     /** If this flag is set to <FALSE/> the date or time
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Description.idl b/offapi/com/sun/star/text/textfield/docinfo/Description.idl
index 358f2af2202a..7886c99bb924 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Description.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Description.idl
@@ -48,7 +48,7 @@ published service Description
      */
     [property] string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially useful for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to <FALSE/> the content updated everytime the document
diff --git a/offapi/com/sun/star/text/textfield/docinfo/EditTime.idl b/offapi/com/sun/star/text/textfield/docinfo/EditTime.idl
index e83d12db3a19..3ce26d62f4b0 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/EditTime.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/EditTime.idl
@@ -44,11 +44,11 @@ published service EditTime
 {
     service  com::sun::star::text::TextField;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to false the author
-        will be overiden by the current author
+        will be overridden by the current author
         each time the document is saved.
      */
     /** If this flag is set to <FALSE/> the date or time
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Info0.idl b/offapi/com/sun/star/text/textfield/docinfo/Info0.idl
index 90a305563476..c752fb10f912 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Info0.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Info0.idl
@@ -48,7 +48,7 @@ published service Info0
      */
     [property] string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially useful for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to <FALSE/> the content updated everytime the document
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Info1.idl b/offapi/com/sun/star/text/textfield/docinfo/Info1.idl
index 71bab32a1f1e..f51f75efb2b1 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Info1.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Info1.idl
@@ -48,7 +48,7 @@ published service Info1
      */
     [property] string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially useful for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to <FALSE/> the content updated everytime the document
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Info2.idl b/offapi/com/sun/star/text/textfield/docinfo/Info2.idl
index 65a0da3491ac..6e2934a52f4d 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Info2.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Info2.idl
@@ -48,7 +48,7 @@ published service Info2
      */
     [property] string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially useful for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to <FALSE/> the content updated everytime the document
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Info3.idl b/offapi/com/sun/star/text/textfield/docinfo/Info3.idl
index e0e013eb3448..789e7366c6fc 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Info3.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Info3.idl
@@ -48,7 +48,7 @@ published service Info3
      */
     [property] string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially useful for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to <FALSE/> the content updated everytime the document
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Keywords.idl b/offapi/com/sun/star/text/textfield/docinfo/Keywords.idl
index fee9797e719c..4d8a5408d286 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Keywords.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Keywords.idl
@@ -48,7 +48,7 @@ published service Keywords
      */
     [property] string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially useful for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to <FALSE/> the content updated everytime the document
diff --git a/offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl b/offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl
index bce811fb3ae0..ce26cba6cc7c 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl
@@ -48,11 +48,11 @@ published service PrintAuthor
      */
     [property]string Author;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to false the author
-        will be overiden by the current author
+        will be overridden by the current author
         each time the document is saved.
      */
     [optional, property] boolean IsFixed;
diff --git a/offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl b/offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl
index 87366468838d..9adda414667d 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl
@@ -44,11 +44,11 @@ published service PrintDateTime
 {
     service  com::sun::star::text::TextField;
     /** contains the current content of the text field.
-        <p> This property is escpecially usefull for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to false the author
-        will be overiden by the current author
+        will be overridden by the current author
         each time the document is saved.
      */
     /** If this flag is set to <FALSE/> the date or time
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Revision.idl b/offapi/com/sun/star/text/textfield/docinfo/Revision.idl
index 82897c4cbfd8..678c0a168634 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Revision.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Revision.idl
@@ -48,7 +48,7 @@ published service Revision
      */
     [property] string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially useful for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to <FALSE/> the content updated everytime the document
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Subject.idl b/offapi/com/sun/star/text/textfield/docinfo/Subject.idl
index c9251e734381..991c6b2cd5fd 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Subject.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Subject.idl
@@ -48,7 +48,7 @@ published service Subject
      */
     [property] string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially useful for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to <FALSE/> the content updated everytime the document
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Title.idl b/offapi/com/sun/star/text/textfield/docinfo/Title.idl
index 4025ae6aea15..afaffc45d7a2 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Title.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Title.idl
@@ -48,7 +48,7 @@ published service Title
      */
     [property] string Content;
     /** contains the current content of the text field.
-        <p> This property is escpecially useful for import/export purposes. </p>
+        <p> This property is especially useful for import/export purposes. </p>
      */
     [property]string CurrentPresentation;
     /** If this flag is set to <FALSE/> the content updated everytime the document
diff --git a/offapi/com/sun/star/ucb/AlreadyInitializedException.idl b/offapi/com/sun/star/ucb/AlreadyInitializedException.idl
index 56902f637599..ed036e1e4bc0 100644
--- a/offapi/com/sun/star/ucb/AlreadyInitializedException.idl
+++ b/offapi/com/sun/star/ucb/AlreadyInitializedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_AlreadyInitializedException_idl__
 #define __com_sun_star_ucb_AlreadyInitializedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/AnyCompareFactory.idl b/offapi/com/sun/star/ucb/AnyCompareFactory.idl
index 2e0d3542668c..ec945353a981 100644
--- a/offapi/com/sun/star/ucb/AnyCompareFactory.idl
+++ b/offapi/com/sun/star/ucb/AnyCompareFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_AnyCompareFactory_idl__
 #define __com_sun_star_ucb_AnyCompareFactory_idl__
 
-#ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
 #include <com/sun/star/ucb/XAnyCompareFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/AuthenticationRequest.idl b/offapi/com/sun/star/ucb/AuthenticationRequest.idl
index ceda716c3d91..0c8cc4df0164 100644
--- a/offapi/com/sun/star/ucb/AuthenticationRequest.idl
+++ b/offapi/com/sun/star/ucb/AuthenticationRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_AuthenticationRequest_idl__
 #define __com_sun_star_ucb_AuthenticationRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
@@ -37,7 +35,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** An error specifing lack of correct authentication data (e.g., to log into
+/** An error specifying lack of correct authentication data (e.g., to log into
     an account).
 */
 published exception AuthenticationRequest: com::sun::star::task::ClassifiedInteractionRequest
@@ -49,12 +47,12 @@ published exception AuthenticationRequest: com::sun::star::task::ClassifiedInter
 
     //-------------------------------------------------------------------------
     /** Any diagnostic message about the failure to log in (if applicable; it
-        will typically be an english phrase or sentence).
+        will typically be an English phrase or sentence).
      */
     string Diagnostic;
 
     //-------------------------------------------------------------------------
-    /** Specifies if the authentication involves a 'realm' (as can be the case
+    /** Specifies if the authentication involves a "realm" (as can be the case
         for HTTP).
      */
     boolean HasRealm;
@@ -67,7 +65,7 @@ published exception AuthenticationRequest: com::sun::star::task::ClassifiedInter
     string Realm;
 
     //-------------------------------------------------------------------------
-    /** Specifies if the authentication involves a 'user name' (as is almost
+    /** Specifies if the authentication involves a "user name" (as is almost
         always the case).
     */
     boolean HasUserName;
@@ -80,7 +78,7 @@ published exception AuthenticationRequest: com::sun::star::task::ClassifiedInter
     string UserName;
 
     //-------------------------------------------------------------------------
-    /** Specifies if the authentication involves a 'password' (as is almost
+    /** Specifies if the authentication involves a "password" (as is almost
         always the case).
     */
     boolean HasPassword;
@@ -93,7 +91,7 @@ published exception AuthenticationRequest: com::sun::star::task::ClassifiedInter
     string Password;
 
     //-------------------------------------------------------------------------
-    /** Specifies if the authentication involves an 'account' (as can be the
+    /** Specifies if the authentication involves an "account" (as can be the
         case for FTP).
     */
     boolean HasAccount;
diff --git a/offapi/com/sun/star/ucb/CHAOSProgressStart.idl b/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
index fc53292963c1..6bb47a1df513 100644
--- a/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
+++ b/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_CHAOSProgressStart_idl__
 #define __com_sun_star_ucb_CHAOSProgressStart_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSet.idl b/offapi/com/sun/star/ucb/CachedContentResultSet.idl
index 26d6e66b3160..12bf224c0270 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSet.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_CachedContentResultSet_idl__
 #define __com_sun_star_ucb_CachedContentResultSet_idl__
 
-#ifndef __com_sun_star_ucb_ContentResultSet_idl__
 #include <com/sun/star/ucb/ContentResultSet.idl>
-#endif
 
 //=============================================================================
 
@@ -52,7 +50,7 @@ published service CachedContentResultSet
     service com::sun::star::ucb::ContentResultSet;
 
     //-------------------------------------------------------------------------
-    /** contains the number of result set rows that should be fethched from
+    /** contains the number of result set rows that should be fetched from
     an underlying database.
 
     <p>The default fetch size is implementation specific.
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl b/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
index ab03429e7f84..b6d53f778361 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_CachedContentResultSetFactory_idl__
 #define __com_sun_star_ucb_CachedContentResultSetFactory_idl__
 
-#ifndef __com_sun_star_ucb_XCachedContentResultSetFactory_idl__
 #include <com/sun/star/ucb/XCachedContentResultSetFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl b/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl
index 5d2a4ed61956..a8aafcf7ac71 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_CachedContentResultSetStub_idl__
 #define __com_sun_star_ucb_CachedContentResultSetStub_idl__
 
-#ifndef __com_sun_star_ucb_ContentResultSet_idl__
 #include <com/sun/star/ucb/ContentResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XFetchProvider_idl__
 #include <com/sun/star/ucb/XFetchProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XFetchProviderForContentAccess_idl__
 #include <com/sun/star/ucb/XFetchProviderForContentAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl b/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
index cbfff8944311..e3a77c3c8d08 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_CachedContentResultSetStubFactory_idl__
 #define __com_sun_star_ucb_CachedContentResultSetStubFactory_idl__
 
-#ifndef __com_sun_star_ucb_XCachedContentResultSetStubFactory_idl__
 #include <com/sun/star/ucb/XCachedContentResultSetStubFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl
index a6116d1db1a8..e0bdaf9cb5cc 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_CachedDynamicResultSet_idl__
 #define __com_sun_star_ucb_CachedDynamicResultSet_idl__
 
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XSourceInitialization_idl__
 #include <com/sun/star/ucb/XSourceInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
index 5ec157e15015..962a1f5b2feb 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_CachedDynamicResultSetFactory_idl__
 #define __com_sun_star_ucb_CachedDynamicResultSetFactory_idl__
 
-#ifndef __com_sun_star_ucb_XCachedDynamicResultSetFactory_idl__
 #include <com/sun/star/ucb/XCachedDynamicResultSetFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl
index 6e88b77d74e9..d5ae75de0d8c 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl
@@ -27,20 +27,15 @@
 #ifndef __com_sun_star_ucb_CachedDynamicResultSetStub_idl__
 #define __com_sun_star_ucb_CachedDynamicResultSetStub_idl__
 
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XSourceInitialization_idl__
 #include <com/sun/star/ucb/XSourceInitialization.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** provides read access to a static or dynamicallly changing
+/** provides read access to a static or dynamically changing
     <type>ContentResultSet</type>.
 
     <p>For example, a <type>DynamicResultSet</type> is returned from the
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
index e0357c3ee61b..642bf1833194 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_CachedDynamicResultSetStubFactory_idl__
 #define __com_sun_star_ucb_CachedDynamicResultSetStubFactory_idl__
 
-#ifndef __com_sun_star_ucb_XCachedDynamicResultSetStubFactory_idl__
 #include <com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/CertificateValidationRequest.idl b/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
index 1f427af1a323..4a61b8ef0ebf 100755..100644
--- a/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
+++ b/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
@@ -27,20 +27,15 @@
 #ifndef __com_sun_star_ucb_CertificateValidationRequest_idl__
 #define __com_sun_star_ucb_CertificateValidationRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_security_XCertificate_idl__
 #include <com/sun/star/security/XCertificate.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** An error specifing an invalid certificate.
+/** An error specifying an invalid certificate.
 */
 published exception CertificateValidationRequest: com::sun::star::task::ClassifiedInteractionRequest
 {
diff --git a/offapi/com/sun/star/ucb/Command.idl b/offapi/com/sun/star/ucb/Command.idl
index 9d39c3a3525e..36bb1ebc4efc 100644
--- a/offapi/com/sun/star/ucb/Command.idl
+++ b/offapi/com/sun/star/ucb/Command.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_Command_idl__
 #define __com_sun_star_ucb_Command_idl__
 
-#ifndef __com_sun_star_ucb_CommandInfo_idl__
 #include <com/sun/star/ucb/CommandInfo.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/CommandAbortedException.idl b/offapi/com/sun/star/ucb/CommandAbortedException.idl
index a7fac87d48b3..769dca5709bc 100644
--- a/offapi/com/sun/star/ucb/CommandAbortedException.idl
+++ b/offapi/com/sun/star/ucb/CommandAbortedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_CommandAbortedException_idl__
 #define __com_sun_star_ucb_CommandAbortedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/CommandEnvironment.idl b/offapi/com/sun/star/ucb/CommandEnvironment.idl
index 6141a74da32a..b39068f8a63b 100644
--- a/offapi/com/sun/star/ucb/CommandEnvironment.idl
+++ b/offapi/com/sun/star/ucb/CommandEnvironment.idl
@@ -48,11 +48,11 @@ module com { module sun { module star { module ucb {
     /** Constructor.
 
         @param InteractionHandler the interaction handler instance that will be
-                                  returned by this service' implementation of
+                                  returned by this service's implementation of
                                   <method>XCommandEnvironemt::getInteractionHandler</method>
 
         @param ProgressHandler    the progress handler instance that will be
-                                  returned by this service' implementation of
+                                  returned by this service's implementation of
                                   <method>XCommandEnvironemt::getProgressHandler</method>
     */
      create( [in] com::sun::star::task::XInteractionHandler InteractionHandler,
diff --git a/offapi/com/sun/star/ucb/CommandFailedException.idl b/offapi/com/sun/star/ucb/CommandFailedException.idl
index e757e2c687d0..4934bc89c4c3 100644
--- a/offapi/com/sun/star/ucb/CommandFailedException.idl
+++ b/offapi/com/sun/star/ucb/CommandFailedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_CommandFailedException_idl__
 #define __com_sun_star_ucb_CommandFailedException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
@@ -38,7 +36,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** This exception is thrown if an exception situation occured during the
+/** This exception is thrown if an exception situation occurred during the
     processing of a command and an
     <type scope="com::sun::star::task">XInteractionHandler</type> was able
     to handle the request for the error condition and the requesting code
@@ -47,7 +45,7 @@ module com { module sun { module star { module ucb {
 
     @version    1.0
     @author     Kai Sommerfeld
-    @see        XCommandProcesssor
+    @see        XCommandProcessor
 */
 published exception CommandFailedException : com::sun::star::uno::Exception
 {
diff --git a/offapi/com/sun/star/ucb/CommandInfo.idl b/offapi/com/sun/star/ucb/CommandInfo.idl
index aa4c07c5519f..3eb5237cfb8f 100644
--- a/offapi/com/sun/star/ucb/CommandInfo.idl
+++ b/offapi/com/sun/star/ucb/CommandInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_CommandInfo_idl__
 #define __com_sun_star_ucb_CommandInfo_idl__
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl b/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl
index 60cd2a06a847..231f85541385 100644
--- a/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl
+++ b/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_CommandInfoChangeEvent_idl__
 #define __com_sun_star_ucb_CommandInfoChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/Content.idl b/offapi/com/sun/star/ucb/Content.idl
index 85923c65fe15..084e464efac0 100644
--- a/offapi/com/sun/star/ucb/Content.idl
+++ b/offapi/com/sun/star/ucb/Content.idl
@@ -28,49 +28,17 @@
 #ifndef __com_sun_star_ucb_Content_idl__
 #define __com_sun_star_ucb_Content_idl__
 
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
@@ -84,7 +52,7 @@ module com { module sun { module star { module ucb {
 published service Content
 {
     //-------------------------------------------------------------------------
-    /** provides access to the identitity and the type of the content and
+    /** provides access to the identity and the type of the content and
         allows the registration of listeners for <type>ContentEvent</type>s.
 
         <p>This interface is required.
@@ -95,7 +63,7 @@ published service Content
     /** must be implemented to make it possible to resolve cyclic object
         references.
 
-        <p>Those references i.e. may occure if there are listeners
+        <p>Those references i.e. may occur if there are listeners
         registered at the content ( the content holds the listeners ) and
         the implementation of the listener interface holds a reference on
         the content. If the content shall be released,
@@ -186,7 +154,7 @@ published service Content
         // - <type scope="com::sun::star::lang">IllegalArgumentException</type>
         //   indicates, that the property value is not acceptable. For instance,
         //   setting an empty title may be illegal.
-        // - Any other execption derived from <type scope="com::sun::star::uno">Exception</type>
+        // - Any other exception derived from <type scope="com::sun::star::uno">Exception</type>
         //   indicates, that the value was not set successfully. For example,
         //   this can be a <type>InteractiveAugmentedIOException</type>
         //   transporting the error code <member>IOErrorCode::ACCESS_DENIED</member>.
@@ -218,7 +186,7 @@ published service Content
         // SortingInfo      : contains sort criteria, if result set shall
         //                be sorted, otherwise it can be left empty.
         //
-        // The exceution must be aborted by the implementation of this command
+        // The execution must be aborted by the implementation of this command
         // (by throwing a <type>CommandAbortedException</type>), if an
         // unsupported mode is requested.
         <type>XDynamicResultSet</type>
@@ -240,7 +208,7 @@ published service Content
         // Properties   : empty ( ignored )
         // SortingInfo      : empty ( ignored )
         //
-        // The exceution must be aborted by the implementation of this command
+        // The execution must be aborted by the implementation of this command
         // (by throwing a <type>CommandAbortedException</type>), if an
         // unsupported mode is requested.
         void
@@ -315,7 +283,7 @@ published service Content
                 <type>InsertCommandArgument</type> aInsertCommandArg
 
         // This command searches for subcontents of a content matching the
-        // given search criteria. The command will return an implemenation
+        // given search criteria. The command will return an implementation
         // of service <type>DynamicResultSet</type>.
         <type>XDynamicResultSet</type>
             <B>search</B>
@@ -339,7 +307,7 @@ published service Content
         // for this scenario, because it is not directly supported by the IMAP
         // protocol. On the other hand, moving a message from one folder to
         // another folder on the same IMAP server should work, because it can
-        // be implemeted efficiently. If an implementation is not able to
+        // be implemented efficiently. If an implementation is not able to
         // handle a given source URL, it should indicate this by issuing a
         // <type>InteractiveBadTransferURLException</type> interaction request.
         // Source and target folder may be the same when doing a move operation.
@@ -363,7 +331,7 @@ published service Content
             <B>transfer</B>
                 <type>TransferInfo</type> aTransferInfo
 
-        // This command obtains an exlusive write lock for the resource. The
+        // This command obtains an exclusive write lock for the resource. The
         // lock is active until command "unlock" is executed or the OOo
         // session that obtained the lock ends or until the lock is released by
         // a third party (e.g. a system administrator).
@@ -406,7 +374,7 @@ published service Content
         // interface <type>XContentCreator</type>.
         <type>XContent</type> >
             <B>createNewContent</B>
-                <type>ContentInfo<type> contentinfo
+                <type>ContentInfo<type> content info
 
         =======================================================================
         Properties:
@@ -445,7 +413,7 @@ published service Content
         long AutoUpdateInterval
 
         // contains the maximum number of network connections
-        // allowed for one (internet) protocol at a time. (e.g. The HTTP
+        // allowed for one (Internet) protocol at a time. (e.g. The HTTP
         // cache can be configured to use a maximum for the number of
         // connections used for browsing.)
         short ConnectionLimit
@@ -466,7 +434,7 @@ published service Content
         // contains the count of marked documents within a folder.
         long DocumentCountMarked
 
-        // contains a sequence of documemt header fields (i.e. header
+        // contains a sequence of document header fields (i.e. header
         // fields of a MIME-message, or the document info of an
         // office document ). For some standard header fields there
         // are predefined separate properties, like &quot;MessageTo&quot;.
diff --git a/offapi/com/sun/star/ucb/ContentAction.idl b/offapi/com/sun/star/ucb/ContentAction.idl
index 7e5a7370c067..321b6569a19c 100644
--- a/offapi/com/sun/star/ucb/ContentAction.idl
+++ b/offapi/com/sun/star/ucb/ContentAction.idl
@@ -52,13 +52,13 @@ module com { module sun { module star { module ucb {
                        </td></tr>
     <tr><td>D3</td><td>A folder content F has a set of children H(F) that is a
                        set of content identifiers. For example, an "open"
-                       command will usualy return a subset of the contents
+                       command will usually return a    subset of the contents
                        denoted by H(F).</td></tr>
     </table>
 
     <p>
     The events that can happen to contents (and that are of interest in this
-    context) are listed next.  Note that 'event' here does not mean an
+    context) are listed next.  Note that "event" here does not mean an
     ContentEvent, but rather some event that occurs either because some content
     processes a command, or because a content gets informed about a relevant
     change in the underlying system it represents.
@@ -68,8 +68,8 @@ module com { module sun { module star { module ucb {
     <tr><td>E1</td><td>The identifier of a content C changes from id1(C) == A
                        to id2(C) == B, denoted as E1(C: A->B). For example,
                        this event may occur when content C processes a
-                       "setPropertyValues" command changing its "Title" propery,
-                       or when afolder that hierarchicaly contains C changes
+                       "setPropertyValues" command changing its "Title" property,
+                       or when a folder that hierarchically contains C changes
                        its identity.</td></tr>
     <tr><td>E2</td><td>The state of a content C changes from Alive to Deleted,
                        denoted as E2(C). For example, this event may occur when
diff --git a/offapi/com/sun/star/ucb/ContentCreationException.idl b/offapi/com/sun/star/ucb/ContentCreationException.idl
index fdeca8a1c772..62f10e3e6c71 100644
--- a/offapi/com/sun/star/ucb/ContentCreationException.idl
+++ b/offapi/com/sun/star/ucb/ContentCreationException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_ContentCreationException_idl__
 #define __com_sun_star_ucb_ContentCreationException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ContentCreationError_idl__
 #include <com/sun/star/ucb/ContentCreationError.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentEvent.idl b/offapi/com/sun/star/ucb/ContentEvent.idl
index 8d69bfb3d23e..b0753e547f24 100644
--- a/offapi/com/sun/star/ucb/ContentEvent.idl
+++ b/offapi/com/sun/star/ucb/ContentEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ContentEvent_idl__
 #define __com_sun_star_ucb_ContentEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentInfo.idl b/offapi/com/sun/star/ucb/ContentInfo.idl
index f562d8f39670..c19aa6747fc5 100644
--- a/offapi/com/sun/star/ucb/ContentInfo.idl
+++ b/offapi/com/sun/star/ucb/ContentInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ContentInfo_idl__
 #define __com_sun_star_ucb_ContentInfo_idl__
 
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentProvider.idl b/offapi/com/sun/star/ucb/ContentProvider.idl
index 314b4f7c858d..55e427737d86 100644
--- a/offapi/com/sun/star/ucb/ContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ContentProvider.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_ucb_ContentProvider_idl__
 #define __com_sun_star_ucb_ContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifierFactory_idl__
 #include <com/sun/star/ucb/XContentIdentifierFactory.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XParameterizedContentProvider_idl__
 #include <com/sun/star/ucb/XParameterizedContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProviderSupplier_idl__
 #include <com/sun/star/ucb/XContentProviderSupplier.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentProviderInfo.idl b/offapi/com/sun/star/ucb/ContentProviderInfo.idl
index 1c39ff7929f8..bf863e0270b2 100644
--- a/offapi/com/sun/star/ucb/ContentProviderInfo.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ContentProviderInfo_idl__
 #define __com_sun_star_ucb_ContentProviderInfo_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/ContentProviderProxy.idl b/offapi/com/sun/star/ucb/ContentProviderProxy.idl
index 1bbd1ebf8c8e..cb97a41c2082 100644
--- a/offapi/com/sun/star/ucb/ContentProviderProxy.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderProxy.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_ContentProviderProxy_idl__
 #define __com_sun_star_ucb_ContentProviderProxy_idl__
 
-#ifndef __com_sun_star_ucb_XContentProviderSupplier_idl__
 #include <com/sun/star/ucb/XContentProviderSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XParameterizedContentProvider_idl__
 #include <com/sun/star/ucb/XParameterizedContentProvider.idl>
-#endif
 
 //=============================================================================
 
@@ -48,8 +40,8 @@ module com { module sun { module star { module ucb {
 
     <p>Implementing a content provider proxy can be useful if the creation of
     the real content provider object shall be deferred for some reason
-    (i.e. performance) until the first method gets called on it. Instaead of
-    instanciating and registering the real provider at the UCB, a proxy for
+    (i.e. performance) until the first method gets called on it. Instead of
+    instantiating and registering the real provider at the UCB, a proxy for
     the real provider can be created and registered at the UCB.
 
     @see XContentProviderProxyFactory
@@ -59,7 +51,7 @@ published service ContentProviderProxy
     //-------------------------------------------------------------------------
     /** The implementation of
         <member scope="com::sun::star::uno">XInterface::queryInterface</member>
-        must instanciate the real provider and return the return value
+        must instantiate the real provider and return the return value
         of a queryInterface call at the real provider, except for queries
         for the interfaces implemented by the proxy itself. So the caller of
         the queryInterface method at the proxy will get access to the real
@@ -77,12 +69,12 @@ published service ContentProviderProxy
     interface com::sun::star::ucb::XContentProviderSupplier;
 
     //-------------------------------------------------------------------------
-    /** a content provider implementation that wrappes the original provider.
+    /** a content provider implementation that wraps the original provider.
      */
     interface com::sun::star::ucb::XContentProvider;
 
     //-------------------------------------------------------------------------
-    /** a parameterized content provider implementation that wrappes the
+    /** a parameterized content provider implementation that wraps the
         original provider.
      */
     interface com::sun::star::ucb::XParameterizedContentProvider;
diff --git a/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl b/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
index adc63748b95f..80f98dbcd329 100644
--- a/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ContentProviderProxyFactory_idl__
 #define __com_sun_star_ucb_ContentProviderProxyFactory_idl__
 
-#ifndef __com_sun_star_ucb_XContentProviderFactory_idl__
 #include <com/sun/star/ucb/XContentProviderFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ContentResultSet.idl b/offapi/com/sun/star/ucb/ContentResultSet.idl
index 64867d800cfb..dd004dd46be6 100644
--- a/offapi/com/sun/star/ucb/ContentResultSet.idl
+++ b/offapi/com/sun/star/ucb/ContentResultSet.idl
@@ -27,37 +27,14 @@
 #ifndef __com_sun_star_ucb_ContentResultSet_idl__
 #define __com_sun_star_ucb_ContentResultSet_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XRow_idl__
 #include <com/sun/star/sdbc/XRow.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XCloseable_idl__
 #include <com/sun/star/sdbc/XCloseable.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentAccess_idl__
 #include <com/sun/star/ucb/XContentAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
 #include <com/sun/star/sdbc/ResultSet.idl>
-#endif
 
 //=============================================================================
 
@@ -92,7 +69,7 @@ published service ContentResultSet
     interface com::sun::star::sdbc::XResultSetMetaDataSupplier;
 
     //-------------------------------------------------------------------------
-    /** enables travelling through the result set members ( the contents ).
+    /** enables traveling through the result set members ( the contents ).
         This interface mainly provides a cursor for the result set.
 
         <p>Note that every method of this interface implementation additionally
@@ -133,20 +110,20 @@ published service ContentResultSet
     interface com::sun::star::sdbc::XCloseable;
 
     //-------------------------------------------------------------------------
-    /** holds properties of the resultset.
+    /** holds properties of the result set.
 
         <p>This interface is required.
      */
     interface com::sun::star::beans::XPropertySet;
 
     //-------------------------------------------------------------------------
-    /** controls the travel mode of the resultset cursor.
+    /** controls the travel mode of the result set cursor.
 
         <p>There are two possible travel modes:
 
         <p><table border=1>
         <tr><td><member>CursorTravelMode::BLOCKING</member></td>
-            <td>Each travel method of the resultset will not return until the
+            <td>Each travel method of the result set will not return until the
                 data for the new position were retrieved.</td></tr>
         <tr><td><member>CursorTravelMode::NONBLOCKING</member></td>
             <td>The implementation will throw a
@@ -206,7 +183,7 @@ published service ContentResultSet
     /** contains the number of rows obtained (so far) from the data source. */
     [readonly, property] long RowCount;
 
-    /** indicates that all rows of te resultset have been obtained. */
+    /** indicates that all rows of the result set have been obtained. */
     [readonly, property] boolean IsRowCountFinal;
 
     //-------------------------------------------------------------------------
@@ -221,7 +198,7 @@ published service ContentResultSet
     /** can be implemented to provide a complete JDBC conform result set
         interface for the implementation of this service.
 
-        <p>The implememtation of this service is optional.
+        <p>The implementation of this service is optional.
      */
     service com::sun::star::sdbc::ResultSet;
 };
diff --git a/offapi/com/sun/star/ucb/ContentTransmitter.idl b/offapi/com/sun/star/ucb/ContentTransmitter.idl
index 7691dcf91036..f0b5fee2e7be 100644
--- a/offapi/com/sun/star/ucb/ContentTransmitter.idl
+++ b/offapi/com/sun/star/ucb/ContentTransmitter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ContentTransmitter_idl__
 #define __com_sun_star_ucb_ContentTransmitter_idl__
 
-#ifndef __com_sun_star_ucb_XContentTransmitter_idl__
 #include <com/sun/star/ucb/XContentTransmitter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/Cookie.idl b/offapi/com/sun/star/ucb/Cookie.idl
index 0c413322dd76..6263b84bf7d5 100644
--- a/offapi/com/sun/star/ucb/Cookie.idl
+++ b/offapi/com/sun/star/ucb/Cookie.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_Cookie_idl__
 #define __com_sun_star_ucb_Cookie_idl__
 
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CookiePolicy_idl__
 #include <com/sun/star/ucb/CookiePolicy.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl b/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl
index b2f3af2c01b7..5965f464681d 100644
--- a/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl
+++ b/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_DefaultHierarchyDataSource_idl__
 #define __com_sun_star_ucb_DefaultHierarchyDataSource_idl__
 
-#ifndef __com_sun_star_ucb_HierarchyDataSource_idl__
 #include <com/sun/star/ucb/HierarchyDataSource.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl b/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl
index fb6153644e0e..8cbac473b5a2 100644
--- a/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl
+++ b/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_DuplicateCommandIdentifierException_idl__
 #define __com_sun_star_ucb_DuplicateCommandIdentifierException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/DuplicateProviderException.idl b/offapi/com/sun/star/ucb/DuplicateProviderException.idl
index 1cade82f18e0..d283c49d542c 100644
--- a/offapi/com/sun/star/ucb/DuplicateProviderException.idl
+++ b/offapi/com/sun/star/ucb/DuplicateProviderException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_DuplicateProviderException_idl__
 #define __com_sun_star_ucb_DuplicateProviderException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/DynamicResultSet.idl b/offapi/com/sun/star/ucb/DynamicResultSet.idl
index 637d15ab814a..88eee5bb1422 100644
--- a/offapi/com/sun/star/ucb/DynamicResultSet.idl
+++ b/offapi/com/sun/star/ucb/DynamicResultSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_DynamicResultSet_idl__
 #define __com_sun_star_ucb_DynamicResultSet_idl__
 
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ExpandContentProvider.idl b/offapi/com/sun/star/ucb/ExpandContentProvider.idl
index 1db65c2f5150..cebac646534a 100644
--- a/offapi/com/sun/star/ucb/ExpandContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ExpandContentProvider.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module ucb {
 
     Macros which will be expanded using the singleton
     /singletons/com.sun.star.util.theMacroExpander
-    of the process' initial component context.
+    of the process's initial component context.
 
     @see Content
 */
diff --git a/offapi/com/sun/star/ucb/ExportStreamInfo.idl b/offapi/com/sun/star/ucb/ExportStreamInfo.idl
index bf8f2b59bc3d..763622d7bfa1 100644
--- a/offapi/com/sun/star/ucb/ExportStreamInfo.idl
+++ b/offapi/com/sun/star/ucb/ExportStreamInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ExportStreamInfo_idl__
 #define __com_sun_star_ucb_ExportStreamInfo_idl__
 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/FTPContent.idl b/offapi/com/sun/star/ucb/FTPContent.idl
index b72ef1d660cd..cfd1b33864c4 100644
--- a/offapi/com/sun/star/ucb/FTPContent.idl
+++ b/offapi/com/sun/star/ucb/FTPContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_FTPContent_idl__
 #define __com_sun_star_ucb_FTPContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/FTPContentProvider.idl b/offapi/com/sun/star/ucb/FTPContentProvider.idl
index dd1a6e8aea09..5432891d3084 100644
--- a/offapi/com/sun/star/ucb/FTPContentProvider.idl
+++ b/offapi/com/sun/star/ucb/FTPContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_FTPContentProvider_idl__
 #define __com_sun_star_ucb_FTPContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/FetchError.idl b/offapi/com/sun/star/ucb/FetchError.idl
index 49e9f5f7ed39..293224af4acf 100644
--- a/offapi/com/sun/star/ucb/FetchError.idl
+++ b/offapi/com/sun/star/ucb/FetchError.idl
@@ -32,7 +32,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** These values are used to specify whether and which error has occured
+/** These values are used to specify whether and which error has occurred
     while fetching data of some <type>ContentResultSet</type> rows.
 
     @see FetchResult
@@ -56,10 +56,10 @@ published constants FetchError
     //-------------------------------------------------------------------------
     /** indicates that during fetching we got an exception.
 
-        <p>The row, that causes the exceptione, and all following ( 'following'
-        in readorder! ) rows are not contained in the <type>FetchResult</type>.
+        <p>The row, that causes the exception, and all following ( "following"
+        in read order! ) rows are not contained in the <type>FetchResult</type>.
         Therefore the <type>FetchResult</type> does not contain the full count
-        of demanded rows. But all properly readed rows so far must be contained.
+        of demanded rows. But all properly read rows so far must be contained.
     */
     const short EXCEPTION = 2;
 };
diff --git a/offapi/com/sun/star/ucb/FetchResult.idl b/offapi/com/sun/star/ucb/FetchResult.idl
index ebd8dd4060aa..b6a1d969fb08 100644
--- a/offapi/com/sun/star/ucb/FetchResult.idl
+++ b/offapi/com/sun/star/ucb/FetchResult.idl
@@ -50,10 +50,10 @@ published struct FetchResult
 
     //-------------------------------------------------------------------------
     /** indicates the index of the first row contained in
-        <member>FetchResult::Rows</member> in the original resultset. So if
+        <member>FetchResult::Rows</member> in the original result set. So if
         <member>FetchResult::StartIndex</member> equals <code>3</code>, the
         first element in the sequence <member>FetchResult::Rows</member>
-        contains the data of the index <code>3</code> in the original resultset.
+        contains the data of the index <code>3</code> in the original result set.
 
         <p>The following rows are one after the other, but the direction
         depends on the value of <member>FetchResult::Direction</member>
@@ -66,12 +66,12 @@ published struct FetchResult
 
         <p>When <member>FetchResult::Orientation</member> equals <TRUE/>, the
         rows in <member>FetchResult::Rows</member> are ordered in the same way
-        as in the original resultset.
+        as in the original result set.
     */
     boolean Orientation;
 
     //-------------------------------------------------------------------------
-    /** indicates whether and which error has occured, while fetching.
+    /** indicates whether and which error has occurred, while fetching.
 
         <p>The value may contain zero or more constants of the
         <type>FetchError</type> constants group.
diff --git a/offapi/com/sun/star/ucb/FileContent.idl b/offapi/com/sun/star/ucb/FileContent.idl
index 7dfd2d7439ca..5351f5363f39 100644
--- a/offapi/com/sun/star/ucb/FileContent.idl
+++ b/offapi/com/sun/star/ucb/FileContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_FileContent_idl__
 #define __com_sun_star_ucb_FileContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/FileContentProvider.idl b/offapi/com/sun/star/ucb/FileContentProvider.idl
index 5951d852e2ca..7c7cb43de7f3 100644
--- a/offapi/com/sun/star/ucb/FileContentProvider.idl
+++ b/offapi/com/sun/star/ucb/FileContentProvider.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_ucb_FileContentProvider_idl__
 #define __com_sun_star_ucb_FileContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-#ifndef __com_sun_star_ucb_XFileIdentifierConverter_idl__
 #include <com/sun/star/ucb/XFileIdentifierConverter.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContentIdentifierFactory_idl__
 #include <com/sun/star/ucb/XContentIdentifierFactory.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -51,7 +43,7 @@ module com { module sun { module star { module ucb {
     <p>The served contents enable access to the local file system.
 
     <p>The FCP is able to restrict access to the local file system to a number
-    of directories shown to the client under configurable aliasnames.
+    of directories shown to the client under configurable alias names.
 
     @see com::sun::star::ucb::Content
 */
diff --git a/offapi/com/sun/star/ucb/FolderList.idl b/offapi/com/sun/star/ucb/FolderList.idl
index 0966639725cf..a33963e88e56 100644
--- a/offapi/com/sun/star/ucb/FolderList.idl
+++ b/offapi/com/sun/star/ucb/FolderList.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_FolderList_idl__
 #define __com_sun_star_ucb_FolderList_idl__
 
-#ifndef __com_sun_star_ucb_FolderListCommand_idl__
 #include <com/sun/star/ucb/FolderListCommand.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_FolderListEntry_idl__
 #include <com/sun/star/ucb/FolderListEntry.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/FolderListEntry.idl b/offapi/com/sun/star/ucb/FolderListEntry.idl
index 0652dd17c87e..79db1e5b65e3 100644
--- a/offapi/com/sun/star/ucb/FolderListEntry.idl
+++ b/offapi/com/sun/star/ucb/FolderListEntry.idl
@@ -50,17 +50,17 @@ published struct FolderListEntry
     string ID;
 
     //-------------------------------------------------------------------------
-    /** The foler is subscribed.
+    /** The folder is subscribed.
     */
     boolean Subscribed;
 
     //-------------------------------------------------------------------------
-    /** The foler is new.
+    /** The folder is new.
     */
     boolean New;
 
     //-------------------------------------------------------------------------
-    /** The foler has been removed.
+    /** The folder has been removed.
     */
     boolean Removed;
 
diff --git a/offapi/com/sun/star/ucb/GIOContentProvider.idl b/offapi/com/sun/star/ucb/GIOContentProvider.idl
index 356fd6a5c246..d6823c9cfe82 100644
--- a/offapi/com/sun/star/ucb/GIOContentProvider.idl
+++ b/offapi/com/sun/star/ucb/GIOContentProvider.idl
@@ -1,9 +1,7 @@
 #ifndef __com_sun_star_ucb_GIOContentProvider_idl__
 #define __com_sun_star_ucb_GIOContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 module com { module sun { module star { module ucb {
 service GIOContentProvider
diff --git a/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl b/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl
index 65b479bb3c55..7ffaa5445bc5 100644
--- a/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_GlobalTransferCommandArgument_idl__
 #define __com_sun_star_ucb_GlobalTransferCommandArgument_idl__
 
-#ifndef __com_sun_star_ucb_TransferCommandOperation_idl__
 #include <com/sun/star/ucb/TransferCommandOperation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl b/offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl
index 2e6276dca63d..cd6070a007ed 100644
--- a/offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl
+++ b/offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl
@@ -1,9 +1,7 @@
 #ifndef __com_sun_star_ucb_GnomeVFSContentProvider_idl__
 #define __com_sun_star_ucb_GnomeVFSContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl b/offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl
index 4cda47bc34bf..eaf4171ae4b6 100644
--- a/offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl
+++ b/offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl
@@ -1,41 +1,15 @@
 #ifndef __com_sun_star_ucb_GnomeVFSDocumentContent_idl__
 #define __com_sun_star_ucb_GnomeVFSDocumentContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl b/offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl
index fe105e2f4034..86917ad834b6 100644
--- a/offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl
+++ b/offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl
@@ -1,45 +1,16 @@
 #ifndef __com_sun_star_ucb_GnomeVFSFolderContent_idl__
 #define __com_sun_star_ucb_GnomeVFSFolderContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HandleCookiesRequest.idl b/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
index 50dbac15ef0b..d7ecb255e710 100644
--- a/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
+++ b/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_HandleCookiesRequest_idl__
 #define __com_sun_star_ucb_HandleCookiesRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_Cookie_idl__
 #include <com/sun/star/ucb/Cookie.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CookieRequest_idl__
 #include <com/sun/star/ucb/CookieRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/HelpContent.idl b/offapi/com/sun/star/ucb/HelpContent.idl
index 2dca8b8cf8b1..98e42ded97d1 100644
--- a/offapi/com/sun/star/ucb/HelpContent.idl
+++ b/offapi/com/sun/star/ucb/HelpContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_HelpContent_idl__
 #define __com_sun_star_ucb_HelpContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HelpContentProvider.idl b/offapi/com/sun/star/ucb/HelpContentProvider.idl
index 32b51431436a..06146fb00d65 100644
--- a/offapi/com/sun/star/ucb/HelpContentProvider.idl
+++ b/offapi/com/sun/star/ucb/HelpContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_HelpContentProvider_idl__
 #define __com_sun_star_ucb_HelpContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/HierarchyContentProvider.idl b/offapi/com/sun/star/ucb/HierarchyContentProvider.idl
index f5a975ed58b6..6510b9200a06 100644
--- a/offapi/com/sun/star/ucb/HierarchyContentProvider.idl
+++ b/offapi/com/sun/star/ucb/HierarchyContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_HierarchyContentProvider_idl__
 #define __com_sun_star_ucb_HierarchyContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl b/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl
index d5056f2c0afb..c3920aff0417 100644
--- a/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl
+++ b/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_ucb_HierarchyDataReadAccess_idl__
 #define __com_sun_star_ucb_HierarchyDataReadAccess_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-#ifndef __com_sun_star_util_XChangesNotifier_idl__
 #include <com/sun/star/util/XChangesNotifier.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
@@ -90,12 +82,12 @@ published service HierarchyDataReadAccess
         hierarchical name.
 
         <p>A hierarchical name consists of segments that are separated by a
-        single slash ('/'). There is neither a leading nor a trailing slash
+        single slash ("/"). There is neither a leading nor a trailing slash
         allowed.
 
         <ul>
         <li>
-        path = segment ( '/' segement )*
+        path = segment ( '/' segment )*
         </li>
         <li>
         segment = '[' quoted-string ']'
@@ -104,7 +96,7 @@ published service HierarchyDataReadAccess
         quoted-string = "'" escaped-string "'"
         </li>
         <li>
-        escaped-string = escaped accoding to XML attribute naming conventions
+        escaped-string = escaped according to XML attribute naming conventions
         </li>
         </ul>
 
@@ -134,7 +126,7 @@ published service HierarchyDataReadAccess
         <code>getByHierarchicalName( "Children/['subnode3']/Children" )</code>
         will give direct access to the "Children" data member of the child node
         named "subnode3" of the node. It will return an <atom>any</atom>
-        conntaining an implementation of service
+        containing an implementation of service
         <type>HierarchyDataReadAccess</type>, if it was called on a read-only
         node. It will return an implementation of service
         <type>HierarchyDataReadWriteAccess</type> if it was called on a
diff --git a/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl b/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl
index eda1b45094e4..add81ec6cd2e 100644
--- a/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl
+++ b/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_ucb_HierarchyDataReadWriteAccess_idl__
 #define __com_sun_star_ucb_HierarchyDataReadWriteAccess_idl__
 
-#ifndef __com_sun_star_ucb_HierarchyDataReadAccess_idl__
 #include <com/sun/star/ucb/HierarchyDataReadAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_util_XChangesBatch_idl__
 #include <com/sun/star/util/XChangesBatch.idl>
-#endif
 
 //=============================================================================
 
@@ -57,7 +49,7 @@ published service HierarchyDataReadWriteAccess
     //-------------------------------------------------------------------------
     /** allows adding and removing of hierarchy data nodes, replacing of
         the value of hierarchy data node members, as well as obtaining the
-        value of hieryrchy data node members.
+        value of hierarchy data node members.
 
         <p>Adding and removing must only be supported if the access object
         points to the "Children" data member of a node or to the root node.
diff --git a/offapi/com/sun/star/ucb/HierarchyDataSource.idl b/offapi/com/sun/star/ucb/HierarchyDataSource.idl
index 31ec3ea91ca1..3841b887054a 100644
--- a/offapi/com/sun/star/ucb/HierarchyDataSource.idl
+++ b/offapi/com/sun/star/ucb/HierarchyDataSource.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_ucb_HierarchyDataSource_idl__
 #define __com_sun_star_ucb_HierarchyDataSource_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 //=============================================================================
 
@@ -43,7 +39,7 @@ module com { module sun { module star { module ucb {
     for objects that provide access to a subset of the data.
 
     <p><b>Note:</b> This is an abstract service. This means, that there should
-    never be implementations that can be instanciated using the service name
+    never be implementations that can be instantiated using the service name
     <code>com.sun.star.ucb.HierarchyDataSource</code>. Each implementation must
     provide its own service name that can be used to create instances of that
     service implementation. Important for those service specifications is also
@@ -53,7 +49,7 @@ published service HierarchyDataSource
 {
     //-------------------------------------------------------------------------
     /** allows creating access objects for specific views such as subsets and
-        fragments of the hierrachy data.
+        fragments of the hierarchy data.
 
         <p>The parameter <var>aServiceSpecifier</var> passed to
         <member scope="com::sun::star::lang">XMultiServiceFactory::createInstanceWithArguments</member>
@@ -82,11 +78,11 @@ published service HierarchyDataSource
         must accept a property named <code>nodepath</code> of type
         <atom>string</atom>. This property must contain the absolute path to an
         element of the data. The view that is selected consists of the named
-        element and all its decendants. A path consists of segments that are
-        separated by a single slash ('/'). There is neither a leading nor a
+        element and all its descendants. A path consists of segments that are
+        separated by a single slash ("/"). There is neither a leading nor a
         trailing slash allowed. The <b>root</b> of the hierarchy data always
         has an empty path. Refer to <type>HierarchyDataReadAccess</type> for
-        more informtion on hierarchical names.
+        more information on hierarchical names.
 
         <p>Other arguments can be used to control the behavior of the view.
         These are different for different implementations. Whether and how they
diff --git a/offapi/com/sun/star/ucb/HierarchyFolderContent.idl b/offapi/com/sun/star/ucb/HierarchyFolderContent.idl
index 5db255975cae..f65e936180f1 100644
--- a/offapi/com/sun/star/ucb/HierarchyFolderContent.idl
+++ b/offapi/com/sun/star/ucb/HierarchyFolderContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_HierarchyFolderContent_idl__
 #define __com_sun_star_ucb_HierarchyFolderContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HierarchyLinkContent.idl b/offapi/com/sun/star/ucb/HierarchyLinkContent.idl
index 53769e310488..fe81a3581c4e 100644
--- a/offapi/com/sun/star/ucb/HierarchyLinkContent.idl
+++ b/offapi/com/sun/star/ucb/HierarchyLinkContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_HierarchyLinkContent_idl__
 #define __com_sun_star_ucb_HierarchyLinkContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl b/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl
index 3ef8c59bc24a..0c285be49a2b 100644
--- a/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl
+++ b/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_HierarchyRootFolderContent_idl__
 #define __com_sun_star_ucb_HierarchyRootFolderContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/IllegalIdentifierException.idl b/offapi/com/sun/star/ucb/IllegalIdentifierException.idl
index d0dc33dbcd5c..b1a500a1b83a 100644
--- a/offapi/com/sun/star/ucb/IllegalIdentifierException.idl
+++ b/offapi/com/sun/star/ucb/IllegalIdentifierException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_IllegalIdentifierException_idl__
 #define __com_sun_star_ucb_IllegalIdentifierException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InsertCommandArgument.idl b/offapi/com/sun/star/ucb/InsertCommandArgument.idl
index c8950ac87113..c6f5ca077884 100644
--- a/offapi/com/sun/star/ucb/InsertCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/InsertCommandArgument.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_InsertCommandArgument_idl__
 #define __com_sun_star_ucb_InsertCommandArgument_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/InteractiveAppException.idl b/offapi/com/sun/star/ucb/InteractiveAppException.idl
index 5e75721b7cec..0c97970a6f9d 100644
--- a/offapi/com/sun/star/ucb/InteractiveAppException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveAppException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_InteractiveIOException_idl__
 #define __com_sun_star_ucb_InteractiveIOException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IOErrorCode_idl__
 #include <com/sun/star/ucb/IOErrorCode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl b/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl
index 0949078f15f9..2e18f3517fe4 100644
--- a/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveAugmentedIOException_idl__
 #define __com_sun_star_ucb_InteractiveAugmentedIOException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
 #include <com/sun/star/ucb/InteractiveIOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl b/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl
index 37e3f09ae4c2..d30559c057c4 100644
--- a/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveBadTransferURLException_idl__
 #define __com_sun_star_ucb_InteractiveBadTransferURLException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl b/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
index 55a6caa756d4..56af2c02abd4 100644
--- a/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveCHAOSException_idl__
 #define __com_sun_star_ucb_InteractiveCHAOSException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
@@ -46,13 +44,13 @@ published exception InteractiveCHAOSException: com::sun::star::task::ClassifiedI
     //-------------------------------------------------------------------------
     /** The error ID.
 
-        <p>For a 'dynamic' error (with extra textual arguments), this ID
-        does not contain the 'dynamic bits'.
+        <p>For a "dynamic" error (with extra textual arguments), this ID
+        does not contain the "dynamic bits".
     */
     long ID;
 
     //-------------------------------------------------------------------------
-    /** Any textual arguments of a 'dynamic' error (which will get merged into
+    /** Any textual arguments of a "dynamic" error (which will get merged into
         the error message).
 
         <p>This sequence should contain at most two elements.
diff --git a/offapi/com/sun/star/ucb/InteractiveFileIOException.idl b/offapi/com/sun/star/ucb/InteractiveFileIOException.idl
index 6d4f9015f206..11b2029fef55 100644
--- a/offapi/com/sun/star/ucb/InteractiveFileIOException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveFileIOException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_InteractiveFileIOException_idl__
 #define __com_sun_star_ucb_InteractiveFileIOException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveIOException_idl__
 #include <com/sun/star/ucb/InteractiveIOException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IOErrorCode_idl__
 #include <com/sun/star/ucb/IOErrorCode.idl>
-#endif
 
 
 //=============================================================================
@@ -51,7 +46,7 @@ module com { module sun { module star { module ucb {
 published exception InteractiveFileIOException: com::sun::star::ucb::InteractiveIOException
 {
     //-------------------------------------------------------------------------
-    /** The file url where the i/o error occured
+    /** The file url where the i/o error occurred
     */
     string FileName;
 };
diff --git a/offapi/com/sun/star/ucb/InteractiveIOException.idl b/offapi/com/sun/star/ucb/InteractiveIOException.idl
index ef66bd57488a..94a6c74a6df8 100644
--- a/offapi/com/sun/star/ucb/InteractiveIOException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveIOException.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_InteractiveIOException_idl__
 #define __com_sun_star_ucb_InteractiveIOException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IOErrorCode_idl__
 #include <com/sun/star/ucb/IOErrorCode.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingException.idl b/offapi/com/sun/star/ucb/InteractiveLockingException.idl
index 8dc6444ef446..1a5f49a66b14 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
 #define __com_sun_star_ucb_InteractiveLockingException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl b/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
index b47d4f55c3d1..c1e1cc421f4c 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveLockingLockExpiredException_idl__
 #define __com_sun_star_ucb_InteractiveLockingLockExpiredException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
 #include <com/sun/star/ucb/InteractiveLockingException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl b/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
index da243c4d2bbe..636035f953dd 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveLockingLockedException_idl__
 #define __com_sun_star_ucb_InteractiveLockingLockedException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
 #include <com/sun/star/ucb/InteractiveLockingException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl b/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
index 7342ef87f35d..592094458a57 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveLockingNotLockedException_idl__
 #define __com_sun_star_ucb_InteractiveLockingNotLockedException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveLockingException_idl__
 #include <com/sun/star/ucb/InteractiveLockingException.idl>
-#endif
 
 
 //=============================================================================
@@ -39,7 +37,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** An error indicating that the resource is not locked.
 
-    <p>This error for instance can occure when trying to unlock a resource
+    <p>This error for instance can occur when trying to unlock a resource
        that is not locked.
     </p>
 
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl
index bbb9afcb901e..4550bba45560 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkConnectException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkConnectException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
 
 
 //=============================================================================
@@ -37,7 +35,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** A network error specifing a connection failure.
+/** A network error specifying a connection failure.
 */
 published exception InteractiveNetworkConnectException: InteractiveNetworkException
 {
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkException.idl
index deb741724ca1..958a0b29f705 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl
index 7ac16fa30bee..a172d426c3c4 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkGeneralException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkGeneralException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
 
 
 //=============================================================================
@@ -37,7 +35,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** A network error specifing a general failure.
+/** A network error specifying a general failure.
 */
 published exception InteractiveNetworkGeneralException: com::sun::star::ucb::InteractiveNetworkException
 {
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl
index 70c7c3592604..7b4809c05dcb 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkOffLineException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkOffLineException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
 
 
 //=============================================================================
@@ -37,7 +35,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** A network error specifing an off line condition.
+/** A network error specifying an off line condition.
 */
 published exception InteractiveNetworkOffLineException: com::sun::star::ucb::InteractiveNetworkException
 {
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl
index edfdfe6392f2..81dba3052169 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkReadException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkReadException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
 
 
 //=============================================================================
@@ -37,13 +35,13 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** A network error specifing a read failure.
+/** A network error specifying a read failure.
 */
 published exception InteractiveNetworkReadException: com::sun::star::ucb::InteractiveNetworkException
 {
     //-------------------------------------------------------------------------
     /** Any diagnostic message about the failure (which will typically be an
-        english phrase or sentence).
+        English phrase or sentence).
     */
     string Diagnostic;
 
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl
index 3e60d9b21e8d..ccfc9c640900 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkResolveNameException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkResolveNameException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
 
 
 //=============================================================================
@@ -37,7 +35,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** A network error specifing a name resolution failure.
+/** A network error specifying a name resolution failure.
 */
 published exception InteractiveNetworkResolveNameException: com::sun::star::ucb::InteractiveNetworkException
 {
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl
index dbeff75142a0..bd6d76c1e79a 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveNetworkWriteException_idl__
 #define __com_sun_star_ucb_InteractiveNetworkWriteException_idl__
 
-#ifndef __com_sun_star_ucb_InteractiveNetworkException_idl__
 #include <com/sun/star/ucb/InteractiveNetworkException.idl>
-#endif
 
 
 //=============================================================================
@@ -37,13 +35,13 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** A network error specifing a write failure.
+/** A network error specifying a write failure.
 */
 published exception InteractiveNetworkWriteException: com::sun::star::ucb::InteractiveNetworkException
 {
     //-------------------------------------------------------------------------
     /** Any diagnostic message about the failure (which will typically be an
-        english phrase or sentence).
+        English phrase or sentence).
     */
     string Diagnostic;
 
diff --git a/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl b/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl
index f3757b17b7fa..91abadd20210 100644
--- a/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_InteractiveWrongMediumException_idl__
 #define __com_sun_star_ucb_InteractiveWrongMediumException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ListAction.idl b/offapi/com/sun/star/ucb/ListAction.idl
index d7d9e2751eb5..509fdc92b07e 100644
--- a/offapi/com/sun/star/ucb/ListAction.idl
+++ b/offapi/com/sun/star/ucb/ListAction.idl
@@ -107,7 +107,7 @@ published struct ListAction
     long ListActionType;
 
     //-------------------------------------------------------------------------
-    /** dependend on the content of <member>ListAction::ListActionType</member>
+    /** depending on the content of <member>ListAction::ListActionType</member>
         the <member>ListAction::ActionInfo</member> could contain additional
         information about the changes happened (see table above).
     */
diff --git a/offapi/com/sun/star/ucb/ListActionType.idl b/offapi/com/sun/star/ucb/ListActionType.idl
index d370ce00f1d7..d371c75a8f9b 100644
--- a/offapi/com/sun/star/ucb/ListActionType.idl
+++ b/offapi/com/sun/star/ucb/ListActionType.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** These values are used to specify the type of change happened to a list.
 
-    <p>A change happened is sended from an <type>XDynamicResultSet</type>
+    <p>A change happened is sent from an <type>XDynamicResultSet</type>
     as <type>ListAction</type> to a <type>XDynamicResultSetListener</type>.
 
     <p>The values are contained in <member>ListAction::ListActionType</member>.
@@ -46,7 +46,7 @@ published constants ListActionType
     //-------------------------------------------------------------------------
     /** First notification to a single listener for purpose of initialization.
 
-    <p>This type of notification is required to be sended first and only once
+    <p>This type of notification is required to be sent first and only once
     to a new listener.
 
     <p>The member <member>ListAction::ActionInfo</member> is required to
@@ -76,7 +76,7 @@ published constants ListActionType
     <p> <member>ListAction::ActionInfo</member> could contain something but
     this is not required. For example, it could contain the properties of
     the new rows (i.e. for remote optimizing), but this is not required
-    nor unrestrictly recommended.
+    nor unrestrictedly recommended.
 
     <p>@todo ... further description of allowed contents for
     <member>ListAction::ActionInfo</member> is needed
@@ -101,7 +101,7 @@ published constants ListActionType
     //-------------------------------------------------------------------------
     /** The whole list was destroyed and independently rebuild.
 
-    <p>If 'CLEARED' is sended you don't need to refer to the old ResultSet.
+    <p>If "CLEARED" is sent you don't need to refer to the old ResultSet.
 
     <p>The members <member>ListAction::ListActionType</member>,
     <member>ListAction::Count</member> and <member>ListAction::Position</member>
@@ -117,9 +117,9 @@ published constants ListActionType
     moved rows. If the count is greater than one, the moved rows have to be
     one after the other.
 
-    <p><member>ListAction::ListActionType</member> is required to contain a 'long',
+    <p><member>ListAction::ListActionType</member> is required to contain a "long",
     which gives the shift of position.
-    (i.e. When two rows at position 3 and 4 are moved for a shift '+1',
+    (i.e. When two rows at position 3 and 4 are moved for a shift "+1",
     they will appear at the positions 4 and 5. In this action is included, that
     the row on old position 5 now appears on position 3.
     No other notification is needed, to explain or complete this action).
@@ -138,7 +138,7 @@ published constants ListActionType
 
     <p> <member>ListAction::ActionInfo</member> could contain something but
     this is not required. For example, it could contain the new properties
-    (i.e. for remote optimizing), but this is not required nor unrestrictly
+    (i.e. for remote optimizing), but this is not required nor unrestrictedly
     recommended.
 
     <p>@todo ... further description of allowed contents for
@@ -167,15 +167,15 @@ published constants ListActionType
 
     //-------------------------------------------------------------------------
     /*??????????????????????????? we probably will need this
-    After a completely notified Iteration send 'COMPLETED'.
+    After a completely notified Iteration send "COMPLETED".
 
     <p>This notification is required to be send, to indicate, that now the full
     result is reached.
 
     <p>E.g. while a new given list is sorted, some intermediate states are
     notified. After the last portion of sorting is done and notified you have
-    to send 'COMPLETED'. So a listener has the possibility to wait for
-    'COMPLETED' e.g. to print the full result. )
+    to send "COMPLETED". So a listener has the possibility to wait for
+    "COMPLETED" e.g. to print the full result. )
 
     <p>The members <member>ListAction::ListActionType</member>,
     <member>ListAction::Count</member> and <member>ListAction::Position</member>
diff --git a/offapi/com/sun/star/ucb/ListEvent.idl b/offapi/com/sun/star/ucb/ListEvent.idl
index b739f6e11178..fb718391661f 100644
--- a/offapi/com/sun/star/ucb/ListEvent.idl
+++ b/offapi/com/sun/star/ucb/ListEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_ListEvent_idl__
 #define __com_sun_star_ucb_ListEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ListAction_idl__
 #include <com/sun/star/ucb/ListAction.idl>
-#endif
 
 //=============================================================================
 
@@ -47,7 +42,7 @@ published struct ListEvent: com::sun::star::lang::EventObject
 {
     //-------------------------------------------------------------------------
     /** If you apply the given <type>ListAction</type>s one after the other
-        to the old version of an resultset in given order, you will get the
+        to the old version of an result set in given order, you will get the
         positions in the new version.
     */
     sequence<ListAction> Changes;
diff --git a/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl b/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl
index 5c279f974f94..6f43258a8a61 100644
--- a/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl
+++ b/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ListenerAlreadySetException_idl__
 #define __com_sun_star_ucb_ListenerAlreadySetException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/Lock.idl b/offapi/com/sun/star/ucb/Lock.idl
index cf6276f9a4e2..429fdf0b81b5 100644
--- a/offapi/com/sun/star/ucb/Lock.idl
+++ b/offapi/com/sun/star/ucb/Lock.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_ucb_Lock_idl__
 #define __com_sun_star_ucb_Lock_idl__
 
-#ifndef __com_sun_star_ucb_LockEntry_idl__
 #include <com/sun/star/ucb/LockEntry.idl>
-#endif
-#ifndef __com_sun_star_ucb_LockDepth_idl__
 #include <com/sun/star/ucb/LockDepth.idl>
-#endif
 
 //=============================================================================
 
@@ -51,7 +47,7 @@ published struct Lock : LockEntry
     //-------------------------------------------------------------------------
     /** the owner of the lock.
 
-        <p>This element providfes information sufficient for either directly
+        <p>This element provides information sufficient for either directly
         contacting a principal (such as a telephone number or email URI), or
         for discovering the principal (such as the URL of a homepage) who
         owns the lock.
@@ -64,7 +60,7 @@ published struct Lock : LockEntry
         <p>This element specifies the number of seconds between granting
         of the lock and the automatic removal of that lock. The value
         must not be greater than <code>2^32-1</code>. A value of <code>-1</code>
-        stands for an infinit lock, that will never be removed automatically.
+        stands for an infinite lock, that will never be removed automatically.
     */
     hyper Timeout;
 
diff --git a/offapi/com/sun/star/ucb/LockDepth.idl b/offapi/com/sun/star/ucb/LockDepth.idl
index 9ad463b16676..785ec193a74d 100644
--- a/offapi/com/sun/star/ucb/LockDepth.idl
+++ b/offapi/com/sun/star/ucb/LockDepth.idl
@@ -49,7 +49,7 @@ published enum LockDepth
     ONE,
 
     //-------------------------------------------------------------------------
-    /** Ininity (includes children and children's children and ...).
+    /** Infinity (includes children and children's children and ...).
     */
     INFINITY
 };
diff --git a/offapi/com/sun/star/ucb/LockEntry.idl b/offapi/com/sun/star/ucb/LockEntry.idl
index be348e09a08b..c1c5f049d5c6 100644
--- a/offapi/com/sun/star/ucb/LockEntry.idl
+++ b/offapi/com/sun/star/ucb/LockEntry.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_ucb_LockEntry_idl__
 #define __com_sun_star_ucb_LockEntry_idl__
 
-#ifndef __com_sun_star_ucb_LockScope_idl__
 #include <com/sun/star/ucb/LockScope.idl>
-#endif
-#ifndef __com_sun_star_ucb_LockType_idl__
 #include <com/sun/star/ucb/LockType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/LockType.idl b/offapi/com/sun/star/ucb/LockType.idl
index d85cfb7baeb8..da63746b06a2 100644
--- a/offapi/com/sun/star/ucb/LockType.idl
+++ b/offapi/com/sun/star/ucb/LockType.idl
@@ -50,7 +50,7 @@ published enum LockType
 //  READ,
 //
 //  //-------------------------------------------------------------------------
-//  /** readwrite lock.
+//  /** read-write lock.
 //  */
 //  READWRITE
 
diff --git a/offapi/com/sun/star/ucb/MissingInputStreamException.idl b/offapi/com/sun/star/ucb/MissingInputStreamException.idl
index 76dde6da44a8..a9d9c146af31 100644
--- a/offapi/com/sun/star/ucb/MissingInputStreamException.idl
+++ b/offapi/com/sun/star/ucb/MissingInputStreamException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_MissingInputStreamException_idl__
 #define __com_sun_star_ucb_MissingInputStreamException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
@@ -40,7 +38,7 @@ module com { module sun { module star { module ucb {
 /** This exception is used to indicate that there is an
     <type scope="com::sun::star::io">XInputStream</type> missing.
 
-    <p>For example, the command 'insert' may fail, if the implementation
+    <p>For example, the command "insert" may fail, if the implementation
     expects that an input stream is supplied with the given
     <type>InsertCommandArgument</type>.
 
diff --git a/offapi/com/sun/star/ucb/MissingPropertiesException.idl b/offapi/com/sun/star/ucb/MissingPropertiesException.idl
index 086c4a8ec8c7..ae3aff1aa892 100644
--- a/offapi/com/sun/star/ucb/MissingPropertiesException.idl
+++ b/offapi/com/sun/star/ucb/MissingPropertiesException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_MissingPropertiesException_idl__
 #define __com_sun_star_ucb_MissingPropertiesException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
@@ -40,7 +38,7 @@ module com { module sun { module star { module ucb {
 /** This exception is used to indicate that there are properties missing.
 
     <p>For example, to create a new resource, usually one ore more property
-    values must be set prior to executing the command 'insert', which makes
+    values must be set prior to executing the command "insert", which makes
     the new resource persistent.
 
     @version    1.0
diff --git a/offapi/com/sun/star/ucb/NameClashException.idl b/offapi/com/sun/star/ucb/NameClashException.idl
index e3cbedcb4d4c..490e90a540fd 100644
--- a/offapi/com/sun/star/ucb/NameClashException.idl
+++ b/offapi/com/sun/star/ucb/NameClashException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_NameClashException_idl__
 #define __com_sun_star_ucb_NameClashException_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/NameClashResolveRequest.idl b/offapi/com/sun/star/ucb/NameClashResolveRequest.idl
index a76e8845d0c7..f2523bfa7f2f 100644
--- a/offapi/com/sun/star/ucb/NameClashResolveRequest.idl
+++ b/offapi/com/sun/star/ucb/NameClashResolveRequest.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_NameClashResolveRequest_idl__
 #define __com_sun_star_ucb_NameClashResolveRequest_idl__
 
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
 #include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
@@ -40,7 +38,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** This request is used to indicate a name clash.
 
-    <p>For example, when copying a file there migth be another file in the
+    <p>For example, when copying a file there might be another file in the
     target folder that has the same file name as the source file.
 
     <p>If this exception is passed to an
diff --git a/offapi/com/sun/star/ucb/NumberedSortingInfo.idl b/offapi/com/sun/star/ucb/NumberedSortingInfo.idl
index f1b414974160..8a758d12dd07 100644
--- a/offapi/com/sun/star/ucb/NumberedSortingInfo.idl
+++ b/offapi/com/sun/star/ucb/NumberedSortingInfo.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module ucb {
 published struct NumberedSortingInfo
 {
     //-------------------------------------------------------------------------
-    /** sort the resultset by this column. Index starts with <code>1</code>.
+    /** sort the result set by this column. Index starts with <code>1</code>.
     */
     long ColumnIndex;
 
diff --git a/offapi/com/sun/star/ucb/ODMAContent.idl b/offapi/com/sun/star/ucb/ODMAContent.idl
index b74f8be34956..23c44d66da0f 100644
--- a/offapi/com/sun/star/ucb/ODMAContent.idl
+++ b/offapi/com/sun/star/ucb/ODMAContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_ODMAContent_idl__
 #define __com_sun_star_ucb_ODMAContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/ODMAContentProvider.idl b/offapi/com/sun/star/ucb/ODMAContentProvider.idl
index b5f5106cd81c..da67f01ae5bd 100644
--- a/offapi/com/sun/star/ucb/ODMAContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ODMAContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ODMAContentProvider_idl__
 #define __com_sun_star_ucb_ODMAContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
@@ -59,7 +57,7 @@ published service ODMAContentProvider
         <li><p>The document Content corresponds to a document stored on the
             DMS.</p>
         <li><p>The Root Folder exists at any time and is used to show all
-            documents avaible at that time. All other OCP contents are children
+            documents available at that time. All other OCP contents are children
             of this folder. The OCP Root Folder can only contain OCP Documents.
             It has the URL &bdquo;<b>vnd.sun.star.odma:/</b>&ldquo;.</p>
         </ol>
diff --git a/offapi/com/sun/star/ucb/OpenCommandArgument.idl b/offapi/com/sun/star/ucb/OpenCommandArgument.idl
index c09241aa5728..69911e6a9eaf 100644
--- a/offapi/com/sun/star/ucb/OpenCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/OpenCommandArgument.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_OpenCommandArgument_idl__
 #define __com_sun_star_ucb_OpenCommandArgument_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/OpenCommandArgument2.idl b/offapi/com/sun/star/ucb/OpenCommandArgument2.idl
index a9ab8b66dd83..5df59675c931 100644
--- a/offapi/com/sun/star/ucb/OpenCommandArgument2.idl
+++ b/offapi/com/sun/star/ucb/OpenCommandArgument2.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_OpenCommandArgument2_idl__
 #define __com_sun_star_ucb_OpenCommandArgument2_idl__
 
-#ifndef __com_sun_star_ucb_OpenCommandArgument_idl__
 #include <com/sun/star/ucb/OpenCommandArgument.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_NumberedSortingInfo_idl__
 #include <com/sun/star/ucb/NumberedSortingInfo.idl>
-#endif
 
 //=============================================================================
 
@@ -42,7 +37,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** The argument for commands like "open", "update", and "synchronize".
 
-    <p>This strcut extends the original OpenCommandArgument, which must not be
+    <p>This struct extends the original OpenCommandArgument, which must not be
     changed for compatibility reasons.
 
     @see XCommandProcessor
@@ -53,7 +48,7 @@ published struct OpenCommandArgument2 : OpenCommandArgument
     /** The sort criteria for the rows of the returned
         <type>ContentResultSet</type>.
 
-        <p>The resultset implementation may ignore this parameter, if it
+        <p>The result set implementation may ignore this parameter, if it
         cannot sort the data by the given criteria in an efficient way (i.e.
         directly using the underlying data source -> SQL-database -> ORDER BY).
     */
diff --git a/offapi/com/sun/star/ucb/PackageContentProvider.idl b/offapi/com/sun/star/ucb/PackageContentProvider.idl
index 8a26b4044bdf..4fd8dfe78f2e 100644
--- a/offapi/com/sun/star/ucb/PackageContentProvider.idl
+++ b/offapi/com/sun/star/ucb/PackageContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_PackageContentProvider_idl__
 #define __com_sun_star_ucb_PackageContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
@@ -77,7 +75,7 @@ published service PackageContentProvider
         abs-path       = "/" path-segments
         </li>
         <li>
-        path-segements = segment *( "/" segment )
+        path-segments = segment *( "/" segment )
         </li>
         <li>
         segment        = pchar
diff --git a/offapi/com/sun/star/ucb/PackageFolderContent.idl b/offapi/com/sun/star/ucb/PackageFolderContent.idl
index 13668bc54ea6..78500e5fb1d9 100644
--- a/offapi/com/sun/star/ucb/PackageFolderContent.idl
+++ b/offapi/com/sun/star/ucb/PackageFolderContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_PackageFolderContent_idl__
 #define __com_sun_star_ucb_PackageFolderContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/PackageStreamContent.idl b/offapi/com/sun/star/ucb/PackageStreamContent.idl
index 7da23332c959..8a923cf355d4 100644
--- a/offapi/com/sun/star/ucb/PackageStreamContent.idl
+++ b/offapi/com/sun/star/ucb/PackageStreamContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_PackageStreamContent_idl__
 #define __com_sun_star_ucb_PackageStreamContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
@@ -141,10 +115,10 @@ published service PackageStreamContent
         string Title
         </li>
         <li>
-        boolean Compressed ( allows you to explecitly state whether you want a
+        boolean Compressed ( allows you to explicitly state whether you want a
         stream to be compressed or not. The default value of this property
-        will be determined according to the value of the property 'MediaType'.
-        If it is empty or prefixed by "text/", the value of 'Compressed' is set
+        will be determined according to the value of the property "MediaType".
+        If it is empty or prefixed by "text/", the value of "Compressed" is set
         to true. Otherwise the value will be false. )
         </li>
         <li>
diff --git a/offapi/com/sun/star/ucb/PersistentPropertySet.idl b/offapi/com/sun/star/ucb/PersistentPropertySet.idl
index b25e1dfa25cb..f0403c9cefa6 100644
--- a/offapi/com/sun/star/ucb/PersistentPropertySet.idl
+++ b/offapi/com/sun/star/ucb/PersistentPropertySet.idl
@@ -27,25 +27,17 @@
 #ifndef __com_sun_star_ucb_PersistentPropertySet_idl__
 #define __com_sun_star_ucb_PersistentPropertySet_idl__
 
-#ifndef __com_sun_star_ucb_XPersistentPropertySet_idl__
 #include <com/sun/star/ucb/XPersistentPropertySet.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
 #include <com/sun/star/beans/XPropertyAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** This service containss the interfaces to implement by objects
+/** This service contains the interfaces to implement by objects
     returned by <member>XPropertySetRegistry::openPropertySet</member>.
   */
 published service PersistentPropertySet
diff --git a/offapi/com/sun/star/ucb/PostCommandArgument.idl b/offapi/com/sun/star/ucb/PostCommandArgument.idl
index c1c04c237af4..eb2b3aab040f 100644
--- a/offapi/com/sun/star/ucb/PostCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/PostCommandArgument.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_PostCommandArgument_idl__
 #define __com_sun_star_ucb_PostCommandArgument_idl__
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/PostCommandArgument2.idl b/offapi/com/sun/star/ucb/PostCommandArgument2.idl
index 6ee276c013e5..ea92d7943674 100644
--- a/offapi/com/sun/star/ucb/PostCommandArgument2.idl
+++ b/offapi/com/sun/star/ucb/PostCommandArgument2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_PostCommandArgument2_idl__
 #define __com_sun_star_ucb_PostCommandArgument2_idl__
 
-#ifndef __com_sun_star_ucb_PostCommandArgument_idl__
 #include <com/sun/star/ucb/PostCommandArgument.idl>
-#endif
 
 
 //=============================================================================
@@ -50,7 +48,7 @@ published struct PostCommandArgument2 : PostCommandArgument
     string MediaType;
 
     //-------------------------------------------------------------------------
-    /** The URL of the referer.
+    /** The URL of the referrer.
     */
     string Referer;
 };
diff --git a/offapi/com/sun/star/ucb/Priority.idl b/offapi/com/sun/star/ucb/Priority.idl
index 061676b26ab4..935f94d18074 100644
--- a/offapi/com/sun/star/ucb/Priority.idl
+++ b/offapi/com/sun/star/ucb/Priority.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** These are the possible values for the property "Priority".
 
-    @see XCommandprocessor
+    @see XCommandProcessor
     @see Content
 */
 published enum Priority
diff --git a/offapi/com/sun/star/ucb/PropertiesManager.idl b/offapi/com/sun/star/ucb/PropertiesManager.idl
index 9c855a9bb13b..09137b171329 100644
--- a/offapi/com/sun/star/ucb/PropertiesManager.idl
+++ b/offapi/com/sun/star/ucb/PropertiesManager.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_PropertiesManager_idl__
 #define __com_sun_star_ucb_PropertiesManager_idl__
 
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
 #include <com/sun/star/beans/XPropertySetInfo.idl>
-#endif
 
 //=============================================================================
 
@@ -37,7 +35,7 @@ module com { module sun { module star { module ucb {
 
 //=============================================================================
 /** This service provides access to the meta data of the well known
-    (prefdefined) UCB properties.
+    (predefined) UCB properties.
 
     @see com::sun::star::ucb::UniversalContentBroker
     @see com::sun::star::ucb::ContentProvider
@@ -47,7 +45,7 @@ published service PropertiesManager
 {
     //-------------------------------------------------------------------------
     /** This interface provides access to the meta data of the well known
-        (prefdefined) UCB properties.
+        (predefined) UCB properties.
      */
     interface com::sun::star::beans::XPropertySetInfo;
 };
diff --git a/offapi/com/sun/star/ucb/PropertySetRegistry.idl b/offapi/com/sun/star/ucb/PropertySetRegistry.idl
index 2d626335bcf1..6f5199b178b2 100644
--- a/offapi/com/sun/star/ucb/PropertySetRegistry.idl
+++ b/offapi/com/sun/star/ucb/PropertySetRegistry.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_ucb_PropertySetRegistry_idl__
 #define __com_sun_star_ucb_PropertySetRegistry_idl__
 
-#ifndef __com_sun_star_ucb_XPropertySetRegistry_idl__
 #include <com/sun/star/ucb/XPropertySetRegistry.idl>
-#endif
-#ifndef __com_sun_star_conatiner_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
@@ -45,7 +41,7 @@ module com { module sun { module star { module ucb {
 published service PropertySetRegistry
 {
     //-------------------------------------------------------------------------
-    /** A propertyset registry.
+    /** A property set registry.
      */
     interface com::sun::star::ucb::XPropertySetRegistry;
 
diff --git a/offapi/com/sun/star/ucb/PropertyValueInfo.idl b/offapi/com/sun/star/ucb/PropertyValueInfo.idl
index 1c55113e1eaa..5d93a7b53be9 100644
--- a/offapi/com/sun/star/ucb/PropertyValueInfo.idl
+++ b/offapi/com/sun/star/ucb/PropertyValueInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_PropertyValueInfo_idl__
 #define __com_sun_star_ucb_PropertyValueInfo_idl__
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_PropertyValueState_idl__
 #include <com/sun/star/ucb/PropertyValueState.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/RecipientInfo.idl b/offapi/com/sun/star/ucb/RecipientInfo.idl
index fe8f7d5d3a6b..4e0d70a04ca2 100644
--- a/offapi/com/sun/star/ucb/RecipientInfo.idl
+++ b/offapi/com/sun/star/ucb/RecipientInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_RecipientInfo_idl__
 #define __com_sun_star_ucb_RecipientInfo_idl__
 
-#ifndef __com_sun_star_ucb_OutgoingMessageState_idl__
 #include <com/sun/star/ucb/OutgoingMessageState.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/RememberAuthentication.idl b/offapi/com/sun/star/ucb/RememberAuthentication.idl
index 711eab079741..590a3e6407d4 100644
--- a/offapi/com/sun/star/ucb/RememberAuthentication.idl
+++ b/offapi/com/sun/star/ucb/RememberAuthentication.idl
@@ -50,7 +50,7 @@ published enum RememberAuthentication
     SESSION,
 
     //-------------------------------------------------------------------------
-    /** Remember the authentication data 'forever'.
+    /** Remember the authentication data "forever".
     */
     PERSISTENT
 
diff --git a/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl b/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl
index 2a0f84a5737f..c1a3caf4c889 100644
--- a/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl
+++ b/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_RemoteAccessContentProvider_idl__
 #define __com_sun_star_ucb_RemoteAccessContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_ContentProvider_idl__
 #include <com/sun/star/ucb/ContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XParameterizedContentProvider_idl__
 #include <com/sun/star/ucb/XParameterizedContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/RemoteContentProviderAcceptor.idl b/offapi/com/sun/star/ucb/RemoteContentProviderAcceptor.idl
index 88f71abb9986..ef9b8dc04968 100644
--- a/offapi/com/sun/star/ucb/RemoteContentProviderAcceptor.idl
+++ b/offapi/com/sun/star/ucb/RemoteContentProviderAcceptor.idl
@@ -50,7 +50,7 @@ published service RemoteContentProviderAcceptor
         for this service, which can improve performance in certain situations.
 
         <p>The way this works might change, therefore this interface is marked
-        as deprectated.
+        as deprecated.
 
         @deprecated
      */
diff --git a/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl b/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl
index ddf2c668763d..648729473b09 100644
--- a/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl
+++ b/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_ucb_RemoteContentProviderChangeEvent_idl__
 #define __com_sun_star_ucb_RemoteContentProviderChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-#ifndef __com_sun_star_ucb_RemoteContentProviderChangeAction_idl__
 #include <com/sun/star/ucb/RemoteContentProviderChangeAction.idl>
-#endif
 
 module com { module sun { module star { module ucb {
 
diff --git a/offapi/com/sun/star/ucb/RemoteProxyContentProvider.idl b/offapi/com/sun/star/ucb/RemoteProxyContentProvider.idl
index 9415346aacaf..b744322de176 100644
--- a/offapi/com/sun/star/ucb/RemoteProxyContentProvider.idl
+++ b/offapi/com/sun/star/ucb/RemoteProxyContentProvider.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module ucb {
 /** A <type>ContentProvider</type> that wraps remote content providers that
     (potentially) have been distributed to a UCB.
 
-    <p>Before trying to pass a request to a 'real,' underlying content provider
+    <p>Before trying to pass a request to a "real", underlying content provider
     (which will most likely be a remote content provider distributed to this
     UCB), this proxy first activates any remote content providers that have
     been distributed here, but are still inactive (see
@@ -46,7 +46,7 @@ module com { module sun { module star { module ucb {
     <type>XRemoteContentProviderActivator</type> for more information).
 
     <p>The way this works might change, therefore this interface is marked as
-    deprectated.
+    deprecated.
 
     @deprecated
  */
diff --git a/offapi/com/sun/star/ucb/ResultSetException.idl b/offapi/com/sun/star/ucb/ResultSetException.idl
index 7e207d96867b..8e49a1df125a 100644
--- a/offapi/com/sun/star/ucb/ResultSetException.idl
+++ b/offapi/com/sun/star/ucb/ResultSetException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ResultSetException_idl__
 #define __com_sun_star_ucb_ResultSetException_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
 #include <com/sun/star/sdbc/SQLException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/Rule.idl b/offapi/com/sun/star/ucb/Rule.idl
index 213ac28b1f3d..acfc868b641e 100644
--- a/offapi/com/sun/star/ucb/Rule.idl
+++ b/offapi/com/sun/star/ucb/Rule.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_Rule_idl__
 #define __com_sun_star_ucb_Rule_idl__
 
-#ifndef __com_sun_star_ucb_RuleTerm_idl__
 #include <com/sun/star/ucb/RuleTerm.idl>
-#endif
 
 
 //=============================================================================
@@ -65,7 +63,7 @@ published struct Rule
         </tr>
         <tr>
             <td>FORWARD</td>
-            <td>The email address of the recepient</td>
+            <td>The email address of the recipient</td>
         </tr>
         <tr>
             <td>All other actions</td>
diff --git a/offapi/com/sun/star/ucb/RuleSet.idl b/offapi/com/sun/star/ucb/RuleSet.idl
index ae4af6d876cb..182a469ad53c 100644
--- a/offapi/com/sun/star/ucb/RuleSet.idl
+++ b/offapi/com/sun/star/ucb/RuleSet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_RuleSet_idl__
 #define __com_sun_star_ucb_RuleSet_idl__
 
-#ifndef __com_sun_star_ucb_Rule_idl__
 #include <com/sun/star/ucb/Rule.idl>
-#endif
 
 
 //=============================================================================
@@ -47,7 +45,7 @@ module com { module sun { module star { module ucb {
 published struct RuleSet
 {
     //-------------------------------------------------------------------------
-    /** conatains a number of rules.
+    /** contains a number of rules.
     */
     sequence<com::sun::star::ucb::Rule> Rules;
 
diff --git a/offapi/com/sun/star/ucb/SearchCommandArgument.idl b/offapi/com/sun/star/ucb/SearchCommandArgument.idl
index 47353803dfa0..a7547bd6c104 100644
--- a/offapi/com/sun/star/ucb/SearchCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/SearchCommandArgument.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_SearchCommandArgument_idl__
 #define __com_sun_star_ucb_SearchCommandArgument_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_SearchInfo_idl__
 #include <com/sun/star/ucb/SearchInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/SearchCriterium.idl b/offapi/com/sun/star/ucb/SearchCriterium.idl
index 09be35ed6152..b523f9350454 100644
--- a/offapi/com/sun/star/ucb/SearchCriterium.idl
+++ b/offapi/com/sun/star/ucb/SearchCriterium.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_SearchCriterium_idl__
 #define __com_sun_star_ucb_SearchCriterium_idl__
 
-#ifndef __com_sun_star_ucb_RuleTerm_idl__
 #include <com/sun/star/ucb/RuleTerm.idl>
-#endif
 
 
 //=============================================================================
@@ -37,7 +35,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** a criterium describing how an object must match some rules that specify
+/** a criterion describing how an object must match some rules that specify
     (part of) a search.
 */
 published struct SearchCriterium
diff --git a/offapi/com/sun/star/ucb/SearchInfo.idl b/offapi/com/sun/star/ucb/SearchInfo.idl
index 5137db204c5c..fd246fa9cd83 100644
--- a/offapi/com/sun/star/ucb/SearchInfo.idl
+++ b/offapi/com/sun/star/ucb/SearchInfo.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_SearchInfo_idl__
 #define __com_sun_star_ucb_SearchInfo_idl__
 
-#ifndef __com_sun_star_ucb_SearchCriterium_idl__
 #include <com/sun/star/ucb/SearchCriterium.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_SearchRecursion_idl__
 #include <com/sun/star/ucb/SearchRecursion.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/SearchRecursion.idl b/offapi/com/sun/star/ucb/SearchRecursion.idl
index e682deb012d5..911faf88b20a 100644
--- a/offapi/com/sun/star/ucb/SearchRecursion.idl
+++ b/offapi/com/sun/star/ucb/SearchRecursion.idl
@@ -33,7 +33,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** the various modes of recursion when searching through a hierachical
+/** the various modes of recursion when searching through a hierarchical
     object.
 
     @see SearchInfo
diff --git a/offapi/com/sun/star/ucb/SendMediaTypes.idl b/offapi/com/sun/star/ucb/SendMediaTypes.idl
index 64a4710bbe1a..ae1abce97f1e 100644
--- a/offapi/com/sun/star/ucb/SendMediaTypes.idl
+++ b/offapi/com/sun/star/ucb/SendMediaTypes.idl
@@ -33,7 +33,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** contains a list of internet media types (like "text/plain" and "text/html"),
+/** contains a list of Internet media types (like "text/plain" and "text/html"),
     that are related to a send protocol.
 */
 published struct SendMediaTypes
@@ -45,7 +45,7 @@ published struct SendMediaTypes
     string ProtocolType;
 
     //-------------------------------------------------------------------------
-    /** a list of internet media types
+    /** a list of Internet media types
     */
     sequence<string> Value;
 
diff --git a/offapi/com/sun/star/ucb/ServiceNotFoundException.idl b/offapi/com/sun/star/ucb/ServiceNotFoundException.idl
index e5780837b9bd..d63b55c485f9 100644
--- a/offapi/com/sun/star/ucb/ServiceNotFoundException.idl
+++ b/offapi/com/sun/star/ucb/ServiceNotFoundException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_ServiceNotFoundException_idl__
 #define __com_sun_star_ucb_ServiceNotFoundException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/SimpleFileAccess.idl b/offapi/com/sun/star/ucb/SimpleFileAccess.idl
index 4a1d69d2458d..25ec2d130107 100644
--- a/offapi/com/sun/star/ucb/SimpleFileAccess.idl
+++ b/offapi/com/sun/star/ucb/SimpleFileAccess.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_SimpleFileAccess_idl__
 #define __com_sun_star_ucb_SimpleFileAccess_idl__
 
-#ifndef __com_sun_star_ucb_XSimpleFileAccess2_idl__
 #include <com/sun/star/ucb/XSimpleFileAccess2.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
index d9ad5d7cb6e6..45a8f8a0486f 100644
--- a/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_SortedDynamicResultSetFactory_idl__
 #define __com_sun_star_ucb_SortedDynamicResultSetFactory_idl__
 
-#ifndef __com_sun_star_ucb_XSortedDynamicResultSetFactory_idl__
 #include <com/sun/star/ucb/XSortedDynamicResultSetFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/Store.idl b/offapi/com/sun/star/ucb/Store.idl
index 18eca0e9fb61..a6f2daf60a08 100644
--- a/offapi/com/sun/star/ucb/Store.idl
+++ b/offapi/com/sun/star/ucb/Store.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_Store_idl__
 #define __com_sun_star_ucb_Store_idl__
 
-#ifndef __com_sun_star_ucb_XPropertySetRegistryFactory_idl__
 #include <com/sun/star/ucb/XPropertySetRegistryFactory.idl>
-#endif
 
 //=============================================================================
 
@@ -41,8 +39,8 @@ module com { module sun { module star { module ucb {
 published service Store
 {
     //-------------------------------------------------------------------------
-    /** A factory for propertyset registries. This factory must create
-        instances of the service <typePropertySetRegistry</type>
+    /** A factory for property set registries. This factory must create
+        instances of the service <type>PropertySetRegistry</type>
      */
     interface com::sun::star::ucb::XPropertySetRegistryFactory;
 };
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl b/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl
index f654819a6d8d..27a7b47e6467 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_TransientDocumentsContentProvider_idl__
 #define __com_sun_star_ucb_TransientDocumentsContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
@@ -40,7 +38,7 @@ module com { module sun { module star { module ucb {
     <type>ContentProvider</type> for the <type>UniversalContentBroker</type>
     (UCB).
 
-    <p>It provides access to the hierachical structure of the documents that
+    <p>It provides access to the hierarchical structure of the documents that
     are active in a running OpenOffice.org process. As long as a document was
     not closed, the TDCP can access it. All documents that have been loaded -
     regardless of their persistent document format (sxw, doc, sxc, xls, ...)
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl
index 54314f5bd24b..315599c77173 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_TransientDocumentsDocumentContent_idl__
 #define __com_sun_star_ucb_TransientDocumentsDocumentContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl
index 68ad0be1f7bb..f55acd7e7500 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_TransientDocumentsFolderContent_idl__
 #define __com_sun_star_ucb_TransientDocumentsFolderContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl
index cf953bb3d60a..69a5d7cd46a6 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl
@@ -27,48 +27,22 @@
 #ifndef __com_sun_star_ucb_TransientDocumentsRootContent_idl__
 #define __com_sun_star_ucb_TransientDocumentsRootContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** A TDCP Root Folder is the root container for all other DTCP contents.
+/** A TDCP Root Folder is the root container for all other TDCP contents.
 
     <p>There is at most one instance of a TDCP Root at a time. All other TDCP
     contents are children of this folder. The TDCP Root Folder can contain
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl
index 7aaf3d4574db..34ecab40addc 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_TransientDocumentsStreamContent_idl__
 #define __com_sun_star_ucb_TransientDocumentsStreamContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
index 8e1ed6c0d2b5..268c709ebef9 100644
--- a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
+++ b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_URLAuthenticationRequest_idl__
 #define __com_sun_star_ucb_URLAuthenticationRequest_idl__
 
-#ifndef __com_sun_star_ucb_AuthenticationRequest_idl__
 #include <com/sun/star/ucb/AuthenticationRequest.idl>
-#endif
 
 
 //=============================================================================
@@ -37,7 +35,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** An error specifing lack of correct authentication data (e.g., to log into
+/** An error specifying lack of correct authentication data (e.g., to log into
     an account).
 
     @since OOo 3.2
diff --git a/offapi/com/sun/star/ucb/UniversalContentBroker.idl b/offapi/com/sun/star/ucb/UniversalContentBroker.idl
index 562508a74314..3fc4d8eee1b8 100644
--- a/offapi/com/sun/star/ucb/UniversalContentBroker.idl
+++ b/offapi/com/sun/star/ucb/UniversalContentBroker.idl
@@ -27,33 +27,13 @@
 #ifndef __com_sun_star_ucb_UniversalContentBroker_idl__
 #define __com_sun_star_ucb_UniversalContentBroker_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProviderManager_idl__
 #include <com/sun/star/ucb/XContentProviderManager.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifierFactory_idl__
 #include <com/sun/star/ucb/XContentIdentifierFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
@@ -69,7 +49,7 @@ module com { module sun { module star { module ucb {
     <type scope="com::sun::star::lang">XInitialization</type> interface for
     details.
 
-    <p>If the instance is created without arguments, the newly instatiated
+    <p>If the instance is created without arguments, the newly instantiated
     broker is not configured.
 */
 published service UniversalContentBroker
@@ -78,7 +58,7 @@ published service UniversalContentBroker
     /** must be implemented to make it possible to resolve cyclic object
         references.
 
-        <p>Those references i.e. may occure if content provider implementations
+        <p>Those references i.e. may occur if content provider  implementations
         hold references to the Broker. The Broker itself always holds its
         providers. If the Broker shall be released,
         <member scope="com::sun::star::lang">XComponent::dispose</member>
@@ -153,7 +133,7 @@ published service UniversalContentBroker
                 [parameter type and name]
 
         -----------------------------------------------------------------------
-        Requiered commands:
+        Required commands:
         -----------------------------------------------------------------------
 
         // This command obtains an interface which allows to query
@@ -167,7 +147,7 @@ published service UniversalContentBroker
         // Additionally, it can be used to create a link to a Content.
         // The implementation must be able to handle Contents provided
         // by any Content Provider. This is different from the command
-        // 'transfer' that can be supported by a Content. That command
+        // "transfer" that can be supported by a Content. That command
         // typically can only handle <type>Content</type>s provided by one
         // <type>ContentProvider</type>.
 
diff --git a/offapi/com/sun/star/ucb/UnsupportedCommandException.idl b/offapi/com/sun/star/ucb/UnsupportedCommandException.idl
index 03431da57906..1ab6036ecac9 100644
--- a/offapi/com/sun/star/ucb/UnsupportedCommandException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedCommandException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_UnsupportedCommandException_idl__
 #define __com_sun_star_ucb_UnsupportedCommandException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl b/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl
index 47dcf76ca4a0..6c881fb5d529 100644
--- a/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_ucb_UnsupportedDataSinkException_idl__
 #define __com_sun_star_ucb_UnsupportedDataSinkException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -44,7 +40,7 @@ module com { module sun { module star { module ucb {
     is not supported.
 
     <p>For example, each <type>OpenCommandArgument</type> supplied as argument
-    of the command 'open' contains such a data sink.
+    of the command "open" contains such a data sink.
 
     @version    1.0
     @author     Kai Sommerfeld
diff --git a/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl b/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl
index 2a4417291489..aaee66ff310d 100644
--- a/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl
@@ -28,20 +28,18 @@
 #ifndef __com_sun_star_ucb_UnsupportedNameClashException_idl__
 #define __com_sun_star_ucb_UnsupportedNameClashException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** <p>This exception must be thrown in case the requested nameclash
+/** <p>This exception must be thrown in case the requested name clash
     directive is not supported, because it is not possible to implement
     it or if it is just not (yet) implemented.
 
-    <p>Command 'transfer': Used if the nameclash directive specified in
+    <p>Command "transfer": Used if the name clash directive specified in
     parameter NameClash of the supplied <type>TransferInfo</type> is not
     supported. For example, if the NameClash was set to NameClash::ERROR,
     to NameClash::RENAME or to NameClash::ASK, the implementation must be
@@ -49,7 +47,7 @@ module com { module sun { module star { module ucb {
     be used if NameClash::RENAME was specified and the implementation is
     unable to create a valid new name after a suitable number of tries.
 
-    <p>Command 'insert': Used if the parameter ReplaceExisting of the
+    <p>Command "insert": Used if the parameter ReplaceExisting of the
     supplied <type>InsertCommandArgument</type> was set to <false/> and the
     implementation is unable to determine whether there are existing data.
     The member NameClash of the exception must be set to NameClash::ERROR
diff --git a/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl b/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl
index 5e79f175ebd9..bfd3e6d77670 100644
--- a/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_UnsupportedOpenModeException_idl__
 #define __com_sun_star_ucb_UnsupportedOpenModeException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
@@ -41,7 +39,7 @@ module com { module sun { module star { module ucb {
     is not supported.
 
     <p>For example, each <type>OpenCommandArgument</type> supplied as argument
-    of the command 'open' contains such an open mode.
+    of the command "open" contains such an open mode.
 
     @version    1.0
     @author     Kai Sommerfeld
diff --git a/offapi/com/sun/star/ucb/WebDAVContentProvider.idl b/offapi/com/sun/star/ucb/WebDAVContentProvider.idl
index 17c6d66e8c1f..2091497c56e3 100644
--- a/offapi/com/sun/star/ucb/WebDAVContentProvider.idl
+++ b/offapi/com/sun/star/ucb/WebDAVContentProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_WebDAVContentProvider_idl__
 #define __com_sun_star_ucb_WebDAVContentProvider_idl__
 
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
@@ -41,7 +39,7 @@ module com { module sun { module star { module ucb {
 
     <p>It provides access to WebDAV and standard HTTP servers. The DCP
     communicates with the server using the WebDAV protocol which is an
-    extention to the HTTP protocol or using the plain HTTP protocol in case
+    extension to the HTTP protocol or using the plain HTTP protocol in case
     the server  is not WebDAV enabled.
 
     @see com::sun::star::ucb::Content
diff --git a/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl b/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl
index 7fbfd36ebdb9..0ee2e07a1493 100644
--- a/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl
+++ b/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_WebDAVDocumentContent_idl__
 #define __com_sun_star_ucb_WebDAVDocumentContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/WebDAVFolderContent.idl b/offapi/com/sun/star/ucb/WebDAVFolderContent.idl
index 5363015cfb99..63ec9fd83d21 100644
--- a/offapi/com/sun/star/ucb/WebDAVFolderContent.idl
+++ b/offapi/com/sun/star/ucb/WebDAVFolderContent.idl
@@ -27,45 +27,16 @@
 #ifndef __com_sun_star_ucb_WebDAVFolderContent_idl__
 #define __com_sun_star_ucb_WebDAVFolderContent_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #include <com/sun/star/ucb/XCommandProcessor2.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentCreator_idl__
 #include <com/sun/star/ucb/XContentCreator.idl>
-#endif
 
 //=============================================================================
 
@@ -122,7 +93,7 @@ published service WebDAVFolderContent
         </li>
         <li>
         transfer ( only transfers from DCP Folders/DCP Documents to other
-        DCP folders. Source and target must recide on the same server. )
+        DCP folders. Source and target must reside on the same server. )
         </li>
         </ul>
 
diff --git a/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl b/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl
index 329f36f7696d..053e62d55680 100644
--- a/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl
+++ b/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_WelcomeDynamicResultSetStruct_idl__
 #define __com_sun_star_ucb_WelcomeDynamicResultSetStruct_idl__
 
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
 
 //=============================================================================
 
@@ -48,12 +46,12 @@ module com { module sun { module star { module ucb {
 published struct WelcomeDynamicResultSetStruct
 {
     //-------------------------------------------------------------------------
-    /** The static resultset containing the previous version of resultset data.
+    /** The static result set containing the previous version of result set data.
     */
     com::sun::star::sdbc::XResultSet    Old;
 
     //-------------------------------------------------------------------------
-    /** The static resultset containing the new version of resultset data.
+    /** The static result set containing the new version of result set data.
     */
     com::sun::star::sdbc::XResultSet    New;
 };
diff --git a/offapi/com/sun/star/ucb/XAnyCompare.idl b/offapi/com/sun/star/ucb/XAnyCompare.idl
index f718883ac582..dab6789299f6 100644
--- a/offapi/com/sun/star/ucb/XAnyCompare.idl
+++ b/offapi/com/sun/star/ucb/XAnyCompare.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XAnyCompare_idl__
 #define __com_sun_star_ucb_XAnyCompare_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -42,7 +40,7 @@ module com { module sun { module star { module ucb {
 published interface XAnyCompare: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** allows comparision of two <atom>any</atom>s.
+    /** allows comparison of two <atom>any</atom>s.
 
         @param Any1
         is the first compare value
diff --git a/offapi/com/sun/star/ucb/XAnyCompareFactory.idl b/offapi/com/sun/star/ucb/XAnyCompareFactory.idl
index 6356c846aa47..93f2525fee80 100644
--- a/offapi/com/sun/star/ucb/XAnyCompareFactory.idl
+++ b/offapi/com/sun/star/ucb/XAnyCompareFactory.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
 #define __com_sun_star_ucb_XAnyCompareFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XAnyCompare_idl__
 #include <com/sun/star/ucb/XAnyCompare.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl b/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
index 2f764a05c4f9..aa7c64a4fcc3 100644
--- a/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XCachedContentResultSetFactory_idl__
 #define __com_sun_star_ucb_XCachedContentResultSetFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifierMapping_idl__
 #include <com/sun/star/ucb/XContentIdentifierMapping.idl>
-#endif
 
 //=============================================================================
 
@@ -59,7 +51,7 @@ published interface XCachedContentResultSetFactory: com::sun::star::uno::XInterf
         @param xMapping
         can be used for optimization of remote access via the interface
         <type>XContentAccess</type> of the <type>CachedContentResultSet</type>.
-        This paramter can be <NULL/>.
+        This parameter can be <NULL/>.
 
         @returns
         an instance of service <type>CachedContentResultSet</type>.
diff --git a/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl b/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl
index 9a78bc2e0952..a11a83c83685 100644
--- a/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XCachedContentResultSetStubFactory_idl__
 #define __com_sun_star_ucb_XCachedContentResultSetStubFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
index f7ccbc2c8804..fb3ce003afc1 100644
--- a/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XCachedDynamicResultSetFactory_idl__
 #define __com_sun_star_ucb_XCachedDynamicResultSetFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifierMapping_idl__
 #include <com/sun/star/ucb/XContentIdentifierMapping.idl>
-#endif
 
 //=============================================================================
 
@@ -46,7 +38,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** creates a <type>CachedDynamicResultSet</type>.
 
-    <p>Pay attention to instanciate this helper on clientside where your want
+    <p>Pay attention to instantiate this helper on client side where your want
     to read the data respectively where you have instantiated the listener to
     the <type>XDynamicResultSet</type>.
 
@@ -67,7 +59,7 @@ published interface XCachedDynamicResultSetFactory: com::sun::star::uno::XInterf
 
         @param ContentIdentifierMapping
         is not required, but can be set if it is necessary to change the
-        identity of the contents accessable via the interface
+        identity of the contents accessible via the interface
         <type>XContentAccess</type> of the <type>ContentResultSet</type>
         (e.g., if merging two sources of the same type).
 
diff --git a/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl b/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl
index cb46cca15c82..3cb0c705f9eb 100644
--- a/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_ucb_XCachedDynamicResultSetStubFactory_idl__
 #define __com_sun_star_ucb_XCachedDynamicResultSetStubFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_NumberedSortingInfo_idl__
 #include <com/sun/star/ucb/NumberedSortingInfo.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
 #include <com/sun/star/ucb/XAnyCompareFactory.idl>
-#endif
 
 //=============================================================================
 
@@ -52,14 +41,14 @@ module com { module sun { module star { module ucb {
     optimized <type>DynamicResultSet</type> to a remote optimized
     <type>CachedDynamicResultSet</type>.
 
-    <p>Pay attention to instanciate this helper on serverside where your source
-    <type>DynamicResultSet</type> was instanciated.
+    <p>Pay attention to instantiate this helper on server side where your source
+    <type>DynamicResultSet</type> was instantiated.
 
     <p>Method
     <member>XCachedDynamicResultSetStubFactory::createCachedDynamicResultSetStub</member>
-    can be used to create a stub on serverside.
+    can be used to create a stub on server side.
 
-    <p>If you have instanciated a <type>CachedDynamicResultSet</type> on client
+    <p>If you have instantiated a <type>CachedDynamicResultSet</type> on client
     side already, use method <member>connectToCache</member> to connect your
     given DynamicResultSet with this Cache.
 
@@ -83,7 +72,7 @@ published interface XCachedDynamicResultSetStubFactory: com::sun::star::uno::XIn
                 [in] com::sun::star::ucb::XDynamicResultSet Source );
 
     //-------------------------------------------------------------------------
-    /** If you have instanciated a <type>CachedDynamicResultSet</type> on
+    /** If you have instantiated a <type>CachedDynamicResultSet</type> on
         client side already, use this to connect your given Source on server
         side to the TargetCache.
 
@@ -99,7 +88,7 @@ published interface XCachedDynamicResultSetStubFactory: com::sun::star::uno::XIn
 
         @param CompareFactory
         will be ignored unless SortingInfo is not empty. Then the supplied
-        factory will be used to instanciate objects used to compare the
+        factory will be used to instantiate objects used to compare the
         properties that are involved in sorting.
 
         @throws ListenerAlreadySetException
diff --git a/offapi/com/sun/star/ucb/XCommandEnvironment.idl b/offapi/com/sun/star/ucb/XCommandEnvironment.idl
index 35e1af812e60..6da80eb46a78 100644
--- a/offapi/com/sun/star/ucb/XCommandEnvironment.idl
+++ b/offapi/com/sun/star/ucb/XCommandEnvironment.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_ucb_XCommandEnvironment_idl__
 #define __com_sun_star_ucb_XCommandEnvironment_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XProgressHandler_idl__
 #include <com/sun/star/ucb/XProgressHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCommandInfo.idl b/offapi/com/sun/star/ucb/XCommandInfo.idl
index e262e658a424..fa14abf07b99 100644
--- a/offapi/com/sun/star/ucb/XCommandInfo.idl
+++ b/offapi/com/sun/star/ucb/XCommandInfo.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XCommandInfo_idl__
 #define __com_sun_star_ucb_XCommandInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CommandInfo_idl__
 #include <com/sun/star/ucb/CommandInfo.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_UnsupportedCommandException_idl__
 #include <com/sun/star/ucb/UnsupportedCommandException.idl>
-#endif
 
 
 //=============================================================================
@@ -103,7 +95,7 @@ published interface XCommandInfo: com::sun::star::uno::XInterface
     boolean hasCommandByName( [in] string Name );
 
     //-------------------------------------------------------------------------
-    /** checks whether a apecific command is supported.
+    /** checks whether a specific command is supported.
 
         @returns
         <TRUE/> if a command with the specified handle is supported;
diff --git a/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl b/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl
index 3bd9012c5b4c..082646442914 100644
--- a/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl
+++ b/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XCommandInfoChangeListener_idl__
 #define __com_sun_star_ucb_XCommandInfoChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CommandInfoChangeEvent_idl__
 #include <com/sun/star/ucb/CommandInfoChangeEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl b/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl
index 43379f86de83..2d7275e7bf5d 100644
--- a/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl
+++ b/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 #define __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_ucb_XCommandInfoChangeListener_idl__
 #include <com/sun/star/ucb/XCommandInfoChangeListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XCommandProcessor.idl b/offapi/com/sun/star/ucb/XCommandProcessor.idl
index 92da7d7f1495..5490c1a8595b 100644
--- a/offapi/com/sun/star/ucb/XCommandProcessor.idl
+++ b/offapi/com/sun/star/ucb/XCommandProcessor.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #define __com_sun_star_ucb_XCommandProcessor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandEnvironment_idl__
 #include <com/sun/star/ucb/XCommandEnvironment.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_Command_idl__
 #include <com/sun/star/ucb/Command.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CommandAbortedException_idl__
 #include <com/sun/star/ucb/CommandAbortedException.idl>
-#endif
 
 //=============================================================================
 
@@ -68,7 +57,7 @@ published interface XCommandProcessor : com::sun::star::uno::XInterface
     /** creates a unique identifier for a command.
 
         <p>This identifier can be used to abort the execution of the command
-        accociated with that identifier. Note that it is generally not
+        associated with that identifier. Note that it is generally not
         necessary to obtain a new id for each command, because commands are
         executed synchronously. So the id for a command is valid again after a
         command previously associated with this id has finished. In fact you
@@ -94,7 +83,7 @@ published interface XCommandProcessor : com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** executes a command.
 
-        <p>Common command definitions can be found in the soecification of the
+        <p>Common command definitions can be found in the specification of the
         service <type>Content</type>.
 
         @param aCommand
@@ -124,7 +113,7 @@ published interface XCommandProcessor : com::sun::star::uno::XInterface
         to indicate that two threads tried to use the same command identifier
 
         @throws Exception
-        if an error occured during the execution of the command.
+        if an error occurred during the execution of the command.
     */
     any execute( [in] Command aCommand,
                  [in] long CommandId,
diff --git a/offapi/com/sun/star/ucb/XCommandProcessor2.idl b/offapi/com/sun/star/ucb/XCommandProcessor2.idl
index cc9d1c885a7a..314e46c890ba 100644
--- a/offapi/com/sun/star/ucb/XCommandProcessor2.idl
+++ b/offapi/com/sun/star/ucb/XCommandProcessor2.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
 #define __com_sun_star_ucb_XCommandProcessor2_idl__
 
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
 
 module com { module sun { module star { module ucb {
 
@@ -42,7 +40,7 @@ module com { module sun { module star { module ucb {
 published interface XCommandProcessor2: com::sun::star::ucb::XCommandProcessor
 {
     //------------------------------------------------------------------------
-    /** releases a command identifier obtainded through
+    /** releases a command identifier obtained through
         <member>XCommandProcessor::createCommandIdentifier</member> when it is
         no longer used.
 
@@ -59,7 +57,7 @@ published interface XCommandProcessor2: com::sun::star::ucb::XCommandProcessor
         identifier is invalid (not obtained via
         <member>XCommandProcessor::createCommandIdentifier</member> or already
         handed to <member>XCommandProcessor2::releaseCommandIdentifier</member>
-        before), the behaviour is undefined.
+        before), the behavior is undefined.
      */
     [oneway] void releaseCommandIdentifier([in] long CommandId);
 };
diff --git a/offapi/com/sun/star/ucb/XContent.idl b/offapi/com/sun/star/ucb/XContent.idl
index 2be61f32ac56..7cf1dd0bd513 100644
--- a/offapi/com/sun/star/ucb/XContent.idl
+++ b/offapi/com/sun/star/ucb/XContent.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XContent_idl__
 #define __com_sun_star_ucb_XContent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
 #include <com/sun/star/ucb/XContentIdentifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentEventListener_idl__
 #include <com/sun/star/ucb/XContentEventListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentAccess.idl b/offapi/com/sun/star/ucb/XContentAccess.idl
index 8ead478e660f..a7758a3dff51 100644
--- a/offapi/com/sun/star/ucb/XContentAccess.idl
+++ b/offapi/com/sun/star/ucb/XContentAccess.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XContentAccess_idl__
 #define __com_sun_star_ucb_XContentAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XContentCreator.idl b/offapi/com/sun/star/ucb/XContentCreator.idl
index 6dcc42b37471..bff4e1b072c0 100644
--- a/offapi/com/sun/star/ucb/XContentCreator.idl
+++ b/offapi/com/sun/star/ucb/XContentCreator.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XContentCreator_idl__
 #define __com_sun_star_ucb_XContentCreator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ContentInfo_idl__
 #include <com/sun/star/ucb/ContentInfo.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentEventListener.idl b/offapi/com/sun/star/ucb/XContentEventListener.idl
index 069f9c1012cc..f7b7c163db8e 100644
--- a/offapi/com/sun/star/ucb/XContentEventListener.idl
+++ b/offapi/com/sun/star/ucb/XContentEventListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XContentEventListener_idl__
 #define __com_sun_star_ucb_XContentEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ContentEvent_idl__
 #include <com/sun/star/ucb/ContentEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XContentIdentifier.idl b/offapi/com/sun/star/ucb/XContentIdentifier.idl
index 143bcfdb0ac7..2bd500caee7b 100644
--- a/offapi/com/sun/star/ucb/XContentIdentifier.idl
+++ b/offapi/com/sun/star/ucb/XContentIdentifier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XContentIdentifier_idl__
 #define __com_sun_star_ucb_XContentIdentifier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -51,15 +49,15 @@ published interface XContentIdentifier: com::sun::star::uno::XInterface
         @returns
         the content identifier string. This must be a valid URI
         (Uniform Resource Identifier, see RFC 2396). This string
-        is required. If a content provider 'implements' some
+        is required. If a content provider "implements" some
         existent URI scheme (e.g., a content provider offering
-        access to a file system would implement the 'file' scheme,
+        access to a file system would implement the "file" scheme,
         and a content provider offering access to IMAP servers
-        would implement the 'imap' scheme), the content identifier
+        would implement the "imap" scheme), the content identifier
         strings should use that scheme. If on the other hand a
         content provider offers access to content for which no
         appropriate URI scheme exists, a vendor-specific URL scheme
-        starting with 'vnd.' must be created (see the Internet Draft
+        starting with "vnd." must be created (see the Internet Draft
         draft-king-vnd-urlscheme-00.txt).
     */
     string getContentIdentifier();
@@ -68,9 +66,9 @@ published interface XContentIdentifier: com::sun::star::uno::XInterface
     /** returns the content provider scheme string.
 
           <p>This string will   be calculated from the content identifier string
-        and must be lower-cased(!). It is the 'scheme' the content provider is
+        and must be lower-cased(!). It is the "scheme" the content provider is
         registered for. In example, a provider for FTP contents will use
-        ftp-URL's as content identifiers. The content provider scheme for all
+        ftp-URLs as content identifiers. The content provider scheme for all
         contents provided by that provider will be "ftp".
         </p>
 
diff --git a/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl b/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl
index 5a89d4e59087..5f771cd1feed 100644
--- a/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl
+++ b/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XContentIdentifierFactory_idl__
 #define __com_sun_star_ucb_XContentIdentifierFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
 #include <com/sun/star/ucb/XContentIdentifier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl b/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
index e4ab524fed8b..953b459fbb10 100644
--- a/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
+++ b/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XContentIdentifierMapping_idl__
 #define __com_sun_star_ucb_XContentIdentifierMapping_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -47,7 +45,7 @@ module com { module sun { module star { module ucb {
     between <type>XContent</type>s identified by source/target
     XContentIdentifiers is also supported.
 
-    <p>This interface can be useful in cases where the identifieres (and
+    <p>This interface can be useful in cases where the identifiers (and
     associated contents) returned by the various methods of an
     <type>XContentAccess</type> need to be mapped to some other space of
     identifiers (and associated contents).
@@ -106,12 +104,12 @@ published interface XContentIdentifierMapping: com::sun::star::uno::XInterface
         of the XRow (the first column goes into the zeroth position of the
         sequence, and so on).  On output, the same sequence, but with the
         entries mapped as necessary.  This is an inout parameter rather than a
-        comination of in parameter and return value for performance reasons
+        combination of in parameter and return value for    performance reasons
         (assuming that in most cases most elements in the input sequence will
         be returned unmodified).
 
         @returns  <TRUE/> if any of the columns contain data that (potentially)
-        needs mapping (though maybe no mapping occured for the concrete input
+        needs mapping (though maybe no mapping occurred for the concrete input
         data of this call).  This information can be useful to decide whether,
         for another row, a call to this function is at all necessary.
     */
diff --git a/offapi/com/sun/star/ucb/XContentProvider.idl b/offapi/com/sun/star/ucb/XContentProvider.idl
index 1422441a8879..f13ba15df8b5 100644
--- a/offapi/com/sun/star/ucb/XContentProvider.idl
+++ b/offapi/com/sun/star/ucb/XContentProvider.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_ucb_XContentProvider_idl__
 #define __com_sun_star_ucb_XContentProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
 #include <com/sun/star/ucb/XContentIdentifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContent_idl__
 #include <com/sun/star/ucb/XContent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_IllegalIdentifierException_idl__
 #include <com/sun/star/ucb/IllegalIdentifierException.idl>
-#endif
 
 //=============================================================================
 
@@ -87,7 +76,7 @@ published interface XContentProvider: com::sun::star::uno::XInterface
 
         @returns
         <code>0</code> is returned, if the identifiers are equal.
-        A value less than <code>0</code> indiactes, that the Id1
+        A value less than <code>0</code> indicates, that the Id1
         is less than Id2. A value greater than <code>0</code>
         is returned, if Id1 is greater than Id2.
     */
diff --git a/offapi/com/sun/star/ucb/XContentProviderFactory.idl b/offapi/com/sun/star/ucb/XContentProviderFactory.idl
index 034be592ece0..8a88409ebe42 100644
--- a/offapi/com/sun/star/ucb/XContentProviderFactory.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderFactory.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XContentProviderFactory_idl__
 #define __com_sun_star_ucb_XContentProviderFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XContentProviderManager.idl b/offapi/com/sun/star/ucb/XContentProviderManager.idl
index 9e3ed70a1276..f7bbfee54c87 100644
--- a/offapi/com/sun/star/ucb/XContentProviderManager.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderManager.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_ucb_XContentProviderManager_idl__
 #define __com_sun_star_ucb_XContentProviderManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_DuplicateProviderException_idl__
 #include <com/sun/star/ucb/DuplicateProviderException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ContentProviderInfo_idl__
 #include <com/sun/star/ucb/ContentProviderInfo.idl>
-#endif
 
 
 //=============================================================================
@@ -112,7 +101,7 @@ published interface XContentProviderManager: com::sun::star::uno::XInterface
         (<code>&lt;simple-authority&gt:</code>), or by arbitrary characters not
         including any of '/', '?', or '#', followed by a given string literal,
         followed by arbitrary characters that start with one of '/', '?', or
-        '#', if any. The comparision of string literals is done ignoring the
+        '#', if any. The comparison of string literals is done ignoring the
         case of ASCII letters.  The <code>&lt;translation&gt:</code> regexps
         match the same URLs as their <code>&lt;simple&gt:</code> counterparts,
         but they also describe how a (local) URL is mapped to another (remote)
diff --git a/offapi/com/sun/star/ucb/XContentProviderSupplier.idl b/offapi/com/sun/star/ucb/XContentProviderSupplier.idl
index cfa70cee5ddb..02ef214c8a2a 100644
--- a/offapi/com/sun/star/ucb/XContentProviderSupplier.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XContentProviderSupplier_idl__
 #define __com_sun_star_ucb_XContentProviderSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XContentTransmitter.idl b/offapi/com/sun/star/ucb/XContentTransmitter.idl
index 0ef1aace93cf..f28f989e3f5f 100644
--- a/offapi/com/sun/star/ucb/XContentTransmitter.idl
+++ b/offapi/com/sun/star/ucb/XContentTransmitter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XContentTransmitter_idl__
 #define __com_sun_star_ucb_XContentTransmitter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XDataContainer.idl b/offapi/com/sun/star/ucb/XDataContainer.idl
index 78437e0529a5..b4daa77232d4 100644
--- a/offapi/com/sun/star/ucb/XDataContainer.idl
+++ b/offapi/com/sun/star/ucb/XDataContainer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XDataContainer_idl__
 #define __com_sun_star_ucb_XDataContainer_idl__
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XDynamicResultSet.idl b/offapi/com/sun/star/ucb/XDynamicResultSet.idl
index 291cd397e767..a00d8fbf42c0 100644
--- a/offapi/com/sun/star/ucb/XDynamicResultSet.idl
+++ b/offapi/com/sun/star/ucb/XDynamicResultSet.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #define __com_sun_star_ucb_XDynamicResultSet_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XDynamicResultSetListener_idl__
 #include <com/sun/star/ucb/XDynamicResultSetListener.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ListenerAlreadySetException_idl__
 #include <com/sun/star/ucb/ListenerAlreadySetException.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
 #include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_AlreadyInitializedException_idl__
 #include <com/sun/star/ucb/AlreadyInitializedException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ServiceNotFoundException_idl__
 #include <com/sun/star/ucb/ServiceNotFoundException.idl>
-#endif
 
 //=============================================================================
 
@@ -88,7 +71,7 @@ module com { module sun { module star { module ucb {
     <p>
     The calling of <member>XDynamicResultSetListener::notify</member> has
     to happen in an own thread, because it could take a longer time and any
-    actions til the listener returns the call. So don't block the notify-causing
+    actions ??? until the listener returns the call. So don't block the notify-causing
     action.
     </p>
 
@@ -100,7 +83,7 @@ module com { module sun { module star { module ucb {
       <li> The listener is allowed to access both <type>ContentResultSet</type>s,
          they must be both valid.</li>
       <li> It is not allowed to start a second notify-call.</li>
-      <li> All addditional things we want to send as notification are to be
+      <li> All additional things we want to send as notification are to be
          queued.</li>
       <li> Any other calls are to be accepted and treated.</li>
     </ol>
@@ -147,7 +130,7 @@ published interface XDynamicResultSet: com::sun::star::lang::XComponent
         at the listener
 
         @param Listener
-        a listener for resultset notifications
+        a listener for result set notifications
 
         @throws ListenerAlreadySetException
         if this method is called more than once during the life of the
diff --git a/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl b/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl
index 6bde84d89663..ddd13eaa4606 100644
--- a/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl
+++ b/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XDynamicResultSetListener_idl__
 #define __com_sun_star_ucb_XDynamicResultSetListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_ListEvent_idl__
 #include <com/sun/star/ucb/ListEvent.idl>
-#endif
 
 //=============================================================================
 
@@ -46,7 +41,7 @@ module com { module sun { module star { module ucb {
 published interface XDynamicResultSetListener: com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
-    /** A method used to propagate changes of a resultset.
+    /** A method used to propagate changes of a result set.
 
         <p>In the first notify-call the listener gets two(!)
         <type scope="com::sun::star::sdbc">XResultSet</type>s and has to hold
@@ -59,11 +54,11 @@ published interface XDynamicResultSetListener: com::sun::star::lang::XEventListe
         returning.
 
         <p>While in notify-call the listener is allowed to read from old and
-        new resultset, except in the first call, where only the new resultset
+        new result set, except in the first call, where only the new result set
         is valid.
 
         <p>The Listener is allowed to stay (block) this call, until he really
-        wants to use the new resultset. The only situation, where the listener
+        wants to use the new result set. The only situation, where the listener
         has to return immediately is while he disposes his broadcaster or while
         he is removing himself as listener (otherwise you deadlock)!!!
 
diff --git a/offapi/com/sun/star/ucb/XFetchProvider.idl b/offapi/com/sun/star/ucb/XFetchProvider.idl
index eb491caaaabf..b218f14b24c8 100644
--- a/offapi/com/sun/star/ucb/XFetchProvider.idl
+++ b/offapi/com/sun/star/ucb/XFetchProvider.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XFetchProvider_idl__
 #define __com_sun_star_ucb_XFetchProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_FetchResult_idl__
 #include <com/sun/star/ucb/FetchResult.idl>
-#endif
 
 //=============================================================================
 
@@ -54,7 +49,7 @@ published interface XFetchProvider: com::sun::star::uno::XInterface
         of these anys contains a sequence of anys.
 
         @param nRowStartPosition
-        the starting row of the resultset
+        the starting row of the result set
 
         @param nRowCount
         the count of rows
diff --git a/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl b/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
index 5e6242e79e4e..00f29974d806 100644
--- a/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
+++ b/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XFetchProviderForContentAccess_idl__
 #define __com_sun_star_ucb_XFetchProviderForContentAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_FetchResult_idl__
 #include <com/sun/star/ucb/FetchResult.idl>
-#endif
 
 //=============================================================================
 
@@ -55,7 +50,7 @@ published interface XFetchProviderForContentAccess: com::sun::star::uno::XInterf
         of these anys contains a string.
 
         @param nRowStartPosition
-        the starting row of the resultset
+        the starting row of the result set
 
         @param nRowCount
         the count of rows
@@ -79,7 +74,7 @@ published interface XFetchProviderForContentAccess: com::sun::star::uno::XInterf
         of these anys contains an <type>XContentIdentifier</type>.
 
         @param nRowStartPosition
-        the starting row of the resultset
+        the starting row of the result set
 
         @param nRowCount
         the count of rows
@@ -102,7 +97,7 @@ published interface XFetchProviderForContentAccess: com::sun::star::uno::XInterf
         of these anys contains an <type>XContent</type>.
 
         @param nRowStartPosition
-        the starting row of the resultset
+        the starting row of the result set
 
         @param nRowCount
         the count of rows
diff --git a/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl b/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl
index 1ff2579164ee..befad440ebc9 100644
--- a/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl
+++ b/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XFileIdentifierConverter_idl__
 #define __com_sun_star_ucb_XFileIdentifierConverter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -45,18 +43,18 @@ module com { module sun { module star { module ucb {
 published interface XFileIdentifierConverter : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Get information about the 'locality' of a file content provider.
+    /** Get information about the "locality" of a file content provider.
 
-        <p>The returned information can be used to chose the 'best' among a
+        <p>The returned information can be used to chose the "best" among a
         number of file content providers implementing this interface.
 
         @param BaseURL
         the base (file) URL used to specify a file content provider.
 
         @returns
-        an appropriat value representing the 'locality' of the specified file
+        an appropriate value representing the "locality" of the specified file
         content provider.   Generally, higher (non-negative) numbers denote
-        file content providers that are more 'local', and negative numbers
+        file content providers that are more "local", and negative numbers
         denote content providers that are not file content providers at all.
         As a convention (and to keep this useful), values should be restricted
         to the range from -1 to +10, inclusive.
diff --git a/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl b/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
index fe31114241da..e9173ebf77d8 100644
--- a/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
+++ b/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XInteractionCookieHandling_idl__
 #define __com_sun_star_ucb_XInteractionCookieHandling_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CookiePolicy_idl__
 #include <com/sun/star/ucb/CookiePolicy.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_Cookie_idl__
 #include <com/sun/star/ucb/Cookie.idl>
-#endif
 
 
 //=============================================================================
@@ -69,7 +61,7 @@ published interface XInteractionCookieHandling: com::sun::star::task::XInteracti
         <p>This method should be called before select().
 
         @param ConfirmCookie
-            A cookie that sould come from the sequence of
+            A cookie that should come from the sequence of
             cookies offered by the <type>HandleCookiesRequest</type> and that
             should have a policy of <member>CookiePolicy::CONFIRM</member>.
 
diff --git a/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl b/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl
index a5ab34fc6af5..317f3e3af5a6 100644
--- a/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl
+++ b/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XInteractionHandlerSupplier_idl__
 #define __com_sun_star_ucb_XInteractionHandlerSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl b/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl
index c5f03d720d49..293ade78637b 100644
--- a/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl
+++ b/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XInteractionReplaceExistingData_idl__
 #define __com_sun_star_ucb_XInteractionReplaceExistingData_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl
index d89c06985044..2b45b4b664de 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XInteractionSupplyAuthentication_idl__
 #define __com_sun_star_ucb_XInteractionSupplyAuthentication_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_RememberAuthentication_idl__
 #include <com/sun/star/ucb/RememberAuthentication.idl>
-#endif
 
 
 //=============================================================================
@@ -49,12 +44,12 @@ module com { module sun { module star { module ucb {
 published interface XInteractionSupplyAuthentication: com::sun::star::task::XInteractionContinuation
 {
     //-------------------------------------------------------------------------
-    /** Specifies if a new 'realm' value can be handed back.
+    /** Specifies if a new "realm" value can be handed back.
     */
     boolean canSetRealm();
 
     //-------------------------------------------------------------------------
-    /** Set a new 'realm' value to hand back.
+    /** Set a new "realm" value to hand back.
 
         <p>This method should be called before
         <member scope="com::sun::star::task">XInteractionContinuation::select</member>,
@@ -65,12 +60,12 @@ published interface XInteractionSupplyAuthentication: com::sun::star::task::XInt
     void setRealm( [in] string Realm );
 
     //-------------------------------------------------------------------------
-    /** Specifies if a 'user name' value can be handed back.
+    /** Specifies if a "user name" value can be handed back.
     */
     boolean canSetUserName();
 
     //-------------------------------------------------------------------------
-    /** Set a new 'user name' value to hand back.
+    /** Set a new "user name" value to hand back.
 
         <p>This method should be called before
         <member scope="com::sun::star::task">XInteractionContinuation::select</member>,
@@ -81,12 +76,12 @@ published interface XInteractionSupplyAuthentication: com::sun::star::task::XInt
     void setUserName( [in] string UserName );
 
     //-------------------------------------------------------------------------
-    /** Specifies if a 'password' value can be handed back.
+    /** Specifies if a "password" value can be handed back.
     */
     boolean canSetPassword();
 
     //-------------------------------------------------------------------------
-    /** Set a new 'password' value to hand back.
+    /** Set a new "password" value to hand back.
 
         <p>This method should be called before
         <member scope="com::sun::star::task">XInteractionContinuation::select</member>,
@@ -125,12 +120,12 @@ published interface XInteractionSupplyAuthentication: com::sun::star::task::XInt
     void setRememberPassword( [in] com::sun::star::ucb::RememberAuthentication Remember );
 
     //-------------------------------------------------------------------------
-    /** Specifies if an 'account' value can be handed back.
+    /** Specifies if an "account" value can be handed back.
     */
     boolean canSetAccount();
 
     //-------------------------------------------------------------------------
-    /** Set a new 'account' value to hand back.
+    /** Set a new "account" value to hand back.
 
         <p>This method should be called before
         <member scope="com::sun::star::task">XInteractionContinuation::select</member>,
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
index 853a927ba3dd..cba4ac81a514 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XInteractionSupplyAuthentication2_idl__
 #define __com_sun_star_ucb_XInteractionSupplyAuthentication2_idl__
 
-#ifndef __com_sun_star_ucb_XInteractionSupplyAuthentication_idl__
 #include <com/sun/star/ucb/XInteractionSupplyAuthentication.idl>
-#endif
 
 
 
@@ -48,8 +46,8 @@ module com { module sun { module star { module ucb {
 published interface XInteractionSupplyAuthentication2 : XInteractionSupplyAuthentication
 {
     //-------------------------------------------------------------------------
-    /** Specifies if 'system credentials' can be obtained and used by the issuer
-        of the authentiction request.
+    /** Specifies if "system credentials" can be obtained and used by the issuer
+        of the authentication request.
 
         @param Default
         Returns the default behavior for system credentials handling (to be
@@ -62,7 +60,7 @@ published interface XInteractionSupplyAuthentication2 : XInteractionSupplyAuthen
     boolean canUseSystemCredentials( [out] boolean Default );
 
     //-------------------------------------------------------------------------
-    /** Set a new 'use system credentials' value to hand back.
+    /** Set a new "use system credentials" value to hand back.
 
         @param UseSystemCredentials
         <true/> means the request issuer shall obtain and use system credentials.
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyName.idl b/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
index 57009d3bd7fb..f54777798dbf 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XInteractionSupplyName_idl__
 #define __com_sun_star_ucb_XInteractionSupplyName_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 //=============================================================================
 
@@ -50,7 +48,7 @@ published interface XInteractionSupplyName : com::sun::star::task::XInteractionC
     //-------------------------------------------------------------------------
     /** sets the name to supply.
 
-        @parem Name
+        @param Name
         contains the name to supply.
     */
     void setName( [in] string Name );
diff --git a/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl b/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl
index e7b0feec1a3f..38be079f50a1 100644
--- a/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl
+++ b/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XParameterizedContentProvider_idl__
 #define __com_sun_star_ucb_XParameterizedContentProvider_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentProvider_idl__
 #include <com/sun/star/ucb/XContentProvider.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XPersistentPropertySet.idl b/offapi/com/sun/star/ucb/XPersistentPropertySet.idl
index 05a723972675..ba1c572ef80d 100644
--- a/offapi/com/sun/star/ucb/XPersistentPropertySet.idl
+++ b/offapi/com/sun/star/ucb/XPersistentPropertySet.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XPersistentPropertySet_idl__
 #define __com_sun_star_ucb_XPersistentPropertySet_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -39,7 +37,7 @@ module com { module sun { module star { module ucb {
  published interface XPropertySetRegistry;
 
 //=============================================================================
-/** A persistent propertyset, which can be saved in and restored from a
+/** A persistent property set, which can be saved in and restored from a
     <type>XPropertySetRegistry</type>.
 
      @version  1.0
@@ -56,7 +54,7 @@ published interface XPersistentPropertySet : com::sun::star::beans::XPropertySet
     com::sun::star::ucb::XPropertySetRegistry getRegistry();
 
     //-------------------------------------------------------------------------
-    /** returns the key used to address the set in the propertyset registry.
+    /** returns the key used to address the set in the property set registry.
 
         @returns
         The key.
diff --git a/offapi/com/sun/star/ucb/XProgressHandler.idl b/offapi/com/sun/star/ucb/XProgressHandler.idl
index 21665a0b3b3a..3c1b00d86efb 100644
--- a/offapi/com/sun/star/ucb/XProgressHandler.idl
+++ b/offapi/com/sun/star/ucb/XProgressHandler.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ucb_XProgressHandler_idl__
 #define __com_sun_star_ucb_XProgressHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XPropertyMatcher.idl b/offapi/com/sun/star/ucb/XPropertyMatcher.idl
index 3ca6f6005a32..d0abed2fa83e 100644
--- a/offapi/com/sun/star/ucb/XPropertyMatcher.idl
+++ b/offapi/com/sun/star/ucb/XPropertyMatcher.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XPropertyMatcher_idl__
 #define __com_sun_star_ucb_XPropertyMatcher_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandEnvironment_idl__
 #include <com/sun/star/ucb/XCommandEnvironment.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl b/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl
index 32627ce4d37b..025b878d8561 100644
--- a/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl
+++ b/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XPropertyMatcherFactory_idl__
 #define __com_sun_star_ucb_XPropertyMatcherFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XPropertyMatcher_idl__
 #include <com/sun/star/ucb/XPropertyMatcher.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_SearchCriterium_idl__
 #include <com/sun/star/ucb/SearchCriterium.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XPropertySetRegistry.idl b/offapi/com/sun/star/ucb/XPropertySetRegistry.idl
index ea283ae81589..a165cc5d077a 100644
--- a/offapi/com/sun/star/ucb/XPropertySetRegistry.idl
+++ b/offapi/com/sun/star/ucb/XPropertySetRegistry.idl
@@ -27,20 +27,15 @@
 #ifndef __com_sun_star_ucb_XPropertySetRegistry_idl__
 #define __com_sun_star_ucb_XPropertySetRegistry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XPersistentPropertySet_idl__
 #include <com/sun/star/ucb/XPersistentPropertySet.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** A registry (storage medium) for persistent propertysets.
+/** A registry (storage medium) for persistent property sets.
 
      @version  1.0
      @author   Kai Sommerfeld
@@ -49,26 +44,26 @@ module com { module sun { module star { module ucb {
 published interface XPropertySetRegistry : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** creates a new or opens an existing propertyset in the registry.
+    /** creates a new or opens an existing property set in the registry.
 
         @param key
-        The key to use for addressing the propertyset.
+        The key to use for addressing the property set.
 
         @param create
         Indicates whether a new set shall be created in case there
         does not already exist one for the given key.
 
         @returns
-        The propertyset.
+        The property set.
       */
     com::sun::star::ucb::XPersistentPropertySet
     openPropertySet( [in] string key, [in] boolean create );
 
     //-------------------------------------------------------------------------
-    /** removes a propertyset from the registry.
+    /** removes a property set from the registry.
 
         @param key
-        The key to use for addressing the propertyset.
+        The key to use for addressing the property set.
       */
     [oneway] void removePropertySet( [in] string key );
 };
diff --git a/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl b/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl
index a61210b78ba9..ce7f5f0a3936 100644
--- a/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl
+++ b/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl
@@ -27,20 +27,15 @@
 #ifndef __com_sun_star_ucb_XPropertySetRegistryFactory_idl__
 #define __com_sun_star_ucb_XPropertySetRegistryFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XPropertySetRegistry_idl__
 #include <com/sun/star/ucb/XPropertySetRegistry.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** A factory for propertyset registries.
+/** A factory for property set registries.
 
      @version  1.0
      @author   Kai Sommerfeld
@@ -48,7 +43,7 @@ module com { module sun { module star { module ucb {
 published interface XPropertySetRegistryFactory : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** creates a propertyset registry.
+    /** creates a property set registry.
 
         @param URL
         The identifier of the registry to create ( e.g. file-URL ). The
diff --git a/offapi/com/sun/star/ucb/XRecycler.idl b/offapi/com/sun/star/ucb/XRecycler.idl
index e3e193b6c460..4279328e3c38 100644
--- a/offapi/com/sun/star/ucb/XRecycler.idl
+++ b/offapi/com/sun/star/ucb/XRecycler.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ucb_XRecycler_idl__
 #define __com_sun_star_ucb_XRecycler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XContentIdentifier_idl__
 #include <com/sun/star/ucb/XContentIdentifier.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
 #include <com/sun/star/ucb/XCommandProcessor.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl
index 54aee34f4e7d..8a484a819171 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderAcceptor_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderAcceptor_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl
index e2c69ec0f8f7..d7fe4e22ead7 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderActivator_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderActivator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module ucb {
 
@@ -43,7 +41,7 @@ module com { module sun { module star { module ucb {
     <member>XRemoteContentProviderAcceptor::addRemoteContentProvider</member>.
 
     The way this works might change, therefore this interface is marked as
-    deprectated.
+    deprecated.
 
     @deprecated
  */
@@ -57,7 +55,7 @@ published interface XRemoteContentProviderActivator: com::sun::star::uno::XInter
 
         <p>This allows for
         <member>XRemoteContentProviderAcceptor::addRemoteContentProvider</member>
-        to be implemented in a layz fashion (remember the remote content
+        to be implemented in a lazy fashion (remember the remote content
         providers, but do not register them right away), which can increase
         performance in certain situations.  But it is not required that an
         implementation of <type>XRemoteContentProviderAcceptor</type> uses this
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl
index 3a8a22cc4da6..2c361381e0bb 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderChangeListener_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_ucb_RemoteContentProviderChangeEvent_idl__
 #include <com/sun/star/ucb/RemoteContentProviderChangeEvent.idl>
-#endif
 
 module com { module sun { module star { module ucb {
 
@@ -53,7 +49,7 @@ published interface XRemoteContentProviderChangeListener:
         occur.
 
         @param Event
-        describes the change that has occured.
+        describes the change that has occurred.
      */
     void
     remoteContentProviderChange([in] RemoteContentProviderChangeEvent Event);
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl
index ca43be38e95a..57f93a5e39f8 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderChangeNotifier_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderChangeNotifier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module ucb {
      published interface XRemoteContentProviderChangeListener;
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl
index 1bb56c3d7616..ae969de0aca3 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderConnectionControl_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderConnectionControl_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module ucb {
      published interface XRemoteContentProviderAcceptor;
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl
index c787fe32aa15..ffa4b961ab00 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderDistributor_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderDistributor_idl__
 
-#ifndef __com_sun_star_connection_ConnectionSetupException_idl__
 #include <com/sun/star/connection/ConnectionSetupException.idl>
-#endif
-
-#ifndef __com_sun_star_connection_NoConnectException_idl__
 #include <com/sun/star/connection/NoConnectException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -49,7 +38,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** Distribute a content broker to variuos
+/** Distribute a content broker to various
     <type>XRemoteContentProviderAcceptor</type>s.
 
     @version 1.0
@@ -71,7 +60,7 @@ published interface XRemoteContentProviderDistributor: com::sun::star::uno::XInt
         @param Identifier  An identifier handed to the
         <type>XRemoteContentProviderAcceptor</type>.
 
-        @returns success indicator.  Escpecially, if there's already a
+        @returns success indicator.  Especially, if there's already a
         connection to the given Url, the call will fail, no matter whether
         that connection uses the same identifier as the given one or not.
     */
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl
index 8786c28b49e5..f5f4a582cc6b 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderDoneListener_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderDoneListener_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module ucb {
 
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl
index 037d67af4d36..8d90633e1f6e 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XRemoteContentProviderSupplier_idl__
 #define __com_sun_star_ucb_XRemoteContentProviderSupplier_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XSimpleFileAccess.idl b/offapi/com/sun/star/ucb/XSimpleFileAccess.idl
index 122bde51ef1c..0f77fd63ae84 100644
--- a/offapi/com/sun/star/ucb/XSimpleFileAccess.idl
+++ b/offapi/com/sun/star/ucb/XSimpleFileAccess.idl
@@ -27,41 +27,15 @@
 #ifndef __com_sun_star_ucb_XSimpleFileAccess_idl__
 #define __com_sun_star_ucb_XSimpleFileAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_CommandAbortedException_idl__
 #include <com/sun/star/ucb/CommandAbortedException.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
 
 
 
diff --git a/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl b/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl
index 92bdb9ca6365..b43837cb1459 100644
--- a/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl
+++ b/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_ucb_XSimpleFileAccess2_idl__
 #define __com_sun_star_ucb_XSimpleFileAccess2_idl__
 
-#ifndef __com_sun_star_ucb_XSimpleFileAccess_idl__
 #include <com/sun/star/ucb/XSimpleFileAccess.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl b/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
index 396a0d3892c4..6262f734a5c5 100644
--- a/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
+++ b/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_ucb_XSimpleFileAccess3_idl__
 #define __com_sun_star_ucb_XSimpleFileAccess3_idl__
 
-#ifndef __com_sun_star_ucb_XSimpleFileAccess2_idl__
 #include <com/sun/star/ucb/XSimpleFileAccess2.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl
index 91ae947b613f..161698a0e94d 100644
--- a/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl
@@ -27,19 +27,10 @@
 #ifndef __com_sun_star_ucb_XSortedDynamicResultSetFactory_idl__
 #define __com_sun_star_ucb_XSortedDynamicResultSetFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_XDynamicResultSet_idl__
 #include <com/sun/star/ucb/XDynamicResultSet.idl>
-#endif
-#ifndef __com_sun_star_ucb_NumberedSortingInfo_idl__
 #include <com/sun/star/ucb/NumberedSortingInfo.idl>
-#endif
-#ifndef __com_sun_star_ucb_XAnyCompareFactory_idl__
 #include <com/sun/star/ucb/XAnyCompareFactory.idl>
-#endif
 
 //=============================================================================
 
@@ -57,10 +48,10 @@ published interface XSortedDynamicResultSetFactory: com::sun::star::uno::XInterf
         data, an (unsorted) XDynamicResultSet and the sorting info.
 
         @returns
-        a sorted resultset.
+        a sorted result set.
 
         @param Source
-        the (unsorted) source resultset
+        the (unsorted) source result set
 
         @param Info
         the sort criteria
diff --git a/offapi/com/sun/star/ucb/XSourceInitialization.idl b/offapi/com/sun/star/ucb/XSourceInitialization.idl
index b091faece81d..c518c358b23f 100644
--- a/offapi/com/sun/star/ucb/XSourceInitialization.idl
+++ b/offapi/com/sun/star/ucb/XSourceInitialization.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ucb_XSourceInitialization_idl__
 #define __com_sun_star_ucb_XSourceInitialization_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ucb_AlreadyInitializedException_idl__
 #include <com/sun/star/ucb/AlreadyInitializedException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
index 561da63ee8c8..9a22ebf7fff0 100644
--- a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
+++ b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_ucb_XWebDAVCommandEnvironment_idl__
 #define __com_sun_star_ucb_XWebDAVCommandEnvironment_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/ActionTrigger.idl b/offapi/com/sun/star/ui/ActionTrigger.idl
index fd41e7ae38f2..73c6faa47f2a 100644
--- a/offapi/com/sun/star/ui/ActionTrigger.idl
+++ b/offapi/com/sun/star/ui/ActionTrigger.idl
@@ -27,15 +27,9 @@
 #ifndef __com_sun_star_ui_ActionTrigger_idl__
 #define __com_sun_star_ui_ActionTrigger_idl__
 
-#ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
diff --git a/offapi/com/sun/star/ui/ActionTriggerContainer.idl b/offapi/com/sun/star/ui/ActionTriggerContainer.idl
index 63ef251ec83d..3922bb0c40a2 100644
--- a/offapi/com/sun/star/ui/ActionTriggerContainer.idl
+++ b/offapi/com/sun/star/ui/ActionTriggerContainer.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_ui_ActionTriggerContainer_idl__
 #define __com_sun_star_ui_ActionTriggerContainer_idl__
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
 #include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
@@ -88,7 +80,7 @@ published service ActionTriggerContainer
     */
     [optional] interface ::com::sun::star::container::XEnumerationAccess;
 
-    /** allows foreign components to register themself as listener for the container
+    /** allows foreign components to register themselves as listener for the container
         structure.
     */
     [optional] interface ::com::sun::star::container::XContainer;
diff --git a/offapi/com/sun/star/ui/ActionTriggerSeparator.idl b/offapi/com/sun/star/ui/ActionTriggerSeparator.idl
index 94e6cc319f3a..5d42c4a3d252 100644
--- a/offapi/com/sun/star/ui/ActionTriggerSeparator.idl
+++ b/offapi/com/sun/star/ui/ActionTriggerSeparator.idl
@@ -35,7 +35,7 @@ module com {  module sun {  module star {  module ui {
 */
 published service ActionTriggerSeparator
 {
-    /** determins the type of the separator using constants from
+    /** determines the type of the separator using constants from
         <type>ActionTriggerSeparatorType</type>.
     */
     [optional, property] short SeparatorType;
diff --git a/offapi/com/sun/star/ui/ActionTriggerSeparatorType.idl b/offapi/com/sun/star/ui/ActionTriggerSeparatorType.idl
index f3ea2240547b..ec1ef5c7d777 100644
--- a/offapi/com/sun/star/ui/ActionTriggerSeparatorType.idl
+++ b/offapi/com/sun/star/ui/ActionTriggerSeparatorType.idl
@@ -29,20 +29,20 @@
 
 module com {  module sun {  module star {  module ui {
 
-/** Determins the type of a separator in an ActionTriggerContainer.
+/** Determines the type of a separator in an ActionTriggerContainer.
  */
 published constants ActionTriggerSeparatorType
 {
     //-------------------------------------------------------------------------
-    /** a separarator is inserted as a line.
+    /** a separator is inserted as a line.
      */
     const short LINE = 0;
     //-------------------------------------------------------------------------
-    /** a separarator is inserted as a space.
+    /** a separator is inserted as a space.
      */
     const short SPACE = 1;
     //-------------------------------------------------------------------------
-    /** a linebreak is inserted.
+    /** a line break is inserted.
      */
     const short LINEBREAK = 2;
 
diff --git a/offapi/com/sun/star/ui/ConfigurableUIElement.idl b/offapi/com/sun/star/ui/ConfigurableUIElement.idl
index afde83a344bd..98e380c95546 100644
--- a/offapi/com/sun/star/ui/ConfigurableUIElement.idl
+++ b/offapi/com/sun/star/ui/ConfigurableUIElement.idl
@@ -28,33 +28,13 @@
 #ifndef __com_sun_star_ui_ConfigurableUIElement_idl__
 #define __com_sun_star_ui_ConfigurableUIElement_idl__
 
-#ifndef __com_sun_star_ui_UIElement_idl__
 #include <com/sun/star/ui/UIElement.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElementSettings_idl__
 #include <com/sun/star/ui/XUIElementSettings.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_ui_UIElementType_idl__
 #include <com/sun/star/ui/UIElementType.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
 #include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/ConfigurationEvent.idl b/offapi/com/sun/star/ui/ConfigurationEvent.idl
index b778bda9ac8a..14580c18a4ef 100644
--- a/offapi/com/sun/star/ui/ConfigurationEvent.idl
+++ b/offapi/com/sun/star/ui/ConfigurationEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_ConfigurationEvent_idl__
 #define __com_sun_star_ui_ConfigurationEvent_idl__
 
-#ifndef __com_sun_star_container_ContainerEvent_idl__
 #include <com/sun/star/container/ContainerEvent.idl>
-#endif
 
 module com { module sun { module star { module ui {
 
diff --git a/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl b/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl
index 09fa6843efb7..eadf26e8f738 100644
--- a/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl
+++ b/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl
@@ -27,18 +27,10 @@
 #ifndef __com_sun_star_ui_ContextMenuExecuteEvent_idl__
 #define __com_sun_star_ui_ContextMenuExecuteEvent_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
diff --git a/offapi/com/sun/star/ui/ContextMenuInterceptorAction.idl b/offapi/com/sun/star/ui/ContextMenuInterceptorAction.idl
index e4fa8e0d7819..bbcc53227ef1 100644
--- a/offapi/com/sun/star/ui/ContextMenuInterceptorAction.idl
+++ b/offapi/com/sun/star/ui/ContextMenuInterceptorAction.idl
@@ -30,7 +30,7 @@
 module com {  module sun {  module star {  module ui {
 
 
-/** determins the action that is requested from the <type>XContextMenuInterceptor</type>.
+/** determines the action that is requested from the <type>XContextMenuInterceptor</type>.
  */
 published enum ContextMenuInterceptorAction
 {
diff --git a/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
index f0552332946d..14db19801cdc 100644
--- a/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
+++ b/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ui_GlobalAcceleratorConfiguration_idl__
 #define __com_sun_star_ui_GlobalAcceleratorConfiguration_idl__
 
-#ifndef __com_sun_star_ui_XAcceleratorConfiguration_idl__
 #include <com/sun/star/ui/XAcceleratorConfiguration.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
diff --git a/offapi/com/sun/star/ui/ItemDescriptor.idl b/offapi/com/sun/star/ui/ItemDescriptor.idl
index b6e9c2404330..df3f4c355a3b 100644
--- a/offapi/com/sun/star/ui/ItemDescriptor.idl
+++ b/offapi/com/sun/star/ui/ItemDescriptor.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_ItemDescriptor_idl__
 #define __com_sun_star_ui_ItemDescriptor_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/ItemType.idl b/offapi/com/sun/star/ui/ItemType.idl
index 677624489126..a83c8b7f24f3 100644
--- a/offapi/com/sun/star/ui/ItemType.idl
+++ b/offapi/com/sun/star/ui/ItemType.idl
@@ -29,7 +29,7 @@
 
 module com {  module sun {  module star {  module ui {
 
-/** Determins the type of an item.
+/** Determines the type of an item.
 
     @since OOo 2.0
  */
@@ -40,15 +40,15 @@ constants ItemType
      */
     const short DEFAULT = 0;
     //-------------------------------------------------------------------------
-    /** a separarator is inserted as a line.
+    /** a separator is inserted as a line.
      */
     const short SEPARATOR_LINE = 1;
     //-------------------------------------------------------------------------
-    /** a separarator is inserted as a space.
+    /** a separator is inserted as a space.
      */
     const short SEPARATOR_SPACE = 2;
     //-------------------------------------------------------------------------
-    /** a linebreak is inserted.
+    /** a line break is inserted.
      */
     const short SEPARATOR_LINEBREAK = 3;
 
diff --git a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
index 3253b1152221..39d209175706 100644
--- a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
+++ b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_ModuleUICommandDescription_idl__
 #define __com_sun_star_ui_ModuleUICommandDescription_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/ModuleUICommandDescription.idl b/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
index dc8c58947079..f3c5b16bc616 100644
--- a/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
+++ b/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_ModuleUICommandDescription_idl__
 #define __com_sun_star_ui_ModuleUICommandDescription_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
@@ -65,7 +63,7 @@ service ModuleUICommandDescription
             <li><b>Name</b><br>a string which specifies the short name of the user interface command without
             any additional information. It can be used for the bubble help.</li>
             <li><b>Popup</b><br>a boolean which specifies if the user interface command is a unique
-            identifer for a popup menu. A popup menu has a label, but is not bound to a command.</li>
+            identifier for a pop-up menu. A pop-up menu has a label, but is not bound to a command.</li>
         </ul>
         The key to a user interface command description is the user interface command itself which has
         the following syntax ".uno:$Command". For example ".uno:Open" shows the file open dialog.
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
index 24eb4d4c22ce..18b6f85b50bc 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_ui_ModuleUIConfigurationManager_idl__
 #define __com_sun_star_ui_ModuleUIConfigurationManager_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
 #include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
 #include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XModuleUIConfigurationManager_idl__
 #include <com/sun/star/ui/XModuleUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfiguration_idl__
 #include <com/sun/star/ui/XUIConfiguration.idl>
-#endif
 
 module com { module sun { module star { module ui {
 
@@ -53,7 +39,7 @@ module com { module sun { module star { module ui {
     configuration data of a module.
 
     <p>
-    A module user interface configuratio manager supports two layers of configuration settings
+    A module user interface configuration manager supports two layers of configuration settings
     data:<br/>
     1. Layer: A module default user interface configuration which describe all user interface
     elements settings that are used by OpenOffice. It is not possible to insert, remove or change
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
index 33bd1ae4a922..a93f4c6949c3 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ui_ModuleUIConfigurationManagerSupplier_idl__
 #define __com_sun_star_ui_ModuleUIConfigurationManagerSupplier_idl__
 
-#ifndef __com_sun_star_ui_XModuleUIConfigurationManagerSupplier_idl__
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 module com { module sun { module star { module ui {
 
diff --git a/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl b/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
index c07651c82b30..fa0dac13e4e1 100644
--- a/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_ModuleUICommandDescription_idl__
 #define __com_sun_star_ui_ModuleUICommandDescription_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
@@ -42,7 +40,7 @@ module com { module sun { module star { module ui {
     elements of a single application module.
 
     <p>
-    Every OpenOffice.org module has an amout of user interface elements that can
+    Every OpenOffice.org module has an amount of user interface elements that can
     be positioned, resized, closed and their style can be changed. This service
     provides access to the window based information of available user interface
     elements which are part of a single OpenOffice.org module, like Writer or
diff --git a/offapi/com/sun/star/ui/UICategoryDescription.idl b/offapi/com/sun/star/ui/UICategoryDescription.idl
index 5698ff74fccf..00e1833e78bc 100644
--- a/offapi/com/sun/star/ui/UICategoryDescription.idl
+++ b/offapi/com/sun/star/ui/UICategoryDescription.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_ui_UICategoryDescription_idl__
 #define __com_sun_star_ui_UICategoryDescription_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
diff --git a/offapi/com/sun/star/ui/UICommandDescription.idl b/offapi/com/sun/star/ui/UICommandDescription.idl
index bd1f35926149..8e22146d87a3 100644
--- a/offapi/com/sun/star/ui/UICommandDescription.idl
+++ b/offapi/com/sun/star/ui/UICommandDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_UICommandDescription_idl__
 #define __com_sun_star_ui_UICommandDescription_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/UIConfigurationManager.idl b/offapi/com/sun/star/ui/UIConfigurationManager.idl
index 509bd71e93d4..017275f09cf3 100644
--- a/offapi/com/sun/star/ui/UIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/UIConfigurationManager.idl
@@ -27,30 +27,16 @@
 #ifndef __com_sun_star_ui_UIConfigurationManager_idl__
 #define __com_sun_star_ui_UIConfigurationManager_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfiguration_idl__
 #include <com/sun/star/ui/XUIConfiguration.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
 #include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
 #include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationStorage_idl__
 #include <com/sun/star/ui/XUIConfigurationStorage.idl>
-#endif
 
 module com { module sun { module star { module ui {
 
 /** specifies a user interface configuration manager which controls
-    all customizeable user interface elements of an object.
+    all customizable user interface elements of an object.
 
     @since OOo 2.0
 */
diff --git a/offapi/com/sun/star/ui/UIElement.idl b/offapi/com/sun/star/ui/UIElement.idl
index 610cfa73ae25..9b530b9f0a44 100644
--- a/offapi/com/sun/star/ui/UIElement.idl
+++ b/offapi/com/sun/star/ui/UIElement.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_ui_UIElement_idl__
 #define __com_sun_star_ui_UIElement_idl__
 
-#ifndef __com_sun_star_ui_XUIElement_idl__
 #include <com/sun/star/ui/XUIElement.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_util_XUpdatable_idl__
 #include <com/sun/star/util/XUpdatable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/UIElementFactory.idl b/offapi/com/sun/star/ui/UIElementFactory.idl
index bc5ced44ca05..7436db4df056 100644
--- a/offapi/com/sun/star/ui/UIElementFactory.idl
+++ b/offapi/com/sun/star/ui/UIElementFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_UIElementFactory_idl__
 #define __com_sun_star_ui_UIElementFactory_idl__
 
-#ifndef __com_sun_star_ui_XUIElementFactory_idl__
 #include <com/sun/star/ui/XUIElementFactory.idl>
-#endif
 
 //=============================================================================
 
@@ -54,7 +52,7 @@ module com { module sun { module star { module ui {
 
 published service UIElementFactory
 {
-    /** this interface provides a function to create and initalize new
+    /** this interface provides a function to create and initialize new
         instances of user interface elements.
 
         @see XUIElementFactory
diff --git a/offapi/com/sun/star/ui/UIElementFactoryManager.idl b/offapi/com/sun/star/ui/UIElementFactoryManager.idl
index 8a150c1af2cc..cfc1cfdf5463 100644
--- a/offapi/com/sun/star/ui/UIElementFactoryManager.idl
+++ b/offapi/com/sun/star/ui/UIElementFactoryManager.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_UIElementFactory_idl__
 #define __com_sun_star_ui_UIElementFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
 #include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElementFactoryRegistration_idl__
 #include <com/sun/star/ui/XUIElementFactoryRegistration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/UIElementSettings.idl b/offapi/com/sun/star/ui/UIElementSettings.idl
index f10eec663683..29cbb55eaa39 100644
--- a/offapi/com/sun/star/ui/UIElementSettings.idl
+++ b/offapi/com/sun/star/ui/UIElementSettings.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_UIElementSettings_idl__
 #define __com_sun_star_ui_UIElementSettings_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XSingleComponentFactory_idl__
 #include <com/sun/star/lang/XSingleComponentFactory.idl>
-#endif
 
 //=============================================================================
 
@@ -61,7 +56,7 @@ service UIElementSettings
         The container contains the items of the user interface element. Every
         item is stored as a sequence of <type scope="com::sun::star::beans">PropertyValue</type>.
         The properties insides the sequence are defined by the service <type scope="com::sun::star::ui">ItemDescriptor</type>.
-        It depends on the function which provides these service if the container is shareable read-only or exclusive writeable.
+        It depends on the function which provides these service if the container is shareable read-only or exclusive writable.
 
         @see com::sun::star::ui::ItemDescriptor
         @see com::sun::star::ui::ItemType
diff --git a/offapi/com/sun/star/ui/UIElementType.idl b/offapi/com/sun/star/ui/UIElementType.idl
index 182d75694a85..b4a8e5cbc7d3 100644
--- a/offapi/com/sun/star/ui/UIElementType.idl
+++ b/offapi/com/sun/star/ui/UIElementType.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module ui {
 constants UIElementType
 {
     //-------------------------------------------------------------------------
-    /** unkown user interface element type, which can be used as a wildcard
+    /** unknown user interface element type, which can be used as a wildcard
        to specify all types.
     */
     const short UNKNOWN         = 0;
@@ -51,7 +51,7 @@ constants UIElementType
     const short MENUBAR         = 1;
 
     //-------------------------------------------------------------------------
-    /** specifies a popup menu.
+    /** specifies a pop-up menu.
     */
     const short POPUPMENU       = 2;
 
diff --git a/offapi/com/sun/star/ui/WindowContentFactory.idl b/offapi/com/sun/star/ui/WindowContentFactory.idl
index 991c92c812cf..135b3aae3cd6 100644
--- a/offapi/com/sun/star/ui/WindowContentFactory.idl
+++ b/offapi/com/sun/star/ui/WindowContentFactory.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_WindowContentFactory_idl__
 #define __com_sun_star_ui_WindowContentFactory_idl__
 
-#ifndef __com_sun_star_lang_XSingleComponentFactory_idl__
 #include <com/sun/star/lang/XSingleComponentFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/WindowStateConfiguration.idl b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
index 8c34d07d557e..f8e299fe1396 100644
--- a/offapi/com/sun/star/ui/WindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_WindowStateConfiguration_idl__
 #define __com_sun_star_ui_WindowStateConfiguration_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
 //=============================================================================
 
@@ -42,7 +40,7 @@ module com { module sun { module star { module ui {
     elements.
 
     <p>
-    OpenOffice.org has an amout of user interface elements that can be positioned,
+    OpenOffice.org has an amount of user interface elements that can be positioned,
     resized, closed and their style can be changed. This service provides access
     to the window based information of available user interface elements which are
     part of OpenOffice.org modules, like Writer or Calc.
diff --git a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
index 46f04e31064f..75740e02a1cd 100644
--- a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
+++ b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
@@ -27,29 +27,12 @@
 #ifndef __com_sun_star_ui_XAcceleratorConfiguration_idl__
 #define __com_sun_star_ui_XAcceleratorConfiguration_idl__
 
-#ifndef __com_sun_star_ui_XUIConfiguration_idl__
 #include <com/sun/star/ui/XUIConfiguration.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
 #include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationStorage_idl__
 #include <com/sun/star/ui/XUIConfigurationStorage.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
 #include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
@@ -67,7 +50,7 @@ module com {  module sun {  module star {  module ui {
 
     <p>
     Note further:<br>
-    All changes you made on this configration access modify the
+    All changes you made on this configuration access modify the
     the configuration set inside memory only. You have to use
     the <type scope="com::sun::star::util">XFlushable</type> interface
     (which must be available at the same implementation object too), to
@@ -83,11 +66,11 @@ interface XAcceleratorConfiguration
 {
     //-------------------------------------------
     /** return the list of all key events, which
-        are available at this configration set.
+        are available at this configuration set.
 
         <p>
         The key events are the "primary keys" of this configuration sets.
-        Means: Commands are registerd for key events.
+        Means: Commands are registered for key events.
         </p>
 
         <p>
@@ -108,7 +91,7 @@ interface XAcceleratorConfiguration
         This function can be used to:<br>
         <ul>
             <li>by a generic service, which can execute commands if a
-                keyboard event occures.</li>
+                keyboard event occurs.</li>
             <li>or to iterate over the whole container and change some
                 accelerator bindings.</li>
         </ul>
@@ -157,7 +140,7 @@ interface XAcceleratorConfiguration
                 the new command for the specified key event.
 
         @throws ::com::sun::star::lang::IllegalArgumentException
-                if the key event isnt a valid one. Commands can be
+                if the key event isn't a valid one. Commands can be
                 checked only, if they are empty. Because every URL schema can be used
                 by commands in general, so its not possible to validate it.
      */
@@ -179,7 +162,7 @@ interface XAcceleratorConfiguration
 
     //-------------------------------------------
     /** optimized access to the relation "command-key" instead
-        of "key-command" which is provided normaly by this interface.
+        of "key-command" which is provided normally by this interface.
 
         <p>
         It can be used to implement collision handling, if more then one
@@ -192,15 +175,15 @@ interface XAcceleratorConfiguration
                 the command, where key bindings are searched for.
 
         @return A list of <type scope="com::sun::star::awt">KeyEvent</type> structures,
-                where the pecified command is registered for.
+                where the specified command is registered for.
 
         @throws ::com::sun::star::lang::IllegalArgumentException
                 if the specified command is empty. It cant be checked, if a command
                 is valid - because every URL schema can be used here.
 
         @throws ::com::sun::star::container::NoSuchElementException
-                if the specified command isnt empty but does not
-                occure inside this configuration set.
+                if the specified command isn't empty but does not
+                occur inside this configuration set.
      */
     sequence< com::sun::star::awt::KeyEvent > getKeyEventsByCommand( [in] string sCommand )
         raises(com::sun::star::lang::IllegalArgumentException   ,
@@ -226,7 +209,7 @@ interface XAcceleratorConfiguration
 
         @attention  Because its not defined, that any command (e.g. configured inside a menu)
                     must have an accelerator - we cant reject the call if at least one command
-                    does not occure inside this configuration set ...
+                    does not occur inside this configuration set ...
                     We handle it more gracefully - and return an empty item instead of throwing
                     and exception.
 
@@ -258,7 +241,7 @@ interface XAcceleratorConfiguration
 
         <p>
         This is an optimized method, which can perform removing of commands
-        from this configuration set. Because normaly Commands are "foreign keys"
+        from this configuration set. Because normally Commands are "foreign keys"
         and key identifier the "primary keys" - it needs some work to remove
         all commands outside this container ...
         </p>
@@ -270,7 +253,7 @@ interface XAcceleratorConfiguration
                 if the specified command is empty.
 
         @throws ::com::sun::star::container::NoSuchElementException
-                if the specified command isnt used inside this configuration set.
+                if the specified command isn't used inside this configuration set.
      */
     void removeCommandFromAllKeyEvents( [in] string sCommand )
         raises(com::sun::star::lang::IllegalArgumentException   ,
diff --git a/offapi/com/sun/star/ui/XContextMenuInterception.idl b/offapi/com/sun/star/ui/XContextMenuInterception.idl
index ab1b0416503f..0958d2c871a5 100644
--- a/offapi/com/sun/star/ui/XContextMenuInterception.idl
+++ b/offapi/com/sun/star/ui/XContextMenuInterception.idl
@@ -27,16 +27,14 @@
 #ifndef __com_sun_star_ui_XContextMenuInterception_idl__
 #define __com_sun_star_ui_XContextMenuInterception_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
 
  published interface XContextMenuInterceptor;
 /** This interface enables an object to get interceptors registered that
- change context menue or prevent them from beeing executed.
+ change context menus or prevent them from being executed.
  */
 published interface XContextMenuInterception : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/ui/XContextMenuInterceptor.idl b/offapi/com/sun/star/ui/XContextMenuInterceptor.idl
index 832197aa01b5..9d03bdb256ac 100644
--- a/offapi/com/sun/star/ui/XContextMenuInterceptor.idl
+++ b/offapi/com/sun/star/ui/XContextMenuInterceptor.idl
@@ -27,27 +27,20 @@
 #ifndef __com_sun_star_ui_XContextMenuInterceptor_idl__
 #define __com_sun_star_ui_XContextMenuInterceptor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_ContextMenuInterceptorAction_idl__
 #include <com/sun/star/ui/ContextMenuInterceptorAction.idl>
-#endif
-#ifndef __com_sun_star_ui_ContextMenuExecuteEvent_idl__
 #include <com/sun/star/ui/ContextMenuExecuteEvent.idl>
-#endif
 
 module com {  module sun {  module star {  module ui {
 
-/** This interface enables the object to be registerd as interceptor to
- change context menues or prevent them from being executed.
+/** This interface enables the object to be registered as interceptor to
+ change context menus or prevent them from being executed.
  */
 published interface XContextMenuInterceptor : ::com::sun::star::uno::XInterface
 {
     /** notifies the interceptor about the request to execute a ContextMenu.
      The interceptor has to decide whether the menu should be executed with or without
-     beeing modified or may ignore the call.
+     being modified or may ignore the call.
     */
     ContextMenuInterceptorAction notifyContextMenuExecute([in]ContextMenuExecuteEvent aEvent);
 };
diff --git a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
index 576c1d00268b..02565db35b5d 100644
--- a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
+++ b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_ui_XDockingAreaAcceptor_idl__
 #define __com_sun_star_ui_XDockingAreaAcceptor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/XImageManager.idl b/offapi/com/sun/star/ui/XImageManager.idl
index fb9d260d7201..c83ba95f062a 100644
--- a/offapi/com/sun/star/ui/XImageManager.idl
+++ b/offapi/com/sun/star/ui/XImageManager.idl
@@ -28,46 +28,20 @@
 #ifndef __com_sun_star_ui_XImageManager_idl__
 #define __com_sun_star_ui_XImageManager_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_graphic_XGraphic_idl__
 #include <com/sun/star/graphic/XGraphic.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
 #include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
 #include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfiguration_idl__
 #include <com/sun/star/ui/XUIConfiguration.idl>
-#endif
-
-#ifndef __com_sun_star_ui_ImageType_idl__
 #include <com/sun/star/ui/ImageType.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
 #include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
 
 module com { module sun { module star { module ui {
 
 /** specifies access functions to an images manager interface to add,
-    replace and remove images assocations to command URLs.
+    replace and remove images associations to command URLs.
 
     <p>
     An image manager controls a number of image sets which are specified
@@ -216,7 +190,7 @@ published interface XImageManager
     */
     interface com::sun::star::ui::XUIConfiguration;
 
-    /** allows controlling or observing the lifetime of an imahge manager
+    /** allows controlling or observing the lifetime of an image manager
         instance.
 
     <p>The owner of the object may dispose of this object using
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
index 66fe267d2fef..cefadb7aee26 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_ui_XModuleUIConfigurationManager_idl__
 #define __com_sun_star_ui_XModuleUIConfigurationManager_idl__
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
 #include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
 
 module com { module sun { module star { module ui {
 
@@ -55,12 +41,12 @@ module com { module sun { module star { module ui {
 
     <p>
     A module user interface configuration manager supports, unlike a
-    document based ui configration manager, two layers of configuration
+    document based ui configuration manager, two layers of configuration
     settings data:<br/>
     1. Layer: A module default user interface configuration which
               describe all user interface elements settings that are
               used by OpenOffice. It is not possible to insert, remove
-              or changeelements settings in this layer through the
+              or change elements settings in this layer through the
               interfaces.</br>
     2. Layer: A module user interface configuration which only contains
               customized user interface elements and user-defined ones.
@@ -79,8 +65,8 @@ interface XModuleUIConfigurationManager : ::com::sun::star::uno::XInterface
 
         @param ResourceURL
             a resource URL which identifies the user interface element. A
-            resourcce URL must meet the following syntax:
-            "private:resource/$type/$name. It is only allowed to use ascii
+            resource URL must meet the following syntax:
+            "private:resource/$type/$name. It is only allowed to use ASCII
             characters for type and name.
 
         @return
@@ -94,8 +80,8 @@ interface XModuleUIConfigurationManager : ::com::sun::star::uno::XInterface
 
         @param ResourceURL
             a resource URL which identifies the user interface element. A
-            resourcce URL must meet the following syntax:
-            "private:resource/$type/$name. It is only allowed to use ascii
+            resource URL must meet the following syntax:
+            "private:resource/$type/$name. It is only allowed to use ASCII
             characters for type and name.
 
         @return
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
index bb35b2211891..527611b13a50 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_XModuleUIConfigurationManagerSupplier_idl__
 #define __com_sun_star_ui_XModuleUIConfigurationManagerSupplier_idl__
 
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
 #include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementExceptio.idl>
-#endif
+#include <com/sun/star/container/NoSuchElementException.idl>
 
 module com { module sun { module star { module ui {
 
diff --git a/offapi/com/sun/star/ui/XUIConfiguration.idl b/offapi/com/sun/star/ui/XUIConfiguration.idl
index 12c1891da376..dd5db80352bd 100644
--- a/offapi/com/sun/star/ui/XUIConfiguration.idl
+++ b/offapi/com/sun/star/ui/XUIConfiguration.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_XUIConfiguration_idl__
 #define __com_sun_star_ui_XUIConfiguration_idl__
 
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
 #include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
 
 module com { module sun { module star { module ui {
 
diff --git a/offapi/com/sun/star/ui/XUIConfigurationListener.idl b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
index a44e2b947512..8c48b5fa355c 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationListener.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
 #define __com_sun_star_ui_XUIConfigurationListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_ConfigurationEvent_idl__
 #include <com/sun/star/ui/ConfigurationEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManager.idl b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
index e47af4af365e..78a692d6ae80 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
@@ -28,41 +28,15 @@
 #ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
 #define __com_sun_star_ui_XUIConfigurationManager_idl__
 
-#ifndef __com_sun_star_container_XIndexContainer_idl__
 #include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIConfigurationListener_idl__
 #include <com/sun/star/ui/XUIConfigurationListener.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
 #include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
 
 module com { module sun { module star { module ui {
 
@@ -130,8 +104,8 @@ published interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
 
         @param ResourceURL
             a resource URL which identifies the user interface element. A
-            resourcce URL must meet the following syntax:
-            "private:resource/$type/$name. It is only allowed to use ascii
+            resource URL must meet the following syntax:
+            "private:resource/$type/$name. It is only allowed to use ASCII
             characters for type and name.
 
         @return
@@ -143,12 +117,12 @@ published interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
 
         @param ResourceURL
             a resource URL which identifies the user interface element. A
-            resourcce URL must meet the following syntax:
-            "private:resource/$type/$name. It is only allowed to use ascii
+            resource URL must meet the following syntax:
+            "private:resource/$type/$name. It is only allowed to use ASCII
             characters for type and name.
 
         @param bWriteable
-            must be <TRUE/> if the retrieved settings should be a writeable.
+            must be <TRUE/> if the retrieved settings should be a writable.
             Otherwise <FALSE/> should be provided to get a shareable reference
             to the settings data.
 
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
index ee2ae174d8d1..8cb28e871a03 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_XUIConfigurationManagerSupplier_idl__
 #define __com_sun_star_ui_XUIConfigurationManagerSupplier_idl__
 
-#ifndef __com_sun_star_ui_XUIConfigurationManager_idl__
 #include <com/sun/star/ui/XUIConfigurationManager.idl>
-#endif
 
 module com { module sun { module star { module ui {
 
diff --git a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
index a102edac1fc0..32df8e0e620b 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_XUIConfigurationPersistence_idl__
 #define __com_sun_star_ui_XUIConfigurationPersistence_idl__
 
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
 
 module com { module sun { module star { module ui {
 
diff --git a/offapi/com/sun/star/ui/XUIConfigurationStorage.idl b/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
index 47aee612d0f5..61f9c436de0f 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_XUIConfigurationStorage_idl__
 #define __com_sun_star_ui_XUIConfigurationStorage_idl__
 
-#ifndef __com_sun_star_embed_XStorage_idl__
 #include <com/sun/star/embed/XStorage.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/XUIElement.idl b/offapi/com/sun/star/ui/XUIElement.idl
index ba835b2ab7d7..3b71cf86d9b9 100644
--- a/offapi/com/sun/star/ui/XUIElement.idl
+++ b/offapi/com/sun/star/ui/XUIElement.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_ui_XUIElement_idl__
 #define __com_sun_star_ui_XUIElement_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XFrame_idl__
 #include <com/sun/star/frame/XFrame.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/XUIElementFactory.idl b/offapi/com/sun/star/ui/XUIElementFactory.idl
index 053f14654ca8..328bd87793fc 100644
--- a/offapi/com/sun/star/ui/XUIElementFactory.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactory.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_ui_XUIElementFactory_idl__
 #define __com_sun_star_ui_XUIElementFactory_idl__
 
-#ifndef __com_sun_star_ui_XUIElement_idl__
 #include <com/sun/star/ui/XUIElement.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
@@ -76,8 +65,8 @@ published interface XUIElementFactory : ::com::sun::star::uno::XInterface
 
         @param ResourceURL
             specifies which unique user interface element should be created
-            by the factory. A resourcce URL must meet the following syntax:
-            "private:resource/$type/$name. It is only allowed to use ascii
+            by the factory. A resource URL must meet the following syntax:
+            "private:resource/$type/$name. It is only allowed to use ASCII
             characters for type and name. This argument must not be empty to
             have a working user interface element instance.The implementation
             can throw an
diff --git a/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl b/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
index 5b453d3de8e0..f5dc9d758748 100644
--- a/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_frame_XUIElementFactoryRegistration_idl__
 #define __com_sun_star_frame_XUIElementFactoryRegistration_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_XUIElementFactory_idl__
 #include <com/sun/star/ui/XUIElementFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
@@ -63,7 +49,7 @@ module com { module sun { module star { module ui {
         <li><b>Name</b>a string that identifies a single user interface element within a type class.</li>
         <li><b>Module</b>a string that identifies a single module of OpenOffice.</li>
     <ul>
-    A combination of these three property values can uniquely identifiy every user interface
+    A combination of these three property values can uniquely identify every user interface
     element within OpenOffice.
 
     Currently the following user interface element types are defined:
@@ -84,7 +70,7 @@ interface XUIElementFactoryRegistration : com::sun::star::uno::XInterface
     /** function to retrieve a list of all registered user interface element factories
 
         @returns
-            a sequence of sequence of propert values which describe every registered
+            a sequence of sequence of property values which describe every registered
             user interface element factory.<br/>
 
             The following properties are defined:
@@ -110,7 +96,7 @@ interface XUIElementFactoryRegistration : com::sun::star::uno::XInterface
 
         @param ResourceURL
             a resource URL which identifies a user interface element. A resource URL uses the
-            following syntax: "private:resource/$type/$name". It is only allowed to use ascii
+            following syntax: "private:resource/$type/$name". It is only allowed to use ASCII
             characters for type and name.
 
         @param ModuleName
@@ -163,7 +149,7 @@ interface XUIElementFactoryRegistration : com::sun::star::uno::XInterface
 
         @param aModuleName
             an optional module name that can be used to deregister a factory only for a single module. This value
-            can remain empty if not a module based factory should be deregisted. The module identifier can be retrieved
+            can remain empty if not a module based factory should be deregistered. The module identifier can be retrieved
             from the <type scope="com::sun::star::frame">ModuleManager</type> service.
 
         <p>
diff --git a/offapi/com/sun/star/ui/XUIElementSettings.idl b/offapi/com/sun/star/ui/XUIElementSettings.idl
index 7d39acb4684d..9e07affcf4e7 100644
--- a/offapi/com/sun/star/ui/XUIElementSettings.idl
+++ b/offapi/com/sun/star/ui/XUIElementSettings.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_XUIElementSettings_idl__
 #define __com_sun_star_ui_XUIElementSettings_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 //=============================================================================
 
@@ -67,7 +62,7 @@ published interface XUIElementSettings : com::sun::star::uno::XInterface
         type supports it.
 
         @param bWriteable
-            must be <TRUE/> if the retrieved settings should be a writeable.
+            must be <TRUE/> if the retrieved settings should be a writable.
             Otherwise <FALSE/> should be provided to get a shareable reference
             to the settings data.
 
diff --git a/offapi/com/sun/star/ui/XUIFunctionListener.idl b/offapi/com/sun/star/ui/XUIFunctionListener.idl
index e62670bec558..7add74469990 100644
--- a/offapi/com/sun/star/ui/XUIFunctionListener.idl
+++ b/offapi/com/sun/star/ui/XUIFunctionListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_frame_XUIFunctionListener_idl__
 #define __com_sun_star_frame_XUIFunctionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl b/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl
index 107ec70ca2cc..f3c5a86f8c84 100644
--- a/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl
+++ b/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_dialogs_DialogClosedEvent_idl__
 #define __com_sun_star_ui_dialogs_DialogClosedEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl b/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl
index c509e50b7576..300b5859e40d 100644
--- a/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl
+++ b/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_dialogs_ExecutableDialogException_idl__
 #define __com_sun_star_ui_dialogs_ExecutableDialogException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/FilePicker.idl b/offapi/com/sun/star/ui/dialogs/FilePicker.idl
index 230f289c10f4..8719623f8350 100644
--- a/offapi/com/sun/star/ui/dialogs/FilePicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilePicker.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_ui_dialogs_FilePicker_idl__
 #define __com_sun_star_ui_dialogs_FilePicker_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__
 #include <com/sun/star/util/XCancellable.idl>
-#endif
 
 //=============================================================================
 
@@ -59,8 +45,8 @@ module com { module sun { module star { module ui { module dialogs {
 
     It is <strong>NOT</strong> recommended to cache a reference to a file
     picker instance. Due to restrictions by the underlying system there can
-    be specific limitations possible. To overcome these problems it'
-    s recommended to create a new instance on demand.
+    be specific limitations possible. To overcome these problems it's
+    recommended to create a new instance on demand.
 
     @see XFilePicker
 */
@@ -129,7 +115,7 @@ published service FilePicker
         <br/><br/>
         <p><strong>Notes for the implementation of a FileSave dialog:</strong>
         The implementation of a FileSave dialog should automatically check
-        for existens of a file and issue a warning if a file with the same
+        for existence of a file and issue a warning if a file with the same
         name already exist.</p>
 
         @see com::sun::star::ui::dialogs::TemplateDescription
@@ -138,7 +124,7 @@ published service FilePicker
 
     //-------------------------------------------------------------------------
     /** For canceling a running dialog instance.
-        <p>This may be usefull for automatic test tools for instance.</p>
+        <p>This may be useful for automatic test tools for instance.</p>
     */
     [optional] interface com::sun::star::util::XCancellable;
 
diff --git a/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl b/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl
index d57f08a921b6..1f8188984e5e 100644
--- a/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_dialogs_FilePickerEvent_idl__
 #define __com_sun_star_ui_dialogs_FilePickerEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl b/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
index fc0f6c480b84..95b6d90cdad1 100644
--- a/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_ui_dialogs_FilterOptionsDialog_idl__
 #define __com_sun_star_ui_dialogs_FilterOptionsDialog_idl__
 
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
 #include <com/sun/star/beans/XPropertyAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
index adfad7fed497..e5452aab6850 100644
--- a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_ui_dialogs_FolderPicker_idl__
 #define __com_sun_star_ui_dialogs_FolderPicker_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
 #include <com/sun/star/lang/XTypeProvider.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__
 #include <com/sun/star/util/XCancellable.idl>
-#endif
 
 //=============================================================================
 
@@ -76,7 +65,7 @@ published service FolderPicker
 
     //-------------------------------------------------------------------------
     /** For canceling a running dialog instance.
-        <p>This may be usefull for automatic test tools for instance.</p>
+        <p>This may be useful for automatic test tools for instance.</p>
     */
     [optional] interface com::sun::star::util::XCancellable;
 };
diff --git a/offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl b/offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl
index 7bd5e5da0219..d7a769087d8e 100644
--- a/offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl
+++ b/offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl
@@ -32,7 +32,7 @@
 module com { module sun { module star { module ui { module dialogs {
 
 //=============================================================================
-/** These constants are deprecated and should not be used anymore. They're superseeded
+/** These constants are deprecated and should not be used anymore. They're superseded
     by <type>ControlActions</type>.
     @deprecated
  */
diff --git a/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl b/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl
index e844ab96b77c..90a66b79042c 100644
--- a/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XAsynchronousExecutableDialog_idl__
 #define __com_sun_star_ui_dialogs_XAsynchronousExecutableDialog_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_XDialogClosedListener_idl__
 #include <com/sun/star/ui/dialogs/XDialogClosedListener.idl>
-#endif
 
 //=============================================================================
 
@@ -49,7 +44,7 @@ interface XAsynchronousExecutableDialog: com::sun::star::uno::XInterface
     /** Sets the title of the dialog.
 
         @param aTitle
-        Set an abitrary title for the dialog,
+        Set an arbitrary title for the dialog,
         may be an empty string if the dialog should not have a title.
     */
     void setDialogTitle( [in] string aTitle );
diff --git a/offapi/com/sun/star/ui/dialogs/XControlAccess.idl b/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
index 6c7eeddf3972..65613622d55f 100644
--- a/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
+++ b/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XControlAccess_idl__
 #define __com_sun_star_ui_dialogs_XControlAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -46,7 +41,7 @@ module com { module sun { module star { module ui { module dialogs {
     <p>Use this interface to access user interface controls supported
         by the implementing service. The supported controls, control
         properties and the appropriate values are documented in the
-        decription of the implementing service.</p>
+        description of the implementing service.</p>
 
     @see com::sun::star::ui::dialogs::FilePicker
     @see com::sun::star::ui::dialogs::FilePicker
@@ -60,11 +55,11 @@ published interface XControlAccess: com::sun::star::uno::XInterface
 
     @param aControlName
         The name of the control. Common control names are for
-        instance 'OkButton' or 'CancelButton'.
+        instance "OkButton" or "CancelButton".
 
     @param aControlProperty
         The control property to manipulate. Common control properties
-        are for instance 'Label' or 'State'.
+        are for instance "Label" or "State".
 
     @param aValue
         A value appropriated for the property.
@@ -81,11 +76,11 @@ void setControlProperty( [in] string aControlName, [in] string aControlProperty,
 
     @param aControlName
        The name of the control. Common control names are for
-        instance 'OkButton' or 'CancelButton'.
+        instance "OkButton" or "CancelButton".
 
     @param aControlProperty
         The requested control property. Common control properties
-        are for instance 'Label' or 'State'.
+        are for instance "Label" or "State".
 
     @returns
         the requested value.
diff --git a/offapi/com/sun/star/ui/dialogs/XControlInformation.idl b/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
index c632f4fa1f8b..e1726c7744e3 100644
--- a/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
+++ b/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XControlInformation_idl__
 #define __com_sun_star_ui_dialogs_XControlInformation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -61,7 +56,7 @@ sequence<string> getSupportedControls( );
 
     @param aControlName
         The name of the control. Common control names are for
-        instance 'OkButton' or 'CancelButton'.
+        instance "OkButton" or "CancelButton".
 
     @returns
         <TRUE/> if the specified control is supported.
@@ -75,7 +70,7 @@ boolean isControlSupported( [in] string aControlName );
 
     @param aControlName
         The name of the control. Common control names are for
-        instance 'OkButton' or 'CancelButton'.
+        instance "OkButton" or "CancelButton".
 
     @returns
         a sequence of control properties supported by the specified control.
diff --git a/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl b/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl
index 0f03d37efea2..d3770bf0ebc8 100644
--- a/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl
+++ b/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XDialogClosedListener_idl__
 #define __com_sun_star_ui_dialogs_XDialogClosedListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_DialogClosedEvent_idl__
 #include <com/sun/star/ui/dialogs/DialogClosedEvent.idl>
-#endif
 
 module com { module sun { module star { module ui { module dialogs {
 
diff --git a/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl b/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl
index 556a9bf8cc0f..fc9eaf152e0f 100644
--- a/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #define __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -51,7 +46,7 @@ published interface XExecutableDialog: com::sun::star::uno::XInterface
     /** Sets the title of the dialog.
 
         @param aTitle
-        Set an abitrary title for the dialog,
+        Set an arbitrary title for the dialog,
         may be an empty string if the dialog should not
         have a title.
     */
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
index d35683f71fc3..21841212e2db 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ui_dialogs_XFilePicker_idl__
 #define __com_sun_star_ui_dialogs_XFilePicker_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
 
 //=============================================================================
 
@@ -51,14 +43,14 @@ published interface XFilePicker: com::sun::star::ui::dialogs::XExecutableDialog
 {
 
     //-------------------------------------------------------------------------
-    /** Enable/disable multiselection mode
+    /** Enable/disable multi-selection mode
 
-        <p>If the multiselection mode is enabled, multiple files
+        <p>If the multi-selection mode is enabled, multiple files
         may be selected by the user else only one file selection at a time is possible</p>
 
         @param bMode
-        <p>A value of <TRUE/> enables the multiselection mode.</p>
-        <p>A value of <FALSE/> disables the multiselection mode, this is the default.</p>
+        <p>A value of <TRUE/> enables the multi-selection mode.</p>
+        <p>A value of <FALSE/> disables the multi-selection mode, this is the default.</p>
     */
     void setMultiSelectionMode( [in] boolean bMode );
 
@@ -114,11 +106,11 @@ published interface XFilePicker: com::sun::star::ui::dialogs::XExecutableDialog
         <p> The complete path of the file or directory currently selected
             in URL format. There are two different cases:
             <ol>
-                <li>Multiselection is disabled:
+                <li>Multi-selection is disabled:
                 The first and only entry of the sequence contains the complete
                 path/filename in URL format.</li>
 
-                <li>Multiselection is enabled:
+                <li>Multi-selection is enabled:
                 If only one file is selected, the first entry
                 of the sequence contains the complete path/filename in URL format.
                 If multiple files are selected, the first entry of the sequence contains
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl
index b80c198a5fa4..908ea3798557 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_dialogs_XFilePicker2_idl__
 #define __com_sun_star_ui_dialogs_XFilePicker2_idl__
 
-#ifndef __com_sun_star_ui_dialogs_XFilePicker_idl__
 #include <com/sun/star/ui/dialogs/XFilePicker.idl>
-#endif
 
 //=============================================================================
 
@@ -53,11 +51,11 @@ interface XFilePicker2 : ::com::sun::star::ui::dialogs::XFilePicker
         @attention
         <p>
         Instead to the method getFiles() of base interface XFilePicker the new method return
-        full qualified URL's for every selected file.
+        full qualified URLs for every selected file.
         </p>
 
         @returns
-        <p>A list of all selected file as complete URL's.</p>
+        <p>A list of all selected file as complete URLs.</p>
         <br/>
 
         <p><strong>Notes for the implementation of a FileSave dialog:</strong>If there exists
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl b/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl
index 1c57cce3243d..bf8d4d91ebbb 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_ui_dialogs_XFilePickerControlAccess_idl__
 #define __com_sun_star_ui_dialogs_XFilePickerControlAccess_idl__
 
-#ifndef __com_sun_star_ui_dialogs_XFilePicker_idl__
 #include <com/sun/star/ui/dialogs/XFilePicker.idl>
-#endif
 
 //=============================================================================
 
@@ -88,7 +86,7 @@ void setValue( [in] short aControlId, [in] short aControlAction, [in] any aValue
     is a checkbox the returned value is a boolean that is <TRUE/>
     if the checkbox is checked <FALSE/> otherwise.
     If the specified element doesn't exist or the specified element
-    doesn't support the specidfied control action an empty any will be
+    doesn't support the specified control action an empty any will be
     returned.
 
     @see com::sun::star::ui::dialogs::CommonFilePickerElementIds
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl b/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl
index cacdcd1afde5..7994b2b4eb3b 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XFilePickerListener_idl__
 #define __com_sun_star_ui_dialogs_XFilePickerListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_FilePickerEvent_idl__
 #include <com/sun/star/ui/dialogs/FilePickerEvent.idl>
-#endif
 
 //=============================================================================
 
@@ -86,7 +81,7 @@ published interface XFilePickerListener: com::sun::star::lang::XEventListener
         A help string which the FilePicker dialog should use to display
         a help for a specific control. If the returned string is empty it is
         undefined how the FilePicker implementation will behave.
-        It may show a message 'no help available' or may show no
+        It may show a message "no help available" or may show no
         help at all.
 
         @see com::sun::star::ui::dialogs::FilePickerEvent
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl b/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl
index 862e92b7084d..e9c7d26ee6e4 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XFilePickerNotifier_idl__
 #define __com_sun_star_ui_dialogs_XFilePickerNotifier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_XFilePickerListener_idl__
 #include <com/sun/star/ui/dialogs/XFilePickerListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
index 935b1528db1e..184d77c603e1 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_ui_dialogs_XFilePreview_idl__
 #define __com_sun_star_ui_dialogs_XFilePreview_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -121,7 +113,7 @@ published interface XFilePreview: com::sun::star::uno::XInterface
 
         @returns
         A value of <TRUE/> on success.
-        <p>A vaue of <FALSE/> if the operation fails for any reason or the preview
+        <p>A value of <FALSE/> if the operation fails for any reason or the preview
         implementation doesn't support hiding the preview.</p>
     */
     boolean setShowState( [in] boolean bShowState );
diff --git a/offapi/com/sun/star/ui/dialogs/XFilterGroupManager.idl b/offapi/com/sun/star/ui/dialogs/XFilterGroupManager.idl
index 75e5b6458f3d..6f1a8c5e7d2f 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilterGroupManager.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilterGroupManager.idl
@@ -24,18 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_ui_dialogs_XFilterGroupManager_idl__
+#define __com_sun_star_ui_dialogs_XFilterGroupManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
 #include <com/sun/star/beans/StringPair.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 module com {  module sun {  module star {  module ui { module dialogs {
 
@@ -74,7 +68,5 @@ published interface XFilterGroupManager : com::sun::star::uno::XInterface
     raises( com::sun::star::lang::IllegalArgumentException );
 };
 
-//.............................................................................
 }; }; }; }; };
-//.............................................................................
-
+#endif
diff --git a/offapi/com/sun/star/ui/dialogs/XFilterManager.idl b/offapi/com/sun/star/ui/dialogs/XFilterManager.idl
index 8e418b7519f0..df327953b1d9 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilterManager.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilterManager.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_ui_dialogs_XFilterManager_idl__
 #define __com_sun_star_ui_dialogs_XFilterManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -57,7 +52,7 @@ published interface XFilterManager: com::sun::star::uno::XInterface
         @param aFilter
         Specifies the extensions of the filter. Multiple filters should be
         semicolon separated. The semicolon may not be used as character in
-        a filter expresion. A typical filter is for instance '*.txt'.
+        a filter expression. A typical filter is for instance "*.txt".
 
         @throws ::com::sun::star::lang::IllegalArgumentException
         If a filter with the specified title already exists.
diff --git a/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl b/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl
index 2265ecab2346..13e94dbb008a 100644
--- a/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_ui_dialogs_XFolderPicker_idl__
 #define __com_sun_star_ui_dialogs_XFolderPicker_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
 
 //=============================================================================
 
@@ -77,7 +69,7 @@ published interface XFolderPicker: com::sun::star::ui::dialogs::XExecutableDialo
     /** Returns the selected directory as url conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>.
 
         @returns
-        The selected directory as url if the user did close the dialog with ok
+        The selected directory as url if the user did close the dialog with Ok
         else the returned value is undefined.
     */
     string getDirectory( );
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardController.idl b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
index 2ada9c1e715d..063873aa541f 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardController.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
@@ -71,7 +71,7 @@ published interface XWizardController
 
     /** called when the wizard is about to be finished.
 
-        <p>This method allows the controller to do any final checks, and ultimatively veto finishing the wizard.</p>
+        <p>This method allows the controller to do any final checks, and ultimately veto finishing the wizard.</p>
     */
     boolean confirmFinish();
 };
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
index 64b9f807da29..aa872a454d48 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
@@ -59,7 +59,7 @@ published interface XWizardPage : ::com::sun::star::lang::XComponent
         depends on the current state of the page.</p>
 
         @param Reason
-            is one of the <type>WizardTravelType</type> contants denoting the reason why the page should be
+            is one of the <type>WizardTravelType</type> constants denoting the reason why the page should be
             committed.
     */
     boolean commitPage( [in] short Reason );
diff --git a/offapi/com/sun/star/util/ChangesEvent.idl b/offapi/com/sun/star/util/ChangesEvent.idl
index e17893d52115..92a0a537bda3 100644
--- a/offapi/com/sun/star/util/ChangesEvent.idl
+++ b/offapi/com/sun/star/util/ChangesEvent.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_ChangesEvent_idl__
 #define __com_sun_star_util_ChangesEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_util_ElementChange_idl__
 #include <com/sun/star/util/ElementChange.idl>
-#endif
 
-#ifndef __com_sun_star_util_ChangesSet_idl__
 #include <com/sun/star/util/ChangesSet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/ChangesSet.idl b/offapi/com/sun/star/util/ChangesSet.idl
index 439ff2e31861..41b8f2d29b03 100644
--- a/offapi/com/sun/star/util/ChangesSet.idl
+++ b/offapi/com/sun/star/util/ChangesSet.idl
@@ -27,14 +27,10 @@
 #ifndef __com_sun_star_util_ChangesSet_idl__
 #define __com_sun_star_util_ChangesSet_idl__
 
-#ifndef __com_sun_star_util_ElementChange_idl__
 #include <com/sun/star/util/ElementChange.idl>
-#endif
 
 /*
-#ifndef __com_sun_star_util_XChangesSet_idl__
 #include <com/sun/star/util/XChangesSet.idl>
-#endif
 */
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/CloseVetoException.idl b/offapi/com/sun/star/util/CloseVetoException.idl
index 49608f76b0be..bff5ad8e3166 100644
--- a/offapi/com/sun/star/util/CloseVetoException.idl
+++ b/offapi/com/sun/star/util/CloseVetoException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_CloseVetoException_idl__
 #define __com_sun_star_util_CloseVetoException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/DataEditorEvent.idl b/offapi/com/sun/star/util/DataEditorEvent.idl
index 0d5b34cc00ae..351755dcbc9a 100644
--- a/offapi/com/sun/star/util/DataEditorEvent.idl
+++ b/offapi/com/sun/star/util/DataEditorEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_DataEditorEvent_idl__
 #define __com_sun_star_util_DataEditorEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_util_DataEditorEventType_idl__
 #include <com/sun/star/util/DataEditorEventType.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/DataEditorEventType.idl b/offapi/com/sun/star/util/DataEditorEventType.idl
index d7c036b52c57..5d1e6e1749f6 100644
--- a/offapi/com/sun/star/util/DataEditorEventType.idl
+++ b/offapi/com/sun/star/util/DataEditorEventType.idl
@@ -39,7 +39,7 @@ published enum DataEditorEventType
      */
     DONE,
 
-    /** specifies that the data editing was cancelled by the user (data not stored).
+    /** specifies that the data editing was canceled by the user (data not stored).
      */
     CANCELED
 };
diff --git a/offapi/com/sun/star/util/DiskFullException.idl b/offapi/com/sun/star/util/DiskFullException.idl
index 43eda08302a2..2387feb87d3d 100644
--- a/offapi/com/sun/star/util/DiskFullException.idl
+++ b/offapi/com/sun/star/util/DiskFullException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_DiskFullException_idl__
 #define __com_sun_star_util_DiskFullException_idl__
 
-#ifndef __com_sun_star_util_FileIOException_idl__
 #include <com/sun/star/util/FileIOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/Endianness.idl b/offapi/com/sun/star/util/Endianness.idl
index 86a1fb7a82bd..e82d8abc5285 100644
--- a/offapi/com/sun/star/util/Endianness.idl
+++ b/offapi/com/sun/star/util/Endianness.idl
@@ -29,7 +29,7 @@
 
 module com { module sun { module star { module util {
 
-/** These constans describe the endiannes of data structures.<p>
+/** These constants describe the endianness of data structures.<p>
 
     The endianness specifies the order in which the bytes of larger
     types are laid out in memory.<p>
@@ -41,7 +41,7 @@ constants Endianness
     /** Little endian.<p>
 
         The values are stored in little endian format, i.e. the bytes
-        of the long word 0xAABBCCDD are layed out like 0xDD, 0xCC,
+        of the long word 0xAABBCCDD are laid out like 0xDD, 0xCC,
         0xBB, 0xAA in memory. That is, data of arbitrary machine word
         lengths always starts with the least significant byte, and
         ends with the most significant one.<p>
@@ -51,7 +51,7 @@ constants Endianness
     /** Big endian.<p>
 
         The values are stored in big endian format, i.e. the bytes of
-        the long word 0xAABBCCDD are layed out like 0xAA, 0xBB, 0xCC,
+        the long word 0xAABBCCDD are laid out like 0xAA, 0xBB, 0xCC,
         0xDD in memory. That is, data of arbitrary machine word
         lengths always start with the most significant byte, and ends
         with the least significant one.<p>
diff --git a/offapi/com/sun/star/util/FileIOException.idl b/offapi/com/sun/star/util/FileIOException.idl
index 804c18094704..61a07bff7c35 100644
--- a/offapi/com/sun/star/util/FileIOException.idl
+++ b/offapi/com/sun/star/util/FileIOException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_FileIOException_idl__
 #define __com_sun_star_util_FileIOException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/JobManager.idl b/offapi/com/sun/star/util/JobManager.idl
index 371fa0ae3bb6..71baadb755ed 100644
--- a/offapi/com/sun/star/util/JobManager.idl
+++ b/offapi/com/sun/star/util/JobManager.idl
@@ -28,14 +28,12 @@
 #ifndef __com_sun__star_util_JobManager_idl__
 #define __com_sun__star_util_JobManager_idl__
 
-#ifndef __com_sun_star_util_XJobManager_idl__
 #include <com/sun/star/util/XJobManager.idl>
-#endif
 
 module com { module sun { module star { module util {
 
 //============================================================================
-/** Manage cancellable jobs
+/** Manage cancelable jobs
 
     @see XJobManager
  */
diff --git a/offapi/com/sun/star/util/MalformedNumberFormatException.idl b/offapi/com/sun/star/util/MalformedNumberFormatException.idl
index f084663289d3..72ee5f489c6a 100644
--- a/offapi/com/sun/star/util/MalformedNumberFormatException.idl
+++ b/offapi/com/sun/star/util/MalformedNumberFormatException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_MalformedNumberFormatException_idl__
 #define __com_sun_star_util_MalformedNumberFormatException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/ModeChangeEvent.idl b/offapi/com/sun/star/util/ModeChangeEvent.idl
index f03b337e1bbc..b6a84c3cc2e1 100644
--- a/offapi/com/sun/star/util/ModeChangeEvent.idl
+++ b/offapi/com/sun/star/util/ModeChangeEvent.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_ModeChangeEvent_idl__
 #define __com_sun_star_util_ModeChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/NotLockedException.idl b/offapi/com/sun/star/util/NotLockedException.idl
index 9819fde69afd..9819fde69afd 100755..100644
--- a/offapi/com/sun/star/util/NotLockedException.idl
+++ b/offapi/com/sun/star/util/NotLockedException.idl
diff --git a/offapi/com/sun/star/util/NotNumericException.idl b/offapi/com/sun/star/util/NotNumericException.idl
index ed1d550c2163..e511fd4df745 100644
--- a/offapi/com/sun/star/util/NotNumericException.idl
+++ b/offapi/com/sun/star/util/NotNumericException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_NotNumericException_idl__
 #define __com_sun_star_util_NotNumericException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormatProperties.idl b/offapi/com/sun/star/util/NumberFormatProperties.idl
index 7c747aff3d0f..f385a9019137 100644
--- a/offapi/com/sun/star/util/NumberFormatProperties.idl
+++ b/offapi/com/sun/star/util/NumberFormatProperties.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_NumberFormatProperties_idl__
 #define __com_sun_star_util_NumberFormatProperties_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormatSettings.idl b/offapi/com/sun/star/util/NumberFormatSettings.idl
index 2f1013ae93ad..6b327c94b075 100644
--- a/offapi/com/sun/star/util/NumberFormatSettings.idl
+++ b/offapi/com/sun/star/util/NumberFormatSettings.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_NumberFormatSettings_idl__
 #define __com_sun_star_util_NumberFormatSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_util_Date_idl__
 #include <com/sun/star/util/Date.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormats.idl b/offapi/com/sun/star/util/NumberFormats.idl
index a451fd1b7a4f..11eadaf86910 100644
--- a/offapi/com/sun/star/util/NumberFormats.idl
+++ b/offapi/com/sun/star/util/NumberFormats.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_NumberFormats_idl__
 #define __com_sun_star_util_NumberFormats_idl__
 
-#ifndef __com_sun_star_util_XNumberFormats_idl__
 #include <com/sun/star/util/XNumberFormats.idl>
-#endif
 
-#ifndef __com_sun_star_util_XNumberFormatTypes_idl__
 #include <com/sun/star/util/XNumberFormatTypes.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/NumberFormatsSupplier.idl b/offapi/com/sun/star/util/NumberFormatsSupplier.idl
index 3b7fae2d7ecb..e7bde9de4636 100644
--- a/offapi/com/sun/star/util/NumberFormatsSupplier.idl
+++ b/offapi/com/sun/star/util/NumberFormatsSupplier.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_util_NumberFormatsSupplier_idl__
 #define __com_sun_star_util_NumberFormatsSupplier_idl__
 
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/NumberFormatter.idl b/offapi/com/sun/star/util/NumberFormatter.idl
index c130dfebc210..daa4ff5e1e25 100644
--- a/offapi/com/sun/star/util/NumberFormatter.idl
+++ b/offapi/com/sun/star/util/NumberFormatter.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_NumberFormatter_idl__
 #define __com_sun_star_util_NumberFormatter_idl__
 
-#ifndef __com_sun_star_util_XNumberFormatter_idl__
 #include <com/sun/star/util/XNumberFormatter.idl>
-#endif
 
-#ifndef __com_sun_star_util_XNumberFormatPreviewer_idl__
 #include <com/sun/star/util/XNumberFormatPreviewer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/OfficeInstallationDirectories.idl b/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
index 027f7ec6c656..c6bee6191e05 100644
--- a/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
+++ b/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_OfficeInstallationDirectories_idl__
 #define __com_sun_star_util_OfficeInstallationDirectories_idl__
 
-#ifndef __com_sun_star_util_XOfficeInstallationDirectories_idl__
 #include <com/sun/star/util/XOfficeInstallationDirectories.idl>
-#endif
 
 //============================================================================
 
@@ -48,7 +46,7 @@ module com {  module sun {  module star {  module  util {
     persistent and re-read later. In many cases, storing the reference
     directly would destroy the relocatability of an office installation and the
     possibility to share one office user data directory among parallel office
-    installtions.
+    installations.
 
     @since OOo 2.0
  */
diff --git a/offapi/com/sun/star/util/PathSettings.idl b/offapi/com/sun/star/util/PathSettings.idl
index e67f6813af93..2496e3071b30 100644
--- a/offapi/com/sun/star/util/PathSettings.idl
+++ b/offapi/com/sun/star/util/PathSettings.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_util_PathSettings_idl__
 #define __com_sun_star_util_PathSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
 #include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -121,7 +113,7 @@ published service PathSettings
   /** The path to the Office help files. */
   [property] string Help;
 
-  /** The files that are necessary for the spellcheck are saved here. */
+  /** The files that are necessary for the spell check are saved here. */
   [property] string Linguistic;
 
   /** This is the path for the modules. */
diff --git a/offapi/com/sun/star/util/PathSubstitution.idl b/offapi/com/sun/star/util/PathSubstitution.idl
index dd55f74dccb4..46711e3c97f5 100644
--- a/offapi/com/sun/star/util/PathSubstitution.idl
+++ b/offapi/com/sun/star/util/PathSubstitution.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_util_PathSubstitution_idl__
 #define __com_sun_star_util_PathSubstitution_idl__
 
-#ifndef __com_sun_star_util_XStringSubstitution_idl__
 #include <com/sun/star/util/XStringSubstitution.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerListener_idl__
 #include <com/sun/star/container/XContainerListener.idl>
-#endif
 
 //=============================================================================
 
@@ -49,8 +41,8 @@ module com {  module sun {  module star {  module  util {
 /** A service to support the substitution and resubstitution of path variables.
 
         <p>
-        A path variable must be specified with the following synatx: "$("&lt;variable-name&gt;")".
-        Path variables are not case sensitive and are always provided as a UCB-complient URL's
+        A path variable must be specified with the following syntax: "$("&lt;variable-name&gt;")".
+        Path variables are not case sensitive and are always provided as a UCB-compliant URLs
         (for example: "file:///c:/temp" or "file:///usr/install"). This is mandatory to support an
         optional remote file system.<br>
         A user defined list of path variables is supported. This list is stored in the Office
@@ -79,11 +71,11 @@ module com {  module sun {  module star {  module  util {
     <dt>$(path)</dt>
         <dd>The value of PATH environment variable.</dd>
     <dt>$(lang)</dt>
-        <dd>The country code used by the Office, like 01=english, 49=german.</dd>
+        <dd>The country code used by the Office, like 01=English, 49=German.</dd>
         <dt>$(langid)</dt>
-        <dd>The language code used by the Office, like 0x0009=english, 0x0409=english us.</dd>
+        <dd>The language code used by the Office, like 0x0009=English, 0x0409=English US.</dd>
     <dt>$(vlang)</dt>
-        <dd>The language used by the Office as a string. Like "german" for a german Office.</dd>
+        <dd>The language used by the Office as a string. Like "German" for a German Office.</dd>
         </dl>
         <p>
         Attention: Most predefined variables describe an absolute path.
@@ -103,7 +95,7 @@ published service PathSubstitution
         /** Interface to exchange path variables with defined paths and to resubstitute paths with path variables.
 
                 <p>
-                To resubstitute path variables the caller must provide pathes as UCB-compliant URL's.
+                To resubstitute path variables the caller must provide paths as UCB-compliant URLs.
                 </p>
         */
         interface com::sun::star::util::XStringSubstitution;
diff --git a/offapi/com/sun/star/util/ReplaceDescriptor.idl b/offapi/com/sun/star/util/ReplaceDescriptor.idl
index 192c10707226..eea45c5c6941 100644
--- a/offapi/com/sun/star/util/ReplaceDescriptor.idl
+++ b/offapi/com/sun/star/util/ReplaceDescriptor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_ReplaceDescriptor_idl__
 #define __com_sun_star_util_ReplaceDescriptor_idl__
 
-#ifndef __com_sun_star_util_SearchDescriptor_idl__
 #include <com/sun/star/util/SearchDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
 #include <com/sun/star/util/XReplaceDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/SearchDescriptor.idl b/offapi/com/sun/star/util/SearchDescriptor.idl
index b49e174ccf50..cd334f763b06 100644
--- a/offapi/com/sun/star/util/SearchDescriptor.idl
+++ b/offapi/com/sun/star/util/SearchDescriptor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_SearchDescriptor_idl__
 #define __com_sun_star_util_SearchDescriptor_idl__
 
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
 #include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/SortDescriptor.idl b/offapi/com/sun/star/util/SortDescriptor.idl
index cab1cf01f0e2..e42ef03f96df 100644
--- a/offapi/com/sun/star/util/SortDescriptor.idl
+++ b/offapi/com/sun/star/util/SortDescriptor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_SortDescriptor_idl__
 #define __com_sun_star_util_SortDescriptor_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
@@ -60,7 +56,7 @@ published service SortDescriptor
      //-------------------------------------------------------------------------
     /** specifies the sorting order.
 
-            The sorting order may be defined for sepearte keys in specific
+            The sorting order may be defined for separate keys in specific
             implementations. For those this property may not need to be set.
 
             @see <type scope"com::sun::star::text">TextSortDescriptor</type>
@@ -94,7 +90,7 @@ published service SortDescriptor
      //-------------------------------------------------------------------------
     /** specifies the algorithm for the compare operator (collator).
 
-            The collator algorithm may be defined for sepearte keys in specific
+            The collator algorithm may be defined for separate keys in specific
             implementations. For those this property may not need to be set.
 
             @see <type scope"com::sun::star::text">TextSortDescriptor</type>
diff --git a/offapi/com/sun/star/util/SortField.idl b/offapi/com/sun/star/util/SortField.idl
index 0c20871f3863..f1edab68800b 100644
--- a/offapi/com/sun/star/util/SortField.idl
+++ b/offapi/com/sun/star/util/SortField.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_SortField_idl__
 #define __com_sun_star_util_SortField_idl__
 
-#ifndef __com_sun_star_util_SortFieldType_idl__
 #include <com/sun/star/util/SortFieldType.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/Sortable.idl b/offapi/com/sun/star/util/Sortable.idl
index 328a80517343..cced73bcbcba 100644
--- a/offapi/com/sun/star/util/Sortable.idl
+++ b/offapi/com/sun/star/util/Sortable.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_Sortable_idl__
 #define __com_sun_star_util_Sortable_idl__
 
-#ifndef __com_sun_star_util_SortDescriptor_idl__
 #include <com/sun/star/util/SortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
 #include <com/sun/star/util/XSortable.idl>
-#endif
 
 
 //=============================================================================
@@ -51,9 +46,9 @@ module com {  module sun {  module star {  module util {
  */
 published service Sortable
 {
-        /** the properties returned by a call to the 'createSortDescriptor' method
+        /** the properties returned by a call to the "createSortDescriptor" method
             of this interfaces implementation are those of the
-            'com.sun.star.util.SortDescriptor' service.
+            "com.sun.star.util.SortDescriptor" service.
 
            @see <type scope="com::sun::star::util">SortDescriptor</type>
          */
diff --git a/offapi/com/sun/star/util/TextSearch.idl b/offapi/com/sun/star/util/TextSearch.idl
index f6abf8c088e1..3154389afae6 100644
--- a/offapi/com/sun/star/util/TextSearch.idl
+++ b/offapi/com/sun/star/util/TextSearch.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_TextSearch_idl__
 #define __com_sun_star_util_TextSearch_idl__
 
-#ifndef __com_sun_star_lang_XTextSearch_idl__
 #include <com/sun/star/util/XTextSearch.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/URL.idl b/offapi/com/sun/star/util/URL.idl
index a869331ac9dd..9d62ca76d2e0 100644
--- a/offapi/com/sun/star/util/URL.idl
+++ b/offapi/com/sun/star/util/URL.idl
@@ -106,7 +106,7 @@ published struct URL
         <strong>Attention:</strong>A service implementing the <type>XURLTransformer</type> interface
         will normally not detect if the last segment is a folder or a file. So it is possible that
         the last segment describes a folder. If you want to be sure that a file URL that references
-        a folder will be correctly put into the URL fields you should append a '/' at the end of the
+        a folder will be correctly put into the URL fields you should append a "/" at the end of the
         hierarchical path.
         </p>
      */
diff --git a/offapi/com/sun/star/util/URLTransformer.idl b/offapi/com/sun/star/util/URLTransformer.idl
index 46b4879a7e7d..8839ad229154 100644
--- a/offapi/com/sun/star/util/URLTransformer.idl
+++ b/offapi/com/sun/star/util/URLTransformer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_URLTransformer_idl__
 #define __com_sun_star_util_URLTransformer_idl__
 
-#ifndef __com_sun_star_util_XURLTransformer_idl__
 #include <com/sun/star/util/XURLTransformer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/UriAbbreviation.idl b/offapi/com/sun/star/util/UriAbbreviation.idl
index 2825fe74b32d..14a88deed4b9 100644
--- a/offapi/com/sun/star/util/UriAbbreviation.idl
+++ b/offapi/com/sun/star/util/UriAbbreviation.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun__star_util_UriAbbreviation_idl__
 #define __com_sun__star_util_UriAbbreviation_idl__
 
-#ifndef __com_sun_star_util_XStringAbbreviation_idl__
 #include <com/sun/star/util/XStringAbbreviation.idl>
-#endif
 
 module com { module sun { module star { module util {
 
diff --git a/offapi/com/sun/star/util/VetoException.idl b/offapi/com/sun/star/util/VetoException.idl
index fdf4d084d790..d197c3c9b350 100644
--- a/offapi/com/sun/star/util/VetoException.idl
+++ b/offapi/com/sun/star/util/VetoException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_VetoException_idl__
 #define __com_sun_star_util_VetoException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XArchiver.idl b/offapi/com/sun/star/util/XArchiver.idl
index d3aee96cf08c..6a4e43f7f674 100644
--- a/offapi/com/sun/star/util/XArchiver.idl
+++ b/offapi/com/sun/star/util/XArchiver.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_XArchiver_idl__
 #define __com_sun_star_util_XArchiver_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XAtomServer.idl b/offapi/com/sun/star/util/XAtomServer.idl
index 610476a0d6c3..3150454489f5 100644
--- a/offapi/com/sun/star/util/XAtomServer.idl
+++ b/offapi/com/sun/star/util/XAtomServer.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_util_XAtomServer_idl__
 #define __com_sun_star_util_XAtomServer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_AtomDescription_idl__
 #include <com/sun/star/util/AtomDescription.idl>
-#endif
-
-#ifndef __com_sun_star_util_AtomClassRequest_idl__
 #include <com/sun/star/util/AtomClassRequest.idl>
-#endif
 
 
 module com
@@ -79,7 +71,7 @@ published interface XAtomServer : com::sun::star::uno::XInterface
             the descriptions for all atoms of class <code>atomClass</code>
     */
     sequence< AtomDescription > getClass( [in] long atomClass );
-    /** returns mutltiple atom classes
+    /** returns multiple atom classes
 
         @param atomClasses
             which classes to return
diff --git a/offapi/com/sun/star/util/XBroadcaster.idl b/offapi/com/sun/star/util/XBroadcaster.idl
index eb9a0d4cc320..81e9494767ce 100644
--- a/offapi/com/sun/star/util/XBroadcaster.idl
+++ b/offapi/com/sun/star/util/XBroadcaster.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XBroadcaster_idl__
 #define __com_sun_star_util_XBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -37,7 +35,7 @@ module com {  module sun {  module star {  module util {
 
 //=============================================================================
 
-/** allows to control notification behaviour of a broadcaster.
+/** allows to control notification behavior of a broadcaster.
 
     @since OOo 3.0
  */
diff --git a/offapi/com/sun/star/util/XCancelManager.idl b/offapi/com/sun/star/util/XCancelManager.idl
index 36fac41e012e..ef9ae90b5f54 100644
--- a/offapi/com/sun/star/util/XCancelManager.idl
+++ b/offapi/com/sun/star/util/XCancelManager.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XCancelManager_idl__
 #define __com_sun_star_util_XCancelManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_XCancellable_idl__
 #include <com/sun/star/util/XCancellable.idl>
-#endif
 
 
 //=============================================================================
@@ -42,19 +38,19 @@ module com {  module sun {  module star {  module util {
 
 //=============================================================================
 
-/** manages a list of cancellable objects.
+/** manages a list of cancelable objects.
 
     @deprecated
  */
 published interface XCancelManager: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** registers a cancellable object.
+    /** registers a cancelable object.
      */
     void registerCancellable( [in] com::sun::star::util::XCancellable Cancel );
 
     //-------------------------------------------------------------------------
-    /** deregisters a cancellable object.
+    /** deregisters a cancelable object.
      */
     void releaseCancellable( [in] com::sun::star::util::XCancellable Cancel );
 
diff --git a/offapi/com/sun/star/util/XCancellable.idl b/offapi/com/sun/star/util/XCancellable.idl
index 6887942234e9..f7915c133672 100644
--- a/offapi/com/sun/star/util/XCancellable.idl
+++ b/offapi/com/sun/star/util/XCancellable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XCancellable_idl__
 #define __com_sun_star_util_XCancellable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
@@ -38,7 +36,7 @@ module com {  module sun {  module star {  module util {
 
 //=============================================================================
 
-/** offers the possibility of cancelling a job.
+/** offers the possibility of canceling a job.
 
     <p>This is supported by objects which represent a job.
  */
diff --git a/offapi/com/sun/star/util/XChainable.idl b/offapi/com/sun/star/util/XChainable.idl
index e381bc683839..41d7d1f9843c 100644
--- a/offapi/com/sun/star/util/XChainable.idl
+++ b/offapi/com/sun/star/util/XChainable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XChainable_idl__
 #define __com_sun_star_util_XChainable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XChangesBatch.idl b/offapi/com/sun/star/util/XChangesBatch.idl
index 253aa80abe33..a42e7bc69050 100644
--- a/offapi/com/sun/star/util/XChangesBatch.idl
+++ b/offapi/com/sun/star/util/XChangesBatch.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_XChangesBatch_idl__
 #define __com_sun_star_util_XChangesBatch_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
-#ifndef __com_sun_star_util_ChangesSet_idl__
 #include <com/sun/star/util/ChangesSet.idl>
-#endif
 
 
 //=============================================================================
@@ -49,7 +43,7 @@ module com {  module sun {  module star {  module util {
 
     <p>An object implementing this interface allows other interfaces to change
     its state locally. It will keep a list of pending changes until such changes
-    are committed or cancelled. </p>
+    are committed or canceled.  </p>
 
     <p>Only when they are explicitly committed will these changes take effect
     persistently or globally.  </p>
diff --git a/offapi/com/sun/star/util/XChangesListener.idl b/offapi/com/sun/star/util/XChangesListener.idl
index 5591c2caf091..3ef055dfeef2 100644
--- a/offapi/com/sun/star/util/XChangesListener.idl
+++ b/offapi/com/sun/star/util/XChangesListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XChangesListener_idl__
 #define __com_sun_star_util_XChangesListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_util_ChangesEvent_idl__
 #include <com/sun/star/util/ChangesEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XChangesNotifier.idl b/offapi/com/sun/star/util/XChangesNotifier.idl
index 6ca009069509..fc6081a93791 100644
--- a/offapi/com/sun/star/util/XChangesNotifier.idl
+++ b/offapi/com/sun/star/util/XChangesNotifier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XChangesNotifier_idl__
 #define __com_sun_star_util_XChangesNotifier_idl__
 
-#ifndef __com_sun_star_util_XChangesListener_idl__
 #include <com/sun/star/util/XChangesListener.idl>
-#endif
 
 //=============================================================================
 
@@ -46,7 +44,7 @@ module com {  module sun {  module star {  module util {
 published interface XChangesNotifier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** adds the specified listener to receive events when changes occured.
+    /** adds the specified listener to receive events when changes occurred.
      */
     [oneway] void addChangesListener( [in] com::sun::star::util::XChangesListener aListener );
 
diff --git a/offapi/com/sun/star/util/XChangesSet.idl b/offapi/com/sun/star/util/XChangesSet.idl
index b812d0389eef..3db6539260fc 100644
--- a/offapi/com/sun/star/util/XChangesSet.idl
+++ b/offapi/com/sun/star/util/XChangesSet.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_XChangesSet_idl__
 #define __com_sun_star_util_XChangesSet_idl__
 
-#ifndef __com_sun_star_container_XElementAccess_idl__
 #include <com/sun/star/container/XElementAccess.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
-#ifndef __com_sun_star_util_ElementChange_idl__
 #include <com/sun/star/util/ElementChange.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XCloneable.idl b/offapi/com/sun/star/util/XCloneable.idl
index f89fcb9eb96d..a47ba1371e4f 100644
--- a/offapi/com/sun/star/util/XCloneable.idl
+++ b/offapi/com/sun/star/util/XCloneable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XCloneable_idl__
 #define __com_sun_star_util_XCloneable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XCloseBroadcaster.idl b/offapi/com/sun/star/util/XCloseBroadcaster.idl
index 7bf7e0f892d5..07719e231b7c 100644
--- a/offapi/com/sun/star/util/XCloseBroadcaster.idl
+++ b/offapi/com/sun/star/util/XCloseBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_XCloseBroadcaster_idl__
 #define __com_sun_star_util_XCloseBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseListener_idl__
 #include <com/sun/star/util/XCloseListener.idl>
-#endif
 
 //=============================================================================
 
@@ -46,10 +41,10 @@
     The called object for closing must post the closing events immediately
     and before any internal cancel operations will be started.
     If a listener disagree with that it should throw a <type>CloseVetoException</type>
-    and called function <method>XCloseable::close</method> must be breaked immediately.
+    and called function <method>XCloseable::close</method> must be broken immediately.
     It's not allowed to catch it inside the close() request.
     If no listener nor internal processes hinder the object on closing
-    all listener get's a notification about real closing.
+    all listeners get a notification about real closing.
     </p>
 
     @see
@@ -60,7 +55,7 @@ published interface XCloseBroadcaster: com::sun::star::uno::XInterface
     /** adds the specified listener to receive or have a veto for "close" events
 
         @param Listener
-            the listener wich is interest on closing events
+            the listener which is interest on closing events
      */
     [oneway] void addCloseListener( [in] XCloseListener Listener );
 
@@ -68,7 +63,7 @@ published interface XCloseBroadcaster: com::sun::star::uno::XInterface
     /** removes the specified listener
 
         @param Listener
-            the listener wich isn't interest on closing events anylonger
+            the listener which isn't interest on closing events any longer
      */
     [oneway] void removeCloseListener( [in] XCloseListener Listener );
 };
diff --git a/offapi/com/sun/star/util/XCloseListener.idl b/offapi/com/sun/star/util/XCloseListener.idl
index 8e45e3d7ad0f..0e9037a3812d 100644
--- a/offapi/com/sun/star/util/XCloseListener.idl
+++ b/offapi/com/sun/star/util/XCloseListener.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_util_XCloseListener_idl__
 #define __com_sun_star_util_XCloseListener_idl__
 
-#ifndef __com_sun_star_util_CloseVetoException_idl__
 #include <com/sun/star/util/CloseVetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 //=============================================================================
 
@@ -59,7 +51,7 @@
 
     <p>
     If an event <method scope="com::sun::star::lang">XEventListener::disposing</method>
-    occured, nobody called <method>XCloseable::close</method> on listened object before.
+    occurred, nobody called <method>XCloseable::close</method> on listened object before.
     Then it's not allowed to break this request - it must be accepted!
     </p>
 
@@ -91,7 +83,7 @@ published interface XCloseListener: com::sun::star::lang::XEventListener
         <p>
         If this listener doesn't disagree with th close request it depends from his internal
         implementation if he deregister himself at the listened object.
-        But normaly this must be done in <member>XCloseListener::notifyClosing()</member>.
+        But normally this must be done in <member>XCloseListener::notifyClosing()</member>.
         </p>
 
         @param Source
@@ -113,16 +105,16 @@ published interface XCloseListener: com::sun::star::lang::XEventListener
             raises( CloseVetoException );
 
     //-------------------------------------------------------------------------
-    /** is called when the listened object is closed realy
+    /** is called when the listened object is closed really
 
         <p>
-        Now the listened object is closed realy. Listener has to accept that;
-        should deregister himself and relaese all references to it.
+        Now the listened object is closed really. Listener has to accept that;
+        should deregister himself and release all references to it.
         It's not allowed nor possible to disagree with that by throwing any exception.
         </p>
 
         <p>
-        If the event <member scope="com::sun::star::lang">XEventListener::disposing()</member> occured before
+        If the event <member scope="com::sun::star::lang">XEventListener::disposing()</member> occurred before
         it must be accepted too. There exist no chance for a disagreement any more.
         </p>
 
diff --git a/offapi/com/sun/star/util/XCloseable.idl b/offapi/com/sun/star/util/XCloseable.idl
index 56fb5429d18f..28c0371325ee 100644
--- a/offapi/com/sun/star/util/XCloseable.idl
+++ b/offapi/com/sun/star/util/XCloseable.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_XClosable_idl__
 #define __com_sun_star_util_XClosable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloseBroadcaster_idl__
 #include <com/sun/star/util/XCloseBroadcaster.idl>
-#endif
 
 //=============================================================================
 
@@ -50,14 +45,14 @@ module com {  module sun {  module star {  module util {
         <li>closed   (if it supports <member>XCloseable::close()</member>)</li>
     </ul>
     First version gives the object no chance to disagree with that (e.g. if a
-    process is still running and can't be cancelled realy). Last version
+    process is still running and can't be canceled really). Last version
     provides this possibility, but can't guarantee real termination of called object.
-    It depends from the environment of an object, if one or both mechanism are neccessary.
+    It depends from the environment of an object, if one or both mechanism are necessary.
     </p>
 
     <p>
     Base interface <type>XCloseBroadcaster</type> makes it possible that any listener
-    which is interrested on life time of listened object ...
+    which is interested on life time of listened object ...
     <ul>
         <li>can get a notification about closing of it</li>
         <li>or can have a veto to break that.</li>
@@ -74,15 +69,15 @@ published interface XCloseable: XCloseBroadcaster
     /** try to close the object
 
         <p>
-        Must definitly be called before <member scope="com::sun::star::lang">XComponent::dispose()</member>.
-        But nobody can guarentee real closing of called object - because it can disagree with that if any
-        still running processes can't be cancelled yet. It's not allowed to block this call till internal
-        operations will be finished here. They must be cancelled or call must return imediatly by throwing
-        the <type>CloseVetoException</type>.  Otherwise (if nothing exist to disagree) it must return normaly.
+        Must definitely be called before <member scope="com::sun::star::lang">XComponent::dispose()</member>.
+        But nobody can guarantee real closing of called object - because it can disagree with that if any
+        still running processes can't be canceled yet. It's not allowed to block this call till internal
+        operations will be finished here. They must be canceled or call must return immediately by throwing
+        the <type>CloseVetoException</type>.  Otherwise (if nothing exist to disagree) it must return normally.
         </p>
 
         <p>
-        Before any internal processes will be cancelled, all registered <type>XCloseListener</type>
+        Before any internal processes will be canceled, all registered <type>XCloseListener</type>
         must be notified. Any of them can disagree with a <type>CloseVetoException</type> too.
         It's forbidden to catch this exception inside the called close() method because the caller must
         get this information!
@@ -96,25 +91,25 @@ published interface XCloseable: XCloseBroadcaster
         If it is set to <TRUE/> the caller gives up his ownership. If a XCloseListener throw the veto exception
         he will be the new owner of the closing object. This information is passed to the listener by a parameter of
         his notification method <member>XCloseListener::queryClosing()</member>. After his operations was finished
-        he MUST try to close it again. If the closing object itselfs disagree by an exception and the parameter
+        he MUST try to close it again. If the closing object itself disagree by an exception and the parameter
         <var>DeliverOwnership</var> was set to <TRUE/> the object will be his own owner with all consequences of that.
         <br><strong>Note:</strong><br>
         There is no way to get the ownership back if it was delivered!
         </p>
 
         <p>
-        If this method was already called on an object it should return without any reaction. Normaly it's possible to throw
+        If this method was already called on an object it should return without any reaction. Normally it's possible to throw
         a <type scope="com::sun::star::lang">DisposedException</type> for already disposed or closed objects
         (which represent a <type scope="com::sun::star::uno">RuntimeException</type> and can be thrown by every interface call),
         but it shouldn't be used here. The veto exception should be the only way to indicates the result.
         </p>
 
         @param DeliverOwnership
-                <TRUE/> delegates the ownership of ths closing object to any one which throw the CloseVetoException.
+                <TRUE/> delegates the ownership of this closing object to any one which throw the CloseVetoException.
                 This new owner has to close the closing object again if his still running processes will be finished.
                 <br>
                 <FALSE/> let the ownership at the original one which called the close() method. He must react for possible
-                CloseVetoExceptions and try it again at a later time. This can be usefull for a generic UI handling.
+                CloseVetoExceptions and try it again at a later time. This can be useful for a generic UI handling.
 
         @throws CloseVetoException
             indicates that the closing object himself or any of his currently registered listener disagree with this close() request.
diff --git a/offapi/com/sun/star/util/XDataEditor.idl b/offapi/com/sun/star/util/XDataEditor.idl
index 82cc18d53eae..874a7ca55b8f 100644
--- a/offapi/com/sun/star/util/XDataEditor.idl
+++ b/offapi/com/sun/star/util/XDataEditor.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XDataEditor_idl__
 #define __com_sun_star_util_XDataEditor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_XDataEditorListener_idl__
 #include <com/sun/star/util/XDataEditorListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XDataEditorListener.idl b/offapi/com/sun/star/util/XDataEditorListener.idl
index abe91ed2a36a..7864b3f8b6d4 100644
--- a/offapi/com/sun/star/util/XDataEditorListener.idl
+++ b/offapi/com/sun/star/util/XDataEditorListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XDataEditorListener_idl__
 #define __com_sun_star_util_XDataEditorListener_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_DataEditorEvent_idl__
 #include <com/sun/star/util/DataEditorEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XFlushListener.idl b/offapi/com/sun/star/util/XFlushListener.idl
index 521aebc5e003..7a155f59e606 100644
--- a/offapi/com/sun/star/util/XFlushListener.idl
+++ b/offapi/com/sun/star/util/XFlushListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XFlushListener_idl__
 #define __com_sun_star_util_XFlushListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XFlushable.idl b/offapi/com/sun/star/util/XFlushable.idl
index 668d64055ed8..e468f4351ec4 100644
--- a/offapi/com/sun/star/util/XFlushable.idl
+++ b/offapi/com/sun/star/util/XFlushable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XFlushable_idl__
 #define __com_sun_star_util_XFlushable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_XFlushListener_idl__
 #include <com/sun/star/util/XFlushListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XImportable.idl b/offapi/com/sun/star/util/XImportable.idl
index 05872c6e3231..31b8a38f1802 100644
--- a/offapi/com/sun/star/util/XImportable.idl
+++ b/offapi/com/sun/star/util/XImportable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XImportable_idl__
 #define __com_sun_star_util_XImportable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XIndent.idl b/offapi/com/sun/star/util/XIndent.idl
index dffd7334316b..887bd4af1683 100644
--- a/offapi/com/sun/star/util/XIndent.idl
+++ b/offapi/com/sun/star/util/XIndent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XIndent_idl__
 #define __com_sun_star_util_XIndent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XJobManager.idl b/offapi/com/sun/star/util/XJobManager.idl
index 99bc7b5428a1..56eb08f51a04 100644
--- a/offapi/com/sun/star/util/XJobManager.idl
+++ b/offapi/com/sun/star/util/XJobManager.idl
@@ -28,29 +28,24 @@
 #ifndef __com_sun_star_util_XJobManager_idl__
 #define __com_sun_star_util_XJobManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__
 #include <com/sun/star/util/XCancellable.idl>
-#endif
 
 module com { module sun { module star { module util {
 
 //============================================================================
-/** Manage cancellable jobs.
+/** Manage cancelable jobs.
 
  */
 published interface XJobManager: com::sun::star::uno::XInterface
 {
         //-------------------------------------------------------------------------
-        /** registers a cancellable job.
+        /** registers a cancelable job.
          */
         void registerJob( [in] com::sun::star::util::XCancellable Job );
 
         //-------------------------------------------------------------------------
-        /** deregisters a cancellable jobs.
+        /** deregisters a cancelable jobs.
          */
         void releaseJob( [in] com::sun::star::util::XCancellable Job );
 
diff --git a/offapi/com/sun/star/util/XLinkUpdate.idl b/offapi/com/sun/star/util/XLinkUpdate.idl
index d4c3a1a41850..6b2da86142e9 100644
--- a/offapi/com/sun/star/util/XLinkUpdate.idl
+++ b/offapi/com/sun/star/util/XLinkUpdate.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XLinkUpdate_idl__
 #define __com_sun_star_util_XLinkUpdate_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XLocalizedAliases.idl b/offapi/com/sun/star/util/XLocalizedAliases.idl
index cb3e0c7bc9f2..0dd7bce38ead 100644
--- a/offapi/com/sun/star/util/XLocalizedAliases.idl
+++ b/offapi/com/sun/star/util/XLocalizedAliases.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_util_XLocalizedAliases_idl__
 #define __com_sun_star_util_XLocalizedAliases_idl__
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
-#ifndef __com_sun_star_util_AliasProgrammaticPair_idl__
 #include <com/sun/star/util/AliasProgrammaticPair.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module util {
@@ -67,7 +59,7 @@ published interface XLocalizedAliases: com::sun::star::uno::XInterface
                      [in]string alias)
         raises (com::sun::star::container::NoSuchElementException);
     //-------------------------------------------------------------------------
-    /** retrieves a registered porgrammatic name identified by an alias.
+    /** retrieves a registered programmatic name identified by an alias.
      */
     string lookupAlias([in]com::sun::star::lang::Locale locale,
                          [in]string Alias)
diff --git a/offapi/com/sun/star/util/XLockable.idl b/offapi/com/sun/star/util/XLockable.idl
index 0e52cc96cb8b..0e52cc96cb8b 100755..100644
--- a/offapi/com/sun/star/util/XLockable.idl
+++ b/offapi/com/sun/star/util/XLockable.idl
diff --git a/offapi/com/sun/star/util/XMergeable.idl b/offapi/com/sun/star/util/XMergeable.idl
index ba2ac3bc90ea..1c3d82169e46 100644
--- a/offapi/com/sun/star/util/XMergeable.idl
+++ b/offapi/com/sun/star/util/XMergeable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XMergeable_idl__
 #define __com_sun_star_util_XMergeable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XModeChangeApproveListener.idl b/offapi/com/sun/star/util/XModeChangeApproveListener.idl
index 76226462531f..f973f503ec4f 100644
--- a/offapi/com/sun/star/util/XModeChangeApproveListener.idl
+++ b/offapi/com/sun/star/util/XModeChangeApproveListener.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_util_XModeChangeApproveListener_idl__
 #define __com_sun_star_util_XModeChangeApproveListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_util_ModeChangeEvent_idl__
 #include <com/sun/star/util/ModeChangeEvent.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XModeChangeBroadcaster.idl b/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
index 1c9cbbde8fa8..3c297dfa4646 100644
--- a/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
+++ b/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_util_XModeChangeBroadcaster_idl__
 #define __com_sun_star_util_XModeChangeBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModeChangeListener_idl__
 #include <com/sun/star/util/XModeChangeListener.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModeChangeApproveListener_idl__
 #include <com/sun/star/util/XModeChangeApproveListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XModeChangeListener.idl b/offapi/com/sun/star/util/XModeChangeListener.idl
index 5f3437081585..417f029eee43 100644
--- a/offapi/com/sun/star/util/XModeChangeListener.idl
+++ b/offapi/com/sun/star/util/XModeChangeListener.idl
@@ -28,13 +28,9 @@
 #ifndef __com_sun_star_util_XModeChangeListener_idl__
 #define __com_sun_star_util_XModeChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_util_ModeChangeEvent_idl__
 #include <com/sun/star/util/ModeChangeEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XModeSelector.idl b/offapi/com/sun/star/util/XModeSelector.idl
index 7efefb361a04..24a740d79090 100644
--- a/offapi/com/sun/star/util/XModeSelector.idl
+++ b/offapi/com/sun/star/util/XModeSelector.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XModeSelector_idl__
 #define __com_sun_star_util_XModeSelector_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XModifiable.idl b/offapi/com/sun/star/util/XModifiable.idl
index 2f0b37531aca..972b99c9e4ab 100644
--- a/offapi/com/sun/star/util/XModifiable.idl
+++ b/offapi/com/sun/star/util/XModifiable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XModifiable_idl__
 #define __com_sun_star_util_XModifiable_idl__
 
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XModifiable2.idl b/offapi/com/sun/star/util/XModifiable2.idl
index fd9b19042424..bcc9335d381f 100644
--- a/offapi/com/sun/star/util/XModifiable2.idl
+++ b/offapi/com/sun/star/util/XModifiable2.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XModifiable2_idl__
 #define __com_sun_star_util_XModifiable2_idl__
 
-#ifndef __com_sun_star_util_XModifiable_idl__
 #include <com/sun/star/util/XModifiable.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
 
 
 //=============================================================================
@@ -48,7 +44,7 @@ module com {  module sun {  module star {  module util {
     This interface allows to prevent changing of the modified state of the
     object. It is introduced for performance optimizations, to allow to prevent
     unnecessary updates, for example while importing a document.
-    Please use this interface very carefuly.
+    Please use this interface very carefully.
     </p>
  */
 published interface XModifiable2: com::sun::star::util::XModifiable
@@ -56,7 +52,7 @@ published interface XModifiable2: com::sun::star::util::XModifiable
     //-------------------------------------------------------------------------
     /** disable possibility to change modified state of the document
 
-        @retuns the value that says whether the modified state change was
+        @returns the value that says whether the modified state change was
                 enabled before the call
             <TRUE/> the changing of the modified state was already disabled
             <FALSE/> the changing of the modified state was enabled
@@ -67,7 +63,7 @@ published interface XModifiable2: com::sun::star::util::XModifiable
     //-------------------------------------------------------------------------
     /** enable possibility to change modified state of the document
 
-        @retuns the value that says whether the modified state change was
+        @returns the value that says whether the modified state change was
                 enabled before the call
             <TRUE/> the changing of the modified state was disabled
             <FALSE/> the changing of the modified state was already enabled
diff --git a/offapi/com/sun/star/util/XModifyBroadcaster.idl b/offapi/com/sun/star/util/XModifyBroadcaster.idl
index 657db5400126..d65f3661342f 100644
--- a/offapi/com/sun/star/util/XModifyBroadcaster.idl
+++ b/offapi/com/sun/star/util/XModifyBroadcaster.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XModifyBroadcaster_idl__
 #define __com_sun_star_util_XModifyBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_XModifyListener_idl__
 #include <com/sun/star/util/XModifyListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XModifyListener.idl b/offapi/com/sun/star/util/XModifyListener.idl
index e31574aaff2a..b9eefa7a1664 100644
--- a/offapi/com/sun/star/util/XModifyListener.idl
+++ b/offapi/com/sun/star/util/XModifyListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XModifyListener_idl__
 #define __com_sun_star_util_XModifyListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormatPreviewer.idl b/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
index cd94ebd1335f..f53a62363ea5 100644
--- a/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
+++ b/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
@@ -27,25 +27,14 @@
 #ifndef __com_sun_star_util_XNumberFormatPreviewer_idl__
 #define __com_sun_star_util_XNumberFormatPreviewer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
-#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__
 #include <com/sun/star/util/MalformedNumberFormatException.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormatTypes.idl b/offapi/com/sun/star/util/XNumberFormatTypes.idl
index 9c896440e20e..399bb715f35c 100644
--- a/offapi/com/sun/star/util/XNumberFormatTypes.idl
+++ b/offapi/com/sun/star/util/XNumberFormatTypes.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_XNumberFormatTypes_idl__
 #define __com_sun_star_util_XNumberFormatTypes_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormats.idl b/offapi/com/sun/star/util/XNumberFormats.idl
index 25954d8e4f99..527681dde3a8 100644
--- a/offapi/com/sun/star/util/XNumberFormats.idl
+++ b/offapi/com/sun/star/util/XNumberFormats.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_util_XNumberFormats_idl__
 #define __com_sun_star_util_XNumberFormats_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
-#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__
 #include <com/sun/star/util/MalformedNumberFormatException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormatsSupplier.idl b/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
index 505be56288bc..4bb5085fa34d 100644
--- a/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
+++ b/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #define __com_sun_star_util_XNumberFormatsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_util_XNumberFormats_idl__
 #include <com/sun/star/util/XNumberFormats.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XNumberFormatter.idl b/offapi/com/sun/star/util/XNumberFormatter.idl
index f01f1b30bf73..b0e44ab2d731 100644
--- a/offapi/com/sun/star/util/XNumberFormatter.idl
+++ b/offapi/com/sun/star/util/XNumberFormatter.idl
@@ -27,25 +27,14 @@
 #ifndef __com_sun_star_util_XNumberFormatter_idl__
 #define __com_sun_star_util_XNumberFormatter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_util_NotNumericException_idl__
 #include <com/sun/star/util/NotNumericException.idl>
-#endif
 
-#ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl b/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
index b8cabbb25e34..ea729b478d5e 100644
--- a/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
+++ b/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_XOfficeInstallationDirectories_idl__
 #define __com_sun_star_util_XOfficeInstallationDirectories_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module util {
 
@@ -99,8 +97,8 @@ published interface XOfficeInstallationDirectories : com::sun::star::uno::XInter
         current office installation directory or office user data directory.
 
         @param URL
-        The URL for that an absolaute URL is requested. In case the URL does
-        not contain the opaque relocation placholder used by
+        The URL for that an absolute URL is requested. In case the URL does
+        not contain the opaque relocation placeholder used by
         <code>makeRelocatableURL</code>, the input URL will be returned
         unchanged.
 
diff --git a/offapi/com/sun/star/util/XPropertyReplace.idl b/offapi/com/sun/star/util/XPropertyReplace.idl
index 7be1114220f3..29308d8e2c17 100644
--- a/offapi/com/sun/star/util/XPropertyReplace.idl
+++ b/offapi/com/sun/star/util/XPropertyReplace.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_util_XPropertyReplace_idl__
 #define __com_sun_star_util_XPropertyReplace_idl__
 
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
 #include <com/sun/star/util/XReplaceDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XProtectable.idl b/offapi/com/sun/star/util/XProtectable.idl
index 57685a168bf5..cb81204ea2d7 100644
--- a/offapi/com/sun/star/util/XProtectable.idl
+++ b/offapi/com/sun/star/util/XProtectable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XProtectable_idl__
 #define __com_sun_star_util_XProtectable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XRefreshListener.idl b/offapi/com/sun/star/util/XRefreshListener.idl
index 8286583015e1..2d2548dd9f19 100644
--- a/offapi/com/sun/star/util/XRefreshListener.idl
+++ b/offapi/com/sun/star/util/XRefreshListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XRefreshListener_idl__
 #define __com_sun_star_util_XRefreshListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XRefreshable.idl b/offapi/com/sun/star/util/XRefreshable.idl
index 1ed7e497a433..a99ae6f8fcc6 100644
--- a/offapi/com/sun/star/util/XRefreshable.idl
+++ b/offapi/com/sun/star/util/XRefreshable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XRefreshable_idl__
 #define __com_sun_star_util_XRefreshable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_XRefreshListener_idl__
 #include <com/sun/star/util/XRefreshListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XReplaceDescriptor.idl b/offapi/com/sun/star/util/XReplaceDescriptor.idl
index e3bb662a2a0a..68d1a75293a1 100644
--- a/offapi/com/sun/star/util/XReplaceDescriptor.idl
+++ b/offapi/com/sun/star/util/XReplaceDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XReplaceDescriptor_idl__
 #define __com_sun_star_util_XReplaceDescriptor_idl__
 
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
 #include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XReplaceable.idl b/offapi/com/sun/star/util/XReplaceable.idl
index bb80fac433b0..994fde57690a 100644
--- a/offapi/com/sun/star/util/XReplaceable.idl
+++ b/offapi/com/sun/star/util/XReplaceable.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_XReplaceable_idl__
 #define __com_sun_star_util_XReplaceable_idl__
 
-#ifndef __com_sun_star_util_XSearchable_idl__
 #include <com/sun/star/util/XSearchable.idl>
-#endif
 
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
 #include <com/sun/star/util/XReplaceDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
 #include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
 
 
 //=============================================================================
@@ -51,7 +45,7 @@ module com {  module sun {  module star {  module util {
 
     @example
     <listing>
-    'replace all bold words "search for" by "look for"
+    replace all bold words "search for" by "look for"
     xReplaceDescr = xDocument.createReplaceDescriptor()
     xReplaceDescr.SearchString = "search for"
     xReplaceDescr.ReplaceString = "look for"
diff --git a/offapi/com/sun/star/util/XSearchDescriptor.idl b/offapi/com/sun/star/util/XSearchDescriptor.idl
index dde3589773dd..07979aefb038 100644
--- a/offapi/com/sun/star/util/XSearchDescriptor.idl
+++ b/offapi/com/sun/star/util/XSearchDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XSearchDescriptor_idl__
 #define __com_sun_star_util_XSearchDescriptor_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XSearchable.idl b/offapi/com/sun/star/util/XSearchable.idl
index fce6b411ce9c..87c8dc511a11 100644
--- a/offapi/com/sun/star/util/XSearchable.idl
+++ b/offapi/com/sun/star/util/XSearchable.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_util_XSearchable_idl__
 #define __com_sun_star_util_XSearchable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
 #include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/util/XSimpleErrorHandler.idl b/offapi/com/sun/star/util/XSimpleErrorHandler.idl
index 1d3953d6ce14..e994aabf6836 100644
--- a/offapi/com/sun/star/util/XSimpleErrorHandler.idl
+++ b/offapi/com/sun/star/util/XSimpleErrorHandler.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XSimpleErrorHandler_idl__
 #define __com_sun_star_util_XSimpleErrorHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XSortable.idl b/offapi/com/sun/star/util/XSortable.idl
index 0ee7e98f5016..3acfe51fd91f 100644
--- a/offapi/com/sun/star/util/XSortable.idl
+++ b/offapi/com/sun/star/util/XSortable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XSortable_idl__
 #define __com_sun_star_util_XSortable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 //=============================================================================
@@ -44,7 +40,7 @@ module com {  module sun {  module star {  module util {
 
 /** makes it possible to sort the contents of this object.
 
-    <p>The available properties describing the sort criterias are
+    <p>The available properties describing the sort criteria are
     defined in the sort descriptor implemented by the object that
     implements this interface.</p>
 
diff --git a/offapi/com/sun/star/util/XStringAbbreviation.idl b/offapi/com/sun/star/util/XStringAbbreviation.idl
index 076b84b033c5..a5ba1d04dac5 100644
--- a/offapi/com/sun/star/util/XStringAbbreviation.idl
+++ b/offapi/com/sun/star/util/XStringAbbreviation.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_XStringAbbreviation_idl__
 #define __com_sun_star_util_XStringAbbreviation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module util {
      published interface XStringWidth;
diff --git a/offapi/com/sun/star/util/XStringEscape.idl b/offapi/com/sun/star/util/XStringEscape.idl
index f73bf84c59ae..79742a47c63b 100644
--- a/offapi/com/sun/star/util/XStringEscape.idl
+++ b/offapi/com/sun/star/util/XStringEscape.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_util_XStringEscape_idl__
 #define __com_sun_star_util_XStringEscape_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XStringMapping.idl b/offapi/com/sun/star/util/XStringMapping.idl
index b6afc14642e7..901ff3ac73e0 100644
--- a/offapi/com/sun/star/util/XStringMapping.idl
+++ b/offapi/com/sun/star/util/XStringMapping.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_util_XStringMapping_idl__
 #define __com_sun_star_util_XStringMapping_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XStringSubstitution.idl b/offapi/com/sun/star/util/XStringSubstitution.idl
index e8d5eb682cf0..5b3c2dd6b99f 100644
--- a/offapi/com/sun/star/util/XStringSubstitution.idl
+++ b/offapi/com/sun/star/util/XStringSubstitution.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_util_XStringSubstitution_idl__
 #define __com_sun_star_util_XStringSubstitution_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
@@ -71,7 +66,7 @@ published interface XStringSubstitution : com::sun::star::uno::XInterface
             A string containing variables that should be substituted.
 
         @param bSubstRequired
-            Specifies if a successfull substitution is required. The
+            Specifies if a successful substitution is required. The
             function throws a <type scope="com::sun::star::container">NoSuchElementException</type>
             if it finds a variable that is unknown. In this case it is possible
             that the returned string would not be what the caller expected!
@@ -100,7 +95,7 @@ published interface XStringSubstitution : com::sun::star::uno::XInterface
         @return
             Returns the resubstituted string with variables for all parts
             that could be replaced. The unchanged argument will be returned
-            if nothing can be resubtituted.
+            if nothing can be resubstituted.
     */
 
     string reSubstituteVariables( [in] string aText );
@@ -110,7 +105,7 @@ published interface XStringSubstitution : com::sun::star::uno::XInterface
 
         <p>
         The method iterates through it's internal variable list and tries to
-        find the given variable. If the variable is unkown a
+        find the given variable. If the variable is unknown a
         <type scope="com::sun::star::container">NoSuchElementException</type>
         is thrown.
         </p>
diff --git a/offapi/com/sun/star/util/XStringWidth.idl b/offapi/com/sun/star/util/XStringWidth.idl
index 81d76dd79475..4b2414f1ed71 100644
--- a/offapi/com/sun/star/util/XStringWidth.idl
+++ b/offapi/com/sun/star/util/XStringWidth.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_XStringWidth_idl__
 #define __com_sun_star_util_XStringWidth_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module util {
 
diff --git a/offapi/com/sun/star/util/XTextSearch.idl b/offapi/com/sun/star/util/XTextSearch.idl
index 3b0170c2ec26..e76d286eec46 100644
--- a/offapi/com/sun/star/util/XTextSearch.idl
+++ b/offapi/com/sun/star/util/XTextSearch.idl
@@ -31,15 +31,10 @@
 
 #include <com/sun/star/lang/Locale.idl>
 #include <com/sun/star/uno/XInterface.idl>
-//#include <com/sun/star/lang/CascadeTransliterator.idl>
 
-//=============================================================================
 
 module com { module sun { module star { module util {
 
-//=============================================================================
-
-
 published enum SearchAlgorithms
 {
     /// Literal
diff --git a/offapi/com/sun/star/util/XTimeStamped.idl b/offapi/com/sun/star/util/XTimeStamped.idl
index 39b2f3f5085b..6cabc0e345d9 100644
--- a/offapi/com/sun/star/util/XTimeStamped.idl
+++ b/offapi/com/sun/star/util/XTimeStamped.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_XTimeStamped_idl__
 #define __com_sun_star_util_XTimeStamped_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module util {
 
diff --git a/offapi/com/sun/star/util/XURLTransformer.idl b/offapi/com/sun/star/util/XURLTransformer.idl
index 38232255fa22..d762f3682d59 100644
--- a/offapi/com/sun/star/util/XURLTransformer.idl
+++ b/offapi/com/sun/star/util/XURLTransformer.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_XURLTransformer_idl__
 #define __com_sun_star_util_XURLTransformer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
-#endif
 
 
 //=============================================================================
@@ -66,7 +61,7 @@ published interface XURLTransformer: com::sun::star::uno::XInterface
 
         @returns
             <TRUE/> if parsing was successfully (means if given URL was syntactically correct)
-            or <FALSE/> otherwhise.
+            or <FALSE/> otherwise.
      */
     boolean parseStrict( [inout] com::sun::star::util::URL aURL );
 
@@ -103,7 +98,7 @@ published interface XURLTransformer: com::sun::star::uno::XInterface
         stores it into <member>URL::Complete</member>
 
         @param aURL
-                the URL which contains alls neccessary information in a structured form. The
+                the URL which contains alls necessary information in a structured form. The
                 member <member>URL::Complete</member> contains the URL in string notation after
                 the operation finished successfully. Otherwise the content of <member>URL::complete</member>
                 is not defined.
@@ -117,7 +112,7 @@ published interface XURLTransformer: com::sun::star::uno::XInterface
     /** returns a representation of the URL for UI purposes only
 
         <p>
-        Sometimes it can be usefull to show an URL on an user interface
+        Sometimes it can be useful to show an URL on an user interface
         in a more "human readable" form. Such URL can't be used on any API
         call, but make it easier for the user to understand it.
         </p>
diff --git a/offapi/com/sun/star/util/XUniqueIDFactory.idl b/offapi/com/sun/star/util/XUniqueIDFactory.idl
index e79c36ab9c09..4cccd126b69d 100644
--- a/offapi/com/sun/star/util/XUniqueIDFactory.idl
+++ b/offapi/com/sun/star/util/XUniqueIDFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_container_XUniqueIDFactory_idl__
 #define __com_sun_star_container_XUniqueIDFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/XUpdatable.idl b/offapi/com/sun/star/util/XUpdatable.idl
index ed221a36ecdd..b6c3cee4c8f5 100644
--- a/offapi/com/sun/star/util/XUpdatable.idl
+++ b/offapi/com/sun/star/util/XUpdatable.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_XUpdatable_idl__
 #define __com_sun_star_util_XUpdatable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshListener_idl__
 #include <com/sun/star/util/XRefreshListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/DocumentZoomType.idl b/offapi/com/sun/star/view/DocumentZoomType.idl
index f922e4c19dd0..0dbac6405158 100644
--- a/offapi/com/sun/star/view/DocumentZoomType.idl
+++ b/offapi/com/sun/star/view/DocumentZoomType.idl
@@ -60,7 +60,7 @@ published constants DocumentZoomType
     const short BY_VALUE = 3;
     //-------------------------------------------------------------------------
     /** The page width at the current selection is fit into the view,
-        with zhe view ends exactly at the end of the page.
+        with the view ends exactly at the end of the page.
      */
     const short PAGE_WIDTH_EXACT = 4;
 };
diff --git a/offapi/com/sun/star/view/OfficeDocumentView.idl b/offapi/com/sun/star/view/OfficeDocumentView.idl
index 1ff13bc13f54..2c32d51b210a 100644
--- a/offapi/com/sun/star/view/OfficeDocumentView.idl
+++ b/offapi/com/sun/star/view/OfficeDocumentView.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_view_OfficeDocumentView_idl__
 #define __com_sun_star_view_OfficeDocumentView_idl__
 
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__
 #include <com/sun/star/view/XViewSettingsSupplier.idl>
-#endif
 
-#ifndef __com_sun_star_view_XControlAccess_idl__
 #include <com/sun/star/view/XControlAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/PrintJobEvent.idl b/offapi/com/sun/star/view/PrintJobEvent.idl
index f1f81f3affa3..38f67486e79a 100644
--- a/offapi/com/sun/star/view/PrintJobEvent.idl
+++ b/offapi/com/sun/star/view/PrintJobEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_view_PrintJobEvent_idl__
 #define __com_sun_star_view_PrintJobEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_view_PrintableState_idl__
 #include <com/sun/star/view/PrintableState.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/PrintOptions.idl b/offapi/com/sun/star/view/PrintOptions.idl
index 3bad70f490e7..0e210b4a744f 100644
--- a/offapi/com/sun/star/view/PrintOptions.idl
+++ b/offapi/com/sun/star/view/PrintOptions.idl
@@ -78,8 +78,8 @@ published service PrintOptions
 
             <p>Default is the asynchronous print mode.</p>
 
-        @attention  Using of this property with TRUE as value is highly reommended.
-                Otherwhise following actions (as e.g. closing the corresponding model) can fail.
+        @attention  Using of this property with TRUE as value is highly recommended.
+                Otherwise following actions (as e.g. closing the corresponding model) can fail.
      */
     [optional, property] boolean Wait;
 
diff --git a/offapi/com/sun/star/view/PrintSettings.idl b/offapi/com/sun/star/view/PrintSettings.idl
index 2b1c54d90578..adfa6373736e 100644
--- a/offapi/com/sun/star/view/PrintSettings.idl
+++ b/offapi/com/sun/star/view/PrintSettings.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module view {
 
 /** provides access to the settings for printing documents.
 
-    <p>These settings are printer independet but affect the rendering of
+    <p>These settings are printer independent but affect the rendering of
     the document.
  */
 published service PrintSettings
diff --git a/offapi/com/sun/star/view/PrintableStateEvent.idl b/offapi/com/sun/star/view/PrintableStateEvent.idl
index a0a92cc02c6c..ddffa31ba916 100644
--- a/offapi/com/sun/star/view/PrintableStateEvent.idl
+++ b/offapi/com/sun/star/view/PrintableStateEvent.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_view_PrintableStateEvent_idl__
 #define __com_sun_star_view_PrintableStateEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_view_PrintableState_idl__
 #include <com/sun/star/view/PrintableState.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/PrinterDescriptor.idl b/offapi/com/sun/star/view/PrinterDescriptor.idl
index 006e1969fedb..b6c608a184fd 100644
--- a/offapi/com/sun/star/view/PrinterDescriptor.idl
+++ b/offapi/com/sun/star/view/PrinterDescriptor.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_view_PrinterDescriptor_idl__
 #define __com_sun_star_view_PrinterDescriptor_idl__
 
-#ifndef __com_sun_star_view_PaperOrientation_idl__
 #include <com/sun/star/view/PaperOrientation.idl>
-#endif
 
-#ifndef __com_sun_star_view_PaperFormat_idl__
 #include <com/sun/star/view/PaperFormat.idl>
-#endif
 
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/RenderDescriptor.idl b/offapi/com/sun/star/view/RenderDescriptor.idl
index 7aa5e058471c..25cb15c0b15c 100644
--- a/offapi/com/sun/star/view/RenderDescriptor.idl
+++ b/offapi/com/sun/star/view/RenderDescriptor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_RenderDescriptor_idl__
 #define __com_sun_star_view_RenderDescriptor_idl__
 
-#ifndef __com_sun_star_awt_Size_idl__
 #include <com/sun/star/awt/Size.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/RenderOptions.idl b/offapi/com/sun/star/view/RenderOptions.idl
index d018872ff47b..a4291f1634d3 100644
--- a/offapi/com/sun/star/view/RenderOptions.idl
+++ b/offapi/com/sun/star/view/RenderOptions.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_RenderOptions_idl__
 #define __com_sun_star_view_RenderOptions_idl__
 
-#ifndef __com_sun_star_awt_XDevice_idl__
 #include <com/sun/star/awt/XDevice.idl>
-#endif
 
 //=============================================================================
 
@@ -80,7 +78,7 @@ published service RenderOptions
 
     /** specifies if empty pages should be skipped.
 
-        <p>Tells the pdf export to skip empty pages. This flag also has
+        <p>Tells the PDF export to skip empty pages. This flag also has
         to be passed to the ::render function, in order to calculate to
         correct page numbers during the export of hyperlinks, notes, and
         outlines.
@@ -93,7 +91,7 @@ published service RenderOptions
 
     /** specifies the page ranges to be rendered.
 
-        <p>Tells the pdf export to skip empty pages. This flag also has
+        <p>Tells the PDF export to skip empty pages. This flag also has
         to be passed to the ::render function, in order to calculate to
         correct page numbers during the export of hyperlinks, notes,
         and outlines.
diff --git a/offapi/com/sun/star/view/ViewSettings.idl b/offapi/com/sun/star/view/ViewSettings.idl
index 49947a40467f..fd2efbf30865 100644
--- a/offapi/com/sun/star/view/ViewSettings.idl
+++ b/offapi/com/sun/star/view/ViewSettings.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_ViewSettings_idl__
 #define __com_sun_star_view_ViewSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
@@ -54,7 +52,7 @@ published service ViewSettings
     [optional, property] boolean ShowHoriScrollBar;
 
     //-------------------------------------------------------------------------
-    /** specfifies the zoom-value in percent.
+    /** specifies the zoom-value in percent.
      */
     [optional, property] short ZoomValue;
 
diff --git a/offapi/com/sun/star/view/XControlAccess.idl b/offapi/com/sun/star/view/XControlAccess.idl
index 1a7264320fd8..157ce7fb1e88 100644
--- a/offapi/com/sun/star/view/XControlAccess.idl
+++ b/offapi/com/sun/star/view/XControlAccess.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_view_XControlAccess_idl__
 #define __com_sun_star_view_XControlAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XControl_idl__
 #include <com/sun/star/awt/XControl.idl>
-#endif
 
-#ifndef __com_sun_star_awt_XControlModel_idl__
 #include <com/sun/star/awt/XControlModel.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/XFormLayerAccess.idl b/offapi/com/sun/star/view/XFormLayerAccess.idl
index 165f79dd0c44..801290940c54 100644
--- a/offapi/com/sun/star/view/XFormLayerAccess.idl
+++ b/offapi/com/sun/star/view/XFormLayerAccess.idl
@@ -28,18 +28,10 @@
 #ifndef __offapi_com_sun_star_view_XFormLayerAccess_idl__
 #define __offapi_com_sun_star_view_XFormLayerAccess_idl__
 
-#ifndef __com_sun_star_view_XControlAccess_idl__
 #include <com/sun/star/view/XControlAccess.idl>
-#endif
-#ifndef __com_sun_star_form_XForm_idl__
 #include <com/sun/star/form/XForm.idl>
-#endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
 #include <com/sun/star/form/runtime/XFormController.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/XLineCursor.idl b/offapi/com/sun/star/view/XLineCursor.idl
index 320831f308ba..e0f801fe58bd 100644
--- a/offapi/com/sun/star/view/XLineCursor.idl
+++ b/offapi/com/sun/star/view/XLineCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_XLineCursor_idl__
 #define __com_sun_star_view_XLineCursor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/XMultiSelectionSupplier.idl b/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
index 249cc53072ec..f5358aa7d129 100644
--- a/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
+++ b/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_view_XMultiSelectionSupplier_idl__
 #define __com_sun_star_view_XMultiSelectionSupplier_idl__
 
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/XPrintJob.idl b/offapi/com/sun/star/view/XPrintJob.idl
index 5898b9f3a7ce..2b94e75a0a8b 100644
--- a/offapi/com/sun/star/view/XPrintJob.idl
+++ b/offapi/com/sun/star/view/XPrintJob.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_view_XPrintJob_idl__
 #define __com_sun_star_view_XPrintJob_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_view_XPrintable_idl__
 #include <com/sun/star/view/XPrintable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintJobBroadcaster.idl b/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
index 54335f834a51..540b2f746a03 100644
--- a/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
+++ b/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_view_XPrintJobBroadcaster_idl__
 #define __com_sun_star_view_XPrintJobBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_view_XPrintJobListener_idl__
 #include <com/sun/star/view/XPrintJobListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/XPrintJobListener.idl b/offapi/com/sun/star/view/XPrintJobListener.idl
index 74e6431e2848..e072d262d39c 100644
--- a/offapi/com/sun/star/view/XPrintJobListener.idl
+++ b/offapi/com/sun/star/view/XPrintJobListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_view_XPrintJobListener_idl__
 #define __com_sun_star_view_XPrintJobListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_view_PrintJobEvent_idl__
 #include <com/sun/star/view/PrintJobEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/XPrintPreview.idl b/offapi/com/sun/star/view/XPrintPreview.idl
index dfc242753788..1e9697911006 100644
--- a/offapi/com/sun/star/view/XPrintPreview.idl
+++ b/offapi/com/sun/star/view/XPrintPreview.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_XPrintPreview_idl__
 #define __com_sun_star_view_XPrintPreview_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintSettingsSupplier.idl b/offapi/com/sun/star/view/XPrintSettingsSupplier.idl
index 349710d3b3cf..2cb5ff6d84da 100644
--- a/offapi/com/sun/star/view/XPrintSettingsSupplier.idl
+++ b/offapi/com/sun/star/view/XPrintSettingsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_view_XPrintSettingsSupplier_idl__
 #define __com_sun_star_view_XPrintSettingsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintable.idl b/offapi/com/sun/star/view/XPrintable.idl
index f4bf1a5c5867..dfd02987a9a8 100644
--- a/offapi/com/sun/star/view/XPrintable.idl
+++ b/offapi/com/sun/star/view/XPrintable.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_view_XPrintable_idl__
 #define __com_sun_star_view_XPrintable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/XPrintableBroadcaster.idl b/offapi/com/sun/star/view/XPrintableBroadcaster.idl
index ab95537cd274..f0ed19d403a1 100644
--- a/offapi/com/sun/star/view/XPrintableBroadcaster.idl
+++ b/offapi/com/sun/star/view/XPrintableBroadcaster.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_view_XPrintableBroadcaster_idl__
 #define __com_sun_star_view_XPrintableBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_view_XPrintableListener_idl__
 #include <com/sun/star/view/XPrintableListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/XPrintableListener.idl b/offapi/com/sun/star/view/XPrintableListener.idl
index 179e4c6e53f7..82987d42c2bc 100644
--- a/offapi/com/sun/star/view/XPrintableListener.idl
+++ b/offapi/com/sun/star/view/XPrintableListener.idl
@@ -27,17 +27,10 @@
 #ifndef __com_sun_star_view_XPrintableListener_idl__
 #define __com_sun_star_view_XPrintableListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_view_XPrintable_idl__
 #include <com/sun/star/view/XPrintable.idl>
-#endif
 
-#ifndef __com_sun_star_view_PrintableState_idl__
 #include <com/sun/star/view/PrintableStateEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/XRenderable.idl b/offapi/com/sun/star/view/XRenderable.idl
index 01c874e0e7ad..84d59bca1e78 100644
--- a/offapi/com/sun/star/view/XRenderable.idl
+++ b/offapi/com/sun/star/view/XRenderable.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_view_XRenderable_idl__
 #define __com_sun_star_view_XRenderable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/XScreenCursor.idl b/offapi/com/sun/star/view/XScreenCursor.idl
index 6a4b520d52c5..6c40db224379 100644
--- a/offapi/com/sun/star/view/XScreenCursor.idl
+++ b/offapi/com/sun/star/view/XScreenCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_XScreenCursor_idl__
 #define __com_sun_star_view_XScreenCursor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/XSelectionChangeListener.idl b/offapi/com/sun/star/view/XSelectionChangeListener.idl
index 91e9d72d17c1..5c28cd0acd66 100644
--- a/offapi/com/sun/star/view/XSelectionChangeListener.idl
+++ b/offapi/com/sun/star/view/XSelectionChangeListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_view_XSelectionChangeListener_idl__
 #define __com_sun_star_view_XSelectionChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/XSelectionSupplier.idl b/offapi/com/sun/star/view/XSelectionSupplier.idl
index 84ed18ee8287..379866a3390c 100644
--- a/offapi/com/sun/star/view/XSelectionSupplier.idl
+++ b/offapi/com/sun/star/view/XSelectionSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_view_XSelectionSupplier_idl__
 #define __com_sun_star_view_XSelectionSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__
 #include <com/sun/star/view/XSelectionChangeListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/XViewCursor.idl b/offapi/com/sun/star/view/XViewCursor.idl
index 5d5b855a357f..2c3d5f836c44 100644
--- a/offapi/com/sun/star/view/XViewCursor.idl
+++ b/offapi/com/sun/star/view/XViewCursor.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_view_XViewCursor_idl__
 #define __com_sun_star_view_XViewCursor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/view/XViewSettingsSupplier.idl b/offapi/com/sun/star/view/XViewSettingsSupplier.idl
index dbcedcda2c17..4cd91affeccd 100644
--- a/offapi/com/sun/star/view/XViewSettingsSupplier.idl
+++ b/offapi/com/sun/star/view/XViewSettingsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_view_XViewSettingsSupplier_idl__
 #define __com_sun_star_view_XViewSettingsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xforms/Binding.idl b/offapi/com/sun/star/xforms/Binding.idl
index 8885d56a4d9e..5950f994c0c6 100644
--- a/offapi/com/sun/star/xforms/Binding.idl
+++ b/offapi/com/sun/star/xforms/Binding.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_xforms_Binding_idl__
 #define __com_sun_star_xforms_Binding_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_ValueBinding_idl__
 #include <com/sun/star/form/binding/ValueBinding.idl>
-#endif
-
-#ifndef __com_sun_star_form_binding_ListEntrySource_idl__
 #include <com/sun/star/form/binding/ListEntrySource.idl>
-#endif
-
-#ifndef __com_sun_star_form_validation_XValidator_idl__
 #include <com/sun/star/form/validation/XValidator.idl>
-#endif
 
 //=============================================================================
 
@@ -64,7 +53,7 @@ service Binding
     /** allows external instances to observe the value represented by the binding
 
         <p>This interface is an optional part of the
-        <type scope="com::sun::star::form::binding">ValueBinding</type> servce, but loses
+        <type scope="com::sun::star::form::binding">ValueBinding</type> service, but loses
         its optionality here.</p>
     */
     interface com::sun::star::util::XModifyBroadcaster;
diff --git a/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl b/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl
index 62174ddb8573..572541513e82 100644
--- a/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl
+++ b/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xforms_InvalidDataOnSubmitException_idl__
 #define __com_sun_star_xforms_InvalidDataOnSubmitException_idl__
 
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xforms/XDataTypeRepository.idl b/offapi/com/sun/star/xforms/XDataTypeRepository.idl
index f2c2f1d2fd67..b29f59328b80 100644
--- a/offapi/com/sun/star/xforms/XDataTypeRepository.idl
+++ b/offapi/com/sun/star/xforms/XDataTypeRepository.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_xsd_XDataTypeRepository_idl__
 #define __com_sun_star_xsd_XDataTypeRepository_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xforms/XFormsSupplier.idl b/offapi/com/sun/star/xforms/XFormsSupplier.idl
index 066cabc4918b..83c78df805e4 100644
--- a/offapi/com/sun/star/xforms/XFormsSupplier.idl
+++ b/offapi/com/sun/star/xforms/XFormsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_xforms_XFormsSupplier_idl__
 #define __com_sun_star_xforms_XFormsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xforms/XFormsUIHelper1.idl b/offapi/com/sun/star/xforms/XFormsUIHelper1.idl
index 35488ba2883d..281d2c8378f8 100644
--- a/offapi/com/sun/star/xforms/XFormsUIHelper1.idl
+++ b/offapi/com/sun/star/xforms/XFormsUIHelper1.idl
@@ -27,41 +27,16 @@
 #ifndef __com_sun_star_xforms_XFormsUIHelper1_idl__
 #define __com_sun_star_xforms_XFormsUIHelper1_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XSet.idl>
-#endif
-
-#ifndef __com_sun_star_xforms_XDataTypeRepository_idl__
 #include <com/sun/star/xforms/XDataTypeRepository.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
 #include <com/sun/star/xml/dom/XDocument.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_xforms_XModel_idl__
 #include <com/sun/star/xforms/XModel.idl>
-#endif
 
 
 //=============================================================================
@@ -94,7 +69,7 @@ interface XFormsUIHelper1
 
     // Creates a new binding based on the one passed as argument.
     // The new binding does *not* contribute to the MIPs table and acts
-    // as a propertyset in disguise, which is what the UI needs this object for...
+    // as a property set in disguise, which is what the UI needs this object for...
     com::sun::star::beans::XPropertySet cloneBindingAsGhost( [in] com::sun::star::beans::XPropertySet binding );
 
     void removeBindingIfUseless( [in] com::sun::star::beans::XPropertySet xBinding );
diff --git a/offapi/com/sun/star/xforms/XModel.idl b/offapi/com/sun/star/xforms/XModel.idl
index ea2e71bdd39a..f7319f223aa0 100644
--- a/offapi/com/sun/star/xforms/XModel.idl
+++ b/offapi/com/sun/star/xforms/XModel.idl
@@ -27,37 +27,15 @@
 #ifndef __com_sun_star_xforms_XModel_idl__
 #define __com_sun_star_xforms_XModel_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XSet.idl>
-#endif
-
-#ifndef __com_sun_star_xforms_XDataTypeRepository_idl__
 #include <com/sun/star/xforms/XDataTypeRepository.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
 #include <com/sun/star/xml/dom/XDocument.idl>
-#endif
-
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 //=============================================================================
 
@@ -107,7 +85,7 @@ interface XModel
             consistency criteria for the model data is not fulfilled.
 
         @throws com::sun::star::lang::WrappedTargetException
-            when another error occured during the submission. The
+            when another error occurred during the submission. The
             <member scope="com::sun::star::lang">WrappedTargetException::TargetException</member> describes
             this error then.
     */
@@ -131,7 +109,7 @@ interface XModel
             consistency criteria for the model data is not fulfilled.
 
         @throws com::sun::star::lang::WrappedTargetException
-            when another error occured during the submission. The
+            when another error occurred during the submission. The
             <member scope="com::sun::star::lang">WrappedTargetException::TargetException</member> describes
             this error then.
     */
diff --git a/offapi/com/sun/star/xforms/XSubmission.idl b/offapi/com/sun/star/xforms/XSubmission.idl
index a7c11f661666..21775d3a7517 100644
--- a/offapi/com/sun/star/xforms/XSubmission.idl
+++ b/offapi/com/sun/star/xforms/XSubmission.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_xsd_XSubmission_idl__
 #define __com_sun_star_xsd_XSubmission_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_form_submission_XSubmission_idl__
 #include <com/sun/star/form/submission/XSubmission.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xforms {
diff --git a/offapi/com/sun/star/xml/AttributeContainer.idl b/offapi/com/sun/star/xml/AttributeContainer.idl
index 74f34e7f5ac7..d47fdc266d3b 100644
--- a/offapi/com/sun/star/xml/AttributeContainer.idl
+++ b/offapi/com/sun/star/xml/AttributeContainer.idl
@@ -27,16 +27,14 @@
 #ifndef __com_sun_star_drawing_NamespaceContainer_idl__
 #define __com_sun_star_drawing_NamespaceContainer_idl__
 
-#ifndef __com_sun_star_container_xnamecontainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
 module com { module sun { module star { module xml {
 
 //=============================================================================
-/** This service describes a container for xml attributes.
+/** This service describes a container for XML attributes.
 
     <p>Each attribute is accessed with its local name, or optionally, its local
     name with its namespace prefix. The type and value of an attribute is stored
diff --git a/offapi/com/sun/star/xml/ExportFilter.idl b/offapi/com/sun/star/xml/ExportFilter.idl
index aae508180607..3531b649df97 100644
--- a/offapi/com/sun/star/xml/ExportFilter.idl
+++ b/offapi/com/sun/star/xml/ExportFilter.idl
@@ -28,9 +28,7 @@
 #ifndef _COM_SUN_STAR_XML_EXPORTFILTER_IDL__
 #define _COM_SUN_STAR_XML_EXPORTFILTER_IDL__
 
-#ifndef _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
 #include <com/sun/star/xml/XExportFilter.idl>
-#endif
 
 
 module com { module sun { module star { module xml {
@@ -42,7 +40,7 @@ module com { module sun { module star { module xml {
    which the data should be exported. Then, the source document's XML
    representation will be generated by calling the appropriate methods
    of the <type scope="com::sun::star::xml::sax">XDocumentHandler</type>
-   interface.  Error conditions must be signalled by throwing
+   interface.  Error conditions must be signaled by throwing
    a <type scope="com::sun::star::xml::sax">SAXException</type> in the
    <type scope="com::sun::star::xml::sax">XDocumentHandler</type> calls.
 
diff --git a/offapi/com/sun/star/xml/ImportFilter.idl b/offapi/com/sun/star/xml/ImportFilter.idl
index d95c7c099bf3..82b6f1a91cf6 100644
--- a/offapi/com/sun/star/xml/ImportFilter.idl
+++ b/offapi/com/sun/star/xml/ImportFilter.idl
@@ -28,9 +28,7 @@
 #ifndef _COM_SUN_STAR_XML_IMPORTFILTER_IDL__
 #define _COM_SUN_STAR_XML_IMPORTFILTER_IDL__
 
-#ifndef _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
 #include <com/sun/star/xml/XImportFilter.idl>
-#endif
 
 
 module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/NamespaceContainer.idl b/offapi/com/sun/star/xml/NamespaceContainer.idl
index 03319c029fa4..77d6224cd6ce 100644
--- a/offapi/com/sun/star/xml/NamespaceContainer.idl
+++ b/offapi/com/sun/star/xml/NamespaceContainer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_drawing_NamespaceContainer_idl__
 #define __com_sun_star_drawing_NamespaceContainer_idl__
 
-#ifndef __com_sun_star_container_xnamecontainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
index 9d85e30bb255..eb230ecbba6a 100644
--- a/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
 #define _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 module com { module sun { module star { module xml {
 
diff --git a/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
index cde995ba8872..f0022b1a0d96 100644
--- a/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef _com_sun_star_xml_TextUserDefinedAttributesSupplier_idl_
 #define _com_sun_star_xml_TextUserDefinedAttributesSupplier_idl_
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 module com { module sun { module star { module xml {
 
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
index 515ed93f7b07..105867aecf1f 100644
--- a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
+++ b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #define _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 module com { module sun { module star { module xml {
 
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
index 9a90a0f06609..24224119b645 100644
--- a/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #define _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 module com { module sun { module star { module xml {
 
diff --git a/offapi/com/sun/star/xml/XExportFilter.idl b/offapi/com/sun/star/xml/XExportFilter.idl
index 47051f579e2d..caa0364ab750 100644
--- a/offapi/com/sun/star/xml/XExportFilter.idl
+++ b/offapi/com/sun/star/xml/XExportFilter.idl
@@ -28,10 +28,7 @@
 #ifndef _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
 #define _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/beans/PropertyValue.idl>
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
@@ -61,7 +58,7 @@ published interface XExportFilter: com::sun::star::uno::XInterface
           which defines the data source
 
       @param msUserData
-          Sequence of strings which contains the userdata defined in the
+          Sequence of strings which contains the user data defined in the
           TypeDetection.xml (???)
 
       @returns
diff --git a/offapi/com/sun/star/xml/XImportFilter.idl b/offapi/com/sun/star/xml/XImportFilter.idl
index 650a24d8b05c..f952a01b91b4 100644
--- a/offapi/com/sun/star/xml/XImportFilter.idl
+++ b/offapi/com/sun/star/xml/XImportFilter.idl
@@ -28,10 +28,7 @@
 #ifndef _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
 #define _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/beans/PropertyValue.idl>
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
@@ -61,7 +58,7 @@ published interface XImportFilter: com::sun::star::uno::XInterface
           which defines the data source
 
       @param msUserData
-          Sequence of strings which contains the userdata defined in the
+          Sequence of strings which contains the user data defined in the
           TypeDetection.xml
 
       @param xDocHandler
diff --git a/offapi/com/sun/star/xml/XMLExportFilter.idl b/offapi/com/sun/star/xml/XMLExportFilter.idl
index c66b6cb3bc60..81b94a27ce44 100644
--- a/offapi/com/sun/star/xml/XMLExportFilter.idl
+++ b/offapi/com/sun/star/xml/XMLExportFilter.idl
@@ -29,9 +29,7 @@
 #define __com_sun_star_xml_XMLExportFilter_idl__
 
 
-#ifndef __com_sun_star_document_ExportFilter_idl__
 #include <com/sun/star/document/ExportFilter.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xml/XMLImportFilter.idl b/offapi/com/sun/star/xml/XMLImportFilter.idl
index 6e551859f720..05cf2718e264 100644
--- a/offapi/com/sun/star/xml/XMLImportFilter.idl
+++ b/offapi/com/sun/star/xml/XMLImportFilter.idl
@@ -29,13 +29,8 @@
 #define __com_sun_star_xml_XMLImportFilter_idl__
 
 
-#ifndef __com_sun_star_document_ImportFilter_idl__
 #include <com/sun/star/document/ImportFilter.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xml/crypto/SEInitializer.idl b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
index 239ef92c9693..fb415bd9b164 100644
--- a/offapi/com/sun/star/xml/crypto/SEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
@@ -29,8 +29,8 @@
 #define __com_sun_star_xml_crypto_seinitializer_idl_
 
 #include <com/sun/star/xml/crypto/XSEInitializer.idl>
-#include <com/sun/star/xml/crypto/XDigestContextSupplier.idl>
 #include <com/sun/star/xml/crypto/XCipherContextSupplier.idl>
+#include <com/sun/star/xml/crypto/XDigestContextSupplier.idl>
 
 module com { module sun { module star { module xml { module crypto {
 
diff --git a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
index 395ef0fb9201..4cefdc02a94e 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
-
 #include <com/sun/star/lang/XUnoTunnel.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl b/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl
index f7f07658d6f5..98ff594af23a 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -43,7 +43,7 @@ enum SecurityOperationStatus
     OPERATION_SUCCEEDED,
     RUNTIMEERROR_FAILED,
 /**
- * The following constants are derived from xmlsec error definations, as following:
+ * The following constants are derived from XMLSec error definitions, as following:
  *
  * XMLSEC_ERRORS_R_XMLSEC_FAILED
  * XMLSEC_ERRORS_R_MALLOC_FAILED
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
index 7dc93ed7497d..c48c87ddf84f 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XXMLEncryption.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
index 21b5b9beb618..292bf71db8e9 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
@@ -25,16 +25,14 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_xml_crypto_XMLEncryptionException_idl__
 #define __com_sun_star_xml_crypto_XMLEncryptionException_idl__
 
-#ifndef __com_sun_star_security_EncryptionException_idl__
 #include <com/sun/star/security/EncryptionException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
index 694e4ed56f9b..2b4922678795 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
index c047e8ae45be..dc9a7665ab27 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignature.idl b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
index 1153b7bb9c8f..dddccae400d0 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XXMLSignature.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
index 87d2d0ba05a4..ab0613f56026 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
@@ -25,16 +25,14 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_xml_crypto_XMLSignatureException_idl__
 #define __com_sun_star_xml_crypto_XMLSignatureException_idl__
 
-#ifndef __com_sun_star_security_SignatureException_idl__
 #include <com/sun/star/security/SignatureException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
index 3a4971e12ba1..18379a0c58a5 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
index d2a3e99a36ba..1e8575c00df0 100644
--- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
@@ -28,10 +28,7 @@
 #ifndef __com_sun_star_xml_crypto_xsecurityenvironment_idl_
 #define __com_sun_star_xml_crypto_xsecurityenvironment_idl_
 
-#ifndef __com_sun_star_uno_SecurityException_idl__
 #include <com/sun/star/uno/SecurityException.idl>
-#endif
-
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/security/XCertificate.idl>
@@ -66,7 +63,7 @@ published interface XSecurityEnvironment : com::sun::star::uno::XInterface
     com::sun::star::security::XCertificate createCertificateFromRaw( [in] sequence< byte > rawCertificate ) raises( com::sun::star::uno::SecurityException ) ;
 
     /**
-     * Create certificate interface from a BASE64 encoded certificate.
+     * Create certificate interface from a Base64 encoded certificate.
      */
     com::sun::star::security::XCertificate createCertificateFromAscii( [in] string asciiCertificate ) raises( com::sun::star::uno::SecurityException ) ;
 
diff --git a/offapi/com/sun/star/xml/crypto/XUriBinding.idl b/offapi/com/sun/star/xml/crypto/XUriBinding.idl
index 8d1609ff80e7..7208d4ac15d7 100644
--- a/offapi/com/sun/star/xml/crypto/XUriBinding.idl
+++ b/offapi/com/sun/star/xml/crypto/XUriBinding.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
index 5788b0482349..26ef95f118b9 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -35,25 +35,23 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/uno/SecurityException.idl>
-
 #include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl>
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
 #include <com/sun/star/xml/crypto/XMLEncryptionException.idl>
 
-
 module com { module sun { module star { module xml { module crypto {
 
 /**
  * Interface of XML encryption
  *
- * <p>This interface represents a xml encrypter or decrypter.</p>
+ * <p>This interface represents a XML encryptor or decryptor.</p>
  *
- * <p>The encrypter or decrypter concrete a key by retrieve security context
+ * <p>The encryptor or decryptor concrete a key by retrieve security context
  * and encryption template.</p>
  *
- * <p>In some cases, the encrypter or decrypter can dertermine and locate the
- * EncrytedKey from the encryption template by dereference the RetrievalMethod
+ * <p>In some cases, the encryptor or decryptor can determine and locate the
+ * EncryptedKey from the encryption template by dereference the RetrievalMethod
  * inside EncryptedData.</p>
  *
  * <p>In some cases, the EncryptedKey need to be clearly pointed out by the
@@ -71,7 +69,7 @@ interface XXMLEncryption : com::sun::star::uno::XInterface
         com::sun::star::uno::SecurityException ) ;
 
     /**
-     * Perform decryption in the environment of encrytpion template and context.
+     * Perform decryption in the environment of encryption template and context.
      */
     com::sun::star::xml::crypto::XXMLEncryptionTemplate decrypt(
         [in] com::sun::star::xml::crypto::XXMLEncryptionTemplate aTemplate ,
diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
index c2ec51908fb6..459104e357df 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,7 +34,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
 #include <com/sun/star/xml/crypto/XXMLSecurityTemplate.idl>
 
@@ -44,19 +43,19 @@ module com { module sun { module star { module xml { module crypto {
  * Interface of XML encryption template
  *
  * <p>This interface represents a encryption template, which is the same as the
- * desired xml encryption element[ EncryptedType ] but some of the nodes may be
+ * desired XML encryption element[ EncryptedType ] but some of the nodes may be
  * empty. The empty entities include CipherValue, which is a subset of
  * EncryptedData or EncryptedKey. Empty entities are not allowed in a encryption
  * template when performing decryption.</p>
  *
- * <p>In some cases, the encrypter or decrypter can dertermine and locate the
- * EncrytedKey from the encryption template by dereference the RetrievalMethod
+ * <p>In some cases, the encryptor or decryptor can determine and locate the
+ * EncryptedKey from the encryption template by dereference the RetrievalMethod
  * inside EncryptedData.</p>
  *
  * <p>In some cases, the EncryptedKey need to be clearly pointed out by the
  * encryption template.</p>
  *
- * <p>With the help of encryption context, the encrypter or decrypter specifies
+ * <p>With the help of encryption context, the encryptor or decryptor specifies
  * the key from the KeyInfo in the encryption template.</p>
  *
  *
@@ -67,12 +66,12 @@ module com { module sun { module star { module xml { module crypto {
  * except that the high level application tell the mechanism and parameters.
  *
  * So I think it will be more simple that the application set the encrypted key
- * information. In this case, the application only need to know the xml schema
+ * information. In this case, the application only need to know the XML schema
  * or DTD and the encryption device. If so, the high level application takes the
  * action of build the EncryptedKey template and references it in the element of
  * EncryptedData. And in this case, the calling to set up EncryptedKey template
- * and target is not necessary, because the encrypter or decrypter can determine
- * and locate the EncrypedKet from the encryption template of EncryptedData by
+ * and target is not necessary, because the encryptor or decryptor can determine
+ * and locate the EncryptedKey from the encryption template of EncryptedData by
  * dereference the RetrievalMethod.
  *
  * In some situation, the high level applications do not want to know anything
@@ -83,7 +82,7 @@ module com { module sun { module star { module xml { module crypto {
 interface XXMLEncryptionTemplate : XXMLSecurityTemplate
 {
     /**
-     * Get the target xml element, i.e. the element to be encrypted
+     * Get the target XML element, i.e. the element to be encrypted
      */
     com::sun::star::xml::wrapper::XXMLElementWrapper getTarget(
     ) ;
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
index f61ae4d802ae..a96057107d16 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
@@ -30,7 +30,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/security/SecurityInfrastructureException.idl>
-
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
 
 module com { module sun { module star { module xml { module crypto {
@@ -44,7 +43,7 @@ module com { module sun { module star { module xml { module crypto {
 published interface XXMLSecurityContext : com::sun::star::uno::XInterface
 {
     /**
-     * Add personal security environment , and return the index of the added env.
+     * Add personal security environment , and return the index of the added environment.
      */
     long addSecurityEnvironment( [in] XSecurityEnvironment aSecurityEnvironment
     ) raises( com::sun::star::security::SecurityInfrastructureException ) ;
@@ -61,7 +60,7 @@ published interface XXMLSecurityContext : com::sun::star::uno::XInterface
 
     /**
      * An handy method to get the first personal security environment.
-     * In xmlsec/nss, the first personal security environment should be the "internal slot"
+     * In XMLSec/NSS, the first personal security environment should be the "internal slot"
      */
     com::sun::star::xml::crypto::XSecurityEnvironment getSecurityEnvironment( ) ;
 
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
index bff443796200..66f4a1b4d2a6 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,7 +34,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
 #include <com/sun/star/xml/crypto/XUriBinding.idl>
 #include <com/sun/star/xml/crypto/SecurityOperationStatus.idl>
@@ -50,7 +49,7 @@ module com { module sun { module star { module xml { module crypto {
 interface XXMLSecurityTemplate : com::sun::star::uno::XInterface
 {
     /**
-     * Load a XML signature template from xml signature element
+     * Load a XML signature template from XML signature element
      */
     void setTemplate(
         [in] com::sun::star::xml::wrapper::XXMLElementWrapper aXmlElement
@@ -63,7 +62,7 @@ interface XXMLSecurityTemplate : com::sun::star::uno::XInterface
     ) ;
 
     /**
-     * Load the target xml element, i.e. the element to be signed
+     * Load the target XML element, i.e. the element to be signed
      */
     void setTarget(
         [in] com::sun::star::xml::wrapper::XXMLElementWrapper aXmlElement
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
index fc61c07d17d3..325531fadab1 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,7 +34,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/SecurityException.idl>
-
 #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.idl>
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
 #include <com/sun/star/xml/crypto/XMLSignatureException.idl>
@@ -44,12 +43,12 @@ module com { module sun { module star { module xml { module crypto {
 /**
  * Interface of XML signature
  *
- * <p>This interface represents a xml signer or vertifier.</p>
+ * <p>This interface represents a XML signer or verifier.</p>
  *
- * <p>The signer or vertifier concrete a key by retrieve signature context and
+ * <p>The signer or verifier concrete a key by retrieve signature context and
  * signature template.</p>
  *
- * <p>In some cases, the signer or vertifier can dertermine and locate the
+ * <p>In some cases, the signer or verifier can determine and locate the
  * contents to be signed from the signature template by dereference the URI.</p>
  *
  * <p>In some cases, the contents to be signed need to be clearly pointed out by
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
index 08098a8d590d..c5ad60db790a 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,7 +34,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
 #include <com/sun/star/xml/crypto/XUriBinding.idl>
 #include <com/sun/star/xml/crypto/XXMLSecurityTemplate.idl>
@@ -45,11 +44,11 @@ module com { module sun { module star { module xml { module crypto {
  * Interface of XML signature template
  *
  * <p>This interface represents a signature template, which is the same as the
- * desired xml signature element but some of the nodes may be empty. The empty
+ * desired XML signature element but some of the nodes may be empty. The empty
  * entities include digest value and signature value. Empty entities are not
  * allowed in a signature template when performing validation.</p>
  *
- * <p>In some cases, the signer or vertifier can dertermine and locate the
+ * <p>In some cases, the signer or verifier can determine and locate the
  * contents to be signed from the template by dereference the URI.</p>
  *
  * <p>With the help of signature context, the signer or verifier specifies the
@@ -60,7 +59,7 @@ module com { module sun { module star { module xml { module crypto {
 interface XXMLSignatureTemplate : XXMLSecurityTemplate
 {
     /**
-     * Get the target xml element, i.e. the element to be signed
+     * Get the target XML element, i.e. the element to be signed
      */
     sequence< com::sun::star::xml::wrapper::XXMLElementWrapper > getTargets(
     ) ;
diff --git a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
index 6b8323b19893..1e51568d0628 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,10 +34,8 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include "XReferenceResolvedListener.idl"
 #include "XBlockerMonitor.idl"
 #include "XDecryptionResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
index 82d32ebfbae1..536efe61c831 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,10 +34,8 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include "XReferenceResolvedListener.idl"
 #include "XReferenceCollector.idl"
 #include "XBlockerMonitor.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
index 0a70aac82c80..a85d9dcc0af9 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,11 +34,9 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include "XSecuritySAXEventKeeper.idl"
 #include "XReferenceResolvedBroadcaster.idl"
 #include "XSAXEventKeeperStatusChangeBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
index 6660008a6d04..0cf2cc075a13 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
- //i20156 - new file for xmlsecurity module
+ //i20156 - new file for XML security module
 
  /** -- idl definition -- **/
 
@@ -35,9 +35,7 @@
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include <com/sun/star/xml/crypto/XUriBinding.idl>
-
 #include "XReferenceResolvedListener.idl"
 #include "XReferenceCollector.idl"
 #include "XSignatureCreationResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
index b3355e2e98b4..2b06ae7b07f1 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -36,9 +36,7 @@
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
-
 #include <com/sun/star/xml/crypto/XUriBinding.idl>
-
 #include "XReferenceResolvedListener.idl"
 #include "XReferenceCollector.idl"
 #include "XSignatureVerifyResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl b/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl
index 07cec12ad824..da489aad1af4 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl
index be29d4ee49fd..848e9257f7af 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl
index e8a420b21f27..493d86720e68 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
index 7b3e1a1039bc..69b808991bc1 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -62,7 +62,7 @@ struct ElementStackItem
 /**
  * Manipulate the "key SAX events" in a SAX event stream.
  *
- * @see   XSecController
+ * @see   XSecurityController
  */
 interface XElementStackKeeper : com::sun::star::uno::XInterface
 {
@@ -77,7 +77,7 @@ interface XElementStackKeeper : com::sun::star::uno::XInterface
     void stop();
 
     /**
-     * Transfers the bufferred key SAX events to a document handler.
+     * Transfers the buffered key SAX events to a document handler.
      * <p>
      * All transferred events are removed from the buffer.
      *
diff --git a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl
index 7d77439ed710..17c4fae37729 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl
index 0eca5a84d413..046b7dfe36dc 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl b/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl
index a7bc3c5c807f..178ef7b8da3d 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl b/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl
index 6f902a867b65..426cbcc4efd0 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -40,7 +40,7 @@ module com { module sun { module star { module xml { module crypto { module sax
 /**
  * Interface of Mission Taker.
  * <p>
- * This interface is used to controll a mission.
+ * This interface is used to control a mission.
  */
 interface XMissionTaker : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
index 10e79fbcb58d..c7e98e794e88 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -53,7 +53,7 @@ interface XReferenceCollector : com::sun::star::uno::XInterface
         raises( com::sun::star::uno::Exception );
 
     /**
-     * Set the keeper id of the element colllector of the
+     * Set the keeper id of the element collector of the
      * referenced element.
      *
      * @param id   the keeper id of the element collector,
diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl
index dba649deea7c..53fec9b363f1 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl
index 485f6090725b..cf06fd8c0add 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
index 20f8a0289f5c..d59e037934ab 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -35,7 +35,6 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-
 #include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl>
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
 
@@ -124,9 +123,9 @@ interface XSAXEventKeeper : com::sun::star::uno::XInterface
         [in] com::sun::star::xml::sax::XDocumentHandler nextHandler);
 
     /**
-     * Prints information about all bufferred elements.
+     * Prints information about all buffered elements.
      *
-     * @return   a tree-style string including all buffer informtion
+     * @return   a tree-style string including all buffer information
      */
     string printBufferNodeTree();
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl
index 87991d07c7f9..a30bf9f0fa30 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl
index 9d04a0ba1757..75c0fb56a689 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl b/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
index 872f27d2a78f..0a77210becc2 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
index 16b52279a556..65bfabc22920 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -56,7 +56,7 @@ constants ConstOfSecurityId
  * The PRI_AFTERMODIFY priority represents the notification will be
  * sent after any internal modification has finished.
  * <p>
- * The PRI_BEFOREMODIFY proirity represents the notification will be
+ * The PRI_BEFOREMODIFY priority represents the notification will be
  * sent before any internal modification happens.
  * <p>
  * So an element mark with PRI_BEFOREMODIFY will be handled first,
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl
index ff65155a6491..1eaf2c8d5d25 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl
index 7d488ef640bf..ce6184be1475 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for xml security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl
index de557f356f44..e3ff0d2c0709 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for xml security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl
index a9de2fb7ef90..ddc54cba908c 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for xml security module
 
 /** -- idl definition -- **/
 
diff --git a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
index bcab642f7155..ad314f4b60ff 100644
--- a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 #ifndef __com_sun_star_xml_csax_XCompressedDocumentHandler_idl__
 #define __com_sun_star_xml_csax_XCompressedDocumentHandler_idl__
diff --git a/offapi/com/sun/star/xml/dom/DOMException.idl b/offapi/com/sun/star/xml/dom/DOMException.idl
index d344af889bbe..3e5857c32f19 100644
--- a/offapi/com/sun/star/xml/dom/DOMException.idl
+++ b/offapi/com/sun/star/xml/dom/DOMException.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xml_dom_DOMException_idl__
 #define __com_sun_star_xml_dom_DOMException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_DOMExceptionType_idl__
 #include <com/sun/star/xml/dom/DOMExceptionType.idl>
-#endif
 
 module com {  module sun {  module star {  module xml {  module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/DocumentBuilder.idl b/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
index 0804dc6df201..d280f01833ab 100644
--- a/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
@@ -1,8 +1,6 @@
 #ifndef __com_sun_star_xml_dom_documentbuilder_idl
 #define __com_sun_star_xml_dom_documentbuilder_idl
-#ifndef __com_sun_star_xml_dom_xdocumentbuilder_idl
 #include <com/sun/star/xml/dom/XDocumentBuilder.idl>
-#endif
 module com {  module sun {  module star {  module xml { module dom {
 
     service DocumentBuilder
diff --git a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
index 4c9dffd36dda..c530d479ead2 100644
--- a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
@@ -1,11 +1,7 @@
 #ifndef __com_sun_star_xml_dom_documentbuilder_idl
 #define __com_sun_star_xml_dom_documentbuilder_idl
-#ifndef __com_sun_star_xml_sax_xdocumenthandler_idl
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XSAXDocumentBuilder_idl
 #include <com/sun/star/xml/dom/XSAXDocumentBuilder.idl>
-#endif
 
 module com {  module sun {  module star {  module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XAttr.idl b/offapi/com/sun/star/xml/dom/XAttr.idl
index 7d4a010e3723..6737645e0ac7 100644
--- a/offapi/com/sun/star/xml/dom/XAttr.idl
+++ b/offapi/com/sun/star/xml/dom/XAttr.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XAttr_idl__
 #define __com_sun_star_xml_sax_XAttr_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XCDATASection.idl b/offapi/com/sun/star/xml/dom/XCDATASection.idl
index a484ccabca34..dae54a750922 100644
--- a/offapi/com/sun/star/xml/dom/XCDATASection.idl
+++ b/offapi/com/sun/star/xml/dom/XCDATASection.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XCDATASection_idl__
 #define __com_sun_star_xml_dom_XCDATASection_idl__
 
-#ifndef __com_sun_star_xml_dom_XText_idl__
 #include <com/sun/star/xml/dom/XText.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XCharacterData.idl b/offapi/com/sun/star/xml/dom/XCharacterData.idl
index 380c705d6359..af2767faa3d6 100644
--- a/offapi/com/sun/star/xml/dom/XCharacterData.idl
+++ b/offapi/com/sun/star/xml/dom/XCharacterData.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XCharacterData_idl__
 #define __com_sun_star_xml_dom_XCharacterData_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XComment.idl b/offapi/com/sun/star/xml/dom/XComment.idl
index 36a6a6e6afe7..95fd6ebeb199 100644
--- a/offapi/com/sun/star/xml/dom/XComment.idl
+++ b/offapi/com/sun/star/xml/dom/XComment.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XComment_idl__
 #define __com_sun_star_xml_dom_XCComment_idl__
 
-#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
 #include <com/sun/star/xml/dom/XCharacterData.idl>
-#endif
 
 
 module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDOMImplementation.idl b/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
index f8003fce26e2..56f7ceda68e6 100644
--- a/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
+++ b/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
 #define __com_sun_star_xml_dom_XDOMImplementation_idl__
 
-#ifndef __com_sun_star_uno__XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_DOMException_idl__
 #include <com/sun/star/xml/dom/DOMException.idl>
-#endif
 
 
 module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocument.idl b/offapi/com/sun/star/xml/dom/XDocument.idl
index 6bd105d8e06c..d64eb18fc290 100644
--- a/offapi/com/sun/star/xml/dom/XDocument.idl
+++ b/offapi/com/sun/star/xml/dom/XDocument.idl
@@ -28,33 +28,15 @@
 #ifndef __com_sun_star_xml_dom_XDocument_idl__
 #define __com_sun_star_xml_dom_XDocument_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XAttr_idl__
 #include <com/sun/star/xml/dom/XAttr.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XCDATASection_idl__
 #include <com/sun/star/xml/dom/XCDATASection.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XComment_idl__
 #include <com/sun/star/xml/dom/XComment.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentFragemnt_idl__
 #include <com/sun/star/xml/dom/XDocumentFragment.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XEntityReference_idl__
 #include <com/sun/star/xml/dom/XEntityReference.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__
 #include <com/sun/star/xml/dom/XProcessingInstruction.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentType_idl__
 #include <com/sun/star/xml/dom/XDocumentType.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
 #include <com/sun/star/xml/dom/XDOMImplementation.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
index e2245e9d3153..a72625c6cfd6 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
@@ -28,35 +28,16 @@
 #ifndef __com_sun_star_xml_dom_XDocumentBuilder_idl__
 #define __com_sun_star_xml_dom_XDocumentBuilder_idl__
 
-#ifndef __com_sun_star_uno__XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
 #include <com/sun/star/xml/dom/XDocumentType.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
 #include <com/sun/star/xml/dom/XDOMImplementation.idl>
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
 #include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
 #include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
 
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XDocumentFragment.idl b/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
index cbc8af63b923..5a48224e4b23 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__
 #define __com_sun_star_xml_dom_XDocumentFragment_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XDocumentType.idl b/offapi/com/sun/star/xml/dom/XDocumentType.idl
index ce6495214bcf..cd4c46573ce5 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentType.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentType.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XDocumentType_idl__
 #define __com_sun_star_xml_dom_XDocumentType_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
 #include <com/sun/star/xml/dom/XNamedNodeMap.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XElement.idl b/offapi/com/sun/star/xml/dom/XElement.idl
index dc0373467a53..f0869b708124 100644
--- a/offapi/com/sun/star/xml/dom/XElement.idl
+++ b/offapi/com/sun/star/xml/dom/XElement.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XElement_idl__
 #define __com_sun_star_xml_dom_XElement_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XAttr_idl__
 #include <com/sun/star/xml/dom/XAttr.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XEntity.idl b/offapi/com/sun/star/xml/dom/XEntity.idl
index 7396a42aa190..3352ae002a49 100644
--- a/offapi/com/sun/star/xml/dom/XEntity.idl
+++ b/offapi/com/sun/star/xml/dom/XEntity.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XEntety_idl__
 #define __com_sun_star_xml_dom_XEntety_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XEntityReference.idl b/offapi/com/sun/star/xml/dom/XEntityReference.idl
index cec97fdf0219..9650fbe55854 100644
--- a/offapi/com/sun/star/xml/dom/XEntityReference.idl
+++ b/offapi/com/sun/star/xml/dom/XEntityReference.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XEntetyReference_idl__
 #define __com_sun_star_xml_dom_XEntetyReference_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl b/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
index d5ea97e1ef69..c09a63e0c83b 100644
--- a/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
+++ b/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
 #define __com_sun_star_xml_dom_XNamedNodeMap_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_DOMException_idl__
 #include <com/sun/star/xml/dom/DOMException.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
@@ -48,7 +44,7 @@ interface XNamedNodeMap : com::sun::star::uno::XInterface
     long getLength();
 
     /**
-    Retrieves a node specified by local name
+    Retrieves a node specified by local name.
     */
     XNode getNamedItem([in] string name);
 
@@ -58,7 +54,7 @@ interface XNamedNodeMap : com::sun::star::uno::XInterface
     XNode getNamedItemNS([in] string namespaceURI,[in]  string localName);
 
     /**
-    Returns the indexth item in the map.
+    Returns a node specified by index.
     */
     XNode item([in] long index);
 
diff --git a/offapi/com/sun/star/xml/dom/XNode.idl b/offapi/com/sun/star/xml/dom/XNode.idl
index 7f7ffc14aa0e..b60a24796f52 100644
--- a/offapi/com/sun/star/xml/dom/XNode.idl
+++ b/offapi/com/sun/star/xml/dom/XNode.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_xml_dom_XNode_idl__
 #define __com_sun_star_xml_dom_XNode_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_NodeType_idl__
 #include <com/sun/star/xml/dom/NodeType.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
 #include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
 #include <com/sun/star/xml/dom/XNamedNodeMap.idl>
-#endif
 
 
 module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNodeList.idl b/offapi/com/sun/star/xml/dom/XNodeList.idl
index a59d2aa7a70a..13ae64f35628 100644
--- a/offapi/com/sun/star/xml/dom/XNodeList.idl
+++ b/offapi/com/sun/star/xml/dom/XNodeList.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XNodeList_idl__
 #define __com_sun_star_xml_dom_XNodeList_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 module com { module sun { module star { module xml { module dom {
@@ -44,7 +42,7 @@ interface XNodeList : com::sun::star::uno::XInterface
     */
     long getLength();
     /**
-    Returns the indexth item in the collection.
+    Returns a node specified by index in the collection.
     */
     XNode item([in] long index);
 };
diff --git a/offapi/com/sun/star/xml/dom/XNotation.idl b/offapi/com/sun/star/xml/dom/XNotation.idl
index 6198cdd491e9..415e7da0d5d6 100644
--- a/offapi/com/sun/star/xml/dom/XNotation.idl
+++ b/offapi/com/sun/star/xml/dom/XNotation.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XNotation_idl__
 #define __com_sun_star_xml_dom_XNotation_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl b/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
index 48277fc4a5c8..cf329f8c3988 100644
--- a/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
+++ b/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__
 #define __com_sun_star_xml_dom_XProcessingInstruction_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
index 05fafa20fc9f..7b84712eb06e 100644
--- a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
@@ -28,19 +28,10 @@
 #ifndef __com_sun_star_xml_dom_XSAXDocumentBuilder_idl__
 #define __com_sun_star_xml_dom_XSAXDocumentBuilder_idl__
 
-#ifndef __com_sun_star_uno__XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
 #include <com/sun/star/xml/dom/XDocument.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__
 #include <com/sun/star/xml/dom/XDocumentFragment.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_SAXDocumentBuilderState_idl__
 #include <com/sun/star/xml/dom/SAXDocumentBuilderState.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/XText.idl b/offapi/com/sun/star/xml/dom/XText.idl
index 8d12d1466cdd..bc009f2f65cd 100644
--- a/offapi/com/sun/star/xml/dom/XText.idl
+++ b/offapi/com/sun/star/xml/dom/XText.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xml_dom_XText_idl__
 #define __com_sun_star_xml_dom_XText_idl__
 
-#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
 #include <com/sun/star/xml/dom/XCharacterData.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom {
 
diff --git a/offapi/com/sun/star/xml/dom/events/EventException.idl b/offapi/com/sun/star/xml/dom/events/EventException.idl
index e05e7c7623d2..e1a04208037c 100644
--- a/offapi/com/sun/star/xml/dom/events/EventException.idl
+++ b/offapi/com/sun/star/xml/dom/events/EventException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_dom_events_EventException_idl__
 #define __com_sun_star_xml_dom_events_EventException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 module com { module sun { module star { module xml { module dom { module events {
 
diff --git a/offapi/com/sun/star/xml/dom/events/EventType.idl b/offapi/com/sun/star/xml/dom/events/EventType.idl
index d0b10c05765e..1a1226c08063 100644
--- a/offapi/com/sun/star/xml/dom/events/EventType.idl
+++ b/offapi/com/sun/star/xml/dom/events/EventType.idl
@@ -50,7 +50,7 @@ enum EventType
 
     DOMActivate,
     /*
-    The activate event occurs when an element is activated, for instance, thru a mouse click or a keypress. A numerical argument is provided to give an indication of the type of activation that occurs: 1 for a simple activation (e.g. a simple click or Enter), 2 for hyperactivation (for instance a double click or Shift Enter).
+    The activate event occurs when an element is activated, for instance, through a mouse click or a key press. A numerical argument is provided to give an indication of the type of activation that occurs: 1 for a simple activation (e.g. a simple click or Enter), 2 for hyper activation (for instance a double click or Shift Enter).
     * Bubbles: Yes
     * Cancelable: Yes
     * Context Info: detail (the numerical value)
@@ -115,7 +115,7 @@ enum EventType
 
     DOMSubtreeModified,
     /*
-    This is a general event for notification of all changes to the document. It can be used instead of the more specific events listed below. It may be fired after a single modification to the document or, at the implementation's discretion, after multiple changes have occurred. The latter use should generally be used to accomodate multiple changes which occur either simultaneously or in rapid succession. The target of this event is the lowest common parent of the changes which have taken place. This event is dispatched after any other events caused by the mutation have fired.
+    This is a general event for notification of all changes to the document. It can be used instead of the more specific events listed below. It may be fired after a single modification to the document or, at the implementation's discretion, after multiple changes have occurred. The latter use should generally be used to accommodate multiple changes which occur either simultaneously or in rapid succession. The target of this event is the lowest common parent of the changes which have taken place. This event is dispatched after any other events caused by the mutation have fired.
     * Bubbles: Yes
     * Cancelable: No
     * Context Info: None
diff --git a/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl b/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
index 724ea388fd75..f1ccdde43798 100644
--- a/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
+++ b/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
@@ -32,7 +32,6 @@
 #include <com/sun/star/xml/dom/events/XEvent.idl>
 #include <com/sun/star/xml/dom/events/XEventTarget.idl>
 #include <com/sun/star/xml/dom/events/XEventListener.idl>
-
 #include <com/sun/star/xml/dom/XNode.idl>
 
 module com { module sun { module star { module xml { module dom { module events {
diff --git a/offapi/com/sun/star/xml/input/XAttributes.idl b/offapi/com/sun/star/xml/input/XAttributes.idl
index 2e026da99662..4008f32adfd5 100644
--- a/offapi/com/sun/star/xml/input/XAttributes.idl
+++ b/offapi/com/sun/star/xml/input/XAttributes.idl
@@ -54,12 +54,12 @@ interface XAttributes : com::sun::star::uno::XInterface
     */
     long getIndexByQName( [in] string qName );
 
-    /** Gets attribute index passing a namespace uid and a localname.
+    /** Gets attribute index passing a namespace uid and a local name.
 
         @param uid
                namespace uid
         @param localName
-               localname
+               local name
         @return
                 attribute index or -1, if not found
     */
@@ -83,12 +83,12 @@ interface XAttributes : com::sun::star::uno::XInterface
     */
     long getUidByIndex( [in] long nIndex );
 
-    /** Gets the localname of an attribute.
+    /** Gets the local name of an attribute.
 
         @param nIndex
                index
         @return
-                localname of attribute or empty string, if invalid index
+                local name of attribute or empty string, if invalid index
     */
     string getLocalNameByIndex( [in] long nIndex );
 
@@ -101,14 +101,14 @@ interface XAttributes : com::sun::star::uno::XInterface
     */
     string getValueByIndex( [in] long nIndex );
 
-    /** For convenience: Gets the value of an attribute passing uid, localname.
+    /** For convenience: Gets the value of an attribute passing uid, local name.
 
         @param uid
                namespace uid
         @param localName
-               localname
+               local name
         @return
-                value string or empty string, if invalid uid/localname
+                value string or empty string, if invalid uid/local name
     */
     string getValueByUidName( [in] long uid, [in] string localName );
 
diff --git a/offapi/com/sun/star/xml/input/XElement.idl b/offapi/com/sun/star/xml/input/XElement.idl
index 3c151cf4eed3..c0806d078182 100644
--- a/offapi/com/sun/star/xml/input/XElement.idl
+++ b/offapi/com/sun/star/xml/input/XElement.idl
@@ -46,10 +46,10 @@ interface XElement : com::sun::star::uno::XInterface
     */
     XElement getParent();
 
-    /** Gets the localname of this element.
+    /** Gets the local name of this element.
 
         @return
-                localname of this element
+                local name of this element
     */
     string getLocalName();
 
@@ -67,12 +67,12 @@ interface XElement : com::sun::star::uno::XInterface
     */
     XAttributes getAttributes();
 
-    /** Called upon each occuring child element.
+    /** Called upon each occurring child element.
 
         @param uid
                namespace uid of element
         @param localName
-               localname of element
+               local name of element
         @param xAttributes
                attributes of element
         @return
diff --git a/offapi/com/sun/star/xml/input/XRoot.idl b/offapi/com/sun/star/xml/input/XRoot.idl
index 41bfefc2a76f..626a0301e09a 100644
--- a/offapi/com/sun/star/xml/input/XRoot.idl
+++ b/offapi/com/sun/star/xml/input/XRoot.idl
@@ -83,7 +83,7 @@ interface XRoot : com::sun::star::uno::XInterface
          @param uid
                 namespace uid of element
          @param localName
-                localname of element
+                local name of element
          @param xAattributes
                 attributes of element
      */
diff --git a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
index fae70b3c84c0..c5d1b7ab4b7b 100644
--- a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_FastShapeContextHandler_idl__
 #define __com_sun_star_xml_sax_FastShapeContextHandler_idl__
 
-#ifndef __com_sun_star_xml_sax_XFastShapeContextHandler_idl__
 #include <com/sun/star/xml/sax/XFastShapeContextHandler.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xml/sax/FastToken.idl b/offapi/com/sun/star/xml/sax/FastToken.idl
index baec31bb7fb9..9a1d74bf4da8 100644
--- a/offapi/com/sun/star/xml/sax/FastToken.idl
+++ b/offapi/com/sun/star/xml/sax/FastToken.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_XFastToken_idl__
 #define __com_sun_star_xml_sax_XFastToken_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xml/sax/InputSource.idl b/offapi/com/sun/star/xml/sax/InputSource.idl
index dafffbd31695..5445d6dfb294 100644
--- a/offapi/com/sun/star/xml/sax/InputSource.idl
+++ b/offapi/com/sun/star/xml/sax/InputSource.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_InputSource_idl__
 #define __com_sun_star_xml_sax_InputSource_idl__
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
 
 //=============================================================================
@@ -58,7 +56,7 @@ published struct InputSource
     //-------------------------------------------------------------------------
 
     /** contains the encoding of the data stream. This is used by the parser
-        to do unicode conversions.
+        to do Unicode conversions.
 
         <p>Note that in general you do not need to specify an encoding.
         Either it is UTF-8 or UTF-16 which is recognized by the parser
@@ -69,14 +67,14 @@ published struct InputSource
 
     //-------------------------------------------------------------------------
 
-    /** constains the public Id of the document, for example, needed in
+    /** contains the public Id of the document, for example, needed in
         exception-message strings.
      */
     string sPublicId;
 
     //-------------------------------------------------------------------------
 
-    /** contains the sytemID of the document.
+    /** contains the system ID of the document.
      */
     string sSystemId;
 };
diff --git a/offapi/com/sun/star/xml/sax/SAXException.idl b/offapi/com/sun/star/xml/sax/SAXException.idl
index e7257352fa45..649403ff0d29 100644
--- a/offapi/com/sun/star/xml/sax/SAXException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_SAXException_idl__
 #define __com_sun_star_xml_sax_SAXException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl b/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
index 162d8b3cbb83..3f1c6f2a052d 100644
--- a/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_SAXInvalidCharacterException_idl__
 #define __com_sun_star_xml_sax_SAXInvalidCharacterException_idl__
 
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
 
 
 //=============================================================================
@@ -40,7 +38,7 @@ module com {  module sun {  module star {  module xml {  module sax {
 
 /** stores information for locating the error in the original XML document.
 
-    @see XLocater
+    @see XLocator
  */
 published exception SAXInvalidCharacterException: com::sun::star::xml::sax::SAXException
 {
diff --git a/offapi/com/sun/star/xml/sax/SAXParseException.idl b/offapi/com/sun/star/xml/sax/SAXParseException.idl
index 9c7993fb854c..c306472f69ac 100644
--- a/offapi/com/sun/star/xml/sax/SAXParseException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXParseException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_SAXParseException_idl__
 #define __com_sun_star_xml_sax_SAXParseException_idl__
 
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
 
 
 //=============================================================================
@@ -40,7 +38,7 @@ module com {  module sun {  module star {  module xml {  module sax {
 
 /** stores information for locating the error in the original XML document.
 
-    @see XLocater
+    @see XLocator
  */
 published exception SAXParseException: com::sun::star::xml::sax::SAXException
 {
diff --git a/offapi/com/sun/star/xml/sax/XAttributeList.idl b/offapi/com/sun/star/xml/sax/XAttributeList.idl
index f7b24418410d..e671c6eb997f 100644
--- a/offapi/com/sun/star/xml/sax/XAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XAttributeList.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_XAttributeList_idl__
 #define __com_sun_star_xml_sax_XAttributeList_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/xml/sax/XDTDHandler.idl b/offapi/com/sun/star/xml/sax/XDTDHandler.idl
index 184850386f11..44168ac406fc 100644
--- a/offapi/com/sun/star/xml/sax/XDTDHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XDTDHandler.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
 #define __com_sun_star_xml_sax_XDTDHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
index 6586ba99a66b..210b8c6ec557 100644
--- a/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
 #define __com_sun_star_xml_sax_XDocumentHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_XAttributeList_idl__
 #include <com/sun/star/xml/sax/XAttributeList.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
 #include <com/sun/star/xml/sax/XLocator.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XEntityResolver.idl b/offapi/com/sun/star/xml/sax/XEntityResolver.idl
index 0638f72ba94c..c850f3e702e1 100644
--- a/offapi/com/sun/star/xml/sax/XEntityResolver.idl
+++ b/offapi/com/sun/star/xml/sax/XEntityResolver.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
 #define __com_sun_star_xml_sax_XEntityResolver_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
 #include <com/sun/star/xml/sax/InputSource.idl>
-#endif
 
 
 //=============================================================================
@@ -42,12 +38,12 @@ module com {  module sun {  module star {  module xml {  module sax {
 
 //=============================================================================
 
-/** makes it possible to modify the behaviour of resolving external
+/** makes it possible to modify the behavior of resolving external
     preferences.
 
-    <p>Usually, the parser has a default behaviour of resolving external
+    <p>Usually, the parser has a default behavior of resolving external
     references (See documentation of the parser implementation).
-    Use this interface to modify or reimplement this behaviour.</p>
+    Use this interface to modify or reimplement this behavior.</p>
  */
 published interface XEntityResolver: com::sun::star::uno::XInterface
 {
@@ -58,7 +54,7 @@ published interface XEntityResolver: com::sun::star::uno::XInterface
 
         <p>If <var>aInputStream</var> is a valid reference to an input stream,
         the parser uses this <type>InputSource</type>. Otherwise the
-        parser seeks for the entity using its default behaviour.
+        parser seeks for the entity using its default behavior.
      */
     InputSource resolveEntity( [in] string sPublicId, [in] string sSystemId );
 
diff --git a/offapi/com/sun/star/xml/sax/XErrorHandler.idl b/offapi/com/sun/star/xml/sax/XErrorHandler.idl
index 2d799fc6afdc..87a4b33dfe8f 100644
--- a/offapi/com/sun/star/xml/sax/XErrorHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XErrorHandler.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
 #define __com_sun_star_xml_sax_XErrorHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
index 5801a22a2517..d1f04f801b4a 100644
--- a/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__
 #define __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__
 
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
index 5fa78b81d393..baafcc24e435 100644
--- a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
 #define __com_sun_star_xml_sax_XFastAttributeList_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_Attribute_idl__
 #include <com/sun/star/xml/Attribute.idl>
-#endif
-
-#ifndef __com_sun_star_xml_FastAttribute_idl__
 #include <com/sun/star/xml/FastAttribute.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
 
 //=============================================================================
 
@@ -49,9 +38,9 @@ module com {  module sun {  module star {  module xml {  module sax {
 
 //=============================================================================
 
-/** a container for the attributes of an xml element.
+/** a container for the attributes of an XML element.
 
-    <br>Attributes are seperated into known attributes and unknown attributes.
+    <br>Attributes are separated into known attributes and unknown attributes.
     <p>Known attributes have a local name that is known to the <type>XFastTokenHandler</token>
     registered at the <type>XFastParser</type> which created the sax event containing
     this attributes. If an attribute also has a namespace, that must be registered
diff --git a/offapi/com/sun/star/xml/sax/XFastContextHandler.idl b/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
index 22feebe6f5a0..19c71e696d1a 100644
--- a/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__
 #define __com_sun_star_xml_sax_XFastContextHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
 #include <com/sun/star/xml/sax/XFastAttributeList.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
 #include <com/sun/star/xml/sax/XLocator.idl>
-#endif
 
 
 //=============================================================================
@@ -104,7 +96,7 @@ interface XFastContextHandler: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    /** receives notification of the end of an kown element.
+    /** receives notification of the end of an known element.
         @see startUnknownElement
      */
     void endUnknownElement( [in] string Namespace, [in] string Name )
diff --git a/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
index a4b5c94b8142..a9e2e74dcced 100644
--- a/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
@@ -27,25 +27,13 @@
 #ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
 #define __com_sun_star_xml_sax_XFastDocumentHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
 #include <com/sun/star/xml/sax/XFastAttributeList.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__
 #include <com/sun/star/xml/sax/XFastContextHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
 #include <com/sun/star/xml/sax/XLocator.idl>
-#endif
 
 
 //=============================================================================
@@ -61,14 +49,14 @@ interface XFastDocumentHandler: XFastContextHandler
 {
     //-------------------------------------------------------------------------
 
-    /** called by the parser when parsing of an xml stream is started.
+    /** called by the parser when parsing of an XML stream is started.
      */
     void startDocument()
             raises( com::sun::star::xml::sax::SAXException );
 
     //-------------------------------------------------------------------------
 
-    /** called by the parser after the last xml element of a stream is processed.
+    /** called by the parser after the last XML element of a stream is processed.
      */
     void endDocument()
             raises( com::sun::star::xml::sax::SAXException );
diff --git a/offapi/com/sun/star/xml/sax/XFastParser.idl b/offapi/com/sun/star/xml/sax/XFastParser.idl
index 037aa01f913b..07a0a24c2d62 100644
--- a/offapi/com/sun/star/xml/sax/XFastParser.idl
+++ b/offapi/com/sun/star/xml/sax/XFastParser.idl
@@ -27,49 +27,25 @@
 #ifndef __com_sun_star_xml_sax_XFastParser_idl__
 #define __com_sun_star_xml_sax_XFastParser_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
 #include <com/sun/star/xml/sax/InputSource.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
 #include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
 #include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
 #include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
 #include <com/sun/star/xml/sax/XDTDHandler.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
 #include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
@@ -77,19 +53,19 @@ module com {  module sun {  module star {  module xml {  module sax {
 
 //=============================================================================
 
-/** specifies a SAX parser that uses integer values for known xml names
+/** specifies a SAX parser that uses integer values for known XML names
     (elements, attributes and attribute values). The parser also handles
-    namespaces and allows to have individual contexts for each xml element.
+    namespaces and allows to have individual contexts for each XML element.
 
     <p>Before parsing is possible you have to set your
     <type>XFastDocumentHandler</type> using <member>setFastDocumentHandler</member>.
 
     <p>Parsing starts with calling <member>parseStream</member>. If the parser
-    finds a valid xml file with the given <type>InputSource</type>, it calls
+    finds a valid XML file with the given <type>InputSource</type>, it calls
     <member>XFastDocumentHandler::startDocument</member> first.
 
-    <p>This parser generates either 'fast' events that use integer token
-    values for namespaces, elements and attributes or 'unknown' events for
+    <p>This parser generates either "fast" events that use integer token
+    values for namespaces, elements and attributes or "unknown" events for
     elements that are unknown.
 
     <p>A namespace is unknown if the namespace URL was not registered with
@@ -102,7 +78,7 @@ module com {  module sun {  module star {  module xml {  module sax {
 
     <p>Setting a <type>XFastTokenHandler</type> with <member>setTokenHandler</member>
     is optional, but without a <type>XFastTokenHandler</type> you will only
-    get unknown sax events. This can be usefull if you are only interested
+    get unknown sax events. This can be useful if you are only interested
     in the namespace handling and/or the context feature.
 
     <p>For each element the parser sends a create child element event to the
@@ -114,7 +90,7 @@ module com {  module sun {  module star {  module xml {  module sax {
     itself.
 
     <p>If the parent context returns an empty reference, no further events for
-    the element and all of its childs are created.
+    the element and all of its children are created.
 
     <p>If a valid context is returned this context gets a start event by a call to
     <member>XFastContextHandler::startFastElement</member> for known elements or
@@ -153,7 +129,7 @@ interface XFastParser: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    /** must be registered to translate known xml names to integer tokens.
+    /** must be registered to translate known XML names to integer tokens.
      */
     void setTokenHandler( [in] XFastTokenHandler Handler );
 
@@ -187,6 +163,11 @@ interface XFastParser: com::sun::star::uno::XInterface
         errors will be presented to the user.</p>
      */
     void setLocale( [in] com::sun::star::lang::Locale locale );
+
+    /** Gets the namespace url string.
+      */
+    string getNamespaceURL( [in] string prefix )
+        raises( com::sun::star::lang::IllegalArgumentException );
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
index 949d8ef2386b..aa35a92a9896 100644
--- a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
@@ -28,21 +28,10 @@
 #ifndef __com_sun_star_xml_sax_XFastSAXSerializable_idl__
 #define __com_sun_star_xml_sax_XFastSAXSerializable_idl__
 
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
 #include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
 #include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
 #include <com/sun/star/beans/StringPair.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Pair_idl__
 #include <com/sun/star/beans/Pair.idl>
-#endif
 
 module com { module sun { module star { module xml { module sax {
 
diff --git a/offapi/com/sun/star/xml/sax/XFastSerializer.idl b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
index 3c61d0ffcbf4..fa747d3d8474 100644
--- a/offapi/com/sun/star/xml/sax/XFastSerializer.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
@@ -27,26 +27,11 @@
 #ifndef __com_sun_star_xml_sax_XFastSerializer_idl__
 #define __com_sun_star_xml_sax_XFastSerializer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastDocumentHanlder_idl__
 #include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
 #include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
 
 //=============================================================================
 
@@ -60,14 +45,14 @@ interface XFastSerializer: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    /** called by the parser when parsing of an xml stream is started.
+    /** called by the parser when parsing of an XML stream is started.
      */
     void startDocument()
             raises( com::sun::star::xml::sax::SAXException );
 
     //-------------------------------------------------------------------------
 
-    /** called by the parser after the last xml element of a stream is processed.
+    /** called by the parser after the last XML element of a stream is processed.
      */
     void endDocument()
             raises( com::sun::star::xml::sax::SAXException );
diff --git a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
index e4af64500b6c..68fe416663c8 100644
--- a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
 #define __com_sun_star_xml_sax_XFastTokenHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
@@ -37,10 +35,10 @@ module com {  module sun {  module star {  module xml {  module sax {
 
 //============================================================================
 
-/** interface to translate xml strings to integer tokens.
+/** interface to translate XML strings to integer tokens.
 
     <p>An instance of this interface can be registered at a <type>XFastParser</type>.
-    It should be able to translate all xml names (element local names,
+    It should be able to translate all XML names (element local names,
     attribute local names and constant attribute values) to integer tokens.
 
     A token value must be greater or equal to zero and less than
@@ -70,7 +68,7 @@ interface XFastTokenHandler: com::sun::star::uno::XInterface
     /** returns a integer token for the given string
 
         @param Identifier
-            the string given as a byte sequence encoded in UTF8
+            the string given as a byte sequence encoded in UTF-8
 
         @returns
             a unique integer token for the given String or <const>FastToken::DONTKNOW</const>
@@ -81,7 +79,7 @@ interface XFastTokenHandler: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     /** returns a identifier for the given integer token as a byte
-          sequence encoded in UTF8.
+          sequence encoded in UTF-8.
     */
     sequence< byte > getUTF8Identifier( [in] long Token );
 };
diff --git a/offapi/com/sun/star/xml/sax/XLocator.idl b/offapi/com/sun/star/xml/sax/XLocator.idl
index e77d83000f8a..81139a153b1c 100644
--- a/offapi/com/sun/star/xml/sax/XLocator.idl
+++ b/offapi/com/sun/star/xml/sax/XLocator.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_sax_XLocator_idl__
 #define __com_sun_star_xml_sax_XLocator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XParser.idl b/offapi/com/sun/star/xml/sax/XParser.idl
index 0d29af5d6562..bab4475f1229 100644
--- a/offapi/com/sun/star/xml/sax/XParser.idl
+++ b/offapi/com/sun/star/xml/sax/XParser.idl
@@ -27,41 +27,23 @@
 #ifndef __com_sun_star_xml_sax_XParser_idl__
 #define __com_sun_star_xml_sax_XParser_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
 #include <com/sun/star/xml/sax/InputSource.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
 #include <com/sun/star/xml/sax/SAXException.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
 #include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
 #include <com/sun/star/xml/sax/XDTDHandler.idl>
-#endif
 
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
 #include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
index 94af79fc1444..065fec06668b 100644
--- a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_xml_sax_XSAXSerializable_idl__
 #define __com_sun_star_xml_sax_XSAXSerializable_idl__
 
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
 #include <com/sun/star/beans/StringPair.idl>
-#endif
 
 module com { module sun { module star { module xml { module sax {
 
diff --git a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
index 8fb0ed67d17a..e5aa2075e232 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl>
-
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
 
diff --git a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
index 3a5edca4325e..9f457bff5ac1 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -34,9 +34,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
-
 #include <com/sun/star/lang/XUnoTunnel.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl
index 2145c23a941b..996e76a6fefa 100644
--- a/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -46,11 +46,11 @@ interface XXMLElementWrapper;
  * When converting SAX events into a DOM tree, this interface is
  * used to manipulate the DOM data in UNO perspective.
  * <p>
- * Every lauguage has its own methods to manipulate its native DOM
+ * Every language has its own methods to manipulate its native DOM
  * data structure, this interface provides a common method set which
- * each lauguage have to implement.
+ * each language have to implement.
  * <p>
- * In another word, this interface wraps language dependant methods,
+ * In another word, this interface wraps language dependent methods,
  * then other component can manipulate DOM data through UNO methods.
  */
 interface XXMLDocumentWrapper : com::sun::star::uno::XInterface
@@ -153,7 +153,7 @@ interface XXMLDocumentWrapper : com::sun::star::uno::XInterface
     /**
      * Converts the whole DOM tree into a SAX event stream.
      *
-     * @param handler   the document handelr which will receive the SAX event
+     * @param handler   the document handler which will receive the SAX event
      *                  stream
      */
     void getTree([in] com::sun::star::xml::sax::XDocumentHandler handler)
diff --git a/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl
index ef19b64826c7..95f536abf8ef 100644
--- a/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
 
 /** -- idl definition -- **/
 
@@ -41,7 +41,7 @@ module com { module sun { module star { module xml { module wrapper {
  * Interface of XML Element Wrapper.
  * <p>
  * This interface is used to wrap a element information, which
- * make it enable to tranfer the element information between
+ * make it enable to transfer the element information between
  * different languages, such as C++/Java.
  */
 interface XXMLElementWrapper : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/xml/xpath/XPathAPI.idl b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
index 67d771b3ea66..99842d95492f 100644
--- a/offapi/com/sun/star/xml/xpath/XPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
@@ -1,8 +1,6 @@
 #ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
 #define __com_sun_star_xml_xpath_XPathExtension_idl__
-#ifndef __com_sun_star_xml_xpath_XXPathAPI_idl
 #include <com/sun/star/xml/xpath/XXPathAPI.idl>
-#endif
 module com {  module sun {  module star {  module xml { module xpath {
 
     service XPathExtension
diff --git a/offapi/com/sun/star/xml/xpath/XPathException.idl b/offapi/com/sun/star/xml/xpath/XPathException.idl
index 37ee4eb789bb..2c36d2668745 100644
--- a/offapi/com/sun/star/xml/xpath/XPathException.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_xml_XPath_XPathException_idl__
 #define __com_sun_star_xml_XPath_XPathException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xml/xpath/XPathExtension.idl b/offapi/com/sun/star/xml/xpath/XPathExtension.idl
index d286cc0a817e..e5c827b84b2f 100644
--- a/offapi/com/sun/star/xml/xpath/XPathExtension.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathExtension.idl
@@ -1,8 +1,6 @@
 #ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
 #define __com_sun_star_xml_xpath_XPathExtension_idl__
-#ifndef __com_sun_star_xml_xpath_XXPathExtension_idl
 #include <com/sun/star/xml/xpath/XXPathExtension.idl>
-#endif
 module com {  module sun {  module star {  module xml { module xpath {
 
     service XPathExtension
diff --git a/offapi/com/sun/star/xml/xpath/XXPathAPI.idl b/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
index e3501947cb4c..6a19b545c2da 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_xml_XPath_XXPathAPI_idl__
 #define __com_sun_star_xml_XPath_XXPathAPI_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
 #include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_xpath_XXPathObject_idl__
 #include <com/sun/star/xml/xpath/XXPathObject.idl>
-#endif
-#ifndef __com_sun_star_xml_xpath_XXPathExtension_idl__
 #include <com/sun/star/xml/xpath/XXPathExtension.idl>
-#endif
-#ifndef __com_sun_star_xml_XPath_XPathException_idl__
 #include <com/sun/star/xml/xpath/XPathException.idl>
-#endif
 
 
 module com { module sun { module star { module xml { module xpath {
@@ -66,7 +54,7 @@ interface XXPathAPI : com::sun::star::uno::XInterface
     void registerExtensionInstance(
             [in] com::sun::star::xml::xpath::XXPathExtension aExtension);
 
-    /** Eval XPath Expression.
+    /** Evaluate XPath Expression.
 
         @param contextNode
             the context node (expression is relative to this node)
@@ -87,7 +75,7 @@ interface XXPathAPI : com::sun::star::uno::XInterface
             [in] string expr)
         raises( com::sun::star::xml::xpath::XPathException );
 
-    /** Eval XPath Expression.
+    /** Evaluate XPath Expression.
 
         @param contextNode
             the context node (expression is relative to this node)
diff --git a/offapi/com/sun/star/xml/xpath/XXPathExtension.idl b/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
index 527c37ba46f3..016439e6c78e 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
@@ -27,12 +27,8 @@
 
 #ifndef __com_sun_star_xml_XPath_XXPathExtension_idl__
 #define __com_sun_star_xml_XPath_XXPathExtension_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com__sun_star_xml_xpath_Libxml2ExtensionHandle_idl__
 #include <com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl>
-#endif
 
 module com { module sun { module star { module xml { module xpath {
 
diff --git a/offapi/com/sun/star/xml/xpath/XXPathObject.idl b/offapi/com/sun/star/xml/xpath/XXPathObject.idl
index 3371a17fe93c..a1ef71ff8762 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathObject.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathObject.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_xml_XPath_XXPathObject_idl__
 #define __com_sun_star_xml_XPath_XXPathObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNode_idl__
 #include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
 #include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_XPath_XObjectType_idl__
 #include <com/sun/star/xml/xpath/XPathObjectType.idl>
-#endif
 
 module com { module sun { module star { module xml { module xpath {
 
@@ -52,7 +44,7 @@ interface XXPathObject : com::sun::star::uno::XInterface
     XPathObjectType getObjectType();
 
     /**
-        get the nodes from a nodelist type object
+        get the nodes from a node list type object
     */
     com::sun::star::xml::dom::XNodeList getNodeList();
 
diff --git a/offapi/com/sun/star/xsd/Boolean.idl b/offapi/com/sun/star/xsd/Boolean.idl
index da715bc6ee22..6c3a409add2e 100644
--- a/offapi/com/sun/star/xsd/Boolean.idl
+++ b/offapi/com/sun/star/xsd/Boolean.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xsd_Boolean_idl__
 #define __com_sun_star_xsd_Boolean_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/Date.idl b/offapi/com/sun/star/xsd/Date.idl
index 624f6af4ca2d..3c01b978db1e 100644
--- a/offapi/com/sun/star/xsd/Date.idl
+++ b/offapi/com/sun/star/xsd/Date.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xsd_Date_idl__
 #define __com_sun_star_xsd_Date_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
-#ifndef __com_sun_star_util_Date_idl__
 #include <com/sun/star/util/Date.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/DateTime.idl b/offapi/com/sun/star/xsd/DateTime.idl
index 06b7c945baf8..3a88a167c8f0 100644
--- a/offapi/com/sun/star/xsd/DateTime.idl
+++ b/offapi/com/sun/star/xsd/DateTime.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xsd_DateTime_idl__
 #define __com_sun_star_xsd_DateTime_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
-#ifndef __com_sun_star_util_DateTime_idl__
 #include <com/sun/star/util/DateTime.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/Day.idl b/offapi/com/sun/star/xsd/Day.idl
index c683ad3ebb4a..e63831fe0f09 100644
--- a/offapi/com/sun/star/xsd/Day.idl
+++ b/offapi/com/sun/star/xsd/Day.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xsd_Day_idl__
 #define __com_sun_star_xsd_Day_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/Decimal.idl b/offapi/com/sun/star/xsd/Decimal.idl
index 008fb9340b82..886493b45fbf 100644
--- a/offapi/com/sun/star/xsd/Decimal.idl
+++ b/offapi/com/sun/star/xsd/Decimal.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xsd_Decimal_idl__
 #define __com_sun_star_xsd_Decimal_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/Month.idl b/offapi/com/sun/star/xsd/Month.idl
index bc57ed265bfb..36d83591d8fe 100644
--- a/offapi/com/sun/star/xsd/Month.idl
+++ b/offapi/com/sun/star/xsd/Month.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xsd_Month_idl__
 #define __com_sun_star_xsd_Month_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/String.idl b/offapi/com/sun/star/xsd/String.idl
index f86cc0c3fa2f..190368a69f34 100644
--- a/offapi/com/sun/star/xsd/String.idl
+++ b/offapi/com/sun/star/xsd/String.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xsd_String_idl__
 #define __com_sun_star_xsd_String_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
@@ -46,21 +44,21 @@ service String
 
     /** specifies the length of the string
 
-        <p>Note that you cannot specifiy <member>Length</member> together
+        <p>Note that you cannot specify <member>Length</member> together
         with <member>MinLength</member> or <member>MaxLength</member>.</p>
     */
     [property, maybevoid] long Length;
 
     /** specifies the minimum length of the string
 
-        <p>Note that you cannot specifiy <member>MinLength</member> together
+        <p>Note that you cannot specify <member>MinLength</member> together
         with <member>Length</member>.</p>
     */
     [property, maybevoid] long MinLength;
 
     /** specifies the maximum length of the string
 
-        <p>Note that you cannot specifiy <member>MaxLength</member> together
+        <p>Note that you cannot specify <member>MaxLength</member> together
         with <member>Length</member>.</p>
     */
     [property, maybevoid] long MaxLength;
diff --git a/offapi/com/sun/star/xsd/Time.idl b/offapi/com/sun/star/xsd/Time.idl
index bca39677b8cd..033c804605d3 100644
--- a/offapi/com/sun/star/xsd/Time.idl
+++ b/offapi/com/sun/star/xsd/Time.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_xsd_Time_idl__
 #define __com_sun_star_xsd_Time_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
-#ifndef __com_sun_star_util_Time_idl__
 #include <com/sun/star/util/Time.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl b/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl
index 05294e3a3217..7b76c069f07d 100644
--- a/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl
+++ b/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl
@@ -32,7 +32,7 @@
 module com {  module sun {  module star {  module xsd {
 
 //-----------------------------------------------------------------------------
-/** specifies possibilities how to treat whitespaces in strings
+/** specifies possibilities how to treat whitespace in strings
 
     @see XDataType
 */
diff --git a/offapi/com/sun/star/xsd/XDataType.idl b/offapi/com/sun/star/xsd/XDataType.idl
index b3009756e92c..f063167ea133 100644
--- a/offapi/com/sun/star/xsd/XDataType.idl
+++ b/offapi/com/sun/star/xsd/XDataType.idl
@@ -28,18 +28,10 @@
 #ifndef __com_sun_star_xsd_XDataType_idl__
 #define __com_sun_star_xsd_XDataType_idl__
 
-#ifndef __com_sun_star_container_XNamed_idl__
 #include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/com/sun/star/xsd/Year.idl b/offapi/com/sun/star/xsd/Year.idl
index 3e4a3438acec..a351b3130297 100644
--- a/offapi/com/sun/star/xsd/Year.idl
+++ b/offapi/com/sun/star/xsd/Year.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_xsd_Year_idl__
 #define __com_sun_star_xsd_Year_idl__
 
-#ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star {  module xsd {
diff --git a/offapi/prj/d.lst b/offapi/prj/d.lst
index ab0e4eb7a293..f57cb678b2ff 100644
--- a/offapi/prj/d.lst
+++ b/offapi/prj/d.lst
@@ -4,221 +4,221 @@
 #
 ##############################################################################
 
-mkdir: %COMMON_DEST%\idl%_EXT%\com
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\accessibility
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\animations
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\auth
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tree
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\grid
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tab
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\chart
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2\data
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\backend
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\backend\xml
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\bootstrap
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer\clipboard
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer\dnd
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\deployment
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\deployment\ui
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\document
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\drawing
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\drawing\framework
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\embed
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\binding
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\component
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\control
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\inspection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\runtime
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\submission
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\form\validation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\formula
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\frame
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\frame\status
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\gallery
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\geometry
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\graphic
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\i18n
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\image
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\inspection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\installation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ldap
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\linguistic2
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\logging
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\mail
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\media
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\mozilla
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\oooimprovement
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\packages
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\packages\manifest
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\packages\zip
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\plugin
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\presentation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\rdf
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\rendering
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\report
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\report\inspection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\report\meta
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\resource
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\scanner
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script\browse
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script\provider
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script\vba
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\application
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\tools
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdbc
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sdbcx
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\setup
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sheet
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\smarttags
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\style
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\svg
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sync
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\sync2
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\system
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\table
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\text
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\text\fieldmaster
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\text\textfield
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\text\textfield\docinfo
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ucb
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ucb\smart
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ui
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\ui\dialogs
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\view
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xforms
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto\sax
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\csax
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom\views
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom\events
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\input
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\sax
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\wrapper
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\xpath
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xsd
+mkdir: %COMMON_DEST%\idl\com
+mkdir: %COMMON_DEST%\idl\com\sun
+mkdir: %COMMON_DEST%\idl\com\sun\star
+mkdir: %COMMON_DEST%\idl\com\sun\star\accessibility
+mkdir: %COMMON_DEST%\idl\com\sun\star\animations
+mkdir: %COMMON_DEST%\idl\com\sun\star\auth
+mkdir: %COMMON_DEST%\idl\com\sun\star\awt
+mkdir: %COMMON_DEST%\idl\com\sun\star\awt\tree
+mkdir: %COMMON_DEST%\idl\com\sun\star\awt\grid
+mkdir: %COMMON_DEST%\idl\com\sun\star\awt\tab
+mkdir: %COMMON_DEST%\idl\com\sun\star\chart
+mkdir: %COMMON_DEST%\idl\com\sun\star\chart2
+mkdir: %COMMON_DEST%\idl\com\sun\star\chart2\data
+mkdir: %COMMON_DEST%\idl\com\sun\star\configuration
+mkdir: %COMMON_DEST%\idl\com\sun\star\configuration\backend
+mkdir: %COMMON_DEST%\idl\com\sun\star\configuration\backend\xml
+mkdir: %COMMON_DEST%\idl\com\sun\star\configuration\bootstrap
+mkdir: %COMMON_DEST%\idl\com\sun\star\datatransfer
+mkdir: %COMMON_DEST%\idl\com\sun\star\datatransfer\clipboard
+mkdir: %COMMON_DEST%\idl\com\sun\star\datatransfer\dnd
+mkdir: %COMMON_DEST%\idl\com\sun\star\deployment
+mkdir: %COMMON_DEST%\idl\com\sun\star\deployment\ui
+mkdir: %COMMON_DEST%\idl\com\sun\star\document
+mkdir: %COMMON_DEST%\idl\com\sun\star\drawing
+mkdir: %COMMON_DEST%\idl\com\sun\star\drawing\framework
+mkdir: %COMMON_DEST%\idl\com\sun\star\embed
+mkdir: %COMMON_DEST%\idl\com\sun\star\form
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\binding
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\component
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\control
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\inspection
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\runtime
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\submission
+mkdir: %COMMON_DEST%\idl\com\sun\star\form\validation
+mkdir: %COMMON_DEST%\idl\com\sun\star\formula
+mkdir: %COMMON_DEST%\idl\com\sun\star\frame
+mkdir: %COMMON_DEST%\idl\com\sun\star\frame\status
+mkdir: %COMMON_DEST%\idl\com\sun\star\gallery
+mkdir: %COMMON_DEST%\idl\com\sun\star\geometry
+mkdir: %COMMON_DEST%\idl\com\sun\star\graphic
+mkdir: %COMMON_DEST%\idl\com\sun\star\i18n
+mkdir: %COMMON_DEST%\idl\com\sun\star\image
+mkdir: %COMMON_DEST%\idl\com\sun\star\inspection
+mkdir: %COMMON_DEST%\idl\com\sun\star\installation
+mkdir: %COMMON_DEST%\idl\com\sun\star\ldap
+mkdir: %COMMON_DEST%\idl\com\sun\star\linguistic2
+mkdir: %COMMON_DEST%\idl\com\sun\star\logging
+mkdir: %COMMON_DEST%\idl\com\sun\star\mail
+mkdir: %COMMON_DEST%\idl\com\sun\star\media
+mkdir: %COMMON_DEST%\idl\com\sun\star\mozilla
+mkdir: %COMMON_DEST%\idl\com\sun\star\oooimprovement
+mkdir: %COMMON_DEST%\idl\com\sun\star\packages
+mkdir: %COMMON_DEST%\idl\com\sun\star\packages\manifest
+mkdir: %COMMON_DEST%\idl\com\sun\star\packages\zip
+mkdir: %COMMON_DEST%\idl\com\sun\star\plugin
+mkdir: %COMMON_DEST%\idl\com\sun\star\presentation
+mkdir: %COMMON_DEST%\idl\com\sun\star\rdf
+mkdir: %COMMON_DEST%\idl\com\sun\star\rendering
+mkdir: %COMMON_DEST%\idl\com\sun\star\report
+mkdir: %COMMON_DEST%\idl\com\sun\star\report\inspection
+mkdir: %COMMON_DEST%\idl\com\sun\star\report\meta
+mkdir: %COMMON_DEST%\idl\com\sun\star\resource
+mkdir: %COMMON_DEST%\idl\com\sun\star\scanner
+mkdir: %COMMON_DEST%\idl\com\sun\star\script
+mkdir: %COMMON_DEST%\idl\com\sun\star\script\browse
+mkdir: %COMMON_DEST%\idl\com\sun\star\script\provider
+mkdir: %COMMON_DEST%\idl\com\sun\star\script\vba
+mkdir: %COMMON_DEST%\idl\com\sun\star\sdb
+mkdir: %COMMON_DEST%\idl\com\sun\star\sdb\application
+mkdir: %COMMON_DEST%\idl\com\sun\star\sdb\tools
+mkdir: %COMMON_DEST%\idl\com\sun\star\sdbc
+mkdir: %COMMON_DEST%\idl\com\sun\star\sdbcx
+mkdir: %COMMON_DEST%\idl\com\sun\star\security
+mkdir: %COMMON_DEST%\idl\com\sun\star\setup
+mkdir: %COMMON_DEST%\idl\com\sun\star\sheet
+mkdir: %COMMON_DEST%\idl\com\sun\star\smarttags
+mkdir: %COMMON_DEST%\idl\com\sun\star\style
+mkdir: %COMMON_DEST%\idl\com\sun\star\svg
+mkdir: %COMMON_DEST%\idl\com\sun\star\sync
+mkdir: %COMMON_DEST%\idl\com\sun\star\sync2
+mkdir: %COMMON_DEST%\idl\com\sun\star\system
+mkdir: %COMMON_DEST%\idl\com\sun\star\table
+mkdir: %COMMON_DEST%\idl\com\sun\star\task
+mkdir: %COMMON_DEST%\idl\com\sun\star\text
+mkdir: %COMMON_DEST%\idl\com\sun\star\text\fieldmaster
+mkdir: %COMMON_DEST%\idl\com\sun\star\text\textfield
+mkdir: %COMMON_DEST%\idl\com\sun\star\text\textfield\docinfo
+mkdir: %COMMON_DEST%\idl\com\sun\star\ucb
+mkdir: %COMMON_DEST%\idl\com\sun\star\ucb\smart
+mkdir: %COMMON_DEST%\idl\com\sun\star\ui
+mkdir: %COMMON_DEST%\idl\com\sun\star\ui\dialogs
+mkdir: %COMMON_DEST%\idl\com\sun\star\util
+mkdir: %COMMON_DEST%\idl\com\sun\star\view
+mkdir: %COMMON_DEST%\idl\com\sun\star\xforms
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\crypto
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\crypto\sax
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\csax
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\dom
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\dom\views
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\dom\events
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\input
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\sax
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\wrapper
+mkdir: %COMMON_DEST%\idl\com\sun\star\xml\xpath
+mkdir: %COMMON_DEST%\idl\com\sun\star\xsd
 
-..\%__SRC%\ucr\offapi.db %_DEST%\bin%_EXT%\offapi.rdb
-..\%__SRC%\ucrdoc\offapi_doc.db %_DEST%\bin%_EXT%\offapi_doc.rdb
-..\%__SRC%\ucr\types.db %_DEST%\bin%_EXT%\types.rdb
-..\%__SRC%\ucrdoc\types_doc.db %_DEST%\bin%_EXT%\types_doc.rdb
+..\%__SRC%\ucr\offapi.db %_DEST%\bin\offapi.rdb
+..\%__SRC%\ucrdoc\offapi_doc.db %_DEST%\bin\offapi_doc.rdb
+..\%__SRC%\ucr\types.db %_DEST%\bin\types.rdb
+..\%__SRC%\ucrdoc\types_doc.db %_DEST%\bin\types_doc.rdb
 
-..\%__SRC%\misc\unotype_statistics.txt %_DEST%\bin%_EXT%\unotype_statistics.txt
+..\%__SRC%\misc\unotype_statistics.txt %_DEST%\bin\unotype_statistics.txt
 
-..\com\sun\star\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star
-..\com\sun\star\accessibility\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\accessibility
-..\com\sun\star\animations\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\animations
-..\com\sun\star\auth\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\auth
-..\com\sun\star\awt\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt
-..\com\sun\star\awt\tree\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tree
-..\com\sun\star\awt\grid\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\grid
-..\com\sun\star\awt\tab\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\awt\tab
-..\com\sun\star\chart\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\chart
-..\com\sun\star\chart2\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2
-..\com\sun\star\chart2\data\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\chart2\data
-..\com\sun\star\configuration\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration
-..\com\sun\star\configuration\backend\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\backend
-..\com\sun\star\configuration\backend\xml\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\backend\xml
-..\com\sun\star\configuration\bootstrap\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\configuration\bootstrap
-..\com\sun\star\datatransfer\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer
-..\com\sun\star\datatransfer\clipboard\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer\clipboard
-..\com\sun\star\datatransfer\dnd\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\datatransfer\dnd
-..\com\sun\star\deployment\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\deployment
-..\com\sun\star\deployment\ui\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\deployment\ui
-..\com\sun\star\document\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\document
-..\com\sun\star\drawing\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\drawing
-..\com\sun\star\drawing\framework\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\drawing\framework
-..\com\sun\star\embed\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\embed
-..\com\sun\star\form\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form
-..\com\sun\star\form\binding\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\binding
-..\com\sun\star\form\component\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\component
-..\com\sun\star\form\control\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\control
-..\com\sun\star\form\inspection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\inspection
-..\com\sun\star\form\runtime\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\runtime
-..\com\sun\star\form\submission\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\submission
-..\com\sun\star\form\validation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\form\validation
-..\com\sun\star\formula\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\formula
-..\com\sun\star\frame\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\frame
-..\com\sun\star\frame\status\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\frame\status
-..\com\sun\star\gallery\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\gallery
-..\com\sun\star\geometry\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\geometry
-..\com\sun\star\graphic\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\graphic
-..\com\sun\star\i18n\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\i18n
-..\com\sun\star\image\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\image
-..\com\sun\star\inspection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\inspection
-..\com\sun\star\installation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\installation
-..\com\sun\star\ldap\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ldap
-..\com\sun\star\linguistic2\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\linguistic2
-..\com\sun\star\logging\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\logging
-..\com\sun\star\mail\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\mail
-..\com\sun\star\media\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\media
-..\com\sun\star\mozilla\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\mozilla
-..\com\sun\star\oooimprovement\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\oooimprovement
-..\com\sun\star\packages\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\packages
-..\com\sun\star\packages\manifest\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\packages\manifest
-..\com\sun\star\packages\zip\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\packages\zip
-..\com\sun\star\plugin\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\plugin
-..\com\sun\star\presentation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\presentation
-..\com\sun\star\rdf\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\rdf
-..\com\sun\star\rendering\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\rendering
-..\com\sun\star\report\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\report
-..\com\sun\star\report\inspection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\report\inspection
-..\com\sun\star\report\meta\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\report\meta
-..\com\sun\star\resource\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\resource
-..\com\sun\star\scanner\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\scanner
-..\com\sun\star\script\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-..\com\sun\star\script\browse\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script\browse
-..\com\sun\star\script\provider\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script\provider
-..\com\sun\star\script\vba\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script\vba
-..\com\sun\star\sdb\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb
-..\com\sun\star\sdb\application\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\application
-..\com\sun\star\sdb\tools\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdb\tools
-..\com\sun\star\sdbc\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdbc
-..\com\sun\star\sdbcx\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sdbcx
-..\com\sun\star\security\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-..\com\sun\star\setup\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\setup
-..\com\sun\star\sheet\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sheet
-..\com\sun\star\smarttags\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\smarttags
-..\com\sun\star\style\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\style
-..\com\sun\star\svg\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\svg
-..\com\sun\star\sync\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sync
-..\com\sun\star\sync2\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\sync2
-..\com\sun\star\system\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\system
-..\com\sun\star\table\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\table
-..\com\sun\star\task\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-..\com\sun\star\text\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text
-..\com\sun\star\text\fieldmaster\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text\fieldmaster
-..\com\sun\star\text\textfield\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text\textfield
-..\com\sun\star\text\textfield\docinfo\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text\textfield\docinfo
-..\com\sun\star\ucb\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ucb
-..\com\sun\star\ucb\smart\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ucb\smart
-..\com\sun\star\ui\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ui
-..\com\sun\star\ui\dialogs\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\ui\dialogs
-..\com\sun\star\util\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-..\com\sun\star\view\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\view
-..\com\sun\star\xforms\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xforms
-..\com\sun\star\xml\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml
-..\com\sun\star\xml\crypto\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto
-..\com\sun\star\xml\crypto\sax\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto\sax
-..\com\sun\star\xml\csax\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\csax
-..\com\sun\star\xml\dom\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom
-..\com\sun\star\xml\dom\views\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom\views
-..\com\sun\star\xml\dom\events\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\dom\events
-..\com\sun\star\xml\input\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\input
-..\com\sun\star\xml\sax\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\sax
-..\com\sun\star\xml\wrapper\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\wrapper
-..\com\sun\star\xml\xpath\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\xpath
-..\com\sun\star\xsd\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xsd
+..\com\sun\star\*.idl %COMMON_DEST%\idl\com\sun\star
+..\com\sun\star\accessibility\*.idl %COMMON_DEST%\idl\com\sun\star\accessibility
+..\com\sun\star\animations\*.idl %COMMON_DEST%\idl\com\sun\star\animations
+..\com\sun\star\auth\*.idl %COMMON_DEST%\idl\com\sun\star\auth
+..\com\sun\star\awt\*.idl %COMMON_DEST%\idl\com\sun\star\awt
+..\com\sun\star\awt\tree\*.idl %COMMON_DEST%\idl\com\sun\star\awt\tree
+..\com\sun\star\awt\grid\*.idl %COMMON_DEST%\idl\com\sun\star\awt\grid
+..\com\sun\star\awt\tab\*.idl %COMMON_DEST%\idl\com\sun\star\awt\tab
+..\com\sun\star\chart\*.idl %COMMON_DEST%\idl\com\sun\star\chart
+..\com\sun\star\chart2\*.idl %COMMON_DEST%\idl\com\sun\star\chart2
+..\com\sun\star\chart2\data\*.idl %COMMON_DEST%\idl\com\sun\star\chart2\data
+..\com\sun\star\configuration\*.idl %COMMON_DEST%\idl\com\sun\star\configuration
+..\com\sun\star\configuration\backend\*.idl %COMMON_DEST%\idl\com\sun\star\configuration\backend
+..\com\sun\star\configuration\backend\xml\*.idl %COMMON_DEST%\idl\com\sun\star\configuration\backend\xml
+..\com\sun\star\configuration\bootstrap\*.idl %COMMON_DEST%\idl\com\sun\star\configuration\bootstrap
+..\com\sun\star\datatransfer\*.idl %COMMON_DEST%\idl\com\sun\star\datatransfer
+..\com\sun\star\datatransfer\clipboard\*.idl %COMMON_DEST%\idl\com\sun\star\datatransfer\clipboard
+..\com\sun\star\datatransfer\dnd\*.idl %COMMON_DEST%\idl\com\sun\star\datatransfer\dnd
+..\com\sun\star\deployment\*.idl %COMMON_DEST%\idl\com\sun\star\deployment
+..\com\sun\star\deployment\ui\*.idl %COMMON_DEST%\idl\com\sun\star\deployment\ui
+..\com\sun\star\document\*.idl %COMMON_DEST%\idl\com\sun\star\document
+..\com\sun\star\drawing\*.idl %COMMON_DEST%\idl\com\sun\star\drawing
+..\com\sun\star\drawing\framework\*.idl %COMMON_DEST%\idl\com\sun\star\drawing\framework
+..\com\sun\star\embed\*.idl %COMMON_DEST%\idl\com\sun\star\embed
+..\com\sun\star\form\*.idl %COMMON_DEST%\idl\com\sun\star\form
+..\com\sun\star\form\binding\*.idl %COMMON_DEST%\idl\com\sun\star\form\binding
+..\com\sun\star\form\component\*.idl %COMMON_DEST%\idl\com\sun\star\form\component
+..\com\sun\star\form\control\*.idl %COMMON_DEST%\idl\com\sun\star\form\control
+..\com\sun\star\form\inspection\*.idl %COMMON_DEST%\idl\com\sun\star\form\inspection
+..\com\sun\star\form\runtime\*.idl %COMMON_DEST%\idl\com\sun\star\form\runtime
+..\com\sun\star\form\submission\*.idl %COMMON_DEST%\idl\com\sun\star\form\submission
+..\com\sun\star\form\validation\*.idl %COMMON_DEST%\idl\com\sun\star\form\validation
+..\com\sun\star\formula\*.idl %COMMON_DEST%\idl\com\sun\star\formula
+..\com\sun\star\frame\*.idl %COMMON_DEST%\idl\com\sun\star\frame
+..\com\sun\star\frame\status\*.idl %COMMON_DEST%\idl\com\sun\star\frame\status
+..\com\sun\star\gallery\*.idl %COMMON_DEST%\idl\com\sun\star\gallery
+..\com\sun\star\geometry\*.idl %COMMON_DEST%\idl\com\sun\star\geometry
+..\com\sun\star\graphic\*.idl %COMMON_DEST%\idl\com\sun\star\graphic
+..\com\sun\star\i18n\*.idl %COMMON_DEST%\idl\com\sun\star\i18n
+..\com\sun\star\image\*.idl %COMMON_DEST%\idl\com\sun\star\image
+..\com\sun\star\inspection\*.idl %COMMON_DEST%\idl\com\sun\star\inspection
+..\com\sun\star\installation\*.idl %COMMON_DEST%\idl\com\sun\star\installation
+..\com\sun\star\ldap\*.idl %COMMON_DEST%\idl\com\sun\star\ldap
+..\com\sun\star\linguistic2\*.idl %COMMON_DEST%\idl\com\sun\star\linguistic2
+..\com\sun\star\logging\*.idl %COMMON_DEST%\idl\com\sun\star\logging
+..\com\sun\star\mail\*.idl %COMMON_DEST%\idl\com\sun\star\mail
+..\com\sun\star\media\*.idl %COMMON_DEST%\idl\com\sun\star\media
+..\com\sun\star\mozilla\*.idl %COMMON_DEST%\idl\com\sun\star\mozilla
+..\com\sun\star\oooimprovement\*.idl %COMMON_DEST%\idl\com\sun\star\oooimprovement
+..\com\sun\star\packages\*.idl %COMMON_DEST%\idl\com\sun\star\packages
+..\com\sun\star\packages\manifest\*.idl %COMMON_DEST%\idl\com\sun\star\packages\manifest
+..\com\sun\star\packages\zip\*.idl %COMMON_DEST%\idl\com\sun\star\packages\zip
+..\com\sun\star\plugin\*.idl %COMMON_DEST%\idl\com\sun\star\plugin
+..\com\sun\star\presentation\*.idl %COMMON_DEST%\idl\com\sun\star\presentation
+..\com\sun\star\rdf\*.idl %COMMON_DEST%\idl\com\sun\star\rdf
+..\com\sun\star\rendering\*.idl %COMMON_DEST%\idl\com\sun\star\rendering
+..\com\sun\star\report\*.idl %COMMON_DEST%\idl\com\sun\star\report
+..\com\sun\star\report\inspection\*.idl %COMMON_DEST%\idl\com\sun\star\report\inspection
+..\com\sun\star\report\meta\*.idl %COMMON_DEST%\idl\com\sun\star\report\meta
+..\com\sun\star\resource\*.idl %COMMON_DEST%\idl\com\sun\star\resource
+..\com\sun\star\scanner\*.idl %COMMON_DEST%\idl\com\sun\star\scanner
+..\com\sun\star\script\*.idl %COMMON_DEST%\idl\com\sun\star\script
+..\com\sun\star\script\browse\*.idl %COMMON_DEST%\idl\com\sun\star\script\browse
+..\com\sun\star\script\provider\*.idl %COMMON_DEST%\idl\com\sun\star\script\provider
+..\com\sun\star\script\vba\*.idl %COMMON_DEST%\idl\com\sun\star\script\vba
+..\com\sun\star\sdb\*.idl %COMMON_DEST%\idl\com\sun\star\sdb
+..\com\sun\star\sdb\application\*.idl %COMMON_DEST%\idl\com\sun\star\sdb\application
+..\com\sun\star\sdb\tools\*.idl %COMMON_DEST%\idl\com\sun\star\sdb\tools
+..\com\sun\star\sdbc\*.idl %COMMON_DEST%\idl\com\sun\star\sdbc
+..\com\sun\star\sdbcx\*.idl %COMMON_DEST%\idl\com\sun\star\sdbcx
+..\com\sun\star\security\*.idl %COMMON_DEST%\idl\com\sun\star\security
+..\com\sun\star\setup\*.idl %COMMON_DEST%\idl\com\sun\star\setup
+..\com\sun\star\sheet\*.idl %COMMON_DEST%\idl\com\sun\star\sheet
+..\com\sun\star\smarttags\*.idl %COMMON_DEST%\idl\com\sun\star\smarttags
+..\com\sun\star\style\*.idl %COMMON_DEST%\idl\com\sun\star\style
+..\com\sun\star\svg\*.idl %COMMON_DEST%\idl\com\sun\star\svg
+..\com\sun\star\sync\*.idl %COMMON_DEST%\idl\com\sun\star\sync
+..\com\sun\star\sync2\*.idl %COMMON_DEST%\idl\com\sun\star\sync2
+..\com\sun\star\system\*.idl %COMMON_DEST%\idl\com\sun\star\system
+..\com\sun\star\table\*.idl %COMMON_DEST%\idl\com\sun\star\table
+..\com\sun\star\task\*.idl %COMMON_DEST%\idl\com\sun\star\task
+..\com\sun\star\text\*.idl %COMMON_DEST%\idl\com\sun\star\text
+..\com\sun\star\text\fieldmaster\*.idl %COMMON_DEST%\idl\com\sun\star\text\fieldmaster
+..\com\sun\star\text\textfield\*.idl %COMMON_DEST%\idl\com\sun\star\text\textfield
+..\com\sun\star\text\textfield\docinfo\*.idl %COMMON_DEST%\idl\com\sun\star\text\textfield\docinfo
+..\com\sun\star\ucb\*.idl %COMMON_DEST%\idl\com\sun\star\ucb
+..\com\sun\star\ucb\smart\*.idl %COMMON_DEST%\idl\com\sun\star\ucb\smart
+..\com\sun\star\ui\*.idl %COMMON_DEST%\idl\com\sun\star\ui
+..\com\sun\star\ui\dialogs\*.idl %COMMON_DEST%\idl\com\sun\star\ui\dialogs
+..\com\sun\star\util\*.idl %COMMON_DEST%\idl\com\sun\star\util
+..\com\sun\star\view\*.idl %COMMON_DEST%\idl\com\sun\star\view
+..\com\sun\star\xforms\*.idl %COMMON_DEST%\idl\com\sun\star\xforms
+..\com\sun\star\xml\*.idl %COMMON_DEST%\idl\com\sun\star\xml
+..\com\sun\star\xml\crypto\*.idl %COMMON_DEST%\idl\com\sun\star\xml\crypto
+..\com\sun\star\xml\crypto\sax\*.idl %COMMON_DEST%\idl\com\sun\star\xml\crypto\sax
+..\com\sun\star\xml\csax\*.idl %COMMON_DEST%\idl\com\sun\star\xml\csax
+..\com\sun\star\xml\dom\*.idl %COMMON_DEST%\idl\com\sun\star\xml\dom
+..\com\sun\star\xml\dom\views\*.idl %COMMON_DEST%\idl\com\sun\star\xml\dom\views
+..\com\sun\star\xml\dom\events\*.idl %COMMON_DEST%\idl\com\sun\star\xml\dom\events
+..\com\sun\star\xml\input\*.idl %COMMON_DEST%\idl\com\sun\star\xml\input
+..\com\sun\star\xml\sax\*.idl %COMMON_DEST%\idl\com\sun\star\xml\sax
+..\com\sun\star\xml\wrapper\*.idl %COMMON_DEST%\idl\com\sun\star\xml\wrapper
+..\com\sun\star\xml\xpath\*.idl %COMMON_DEST%\idl\com\sun\star\xml\xpath
+..\com\sun\star\xsd\*.idl %COMMON_DEST%\idl\com\sun\star\xsd
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index f0837e21ca8b..d377ecafc589 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -31,12 +31,12 @@ PRJPCH=
 PRJNAME=offapi
 TARGET=offapi_db
 
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  makefile.pmk
 
 # ------------------------------------------------------------------
+
 UNOIDLDBFILES= \
     $(UCR)$/cssauth.db \
     $(UCR)$/cssawt.db \
@@ -176,13 +176,19 @@ $(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udk
 #
 #JSC: i have removed the doc rdb because all type information is already in the
 #     types.rdb, even the service and singleton type info. IDL docu isn't checked.
-$(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
-    $(COMMAND_ECHO)$(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db \
-        && echo > $(REGISTRYCHECKFLAG)
+#
+#Use the types-whitelist to exclude published API from signalling incompatibility.
+#Handle with care.
+
+$(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db types-whitelist
+# FIXME: disabled. fails without OS2 support
+#    $(COMMAND_ECHO)$(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db @types-whitelist \
+#        && echo > $(REGISTRYCHECKFLAG)
+	echo "" > $(REGISTRYCHECKFLAG)
 
 #JSC: new target to prepare some UNO type statistics, the ouput will be later used
 #     for versioning of UNO cli type libraries
-$(UNOTYPE_STATISTICS) : $(REGISTRYCHECKFLAG)
+$(UNOTYPE_STATISTICS) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
     $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" "$(REGVIEWTOOL)" > $@
 
 .INCLUDE :  target.mk
diff --git a/offapi/util/types-whitelist b/offapi/util/types-whitelist
new file mode 100644
index 000000000000..343bede08724
--- /dev/null
+++ b/offapi/util/types-whitelist
@@ -0,0 +1 @@
+-x /UCR/com/sun/star/drawing/TextFitToSizeType
diff --git a/offuh/prj/d.lst b/offuh/prj/d.lst
index 464dfca14075..8642b07880a3 100644
--- a/offuh/prj/d.lst
+++ b/offuh/prj/d.lst
@@ -1,423 +1,423 @@
-mkdir: %_DEST%\inc%_EXT%\offuh
-mkdir: %_DEST%\inc%_EXT%\offuh\com
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star
+mkdir: %_DEST%\inc\offuh
+mkdir: %_DEST%\inc\offuh\com
+mkdir: %_DEST%\inc\offuh\com\sun
+mkdir: %_DEST%\inc\offuh\com\sun\star
 
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\auth
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\accessibility
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tree
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\grid
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tab
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\beans
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\oleautomation
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\chart
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\chart2
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\chart2\data
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\container
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\configuration
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\configuration\backend
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\connection
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\data
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\deployment
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\deployment\ui
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\clipboard
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\dnd
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\daemons
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\document
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\drawing
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\drawing\framework
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\geometry
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\rendering
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\embed
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\form
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xforms
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\form\binding
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\form\validation
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\form\submission
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\form\runtime
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\form\inspection
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\formula
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\frame
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\frame\status
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\gallery
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\graphic
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\i18n
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\installation
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\io
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\java
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\lang
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\logging
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\oooimprovement
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\office
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\mail
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\media
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\packages
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\manifest
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\zip
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\presentation
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\animations
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\reflection
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\registry
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\report
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\report\inspection
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\report\meta
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\resource
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\tools
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\application
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbc
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbcx
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\scanner
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\script
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\script\vba
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sheet
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\smarttags
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\style
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\svg
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\sync2
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\system
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\table
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\telephony
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\telephony\DIALER
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\text
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xsd
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\inspection
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\ui
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\ui\dialogs
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\uno
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\uri
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\util
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\util\logging
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\view
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\input
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\sax
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\xpath
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\events
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\views
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\loader
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\task
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\ucb
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\plugin
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\setup
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\portal
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\client
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons\sadmind
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons\sofficed
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\system
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\mozilla
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\ldap
+mkdir: %_DEST%\inc\offuh\com\sun\star\auth
+mkdir: %_DEST%\inc\offuh\com\sun\star\accessibility
+mkdir: %_DEST%\inc\offuh\com\sun\star\awt
+mkdir: %_DEST%\inc\offuh\com\sun\star\awt\tree
+mkdir: %_DEST%\inc\offuh\com\sun\star\awt\grid
+mkdir: %_DEST%\inc\offuh\com\sun\star\awt\tab
+mkdir: %_DEST%\inc\offuh\com\sun\star\beans
+mkdir: %_DEST%\inc\offuh\com\sun\star\bridge
+mkdir: %_DEST%\inc\offuh\com\sun\star\bridge\oleautomation
+mkdir: %_DEST%\inc\offuh\com\sun\star\chart
+mkdir: %_DEST%\inc\offuh\com\sun\star\chart2
+mkdir: %_DEST%\inc\offuh\com\sun\star\chart2\data
+mkdir: %_DEST%\inc\offuh\com\sun\star\container
+mkdir: %_DEST%\inc\offuh\com\sun\star\configuration
+mkdir: %_DEST%\inc\offuh\com\sun\star\configuration\backend
+mkdir: %_DEST%\inc\offuh\com\sun\star\connection
+mkdir: %_DEST%\inc\offuh\com\sun\star\data
+mkdir: %_DEST%\inc\offuh\com\sun\star\deployment
+mkdir: %_DEST%\inc\offuh\com\sun\star\deployment\ui
+mkdir: %_DEST%\inc\offuh\com\sun\star\datatransfer
+mkdir: %_DEST%\inc\offuh\com\sun\star\datatransfer\clipboard
+mkdir: %_DEST%\inc\offuh\com\sun\star\datatransfer\dnd
+mkdir: %_DEST%\inc\offuh\com\sun\star\daemons
+mkdir: %_DEST%\inc\offuh\com\sun\star\document
+mkdir: %_DEST%\inc\offuh\com\sun\star\drawing
+mkdir: %_DEST%\inc\offuh\com\sun\star\drawing\framework
+mkdir: %_DEST%\inc\offuh\com\sun\star\geometry
+mkdir: %_DEST%\inc\offuh\com\sun\star\rendering
+mkdir: %_DEST%\inc\offuh\com\sun\star\embed
+mkdir: %_DEST%\inc\offuh\com\sun\star\form
+mkdir: %_DEST%\inc\offuh\com\sun\star\xforms
+mkdir: %_DEST%\inc\offuh\com\sun\star\form\binding
+mkdir: %_DEST%\inc\offuh\com\sun\star\form\validation
+mkdir: %_DEST%\inc\offuh\com\sun\star\form\submission
+mkdir: %_DEST%\inc\offuh\com\sun\star\form\runtime
+mkdir: %_DEST%\inc\offuh\com\sun\star\form\inspection
+mkdir: %_DEST%\inc\offuh\com\sun\star\formula
+mkdir: %_DEST%\inc\offuh\com\sun\star\frame
+mkdir: %_DEST%\inc\offuh\com\sun\star\frame\status
+mkdir: %_DEST%\inc\offuh\com\sun\star\gallery
+mkdir: %_DEST%\inc\offuh\com\sun\star\graphic
+mkdir: %_DEST%\inc\offuh\com\sun\star\i18n
+mkdir: %_DEST%\inc\offuh\com\sun\star\installation
+mkdir: %_DEST%\inc\offuh\com\sun\star\io
+mkdir: %_DEST%\inc\offuh\com\sun\star\java
+mkdir: %_DEST%\inc\offuh\com\sun\star\lang
+mkdir: %_DEST%\inc\offuh\com\sun\star\linguistic2
+mkdir: %_DEST%\inc\offuh\com\sun\star\logging
+mkdir: %_DEST%\inc\offuh\com\sun\star\oooimprovement
+mkdir: %_DEST%\inc\offuh\com\sun\star\office
+mkdir: %_DEST%\inc\offuh\com\sun\star\mail
+mkdir: %_DEST%\inc\offuh\com\sun\star\media
+mkdir: %_DEST%\inc\offuh\com\sun\star\packages
+mkdir: %_DEST%\inc\offuh\com\sun\star\packages\manifest
+mkdir: %_DEST%\inc\offuh\com\sun\star\packages\zip
+mkdir: %_DEST%\inc\offuh\com\sun\star\presentation
+mkdir: %_DEST%\inc\offuh\com\sun\star\animations
+mkdir: %_DEST%\inc\offuh\com\sun\star\reflection
+mkdir: %_DEST%\inc\offuh\com\sun\star\registry
+mkdir: %_DEST%\inc\offuh\com\sun\star\report
+mkdir: %_DEST%\inc\offuh\com\sun\star\report\inspection
+mkdir: %_DEST%\inc\offuh\com\sun\star\report\meta
+mkdir: %_DEST%\inc\offuh\com\sun\star\resource
+mkdir: %_DEST%\inc\offuh\com\sun\star\sdb
+mkdir: %_DEST%\inc\offuh\com\sun\star\sdb\tools
+mkdir: %_DEST%\inc\offuh\com\sun\star\sdb\application
+mkdir: %_DEST%\inc\offuh\com\sun\star\sdbc
+mkdir: %_DEST%\inc\offuh\com\sun\star\sdbcx
+mkdir: %_DEST%\inc\offuh\com\sun\star\scanner
+mkdir: %_DEST%\inc\offuh\com\sun\star\script
+mkdir: %_DEST%\inc\offuh\com\sun\star\script\vba
+mkdir: %_DEST%\inc\offuh\com\sun\star\sheet
+mkdir: %_DEST%\inc\offuh\com\sun\star\smarttags
+mkdir: %_DEST%\inc\offuh\com\sun\star\style
+mkdir: %_DEST%\inc\offuh\com\sun\star\svg
+mkdir: %_DEST%\inc\offuh\com\sun\star\sync2
+mkdir: %_DEST%\inc\offuh\com\sun\star\system
+mkdir: %_DEST%\inc\offuh\com\sun\star\table
+mkdir: %_DEST%\inc\offuh\com\sun\star\telephony
+mkdir: %_DEST%\inc\offuh\com\sun\star\telephony\DIALER
+mkdir: %_DEST%\inc\offuh\com\sun\star\text
+mkdir: %_DEST%\inc\offuh\com\sun\star\xsd
+mkdir: %_DEST%\inc\offuh\com\sun\star\inspection
+mkdir: %_DEST%\inc\offuh\com\sun\star\ui
+mkdir: %_DEST%\inc\offuh\com\sun\star\ui\dialogs
+mkdir: %_DEST%\inc\offuh\com\sun\star\uno
+mkdir: %_DEST%\inc\offuh\com\sun\star\uri
+mkdir: %_DEST%\inc\offuh\com\sun\star\util
+mkdir: %_DEST%\inc\offuh\com\sun\star\util\logging
+mkdir: %_DEST%\inc\offuh\com\sun\star\view
+mkdir: %_DEST%\inc\offuh\com\sun\star\linguistic2
+mkdir: %_DEST%\inc\offuh\com\sun\star\xml
+mkdir: %_DEST%\inc\offuh\com\sun\star\xml\input
+mkdir: %_DEST%\inc\offuh\com\sun\star\xml\sax
+mkdir: %_DEST%\inc\offuh\com\sun\star\xml\dom
+mkdir: %_DEST%\inc\offuh\com\sun\star\xml\xpath
+mkdir: %_DEST%\inc\offuh\com\sun\star\xml\dom\events
+mkdir: %_DEST%\inc\offuh\com\sun\star\xml\dom\views
+mkdir: %_DEST%\inc\offuh\com\sun\star\loader
+mkdir: %_DEST%\inc\offuh\com\sun\star\task
+mkdir: %_DEST%\inc\offuh\com\sun\star\ucb
+mkdir: %_DEST%\inc\offuh\com\sun\star\plugin
+mkdir: %_DEST%\inc\offuh\com\sun\star\setup
+mkdir: %_DEST%\inc\offuh\com\sun\star\portal
+mkdir: %_DEST%\inc\offuh\com\sun\star\portal\client
+mkdir: %_DEST%\inc\offuh\com\sun\star\portal\daemons
+mkdir: %_DEST%\inc\offuh\com\sun\star\portal\daemons\sadmind
+mkdir: %_DEST%\inc\offuh\com\sun\star\portal\daemons\sofficed
+mkdir: %_DEST%\inc\offuh\com\sun\star\portal\system
+mkdir: %_DEST%\inc\offuh\com\sun\star\mozilla
+mkdir: %_DEST%\inc\offuh\com\sun\star\ldap
 
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com\sun
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star
+mkdir: %_DEST%\inc\offuh\drafts\com
+mkdir: %_DEST%\inc\offuh\drafts\com\sun
+mkdir: %_DEST%\inc\offuh\drafts\com\sun\star
 
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\i18n
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\ui
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\form
-mkdir: %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\script
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\script\browse
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\script\provider
+mkdir: %_DEST%\inc\offuh\drafts\com\sun\star\i18n
+mkdir: %_DEST%\inc\offuh\drafts\com\sun\star\ui
+mkdir: %_DEST%\inc\offuh\drafts\com\sun\star\form
+mkdir: %_DEST%\inc\offuh\drafts\com\sun\star\script
+mkdir: %_DEST%\inc\offuh\com\sun\star\script\browse
+mkdir: %_DEST%\inc\offuh\com\sun\star\script\provider
 #i20156 - add xmlsecurity module related
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\security
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\crypto
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\crypto\sax
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\csax
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\wrapper
+mkdir: %_DEST%\inc\offuh\com\sun\star\security
+mkdir: %_DEST%\inc\offuh\com\sun\star\xml
+mkdir: %_DEST%\inc\offuh\com\sun\star\xml\crypto
+mkdir: %_DEST%\inc\offuh\com\sun\star\xml\crypto\sax
+mkdir: %_DEST%\inc\offuh\com\sun\star\xml\csax
+mkdir: %_DEST%\inc\offuh\com\sun\star\xml\wrapper
 #i20156 - end
-mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf
+mkdir: %_DEST%\inc\offuh\com\sun\star\rdf
 
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\access
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\adodb
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\dao
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\excel
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\msforms
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\office
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\powerpoint
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\stdole
-mkdir: %_DEST%\inc%_EXT%\offuh\ooo\vba\word
-mkdir: %_DEST%\inc%_EXT%\offuh\msforms
+mkdir: %_DEST%\inc\offuh\ooo
+mkdir: %_DEST%\inc\offuh\ooo\vba
+mkdir: %_DEST%\inc\offuh\ooo\vba\access
+mkdir: %_DEST%\inc\offuh\ooo\vba\adodb
+mkdir: %_DEST%\inc\offuh\ooo\vba\dao
+mkdir: %_DEST%\inc\offuh\ooo\vba\excel
+mkdir: %_DEST%\inc\offuh\ooo\vba\msforms
+mkdir: %_DEST%\inc\offuh\ooo\vba\office
+mkdir: %_DEST%\inc\offuh\ooo\vba\powerpoint
+mkdir: %_DEST%\inc\offuh\ooo\vba\stdole
+mkdir: %_DEST%\inc\offuh\ooo\vba\word
+mkdir: %_DEST%\inc\offuh\msforms
 
 
 
-..\%__SRC%\inc\offuh\com\sun\star\auth\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\auth\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\auth\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\auth\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\accessibility\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\accessibility\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\accessibility\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\accessibility\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\awt\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\awt\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\awt\tree\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tree\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\awt\tree\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tree\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\awt\grid\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\grid\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\awt\grid\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\grid\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\awt\tab\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tab\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\awt\tab\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\awt\tab\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\beans\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\beans\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\beans\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\beans\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\bridge\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\bridge\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\bridge\oleautomation\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\oleautomation\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\bridge\oleautomation\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\bridge\oleautomation\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\chart\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\chart\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\chart\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\chart\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\chart2\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\chart2\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\chart2\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\chart2\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\chart2\data\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\chart2\data\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\chart2\data\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\chart2\data\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\configuration\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\configuration\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\configuration\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\configuration\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\configuration\backend\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\configuration\backend\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\configuration\backend\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\configuration\backend\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\container\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\container\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\container\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\container\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\connection\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\connection\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\connection\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\connection\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\data\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\data\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\data\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\data\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\deployment\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\deployment\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\deployment\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\deployment\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\deployment\ui\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\deployment\ui\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\deployment\ui\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\deployment\ui\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\datatransfer\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\datatransfer\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\datatransfer\clipboard\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\clipboard\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\datatransfer\clipboard\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\clipboard\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\datatransfer\dnd\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\dnd\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\datatransfer\dnd\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\datatransfer\dnd\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\daemons\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\daemons\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\daemons\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\daemons\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\document\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\document\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\document\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\document\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\drawing\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\drawing\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\drawing\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\drawing\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\drawing\framework\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\drawing\framework\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\drawing\framework\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\drawing\framework\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\geometry\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\geometry\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\geometry\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\geometry\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\rendering\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\rendering\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\rendering\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\rendering\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\embed\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\embed\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\embed\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\embed\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\form\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\form\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\form\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\form\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xforms\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xforms\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xforms\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xforms\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\form\binding\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\form\binding\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\form\binding\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\form\binding\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\form\validation\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\form\validation\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\form\validation\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\form\validation\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\form\submission\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\form\submission\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\form\submission\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\form\submission\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\form\runtime\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\form\runtime\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\form\runtime\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\form\runtime\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\form\inspection\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\form\inspection\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\form\inspection\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\form\inspection\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\formula\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\formula\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\formula\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\formula\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\frame\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\frame\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\frame\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\frame\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\frame\status\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\frame\status\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\frame\status\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\frame\status\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\gallery\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\gallery\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\gallery\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\gallery\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\graphic\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\graphic\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\graphic\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\graphic\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\i18n\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\i18n\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\i18n\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\i18n\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\installation\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\installation\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\installation\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\installation\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\io\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\io\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\io\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\io\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\java\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\java\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\java\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\java\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\lang\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\lang\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\lang\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\lang\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\logging\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\logging\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\logging\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\logging\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\office\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\office\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\office\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\office\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\oooimprovement\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\oooimprovement\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\oooimprovement\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\oooimprovement\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\mail\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\mail\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\mail\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\mail\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\media\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\media\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\media\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\media\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\packages\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\packages\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\packages\manifest\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\manifest\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\packages\manifest\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\manifest\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\packages\zip\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\zip\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\packages\zip\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\packages\zip\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\presentation\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\presentation\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\presentation\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\presentation\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\animations\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\animations\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\animations\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\animations\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\reflection\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\reflection\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\reflection\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\reflection\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\registry\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\registry\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\registry\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\registry\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\report\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\report\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\report\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\report\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\report\inspection\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\report\inspection\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\report\inspection\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\report\inspection\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\report\meta\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\report\meta\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\report\meta\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\report\meta\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\resource\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\resource\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\resource\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\resource\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sdb\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sdb\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\sdb\tools\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\tools\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sdb\tools\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\tools\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\sdb\application\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\application\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sdb\application\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sdb\application\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\sdbc\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbc\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sdbc\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbc\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\sdbcx\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbcx\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sdbcx\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sdbcx\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\scanner\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\scanner\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\scanner\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\scanner\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\script\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\script\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\script\vba\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\vba\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\script\vba\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\vba\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\sheet\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sheet\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sheet\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sheet\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\smarttags\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\smarttags\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\smarttags\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\smarttags\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\svg\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\svg\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\svg\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\svg\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\style\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\style\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\style\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\style\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\sync2\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\sync2\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\sync2\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\sync2\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\system\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\system\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\system\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\system\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\table\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\table\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\table\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\table\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\telephony\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\telephony\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\telephony\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\telephony\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\telephony\DIALER\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\telephony\DIALER\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\telephony\DIALER\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\telephony\DIALER\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\text\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\text\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\text\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\text\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xsd\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xsd\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xsd\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xsd\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\inspection\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\inspection\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\inspection\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\inspection\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\ui\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\ui\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\ui\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\ui\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\ui\dialogs\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\ui\dialogs\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\ui\dialogs\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\ui\dialogs\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\uno\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\uno\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\uno\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\uno\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\uri\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\uri\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\uri\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\uri\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\util\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\util\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\util\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\util\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\util\logging\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\util\logging\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\util\logging\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\util\logging\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\view\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\view\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\view\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\view\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\input\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\input\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\input\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\input\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\sax\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\sax\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\sax\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\sax\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\dom\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\dom\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\dom\events\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\events\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\dom\events\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\events\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\dom\views\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\views\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\dom\views\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\dom\views\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\xpath\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\xpath\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\xpath\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\xpath\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\loader\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\loader\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\loader\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\loader\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\task\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\task\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\task\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\task\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\ucb\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\ucb\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\ucb\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\ucb\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\plugin\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\plugin\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\plugin\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\plugin\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\setup\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\setup\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\setup\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\setup\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\portal\client\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\client\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\portal\client\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\client\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sadmind\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons\sadmind\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sadmind\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons\sadmind\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sofficed\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons\sofficed\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sofficed\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\daemons\sofficed\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\portal\system\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\system\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\portal\system\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\portal\system\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\mozilla\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\mozilla\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\mozilla\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\mozilla\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\ldap\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\ldap\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\ldap\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\ldap\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\auth\*.hdl %_DEST%\inc\offuh\com\sun\star\auth\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\auth\*.hpp %_DEST%\inc\offuh\com\sun\star\auth\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\accessibility\*.hpp %_DEST%\inc\offuh\com\sun\star\accessibility\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\accessibility\*.hdl %_DEST%\inc\offuh\com\sun\star\accessibility\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\awt\*.hdl %_DEST%\inc\offuh\com\sun\star\awt\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\awt\*.hpp %_DEST%\inc\offuh\com\sun\star\awt\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\awt\tree\*.hdl %_DEST%\inc\offuh\com\sun\star\awt\tree\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\awt\tree\*.hpp %_DEST%\inc\offuh\com\sun\star\awt\tree\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\awt\grid\*.hdl %_DEST%\inc\offuh\com\sun\star\awt\grid\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\awt\grid\*.hpp %_DEST%\inc\offuh\com\sun\star\awt\grid\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\awt\tab\*.hdl %_DEST%\inc\offuh\com\sun\star\awt\tab\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\awt\tab\*.hpp %_DEST%\inc\offuh\com\sun\star\awt\tab\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\beans\*.hdl %_DEST%\inc\offuh\com\sun\star\beans\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\beans\*.hpp %_DEST%\inc\offuh\com\sun\star\beans\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\bridge\*.hdl %_DEST%\inc\offuh\com\sun\star\bridge\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\bridge\*.hpp %_DEST%\inc\offuh\com\sun\star\bridge\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\bridge\oleautomation\*.hdl %_DEST%\inc\offuh\com\sun\star\bridge\oleautomation\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\bridge\oleautomation\*.hpp %_DEST%\inc\offuh\com\sun\star\bridge\oleautomation\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\chart\*.hdl %_DEST%\inc\offuh\com\sun\star\chart\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\chart\*.hpp %_DEST%\inc\offuh\com\sun\star\chart\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\chart2\*.hpp %_DEST%\inc\offuh\com\sun\star\chart2\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\chart2\*.hdl %_DEST%\inc\offuh\com\sun\star\chart2\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\chart2\data\*.hpp %_DEST%\inc\offuh\com\sun\star\chart2\data\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\chart2\data\*.hdl %_DEST%\inc\offuh\com\sun\star\chart2\data\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\configuration\*.hdl %_DEST%\inc\offuh\com\sun\star\configuration\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\configuration\*.hpp %_DEST%\inc\offuh\com\sun\star\configuration\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\configuration\backend\*.hdl %_DEST%\inc\offuh\com\sun\star\configuration\backend\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\configuration\backend\*.hpp %_DEST%\inc\offuh\com\sun\star\configuration\backend\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\container\*.hdl %_DEST%\inc\offuh\com\sun\star\container\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\container\*.hpp %_DEST%\inc\offuh\com\sun\star\container\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\connection\*.hdl %_DEST%\inc\offuh\com\sun\star\connection\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\connection\*.hpp %_DEST%\inc\offuh\com\sun\star\connection\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\data\*.hdl %_DEST%\inc\offuh\com\sun\star\data\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\data\*.hpp %_DEST%\inc\offuh\com\sun\star\data\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\deployment\*.hpp %_DEST%\inc\offuh\com\sun\star\deployment\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\deployment\*.hdl %_DEST%\inc\offuh\com\sun\star\deployment\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\deployment\ui\*.hpp %_DEST%\inc\offuh\com\sun\star\deployment\ui\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\deployment\ui\*.hdl %_DEST%\inc\offuh\com\sun\star\deployment\ui\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\datatransfer\*.hpp %_DEST%\inc\offuh\com\sun\star\datatransfer\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\datatransfer\*.hdl %_DEST%\inc\offuh\com\sun\star\datatransfer\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\datatransfer\clipboard\*.hpp %_DEST%\inc\offuh\com\sun\star\datatransfer\clipboard\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\datatransfer\clipboard\*.hdl %_DEST%\inc\offuh\com\sun\star\datatransfer\clipboard\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\datatransfer\dnd\*.hpp %_DEST%\inc\offuh\com\sun\star\datatransfer\dnd\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\datatransfer\dnd\*.hdl %_DEST%\inc\offuh\com\sun\star\datatransfer\dnd\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\daemons\*.hdl %_DEST%\inc\offuh\com\sun\star\daemons\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\daemons\*.hpp %_DEST%\inc\offuh\com\sun\star\daemons\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\document\*.hdl %_DEST%\inc\offuh\com\sun\star\document\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\document\*.hpp %_DEST%\inc\offuh\com\sun\star\document\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\drawing\*.hdl %_DEST%\inc\offuh\com\sun\star\drawing\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\drawing\*.hpp %_DEST%\inc\offuh\com\sun\star\drawing\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\drawing\framework\*.hdl %_DEST%\inc\offuh\com\sun\star\drawing\framework\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\drawing\framework\*.hpp %_DEST%\inc\offuh\com\sun\star\drawing\framework\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\geometry\*.hdl %_DEST%\inc\offuh\com\sun\star\geometry\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\geometry\*.hpp %_DEST%\inc\offuh\com\sun\star\geometry\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\rendering\*.hdl %_DEST%\inc\offuh\com\sun\star\rendering\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\rendering\*.hpp %_DEST%\inc\offuh\com\sun\star\rendering\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\embed\*.hdl %_DEST%\inc\offuh\com\sun\star\embed\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\embed\*.hpp %_DEST%\inc\offuh\com\sun\star\embed\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\form\*.hdl %_DEST%\inc\offuh\com\sun\star\form\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\form\*.hpp %_DEST%\inc\offuh\com\sun\star\form\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xforms\*.hdl %_DEST%\inc\offuh\com\sun\star\xforms\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xforms\*.hpp %_DEST%\inc\offuh\com\sun\star\xforms\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\form\binding\*.hdl %_DEST%\inc\offuh\com\sun\star\form\binding\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\form\binding\*.hpp %_DEST%\inc\offuh\com\sun\star\form\binding\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\form\validation\*.hdl %_DEST%\inc\offuh\com\sun\star\form\validation\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\form\validation\*.hpp %_DEST%\inc\offuh\com\sun\star\form\validation\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\form\submission\*.hdl %_DEST%\inc\offuh\com\sun\star\form\submission\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\form\submission\*.hpp %_DEST%\inc\offuh\com\sun\star\form\submission\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\form\runtime\*.hdl %_DEST%\inc\offuh\com\sun\star\form\runtime\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\form\runtime\*.hpp %_DEST%\inc\offuh\com\sun\star\form\runtime\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\form\inspection\*.hdl %_DEST%\inc\offuh\com\sun\star\form\inspection\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\form\inspection\*.hpp %_DEST%\inc\offuh\com\sun\star\form\inspection\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\formula\*.hdl %_DEST%\inc\offuh\com\sun\star\formula\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\formula\*.hpp %_DEST%\inc\offuh\com\sun\star\formula\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\frame\*.hdl %_DEST%\inc\offuh\com\sun\star\frame\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\frame\*.hpp %_DEST%\inc\offuh\com\sun\star\frame\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\frame\status\*.hdl %_DEST%\inc\offuh\com\sun\star\frame\status\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\frame\status\*.hpp %_DEST%\inc\offuh\com\sun\star\frame\status\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\gallery\*.hdl %_DEST%\inc\offuh\com\sun\star\gallery\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\gallery\*.hpp %_DEST%\inc\offuh\com\sun\star\gallery\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\graphic\*.hdl %_DEST%\inc\offuh\com\sun\star\graphic\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\graphic\*.hpp %_DEST%\inc\offuh\com\sun\star\graphic\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\i18n\*.hdl %_DEST%\inc\offuh\com\sun\star\i18n\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\i18n\*.hpp %_DEST%\inc\offuh\com\sun\star\i18n\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\installation\*.hdl %_DEST%\inc\offuh\com\sun\star\installation\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\installation\*.hpp %_DEST%\inc\offuh\com\sun\star\installation\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\io\*.hdl %_DEST%\inc\offuh\com\sun\star\io\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\io\*.hpp %_DEST%\inc\offuh\com\sun\star\io\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\java\*.hdl %_DEST%\inc\offuh\com\sun\star\java\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\java\*.hpp %_DEST%\inc\offuh\com\sun\star\java\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\lang\*.hdl %_DEST%\inc\offuh\com\sun\star\lang\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\lang\*.hpp %_DEST%\inc\offuh\com\sun\star\lang\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hdl %_DEST%\inc\offuh\com\sun\star\linguistic2\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hpp %_DEST%\inc\offuh\com\sun\star\linguistic2\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\logging\*.hdl %_DEST%\inc\offuh\com\sun\star\logging\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\logging\*.hpp %_DEST%\inc\offuh\com\sun\star\logging\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\office\*.hpp %_DEST%\inc\offuh\com\sun\star\office\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\office\*.hdl %_DEST%\inc\offuh\com\sun\star\office\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\oooimprovement\*.hdl %_DEST%\inc\offuh\com\sun\star\oooimprovement\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\oooimprovement\*.hpp %_DEST%\inc\offuh\com\sun\star\oooimprovement\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\mail\*.hpp %_DEST%\inc\offuh\com\sun\star\mail\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\mail\*.hdl %_DEST%\inc\offuh\com\sun\star\mail\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\media\*.hdl %_DEST%\inc\offuh\com\sun\star\media\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\media\*.hpp %_DEST%\inc\offuh\com\sun\star\media\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\packages\*.hdl %_DEST%\inc\offuh\com\sun\star\packages\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\packages\*.hpp %_DEST%\inc\offuh\com\sun\star\packages\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\packages\manifest\*.hdl %_DEST%\inc\offuh\com\sun\star\packages\manifest\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\packages\manifest\*.hpp %_DEST%\inc\offuh\com\sun\star\packages\manifest\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\packages\zip\*.hdl %_DEST%\inc\offuh\com\sun\star\packages\zip\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\packages\zip\*.hpp %_DEST%\inc\offuh\com\sun\star\packages\zip\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\presentation\*.hdl %_DEST%\inc\offuh\com\sun\star\presentation\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\presentation\*.hpp %_DEST%\inc\offuh\com\sun\star\presentation\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\animations\*.hdl %_DEST%\inc\offuh\com\sun\star\animations\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\animations\*.hpp %_DEST%\inc\offuh\com\sun\star\animations\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\reflection\*.hdl %_DEST%\inc\offuh\com\sun\star\reflection\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\reflection\*.hpp %_DEST%\inc\offuh\com\sun\star\reflection\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\registry\*.hpp %_DEST%\inc\offuh\com\sun\star\registry\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\registry\*.hdl %_DEST%\inc\offuh\com\sun\star\registry\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\report\*.hpp %_DEST%\inc\offuh\com\sun\star\report\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\report\*.hdl %_DEST%\inc\offuh\com\sun\star\report\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\report\inspection\*.hpp %_DEST%\inc\offuh\com\sun\star\report\inspection\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\report\inspection\*.hdl %_DEST%\inc\offuh\com\sun\star\report\inspection\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\report\meta\*.hpp %_DEST%\inc\offuh\com\sun\star\report\meta\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\report\meta\*.hdl %_DEST%\inc\offuh\com\sun\star\report\meta\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\resource\*.hpp %_DEST%\inc\offuh\com\sun\star\resource\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\resource\*.hdl %_DEST%\inc\offuh\com\sun\star\resource\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\sdb\*.hdl %_DEST%\inc\offuh\com\sun\star\sdb\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\sdb\*.hpp %_DEST%\inc\offuh\com\sun\star\sdb\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\sdb\tools\*.hdl %_DEST%\inc\offuh\com\sun\star\sdb\tools\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\sdb\tools\*.hpp %_DEST%\inc\offuh\com\sun\star\sdb\tools\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\sdb\application\*.hdl %_DEST%\inc\offuh\com\sun\star\sdb\application\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\sdb\application\*.hpp %_DEST%\inc\offuh\com\sun\star\sdb\application\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\sdbc\*.hdl %_DEST%\inc\offuh\com\sun\star\sdbc\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\sdbc\*.hpp %_DEST%\inc\offuh\com\sun\star\sdbc\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\sdbcx\*.hdl %_DEST%\inc\offuh\com\sun\star\sdbcx\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\sdbcx\*.hpp %_DEST%\inc\offuh\com\sun\star\sdbcx\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\scanner\*.hdl %_DEST%\inc\offuh\com\sun\star\scanner\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\scanner\*.hpp %_DEST%\inc\offuh\com\sun\star\scanner\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\script\*.hdl %_DEST%\inc\offuh\com\sun\star\script\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\script\*.hpp %_DEST%\inc\offuh\com\sun\star\script\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\script\vba\*.hdl %_DEST%\inc\offuh\com\sun\star\script\vba\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\script\vba\*.hpp %_DEST%\inc\offuh\com\sun\star\script\vba\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\sheet\*.hdl %_DEST%\inc\offuh\com\sun\star\sheet\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\sheet\*.hpp %_DEST%\inc\offuh\com\sun\star\sheet\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\smarttags\*.hdl %_DEST%\inc\offuh\com\sun\star\smarttags\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\smarttags\*.hpp %_DEST%\inc\offuh\com\sun\star\smarttags\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\svg\*.hdl %_DEST%\inc\offuh\com\sun\star\svg\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\svg\*.hpp %_DEST%\inc\offuh\com\sun\star\svg\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\style\*.hdl %_DEST%\inc\offuh\com\sun\star\style\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\style\*.hpp %_DEST%\inc\offuh\com\sun\star\style\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\sync2\*.hdl %_DEST%\inc\offuh\com\sun\star\sync2\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\sync2\*.hpp %_DEST%\inc\offuh\com\sun\star\sync2\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\system\*.hdl %_DEST%\inc\offuh\com\sun\star\system\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\system\*.hpp %_DEST%\inc\offuh\com\sun\star\system\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\table\*.hdl %_DEST%\inc\offuh\com\sun\star\table\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\table\*.hpp %_DEST%\inc\offuh\com\sun\star\table\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\telephony\*.hdl %_DEST%\inc\offuh\com\sun\star\telephony\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\telephony\*.hpp %_DEST%\inc\offuh\com\sun\star\telephony\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\telephony\DIALER\*.hdl %_DEST%\inc\offuh\com\sun\star\telephony\DIALER\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\telephony\DIALER\*.hpp %_DEST%\inc\offuh\com\sun\star\telephony\DIALER\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\text\*.hdl %_DEST%\inc\offuh\com\sun\star\text\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\text\*.hpp %_DEST%\inc\offuh\com\sun\star\text\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xsd\*.hdl %_DEST%\inc\offuh\com\sun\star\xsd\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xsd\*.hpp %_DEST%\inc\offuh\com\sun\star\xsd\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\inspection\*.hdl %_DEST%\inc\offuh\com\sun\star\inspection\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\inspection\*.hpp %_DEST%\inc\offuh\com\sun\star\inspection\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\ui\*.hdl %_DEST%\inc\offuh\com\sun\star\ui\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\ui\*.hpp %_DEST%\inc\offuh\com\sun\star\ui\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\ui\dialogs\*.hdl %_DEST%\inc\offuh\com\sun\star\ui\dialogs\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\ui\dialogs\*.hpp %_DEST%\inc\offuh\com\sun\star\ui\dialogs\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\uno\*.hdl %_DEST%\inc\offuh\com\sun\star\uno\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\uno\*.hpp %_DEST%\inc\offuh\com\sun\star\uno\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\uri\*.hdl %_DEST%\inc\offuh\com\sun\star\uri\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\uri\*.hpp %_DEST%\inc\offuh\com\sun\star\uri\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\util\*.hdl %_DEST%\inc\offuh\com\sun\star\util\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\util\*.hpp %_DEST%\inc\offuh\com\sun\star\util\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\util\logging\*.hdl %_DEST%\inc\offuh\com\sun\star\util\logging\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\util\logging\*.hpp %_DEST%\inc\offuh\com\sun\star\util\logging\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\view\*.hdl %_DEST%\inc\offuh\com\sun\star\view\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\view\*.hpp %_DEST%\inc\offuh\com\sun\star\view\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hdl %_DEST%\inc\offuh\com\sun\star\linguistic2\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hpp %_DEST%\inc\offuh\com\sun\star\linguistic2\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xml\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xml\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xml\input\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\input\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xml\input\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\input\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xml\sax\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\sax\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xml\sax\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\sax\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xml\dom\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\dom\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xml\dom\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\dom\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xml\dom\events\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\dom\events\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xml\dom\events\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\dom\events\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xml\dom\views\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\dom\views\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xml\dom\views\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\dom\views\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xml\xpath\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\xpath\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xml\xpath\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\xpath\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\loader\*.hdl %_DEST%\inc\offuh\com\sun\star\loader\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\loader\*.hpp %_DEST%\inc\offuh\com\sun\star\loader\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\task\*.hdl %_DEST%\inc\offuh\com\sun\star\task\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\task\*.hpp %_DEST%\inc\offuh\com\sun\star\task\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\ucb\*.hpp %_DEST%\inc\offuh\com\sun\star\ucb\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\ucb\*.hdl %_DEST%\inc\offuh\com\sun\star\ucb\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\plugin\*.hpp %_DEST%\inc\offuh\com\sun\star\plugin\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\plugin\*.hdl %_DEST%\inc\offuh\com\sun\star\plugin\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\setup\*.hpp %_DEST%\inc\offuh\com\sun\star\setup\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\setup\*.hdl %_DEST%\inc\offuh\com\sun\star\setup\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\portal\client\*.hpp %_DEST%\inc\offuh\com\sun\star\portal\client\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\portal\client\*.hdl %_DEST%\inc\offuh\com\sun\star\portal\client\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sadmind\*.hpp %_DEST%\inc\offuh\com\sun\star\portal\daemons\sadmind\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sadmind\*.hdl %_DEST%\inc\offuh\com\sun\star\portal\daemons\sadmind\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sofficed\*.hpp %_DEST%\inc\offuh\com\sun\star\portal\daemons\sofficed\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\portal\daemons\sofficed\*.hdl %_DEST%\inc\offuh\com\sun\star\portal\daemons\sofficed\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\portal\system\*.hpp %_DEST%\inc\offuh\com\sun\star\portal\system\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\portal\system\*.hdl %_DEST%\inc\offuh\com\sun\star\portal\system\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\mozilla\*.hpp %_DEST%\inc\offuh\com\sun\star\mozilla\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\mozilla\*.hdl %_DEST%\inc\offuh\com\sun\star\mozilla\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\ldap\*.hpp %_DEST%\inc\offuh\com\sun\star\ldap\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\ldap\*.hdl %_DEST%\inc\offuh\com\sun\star\ldap\*.hdl
 
-..\%__SRC%\inc\offuh\drafts\com\sun\star\i18n\*.hpp %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\i18n\*.hpp
-..\%__SRC%\inc\offuh\drafts\com\sun\star\i18n\*.hdl %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\i18n\*.hdl
+..\%__SRC%\inc\offuh\drafts\com\sun\star\i18n\*.hpp %_DEST%\inc\offuh\drafts\com\sun\star\i18n\*.hpp
+..\%__SRC%\inc\offuh\drafts\com\sun\star\i18n\*.hdl %_DEST%\inc\offuh\drafts\com\sun\star\i18n\*.hdl
 
-..\%__SRC%\inc\offuh\com\sun\star\script\browse\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\browse\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\script\browse\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\browse\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\script\provider\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\provider\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\script\provider\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\provider\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\script\browse\*.hpp %_DEST%\inc\offuh\com\sun\star\script\browse\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\script\browse\*.hdl %_DEST%\inc\offuh\com\sun\star\script\browse\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\script\provider\*.hpp %_DEST%\inc\offuh\com\sun\star\script\provider\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\script\provider\*.hdl %_DEST%\inc\offuh\com\sun\star\script\provider\*.hdl
 
-..\%__SRC%\inc\offuh\drafts\com\sun\star\form\*.hpp %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\form\*.hpp
-..\%__SRC%\inc\offuh\drafts\com\sun\star\form\*.hdl %_DEST%\inc%_EXT%\offuh\drafts\com\sun\star\form\*.hdl
+..\%__SRC%\inc\offuh\drafts\com\sun\star\form\*.hpp %_DEST%\inc\offuh\drafts\com\sun\star\form\*.hpp
+..\%__SRC%\inc\offuh\drafts\com\sun\star\form\*.hdl %_DEST%\inc\offuh\drafts\com\sun\star\form\*.hdl
 
 #i20156 - add xmlsecurity module related
-..\%__SRC%\inc\offuh\com\sun\star\security\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\security\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\security\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\security\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\crypto\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\crypto\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\sax\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\crypto\sax\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\sax\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\crypto\sax\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\csax\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\csax\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\csax\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\csax\*.hdl
-..\%__SRC%\inc\offuh\com\sun\star\xml\wrapper\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\wrapper\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\xml\wrapper\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\xml\wrapper\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\security\*.hpp %_DEST%\inc\offuh\com\sun\star\security\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\security\*.hdl %_DEST%\inc\offuh\com\sun\star\security\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\crypto\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\crypto\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\sax\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\crypto\sax\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xml\crypto\sax\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\crypto\sax\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xml\csax\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\csax\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xml\csax\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\csax\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\xml\wrapper\*.hpp %_DEST%\inc\offuh\com\sun\star\xml\wrapper\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\xml\wrapper\*.hdl %_DEST%\inc\offuh\com\sun\star\xml\wrapper\*.hdl
 #i20156 - end
 
-..\%__SRC%\inc\offuh\com\sun\star\rdf\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\rdf\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\rdf\*.hpp %_DEST%\inc\offuh\com\sun\star\rdf\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\rdf\*.hdl %_DEST%\inc\offuh\com\sun\star\rdf\*.hdl
 
-..\%__SRC%\inc\offuh\ooo\vba\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\access\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\access\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\access\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\access\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\adodb\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\adodb\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\adodb\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\adodb\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\dao\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\dao\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\dao\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\dao\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\excel\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\excel\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\excel\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\excel\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\msforms\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\msforms\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\msforms\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\msforms\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\office\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\office\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\office\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\office\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\powerpoint\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\powerpoint\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\powerpoint\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\powerpoint\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\stdole\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\stdole\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\stdole\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\stdole\*.hdl
-..\%__SRC%\inc\offuh\ooo\vba\word\*.hpp %_DEST%\inc%_EXT%\offuh\ooo\vba\word\*.hpp
-..\%__SRC%\inc\offuh\ooo\vba\word\*.hdl %_DEST%\inc%_EXT%\offuh\ooo\vba\word\*.hdl
-..\%__SRC%\inc\offuh\msforms\*.hpp %_DEST%\inc%_EXT%\offuh\msforms\*.hpp
-..\%__SRC%\inc\offuh\msforms\*.hdl %_DEST%\inc%_EXT%\offuh\msforms\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\*.hpp %_DEST%\inc\offuh\ooo\vba\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\*.hdl %_DEST%\inc\offuh\ooo\vba\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\*.hpp %_DEST%\inc\offuh\ooo\vba\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\*.hdl %_DEST%\inc\offuh\ooo\vba\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\access\*.hpp %_DEST%\inc\offuh\ooo\vba\access\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\access\*.hdl %_DEST%\inc\offuh\ooo\vba\access\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\adodb\*.hpp %_DEST%\inc\offuh\ooo\vba\adodb\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\adodb\*.hdl %_DEST%\inc\offuh\ooo\vba\adodb\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\dao\*.hpp %_DEST%\inc\offuh\ooo\vba\dao\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\dao\*.hdl %_DEST%\inc\offuh\ooo\vba\dao\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\excel\*.hpp %_DEST%\inc\offuh\ooo\vba\excel\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\excel\*.hdl %_DEST%\inc\offuh\ooo\vba\excel\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\msforms\*.hpp %_DEST%\inc\offuh\ooo\vba\msforms\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\msforms\*.hdl %_DEST%\inc\offuh\ooo\vba\msforms\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\office\*.hpp %_DEST%\inc\offuh\ooo\vba\office\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\office\*.hdl %_DEST%\inc\offuh\ooo\vba\office\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\powerpoint\*.hpp %_DEST%\inc\offuh\ooo\vba\powerpoint\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\powerpoint\*.hdl %_DEST%\inc\offuh\ooo\vba\powerpoint\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\stdole\*.hpp %_DEST%\inc\offuh\ooo\vba\stdole\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\stdole\*.hdl %_DEST%\inc\offuh\ooo\vba\stdole\*.hdl
+..\%__SRC%\inc\offuh\ooo\vba\word\*.hpp %_DEST%\inc\offuh\ooo\vba\word\*.hpp
+..\%__SRC%\inc\offuh\ooo\vba\word\*.hdl %_DEST%\inc\offuh\ooo\vba\word\*.hdl
+..\%__SRC%\inc\offuh\msforms\*.hpp %_DEST%\inc\offuh\msforms\*.hpp
+..\%__SRC%\inc\offuh\msforms\*.hdl %_DEST%\inc\offuh\msforms\*.hdl
 
diff --git a/pyuno/demo/biblioaccess.py b/pyuno/demo/biblioaccess.py
index ac9cf64044ad..59d843ad6c01 100644
--- a/pyuno/demo/biblioaccess.py
+++ b/pyuno/demo/biblioaccess.py
@@ -1,35 +1,36 @@
-import uno
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 
+import uno
 from com.sun.star.sdb.CommandType import COMMAND
 
 def main():
-
     connectionString = "socket,host=localhost,port=2002"
-    
-    url = "uno:"+connectionString + ";urp;StarOffice.ComponentContext"
-    
+
+    url = "uno:" + connectionString + ";urp;StarOffice.ComponentContext"
+
     localCtx = uno.getComponentContext()
     localSmgr = localCtx.ServiceManager
     resolver = localSmgr.createInstanceWithContext(
         "com.sun.star.bridge.UnoUrlResolver", localCtx)
-    ctx = resolver.resolve( url )
+    ctx = resolver.resolve(url)
     smgr = ctx.ServiceManager
 
-    rowset =smgr.createInstanceWithContext( "com.sun.star.sdb.RowSet", ctx )
+    rowset =smgr.createInstanceWithContext("com.sun.star.sdb.RowSet", ctx)
     rowset.DataSourceName = "Bibliography"
     rowset.CommandType = COMMAND
     rowset.Command = "SELECT IDENTIFIER, AUTHOR FROM biblio"
 
     rowset.execute();
 
-    print "Identifier\tAuthor"
+    print("Identifier\tAuthor")
 
-    id = rowset.findColumn( "IDENTIFIER" )
-    author = rowset.findColumn( "AUTHOR" )
+    id = rowset.findColumn("IDENTIFIER")
+    author = rowset.findColumn("AUTHOR")
     while rowset.next():
-        print rowset.getString( id ) + "\t" + repr( rowset.getString( author ) )
-
+        print(rowset.getString(id) + "\t" + repr(rowset.getString(author)))
 
     rowset.dispose();
 
 main()
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/hello_world_comp.py b/pyuno/demo/hello_world_comp.py
index a9bc488853ec..32f40562856d 100644
--- a/pyuno/demo/hello_world_comp.py
+++ b/pyuno/demo/hello_world_comp.py
@@ -1,3 +1,5 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
 import uno
 import unohelper
 
@@ -5,36 +7,37 @@ from com.sun.star.task import XJobExecutor
 
 # implement a UNO component by deriving from the standard unohelper.Base class
 # and from the interface(s) you want to implement.
-class HelloWorldJob( unohelper.Base, XJobExecutor ):
-    def __init__( self, ctx ):
+class HelloWorldJob(unohelper.Base, XJobExecutor):
+    def __init__(self, ctx):
         # store the component context for later use
         self.ctx = ctx
-        
-    def trigger( self, args ):
+
+    def trigger(self, args):
         # note: args[0] == "HelloWorld", see below config settings
-    
+
         # retrieve the desktop object
         desktop = self.ctx.ServiceManager.createInstanceWithContext(
-            "com.sun.star.frame.Desktop", self.ctx )
-	    
+            "com.sun.star.frame.Desktop", self.ctx)
+
         # get current document model
         model = desktop.getCurrentComponent()
 
-	# access the document's text property
-	text = model.Text
+        # access the document's text property
+        text = model.Text
 
-	# create a cursor
-	cursor = text.createTextCursor()
+        # create a cursor
+        cursor = text.createTextCursor()
 
-	# insert the text into the document
-	text.insertString( cursor, "Hello World", 0 )
+        # insert the text into the document
+        text.insertString(cursor, "Hello World", 0)
 
 # pythonloader looks for a static g_ImplementationHelper variable
 g_ImplementationHelper = unohelper.ImplementationHelper()
 
-# 
 g_ImplementationHelper.addImplementation( \
-	HelloWorldJob,                        # UNO object class
-	"org.openoffice.comp.pyuno.demo.HelloWorld", # implemenation name 
-	("com.sun.star.task.Job",),)          # list of implemented services
-	                                      # (the only service)
+    HelloWorldJob,                               # UNO object class
+    "org.openoffice.comp.pyuno.demo.HelloWorld", # implemenation name
+    ("com.sun.star.task.Job",),)                 # list of implemented services
+                                                 # (the only service)
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/makefile.mk b/pyuno/demo/makefile.mk
index f328ac5a6ddc..e369c8c06905 100644
--- a/pyuno/demo/makefile.mk
+++ b/pyuno/demo/makefile.mk
@@ -6,27 +6,25 @@ PRJ=..
 
 ROOT=$(MISC)$/pyuno-doc
 
-
 FILES=\
-    $(ROOT)$/python-bridge.html 		\
-    $(ROOT)$/customized_setup.png 		\
-    $(ROOT)$/mode_component.png 		\
-    $(ROOT)$/mode_ipc.png			\
-    $(ROOT)$/modes.sxd			\
-    $(ROOT)$/optional_components.png       	\
-    $(ROOT)$/samples$/swriter.py		\
-    $(ROOT)$/samples$/swritercomp.py	\
-    $(ROOT)$/samples$/ooextract.py		\
-    $(ROOT)$/samples$/biblioaccess.py	\
-    $(ROOT)$/samples$/swritercompclient.py	\
-    $(ROOT)$/samples$/hello_world_pyuno.zip	
-
-
-
-$(MISC)$/pyuno-doc.zip : dirs $(FILES) 
+    $(ROOT)$/python-bridge.html \
+    $(ROOT)$/customized_setup.png \
+    $(ROOT)$/mode_component.png \
+    $(ROOT)$/mode_ipc.png \
+    $(ROOT)$/modes.sxd \
+    $(ROOT)$/optional_components.png \
+    $(ROOT)$/samples$/swriter.py \
+    $(ROOT)$/samples$/swritercomp.py \
+    $(ROOT)$/samples$/ooextract.py \
+    $(ROOT)$/samples$/biblioaccess.py \
+    $(ROOT)$/samples$/swritercompclient.py \
+    $(ROOT)$/samples$/hello_world_pyuno.zip
+
+
+$(MISC)$/pyuno-doc.zip : dirs $(FILES)
     -rm -f $@
     cd $(MISC) && zip -r pyuno-doc.zip pyuno-doc
-dirs .PHONY : 
+dirs .PHONY :
     -mkdir $(ROOT)
     -mkdir $(ROOT)$/samples
 
@@ -42,188 +40,3 @@ $(ROOT)$/samples$/% : %
 $(ROOT)$/% : ..$/doc$/%
     -rm -f $@
     cat $? > $@
-
-#VERSION=0.9.4
-#PYDIRNAME=python-$(PYVERSION)
-#.IF "$(GUI)"=="WNT"
-#INISUFFIX=.ini
-#BATCHSUFFIX=.bat
-#ENVSUFFIX=.bat
-#PLATFORM=win32
-#EXESUFFIX=.exe
-#PACKSUFFIX=.zip
-#MYCOPY=copy
-#DOLLAR_SIGN=$$
-#.ELSE
-#DOLLAR_SIGN=\$$
-#PACKSUFFIX=.tar.gz
-#MYCOPY=cp
-#BATCHSUFFIX=.sh
-#ENVSUFFIX=.tcsh
-#INISUFFIX=rc
-#PYUNOMODULE=$(DESTROOT)$/program$/pyuno$(DLLPOST)
-#PYTHONLIBRARY=$(DESTROOT)$/program$/$(DLLPRE)python$(DLLPOST).$(PYVERSION)
-#PYRUNTIMELINK=$(DESTROOT)$/program$/python
-#PYRUNTIMELIBLINK1=$(DESTROOT)$/program$/libpython.so.2
-#PYRUNTIMELIBLINK2=$(DESTROOT)$/program$/libpython.so
-#
-#.IF "$(OS)$(CPU)"=="SOLARISS"
-#PLATFORM=solaris-sparc
-#.ELIF "$(OS)$(CPU)"=="SOLARISI"
-#PLATFORM=solaris-x86
-#.ELIF "$(OS)$(CPU)"=="LINUXI"
-#PLATFORM=linux-x86
-#.ELIF "$(OS)$(CPU)"=="LINUXP"
-#PLATFORM=linux-ppc
-#.ELSE
-#error please add your platform
-#.ENDIF
-#
-#.ENDIF
-#
-#DESTROOT=$(BIN)$/root
-#
-#FINDDIRS=$(subst,/,$/ $(shell +cd $(SOLARLIBDIR)$/python && $(FIND) . -type d))
-#FINDLIBFILES=$(subst,/,$/ $(shell +cd $(SOLARLIBDIR)$/python && $(FIND) . -type f))
-#
-#PYRUNTIME_DIRS=\
-#	$(DESTROOT)				\
-#	$(DESTROOT)$/program			\
-#	$(DESTROOT)$/program/pydemo		\
-#	$(DESTROOT)$/program$/$(PYDIRNAME) 	\
-#	$(DESTROOT)$/program$/$(PYDIRNAME)$/bin 	\
-#	$(DESTROOT)$/program$/$(PYDIRNAME)$/lib 	\
-#	$(foreach,i,$(FINDDIRS) $(DESTROOT)$/program$/$(PYDIRNAME)$/lib$/$(i))
-#
-#
-#FILES=\
-#	$(DESTROOT)$/program$/$(DLLPRE)pyuno$(DLLPOST) 		\
-#	$(DESTROOT)$/program$/pythonloader.uno$(DLLPOST)	\
-#	$(DESTROOT)$/program$/pyuno$(INISUFFIX)			\
-#	$(DESTROOT)$/program$/uno.py				\
-#	$(DESTROOT)$/program$/unohelper.py			\
-#	$(DESTROOT)$/program$/pythonloader.py			\
-#	$(DESTROOT)$/program$/pyuno_setup$(BATCHSUFFIX)		\
-#	$(DESTROOT)$/program$/regcomp$(EXESUFFIX)		\
-#	$(DESTROOT)$/program$/pyunoenv$(ENVSUFFIX)		\
-#	$(DESTROOT)$/program$/pydemo$/biblioaccess.py		\
-#	$(DESTROOT)$/program$/pydemo$/ooextract.py		\
-#	$(DESTROOT)$/program$/pydemo$/swriter.py		\
-#	$(DESTROOT)$/program$/pydemo$/swritercomp.py		\
-#	$(DESTROOT)$/program$/pydemo$/swritercompclient.py	\
-#	$(DESTROOT)$/program$/pydemo$/swritercompclient.py	\
-#	$(DESTROOT)$/program$/pydemo$/python-bridge.html	\
-#	$(PYUNOMODULE)						\
-#	$(PYTHONLIBRARY)					\
-#	$(DESTROOT)$/program$/$(PYDIRNAME)$/bin$/python$(EXESUFFIX)	\
-#	$(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/program$/$(PYDIRNAME)$/lib$/$(i)) \
-#	$(PYRUNTIMELINK)					\
-#	$(PYRUNTIMELIBLINK1)					\
-#	$(PYRUNTIMELIBLINK2)
-#
-#
-#
-#$(BIN)$/pyuno-$(PLATFORM)-$(PYVERSION)$(PACKSUFFIX) : makefile.mk dirs $(FILES)
-#	-rm $@
-#.IF "$(GUI)"=="WNT"
-#	+cd $(DESTROOT) && zip -r ..$/pyuno-$(PLATFORM)-$(VERSION)$(PACKSUFFIX) program
-#.ELSE
-#	$(FIND) $(DESTROOT) -name '*.so' | xargs strip
-#	cd $(DESTROOT) && tar -cO program | gzip - > ..$/pyuno-$(PLATFORM)-$(VERSION)$(PACKSUFFIX)
-#.ENDIF
-#
-#
-#dirs .PHONY:
-#	-mkdir $(PYRUNTIME_DIRS) 
-#
-## Some symbolic links for unix  
-#.IF "$(GUI)" == "UNX"
-#$(PYRUNTIMELINK) : makefile.mk
-#	-rm -f $@
-#	cd $(DESTROOT)$/program && ln -s $(PYDIRNAME) python
-#
-#$(PYRUNTIMELIBLINK1) : makefile.mk
-#	-rm -f $@
-#	cd $(DESTROOT)$/program && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST).$(PYMAJOR)
-#
-#$(PYRUNTIMELIBLINK2) : makefile.mk
-#	-rm -f $@
-#	cd $(DESTROOT)$/program && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST)
-#.ENDIF
-#
-#$(DESTROOT)$/program$/regcomp$(EXESUFFIX) : $(SOLARBINDIR)$/regcomp$(EXESUFFIX)
-#	cp $? $@
-#.IF "$(GUI)" == "UNX"
-#	strip $@
-#	chmod +x $@
-#.ENDIF
-#
-#
-#$(DESTROOT)$/program$/pyunoenv$(ENVSUFFIX) : pyunoenv$(ENVSUFFIX)
-#	-rm -f $@
-#	cat $? > $@
-#
-#$(DESTROOT)$/program$/$(DLLPRE)pyuno$(DLLPOST) : $(DLLDEST)$/$(DLLPRE)pyuno$(DLLPOST)
-#	cp $? $@
-#
-#$(DESTROOT)$/program$/pyuno_setup$(BATCHSUFFIX) : makefile.mk
-#	-rm -f $@
-#.IF "$(GUI)"!="WNT"
-#	echo #\!/bin/sh >> $@
-#	chmod +x $@
-#.ENDIF
-#	echo regcomp -register -r services.rdb -c pythonloader.uno >>$@
-##	echo "$(MYCOPY) applicat.rdb pydemo$/applicat.rdb" >> $@
-#	echo regcomp -register -br types.rdb -br services.rdb -r services.rdb -c vnd.openoffice.pymodule:swritercomp -l com.sun.star.loader.Python >>$@
-#
-#$(DESTROOT)$/program$/$(DLLPRE)python$(DLLPOST).$(PYVERSION) : $(SOLARLIBDIR)$/$(DLLPRE)python$(DLLPOST).$(PYVERSION)
-#	cp $? $@
-#
-#$(DESTROOT)$/program$/pythonloader.uno$(DLLPOST) : $(DLLDEST)$/pythonloader.uno$(DLLPOST)
-#	cp $? $@
-#
-#$(DESTROOT)$/program$/%.py : $(DLLDEST)$/%.py
-#	cp $? $@
-#
-#.IF "$(GUI)" == "UNX"
-#$(DESTROOT)$/program$/pyuno$(DLLPOST) : $(DLLDEST)$/pyuno$(DLLPOST)
-#	cp $? $@
-#.ENDIF
-#
-#$(DESTROOT)$/program$/pydemo$/%.py : %.py
-#	-rm -f $@
-#	cat $? > $@
-#
-#$(DESTROOT)$/program$/pyuno$(INISUFFIX) : makefile.mk
-#	-rm -f $@ $(DESTROOT)$/program$/pyuno.tmp
-#	echo UNO_TYPES=$(DOLLAR_SIGN)PYUNOLIBDIR/types.rdb > $(DESTROOT)$/program$/pyuno.tmp
-#	echo UNO_SERVICES=$(DOLLAR_SIGN)PYUNOLIBDIR/services.rdb >> $(DESTROOT)$/program$/pyuno.tmp
-#	mv $(DESTROOT)$/program$/pyuno.tmp $@
-#
-#$(DESTROOT)$/program$/pydemo$/python-bridge.html : ..$/doc$/python-bridge.html
-#	-rm -f $@
-#	cat $? > $@
-#
-#
-# $(DESTROOT)$/program$/$(PYDIRNAME)$/lib$/%.so : $(SOLARLIBDIR)$/python$/%.so
-# 	-rm -f $@
-# 	cat $? > $@
-# 	strip $@
-#
-#$(DESTROOT)$/program$/$(PYDIRNAME)$/lib$/% : $(SOLARLIBDIR)$/python$/%
-#	-rm -f $@
-#	cat $? > $@
-#
-#
-#$(DESTROOT)$/program$/$(PYDIRNAME)$/bin$/python$(EXESUFFIX) : $(SOLARBINDIR)$/python$(EXESUFFIX)
-#	-rm -f $@
-#	cat $? > $@
-#.IF "$(GUI)" == "UNX"
-#	strip $@
-#	chmod +x $@
-#.ENDIF
-#
-#
-#
-#
-#
\ No newline at end of file
diff --git a/pyuno/demo/ooextract.py b/pyuno/demo/ooextract.py
index 057fa04964eb..74e072feef5d 100644
--- a/pyuno/demo/ooextract.py
+++ b/pyuno/demo/ooextract.py
@@ -1,3 +1,5 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
 import getopt,sys
 import uno
 from unohelper import Base,systemPathToFileUrl, absolutize
@@ -8,26 +10,25 @@ from com.sun.star.beans.PropertyState import DIRECT_VALUE
 from com.sun.star.uno import Exception as UnoException
 from com.sun.star.io import IOException,XInputStream, XOutputStream
 
-class OutputStream( Base, XOutputStream ):
-      def __init__( self ):
-	  self.closed = 0
-	  
-      def closeOutput(self):
-	  self.closed = 1
+class OutputStream(Base, XOutputStream):
+    def __init__(self):
+        self.closed = 0
+
+    def closeOutput(self):
+        self.closed = 1
 
-      def writeBytes( self, seq ):
-	  sys.stdout.write( seq.value )
+    def writeBytes(self, seq):
+        sys.stdout.write(seq.value)
 
-      def flush( self ):
-	  pass
-      
+    def flush(self):
+        pass
 
 def main():
     retVal = 0
     doc = None
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "hc:",["help", "connection-string=" , "html"])
+        opts, args = getopt.getopt(sys.argv[1:], "hc:", ["help", "connection-string=", "html"])
         format = None
         url = "uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext"
         filterName = "Text (Encoded)"
@@ -35,61 +36,61 @@ def main():
             if o in ("-h", "--help"):
                 usage()
                 sys.exit()
-            if o in ("-c", "--connection-string" ):
+            if o in ("-c", "--connection-string"):
                 url = "uno:" + a + ";urp;StarOffice.ComponentContext"
             if o == "--html":
                 filterName = "HTML (StarWriter)"
-            
-        print filterName
-        if not len( args ):
+
+        print(filterName)
+        if not len(args):
               usage()
               sys.exit()
-              
+
         ctxLocal = uno.getComponentContext()
         smgrLocal = ctxLocal.ServiceManager
 
         resolver = smgrLocal.createInstanceWithContext(
-                 "com.sun.star.bridge.UnoUrlResolver", ctxLocal )
-        ctx = resolver.resolve( url )
+                 "com.sun.star.bridge.UnoUrlResolver", ctxLocal)
+        ctx = resolver.resolve(url)
         smgr = ctx.ServiceManager
 
-        desktop = smgr.createInstanceWithContext("com.sun.star.frame.Desktop", ctx )
+        desktop = smgr.createInstanceWithContext("com.sun.star.frame.Desktop", ctx)
 
-        cwd = systemPathToFileUrl( getcwd() )
+        cwd = systemPathToFileUrl(getcwd())
         outProps = (
-            PropertyValue( "FilterName" , 0, filterName , 0 ),
-            PropertyValue( "OutputStream",0, OutputStream(),0))
-        inProps = PropertyValue( "Hidden" , 0 , True, 0 ),
+            PropertyValue("FilterName" , 0, filterName, 0),
+            PropertyValue("OutputStream", 0, OutputStream(), 0))
+        inProps = PropertyValue("Hidden", 0 , True, 0),
         for path in args:
             try:
-                fileUrl = uno.absolutize( cwd, systemPathToFileUrl(path) )
-                doc = desktop.loadComponentFromURL( fileUrl , "_blank", 0,inProps)
+                fileUrl = uno.absolutize(cwd, systemPathToFileUrl(path))
+                doc = desktop.loadComponentFromURL(fileUrl , "_blank", 0, inProps)
 
                 if not doc:
-                    raise UnoException( "Couldn't open stream for unknown reason", None )
+                    raise UnoException("Could not open stream for unknown reason", None)
 
-                doc.storeToURL("private:stream",outProps)
-            except IOException, e:
-                sys.stderr.write( "Error during conversion: " + e.Message + "\n" )
+                doc.storeToURL("private:stream", outProps)
+            except IOException as e:
+                sys.stderr.write("Error during conversion: " + e.Message + "\n")
                 retVal = 1
-            except UnoException, e:
-                sys.stderr.write( "Error ("+repr(e.__class__)+") during conversion:" + e.Message + "\n" )
+            except UnoException as e:
+                sys.stderr.write("Error (" + repr(e.__class__) + ") during conversion: " + e.Message + "\n")
                 retVal = 1
             if doc:
                 doc.dispose()
 
-    except UnoException, e:
-        sys.stderr.write( "Error ("+repr(e.__class__)+") :" + e.Message + "\n" )
+    except UnoException as e:
+        sys.stderr.write("Error (" + repr(e.__class__) + "): " + e.Message + "\n")
         retVal = 1
-    except getopt.GetoptError,e:
-        sys.stderr.write( str(e) + "\n" )
+    except getopt.GetoptError as e:
+        sys.stderr.write(str(e) + "\n")
         usage()
         retVal = 1
 
     sys.exit(retVal)
-    
+
 def usage():
-    sys.stderr.write( "usage: ooextract.py --help |\n"+
+    sys.stderr.write("usage: ooextract.py --help |\n"+
                   "       [-c <connection-string> | --connection-string=<connection-string>\n"+
                   "       file1 file2 ...\n"+
                   "\n" +
@@ -106,4 +107,6 @@ def usage():
                   "        Instead of the text filter, the writer html filter is used\n"
                   )
 
-main()    
+main()
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/pyunoenv.tcsh b/pyuno/demo/pyunoenv.tcsh
index 038cf2ddb45b..dbe69d0ec66c 100644
--- a/pyuno/demo/pyunoenv.tcsh
+++ b/pyuno/demo/pyunoenv.tcsh
@@ -18,13 +18,15 @@ setenv LD_LIBRARY_PATH
 endif
 
 if( "$PYTHONPATH" != "" ) then
-	setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH
+    setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH
 else
-	setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib
+    setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib
 endif
-	
+
 setenv LD_LIBRARY_PATH $OOOHOME/program:$LD_LIBRARY_PATH
 
 if( $?PYTHONHOME ) then
 setenv PATH $PYTHONHOME/bin:$PATH
 endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/swriter.py b/pyuno/demo/swriter.py
index 05ab332fd382..3fafcd603da6 100644
--- a/pyuno/demo/swriter.py
+++ b/pyuno/demo/swriter.py
@@ -1,8 +1,10 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 
-# bootstrap uno component context 	
+# bootstrap uno component context
 import uno
 import unohelper
 
+from com.sun.star.lang import IllegalArgumentException
 
 # a UNO struct later needed to create a document
 from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK
@@ -17,9 +19,9 @@ def insertTextIntoCell( table, cellName, text, color ):
     tableText.setString( text )
 
 localContext = uno.getComponentContext()
-				   
+
 resolver = localContext.ServiceManager.createInstanceWithContext(
-				"com.sun.star.bridge.UnoUrlResolver", localContext )
+           "com.sun.star.bridge.UnoUrlResolver", localContext )
 
 smgr = resolver.resolve( "uno:socket,host=localhost,port=2002;urp;StarOffice.ServiceManager" )
 remoteContext = smgr.getPropertyValue( "DefaultContext" )
@@ -41,15 +43,15 @@ text.insertString( cursor, "Now we are in the second line\n" , 0 )
 table = doc.createInstance( "com.sun.star.text.TextTable" )
 
 # with 4 rows and 4 columns
-table.initialize( 4,4)
+table.initialize(4, 4)
 
 text.insertTextContent( cursor, table, 0 )
 rows = table.Rows
 
-table.setPropertyValue( "BackTransparent", uno.Bool(0) )
+table.setPropertyValue( "BackTransparent", False )
 table.setPropertyValue( "BackColor", 13421823 )
 row = rows.getByIndex(0)
-row.setPropertyValue( "BackTransparent", uno.Bool(0) )
+row.setPropertyValue( "BackTransparent", False )
 row.setPropertyValue( "BackColor", 6710932 )
 
 textColor = 16777215
@@ -60,8 +62,8 @@ insertTextIntoCell( table, "C1", "ThirdColumn", textColor )
 insertTextIntoCell( table, "D1", "SUM", textColor )
 
 values = ( (22.5,21.5,121.5),
-	   (5615.3,615.3,-615.3),
-	   (-2315.7,315.7,415.7) )
+         (5615.3,615.3,-615.3),
+         (-2315.7,315.7,415.7) )
 table.getCellByName("A2").setValue(22.5)
 table.getCellByName("B2").setValue(5615.3)
 table.getCellByName("C2").setValue(-2315.7)
@@ -79,7 +81,7 @@ table.getCellByName("D4").setFormula("sum <A4:C4>")
 
 
 cursor.setPropertyValue( "CharColor", 255 )
-cursor.setPropertyValue( "CharShadowed", uno.Bool(1) )
+cursor.setPropertyValue( "CharShadowed", True )
 
 text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
 text.insertString( cursor, " This is a colored Text - blue with shadow\n" , 0 )
@@ -99,7 +101,8 @@ textInTextFrame.insertString( cursorInTextFrame, "\nWith this second line the he
 text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
 
 cursor.setPropertyValue( "CharColor", 65536 )
-cursor.setPropertyValue( "CharShadowed", uno.Bool(0) )
+cursor.setPropertyValue( "CharShadowed", False )
 
-text.insertString( cursor, " That's all for now !!" , 0 )
+text.insertString( cursor, " That's all for now!" , 0 )
 
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/swritercomp.py b/pyuno/demo/swritercomp.py
index 6f8f30607bd2..be3109c12b44 100644
--- a/pyuno/demo/swritercomp.py
+++ b/pyuno/demo/swritercomp.py
@@ -1,3 +1,5 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
 # just a simple copy of the swriter.py demo, but implemented as a component. The advantage is,
 # that the component may run within the office process which may give a performance improvement.
 
@@ -21,92 +23,92 @@ def insertTextIntoCell( table, cellName, text, color ):
 # implementing the interface com.sun.star.lang.XMain
 # unohelper.Base implements the XTypeProvider interface
 class SWriterComp(XMain,unohelper.Base):
-      def __init__( self, ctx ):
-	  self.ctx = ctx
-
-      # implementation for XMain.run( [in] sequence< any > )	  
-      def run( self,args ):
+    def __init__( self, ctx ):
+        self.ctx = ctx
 
-	 ctx = self.ctx
-	 smgr = ctx.ServiceManager
-	 desktop = smgr.createInstanceWithContext( "com.sun.star.frame.Desktop",ctx)
+    # implementation for XMain.run( [in] sequence< any > )
+    def run( self,args ):
+        ctx = self.ctx
+        smgr = ctx.ServiceManager
+        desktop = smgr.createInstanceWithContext( "com.sun.star.frame.Desktop",ctx)
 
-	 # open a writer document
-	 doc = desktop.loadComponentFromURL( "private:factory/swriter","_blank", 0, () )
+        # open a writer document
+        doc = desktop.loadComponentFromURL( "private:factory/swriter","_blank", 0, () )
 
-	 text = doc.Text
-	 cursor = text.createTextCursor()
-	 text.insertString( cursor, "The first line in the newly created text document.\n", 0 )
-	 text.insertString( cursor, "Now we are in the second line\n" , 0 )
+        text = doc.Text
+        cursor = text.createTextCursor()
+        text.insertString( cursor, "The first line in the newly created text document.\n", 0 )
+        text.insertString( cursor, "Now we are in the second line\n" , 0 )
 
-	 # create a text table
-	 table = doc.createInstance( "com.sun.star.text.TextTable" )
+        # create a text table
+        table = doc.createInstance( "com.sun.star.text.TextTable" )
 
-	 # with 4 rows and 4 columns
-	 table.initialize( 4,4)
+        # with 4 rows and 4 columns
+        table.initialize( 4,4)
 
-	 text.insertTextContent( cursor, table, 0 )
-	 rows = table.Rows
+        text.insertTextContent( cursor, table, 0 )
+        rows = table.Rows
 
-	 table.setPropertyValue( "BackTransparent", uno.Bool(0) )
-	 table.setPropertyValue( "BackColor", 13421823 )
-	 row = rows.getByIndex(0)
-	 row.setPropertyValue( "BackTransparent", uno.Bool(0) )
-	 row.setPropertyValue( "BackColor", 6710932 )
+        table.setPropertyValue( "BackTransparent", uno.Bool(0) )
+        table.setPropertyValue( "BackColor", 13421823 )
+        row = rows.getByIndex(0)
+        row.setPropertyValue( "BackTransparent", uno.Bool(0) )
+        row.setPropertyValue( "BackColor", 6710932 )
 
-	 textColor = 16777215
+        textColor = 16777215
 
-	 insertTextIntoCell( table, "A1", "FirstColumn", textColor )
-	 insertTextIntoCell( table, "B1", "SecondColumn", textColor )
-	 insertTextIntoCell( table, "C1", "ThirdColumn", textColor )
-	 insertTextIntoCell( table, "D1", "SUM", textColor )
+        insertTextIntoCell( table, "A1", "FirstColumn", textColor )
+        insertTextIntoCell( table, "B1", "SecondColumn", textColor )
+        insertTextIntoCell( table, "C1", "ThirdColumn", textColor )
+        insertTextIntoCell( table, "D1", "SUM", textColor )
 
-	 values = ( (22.5,21.5,121.5),
-	 	   (5615.3,615.3,-615.3),
-		   (-2315.7,315.7,415.7) )
-         table.getCellByName("A2").setValue(22.5)
-	 table.getCellByName("B2").setValue(5615.3)
-	 table.getCellByName("C2").setValue(-2315.7)
-	 table.getCellByName("D2").setFormula("sum <A2:C2>")
+        values = ( (22.5,21.5,121.5),
+                 (5615.3,615.3,-615.3),
+                  (-2315.7,315.7,415.7) )
+        table.getCellByName("A2").setValue(22.5)
+        table.getCellByName("B2").setValue(5615.3)
+        table.getCellByName("C2").setValue(-2315.7)
+        table.getCellByName("D2").setFormula("sum <A2:C2>")
 
-	 table.getCellByName("A3").setValue(21.5)
-	 table.getCellByName("B3").setValue(615.3)
-	 table.getCellByName("C3").setValue(-315.7)
-	 table.getCellByName("D3").setFormula("sum <A3:C3>")
+        table.getCellByName("A3").setValue(21.5)
+        table.getCellByName("B3").setValue(615.3)
+        table.getCellByName("C3").setValue(-315.7)
+        table.getCellByName("D3").setFormula("sum <A3:C3>")
 
-	 table.getCellByName("A4").setValue(121.5)
-	 table.getCellByName("B4").setValue(-615.3)
-	 table.getCellByName("C4").setValue(415.7)
-	 table.getCellByName("D4").setFormula("sum <A4:C4>")
+        table.getCellByName("A4").setValue(121.5)
+        table.getCellByName("B4").setValue(-615.3)
+        table.getCellByName("C4").setValue(415.7)
+        table.getCellByName("D4").setFormula("sum <A4:C4>")
 
 
-	 cursor.setPropertyValue( "CharColor", 255 )
-	 cursor.setPropertyValue( "CharShadowed", uno.Bool(1) )
+        cursor.setPropertyValue( "CharColor", 255 )
+        cursor.setPropertyValue( "CharShadowed", uno.Bool(1) )
 
-	 text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
-	 text.insertString( cursor, " This is a colored Text - blue with shadow\n" , 0 )
-	 text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
+        text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
+        text.insertString( cursor, " This is a colored Text - blue with shadow\n" , 0 )
+        text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
 
-	 textFrame = doc.createInstance( "com.sun.star.text.TextFrame" )
-	 textFrame.setSize( Size(15000,400))
-	 textFrame.setPropertyValue( "AnchorType" , AS_CHARACTER )
+        textFrame = doc.createInstance( "com.sun.star.text.TextFrame" )
+        textFrame.setSize( Size(15000,400))
+        textFrame.setPropertyValue( "AnchorType" , AS_CHARACTER )
 
-	 text.insertTextContent( cursor, textFrame, 0 )
+        text.insertTextContent( cursor, textFrame, 0 )
 
-	 textInTextFrame = textFrame.getText()
-	 cursorInTextFrame = textInTextFrame.createTextCursor()
-	 textInTextFrame.insertString( cursorInTextFrame, "The first line in the newly created text frame.", 0 )
-	 textInTextFrame.insertString( cursorInTextFrame, "\nWith this second line the height of the rame raises.",0)
-	 text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
+        textInTextFrame = textFrame.getText()
+        cursorInTextFrame = textInTextFrame.createTextCursor()
+        textInTextFrame.insertString( cursorInTextFrame, "The first line in the newly created text frame.", 0 )
+        textInTextFrame.insertString( cursorInTextFrame, "\nWith this second line the height of the rame raises.",0)
+        text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
 
-	 cursor.setPropertyValue( "CharColor", 65536 )
-	 cursor.setPropertyValue( "CharShadowed", uno.Bool(0) )
-
-	 text.insertString( cursor, " That's all for now !!" , 0 )
-	 return 0
+        cursor.setPropertyValue( "CharColor", 65536 )
+        cursor.setPropertyValue( "CharShadowed", uno.Bool(0) )
 
+        text.insertString( cursor, " That's all for now!" , 0 )
+        return 0
 
 # pythonloader looks for a static g_ImplementationHelper variable
 g_ImplementationHelper = unohelper.ImplementationHelper()
 g_ImplementationHelper.addImplementation( \
-	SWriterComp,"org.openoffice.comp.pyuno.swriter",("org.openoffice.demo.SWriter",),)
+    SWriterComp,"org.openoffice.comp.pyuno.swriter",("org.openoffice.demo.SWriter",),)
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/swritercompclient.py b/pyuno/demo/swritercompclient.py
index 1076a69eb9b6..19ca6b5c1c46 100644
--- a/pyuno/demo/swritercompclient.py
+++ b/pyuno/demo/swritercompclient.py
@@ -1,9 +1,10 @@
-# instantiating
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
 import uno
 
 localContext = uno.getComponentContext()
 resolver = localContext.ServiceManager.createInstanceWithContext(
-				"com.sun.star.bridge.UnoUrlResolver", localContext )
+           "com.sun.star.bridge.UnoUrlResolver", localContext )
 remoteContext = resolver.resolve( "uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext" )
 remoteSmgr = remoteContext.ServiceManager
 
@@ -11,3 +12,4 @@ pyComp = remoteSmgr.createInstanceWithContext( "org.openoffice.demo.SWriter" , r
 
 pyComp.run( (), )
 
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno/pyuno.hxx
index dc08c8fbc2a3..e1bac60d96be 100644
--- a/pyuno/inc/pyuno/pyuno.hxx
+++ b/pyuno/inc/pyuno/pyuno.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef _PYUNO_PYUNO_HXX_
 #define _PYUNO_PYUNO_HXX_
 
@@ -44,8 +45,12 @@
     preconditions: python has been initialized before and
                    the global interpreter lock is held
 */
-extern "C" PY_DLLEXPORT void SAL_CALL initpyuno();
-
+extern "C" PY_DLLEXPORT
+#if PY_MAJOR_VERSION >= 3
+    PyObject* SAL_CALL PyInit_pyuno();
+#else
+   void SAL_CALL initpyuno();
+#endif
 
 namespace pyuno
 {
@@ -294,3 +299,5 @@ public:
 
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst
index 5a3b2c179e7d..a7c1c5b03426 100644
--- a/pyuno/prj/build.lst
+++ b/pyuno/prj/build.lst
@@ -1,5 +1,5 @@
-bgpu	pyuno	:	stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
-pu	pyuno				  usr1	-	all	br_mkout NULL
-pu	pyuno\zipcore	nmake	-	all	pu_zipcore NULL
-pu	pyuno\source\module	nmake	-	all	pu_module NULL
-pu	pyuno\source\loader	nmake	-	all	pu_loader pu_module NULL
+bgpu  pyuno : stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
+pu    pyuno usr1 - all br_mkout NULL
+pu    pyuno\zipcore nmake - all pu_zipcore NULL
+pu    pyuno\source\module nmake - all pu_module NULL
+pu    pyuno\source\loader nmake - all pu_loader pu_module NULL
diff --git a/pyuno/prj/d.lst b/pyuno/prj/d.lst
index 1dd212ea9cf4..38ae95de2b23 100644
--- a/pyuno/prj/d.lst
+++ b/pyuno/prj/d.lst
@@ -1,26 +1,27 @@
-mkdir: %_DEST%\bin%_EXT%\pyuno
-mkdir: %_DEST%\lib%_EXT%\pyuno
+mkdir: %_DEST%\bin\pyuno
+mkdir: %_DEST%\lib\pyuno
 
-..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so
-..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib
-..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so
-..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so
-..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib
-..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\pyuno\unohelper.py
-..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pyuno\pythonloader.py
-..\%__SRC%\lib\uno.py %_DEST%\lib%_EXT%\pyuno\uno.py
+..\%__SRC%\lib\libpyuno.so %_DEST%\lib\libpyuno.so
+..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib\libpyuno.dylib
+..\%__SRC%\lib\pyuno.so %_DEST%\lib\pyuno.so
+..\%__SRC%\lib\pyuno.dylib %_DEST%\lib\pyuno.dylib
+..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib\pythonloader.uno.so
+..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib\pythonloader.uno.dylib
+..\%__SRC%\lib\unohelper.py %_DEST%\lib\pyuno\unohelper.py
+..\%__SRC%\lib\pythonloader.py %_DEST%\lib\pyuno\pythonloader.py
+..\%__SRC%\lib\uno.py %_DEST%\lib\pyuno\uno.py
 ..\%__SRC%\misc\pythonloader.component %_DEST%\xml\pythonloader.component
 
-..\%__SRC%\bin\unohelper.py %_DEST%\bin%_EXT%\pyuno\unohelper.py
-..\%__SRC%\bin\pythonloader.py %_DEST%\bin%_EXT%\pyuno\pythonloader.py
-..\%__SRC%\bin\uno.py %_DEST%\bin%_EXT%\pyuno\uno.py
-..\%__SRC%\bin\pyuno.pyd %_DEST%\bin%_EXT%\pyuno.pyd
-..\%__SRC%\bin\pyuno.dll %_DEST%\bin%_EXT%\pyuno.dll
-..\%__SRC%\bin\pythonl*.dll %_DEST%\bin%_EXT%\pythonl*.dll
+..\%__SRC%\bin\unohelper.py %_DEST%\bin\pyuno\unohelper.py
+..\%__SRC%\bin\pythonloader.py %_DEST%\bin\pyuno\pythonloader.py
+..\%__SRC%\bin\uno.py %_DEST%\bin\pyuno\uno.py
+..\%__SRC%\bin\pyuno.pyd %_DEST%\bin\pyuno.pyd
+..\%__SRC%\bin\pyuno.dll %_DEST%\bin\pyuno.dll
+..\%__SRC%\bin\pythonl*.dll %_DEST%\bin\pythonl*.dll
 
-..\%__SRC%\misc\pyunorc %_DEST%\lib%_EXT%\pyunorc
-..\%__SRC%\misc\pyuno.ini %_DEST%\bin%_EXT%\pyuno.ini
-..\%__SRC%\bin\python-core-*.zip %_DEST%\bin%_EXT%\python-core-*.zip
-..\%__SRC%\bin\python.bin %_DEST%\bin%_EXT%\python.bin
-..\%__SRC%\bin\python.sh %_DEST%\bin%_EXT%\pyuno\python
-..\%__SRC%\bin\python.exe %_DEST%\bin%_EXT%\pyuno\python.exe
+..\%__SRC%\misc\pyunorc %_DEST%\lib\pyunorc
+..\%__SRC%\misc\pyuno.ini %_DEST%\bin\pyuno.ini
+..\%__SRC%\bin\python-core-*.zip %_DEST%\bin\python-core-*.zip
+..\%__SRC%\bin\python.bin %_DEST%\bin\python.bin
+..\%__SRC%\bin\python.sh %_DEST%\bin\pyuno\python
+..\%__SRC%\bin\python.exe %_DEST%\bin\pyuno\python.exe
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk
index 65ec8116f9c5..76c3dc2ffecd 100644
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@ -32,46 +32,46 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  settings.mk
+.INCLUDE : settings.mk
 .IF "$(L10N_framework)"==""
-DLLPRE = 
+DLLPRE =
 
 #-------------------------------------------------------------------
 
 .IF "$(OS)$(COMEX)" == "SOLARIS4"
 # no -Bdirect for SunWS CC
-DIRECT = $(LINKFLAGSDEFS)
+DIRECT= $(LINKFLAGSDEFS)
 .ENDIF
 
 .IF "$(SYSTEM_PYTHON)" == "YES"
 PYTHONLIB=$(PYTHON_LIBS)
 CFLAGS+=$(PYTHON_CFLAGS)
 .IF "$(EXTRA_CFLAGS)"!=""
-PYTHONLIB+=-framework Python
+PYTHONLIB+= -framework Python
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 .ELSE
-.INCLUDE :  pyversion.mk
+.INCLUDE : pyversion.mk
 
-CFLAGS+=-I$(SOLARINCDIR)$/python
+CFLAGS+= -I$(SOLARINCDIR)$/python
 .ENDIF
 
-SHL1TARGET=	$(TARGET)
+SHL1TARGET= $(TARGET)
 
 SHL1STDLIBS= \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(SALLIB)		\
-        $(PYUNOLIB)		\
+        $(CPPULIB) \
+        $(CPPUHELPERLIB) \
+        $(SALLIB) \
+        $(PYUNOLIB) \
         $(PYTHONLIB)
 
-SHL1VERSIONMAP=$(SOLARENV)$/src$/component.map
+SHL1VERSIONMAP= $(SOLARENV)$/src$/component.map
 SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+SHL1IMPLIB= i$(TARGET)
+SHL1LIBS= $(SLB)$/$(TARGET).lib
+SHL1DEF= $(MISC)$/$(SHL1TARGET).def
 
-DEF1NAME=	$(SHL1TARGET)
-SLOFILES=       $(SLO)$/pyuno_loader.obj
+DEF1NAME= $(SHL1TARGET)
+SLOFILES= $(SLO)$/pyuno_loader.obj
 
 # --- Targets ------------------------------------------------------
 
diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py
index 15fe57481f5a..1f6716ee90c1 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -40,112 +40,110 @@ g_supportedServices  = "com.sun.star.loader.Python",      # referenced by the na
 g_implementationName = "org.openoffice.comp.pyuno.Loader" # referenced by the native C++ loader !
 
 def splitUrl( url ):
-      nColon = url.find( ":" )
-      if -1 == nColon:
-            raise RuntimeException( "PythonLoader: No protocol in url " + url, None )
-      return url[0:nColon], url[nColon+1:len(url)]
+    nColon = url.find( ":" )
+    if -1 == nColon:
+        raise RuntimeException( "PythonLoader: No protocol in url " + url, None )
+    return url[0:nColon], url[nColon+1:len(url)]
 
 g_loadedComponents = {}
 def checkForPythonPathBesideComponent( url ):
-      path = unohelper.fileUrlToSystemPath( url+"/pythonpath.zip" );
-      if DEBUG == 1:
-            print "checking for existence of " + encfile( path )
-      if 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path:
-            if DEBUG == 1:
-                  print "adding " + encfile( path ) + " to sys.path"
-            sys.path.append( path )
-
-      path = unohelper.fileUrlToSystemPath( url+"/pythonpath" );
-      if 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path:
-            if DEBUG == 1:
-                  print "adding " + encfile( path ) + " to sys.path"
-            sys.path.append( path )
+    path = unohelper.fileUrlToSystemPath( url+"/pythonpath.zip" );
+    if DEBUG == 1:
+        print("checking for existence of " + encfile( path ))
+    if 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path:
+        if DEBUG == 1:
+            print("adding " + encfile( path ) + " to sys.path")
+        sys.path.append( path )
+
+    path = unohelper.fileUrlToSystemPath( url+"/pythonpath" );
+    if 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path:
+        if DEBUG == 1:
+            print("adding " + encfile( path ) + " to sys.path")
+        sys.path.append( path )
 
 def encfile(uni):
     return uni.encode( sys.getfilesystemencoding())
 
 class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
-      def __init__(self, ctx ):
-	  if DEBUG:
-	     print "pythonloader.Loader ctor" 
-	  self.ctx = ctx
-
-      def getModuleFromUrl( self, url ):
-          if DEBUG:
-                print "pythonloader: interpreting url " +url
-          protocol, dependent = splitUrl( url )
-          if "vnd.sun.star.expand" == protocol:
-                exp = self.ctx.getValueByName( "/singletons/com.sun.star.util.theMacroExpander" )
-                url = exp.expandMacros(dependent)
-                protocol,dependent = splitUrl( url )
-
-          if DEBUG:
-                print "pythonloader: after expansion " +protocol +":" + dependent
-                
-          try:
-                if "file" == protocol:
-                      # remove \..\ sequence, which may be useful e.g. in the build env
-                      url = unohelper.absolutize( url, url )
-
-                      # did we load the module already ?
-                      mod = g_loadedComponents.get( url )
-                      if not mod:
-                            mod = imp.new_module("uno_component")
-
-                            # check for pythonpath.zip beside .py files
-                            checkForPythonPathBesideComponent( url[0:url.rfind('/')] )
-                            
-                            # read the file
-                            filename = unohelper.fileUrlToSystemPath( url )
-                            fileHandle = file( filename )
-                            src = fileHandle.read().replace("\r","")
-                            if not src.endswith( "\n" ):
-                                  src = src + "\n"
-
-                            # compile and execute the module
-                            codeobject = compile( src, encfile(filename), "exec" )
-                            exec codeobject in mod.__dict__
-                            mod.__file__ = encfile(filename)
-                            g_loadedComponents[url] = mod
-                      return mod
-                elif "vnd.openoffice.pymodule" == protocol:
-                      return  __import__( dependent )
-                else:
-                      raise RuntimeException( "PythonLoader: Unknown protocol " +
-                                              protocol + " in url " +url, self )
-          except ImportError, e:
-                raise RuntimeException( "Couldn't load "+url+ " for reason "+str(e), None)
-          return None
-	   
-      def activate( self, implementationName, dummy, locationUrl, regKey ):
-	  if DEBUG:
-	     print "pythonloader.Loader.activate"
-
-	  mod = self.getModuleFromUrl( locationUrl )
-          implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
-          if implHelper == None:
-		return mod.getComponentFactory( implementationName, self.ctx.ServiceManager, regKey )
-          else:
-		return implHelper.getComponentFactory( implementationName,regKey,self.ctx.ServiceManager)
-	     
-      def writeRegistryInfo( self, regKey, dummy, locationUrl ):
-	  if DEBUG:
-	     print "pythonloader.Loader.writeRegistryInfo"
-             
-	  mod = self.getModuleFromUrl( locationUrl )
-          implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
-          if implHelper == None:
-	        return mod.writeRegistryInfo( self.ctx.ServiceManager, regKey )
-          else:
-	        return implHelper.writeRegistryInfo( regKey, self.ctx.ServiceManager )
-
-      def getImplementationName( self ):
-	  return g_implementationName
-
-      def supportsService( self, ServiceName ):
-	  return ServiceName in self.serviceNames
-
-      def getSupportedServiceNames( self ):
-	  return g_supportedServices
-
-
+    def __init__(self, ctx ):
+        if DEBUG:
+            print("pythonloader.Loader ctor")
+        self.ctx = ctx
+
+    def getModuleFromUrl( self, url ):
+        if DEBUG:
+            print("pythonloader: interpreting url " + url)
+        protocol, dependent = splitUrl( url )
+        if "vnd.sun.star.expand" == protocol:
+            exp = self.ctx.getValueByName( "/singletons/com.sun.star.util.theMacroExpander" )
+            url = exp.expandMacros(dependent)
+            protocol,dependent = splitUrl( url )
+
+        if DEBUG:
+            print("pythonloader: after expansion " + protocol + ":" + dependent)
+
+        try:
+            if "file" == protocol:
+                # remove \..\ sequence, which may be useful e.g. in the build env
+                url = unohelper.absolutize( url, url )
+
+                # did we load the module already ?
+                mod = g_loadedComponents.get( url )
+                if not mod:
+                    mod = imp.new_module("uno_component")
+
+                    # check for pythonpath.zip beside .py files
+                    checkForPythonPathBesideComponent( url[0:url.rfind('/')] )
+
+                    # read the file
+                    filename = unohelper.fileUrlToSystemPath( url )
+                    fileHandle = file( filename )
+                    src = fileHandle.read().replace("\r","")
+                    if not src.endswith( "\n" ):
+                        src = src + "\n"
+
+                    # compile and execute the module
+                    codeobject = compile( src, encfile(filename), "exec" )
+                    exec(codeobject, mod.__dict__)
+                    mod.__file__ = encfile(filename)
+                    g_loadedComponents[url] = mod
+                return mod
+            elif "vnd.openoffice.pymodule" == protocol:
+                return  __import__( dependent )
+            else:
+                raise RuntimeException( "PythonLoader: Unknown protocol " +
+                                         protocol + " in url " +url, self )
+        except ImportError as e:
+            raise RuntimeException( "Couldn't load " + url + " for reason " + str(e), None )
+        return None
+
+    def activate( self, implementationName, dummy, locationUrl, regKey ):
+        if DEBUG:
+            print("pythonloader.Loader.activate")
+
+        mod = self.getModuleFromUrl( locationUrl )
+        implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
+        if implHelper == None:
+            return mod.getComponentFactory( implementationName, self.ctx.ServiceManager, regKey )
+        else:
+            return implHelper.getComponentFactory( implementationName,regKey,self.ctx.ServiceManager)
+
+    def writeRegistryInfo( self, regKey, dummy, locationUrl ):
+        if DEBUG:
+            print( "pythonloader.Loader.writeRegistryInfo" )
+
+        mod = self.getModuleFromUrl( locationUrl )
+        implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
+        if implHelper == None:
+            return mod.writeRegistryInfo( self.ctx.ServiceManager, regKey )
+        else:
+            return implHelper.writeRegistryInfo( regKey, self.ctx.ServiceManager )
+
+    def getImplementationName( self ):
+        return g_implementationName
+
+    def supportsService( self, ServiceName ):
+        return ServiceName in self.serviceNames
+
+    def getSupportedServiceNames( self ):
+          return g_supportedServices
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index c69132e51e3d..79fbae9ab098 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -1,3 +1,4 @@
+/*nd '!=' comparisions are defined"126G -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,8 +118,26 @@ static void setPythonHome ( const OUString & pythonHome )
     OUString systemPythonHome;
     osl_getSystemPathFromFileURL( pythonHome.pData, &(systemPythonHome.pData) );
     OString o = rtl::OUStringToOString( systemPythonHome, osl_getThreadTextEncoding() );
-    rtl_string_acquire(o.pData); // leak this string (thats the api!)
-    Py_SetPythonHome( o.pData->buffer);
+#if PY_MAJOR_VERSION >= 3
+    // static because Py_SetPythonHome just copies the "wide" pointer
+    // PATH_MAX is defined in Python.h
+    static wchar_t wide[PATH_MAX + 1];
+    size_t len = mbstowcs(wide, o.pData->buffer, PATH_MAX + 1);
+    if(len == (size_t)-1)
+    {
+        PyErr_SetString(PyExc_SystemError, "invalid multibyte sequence in python home path");
+        return;
+    }
+    if(len == PATH_MAX + 1)
+    {
+        PyErr_SetString(PyExc_SystemError, "python home path is too long");
+        return;
+    }
+    Py_SetPythonHome(wide);
+#else
+    rtl_string_acquire(o.pData); // increase reference count
+    Py_SetPythonHome(o.pData->buffer);
+#endif
 }
 
 static void prependPythonPath( const OUString & pythonPathBootstrap )
@@ -177,7 +196,11 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
 
         if( pythonPath.getLength() )
             prependPythonPath( pythonPath );
-
+#if PY_MAJOR_VERSION >= 3
+        PyImport_AppendInittab( (char*)"pyuno", PyInit_pyuno );
+#else
+        PyImport_AppendInittab( (char*)"pyuno", initpyuno );
+#endif
         // initialize python
         Py_Initialize();
         PyEval_InitThreads();
@@ -223,13 +246,13 @@ extern "C"
 {
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
@@ -237,3 +260,4 @@ void * SAL_CALL component_getFactory(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk
index c928cc6f8e4c..627a97d711f7 100644
--- a/pyuno/source/module/makefile.mk
+++ b/pyuno/source/module/makefile.mk
@@ -36,6 +36,7 @@ LINKFLAGSDEFS = # do not fail with missing symbols
 
 .INCLUDE :  settings.mk
 .IF "$(L10N_framework)"==""
+
 #-------------------------------------------------------------------
 
 .IF "$(OS)$(COMEX)" == "SOLARIS4"
@@ -49,13 +50,7 @@ EXTRA_FRAMEWORK_FLAG=-framework Python
 .ENDIF # .IF "$(EXTRA_CFLAGS)"!=""
 
 .IF "$(GUI)" == "UNX"
-# python expects modules without the lib prefix 
-# pyuno.so even on Mac OS X, because it is a python module
-PYUNO_MODULE=$(DLLDEST)$/pyuno.so
 PYUNORC=pyunorc
-.ELIF "$(GUI)" == "OS2"
-.INCLUDE :  pyversion.mk
-PYUNORC=pyuno.ini
 .ELSE
 .INCLUDE :  pyversion.mk
 PYUNORC=pyuno.ini
@@ -72,38 +67,37 @@ CFLAGS+=-I$(SOLARINCDIR)$/python
 
 SHL1TARGET=$(TARGET)
 SLOFILES= \
-        $(SLO)$/pyuno_runtime.obj 	\
-        $(SLO)$/pyuno.obj 		\
-        $(SLO)$/pyuno_callable.obj 	\
-        $(SLO)$/pyuno_module.obj 	\
-        $(SLO)$/pyuno_type.obj 		\
-        $(SLO)$/pyuno_util.obj		\
-        $(SLO)$/pyuno_except.obj	\
-        $(SLO)$/pyuno_adapter.obj	\
+        $(SLO)$/pyuno_runtime.obj \
+        $(SLO)$/pyuno.obj \
+        $(SLO)$/pyuno_callable.obj \
+        $(SLO)$/pyuno_module.obj \
+        $(SLO)$/pyuno_type.obj \
+        $(SLO)$/pyuno_util.obj \
+        $(SLO)$/pyuno_except.obj \
+        $(SLO)$/pyuno_adapter.obj \
         $(SLO)$/pyuno_gc.obj
 
 # remove this, when issue i35064 is integrated
 .IF "$(COM)"=="GCC"
 NOOPTFILES= \
     $(SLO)$/pyuno_module.obj
-.ENDIF			# "$(COM)"=="GCC"
-
+.ENDIF # "$(COM)"=="GCC"
 
 SHL1STDLIBS= \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(SALLIB)		\
-        $(PYTHONLIB) 		\
-        $(EXTRA_FRAMEWORK_FLAG) 
+        $(CPPULIB) \
+        $(CPPUHELPERLIB) \
+        $(SALLIB) \
+        $(PYTHONLIB) \
+        $(EXTRA_FRAMEWORK_FLAG)
 
-SHL1DEPN=
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=i$(TARGET)
+SHL1DEPN=$(eq,$(OS),MACOSX $(MISC)/framework_link $(NULL))
+SHL1LIBS= $(SLB)$/$(TARGET).lib
+SHL1IMPLIB= i$(TARGET)
 
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+SHL1DEF= $(MISC)$/$(SHL1TARGET).def
 
-DEF1NAME=	$(SHL1TARGET)
-DEF1DEPN=	$(MISC)$/pyuno.flt
+DEF1NAME= $(SHL1TARGET)
+DEF1DEPN= $(MISC)$/pyuno.flt
 
 DEFLIB1NAME=$(TARGET)
 
@@ -111,21 +105,28 @@ DEFLIB1NAME=$(TARGET)
 
 .IF "$(GUI)$(COM)"=="WNTGCC"
 ALLTAR : \
-    $(DLLDEST)$/uno.py 		\
-    $(DLLDEST)$/unohelper.py	\
-    $(PYUNO_MODULE)			\
-    $(MISC)$/$(PYUNORC)		\
+    $(DLLDEST)$/uno.py \
+    $(DLLDEST)$/unohelper.py \
+    $(MISC)$/$(PYUNORC) \
     $(LB)$/lib$(TARGET).a
 
 $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def
     dlltool --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a
 .ELSE
+
+.IF "$(GUI)"!="WNT"
+# For some reason the build breaks on Windows if this is listed in the
+# prerequisite list of ALLTAR, but pyuno.pyd still gets produced. Go
+# figure. But we need it on non-Windows.
+targetdll=$(LB)$/$(TARGET)$(DLLPOST)
+.ENDIF
+
 ALLTAR : \
-    $(DLLDEST)$/uno.py 		\
-    $(DLLDEST)$/unohelper.py	\
-    $(PYUNO_MODULE)			\
-    $(MISC)$/$(PYUNORC)		
-.ENDIF 
+    $(DLLDEST)$/uno.py \
+    $(DLLDEST)$/unohelper.py \
+    $(targetdll) \
+    $(MISC)$/$(PYUNORC)
+.ENDIF
 .ENDIF
 
 .INCLUDE :  target.mk
@@ -133,33 +134,26 @@ ALLTAR : \
 $(DLLDEST)$/%.py: %.py
     cp $? $@
 
-
-.IF "$(GUI)" == "UNX"
-$(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
-.IF "$(OS)" == "LINUX"
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-.ELIF "$(OS)" == "SOLARIS"
-    @echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-.ELIF "$(OS)" == "FREEBSD"
-    @echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-.ELIF "$(OS)" == "NETBSD"
-    @echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-.ELIF "$(OS)" == "MACOSX"
-    @echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(EXTRA_LINKFLAGS) $(EXTRA_FRAMEWORK_FLAG) > $(MISC)$/$(@:b).cmd
-.ELSE
-    @echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-.ENDIF
-    cat $(MISC)$/$(@:b).cmd
-    @+source $(MISC)$/$(@:b).cmd
-.ENDIF
-
+# make checkdll happy
+$(MISC)/framework_link :
+	$(COMMAND_ECHO)ln -sf $(SOLARLIBDIR)/OOoPython.framework $(LB)/OOoPython.framework
+	@touch $@
 
 $(MISC)$/$(PYUNORC) : pyuno
     -rm -f $@
-    cat pyuno > $@ 
+    cat pyuno > $@
 
 $(MISC)$/pyuno.flt : pyuno.flt
     -rm -f $@
     cat $? > $@
+
+.IF "$(DLLPRE)"!=""
+# python does not accept the "lib" prefix in the module library
+$(LB)$/$(TARGET)$(DLLPOST) : $(LB)$/$(DLLPRE)$(TARGET)$(DLLPOST)
+    -rm -f $@
+    ln -s $? $@
+.ENDIF
+
 .ENDIF # L10N_framework
 
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index ef5b5673eae3..2df863dabe5b 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -134,13 +135,6 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
     }
     case typelib_TypeClass_UNION:
     {
-//          typelib_TypeDescription * pTypeDescr = 0;
-//          TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
-//          buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{ ") );
-//          buf.append( val2str( (char *)pVal + ((typelib_UnionTypeDescription *)pTypeDescr)->nValueOffset,
-//                               union_getSetType( pVal, pTypeDescr ) ) );
-//          buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" }") );
-//          TYPELIB_DANGER_RELEASE( pTypeDescr );
         break;
     }
     case typelib_TypeClass_STRUCT:
@@ -192,7 +186,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
         TYPELIB_DANGER_GET( &pElementTypeDescr, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType );
 
         sal_Int32 nElementSize = pElementTypeDescr->nSize;
-        sal_Int32 nElements    = pSequence->nElements;
+        sal_Int32 nElements = pSequence->nElements;
 
         if (nElements)
         {
@@ -599,11 +593,17 @@ int PyUNO_setattr (PyObject* self, char* name, PyObject* value)
 }
 
 // ensure object identity and struct equality
-static int PyUNO_cmp( PyObject *self, PyObject *that )
+static PyObject* PyUNO_cmp( PyObject *self, PyObject *that, int op )
 {
-    if( self == that )
+    if(op != Py_EQ && op != Py_NE)
+    {
+        PyErr_SetString(PyExc_TypeError, "only '==' and '!=' comparisions are defined");
         return 0;
-    int retDefault = self > that ? 1 : -1;
+    }
+    if( self == that )
+    {
+        return (op == Py_EQ ? Py_True : Py_False);
+    }
     try
     {
         Runtime runtime;
@@ -623,13 +623,16 @@ static int PyUNO_cmp( PyObject *self, PyObject *that )
                     Reference< XMaterialHolder > xMe( me->members->xInvocation,UNO_QUERY);
                     Reference< XMaterialHolder > xOther( other->members->xInvocation,UNO_QUERY );
                     if( xMe->getMaterial() == xOther->getMaterial() )
-                        return 0;
+                    {
+                        return (op == Py_EQ ? Py_True : Py_False);
+                    }
                 }
                 else if( tcMe == com::sun::star::uno::TypeClass_INTERFACE )
                 {
                     if( me->members->wrappedObject == other->members->wrappedObject )
-//                     if( me->members->xInvocation == other->members->xInvocation )
-                        return 0;
+                    {
+                        return (op == Py_EQ ? Py_True : Py_False);
+                    }
                 }
             }
         }
@@ -638,13 +641,12 @@ static int PyUNO_cmp( PyObject *self, PyObject *that )
     {
         raisePyExceptionWithAny( makeAny( e ) );
     }
-    return retDefault;
+    return Py_False;
 }
 
 static PyTypeObject PyUNOType =
 {
-    PyObject_HEAD_INIT (&PyType_Type)
-    0,
+    PyVarObject_HEAD_INIT( &PyType_Type, 0 )
     const_cast< char * >("pyuno"),
     sizeof (PyUNO),
     0,
@@ -652,7 +654,7 @@ static PyTypeObject PyUNOType =
     (printfunc) 0,
     (getattrfunc) PyUNO_getattr,
     (setattrfunc) PyUNO_setattr,
-    (cmpfunc) PyUNO_cmp,
+    0,
     (reprfunc) PyUNO_repr,
     0,
     0,
@@ -667,7 +669,7 @@ static PyTypeObject PyUNOType =
     NULL,
     (traverseproc)0,
     (inquiry)0,
-    (richcmpfunc)0,
+    (richcmpfunc) PyUNO_cmp,
     0,
     (getiterfunc)0,
     (iternextfunc)0,
@@ -706,14 +708,14 @@ PyObject* PyUNO_new (
     Reference<XInterface> tmp_interface;
 
     targetInterface >>= tmp_interface;
+
     if (!tmp_interface.is ())
     {
         // empty reference !
         Py_INCREF( Py_None );
         return Py_None;
     }
-
-    return PyUNO_new_UNCHECKED (targetInterface, ssf);
+   return PyUNO_new_UNCHECKED (targetInterface, ssf);
 }
 
 
@@ -727,14 +729,27 @@ PyObject* PyUNO_new_UNCHECKED (
 
     self = PyObject_New (PyUNO, &PyUNOType);
     if (self == NULL)
-        return NULL; //NULL == error
+        return NULL; // == error
     self->members = new PyUNOInternals();
 
     arguments[0] <<= targetInterface;
     {
         PyThreadDetach antiguard;
         tmp_interface = ssf->createInstanceWithArguments (arguments);
+
+        if (!tmp_interface.is ())
+        {
+            Py_INCREF( Py_None );
+            return Py_None;
+        }
+
         Reference<XInvocation2> tmp_invocation (tmp_interface, UNO_QUERY);
+        if (!tmp_invocation.is()) {
+            throw RuntimeException (rtl::OUString::createFromAscii (
+                "XInvocation2 not implemented, cannot interact with object"),
+                Reference< XInterface > ());
+        }
+
         self->members->xInvocation = tmp_invocation;
         self->members->wrappedObject = targetInterface;
     }
@@ -742,3 +757,5 @@ PyObject* PyUNO_new_UNCHECKED (
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx
index 6f2fcdc3dbd5..df3f9fae5443 100644
--- a/pyuno/source/module/pyuno_adapter.cxx
+++ b/pyuno/source/module/pyuno_adapter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -435,3 +436,5 @@ sal_Bool Adapter::hasProperty( const OUString & aPropertyName )
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx
index 8fff629daa80..2bd2a7da2fa8 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -195,8 +196,7 @@ PyObject* PyUNO_callable_call (PyObject* self, PyObject* args, PyObject*)
 
 static PyTypeObject PyUNO_callable_Type =
 {
-    PyObject_HEAD_INIT (&PyType_Type)
-    0,
+    PyVarObject_HEAD_INIT( &PyType_Type, 0 )
     const_cast< char * >("PyUNO_callable"),
     sizeof (PyUNO_callable),
     0,
@@ -204,7 +204,7 @@ static PyTypeObject PyUNO_callable_Type =
     (printfunc) 0,
     (getattrfunc) 0,
     (setattrfunc) 0,
-    (cmpfunc) 0,
+    0,
     (reprfunc) 0,
     0,
     0,
@@ -212,7 +212,7 @@ static PyTypeObject PyUNO_callable_Type =
     (hashfunc) 0,
     (ternaryfunc) ::pyuno::PyUNO_callable_call,
     (reprfunc) 0,
-        (getattrofunc)0,
+    (getattrofunc)0,
     (setattrofunc)0,
     NULL,
     0,
@@ -256,6 +256,8 @@ PyRef PyUNO_callable_new (
 {
     PyUNO_callable* self;
 
+    OSL_ENSURE (my_inv.is(), "XInvocation must be valid");
+
     self = PyObject_New (PyUNO_callable, &PyUNO_callable_Type);
     if (self == NULL)
         return NULL; //NULL == Error!
@@ -271,3 +273,5 @@ PyRef PyUNO_callable_new (
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_dlopenwrapper.c b/pyuno/source/module/pyuno_dlopenwrapper.c
index 517d4f86cd2f..1ace0442ced6 100644
--- a/pyuno/source/module/pyuno_dlopenwrapper.c
+++ b/pyuno/source/module/pyuno_dlopenwrapper.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,5 @@ void initpyuno ()
         }
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx
index ba86014b8410..16aed8935e4f 100644
--- a/pyuno/source/module/pyuno_except.cxx
+++ b/pyuno/source/module/pyuno_except.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -166,7 +167,7 @@ static PyRef createClass( const OUString & name, const Runtime &runtime )
     PyTuple_SetItem( args.get(), 2, PyDict_New() );
 
     PyRef ret(
-        PyObject_CallObject(reinterpret_cast<PyObject *>(&PyClass_Type) , args.get()),
+        PyObject_CallObject(reinterpret_cast<PyObject *>(&PyType_Type) , args.get()),
         SAL_NO_ACQUIRE );
 
     // now overwrite ctor and attrib functions
@@ -249,3 +250,5 @@ PyRef getClass( const OUString & name , const Runtime &runtime)
 
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_gc.cxx b/pyuno/source/module/pyuno_gc.cxx
index aafefd368a4f..77eb6885d04e 100644
--- a/pyuno/source/module/pyuno_gc.cxx
+++ b/pyuno/source/module/pyuno_gc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -115,3 +116,5 @@ void decreaseRefCount( PyInterpreterState *interpreter, PyObject *object )
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index ccb16c24d2a4..ff6ca8716e69 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,10 +28,17 @@
 #ifndef _PYUNO_IMPL_
 #define _PYUNO_IMPL_
 
+#include <Python.h>
+
+//Must define PyVarObject_HEAD_INIT for Python 2.5 or older
+#ifndef PyVarObject_HEAD_INIT
+#define PyVarObject_HEAD_INIT(type, size)  PyObject_HEAD_INIT(type) size,
+#endif
+
 #include <pyuno/pyuno.hxx>
 
-#include <hash_map>
-#include <hash_set>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
 
 #include <com/sun/star/beans/XIntrospection.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
@@ -47,6 +55,49 @@
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/weakref.hxx>
 
+// In Python 3, the PyString_* functions have been replaced by PyBytes_*
+// and PyUnicode_* functions.
+#if PY_MAJOR_VERSION >= 3
+inline char* PyString_AsString(PyObject *object)
+{
+    // check whether object is already of type "PyBytes"
+    if(PyBytes_Check(object))
+    {
+        return PyBytes_AsString(object);
+    }
+
+    // object is not encoded yet, so encode it to utf-8
+    PyObject *pystring;
+    pystring = PyUnicode_AsUTF8String(object);
+    if(!pystring)
+    {
+       PyErr_SetString(PyExc_ValueError, "cannot utf-8 decode string");
+       return 0;
+    }
+    return PyBytes_AsString(pystring);
+}
+
+inline PyObject* PyString_FromString(const char *string)
+{
+    return PyUnicode_FromString(string);
+}
+
+inline int PyString_Check(PyObject *object)
+{
+    return PyBytes_Check(object);
+}
+
+inline Py_ssize_t PyString_Size(PyObject *object)
+{
+    return PyBytes_Size(object);
+}
+
+inline PyObject* PyString_FromStringAndSize(const char *string, Py_ssize_t len)
+{
+    return PyBytes_FromStringAndSize(string, len);
+}
+#endif /* PY_MAJOR_VERSION >= 3 */
+
 namespace pyuno
 {
 
@@ -80,7 +131,7 @@ static const sal_Int32 VAL2STR_MODE_SHALLOW = 1;
 rtl::OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef, sal_Int32 mode = VAL2STR_MODE_DEEP ) SAL_THROW( () );
 //--------------------------------------------------
 
-typedef ::std::hash_map
+typedef ::boost::unordered_map
 <
     PyRef,
     com::sun::star::uno::WeakReference< com::sun::star::script::XInvocation >,
@@ -89,7 +140,7 @@ typedef ::std::hash_map
 > PyRef2Adapter;
 
 
-typedef ::std::hash_map
+typedef ::boost::unordered_map
 <
 rtl::OUString,
 PyRef,
@@ -97,7 +148,7 @@ rtl::OUStringHash,
 std::equal_to<rtl::OUString>
 > ExceptionClassMap;
 
-typedef ::std::hash_map
+typedef ::boost::unordered_map
 <
     rtl::OUString,
     com::sun::star::uno::Sequence< sal_Int16 >,
@@ -105,7 +156,7 @@ typedef ::std::hash_map
     std::equal_to< rtl::OUString >
 > MethodOutIndexMap;
 
-typedef ::std::hash_set< PyRef , PyRef::Hash , std::equal_to<PyRef> > ClassSet;
+typedef ::boost::unordered_set< PyRef , PyRef::Hash , std::equal_to<PyRef> > ClassSet;
 
 PyObject* PyUNO_new(
     const com::sun::star::uno::Any & targetInterface,
@@ -141,9 +192,6 @@ com::sun::star::uno::Any PyObjectToAny (PyObject* o)
 void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime )
     throw ( com::sun::star::reflection::InvocationTargetException );
 
-// bool CheckPyObjectTypes (PyObject* o, Sequence<Type> types);
-// bool CheckPyObjectType (PyObject* o, Type type); //Only check 1 object.
-
 com::sun::star::uno::TypeClass StringToTypeClass (char* string);
 
 PyRef PyUNO_callable_new (
@@ -291,3 +339,5 @@ void decreaseRefCount( PyInterpreterState *interpreter, PyObject *object );
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index 5f3fc3d054e5..4788a2f1846b 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -229,7 +230,7 @@ PyObject * extractOneStringArg( PyObject *args, char const *funcName )
         return NULL;
     }
     PyObject *obj = PyTuple_GetItem( args, 0 );
-    if( !PyString_Check( obj ) && ! PyUnicode_Check(obj))
+    if(!PyString_Check(obj) && !PyUnicode_Check(obj))
     {
         OStringBuffer buf;
         buf.append( funcName ).append( ": expecting one string argument" );
@@ -243,16 +244,17 @@ static PyObject *createUnoStructHelper(PyObject *, PyObject* args )
 {
     Any IdlStruct;
     PyRef ret;
-
     try
     {
         Runtime runtime;
         if( PyTuple_Size( args ) == 2 )
         {
-            PyObject *structName = PyTuple_GetItem( args,0 );
-            PyObject *initializer = PyTuple_GetItem( args ,1 );
+            PyObject *structName = PyTuple_GetItem(args, 0);
+            PyObject *initializer = PyTuple_GetItem(args, 1);
 
-            if( PyString_Check( structName ) )
+            // Perhaps in Python 3, only PyUnicode_Check returns true and
+            // in Python 2, only PyString_Check returns true.
+            if(PyString_Check(structName) || PyUnicode_Check(structName))
             {
                 if( PyTuple_Check( initializer ) )
                 {
@@ -490,9 +492,9 @@ static PyObject *isInterface( PyObject *, PyObject *args )
     {
         PyObject *obj = PyTuple_GetItem( args, 0 );
         Runtime r;
-        return PyInt_FromLong( isInterfaceClass( r, obj ) );
+        return PyLong_FromLong( isInterfaceClass( r, obj ) );
     }
-    return PyInt_FromLong( 0 );
+    return PyLong_FromLong( 0 );
 }
 
 static PyObject * generateUuid( PyObject *, PyObject * )
@@ -591,41 +593,42 @@ static PyObject * absolutize( PyObject *, PyObject * args )
     return 0;
 }
 
-static PyObject * invoke ( PyObject *, PyObject * args )
+static PyObject * invoke(PyObject *, PyObject *args)
 {
     PyObject *ret = 0;
-    if( PyTuple_Check( args ) && PyTuple_Size( args ) == 3 )
+    if(PyTuple_Check(args) && PyTuple_Size(args) == 3)
     {
-        PyObject *object = PyTuple_GetItem( args, 0 );
-
-        if( PyString_Check( PyTuple_GetItem( args, 1 ) ) )
+        PyObject *object = PyTuple_GetItem(args, 0);
+        PyObject *item1 = PyTuple_GetItem(args, 1);
+        if(PyString_Check(item1) || PyUnicode_Check(item1))
         {
-            const char *name = PyString_AsString( PyTuple_GetItem( args, 1 ) );
-            if( PyTuple_Check( PyTuple_GetItem( args , 2 )))
+            const char *name = PyString_AsString(item1);
+            PyObject *item2 = PyTuple_GetItem(args, 2);
+            if(PyTuple_Check(item2))
             {
-                ret = PyUNO_invoke( object, name , PyTuple_GetItem( args, 2 ) );
+                ret = PyUNO_invoke(object, name, item2);
             }
             else
             {
                 OStringBuffer buf;
-                buf.append( "uno.invoke expects a tuple as 3rd argument, got " );
-                buf.append( PyString_AsString( PyObject_Str( PyTuple_GetItem( args, 2) ) ) );
-                PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
+                buf.append("uno.invoke expects a tuple as 3rd argument, got ");
+                buf.append(PyString_AsString(PyObject_Str(item2)));
+                PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
             }
         }
         else
         {
             OStringBuffer buf;
-            buf.append( "uno.invoke expected a string as 2nd argument, got " );
-            buf.append( PyString_AsString( PyObject_Str( PyTuple_GetItem( args, 1) ) ) );
-            PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
+            buf.append("uno.invoke expected a string as 2nd argument, got ");
+            buf.append(PyString_AsString(PyObject_Str(item1)));
+            PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
         }
     }
     else
     {
         OStringBuffer buf;
-        buf.append( "uno.invoke expects object, name, (arg1, arg2, ... )\n" );
-        PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
+        buf.append("uno.invoke expects object, name, (arg1, arg2, ... )\n");
+        PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
     }
     return ret;
 }
@@ -689,29 +692,52 @@ static PyObject *setCurrentContext( PyObject *, PyObject * args )
 
 struct PyMethodDef PyUNOModule_methods [] =
 {
-    {const_cast< char * >("getComponentContext"), getComponentContext, 1, NULL},
-    {const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, 2, NULL},
-    {const_cast< char * >("getTypeByName"), getTypeByName, 1, NULL},
-    {const_cast< char * >("getConstantByName"), getConstantByName,1, NULL},
-    {const_cast< char * >("getClass"), getClass,1, NULL},
-    {const_cast< char * >("checkEnum"), checkEnum, 1, NULL},
-    {const_cast< char * >("checkType"), checkType, 1, NULL},
-    {const_cast< char * >("generateUuid"), generateUuid,0, NULL},
-    {const_cast< char * >("systemPathToFileUrl"),systemPathToFileUrl,1, NULL},
-    {const_cast< char * >("fileUrlToSystemPath"),fileUrlToSystemPath,1, NULL},
-    {const_cast< char * >("absolutize"),absolutize,2, NULL},
-    {const_cast< char * >("isInterface"),isInterface,1, NULL},
-    {const_cast< char * >("invoke"),invoke, 2, NULL},
-    {const_cast< char * >("setCurrentContext"),setCurrentContext,1, NULL},
-    {const_cast< char * >("getCurrentContext"),getCurrentContext,1, NULL},
+    {const_cast< char * >("getComponentContext"), getComponentContext, METH_VARARGS, NULL},
+    {const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, METH_VARARGS | METH_KEYWORDS, NULL},
+    {const_cast< char * >("getTypeByName"), getTypeByName, METH_VARARGS, NULL},
+    {const_cast< char * >("getConstantByName"), getConstantByName, METH_VARARGS, NULL},
+    {const_cast< char * >("getClass"), getClass, METH_VARARGS, NULL},
+    {const_cast< char * >("checkEnum"), checkEnum, METH_VARARGS, NULL},
+    {const_cast< char * >("checkType"), checkType, METH_VARARGS, NULL},
+    {const_cast< char * >("generateUuid"), generateUuid, METH_VARARGS, NULL},
+    {const_cast< char * >("systemPathToFileUrl"), systemPathToFileUrl, METH_VARARGS, NULL},
+    {const_cast< char * >("fileUrlToSystemPath"), fileUrlToSystemPath, METH_VARARGS, NULL},
+    {const_cast< char * >("absolutize"), absolutize, METH_VARARGS | METH_KEYWORDS, NULL},
+    {const_cast< char * >("isInterface"), isInterface, METH_VARARGS, NULL},
+    {const_cast< char * >("invoke"), invoke, METH_VARARGS | METH_KEYWORDS, NULL},
+    {const_cast< char * >("setCurrentContext"), setCurrentContext, METH_VARARGS, NULL},
+    {const_cast< char * >("getCurrentContext"), getCurrentContext, METH_VARARGS, NULL},
     {NULL, NULL, 0, NULL}
 };
 
 }
 
-extern "C" PY_DLLEXPORT void initpyuno()
+extern "C" PY_DLLEXPORT
+#if PY_MAJOR_VERSION >= 3
+PyObject* PyInit_pyuno()
 {
     // noop when called already, otherwise needed to allow multiple threads
     PyEval_InitThreads();
+    static struct PyModuleDef moduledef =
+    {
+        PyModuleDef_HEAD_INIT,
+        "pyuno",             // module name
+        0,                   // module documentation
+        -1,                  // module keeps state in global variables,
+        PyUNOModule_methods, // modules methods
+        0,                   // m_reload (must be 0)
+        0,                   // m_traverse
+        0,                   // m_clear
+        0,                   // m_free
+    };
+    return PyModule_Create(&moduledef);
+}
+#else
+void initpyuno()
+{
+    PyEval_InitThreads();
     Py_InitModule (const_cast< char * >("pyuno"), PyUNOModule_methods);
 }
+#endif /* PY_MAJOR_VERSION >= 3 */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 754ce05e599e..61d05d8321f5 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,14 +64,15 @@ using com::sun::star::script::XInvocation;
 using com::sun::star::beans::XMaterialHolder;
 using com::sun::star::beans::XIntrospection;
 
+#include <vector>
+
 namespace pyuno
 {
 #define USTR_ASCII(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
 
 static PyTypeObject RuntimeImpl_Type =
 {
-    PyObject_HEAD_INIT (&PyType_Type)
-    0,
+    PyVarObject_HEAD_INIT (&PyType_Type, 0)
     const_cast< char * >("pyuno_runtime"),
     sizeof (RuntimeImpl),
     0,
@@ -78,7 +80,7 @@ static PyTypeObject RuntimeImpl_Type =
     (printfunc) 0,
     (getattrfunc) 0,
     (setattrfunc) 0,
-    (cmpfunc) 0,
+    0,
     (reprfunc) 0,
     0,
     0,
@@ -176,17 +178,17 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile )
         reinterpret_cast< oslGenericFunction >(readLoggingConfig),
         (rtl_uString **) &fileName );
     fileName = OUString( fileName.getStr(), fileName.lastIndexOf( '/' )+1 );
-    fileName += OUString::createFromAscii(  SAL_CONFIGFILE("pyuno") );
+    fileName += OUString(RTL_CONSTASCII_USTRINGPARAM(  SAL_CONFIGFILE("pyuno") ));
     rtl::Bootstrap bootstrapHandle( fileName );
 
     OUString str;
     if( bootstrapHandle.getFrom( USTR_ASCII( "PYUNO_LOGLEVEL" ), str ) )
     {
-        if( str.equalsAscii( "NONE" ) )
+        if( str.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "NONE" ) ) )
             *pLevel = LogLevel::NONE;
-        else if( str.equalsAscii( "CALL" ) )
+        else if( str.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CALL" ) ) )
             *pLevel = LogLevel::CALL;
-        else if( str.equalsAscii( "ARGS" ) )
+        else if( str.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ARGS" ) ) )
             *pLevel = LogLevel::ARGS;
         else
         {
@@ -199,9 +201,9 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile )
         *ppFile = stdout;
         if( bootstrapHandle.getFrom( USTR_ASCII( "PYUNO_LOGTARGET" ), str ) )
         {
-            if( str.equalsAscii( "stdout" ) )
+            if( str.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "stdout" ) ) )
                 *ppFile = stdout;
-            else if( str.equalsAscii( "stderr" ) )
+            else if( str.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "stderr" ) ) )
                 *ppFile = stderr;
             else
             {
@@ -442,7 +444,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
     {
         sal_Int32 l = 0;
         a >>= l;
-        return PyRef( PyInt_FromLong (l), SAL_NO_ACQUIRE );
+        return PyRef( PyLong_FromLong (l), SAL_NO_ACQUIRE );
     }
     case typelib_TypeClass_UNSIGNED_LONG:
     {
@@ -663,6 +665,8 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
     {
 
     }
+    // In Python 3, there is no PyInt type.
+#if PY_MAJOR_VERSION < 3
     else if (PyInt_Check (o))
     {
         if( o == Py_True )
@@ -677,7 +681,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
         }
         else
         {
-            sal_Int32 l = (sal_Int32) PyInt_AsLong( o );
+            sal_Int32 l = (sal_Int32) PyLong_AsLong( o );
             if( l < 128 && l >= -128 )
             {
                 sal_Int8 b = (sal_Int8 ) l;
@@ -694,8 +698,24 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
             }
         }
     }
+#endif /* PY_MAJOR_VERSION < 3 */
     else if (PyLong_Check (o))
     {
+#if PY_MAJOR_VERSION >= 3
+        // Convert the Python 3 booleans that are actually of type PyLong.
+        if(o == Py_True)
+        {
+            sal_Bool b = sal_True;
+            a = Any(&b, getBooleanCppuType());
+        }
+        else if(o == Py_False)
+        {
+            sal_Bool b = sal_False;
+            a = Any(&b, getBooleanCppuType());
+        }
+        else
+        {
+#endif /* PY_MAJOR_VERSION >= 3 */
         sal_Int64 l = (sal_Int64)PyLong_AsLong (o);
         if( l < 128 && l >= -128 )
         {
@@ -717,16 +737,19 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
         {
             a <<= l;
         }
+#if PY_MAJOR_VERSION >= 3
+        }
+#endif
     }
     else if (PyFloat_Check (o))
     {
         double d = PyFloat_AsDouble (o);
         a <<= d;
     }
-    else if (PyString_Check (o))
-    a <<= pyString2ustring(o);
-    else if( PyUnicode_Check( o ) )
-    a <<= pyString2ustring(o);
+    else if (PyString_Check(o) || PyUnicode_Check(o))
+    {
+        a <<= pyString2ustring(o);
+    }
     else if (PyTuple_Check (o))
     {
         Sequence<Any> s (PyTuple_Size (o));
@@ -1056,3 +1079,5 @@ PyRef RuntimeCargo::getUnoModule()
     return dictUnoModule;
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx
index 7bf284bbfeed..3f9f00446101 100644
--- a/pyuno/source/module/pyuno_type.cxx
+++ b/pyuno/source/module/pyuno_type.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -429,3 +430,5 @@ PyObject *PyUNO_ByteSequence_new(
 
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx
index e8dd1f704d7a..ae645a7c32e4 100644
--- a/pyuno/source/module/pyuno_util.cxx
+++ b/pyuno/source/module/pyuno_util.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -247,3 +248,5 @@ void logCall( RuntimeCargo *cargo, const char *intro,
 
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
index f61b3c925d36..bca8892fbdb3 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -27,7 +27,12 @@
 import sys
 
 import pyuno
-import __builtin__
+
+try:
+    import __builtin__
+except ImportError:
+    import builtins as __builtin__
+
 import socket # since on Windows sal3.dll no longer calls WSAStartup
 
 # all functions and variables starting with a underscore (_) must be considered private
@@ -149,9 +154,9 @@ class Bool(object):
        Note: This class is deprecated. Use python's True and False directly instead
     """
     def __new__(cls, value):
-        if isinstance(value, (str, unicode)) and value == "true":
+        if isinstance(value, str) and value == "true":
             return True
-        if isinstance(value, (str, unicode)) and value == "false":
+        if isinstance(value, str) and value == "false":
             return False
         if value:
             return True
@@ -161,7 +166,7 @@ class Char:
     "Represents a UNO char, use an instance of this class to explicitly pass a char to UNO"
     # @param value pass a Unicode string with length 1
     def __init__(self,value):
-        assert isinstance(value, unicode)
+        assert isinstance(value, str)
         assert len(value) == 1
         self.value=value
 
@@ -169,7 +174,7 @@ class Char:
         return "<Char instance %s>" % (self.value, )
         
     def __eq__(self, that):
-        if isinstance(that, (str, unicode)):
+        if isinstance(that, str):
             if len(that) > 1:
                 return False
             return self.value == that[0]
@@ -260,7 +265,7 @@ def _uno_import( name, *optargs, **kwargs ):
     mod = None
     d = sys.modules
     for x in modnames:
-        if d.has_key(x):
+        if x in d:
            mod = d[x]
         else:
            mod = pyuno.__class__(x)  # How to create a module ??
@@ -268,25 +273,25 @@ def _uno_import( name, *optargs, **kwargs ):
 
     RuntimeException = pyuno.getClass( "com.sun.star.uno.RuntimeException" )
     for x in fromlist:
-       if not d.has_key(x):
+       if x not in d:
           if x.startswith( "typeOf" ):
              try: 
                 d[x] = pyuno.getTypeByName( name + "." + x[6:len(x)] )
-             except RuntimeException,e:
+             except RuntimeException as e:
                 raise ImportError( "type " + name + "." + x[6:len(x)] +" is unknown" )
           else:
             try:
                 # check for structs, exceptions or interfaces
                 d[x] = pyuno.getClass( name + "." + x )
-            except RuntimeException,e:
+            except RuntimeException as e:
                 # check for enums 
                 try:
                    d[x] = Enum( name , x )
-                except RuntimeException,e2:
+                except RuntimeException as e2:
                    # check for constants
                    try:
                       d[x] = getConstantByName( name + "." + x )
-                   except RuntimeException,e3:
+                   except RuntimeException as e3:
                       # no known uno type !
                       raise ImportError( "type "+ name + "." +x + " is unknown" )
     return mod
@@ -296,7 +301,7 @@ __builtin__.__dict__["__import__"] = _uno_import
         
 # private function, don't use
 def _impl_extractName(name):
-    r = range (len(name)-1,0,-1)
+    r = list(range(len(name)-1,0,-1))
     for i in r:
         if name[i] == ".":
            name = name[i+1:len(name)]
@@ -336,7 +341,7 @@ def _uno_extract_printable_stacktrace( trace ):
     mod = None
     try:
         mod = __import__("traceback")
-    except ImportError,e:
+    except ImportError as e:
         pass
     ret = ""
     if mod:
diff --git a/pyuno/source/module/unohelper.py b/pyuno/source/module/unohelper.py
index c59df0597a73..112d0d97ebca 100644
--- a/pyuno/source/module/unohelper.py
+++ b/pyuno/source/module/unohelper.py
@@ -78,7 +78,7 @@ def _propertymode_to_str( mode ):
     if PROP_ATTR_MAYBEVOID & mode:
         ret = ret + "maybevoid "
     return ret.rstrip()
-    
+
 def inspect( obj , out ):
     if isinstance( obj, uno.Type ) or \
        isinstance( obj, uno.Char ) or \
@@ -108,7 +108,7 @@ def inspect( obj , out ):
             out.write( "  " + ii.typeName + "\n" )
     else:
         out.write( "  unknown\n" )
-        
+
     access = introspection.inspect( obj )
     methods = access.getMethods( METHOD_CONCEPT_ALL )
     out.write( "Methods:\n" )
@@ -132,56 +132,56 @@ def createSingleServiceFactory( clazz, implementationName, serviceNames ):
     return _FactoryHelper_( clazz, implementationName, serviceNames )
 
 class _ImplementationHelperEntry:
-      def __init__(self, ctor,serviceNames):
-	  self.ctor = ctor
-	  self.serviceNames = serviceNames
-	  
+    def __init__(self, ctor,serviceNames):
+        self.ctor = ctor
+        self.serviceNames = serviceNames
+
 class ImplementationHelper:
-      def __init__(self):
-	  self.impls = {}
-	  
-      def addImplementation( self, ctor, implementationName, serviceNames ):
-          self.impls[implementationName] =  _ImplementationHelperEntry(ctor,serviceNames)
-	  
-      def writeRegistryInfo( self, regKey, smgr ):
-          for i in self.impls.items():
-	      keyName = "/"+ i[0] + "/UNO/SERVICES"
-	      key = regKey.createKey( keyName )
-	      for serviceName in i[1].serviceNames:
-		  key.createKey( serviceName )
-          return 1
-
-      def getComponentFactory( self, implementationName , regKey, smgr ):
-	  entry = self.impls.get( implementationName, None )
-	  if entry == None:
-	     raise RuntimeException( implementationName + " is unknown" , None )
-	  return createSingleServiceFactory( entry.ctor, implementationName, entry.serviceNames )
-
-      def getSupportedServiceNames( self, implementationName ):
-	  entry = self.impls.get( implementationName, None )
-	  if entry == None:
-	     raise RuntimeException( implementationName + " is unknown" , None )
-	  return entry.serviceNames	     
-	  
-      def supportsService( self, implementationName, serviceName ):
-	  entry = self.impls.get( implementationName,None )
-	  if entry == None:
-	     raise RuntimeException( implementationName + " is unknown", None )
-          return serviceName in entry.serviceNames	     
-
-	  
+    def __init__(self):
+        self.impls = {}
+
+    def addImplementation( self, ctor, implementationName, serviceNames ):
+        self.impls[implementationName] =  _ImplementationHelperEntry(ctor,serviceNames)
+
+    def writeRegistryInfo( self, regKey, smgr ):
+        for i in list(self.impls.items()):
+            keyName = "/"+ i[0] + "/UNO/SERVICES"
+            key = regKey.createKey( keyName )
+            for serviceName in i[1].serviceNames:
+                key.createKey( serviceName )
+        return 1
+
+    def getComponentFactory( self, implementationName , regKey, smgr ):
+        entry = self.impls.get( implementationName, None )
+        if entry == None:
+            raise RuntimeException( implementationName + " is unknown" , None )
+        return createSingleServiceFactory( entry.ctor, implementationName, entry.serviceNames )
+
+    def getSupportedServiceNames( self, implementationName ):
+        entry = self.impls.get( implementationName, None )
+        if entry == None:
+            raise RuntimeException( implementationName + " is unknown" , None )
+        return entry.serviceNames
+
+    def supportsService( self, implementationName, serviceName ):
+        entry = self.impls.get( implementationName,None )
+        if entry == None:
+            raise RuntimeException( implementationName + " is unknown", None )
+        return serviceName in entry.serviceNames
+
+
 class ImplementationEntry:
-      def __init__(self, implName, supportedServices, clazz ):
-	  self.implName = implName
-	  self.supportedServices = supportedServices
-	  self.clazz = clazz
+    def __init__(self, implName, supportedServices, clazz ):
+        self.implName = implName
+        self.supportedServices = supportedServices
+        self.clazz = clazz
 
 def writeRegistryInfoHelper( smgr, regKey, seqEntries ):
     for entry in seqEntries:
         keyName = "/"+ entry.implName + "/UNO/SERVICES"
-	key = regKey.createKey( keyName )
-	for serviceName in entry.supportedServices:
-	    key.createKey( serviceName )
+        key = regKey.createKey( keyName )
+        for serviceName in entry.supportedServices:
+            key.createKey( serviceName )
 
 def systemPathToFileUrl( systemPath ):
     "returns a file-url for the given system path"
@@ -194,11 +194,11 @@ def fileUrlToSystemPath( url ):
 def absolutize( path, relativeUrl ):
     "returns an absolute file url from the given urls"
     return pyuno.absolutize( path, relativeUrl )
-        
+
 def getComponentFactoryHelper( implementationName, smgr, regKey, seqEntries ):
     for x in seqEntries:
-	if x.implName == implementationName:
-	   return createSingleServiceFactory( x.clazz, implementationName, x.supportedServices )
+        if x.implName == implementationName:
+            return createSingleServiceFactory( x.clazz, implementationName, x.supportedServices )
 
 def addComponentsToContext( toBeExtendedContext, contextRuntime, componentUrls, loaderName ):
     smgr = contextRuntime.ServiceManager
@@ -210,56 +210,56 @@ def addComponentsToContext( toBeExtendedContext, contextRuntime, componentUrls,
     #   create a temporary registry
     for componentUrl in componentUrls:
         reg = smgr.createInstanceWithContext( "com.sun.star.registry.SimpleRegistry", contextRuntime )
-	reg.open( "", 0, 1 )
+        reg.open( "", 0, 1 )
         if not isWin and componentUrl.endswith( ".uno" ):  # still allow platform independent naming
             if isMac:
-               componentUrl = componentUrl + ".dylib"
+                componentUrl = componentUrl + ".dylib"
             else:
-               componentUrl = componentUrl + ".so"
-
-	implReg.registerImplementation( loaderName,componentUrl, reg )
-	rootKey = reg.getRootKey()
-	implementationKey = rootKey.openKey( "IMPLEMENTATIONS" )
-	implNames = implementationKey.getKeyNames()
-	extSMGR = toBeExtendedContext.ServiceManager
-	for x in implNames:
-	    fac = loader.activate( max(x.split("/")),"",componentUrl,rootKey)
-	    extSMGR.insert( fac )
-	reg.close()
-	    	    
+                componentUrl = componentUrl + ".so"
+
+        implReg.registerImplementation( loaderName,componentUrl, reg )
+        rootKey = reg.getRootKey()
+        implementationKey = rootKey.openKey( "IMPLEMENTATIONS" )
+        implNames = implementationKey.getKeyNames()
+        extSMGR = toBeExtendedContext.ServiceManager
+        for x in implNames:
+            fac = loader.activate( max(x.split("/")),"",componentUrl,rootKey)
+            extSMGR.insert( fac )
+        reg.close()
+
 # never shrinks !
 _g_typeTable = {}
 def _unohelper_getHandle( self):
-   ret = None
-   if _g_typeTable.has_key( self.__class__ ):
-     ret = _g_typeTable[self.__class__]
-   else:
-     names = {}
-     traverse = list(self.__class__.__bases__)
-     while len( traverse ) > 0:
-         item = traverse.pop()
-         bases = item.__bases__
-         if uno.isInterface( item ):
-             names[item.__pyunointerface__] = None
-         elif len(bases) > 0:
-             # the "else if", because we only need the most derived interface
-             traverse = traverse + list(bases)#
-
-     lst = names.keys()
-     types = []
-     for x in lst:
-         t = uno.getTypeByName( x )
-         types.append( t )
-         
-     ret = tuple(types) , uno.generateUuid()
-     _g_typeTable[self.__class__] = ret
-   return ret
-  
+    ret = None
+    if self.__class__ in _g_typeTable:
+        ret = _g_typeTable[self.__class__]
+    else:
+        names = {}
+        traverse = list(self.__class__.__bases__)
+        while len( traverse ) > 0:
+            item = traverse.pop()
+            bases = item.__bases__
+            if uno.isInterface( item ):
+                names[item.__pyunointerface__] = None
+            elif len(bases) > 0:
+                # the "else if", because we only need the most derived interface
+                traverse = traverse + list(bases)#
+
+        lst = list(names.keys())
+        types = []
+        for x in lst:
+            t = uno.getTypeByName( x )
+            types.append( t )
+
+        ret = tuple(types) , uno.generateUuid()
+        _g_typeTable[self.__class__] = ret
+    return ret
+
 class Base(XTypeProvider):
-      def getTypes( self ):
-	  return _unohelper_getHandle( self )[0]
-      def getImplementationId(self):
-	  return _unohelper_getHandle( self )[1]
+    def getTypes( self ):
+        return _unohelper_getHandle( self )[0]
+    def getImplementationId(self):
+        return _unohelper_getHandle( self )[1]
 
 class CurrentContext(XCurrentContext, Base ):
     """a current context implementation, which first does a lookup in the given
@@ -277,28 +277,28 @@ class CurrentContext(XCurrentContext, Base ):
             return self.oldContext.getValueByName( name )
         else:
             return None
-        
+
 # -------------------------------------------------
 # implementation details
 # -------------------------------------------------
 class _FactoryHelper_( XSingleComponentFactory, XServiceInfo, Base ):
-      def __init__( self, clazz, implementationName, serviceNames ):
-	  self.clazz = clazz
-	  self.implementationName = implementationName
-	  self.serviceNames = serviceNames
-	  
-      def getImplementationName( self ):
-	  return self.implementationName
-
-      def supportsService( self, ServiceName ):
-	  return ServiceName in self.serviceNames
-
-      def getSupportedServiceNames( self ):
-	  return self.serviceNames
-
-      def createInstanceWithContext( self, context ):
-	  return self.clazz( context )
-	      
-      def createInstanceWithArgumentsAndContext( self, args, context ):
-	  return self.clazz( context, *args )
-      
+    def __init__( self, clazz, implementationName, serviceNames ):
+        self.clazz = clazz
+        self.implementationName = implementationName
+        self.serviceNames = serviceNames
+
+    def getImplementationName( self ):
+        return self.implementationName
+
+    def supportsService( self, ServiceName ):
+        return ServiceName in self.serviceNames
+
+    def getSupportedServiceNames( self ):
+        return self.serviceNames
+
+    def createInstanceWithContext( self, context ):
+        return self.clazz( context )
+
+    def createInstanceWithArgumentsAndContext( self, args, context ):
+        return self.clazz( context, *args )
+
diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk
index 06241da2bfdb..633bdde609e6 100755
--- a/pyuno/zipcore/makefile.mk
+++ b/pyuno/zipcore/makefile.mk
@@ -35,9 +35,9 @@ LIBTARGET=NO
 .IF "$(L10N_framework)"==""
 UWINAPILIB =
 
-.IF "$(SYSTEM_PYTHON)" == "YES" || "$(GUI)" == "OS2"
+.IF "$(SYSTEM_PYTHON)" == "YES"
 systempython:
-        @echo "Not building python-core because system python is being used"
+	@echo "Not building python-core because system python is being used"
 .ELSE
 
 .INCLUDE : pyversion.mk
@@ -54,12 +54,13 @@ PYTHONBINARY=$(DESTROOT)$/bin$/python$(EXECPOST)
 .ENDIF
 .ENDIF
 
+.IF "$(OS)" != "MACOSX"
 FINDLIBFILES_TMP:=$(subst,/,$/ \
     $(shell @$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v "\.pyc" |$(GREP) -v "\.py~" |$(GREP) -v .orig | $(GREP) -v _failed))
 FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP))
 
 FILES=\
-    $(PYTHONBINARY)	\
+    $(PYTHONBINARY) \
     $(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/lib$(i)) 
 
 .IF "$(OS)" == "WNT"
@@ -75,15 +76,18 @@ OBJFILES = $(OBJ)$/python.obj
 
 ALLTAR: \
     $(BIN)$/$(PYDIRNAME).zip
+.ENDIF
 
 .IF "$(GUI)" == "UNX"
 ALLTAR : $(BIN)$/python.sh
+
+STRIPMAC=-e '/^NONMACSECTION/d' -e '/^MACSECTION/,$$d'
+STRIPNONMAC=-e '/^NONMACSECTION/,/^MACSECTION/d'
+
 $(BIN)$/python.sh : python.sh
-    -rm -f $@
-    cat $? > $@
-    sed 's/%%PYVERSION%%/$(PYVERSION)/g' < $@ > $@.new
-    mv $@.new $@
-    chmod +x $@
+	$(COMMAND_ECHO)sed -e 's/%%PYVERSION%%/$(eq,$(OS),MACOSX $(PYMAJOR).$(PYMINOR) $(PYVERSION))/g' -e 's/%%OOO_LIBRARY_PATH_VAR%%/$(OOO_LIBRARY_PATH_VAR)/g' \
+		$(eq,$(OS),MACOSX $(STRIPNONMAC) $(STRIPMAC)) < $? > $@
+	@chmod +x $@
 .ENDIF
 
 $(OBJ)$/python.obj: $(OUT)$/inc$/pyversion.hxx
@@ -93,7 +97,7 @@ $(OUT)$/inc$/pyversion.hxx: pyversion.inc
 
 $(BIN)$/$(PYDIRNAME).zip : $(FILES)
 .IF "$(GUI)" == "UNX"
-.IF "$(OS)" != "MACOSX"
+.IF "$(OS)" != "AIX"
     cd $(DESTROOT) && find . -name '*$(DLLPOST)' | xargs strip
 .ENDIF
 .ENDIF
@@ -110,7 +114,7 @@ $(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST)
     -$(MKDIRHIER) $(@:d)
     -rm -f $@
     cat $< > $@
-.IF "$(OS)" != "MACOSX"
+.IF "$(OS)" != "MACOSX" && "$(OS)" != "AIX"
     strip $@
 .ENDIF
     chmod +x $@
@@ -127,6 +131,4 @@ $(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
 
 .ENDIF
 .ELSE
-ivo:
-    $(ECHO)
 .ENDIF # L10N_framework
diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx
index 14f629922a1d..68991de1ff26 100644
--- a/pyuno/zipcore/python.cxx
+++ b/pyuno/zipcore/python.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -301,3 +302,5 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
     GetExitCodeProcess(procinfo.hProcess,&exitStatus);
     exit(exitStatus);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh
index b57bc6c3e3b6..e32f1370a0d0 100644
--- a/pyuno/zipcore/python.sh
+++ b/pyuno/zipcore/python.sh
@@ -30,7 +30,7 @@
 sd_cwd="`pwd`"
 if [ -h "$0" ] ; then
     sd_basename=`basename "$0"`
-     sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
+    sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
     cd "`dirname "$0"`"
     cd "`dirname "$sd_script"`"
 else
@@ -43,9 +43,9 @@ cd "$sd_cwd"
 PATH=$sd_prog${PATH+:$PATH}
 export PATH
 
-# Set LD_LIBRARY_PATH so that "import pyuno" finds libpyuno.so:
-LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/ure-link/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH
+# Set %%OOO_LIBRARY_PATH_VAR%% so that "import pyuno" finds libpyuno.so:
+%%OOO_LIBRARY_PATH_VAR%%=$sd_prog/../basis-link/program:$sd_prog/../basis-link/ure-link/lib${%%OOO_LIBRARY_PATH_VAR%%:+:$%%OOO_LIBRARY_PATH_VAR%%}
+export %%OOO_LIBRARY_PATH_VAR%%
 
 # Set UNO_PATH so that "officehelper.bootstrap()" can find soffice executable:
 : ${UNO_PATH=$sd_prog}
@@ -56,6 +56,7 @@ export UNO_PATH
 : ${URE_BOOTSTRAP=vnd.sun.star.pathname:$sd_prog/fundamentalrc}
 export URE_BOOTSTRAP
 
+NONMACSECTION
 PYTHONPATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH}
 export PYTHONPATH
 PYTHONHOME=$sd_prog/../basis-link/program/python-core-%%PYVERSION%%
@@ -63,3 +64,13 @@ export PYTHONHOME
 
 # execute binary
 exec "$sd_prog/../basis-link/program/python.bin" "$@"
+MACSECTION
+PYTHONHOME=$sd_prog/../basis-link/program/OOoPython.framework
+export PYTHONHOME
+
+pybasislibdir=$PYTHONHOME/Versions/%%PYVERSION%%/lib/python%%PYVERSION%%
+PYTHONPATH=$sd_prog/../basis-link/program:$pybasislibdir:$pybasislibdir/lib-dynload:$pybasislibdir/lib-tk:$pybasislibdir/site-packages${PYTHONPATH+:$PYTHONPATH}
+export PYTHONPATH
+
+# execute binary
+exec "$PYTHONHOME/Versions/%%PYVERSION%%/Resources/Python.app/Contents/MacOS/OOoPython" "$@"
diff --git a/rdbmaker/inc/codemaker/dependency.hxx b/rdbmaker/inc/codemaker/dependency.hxx
index 138aad46999b..1f80faee6b95 100644
--- a/rdbmaker/inc/codemaker/dependency.hxx
+++ b/rdbmaker/inc/codemaker/dependency.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,11 +29,9 @@
 #ifndef _CODEMAKER_DEPENDENCY_HXX_
 #define _CODEMAKER_DEPENDENCY_HXX_
 
-#include    <hash_map>
+#include    <boost/unordered_map.hpp>
 #include    <registry/registry.hxx>
-#ifndef __REGISTRY_REFLREAD_HXX__
 #include    <registry/reflread.hxx>
-#endif
 #include    <codemaker/typemanager.hxx>
 #include    <codemaker/global.hxx>
 #include <osl/diagnose.h>
@@ -81,26 +80,7 @@ struct LessTypeUsing
 typedef ::std::set< TypeUsing, LessTypeUsing > TypeUsingSet;
 
 
-#if (defined( _MSC_VER ) && ( _MSC_VER < 1200 ))
-typedef ::std::__hash_map__
-<
-    ::rtl::OString,
-    TypeUsingSet,
-    HashString,
-    EqualString,
-    NewAlloc
-> DependencyMap;
-
-typedef ::std::__hash_map__
-<
-    ::rtl::OString,
-    sal_uInt16,
-    HashString,
-    EqualString,
-    NewAlloc
-> GenerationMap;
-#else
-typedef ::std::hash_map
+typedef ::boost::unordered_map
 <
     ::rtl::OString,
     TypeUsingSet,
@@ -108,7 +88,7 @@ typedef ::std::hash_map
     EqualString
 > DependencyMap;
 
-typedef ::std::hash_map
+typedef ::boost::unordered_map
 <
     ::rtl::OString,
     sal_uInt16,
@@ -116,8 +96,6 @@ typedef ::std::hash_map
     EqualString
 > GenerationMap;
 
-#endif
-
 struct TypeDependencyImpl
 {
     TypeDependencyImpl()
@@ -168,3 +146,5 @@ protected:
 sal_Bool checkTypeDependencies(TypeManager& typeMgr, TypeDependency& dependencies, const ::rtl::OString& type, sal_Bool bDepend = sal_False);
 
 #endif // _CODEMAKER_DEPENDENCY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/inc/codemaker/global.hxx b/rdbmaker/inc/codemaker/global.hxx
index dc12fd833811..9ee538fc9f61 100644
--- a/rdbmaker/inc/codemaker/global.hxx
+++ b/rdbmaker/inc/codemaker/global.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -136,3 +137,4 @@ protected:
 
 #endif // _CODEMAKER_GLOBAL_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/inc/codemaker/options.hxx b/rdbmaker/inc/codemaker/options.hxx
index a4e6d53981c9..b2e504923e7e 100644
--- a/rdbmaker/inc/codemaker/options.hxx
+++ b/rdbmaker/inc/codemaker/options.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,27 +29,16 @@
 #ifndef _CODEMAKER_OPTIONS_HXX_
 #define _CODEMAKER_OPTIONS_HXX_
 
-#include    <hash_map>
+#include    <boost/unordered_map.hpp>
 #include    <codemaker/global.hxx>
 
-#if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
-typedef ::std::__hash_map__
-<
-    ::rtl::OString,
-    ::rtl::OString,
-    HashString,
-    EqualString,
-    NewAlloc
-> OptionMap;
-#else
-typedef ::std::hash_map
+typedef ::boost::unordered_map
 <
     ::rtl::OString,
     ::rtl::OString,
     HashString,
     EqualString
 > OptionMap;
-#endif
 
 class CannotDumpException
 {
@@ -96,3 +86,4 @@ protected:
 
 #endif // _CODEMAKER_OPTIONS_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/inc/codemaker/registry.hxx b/rdbmaker/inc/codemaker/registry.hxx
index 09030a77026a..7686cc5a6fd8 100644
--- a/rdbmaker/inc/codemaker/registry.hxx
+++ b/rdbmaker/inc/codemaker/registry.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -206,3 +207,5 @@ private:
 
 
 #endif // _CODEMAKER_REGISTRY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/inc/codemaker/typemanager.hxx b/rdbmaker/inc/codemaker/typemanager.hxx
index a776865e677f..b651e9baa0ca 100644
--- a/rdbmaker/inc/codemaker/typemanager.hxx
+++ b/rdbmaker/inc/codemaker/typemanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,7 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include    <hash_map>
+#include    <boost/unordered_map.hpp>
 
 #ifndef _CODEMAKER_TYPEMANAGER_HXX_
 #define _CODEMAKER_TYPEMANAGER_HXX_
@@ -32,24 +33,13 @@
 
 typedef ::std::list< Registry* >    RegistryList;
 
-#if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
-typedef ::std::__hash_map__
-<
-    ::rtl::OString, // Typename
-    RTTypeClass,    // TypeClass
-    HashString,
-    EqualString,
-    NewAlloc
-> T2TypeClassMap;
-#else
-typedef ::std::hash_map
+typedef ::boost::unordered_map
 <
     ::rtl::OString, // Typename
     RTTypeClass,    // TypeClass
     HashString,
     EqualString
 > T2TypeClassMap;
-#endif
 
 struct TypeManagerImpl
 {
@@ -170,3 +160,5 @@ protected:
 };
 
 #endif // _CODEMAKER_TYPEMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/prj/d.lst b/rdbmaker/prj/d.lst
index 4476addfa59e..67afbfb68b78 100644
--- a/rdbmaker/prj/d.lst
+++ b/rdbmaker/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\rdbmaker.exe %_DEST%\bin%_EXT%\rdbmaker.exe
-..\%__SRC%\bin\rdbmaker.pdb %_DEST%\bin%_EXT%\rdbmaker.pdb
+..\%__SRC%\bin\rdbmaker.exe %_DEST%\bin\rdbmaker.exe
+..\%__SRC%\bin\rdbmaker.pdb %_DEST%\bin\rdbmaker.pdb
 
-..\%__SRC%\bin\rdbmaker %_DEST%\bin%_EXT%\rdbmaker
+..\%__SRC%\bin\rdbmaker %_DEST%\bin\rdbmaker
diff --git a/rdbmaker/source/codemaker/dependency.cxx b/rdbmaker/source/codemaker/dependency.cxx
index 5305fad0b968..8df5fd4bbeff 100644
--- a/rdbmaker/source/codemaker/dependency.cxx
+++ b/rdbmaker/source/codemaker/dependency.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,8 +30,8 @@
 #include    <rtl/alloc.h>
 #include    <codemaker/dependency.hxx>
 
-using namespace rtl;
-
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
 TypeDependency::TypeDependency()
 {
     m_pImpl = new TypeDependencyImpl();
@@ -299,3 +300,4 @@ sal_Bool checkTypeDependencies(TypeManager& typeMgr, TypeDependency& dependencie
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/codemaker/global.cxx b/rdbmaker/source/codemaker/global.cxx
index 2e6d2a586444..6cf654412f7a 100644
--- a/rdbmaker/source/codemaker/global.cxx
+++ b/rdbmaker/source/codemaker/global.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,16 +26,14 @@
  *
  ************************************************************************/
 #include <osl/process.h>
-#ifndef _RTL_OSTRINGBUFFER_HXX_
 #include <rtl/strbuf.hxx>
-#endif
 #include <rtl/ustring.hxx>
 #include    <osl/thread.h>
 #include    <osl/file.hxx>
 
 #include <stdlib.h>
 #include <stdio.h>
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 #include <direct.h>
 #include <errno.h>
@@ -134,7 +133,7 @@ void FileStream::open(const OString& name, FileAccessMode mode)
     if ( name.getLength() > 0 )
     {
         m_name = name;
-        m_pFile = fopen(m_name, checkAccessMode(mode));
+        m_pFile = fopen(m_name.getStr(), checkAccessMode(mode));
     }
 }
 
@@ -169,3 +168,4 @@ const sal_Char* FileStream::checkAccessMode(FileAccessMode mode)
     return "w+";
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/codemaker/options.cxx b/rdbmaker/source/codemaker/options.cxx
index c4fe96d48d04..7090e282b715 100644
--- a/rdbmaker/source/codemaker/options.cxx
+++ b/rdbmaker/source/codemaker/options.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,8 +28,7 @@
 
 #include    <codemaker/options.hxx>
 
-using namespace rtl;
-
+using ::rtl::OString;
 Options::Options()
 {
 }
@@ -65,3 +65,5 @@ const StringVector& Options::getInputFiles()
     return m_inputFiles;
 }
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/codemaker/typemanager.cxx b/rdbmaker/source/codemaker/typemanager.cxx
index f8e231a9403a..075b8f2a30dd 100644
--- a/rdbmaker/source/codemaker/typemanager.cxx
+++ b/rdbmaker/source/codemaker/typemanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,8 +30,9 @@
 #include    <osl/file.hxx>
 #include    <codemaker/typemanager.hxx>
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
 TypeManager::TypeManager()
 {
     m_pImpl = new TypeManagerImpl();
@@ -115,7 +117,7 @@ sal_Bool RegistryTypeManager::init(sal_Bool bMerged, const StringVector& regFile
             freeRegistries();
             return sal_False;
         }
-        iter++;
+        ++iter;
     }
 
     if (m_pImpl->m_isMerged)
@@ -144,7 +146,7 @@ sal_Bool RegistryTypeManager::init(sal_Bool bMerged, const StringVector& regFile
                         return sal_False;
                     }
                 }
-                iter++;
+                ++iter;
             }
 
             m_pImpl->m_pMergedRegistry = pTmpReg;
@@ -237,7 +239,7 @@ void RegistryTypeManager::freeRegistries()
     {
         delete *iter;
 
-        iter++;
+        ++iter;
     }
 
 }
@@ -264,10 +266,12 @@ RegistryKey RegistryTypeManager::searchTypeKey(const OString& name)
                     break;
             }
 
-            iter++;
+            ++iter;
         }
     }
 
     return key;
 }
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/makefile.mk b/rdbmaker/source/rdbmaker/makefile.mk
index 8b41a93b6e7f..4c93b8be9313 100644
--- a/rdbmaker/source/rdbmaker/makefile.mk
+++ b/rdbmaker/source/rdbmaker/makefile.mk
@@ -37,6 +37,11 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+all:
+    @echo No point in build-time executables for this platform
+.ENDIF
+
 OBJFILES=   $(OBJ)$/rdbmaker.obj	\
             $(OBJ)$/rdboptions.obj	\
             $(OBJ)$/typeblop.obj	\
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index 5a4bd498cca2..b20043ea6f2a 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,11 +32,9 @@
 #include <codemaker/typemanager.hxx>
 #include <codemaker/dependency.hxx>
 
-#ifndef _RTL_OSTRINGBUFFER_HXX_
 #include <rtl/strbuf.hxx>
-#endif
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 #include <direct.h>
 #include <errno.h>
@@ -54,9 +53,14 @@
 
 #define PATH_DELEMITTER '/'
 
-using namespace rtl;
 using namespace osl;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+
 FileStream          listFile;
 RegistryKey         rootKey;
 Registry            regFile;
@@ -143,7 +147,7 @@ sal_Bool checkFilterTypes(const OString& type)
             return sal_True;
         }
 
-        iter++;
+        ++iter;
     }
 
     return sal_False;
@@ -186,12 +190,12 @@ void cleanUp( sal_Bool bError)
     StringList::reverse_iterator iter = dirEntries.rbegin();
     while ( iter != dirEntries.rend() )
     {
-           if (rmdir((char*)(*iter).getStr()) == -1)
+        if (rmdir((char*)(*iter).getStr()) == -1)
         {
             break;
         }
 
-        iter++;
+        ++iter;
     }
 }
 
@@ -222,7 +226,7 @@ OString createFileName(const OString& path)
             continue;
         }
 
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
         if (mkdir((char*)nameBuffer.getStr(), 0777) == -1)
 #else
            if (mkdir((char*)nameBuffer.getStr()) == -1)
@@ -293,7 +297,7 @@ sal_Bool produceAllTypes(const OString& typeName,
 }
 
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -506,3 +510,4 @@ int _cdecl main( int argc, char * argv[] )
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/rdboptions.cxx b/rdbmaker/source/rdbmaker/rdboptions.cxx
index c70424bb7b25..cc78f7a7e1da 100644
--- a/rdbmaker/source/rdbmaker/rdboptions.cxx
+++ b/rdbmaker/source/rdbmaker/rdboptions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,8 +30,7 @@
 
 #include    "rdboptions.hxx"
 
-using namespace rtl;
-
+using ::rtl::OString;
 sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
     throw( IllegalArgument )
 {
@@ -379,3 +379,5 @@ OString RdbOptions::prepareVersion()
 }
 
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/rdboptions.hxx b/rdbmaker/source/rdbmaker/rdboptions.hxx
index 533dc6187197..b1ab63fadcb3 100644
--- a/rdbmaker/source/rdbmaker/rdboptions.hxx
+++ b/rdbmaker/source/rdbmaker/rdboptions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,5 @@ protected:
 };
 
 #endif // _RDBMAKER_RDBOPTIONS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/rdbtype.cxx b/rdbmaker/source/rdbmaker/rdbtype.cxx
index 5bfd27be21af..7c76ee6cd564 100644
--- a/rdbmaker/source/rdbmaker/rdbtype.cxx
+++ b/rdbmaker/source/rdbmaker/rdbtype.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,8 +34,9 @@
 #include    "rdbtype.hxx"
 #include    "rdboptions.hxx"
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
 sal_Bool isBaseType(const OString& type)
 {
     if ( type.equals("long") ||
@@ -97,7 +99,7 @@ sal_Bool produceDependedTypes(const OString& typeName,
                 exit(99);
             }
         }
-        iter++;
+        ++iter;
     }
 
     return ret;
@@ -118,12 +120,6 @@ sal_Bool produceType(const OString& typeName,
 {
     if (typeDependencies.isGenerated(typeName) )
         return sal_True;
-/*
-    RegistryKey     typeKey = typeMgr.getTypeKey(typeName);
-
-    if (!typeKey.isValid())
-        return sal_False;
-*/
     if( !checkTypeDependencies(typeMgr, typeDependencies, typeName, bDepend))
         return sal_False;
 
@@ -134,26 +130,6 @@ sal_Bool produceType(const OString& typeName,
             o << typeName.getStr() << "\n";
         } else
         {
-/*
-            RegValueType    valueType;
-            sal_uInt32      valueSize;
-
-            if (typeKey.getValueInfo(OUString(), &valueType, &valueSize))
-            {
-                if (typeName.equals("/"))
-                    return sal_True;
-                else
-                    return sal_False;
-            }
-
-            sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
-
-            if (typeKey.getValue(OUString(), pBuffer))
-            {
-                rtl_freeMemory(pBuffer);
-                return sal_False;
-            }
-*/
             TypeReader reader = typeMgr.getTypeReader(typeName);
 
             if (!reader.isValid())
@@ -169,18 +145,14 @@ sal_Bool produceType(const OString& typeName,
             RegistryKey typeKey;
             if ( regKey.createKey( OStringToOUString(typeName, RTL_TEXTENCODING_UTF8), typeKey) )
             {
-//              rtl_freeMemory(pBuffer);
                 return sal_False;
             }
 
             if ( typeKey.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)reader.getBlop(), reader.getBlopSize()) )
-//          if ( typeKey.setValue(OUString(), valueType, pBuffer, valueSize) )
             {
-//              rtl_freeMemory(pBuffer);
                 return sal_False;
             }
 
-//          rtl_freeMemory(pBuffer);
         }
     }
 
@@ -193,3 +165,4 @@ sal_Bool produceType(const OString& typeName,
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/rdbtype.hxx b/rdbmaker/source/rdbmaker/rdbtype.hxx
index a6df2266257c..2b9e2230237b 100644
--- a/rdbmaker/source/rdbmaker/rdbtype.hxx
+++ b/rdbmaker/source/rdbmaker/rdbtype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,4 @@ sal_Bool produceType(const ::rtl::OString& typeName,
 
 #endif // _RDBMAKER_RDBTYPE_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/specialtypemanager.cxx b/rdbmaker/source/rdbmaker/specialtypemanager.cxx
index 8089e1b8d68d..a5fe51b1acd5 100644
--- a/rdbmaker/source/rdbmaker/specialtypemanager.cxx
+++ b/rdbmaker/source/rdbmaker/specialtypemanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,8 +36,7 @@ sal_Bool SAL_CALL initTypeMapper( const sal_Char* pRegName );
 sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop);
 }
 
-using namespace rtl;
-
+using ::rtl::OString;
 SpecialTypeManager::SpecialTypeManager()
 {
     m_pImpl = new SpecialTypeManagerImpl();
@@ -99,3 +99,5 @@ RTTypeClass SpecialTypeManager::getTypeClass(const OString& name)
 }
 
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/specialtypemanager.hxx b/rdbmaker/source/rdbmaker/specialtypemanager.hxx
index b363e875b042..ee7321939097 100644
--- a/rdbmaker/source/rdbmaker/specialtypemanager.hxx
+++ b/rdbmaker/source/rdbmaker/specialtypemanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ protected:
 };
 
 #endif // _CODEMAKER_TYPEMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/typeblop.cxx b/rdbmaker/source/rdbmaker/typeblop.cxx
index 0300970567d4..8c0c80244dde 100644
--- a/rdbmaker/source/rdbmaker/typeblop.cxx
+++ b/rdbmaker/source/rdbmaker/typeblop.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,9 +27,7 @@
  ************************************************************************/
 
 #include <rtl/alloc.h>
-#ifndef __REGISTRY_REFLWRIT_HXX__
 #include <registry/reflwrit.hxx>
-#endif
 #include <cppuhelper/servicefactory.hxx>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/reflection/XInterfaceTypeDescription.hpp>
@@ -51,8 +50,8 @@ using namespace com::sun::star::reflection;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
 using namespace cppu;
-//using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 static Reference< XHierarchicalNameAccess > xNameAccess;
 
@@ -156,21 +155,6 @@ sal_uInt32 getInheritedMemberCount( Reference< XTypeDescription >& xType )
 
         memberCount += xIFace->getMembers().getLength();
     }
-//  } else
-//  if ( xType->getTypeClass() == TypeClass_Struct || xType->getTypeClass() == TypeClass_Exception )
-//  {
-//      Reference< XCompoundTypeDescription > xComp(xType, UNO_QUERY);
-//
-//      if ( xComp.is() )
-//          return membercount;
-//
-//      Reference< XTypeDescription > xSuperType = xComp->getBaseType();
-//
-//      if ( xSuperType.is() )
-//          memberCount = getInheritedMemberCount( xSuperType );
-//
-//      memberCount += xComp->getMemberNames().getLength();
-//  }
 
     return memberCount;
 }
@@ -533,3 +517,5 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
 
 
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/pch/precompiled_registry.cxx b/registry/inc/pch/precompiled_registry.cxx
index 23c19ddd1599..81ccbc19b576 100644
--- a/registry/inc/pch/precompiled_registry.cxx
+++ b/registry/inc/pch/precompiled_registry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_registry.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/pch/precompiled_registry.hxx b/registry/inc/pch/precompiled_registry.hxx
index 7709276aefa4..0b647d0fd083 100644
--- a/registry/inc/pch/precompiled_registry.hxx
+++ b/registry/inc/pch/precompiled_registry.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/reader.h b/registry/inc/registry/reader.h
index 50fa802c4f83..9244735c7aa7 100644
--- a/registry/inc/registry/reader.h
+++ b/registry/inc/registry/reader.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,7 +65,7 @@ extern "C" {
    not be null; if the given binary blob is malformed, or of a version larger
    than <code>maxVersion</code>, null is returned
 
-   @return false iff an out-of-memory condition occured, in which case
+   @return false iff an out-of-memory condition occurred, in which case
    <code>result</code> is left unchanged, and no type reader is created
 
    @since UDK 3.2.0
@@ -322,7 +323,7 @@ void SAL_CALL typereg_reader_getFieldTypeName(
    @param result an out-parameter obtaining the field value's value; must not be
    null
 
-   @return false iff an out-of-memory condition occured, in which case
+   @return false iff an out-of-memory condition occurred, in which case
    <code>type</code> and <code>value</code> are left unchanged
 
    @since UDK 3.2.0
@@ -608,3 +609,5 @@ void SAL_CALL typereg_reader_getReferenceTypeName(
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/reader.hxx b/registry/inc/registry/reader.hxx
index 30e5abb148aa..cbb0c68f8d30 100644
--- a/registry/inc/registry/reader.hxx
+++ b/registry/inc/registry/reader.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -630,3 +631,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/reflread.hxx b/registry/inc/registry/reflread.hxx
index 4b964ee8a013..9b480d57b390 100644
--- a/registry/inc/registry/reflread.hxx
+++ b/registry/inc/registry/reflread.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -517,3 +518,5 @@ inline RTFieldAccess RegistryTypeReader::getReferenceAccess( sal_uInt16 index )
     {  return m_pApi->getReferenceAccess(m_hImpl, index); }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/refltype.hxx b/registry/inc/registry/refltype.hxx
index 27634e9dce28..b1267e4097e7 100644
--- a/registry/inc/registry/refltype.hxx
+++ b/registry/inc/registry/refltype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ struct RTUik
 #define TYPEREG_CALLTYPE    SAL_CALL
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/reflwrit.hxx b/registry/inc/registry/reflwrit.hxx
index 0046b8829810..2a326c5c40fb 100644
--- a/registry/inc/registry/reflwrit.hxx
+++ b/registry/inc/registry/reflwrit.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -353,3 +354,5 @@ inline void RegistryTypeWriter::setReferenceData( sal_uInt16                inde
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/registry.h b/registry/inc/registry/registry.h
index 6286af132283..a35c9dfde82c 100644
--- a/registry/inc/registry/registry.h
+++ b/registry/inc/registry/registry.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -475,3 +476,4 @@ RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey);
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/registry.hxx b/registry/inc/registry/registry.hxx
index 7ded0738cd72..0ae9136fcf1d 100644
--- a/registry/inc/registry/registry.hxx
+++ b/registry/inc/registry/registry.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1256,3 +1257,5 @@ inline RegError Registry::dumpRegistry(RegistryKey& rKey)
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/regtype.h b/registry/inc/registry/regtype.h
index be3cf42de735..0f439b970733 100644
--- a/registry/inc/registry/regtype.h
+++ b/registry/inc/registry/regtype.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -177,3 +178,5 @@ enum RegError
 #define REGISTRY_CALLTYPE   SAL_CALL
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/types.h b/registry/inc/registry/types.h
index a6898be582d9..44ccda8abad6 100644
--- a/registry/inc/registry/types.h
+++ b/registry/inc/registry/types.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -338,3 +339,5 @@ enum RTReferenceType {
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/version.h b/registry/inc/registry/version.h
index cabd3639104c..bf4664287d0f 100644
--- a/registry/inc/registry/version.h
+++ b/registry/inc/registry/version.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ enum typereg_Version {
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/writer.h b/registry/inc/registry/writer.h
index 5f14766b0f30..57a9f81c9684 100644
--- a/registry/inc/registry/writer.h
+++ b/registry/inc/registry/writer.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -267,3 +268,5 @@ void const * SAL_CALL typereg_writer_getBlob(void * handle, sal_uInt32 * size)
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/writer.hxx b/registry/inc/registry/writer.hxx
index 50bf542024b8..ce7433c31129 100644
--- a/registry/inc/registry/writer.hxx
+++ b/registry/inc/registry/writer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -301,3 +302,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/prj/d.lst b/registry/prj/d.lst
index 644f28e5cfd8..f1dfa729c7f7 100644
--- a/registry/prj/d.lst
+++ b/registry/prj/d.lst
@@ -1,19 +1,19 @@
-mkdir: %_DEST%\inc%_EXT%\registry
+mkdir: %_DEST%\inc\registry
 
-..\inc\registry\*.h %_DEST%\inc%_EXT%\registry\*.h
-..\inc\registry\*.hxx %_DEST%\inc%_EXT%\registry\*.hxx
+..\inc\registry\*.h %_DEST%\inc\registry\*.h
+..\inc\registry\*.hxx %_DEST%\inc\registry\*.hxx
 
-..\%__SRC%\lib\ireg.lib %_DEST%\lib%_EXT%\ireg.lib
-..\%__SRC%\lib\libreg.*.* %_DEST%\lib%_EXT%\*
-..\%__SRC%\bin\reg*.dll %_DEST%\bin%_EXT%\reg*.dll
+..\%__SRC%\lib\ireg.lib %_DEST%\lib\ireg.lib
+..\%__SRC%\lib\libreg.* %_DEST%\lib\*
+..\%__SRC%\bin\reg*.dll %_DEST%\bin\reg*.dll
 
-..\%__SRC%\bin\checksingleton.exe %_DEST%\bin%_EXT%\checksingleton.exe
-..\%__SRC%\bin\regcompare.exe %_DEST%\bin%_EXT%\regcompare.exe
-..\%__SRC%\bin\regmerge.exe %_DEST%\bin%_EXT%\regmerge.exe
-..\%__SRC%\bin\regview.exe %_DEST%\bin%_EXT%\regview.exe
-..\%__SRC%\bin\checksingleton %_DEST%\bin%_EXT%\checksingleton
-..\%__SRC%\bin\regcompare %_DEST%\bin%_EXT%\regcompare
-..\%__SRC%\bin\regmerge %_DEST%\bin%_EXT%\regmerge
-..\%__SRC%\bin\regview %_DEST%\bin%_EXT%\regview
+..\%__SRC%\bin\checksingleton.exe %_DEST%\bin\checksingleton.exe
+..\%__SRC%\bin\regcompare.exe %_DEST%\bin\regcompare.exe
+..\%__SRC%\bin\regmerge.exe %_DEST%\bin\regmerge.exe
+..\%__SRC%\bin\regview.exe %_DEST%\bin\regview.exe
+..\%__SRC%\bin\checksingleton %_DEST%\bin\checksingleton
+..\%__SRC%\bin\regcompare %_DEST%\bin\regcompare
+..\%__SRC%\bin\regmerge %_DEST%\bin\regmerge
+..\%__SRC%\bin\regview %_DEST%\bin\regview
 
 linklib: libreg.*.*
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 9496aee84d8e..4603ce41d163 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1076,3 +1077,5 @@ OUString ORegKey::getFullPath(OUString const & path) const {
     }
     return b.makeStringAndClear();
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index c2558b4f8394..a384d2024953 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -149,3 +150,4 @@ private:
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx
index 4b64a1ad61ea..8d682d9a966b 100644
--- a/registry/source/reflcnst.hxx
+++ b/registry/source/reflcnst.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -293,3 +294,4 @@ sal_uInt32 UINT16StringLen(const sal_uInt8* wstring);
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index a61b5e5f58fa..ad5821d587f9 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,10 +51,6 @@ const sal_uInt32    magic = 0x12345678;
 const sal_uInt16 minorVersion = 0x0000;
 const sal_uInt16 majorVersion = 0x0001;
 
-#if defined ( GCC ) && ( defined ( SCO ) )
-ORealDynamicLoader* ODynamicLoader<RegistryTypeReader_Api>::m_pLoader = NULL;
-#endif
-
 /**************************************************************************
 
     class BlopObject
@@ -1772,3 +1769,5 @@ RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api(void)
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 442951849b02..69cffead8372 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,11 +43,11 @@
 
 #include "reflcnst.hxx"
 
-using namespace rtl;
+using ::rtl::OString;
+
 
 namespace {
 
-// Throws std::bad_alloc:
 inline rtl::OString toByteString(rtl_uString const * str) {
     return rtl::OString(
         str->buffer, str->length, RTL_TEXTENCODING_UTF8,
@@ -57,10 +58,6 @@ inline rtl::OString toByteString(rtl_uString const * str) {
 
 static sal_Unicode NULL_WSTRING[1] = { 0 };
 
-#if defined ( GCC ) && ( defined ( SCO ) )
-ORealDynamicLoader* ODynamicLoader<RegistryTypeWriter_Api>::m_pLoader = NULL;
-#endif
-
 #define BLOP_OFFSET_MAGIC       0
 #define BLOP_OFFSET_SIZE        (BLOP_OFFSET_MAGIC + sizeof(sal_uInt32))
 #define BLOP_OFFSET_MINOR       (BLOP_OFFSET_SIZE + sizeof(sal_uInt32))
@@ -1489,3 +1486,5 @@ RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void)
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 2d3322c25b13..0bd28d0a2fb8 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,20 +35,16 @@
 #include    <string.h>
 #include    <stdio.h>
 
-#if defined(UNX) || defined(OS2)
+#if defined(UNX)
 #include    <unistd.h>
 #endif
 #ifdef __MINGW32__
 #include    <unistd.h>
 #endif
 
-#ifndef __REGISTRY_REFLREAD_HXX__
 #include    <registry/reflread.hxx>
-#endif
 
-#ifndef __REGISTRY_REFLWRIT_HXX__
 #include    <registry/reflwrit.hxx>
-#endif
 
 #include "registry/reader.hxx"
 #include "registry/refltype.hxx"
@@ -64,13 +61,13 @@
 #include    <rtl/ustrbuf.hxx>
 #include    <osl/file.hxx>
 
-using namespace rtl;
 using namespace osl;
 using namespace store;
 
-#if defined ( GCC ) && ( defined ( SCO ) )
-sal_helper::ORealDynamicLoader* sal_helper::ODynamicLoader<RegistryTypeReader_Api>::m_pLoader = NULL;
-#endif
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
 
 namespace {
 
@@ -471,6 +468,7 @@ ORegistry::~ORegistry()
 //
 RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMode)
 {
+    RegError eRet = REG_INVALID_REGISTRY;
     OStoreFile      rRegFile;
     storeAccessMode sAccessMode = REG_MODE_OPEN;
     storeError      errCode;
@@ -478,8 +476,8 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
     if (accessMode & REG_CREATE)
     {
         sAccessMode = REG_MODE_CREATE;
-    } else
-    if (accessMode & REG_READONLY)
+    }
+    else if (accessMode & REG_READONLY)
     {
         sAccessMode = REG_MODE_OPENREAD;
         m_readOnly = sal_True;
@@ -499,17 +497,21 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
     {
         switch (errCode)
         {
-            case  store_E_NotExists:
-                return REG_REGISTRY_NOT_EXISTS;
+            case store_E_NotExists:
+                eRet = REG_REGISTRY_NOT_EXISTS;
+                break;
             case store_E_LockingViolation:
-                return REG_CANNOT_OPEN_FOR_READWRITE;
+                eRet = REG_CANNOT_OPEN_FOR_READWRITE;
+                break;
             default:
-                return REG_INVALID_REGISTRY;
+                eRet = REG_INVALID_REGISTRY;
+                break;
         }
-    } else
+    }
+    else
     {
         OStoreDirectory rStoreDir;
-        storeError      _err = rStoreDir.create(rRegFile, OUString(), OUString(), sAccessMode);
+        storeError _err = rStoreDir.create(rRegFile, OUString(), OUString(), sAccessMode);
 
         if ( _err == store_E_None )
         {
@@ -518,10 +520,13 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
             m_isOpen = sal_True;
 
             m_openKeyTable[ROOT] = new ORegKey(ROOT, this);
-            return REG_NO_ERROR;
-        } else
-            return REG_INVALID_REGISTRY;
+            eRet = REG_NO_ERROR;
+        }
+        else
+            eRet = REG_INVALID_REGISTRY;
     }
+
+    return eRet;
 }
 
 
@@ -1758,3 +1763,5 @@ RegError ORegistry::dumpKey(const OUString& sPath, const OUString& sName, sal_In
 
     return REG_NO_ERROR;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index 7523bb586749..80b6470704c5 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,7 @@
 #define _REGIMPL_HXX_
 
 #include <set>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include    <registry/registry.h>
 #include    <rtl/ustring.hxx>
@@ -61,9 +62,6 @@
 #define REG_GUARD(mutex) \
     osl::Guard< osl::Mutex > aGuard( mutex );
 
-// @@@ using namespace rtl;
-// @@@ using namespace osl;
-
 class ORegKey;
 class RegistryTypeReader;
 
@@ -122,7 +120,7 @@ public:
 
     ORegKey*    getRootKey();
 
-    const store::OStoreFile& getStoreFile()
+    const store::OStoreFile& getStoreFile() const
         { return m_file; }
 
     const rtl::OUString&    getName() const
@@ -167,7 +165,7 @@ private:
                         const rtl::OUString& sName,
                         sal_Int16 nSpace) const;
 
-    typedef std::hash_map< rtl::OUString, ORegKey*, rtl::OUStringHash > KeyMap;
+    typedef boost::unordered_map< rtl::OUString, ORegKey*, rtl::OUStringHash > KeyMap;
 
     sal_uInt32      m_refCount;
     osl::Mutex          m_mutex;
@@ -182,3 +180,4 @@ private:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index ea858f062f51..d61fa32a4b5e 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,7 +37,7 @@
 #include "regimpl.hxx"
 #include "regkey.hxx"
 
-#if defined(WIN32) || defined(WNT) || defined(OS2)
+#if defined(WIN32) || defined(WNT)
 #include <io.h>
 #endif
 
@@ -46,10 +47,6 @@
 #include <unistd.h>
 #endif
 
-#if defined ( GCC ) && ( defined ( SCO ) )
-ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pLoader = NULL;
-#endif
-
 extern "C" {
 
 //*********************************************************************
@@ -630,3 +627,4 @@ RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx
index c65de7e3e2ca..6ea83afe6a54 100644
--- a/registry/source/regkey.cxx
+++ b/registry/source/regkey.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1020,3 +1021,5 @@ RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey,
 
     return getResolvedKeyName(hKey, keyName, firstLinkOnly, pResolvedName);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/regkey.hxx b/registry/source/regkey.hxx
index 4a9e711e28af..0503c05772c9 100644
--- a/registry/source/regkey.hxx
+++ b/registry/source/regkey.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,5 @@ RegError REGISTRY_CALLTYPE freeKeyNames(rtl_uString**, sal_uInt32);
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/test/regdiagnose.h b/registry/test/regdiagnose.h
index 475e315cd32d..08e0ea6602eb 100644
--- a/registry/test/regdiagnose.h
+++ b/registry/test/regdiagnose.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,3 +43,5 @@
 
 
 #endif // REG_DIAGNOSE_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx
index 35c32f751fa6..d91117be2be3 100644
--- a/registry/test/testmerge.cxx
+++ b/registry/test/testmerge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,14 +42,15 @@
 
 
 using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 sal_Int32 lValue1   = 123456789;
 sal_Int32 lValue2   = 54321;
 sal_Int32 lValue3   = 111333111;
 sal_Int32 lValue4   = 333111333;
 sal_Char* sValue    = (sal_Char*)"string Value";
-OUString wValue = rtl::OUString::createFromAscii( "unicode Value" );
+OUString wValue(RTL_CONSTASCII_USTRINGPARAM("unicode Value"));
 
 
 void test_generateMerge1()
@@ -57,21 +59,21 @@ void test_generateMerge1()
 
     RegistryKey rootKey, key1, key2, key3, key4, key5, key6, key7, key8, key9;
 
-    REG_ENSURE(!myRegistry->create(OUString::createFromAscii("merge1.rdb")), "testGenerateMerge1 error 1");
+    REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("merge1.rdb"))), "testGenerateMerge1 error 1");
     REG_ENSURE(!myRegistry->openRootKey(rootKey), "testGenerateMerge1 error 2");
 
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("MergeKey1"), key1), "testGenerateMerge1 error 3");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey1"), key2), "testGenerateMerge1 error 4");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey1/KeyWithLongValue"), key3), "testGenerateMerge1 error 5");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1")), key1), "testGenerateMerge1 error 3");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1")), key2), "testGenerateMerge1 error 4");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1/KeyWithLongValue")), key3), "testGenerateMerge1 error 5");
     REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_LONG, &lValue1, sizeof(sal_Int32)), "testGenerateMerge1 error 5a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey2"), key4), "testGenerateMerge1 error 6");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey2/KeyWithStringValue"), key5), "testGenerateMerge1 error 7");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2")), key4), "testGenerateMerge1 error 6");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2/KeyWithStringValue")), key5), "testGenerateMerge1 error 7");
     REG_ENSURE(!key5.setValue(OUString(), RG_VALUETYPE_STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 7a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey3"), key6), "testGenerateMerge1 error 8");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), key7), "testGenerateMerge1 error 9");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3")), key6), "testGenerateMerge1 error 8");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue")), key7), "testGenerateMerge1 error 9");
     REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_UNICODE, (void*)wValue.getStr(), ((wValue.getLength()+1)*sizeof(sal_Unicode))), "testGenerateMerge1 error 9a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey4"), key8), "testGenerateMerge1 error 10");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), key9), "testGenerateMerge1 error 11");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4")), key8), "testGenerateMerge1 error 10");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4/KeyWithBinaryValue")), key9), "testGenerateMerge1 error 11");
     REG_ENSURE(!key9.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)"abcdefghijklmnopqrstuvwxyz", 27), "testGenerateMerge1 error 11a");
 
 
@@ -85,18 +87,18 @@ void test_generateMerge1()
                 !key8.closeKey() &&
                 !key9.closeKey(), "testGenerateMerge1 error 12");
 
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("MergeKey1u2"), key1), "testGenerateMerge1 error 13");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey11"), key2), "testGenerateMerge1 error 14");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), key3), "testGenerateMerge1 error 15");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1u2")), key1), "testGenerateMerge1 error 13");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11")), key2), "testGenerateMerge1 error 14");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11/KeyWithLongValue")), key3), "testGenerateMerge1 error 15");
     REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_LONG, &lValue2, sizeof(sal_Int32)), "testGenerateMerge1 error 15a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey12"), key4), "testGenerateMerge1 error 16");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), key5), "testGenerateMerge1 error 17");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12")), key4), "testGenerateMerge1 error 16");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12/KeyWithStringValue")), key5), "testGenerateMerge1 error 17");
     REG_ENSURE(!key5.setValue(OUString(), RG_VALUETYPE_STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 17a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey13"), key6), "testGenerateMerge1 error 18");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), key7), "testGenerateMerge1 error 19");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13")), key6), "testGenerateMerge1 error 18");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue")), key7), "testGenerateMerge1 error 19");
     REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_UNICODE, (void*)wValue.getStr(), ((wValue.getLength()+1)*sizeof(sal_Unicode))), "testGenerateMerge1 error 19a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2"), key8), "testGenerateMerge1 error 20");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), key9), "testGenerateMerge1 error 21");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2")), key8), "testGenerateMerge1 error 20");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), key9), "testGenerateMerge1 error 21");
     REG_ENSURE(!key9.setValue(OUString(), RG_VALUETYPE_LONG, &lValue3, sizeof(sal_Int32)), "testGenerateMerge1 error 21a");
 
     REG_ENSURE(!rootKey.closeKey() &&
@@ -123,21 +125,21 @@ void test_generateMerge2()
 
     RegistryKey rootKey, key1, key2, key3, key4, key5, key6, key7, key8, key9;
 
-    REG_ENSURE(!myRegistry->create(OUString::createFromAscii("merge2.rdb")), "testGenerateMerge2 error 1");
+    REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("merge2.rdb"))), "testGenerateMerge2 error 1");
     REG_ENSURE(!myRegistry->openRootKey(rootKey), "testGenerateMerge2 error 2");
 
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("MergeKey2"), key1), "testGenerateMerge2 error 3");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey1"), key2), "testGenerateMerge2 error 4");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), key3), "testGenerateMerge2 error 5");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey2")), key1), "testGenerateMerge2 error 3");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1")), key2), "testGenerateMerge2 error 4");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1/KeyWithBinaryValue")), key3), "testGenerateMerge2 error 5");
     REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)"1234567890", 11), "testGenerateMerge1 error 5a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey2"), key4), "testGenerateMerge2 error 6");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), key5), "testGenerateMerge2 error 7");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2")), key4), "testGenerateMerge2 error 6");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue")), key5), "testGenerateMerge2 error 7");
     REG_ENSURE(!key5.setValue(OUString(), RG_VALUETYPE_UNICODE, (void*)wValue.getStr(), ((wValue.getLength()+1)*sizeof(sal_Unicode))), "testGenerateMerge1 error 7a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey3"), key6), "testGenerateMerge2 error 8");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey3/KeyWithStringValue"), key7), "testGenerateMerge2 error 9");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3")), key6), "testGenerateMerge2 error 8");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3/KeyWithStringValue")), key7), "testGenerateMerge2 error 9");
     REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 9a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey4"), key8), "testGenerateMerge2 error 10");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey4/KeyWithLongValue"), key9), "testGenerateMerge2 error 11");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4")), key8), "testGenerateMerge2 error 10");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4/KeyWithLongValue")), key9), "testGenerateMerge2 error 11");
     REG_ENSURE(!key9.setValue(OUString(), RG_VALUETYPE_LONG, &lValue1, sizeof(sal_Int32)), "testGenerateMerge1 error 11a");
 
     REG_ENSURE(!key1.closeKey() &&
@@ -150,18 +152,18 @@ void test_generateMerge2()
                 !key8.closeKey() &&
                 !key9.closeKey(), "testGenerateMerge2 error 12");
 
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("MergeKey1u2"), key1), "testGenerateMerge2 error 13");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey21"), key2), "testGenerateMerge2 error 14");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), key3), "testGenerateMerge2 error 15");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1u2")), key1), "testGenerateMerge2 error 13");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21")), key2), "testGenerateMerge2 error 14");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue")), key3), "testGenerateMerge2 error 15");
     REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)"a1b2c3d4e5f6g7h8i9", 19), "testGenerateMerge1 error 15a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey22"), key4), "testGenerateMerge2 error 16");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), key5), "testGenerateMerge2 error 17");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22")), key4), "testGenerateMerge2 error 16");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22/KeyWithLongValue")), key5), "testGenerateMerge2 error 17");
     REG_ENSURE(!key5.setValue(OUString(), RG_VALUETYPE_LONG, &lValue2, sizeof(sal_Int32)), "testGenerateMerge1 error 17a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey23"), key6), "testGenerateMerge2 error 18");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), key7), "testGenerateMerge2 error 19");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23")), key6), "testGenerateMerge2 error 18");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23/KeyWithStringValue")), key7), "testGenerateMerge2 error 19");
     REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 19a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2"), key8), "testGenerateMerge2 error 20");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), key9), "testGenerateMerge2 error 21");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2")), key8), "testGenerateMerge2 error 20");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), key9), "testGenerateMerge2 error 21");
     REG_ENSURE(!key9.setValue(OUString(), RG_VALUETYPE_LONG, &lValue4, sizeof(sal_Int32)), "testGenerateMerge1 error 21a");
 
     REG_ENSURE(!rootKey.closeKey() &&
@@ -188,112 +190,112 @@ void test_merge()
 
     RegistryKey rootKey, key1, mkey1, key2, mkey2, key1u2, mkey1u2;
 
-    REG_ENSURE(!myRegistry->create(OUString::createFromAscii("mergetest.rdb")), "testMerge error 1");
-    REG_ENSURE(myRegistry->getName().equals(OUString::createFromAscii("mergetest.rdb")), "testMerge error 1.a)");
+    REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("mergetest.rdb"))), "testMerge error 1");
+    REG_ENSURE(myRegistry->getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("mergetest.rdb"))), "testMerge error 1.a)");
     REG_ENSURE(!myRegistry->openRootKey(rootKey), "testMerge error 2");
-    REG_ENSURE(!myRegistry->loadKey(rootKey, OUString::createFromAscii("/stardiv/IchbineinMergeKey"),
-                OUString::createFromAscii("merge1.rdb")), "testMerge error 3");
-    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString::createFromAscii("/stardiv/IchbineinMergeKey"),
-                OUString::createFromAscii("merge2.rdb")), "testMerge error 4");
+    REG_ENSURE(!myRegistry->loadKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("merge1.rdb"))), "testMerge error 3");
+    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("merge2.rdb"))), "testMerge error 4");
 
     ///////////////////////////////////////////////////////////////////////////
 
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/stardiv/IchbineinMergeKey"), key1), "testMerge error 5");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), key1), "testMerge error 5");
 
-    REG_ENSURE(!key1.openKey(OUString::createFromAscii("MergeKey1"), mkey1), "testMerge error 6");
+    REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1")), mkey1), "testMerge error 6");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 7");
 
-    REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey1"), mkey1), "testMerge error 8");
+    REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1")), mkey1), "testMerge error 8");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 9");
-    REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey1/KeyWithLongValue"), mkey1), "testMerge error 10");
+    REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1/KeyWithLongValue")), mkey1), "testMerge error 10");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 11");
 
-    REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey2"), mkey1), "testMerge error 12");
+    REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2")), mkey1), "testMerge error 12");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 13");
-    REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey2/KeyWithStringValue"), mkey1), "testMerge error 14");
+    REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2/KeyWithStringValue")), mkey1), "testMerge error 14");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 15");
 
-    REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey3"), mkey1), "testMerge error 16");
+    REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3")), mkey1), "testMerge error 16");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 17");
-    REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), mkey1), "testMerge error 18");
+    REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue")), mkey1), "testMerge error 18");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 19");
 
-    REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey4"), mkey1), "testMerge error 20");
+    REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4")), mkey1), "testMerge error 20");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 21");
-    REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), mkey1), "testMerge error 22");
+    REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4/KeyWithBinaryValue")), mkey1), "testMerge error 22");
     REG_ENSURE(!mkey1.closeKey(), "testMerge error 23");
 
     REG_ENSURE(!key1.closeKey(), "testMerge error 24");
 
     ///////////////////////////////////////////////////////////////////////////
 
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/stardiv/IchbineinMergeKey"), key2), "testMerge error 25");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), key2), "testMerge error 25");
 
-    REG_ENSURE(!key2.openKey(OUString::createFromAscii("MergeKey2"), mkey2), "testMerge error 26");
+    REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey2")), mkey2), "testMerge error 26");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 27");
 
-    REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey1"), mkey2), "testMerge error 28");
+    REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1")), mkey2), "testMerge error 28");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 29");
-    REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), mkey2), "testMerge error 30");
+    REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1/KeyWithBinaryValue")), mkey2), "testMerge error 30");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 31");
 
-    REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey2"), mkey2), "testMerge error 31");
+    REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2")), mkey2), "testMerge error 31");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 33");
-    REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), mkey2), "testMerge error 34");
+    REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue")), mkey2), "testMerge error 34");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 35");
 
-    REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey3"), mkey2), "testMerge error 36");
+    REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3")), mkey2), "testMerge error 36");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 37");
-    REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey3/KeyWithStringValue"), mkey2), "testMerge error 38");
+    REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3/KeyWithStringValue")), mkey2), "testMerge error 38");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 39");
 
-    REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey4"), mkey2), "testMerge error 40");
+    REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4")), mkey2), "testMerge error 40");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 41");
-    REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey4/KeyWithLongValue"), mkey2), "testMerge error 42");
+    REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4/KeyWithLongValue")), mkey2), "testMerge error 42");
     REG_ENSURE(!mkey2.closeKey(), "testMerge error 43");
 
     REG_ENSURE(!key2.closeKey(), "testMerge error 44");
 
     ///////////////////////////////////////////////////////////////////////////
 
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/stardiv/IchbineinMergeKey"), key1u2), "testMerge error 40");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), key1u2), "testMerge error 40");
 
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("MergeKey1u2"), mkey1u2), "testMerge error 41");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1u2")), mkey1u2), "testMerge error 41");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 42");
 
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey11"), mkey1u2), "testMerge error 43");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11")), mkey1u2), "testMerge error 43");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 44");
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), mkey1u2), "testMerge error 45");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11/KeyWithLongValue")), mkey1u2), "testMerge error 45");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 46");
 
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey12"), mkey1u2), "testMerge error 47");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12")), mkey1u2), "testMerge error 47");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 48");
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), mkey1u2), "testMerge error 49");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12/KeyWithStringValue")), mkey1u2), "testMerge error 49");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 50");
 
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey13"), mkey1u2), "testMerge error 51");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13")), mkey1u2), "testMerge error 51");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 52");
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), mkey1u2), "testMerge error 53");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue")), mkey1u2), "testMerge error 53");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 54");
 
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey21"), mkey1u2), "testMerge error 55");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21")), mkey1u2), "testMerge error 55");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 56");
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), mkey1u2), "testMerge error 57");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue")), mkey1u2), "testMerge error 57");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 58");
 
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey22"), mkey1u2), "testMerge error 59");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22")), mkey1u2), "testMerge error 59");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 60");
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), mkey1u2), "testMerge error 61");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22/KeyWithLongValue")), mkey1u2), "testMerge error 61");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 62");
 
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey23"), mkey1u2), "testMerge error 63");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23")), mkey1u2), "testMerge error 63");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 64");
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), mkey1u2), "testMerge error 65");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23/KeyWithStringValue")), mkey1u2), "testMerge error 65");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 66");
 
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2"), mkey1u2), "testMerge error 67");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2")), mkey1u2), "testMerge error 67");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 68");
-    REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), mkey1u2), "testMerge error 69");
+    REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), mkey1u2), "testMerge error 69");
     REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 70");
 
     REG_ENSURE(!key1u2.closeKey(), "testMerge error 71");
@@ -305,101 +307,101 @@ void test_merge()
     sal_Int32           int32Value;
     sal_uInt8           *Value;
 
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/stardiv/IchbineinMergeKey"), key1), "testMerge error 72");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), key1), "testMerge error 72");
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1/MK1SubKey1/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 73");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 73");
     REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 74");
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1/MK1SubKey1/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 74.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 74.a)");
     REG_ENSURE(int32Value == lValue1, "testMerge error 74.b)");
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1/MK1SubKey2/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 75");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2/KeyWithStringValue")), &valueType, &valueSize), "testMerge error 75");
     REG_ENSURE(valueType == RG_VALUETYPE_STRING && valueSize == strlen(sValue)+1, "testMerge error 76");
     Value = new sal_uInt8[valueSize];
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1/MK1SubKey2/KeyWithStringValue"), (RegValue)Value), "testMerge error 76.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2/KeyWithStringValue")), (RegValue)Value), "testMerge error 76.a)");
     REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 76.b)");
     delete [] Value;
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 77");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue")), &valueType, &valueSize), "testMerge error 77");
     REG_ENSURE(valueType == RG_VALUETYPE_UNICODE && valueSize == (wValue.getLength()+1)*sizeof(sal_Unicode), "testMerge error 78");
     Value = new sal_uInt8[valueSize];
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), (RegValue)Value), "testMerge error 78.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue")), (RegValue)Value), "testMerge error 78.a)");
     REG_ENSURE(wValue.equals( (const sal_Unicode*)Value ), "testMerge error 78.b)");
     delete [] Value;
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 79");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4/KeyWithBinaryValue")), &valueType, &valueSize), "testMerge error 79");
     REG_ENSURE(valueType == RG_VALUETYPE_BINARY && valueSize == 27, "testMerge error 80");
     Value = new sal_uInt8[valueSize];
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 80.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4/KeyWithBinaryValue")), (RegValue)Value), "testMerge error 80.a)");
     REG_ENSURE(strcmp((const sal_Char*)Value, "abcdefghijklmnopqrstuvwxyz") == 0, "testMerge error 80.b)");
     delete [] Value;
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 81");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1/KeyWithBinaryValue")), &valueType, &valueSize), "testMerge error 81");
     REG_ENSURE(valueType == RG_VALUETYPE_BINARY && valueSize == 11, "testMerge error 82");
     Value = new sal_uInt8[valueSize];
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 82.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1/KeyWithBinaryValue")), (RegValue)Value), "testMerge error 82.a)");
     REG_ENSURE(strcmp((const sal_Char*)Value, "1234567890") == 0, "testMerge error 82.b)");
     delete [] Value;
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 83");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue")), &valueType, &valueSize), "testMerge error 83");
     REG_ENSURE(valueType == RG_VALUETYPE_UNICODE&& valueSize == (wValue.getLength()+1)*sizeof(sal_Unicode), "testMerge error 84");
     Value = new sal_uInt8[valueSize];
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), (RegValue)Value), "testMerge error 84.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue")), (RegValue)Value), "testMerge error 84.a)");
     REG_ENSURE(wValue.equals( (const sal_Unicode*)Value ), "testMerge error 84.b)");
     delete [] Value;
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey2/MK2SubKey3/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 85");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3/KeyWithStringValue")), &valueType, &valueSize), "testMerge error 85");
     REG_ENSURE(valueType == RG_VALUETYPE_STRING && valueSize == strlen(sValue)+1, "testMerge error 86");
     Value = new sal_uInt8[valueSize];
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey2/MK2SubKey3/KeyWithStringValue"), (RegValue)Value), "testMerge error 86.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3/KeyWithStringValue")), (RegValue)Value), "testMerge error 86.a)");
     REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 86.b)");
     delete [] Value;
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey2/MK2SubKey4/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 87");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 87");
     REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 88");
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey2/MK2SubKey4/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 88.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 88.a)");
     REG_ENSURE(int32Value == lValue1, "testMerge error 88.b)");
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 89");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 89");
     REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 90");
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 90.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 90.a)");
     REG_ENSURE(int32Value == lValue2, "testMerge error 90.b)");
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 91");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12/KeyWithStringValue")), &valueType, &valueSize), "testMerge error 91");
     REG_ENSURE(valueType == RG_VALUETYPE_STRING && valueSize == strlen(sValue)+1, "testMerge error 92");
     Value = new sal_uInt8[valueSize];
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), (RegValue)Value), "testMerge error 92.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12/KeyWithStringValue")), (RegValue)Value), "testMerge error 92.a)");
     REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 92.b)");
     delete [] Value;
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 93");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue")), &valueType, &valueSize), "testMerge error 93");
     REG_ENSURE(valueType == RG_VALUETYPE_UNICODE && valueSize == (wValue.getLength()+1)*sizeof(sal_Unicode), "testMerge error 94");
     Value = new sal_uInt8[valueSize];
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), (RegValue)Value), "testMerge error 94.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue")), (RegValue)Value), "testMerge error 94.a)");
     REG_ENSURE(wValue.equals( (const sal_Unicode*)Value ), "testMerge error 94.b)");
     delete [] Value;
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 95");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue")), &valueType, &valueSize), "testMerge error 95");
     REG_ENSURE(valueType == RG_VALUETYPE_BINARY && valueSize == 19, "testMerge error 96");
     Value = new sal_uInt8[valueSize];
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 96.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue")), (RegValue)Value), "testMerge error 96.a)");
     REG_ENSURE(strcmp((const sal_Char*)Value, "a1b2c3d4e5f6g7h8i9") == 0, "testMerge error 96.b)");
     delete [] Value;
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 97");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 97");
     REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 98");
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 98.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 98.a)");
     REG_ENSURE(int32Value == lValue2, "testMerge error 98.b)");
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 99");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23/KeyWithStringValue")), &valueType, &valueSize), "testMerge error 99");
     REG_ENSURE(valueType == RG_VALUETYPE_STRING && valueSize == strlen(sValue)+1, "testMerge error 100");
     Value = new sal_uInt8[valueSize];
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), (RegValue)Value), "testMerge error 100.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23/KeyWithStringValue")), (RegValue)Value), "testMerge error 100.a)");
     REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 100.b)");
     delete [] Value;
 
-    REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 101");
+    REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 101");
     REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 102");
-    REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 102.a)");
+    REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 102.a)");
     REG_ENSURE(int32Value == lValue4, "testMerge error 102.b)");
 
 
@@ -409,8 +411,8 @@ void test_merge()
 
     REG_ENSURE(!rootKey.closeKey(), "testMerge error 10");
 
-    REG_ENSURE(!myRegistry->destroy( OUString::createFromAscii("merge1.rdb") ), "test_registry_CppApi error 11");
-    REG_ENSURE(!myRegistry->destroy( OUString::createFromAscii("merge2.rdb") ), "test_registry_CppApi error 12");
+    REG_ENSURE(!myRegistry->destroy( OUString(RTL_CONSTASCII_USTRINGPARAM("merge1.rdb")) ), "test_registry_CppApi error 11");
+    REG_ENSURE(!myRegistry->destroy( OUString(RTL_CONSTASCII_USTRINGPARAM("merge2.rdb")) ), "test_registry_CppApi error 12");
     REG_ENSURE(!myRegistry->destroy( OUString() ), "test_registry_CppApi error 13");
 
     delete myRegistry;
@@ -420,3 +422,4 @@ void test_merge()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx
index 398936c40e3e..427f5428be7d 100644
--- a/registry/test/testregcpp.cxx
+++ b/registry/test/testregcpp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,10 @@
 #include <rtl/ustring.hxx>
 
 using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 
 void test_coreReflection()
 {
@@ -48,95 +52,95 @@ void test_coreReflection()
 
     RegistryKey rootKey, key1, key2, key3, key4 ,key5, key6, key7, key8;
 
-    REG_ENSURE(!myRegistry->create(OUString::createFromAscii("ucrtest.rdb")), "testCoreReflection error 1");
+    REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("ucrtest.rdb"))), "testCoreReflection error 1");
     REG_ENSURE(!myRegistry->openRootKey(rootKey), "testCoreReflection error 2");
 
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("UCR"), key1), "testCoreReflection error 3");
-    REG_ENSURE(!key1.createKey(OUString::createFromAscii("ModuleA"), key2), "testCoreReflection error 4");
-    REG_ENSURE(!key2.createKey(OUString::createFromAscii("StructA"), key3), "testCoreReflection error 5");
-    REG_ENSURE(!key2.createKey(OUString::createFromAscii("EnumA"), key4), "testCoreReflection error 6");
-    REG_ENSURE(!key2.createKey(OUString::createFromAscii("XInterfaceA"), key5), "testCoreReflection error 7");
-    REG_ENSURE(!key2.createKey(OUString::createFromAscii("ExceptionA"), key6), "testCoreReflection error 8");
-    REG_ENSURE(!key2.createKey(OUString::createFromAscii("ServiceA"), key7), "testCoreReflection error 8a");
-    REG_ENSURE(!key2.createKey(OUString::createFromAscii("ConstantsA"), key8), "testCoreReflection error 8b");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("UCR")), key1), "testCoreReflection error 3");
+    REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA")), key2), "testCoreReflection error 4");
+    REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("StructA")), key3), "testCoreReflection error 5");
+    REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("EnumA")), key4), "testCoreReflection error 6");
+    REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("XInterfaceA")), key5), "testCoreReflection error 7");
+    REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("ExceptionA")), key6), "testCoreReflection error 8");
+    REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("ServiceA")), key7), "testCoreReflection error 8a");
+    REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantsA")), key8), "testCoreReflection error 8b");
 
     {
         RegistryTypeWriter writer(RT_TYPE_MODULE,
-                                  OUString::createFromAscii("ModuleA"),
+                                  OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA")),
                                   OUString(), 11, 0, 0);
 
         RTConstValue aConst;
 
-        writer.setDoku(OUString::createFromAscii("Hallo ich bin ein Modul"));
-        writer.setFileName(OUString::createFromAscii("DummyFile"));
+        writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin ein Modul")));
+        writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")));
 
         aConst.m_type = RT_TYPE_BOOL;
         aConst.m_value.aBool = sal_True;
-        writer.setFieldData(0, OUString::createFromAscii("aConstBool"),
-                            OUString::createFromAscii("boolean"),
-                            OUString::createFromAscii("ich bin ein boolean"),
-                            OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
+        writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstBool")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein boolean")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_BYTE;
         aConst.m_value.aByte = 127;
-        writer.setFieldData(1, OUString::createFromAscii("aConstByte"),
-                            OUString::createFromAscii("byte"),
-                            OUString::createFromAscii("ich bin ein byte"),
-                            OUString::createFromAscii("DummyFile"),  RT_ACCESS_CONST, aConst);
+        writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstByte")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("byte")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein byte")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")),  RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_INT16;
         aConst.m_value.aShort = -10;
-        writer.setFieldData(2, OUString::createFromAscii("aConstShort"),
-                            OUString::createFromAscii("short"),
-                            OUString::createFromAscii("ich bin ein short"),
-                            OUString::createFromAscii("DummyFile"),  RT_ACCESS_CONST, aConst);
+        writer.setFieldData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstShort")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("short")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein short")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")),  RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_UINT16;
         aConst.m_value.aUShort = 10;
-        writer.setFieldData(3, OUString::createFromAscii("aConstUShort"),
-                            OUString::createFromAscii("unsigned short"),
-                            OUString::createFromAscii("ich bin ein unsigned short"),
-                            OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
+        writer.setFieldData(3, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstUShort")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein unsigned short")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_INT32;
         aConst.m_value.aLong = -100000;
-        writer.setFieldData(4, OUString::createFromAscii("aConstLong"),
-                            OUString::createFromAscii("long"),
-                            OUString::createFromAscii("ich bin ein long"),
-                            OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
+        writer.setFieldData(4, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstLong")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("long")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein long")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_UINT32;
         aConst.m_value.aULong = 100000;
-        writer.setFieldData(5, OUString::createFromAscii("aConstULong"),
-                            OUString::createFromAscii("unsigned long"),
-                            OUString::createFromAscii("ich bin ein unsigned long"),
-                            OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
+        writer.setFieldData(5, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstULong")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein unsigned long")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_INT64;
         aConst.m_value.aHyper = -100000000;
-        writer.setFieldData(6, OUString::createFromAscii("aConstHyper"),
-                            OUString::createFromAscii("hyper"),
-                            OUString::createFromAscii("ich bin ein hyper"),
-                            OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
+        writer.setFieldData(6, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstHyper")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("hyper")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein hyper")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_UINT64;
         aConst.m_value.aUHyper = 100000000;
-        writer.setFieldData(7, OUString::createFromAscii("aConstULong"),
-                            OUString::createFromAscii("unsigned long"),
-                            OUString::createFromAscii("ich bin ein unsigned long"),
-                            OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
+        writer.setFieldData(7, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstULong")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein unsigned long")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_FLOAT;
         aConst.m_value.aFloat = -2e-10f;
-        writer.setFieldData(8, OUString::createFromAscii("aConstFloat"),
-                            OUString::createFromAscii("float"),
-                            OUString::createFromAscii("ich bin ein float"),
-                            OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
+        writer.setFieldData(8, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstFloat")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("float")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein float")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_DOUBLE;
-        aConst.m_value.aDouble = -2e-100; writer.setFieldData(9, OUString::createFromAscii("aConstDouble"),
-                                                              OUString::createFromAscii("double"),
-                                                              OUString::createFromAscii("ich bin ein double"),
-                                                              OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
+        aConst.m_value.aDouble = -2e-100; writer.setFieldData(9, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstDouble")),
+                                                              OUString(RTL_CONSTASCII_USTRINGPARAM("double")),
+                                                              OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein double")),
+                                                              OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_STRING;
-        OUString tmpStr(OUString::createFromAscii( "dies ist ein unicode string" ));
+        OUString tmpStr(RTL_CONSTASCII_USTRINGPARAM("dies ist ein unicode string"));
         aConst.m_value.aString = tmpStr.getStr();
 
-        writer.setFieldData(10, OUString::createFromAscii("aConstString"),
-                            OUString::createFromAscii("string"),
-                            OUString::createFromAscii("ich bin ein string"),
-                            OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
+        writer.setFieldData(10, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstString")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("string")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein string")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst);
 
         const sal_uInt8* pBlop = writer.getBlop();
         sal_uInt32      aBlopSize = writer.getBlopSize();
@@ -150,7 +154,7 @@ void test_coreReflection()
 
         if (reader.isValid())
         {
-            REG_ENSURE(reader.getTypeName().equals(OUString::createFromAscii("ModuleA")), "testCoreReflection error 9a2");
+            REG_ENSURE(reader.getTypeName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA"))), "testCoreReflection error 9a2");
 
             RTConstValue aReadConst = reader.getFieldConstValue(4);
             REG_ENSURE( aReadConst.m_type == RT_TYPE_INT32, "testCoreReflection error 9a3");
@@ -169,20 +173,20 @@ void test_coreReflection()
 
     {
         RegistryTypeWriter writer(RT_TYPE_STRUCT,
-                                  OUString::createFromAscii("ModuleA/StructA"),
+                                  OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/StructA")),
                                   OUString(), 3, 0, 0);
 
-        writer.setDoku(OUString::createFromAscii("Hallo ich bin eine Struktur"));
-        writer.setFileName(OUString::createFromAscii("DummyFile"));
+        writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin eine Struktur")));
+        writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")));
 
-        writer.setFieldData(0, OUString::createFromAscii("asal_uInt32"),
-                            OUString::createFromAscii("unsigned long"),
+        writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("asal_uInt32")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")),
                             OUString(), OUString(), RT_ACCESS_READWRITE);
-        writer.setFieldData(1, OUString::createFromAscii("aXInterface"),
-                            OUString::createFromAscii("stardiv/uno/XInterface"),
+        writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("aXInterface")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv/uno/XInterface")),
                             OUString(), OUString(), RT_ACCESS_READWRITE);
-        writer.setFieldData(2, OUString::createFromAscii("aSequence"),
-                            OUString::createFromAscii("[]ModuleA/EnumA"),
+        writer.setFieldData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("aSequence")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA/EnumA")),
                             OUString(), OUString(), RT_ACCESS_READWRITE);
 
         const sal_uInt8* pBlop = writer.getBlop();
@@ -193,7 +197,7 @@ void test_coreReflection()
 
     {
         RegistryTypeWriter writer(RT_TYPE_ENUM,
-                                  OUString::createFromAscii("ModuleA/EnumA"),
+                                  OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/EnumA")),
                                   OUString(), 2, 0, 0);
 
         RTConstValue aConst;
@@ -201,15 +205,15 @@ void test_coreReflection()
         aConst.m_type = RT_TYPE_UINT32;
         aConst.m_value.aULong = 10;
 
-        writer.setDoku(OUString::createFromAscii("Hallo ich bin ein Enum"));
-        writer.setFileName(OUString::createFromAscii("DummyFile"));
+        writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin ein Enum")));
+        writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")));
 
-        writer.setFieldData(0, OUString::createFromAscii("ENUM_VAL_1"),
-                            OUString(), OUString::createFromAscii("ich bin ein enum value"),
+        writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("ENUM_VAL_1")),
+                            OUString(), OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein enum value")),
                             OUString(), RT_ACCESS_CONST, aConst);
 
         aConst.m_value.aULong = 10;
-        writer.setFieldData(1, OUString::createFromAscii("ENUM_VAL_2"),
+        writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("ENUM_VAL_2")),
                             OUString(), OUString(), OUString(), RT_ACCESS_CONST, aConst);
 
         const sal_uInt8* pBlop = writer.getBlop();
@@ -220,38 +224,38 @@ void test_coreReflection()
 
     {
         RegistryTypeWriter writer(RT_TYPE_INTERFACE,
-                                  OUString::createFromAscii("ModuleA/XInterfaceA"),
-                                  OUString::createFromAscii("stardiv/uno/XInterface"),
+                                  OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA")),
+                                  OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv/uno/XInterface")),
                                   4, 1, 0);
         RTConstValue aConst;
 
         RTUik aUik = {1,2,3,4,5};
 
         writer.setUik(aUik);
-        writer.setDoku(OUString::createFromAscii("Hallo ich bin ein Interface"));
-        writer.setFileName(OUString::createFromAscii("DummyFile"));
+        writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin ein Interface")));
+        writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")));
 
-        writer.setFieldData(0, OUString::createFromAscii("aString"),
-                            OUString::createFromAscii("string"), OUString(), OUString(), RT_ACCESS_READWRITE);
-        writer.setFieldData(1, OUString::createFromAscii("aStruct"),
-                            OUString::createFromAscii("ModuleA/StructA"),
+        writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("aString")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("string")), OUString(), OUString(), RT_ACCESS_READWRITE);
+        writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("aStruct")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/StructA")),
                             OUString(), OUString(), RT_ACCESS_READONLY);
-        writer.setFieldData(2, OUString::createFromAscii("aEnum"),
-                            OUString::createFromAscii("ModuleA/EnumA"), OUString(), OUString(), RT_ACCESS_BOUND);
+        writer.setFieldData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("aEnum")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/EnumA")), OUString(), OUString(), RT_ACCESS_BOUND);
         aConst.m_type = RT_TYPE_UINT16;
         aConst.m_value.aUShort = 12;
-        writer.setFieldData(3, OUString::createFromAscii("aConstUShort"),
-                            OUString::createFromAscii("unsigned short"), OUString(),
-                            OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
-
-        writer.setMethodData(0, OUString::createFromAscii("methodA"),
-                             OUString::createFromAscii("double"), RT_MODE_TWOWAY, 2, 1,
-                             OUString::createFromAscii("Hallo ich bin die methodA"));
-        writer.setParamData(0, 0, OUString::createFromAscii("ModuleA/StructA"),
-                            OUString::createFromAscii("aStruct"), RT_PARAM_IN);
-        writer.setParamData(0, 1, OUString::createFromAscii("unsigned short"),
-                            OUString::createFromAscii("aShort"), RT_PARAM_INOUT);
-        writer.setExcData(0, 0, OUString::createFromAscii("ModuleA/ExceptionA"));
+        writer.setFieldData(3, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstUShort")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")), OUString(),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst);
+
+        writer.setMethodData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("methodA")),
+                             OUString(RTL_CONSTASCII_USTRINGPARAM("double")), RT_MODE_TWOWAY, 2, 1,
+                             OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin die methodA")));
+        writer.setParamData(0, 0, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/StructA")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("aStruct")), RT_PARAM_IN);
+        writer.setParamData(0, 1, OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("aShort")), RT_PARAM_INOUT);
+        writer.setExcData(0, 0, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ExceptionA")));
 
         const sal_uInt8* pBlop = writer.getBlop();
         sal_uInt32      aBlopSize = writer.getBlopSize();
@@ -265,7 +269,7 @@ void test_coreReflection()
 
         if (reader.isValid())
         {
-            REG_ENSURE(reader.getTypeName().equals(OUString::createFromAscii("ModuleA/XInterfaceA")), "testCoreReflection error 9c2");
+            REG_ENSURE(reader.getTypeName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA"))), "testCoreReflection error 9c2");
 
             RTUik retUik;
             reader.getUik(retUik);
@@ -280,14 +284,14 @@ void test_coreReflection()
 
     {
         RegistryTypeWriter writer(RT_TYPE_EXCEPTION,
-                                  OUString::createFromAscii("ModuleA/ExceptionA"),
+                                  OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ExceptionA")),
                                   OUString(), 1, 0, 0);
 
-        writer.setDoku(OUString::createFromAscii("Hallo ich bin eine Exception"));
+        writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin eine Exception")));
 
-        writer.setFieldData(0, OUString::createFromAscii("aSource"),
-                            OUString::createFromAscii("stardiv/uno/XInterface"),
-                            OUString::createFromAscii("ich bin ein interface member"),
+        writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("aSource")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv/uno/XInterface")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein interface member")),
                             OUString(), RT_ACCESS_READWRITE);
 
         const sal_uInt8* pBlop = writer.getBlop();
@@ -298,26 +302,26 @@ void test_coreReflection()
 
     {
         RegistryTypeWriter writer(RT_TYPE_SERVICE,
-                                  OUString::createFromAscii("ModuleA/ServiceA"),
+                                  OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ServiceA")),
                                   OUString(), 1, 0, 4);
 
-        writer.setDoku(OUString::createFromAscii("Hallo ich bin ein Service"));
-        writer.setFileName(OUString::createFromAscii("DummyFile"));
+        writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin ein Service")));
+        writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")));
 
-        writer.setFieldData(0, OUString::createFromAscii("aProperty"),
-                            OUString::createFromAscii("stardiv/uno/XInterface"),
-                            OUString::createFromAscii("ich bin eine property"),
+        writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("aProperty")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv/uno/XInterface")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin eine property")),
                             OUString(), RT_ACCESS_READWRITE);
 
-        writer.setReferenceData(0, OUString::createFromAscii("ModuleA/XInterfaceA"), RT_REF_SUPPORTS,
-                                OUString::createFromAscii("Hallo ich eine Reference auf ein supported interface"),
+        writer.setReferenceData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA")), RT_REF_SUPPORTS,
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich eine Reference auf ein supported interface")),
                                 RT_ACCESS_OPTIONAL);
-        writer.setReferenceData(1, OUString::createFromAscii("ModuleA/XInterfaceA"), RT_REF_OBSERVES,
-                                OUString::createFromAscii("Hallo ich eine Reference auf ein observed interface"));
-        writer.setReferenceData(2, OUString::createFromAscii("ModuleA/ServiceB"), RT_REF_EXPORTS,
-                                OUString::createFromAscii("Hallo ich eine Reference auf einen exported service"));
-        writer.setReferenceData(3, OUString::createFromAscii("ModuleA/ServiceB"), RT_REF_NEEDS,
-                                OUString::createFromAscii("Hallo ich eine Reference auf einen needed service"));
+        writer.setReferenceData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA")), RT_REF_OBSERVES,
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich eine Reference auf ein observed interface")));
+        writer.setReferenceData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ServiceB")), RT_REF_EXPORTS,
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich eine Reference auf einen exported service")));
+        writer.setReferenceData(3, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ServiceB")), RT_REF_NEEDS,
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich eine Reference auf einen needed service")));
 
         const sal_uInt8* pBlop = writer.getBlop();
         sal_uInt32      aBlopSize = writer.getBlopSize();
@@ -330,44 +334,44 @@ void test_coreReflection()
 
         if (reader.isValid())
         {
-            REG_ENSURE(reader.getTypeName().equals(OUString::createFromAscii("ModuleA/ServiceA")), "testCoreReflection error 9e3");
+            REG_ENSURE(reader.getTypeName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ServiceA"))), "testCoreReflection error 9e3");
 
             sal_uInt32 referenceCount = reader.getReferenceCount();
             REG_ENSURE( referenceCount == 4, "testCoreReflection error 9e4");
 
             OUString refName = reader.getReferenceName(0);
-            REG_ENSURE(refName.equals(OUString::createFromAscii("ModuleA/XInterfaceA")), "testCoreReflection error 9e5");
+            REG_ENSURE(refName.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA"))), "testCoreReflection error 9e5");
         }
     }
 
     {
         RegistryTypeWriter writer(RT_TYPE_CONSTANTS,
-                                  OUString::createFromAscii("ModuleA/ConstansA"),
+                                  OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ConstansA")),
                                   OUString(), 3, 0, 0);
 
         RTConstValue aConst;
 
-        writer.setDoku(OUString::createFromAscii("Hallo ich bin eine Constants Group"));
-        writer.setFileName(OUString::createFromAscii("DummyFile"));
+        writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin eine Constants Group")));
+        writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")));
 
         aConst.m_type = RT_TYPE_BOOL;
         aConst.m_value.aBool = sal_True;
-        writer.setFieldData(0, OUString::createFromAscii("ConstantsA_aConstBool"),
-                            OUString::createFromAscii("boolean"),
-                            OUString::createFromAscii("ich bin ein boolean"),
-                            OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
+        writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantsA_aConstBool")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein boolean")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_BYTE;
         aConst.m_value.aByte = 127;
-        writer.setFieldData(1, OUString::createFromAscii("ConstantsA_aConstByte"),
-                            OUString::createFromAscii("byte"),
-                            OUString::createFromAscii("ich bin ein byte"),
-                            OUString::createFromAscii("DummyFile"),  RT_ACCESS_CONST, aConst);
+        writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantsA_aConstByte")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("byte")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein byte")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")),  RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_INT16;
         aConst.m_value.aShort = -10;
-        writer.setFieldData(2, OUString::createFromAscii("ConstantsA_aConstShort"),
-                            OUString::createFromAscii("short"),
-                            OUString::createFromAscii("ich bin ein short"),
-                            OUString::createFromAscii("DummyFile"),  RT_ACCESS_CONST, aConst);
+        writer.setFieldData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantsA_aConstShort")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("short")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein short")),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")),  RT_ACCESS_CONST, aConst);
 
         const sal_uInt8* pBlop = writer.getBlop();
         sal_uInt32      aBlopSize = writer.getBlopSize();
@@ -387,45 +391,45 @@ void test_registry_CppApi()
 
     RegistryKey rootKey, key1, key2, key3, key4 ,key5, key6, key7, key8, key9;
 
-    REG_ENSURE(!myRegistry->create(OUString::createFromAscii("test.rdb")), "test_registry_CppApi error 1");
+    REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("test.rdb"))), "test_registry_CppApi error 1");
     REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 2");
 
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("myFirstKey"), key1), "test_registry_CppApi error 3");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("mySecondKey"), key2), "test_registry_CppApi error 4");
-    REG_ENSURE(!key1.createKey(OUString::createFromAscii("X"), key3), "test_registry_CppApi error 5");
-    REG_ENSURE(!key1.createKey(OUString::createFromAscii("mySecondSubKey"), key4), "test_registry_CppApi error 6");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("myThirdKey"), key5), "test_registry_CppApi error 6a");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")), key1), "test_registry_CppApi error 3");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")), key2), "test_registry_CppApi error 4");
+    REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("X")), key3), "test_registry_CppApi error 5");
+    REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondSubKey")), key4), "test_registry_CppApi error 6");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")), key5), "test_registry_CppApi error 6a");
 
-    REG_ENSURE(!key5.createKey(OUString::createFromAscii("1"), key4), "test_registry_CppApi error 6b");
-    REG_ENSURE(!key4.createKey(OUString::createFromAscii("2"), key3), "test_registry_CppApi error 6c");
-    REG_ENSURE(!key5.openKey(OUString::createFromAscii("1"), key4), "test_registry_CppApi error 6d");
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/myThirdKey/1"), key4), "test_registry_CppApi error 6e");
-    REG_ENSURE(key4.getName().equals(OUString::createFromAscii("/myThirdKey/1")), "test_registry_CppApi error 6f");
+    REG_ENSURE(!key5.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("1")), key4), "test_registry_CppApi error 6b");
+    REG_ENSURE(!key4.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("2")), key3), "test_registry_CppApi error 6c");
+    REG_ENSURE(!key5.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("1")), key4), "test_registry_CppApi error 6d");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myThirdKey/1")), key4), "test_registry_CppApi error 6e");
+    REG_ENSURE(key4.getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myThirdKey/1"))), "test_registry_CppApi error 6f");
 
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("myFourthKey"), key6), "test_registry_CppApi error 7");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("myFifthKey"), key6), "test_registry_CppApi error 7a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("mySixthKey"), key6), "test_registry_CppApi error 7b");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFourthKey")), key6), "test_registry_CppApi error 7");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFifthKey")), key6), "test_registry_CppApi error 7a");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), key6), "test_registry_CppApi error 7b");
 
     // Link Test
     //
 
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/myFourthKey/X"), key7), "test_registry_CppApi error 7c)");;
-    REG_ENSURE(!key6.createLink(OUString::createFromAscii("myFirstLink"), OUString::createFromAscii("/myFourthKey/X")), "test_registry_CppApi error 7d");
-    REG_ENSURE(!key6.createKey(OUString::createFromAscii("mySixthSubKey"), key7), "test_registry_CppApi error 7e");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X")), key7), "test_registry_CppApi error 7c)");;
+    REG_ENSURE(!key6.createLink(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstLink")), OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X"))), "test_registry_CppApi error 7d");
+    REG_ENSURE(!key6.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthSubKey")), key7), "test_registry_CppApi error 7e");
 
     OUString linkTarget;
-    REG_ENSURE(!key6.getLinkTarget(OUString::createFromAscii("myFirstLink"), linkTarget), "test_registry_CppApi error 7f");
-    REG_ENSURE(linkTarget.equals(OUString::createFromAscii("/myFourthKey/X")), "test_registry_CppApi error 7g");
+    REG_ENSURE(!key6.getLinkTarget(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstLink")), linkTarget), "test_registry_CppApi error 7f");
+    REG_ENSURE(linkTarget.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X"))), "test_registry_CppApi error 7g");
 
     RegistryKeyNames* pSubKeyNames = new RegistryKeyNames();
     sal_uInt32           nSubKeys=0;
 
-    REG_ENSURE(!rootKey.getKeyNames(OUString::createFromAscii("mySixthKey"), *pSubKeyNames), "test_registry_CppApi error 7h)");
+    REG_ENSURE(!rootKey.getKeyNames(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), *pSubKeyNames), "test_registry_CppApi error 7h)");
     REG_ENSURE(pSubKeyNames->getLength() == 2, "test_registry_CppApi error 7i)");
 
     for (sal_uInt32 i=0; i < pSubKeyNames->getLength(); i++)
     {
-        if (pSubKeyNames->getElement(i).equals(OUString::createFromAscii("/mySixthKey/myFirstLink")))
+        if (pSubKeyNames->getElement(i).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/mySixthKey/myFirstLink"))))
         {
             RegKeyType keyType;
             REG_ENSURE(!rootKey.getKeyType(pSubKeyNames->getElement(i), &keyType), "test_registry_CppApi error 7j");
@@ -436,32 +440,32 @@ void test_registry_CppApi()
     REG_ENSURE(!key7.closeKey(), "test_registry_CppApi error 7k1");
     delete pSubKeyNames;
 
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/mySixthKey/myFirstLink"), key6), "test_registry_CppApi error 7l");
-//    REG_ENSURE(key6.getName().equals(OUString::createFromAscii("/myFourthKey/X")), "test_registry_CppApi error 7m");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/mySixthKey/myFirstLink")), key6), "test_registry_CppApi error 7l");
+//    REG_ENSURE(key6.getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X"))), "test_registry_CppApi error 7m");
 
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("myFifthKey"), key6), "test_registry_CppApi error 7m1");
-    REG_ENSURE(!key6.createLink(OUString::createFromAscii("mySecondLink"),
-                                 OUString::createFromAscii("/mySixthKey/myFirstLink")), "test_registry_CppApi error 7m2");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFifthKey")), key6), "test_registry_CppApi error 7m1");
+    REG_ENSURE(!key6.createLink(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondLink")),
+                                 OUString(RTL_CONSTASCII_USTRINGPARAM("/mySixthKey/myFirstLink"))), "test_registry_CppApi error 7m2");
 
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/myFifthKey/mySecondLink"), key6), "test_registry_CppApi error 7m3");
-//    REG_ENSURE(key6.getName().equals(OUString::createFromAscii("/myFourthKey/X")), "test_registry_CppApi error 7m4");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink")), key6), "test_registry_CppApi error 7m3");
+//    REG_ENSURE(key6.getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X"))), "test_registry_CppApi error 7m4");
 
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/myFifthKey/mySecondLink/myFirstLinkSubKey"), key7), "test_registry_CppApi error 7m5");
-    REG_ENSURE(key7.getName().equals(OUString::createFromAscii("/myFourthKey/X/myFirstLinkSubKey")), "test_registry_CppApi error 7m6");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink/myFirstLinkSubKey")), key7), "test_registry_CppApi error 7m5");
+    REG_ENSURE(key7.getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X/myFirstLinkSubKey"))), "test_registry_CppApi error 7m6");
 
-    REG_ENSURE(!key7.createLink(OUString::createFromAscii("myThirdLink"), OUString::createFromAscii("/myFifthKey/mySecondLink")), "test_registry_CppApi error 7m7");
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/myFourthKey/X/myFirstLinkSubKey/myThirdLink"), key7), "test_registry_CppApi error 7m8");
-//    REG_ENSURE(!key7.openKey(OUString::createFromAscii("/myFirstLinkSubKey/myThirdLink/myFirstLinkSubKey/myThirdLink"), key6), "test_registry_CppApi error 7m9");
-//    REG_ENSURE(key7.getName().equals(OUString::createFromAscii("/myFourthKey/X")), "test_registry_CppApi error 7m10");
+    REG_ENSURE(!key7.createLink(OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdLink")), OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink"))), "test_registry_CppApi error 7m7");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X/myFirstLinkSubKey/myThirdLink")), key7), "test_registry_CppApi error 7m8");
+//    REG_ENSURE(!key7.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFirstLinkSubKey/myThirdLink/myFirstLinkSubKey/myThirdLink")), key6), "test_registry_CppApi error 7m9");
+//    REG_ENSURE(key7.getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X"))), "test_registry_CppApi error 7m10");
     REG_ENSURE(!key7.closeKey(), "test_registry_CppApi error 7m11");
 
-    REG_ENSURE(!rootKey.deleteLink(OUString::createFromAscii("/myFifthKey/mySecondLink")), "test_registry_CppApi error 7m12");
+    REG_ENSURE(!rootKey.deleteLink(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink"))), "test_registry_CppApi error 7m12");
 
-    REG_ENSURE(!rootKey.createLink(OUString::createFromAscii("/myFifthKey/mySecondLink"),
-                                    OUString::createFromAscii("/myFourthKey/X/myFirstLinkSubKey/myThirdLink")),
+    REG_ENSURE(!rootKey.createLink(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink")),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X/myFirstLinkSubKey/myThirdLink"))),
                                     "test_registry_CppApi error 7m13");
 
-//    REG_ENSURE(rootKey.openKey(OUString::createFromAscii("/myFourthKey/X/myFirstLinkSubKey/myThirdLink"), key7) == REG_DETECT_RECURSION,
+//    REG_ENSURE(rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X/myFirstLinkSubKey/myThirdLink")), key7) == REG_DETECT_RECURSION,
 //                "test_registry_CppApi error 7m14");
 
 //    REG_ENSURE(key7.closeKey() == REG_INVALID_KEY, "test_registry_CppApi error 7m11");
@@ -469,45 +473,45 @@ void test_registry_CppApi()
     RegistryKeyNames subKeyNames;
     nSubKeys=0;
 
-    REG_ENSURE(!rootKey.getKeyNames(OUString::createFromAscii("mySixthKey"), subKeyNames), "test_registry_CppApi error 7n");
+    REG_ENSURE(!rootKey.getKeyNames(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), subKeyNames), "test_registry_CppApi error 7n");
 
     nSubKeys = subKeyNames.getLength();
     REG_ENSURE(nSubKeys == 2, "test_registry_CppApi error 7n1");
-    REG_ENSURE(subKeyNames.getElement(0).equals(OUString::createFromAscii("/mySixthKey/myFirstLink")), "test_registry_CppApi error 7p1)");
-    REG_ENSURE(subKeyNames.getElement(1).equals(OUString::createFromAscii("/mySixthKey/mySixthSubKey")), "test_registry_CppApi error 7p2");
+    REG_ENSURE(subKeyNames.getElement(0).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/mySixthKey/myFirstLink"))), "test_registry_CppApi error 7p1)");
+    REG_ENSURE(subKeyNames.getElement(1).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/mySixthKey/mySixthSubKey"))), "test_registry_CppApi error 7p2");
 
 
     RegistryKeyArray subKeys;
     nSubKeys=0;
 
-    REG_ENSURE(!rootKey.openSubKeys(OUString::createFromAscii("myFirstKey"), subKeys), "test_registry_CppApi error 7o");
+    REG_ENSURE(!rootKey.openSubKeys(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")), subKeys), "test_registry_CppApi error 7o");
 
     nSubKeys = subKeys.getLength();
     REG_ENSURE(nSubKeys == 2, "test_registry_CppApi error 7o1");
-    REG_ENSURE(subKeys.getElement(0).getName().equals(OUString::createFromAscii("/myFirstKey/mySecondSubKey")), "test_registry_CppApi error 7p1)");
-    REG_ENSURE(subKeys.getElement(1).getName().equals(OUString::createFromAscii("/myFirstKey/X")), "test_registry_CppApi error 7p2");
+    REG_ENSURE(subKeys.getElement(0).getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFirstKey/mySecondSubKey"))), "test_registry_CppApi error 7p1)");
+    REG_ENSURE(subKeys.getElement(1).getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFirstKey/X"))), "test_registry_CppApi error 7p2");
 
     REG_ENSURE(!rootKey.closeSubKeys(subKeys), "test_registry_CppApi error 7q)");
 
 
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/TEST"), key8), "test_registry_CppApi error 8");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/TEST/Child1"), key8), "test_registry_CppApi error 8a");
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/TEST/Child2"), key8), "test_registry_CppApi error 8a1");
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/TEST"), key9), "test_registry_CppApi error 8b");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST")), key8), "test_registry_CppApi error 8");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST/Child1")), key8), "test_registry_CppApi error 8a");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST/Child2")), key8), "test_registry_CppApi error 8a1");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST")), key9), "test_registry_CppApi error 8b");
     REG_ENSURE(!key8.closeKey() && !key9.closeKey(),  "test_registry_CppApi error 8b1");
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/TEST"), key8), "test_registry_CppApi error 8b");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST")), key8), "test_registry_CppApi error 8b");
     REG_ENSURE(!key8.closeKey(),  "test_registry_CppApi error 8c");
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("TEST"), key8), "test_registry_CppApi error 8c");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("TEST")), key8), "test_registry_CppApi error 8c");
     REG_ENSURE(!key8.closeKey(),  "test_registry_CppApi error 8d");
 
 
     sal_Char* Value=(sal_Char*)"Mein erster Value";
-    REG_ENSURE(!rootKey.setValue(OUString::createFromAscii("mySecondKey"), RG_VALUETYPE_STRING, Value, 18), "test_registry_CppApi error 9");
+    REG_ENSURE(!rootKey.setValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")), RG_VALUETYPE_STRING, Value, 18), "test_registry_CppApi error 9");
 
     RegValueType    valueType;
     sal_uInt32          valueSize;
     sal_Char*           readValue;
-    REG_ENSURE(!rootKey.getValueInfo(OUString::createFromAscii("mySecondKey"), &valueType, &valueSize), "test_registry_CppApi error 9a");
+    REG_ENSURE(!rootKey.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")), &valueType, &valueSize), "test_registry_CppApi error 9a");
 
     readValue = (sal_Char*)rtl_allocateMemory(valueSize);
     REG_ENSURE(!key2.getValue(OUString(), readValue), "test_registry_CppApi error 10");
@@ -526,16 +530,16 @@ void test_registry_CppApi()
     pList[1]=n2;
     pList[2]=n3;
 
-    REG_ENSURE(!rootKey.setStringListValue(OUString::createFromAscii("myFourthKey"), (sal_Char**)pList, 3), "test_registry_CppApi error 13a");
+    REG_ENSURE(!rootKey.setStringListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("myFourthKey")), (sal_Char**)pList, 3), "test_registry_CppApi error 13a");
 
     RegistryValueList<sal_Char*> valueList;
-    REG_ENSURE(!rootKey.getStringListValue(OUString::createFromAscii("myFourthKey"), valueList), "test_registry_CppApi error 13b");
+    REG_ENSURE(!rootKey.getStringListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("myFourthKey")), valueList), "test_registry_CppApi error 13b");
 
     REG_ENSURE(strcmp(n1, valueList.getElement(0)) == 0, "test_registry_CppApi error 13c");
     REG_ENSURE(strcmp(n2, valueList.getElement(1)) == 0, "test_registry_CppApi error 13d");
     REG_ENSURE(strcmp(n3, valueList.getElement(2)) == 0, "test_registry_CppApi error 13e");
 
-    REG_ENSURE(!rootKey.getValueInfo(OUString::createFromAscii("myFourthKey"), &valueType, &valueSize), "test_registry_CppApi error 13e1");
+    REG_ENSURE(!rootKey.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("myFourthKey")), &valueType, &valueSize), "test_registry_CppApi error 13e1");
     REG_ENSURE(valueType == RG_VALUETYPE_STRINGLIST, "test_registry_CppApi error 13e2");
     REG_ENSURE(valueSize == 3, "test_registry_CppApi error 13e3");
 
@@ -544,40 +548,40 @@ void test_registry_CppApi()
     pLong[1] = 456;
     pLong[2] = 789;
 
-    REG_ENSURE(!rootKey.setLongListValue(OUString::createFromAscii("myFifthKey"), pLong, 3), "test_registry_CppApi error 13f");
+    REG_ENSURE(!rootKey.setLongListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("myFifthKey")), pLong, 3), "test_registry_CppApi error 13f");
 
     RegistryValueList<sal_Int32> longList;
-    REG_ENSURE(!rootKey.getLongListValue(OUString::createFromAscii("myFifthKey"), longList), "test_registry_CppApi error 13g");
+    REG_ENSURE(!rootKey.getLongListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("myFifthKey")), longList), "test_registry_CppApi error 13g");
 
     REG_ENSURE(pLong[0] == longList.getElement(0), "test_registry_CppApi error 13h");
     REG_ENSURE(pLong[1] == longList.getElement(1), "test_registry_CppApi error 13i");
     REG_ENSURE(pLong[2] == longList.getElement(2), "test_registry_CppApi error 13j");
 
 
-    OUString sWTestValue(OUString::createFromAscii( "Mein erster Unicode Value" ));
+    OUString sWTestValue(RTL_CONSTASCII_USTRINGPARAM("Mein erster Unicode Value"));
     const sal_Unicode* wTestValue= sWTestValue.getStr();
-    REG_ENSURE(!rootKey.setValue(OUString::createFromAscii("mySixthKey"), RG_VALUETYPE_UNICODE, (void*)wTestValue,
+    REG_ENSURE(!rootKey.setValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), RG_VALUETYPE_UNICODE, (void*)wTestValue,
                 (rtl_ustr_getLength(wTestValue)+1)*sizeof(sal_Unicode)), "test_registry_CppApi error 13j1");
 
-    REG_ENSURE(!rootKey.getValueInfo(OUString::createFromAscii("mySixthKey"), &valueType, &valueSize), "test_registry_CppApi error 13j2");
+    REG_ENSURE(!rootKey.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), &valueType, &valueSize), "test_registry_CppApi error 13j2");
     sal_Unicode* pTmpValue = (sal_Unicode*)rtl_allocateMemory(valueSize);
-    REG_ENSURE(!rootKey.getValue(OUString::createFromAscii("mySixthKey"), pTmpValue), "test_registry_CppApi error 13j3");
+    REG_ENSURE(!rootKey.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), pTmpValue), "test_registry_CppApi error 13j3");
     REG_ENSURE(rtl_ustr_getLength(wTestValue) == rtl_ustr_getLength(pTmpValue), "test_registry_CppApi error 13j4");
     REG_ENSURE(rtl_ustr_compare(wTestValue, pTmpValue) == 0, "test_registry_CppApi error 13j4");
 
     const sal_Unicode* pUnicode[3];
-    OUString w1(OUString::createFromAscii( "Hallo" ));
-    OUString w2(OUString::createFromAscii( "jetzt komm" ));
-    OUString w3(OUString::createFromAscii( "ich als unicode" ));
+    OUString w1(RTL_CONSTASCII_USTRINGPARAM("Hallo"));
+    OUString w2(RTL_CONSTASCII_USTRINGPARAM("jetzt komm"));
+    OUString w3(RTL_CONSTASCII_USTRINGPARAM("ich als unicode"));
 
     pUnicode[0]=w1.getStr();
     pUnicode[1]=w2.getStr();
     pUnicode[2]=w3.getStr();
 
-    REG_ENSURE(!rootKey.setUnicodeListValue(OUString::createFromAscii("mySixthKey"), (sal_Unicode**)pUnicode, 3), "test_registry_CppApi error 13k");
+    REG_ENSURE(!rootKey.setUnicodeListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), (sal_Unicode**)pUnicode, 3), "test_registry_CppApi error 13k");
 
     RegistryValueList<sal_Unicode*> unicodeList;
-    REG_ENSURE(!rootKey.getUnicodeListValue(OUString::createFromAscii("mySixthKey"), unicodeList), "test_registry_CppApi error 13l");
+    REG_ENSURE(!rootKey.getUnicodeListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), unicodeList), "test_registry_CppApi error 13l");
 
     REG_ENSURE(rtl_ustr_compare(w1, unicodeList.getElement(0)) == 0, "test_registry_CppApi error 13m");
     REG_ENSURE(rtl_ustr_compare(w2, unicodeList.getElement(1)) == 0, "test_registry_CppApi error 13n");
@@ -589,16 +593,16 @@ void test_registry_CppApi()
                !key3.closeKey() &&
                !key4.closeKey(),  "test_registry_CppApi error 14");
 
-    REG_ENSURE(!rootKey.deleteKey(OUString::createFromAscii("myFirstKey")), "test_registry_CppApi error 15");
+    REG_ENSURE(!rootKey.deleteKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey"))), "test_registry_CppApi error 15");
 
     REG_ENSURE(!key2.closeKey(), "test_registry_CppApi error 16");
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("mySecondKey"), key2), "test_registry_CppApi error 17");
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")), key2), "test_registry_CppApi error 17");
 
     REG_ENSURE(!key5.closeKey(), "test_registry_CppApi error 18");
 
-    REG_ENSURE(!rootKey.deleteKey(OUString::createFromAscii("myThirdKey")), "test_registry_CppApi error 19");
+    REG_ENSURE(!rootKey.deleteKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey"))), "test_registry_CppApi error 19");
 
-    REG_ENSURE(rootKey.openKey(OUString::createFromAscii("myThirdKey"), key5), "test_registry_CppApi error 20");
+    REG_ENSURE(rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")), key5), "test_registry_CppApi error 20");
 
     REG_ENSURE(!key2.closeKey() &&
                 !rootKey.closeKey(),  "test_registry_CppApi error 21");
@@ -608,14 +612,14 @@ void test_registry_CppApi()
     // Test loadkey
     RegistryKey rootKey2, key21, key22, key23, key24 , key25;
 
-    REG_ENSURE(!myRegistry->create(OUString::createFromAscii("test2.rdb")), "test_registry_CppApi error 23");
+    REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("test2.rdb"))), "test_registry_CppApi error 23");
     REG_ENSURE(!myRegistry->openRootKey(rootKey2), "test_registry_CppApi error 24");
 
-    REG_ENSURE(!rootKey2.createKey(OUString::createFromAscii("reg2FirstKey"), key21), "test_registry_CppApi error 25");
-    REG_ENSURE(!rootKey2.createKey(OUString::createFromAscii("reg2SecondKey"), key22), "test_registry_CppApi error 26");
-    REG_ENSURE(!key21.createKey(OUString::createFromAscii("reg2FirstSubKey"), key23), "test_registry_CppApi error 27");
-    REG_ENSURE(!key21.createKey(OUString::createFromAscii("reg2SecondSubKey"), key24), "test_registry_CppApi error 28");
-    REG_ENSURE(!rootKey2.createKey(OUString::createFromAscii("reg2ThirdKey"), key25), "test_registry_CppApi error 29");
+    REG_ENSURE(!rootKey2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2FirstKey")), key21), "test_registry_CppApi error 25");
+    REG_ENSURE(!rootKey2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2SecondKey")), key22), "test_registry_CppApi error 26");
+    REG_ENSURE(!key21.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2FirstSubKey")), key23), "test_registry_CppApi error 27");
+    REG_ENSURE(!key21.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2SecondSubKey")), key24), "test_registry_CppApi error 28");
+    REG_ENSURE(!rootKey2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2ThirdKey")), key25), "test_registry_CppApi error 29");
 
     sal_uInt32 nValue= 123456789;
     REG_ENSURE(!key23.setValue(OUString(), RG_VALUETYPE_LONG, &nValue, sizeof(sal_uInt32)), "test_registry_CppApi error 30");
@@ -629,38 +633,38 @@ void test_registry_CppApi()
 
     REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 32");
 
-    REG_ENSURE(!myRegistry->open(OUString::createFromAscii("test.rdb"), REG_READWRITE), "test_registry_CppApi error 33");
+    REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("test.rdb")), REG_READWRITE), "test_registry_CppApi error 33");
     REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 34");
 
-    REG_ENSURE(!myRegistry->loadKey(rootKey, OUString::createFromAscii("allFromTest2"),
-                    OUString::createFromAscii("test2.rdb")), "test_registry_CppApi error 35");
-    REG_ENSURE(!myRegistry->saveKey(rootKey, OUString::createFromAscii("allFromTest2"),
-                    OUString::createFromAscii("test3.rdb")), "test_registry_CppApi error 36");
+    REG_ENSURE(!myRegistry->loadKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest2")),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("test2.rdb"))), "test_registry_CppApi error 35");
+    REG_ENSURE(!myRegistry->saveKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest2")),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("test3.rdb"))), "test_registry_CppApi error 36");
 
-    REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("allFromTest3"), key1), "test_registry_CppApi error 37");
-    REG_ENSURE(!key1.createKey(OUString::createFromAscii("myFirstKey2"), key2), "test_registry_CppApi error 38");
-    REG_ENSURE(!key1.createKey(OUString::createFromAscii("mySecondKey2"), key3), "test_registry_CppApi error 39");
+    REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")), key1), "test_registry_CppApi error 37");
+    REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey2")), key2), "test_registry_CppApi error 38");
+    REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey2")), key3), "test_registry_CppApi error 39");
 
-    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"),
-                    OUString::createFromAscii("test3.rdb")), "test_registry_CppApi error 40");
-    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"),
-                    OUString::createFromAscii("ucrtest.rdb"), sal_True), "test_registry_CppApi error 40.a)");
+    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("test3.rdb"))), "test_registry_CppApi error 40");
+    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("ucrtest.rdb")), sal_True), "test_registry_CppApi error 40.a)");
 
-//     REG_ENSURE(myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"), OUString::createFromAscii("ucrtest.rdb"), sal_True)
+//     REG_ENSURE(myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")), OUString(RTL_CONSTASCII_USTRINGPARAM("ucrtest.rdb")), sal_True)
 //                  == REG_NO_ERROR/*REG_MERGE_CONFLICT*/, "test_registry_CppApi error 40.b)");
 
     REG_ENSURE(!key1.closeKey() &&
                 !key2.closeKey(), "test_registry_CppApi error 41");
 
-    const sal_Unicode* wValue= OUString::createFromAscii( "Mein erster Unicode Value" ).getStr();
+    const sal_Unicode* wValue= OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster Unicode Value")).getStr();
     REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_UNICODE, (void*)wValue,
                 (rtl_ustr_getLength(wValue)+1)*sizeof(sal_Unicode)), "test_registry_CppApi error 42");
 
     REG_ENSURE(!key3.closeKey(), "test_registry_CppApi error 43");
 
-    REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/allFromTest3/reg2FirstKey/reg2FirstSubKey"), key1),
+    REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/allFromTest3/reg2FirstKey/reg2FirstSubKey")), key1),
                 "test_registry_CppApi error 43.a)");
-    REG_ENSURE(!rootKey.deleteKey(OUString::createFromAscii("/allFromTest3/reg2FirstKey/reg2FirstSubKey")), "test_registry_CppApi error 44");
+    REG_ENSURE(!rootKey.deleteKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/allFromTest3/reg2FirstKey/reg2FirstSubKey"))), "test_registry_CppApi error 44");
     REG_ENSURE(key1.getValueInfo(OUString(), &valueType, &valueSize) == REG_INVALID_KEY,
                 "test_registry_CppApi error 44.a)");
     REG_ENSURE(!key1.closeKey(), "test_registry_CppApi error 44.b)");
@@ -669,9 +673,9 @@ void test_registry_CppApi()
 
     REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 46");
 
-    REG_ENSURE(!myRegistry->open(OUString::createFromAscii("test.rdb"), REG_READWRITE), "test_registry_CppApi error 47");
+    REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("test.rdb")), REG_READWRITE), "test_registry_CppApi error 47");
 
-    REG_ENSURE(!myRegistry->destroy(OUString::createFromAscii("test2.rdb")), "test_registry_CppApi error 48");
+    REG_ENSURE(!myRegistry->destroy(OUString(RTL_CONSTASCII_USTRINGPARAM("test2.rdb"))), "test_registry_CppApi error 48");
 //  REG_ENSURE(!myRegistry->destroy("test3.rdb"), "test_registry_CppApi error 49");
 
     Registry *myRegistry2 = new Registry(*myRegistry);
@@ -680,22 +684,22 @@ void test_registry_CppApi()
 
     delete(myRegistry2);
 
-    REG_ENSURE(!myRegistry->create(OUString::createFromAscii("destroytest.rdb")), "test_registry_CppApi error 51");
+    REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("destroytest.rdb"))), "test_registry_CppApi error 51");
     REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 52");
-    REG_ENSURE(!myRegistry->open(OUString::createFromAscii("destroytest.rdb"), REG_READONLY), "test_registry_CppApi error 53");
+    REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("destroytest.rdb")), REG_READONLY), "test_registry_CppApi error 53");
     REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 54");
 
-    REG_ENSURE(myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"),
-                    OUString::createFromAscii("test3.rdb")), "test_registry_CppApi error 55");
-    REG_ENSURE(!myRegistry->destroy(OUString::createFromAscii("test3.rdb")), "test_registry_CppApi error 56");
+    REG_ENSURE(myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("test3.rdb"))), "test_registry_CppApi error 55");
+    REG_ENSURE(!myRegistry->destroy(OUString(RTL_CONSTASCII_USTRINGPARAM("test3.rdb"))), "test_registry_CppApi error 56");
 
     REG_ENSURE(!rootKey.closeKey(), "test_registry_CppApi error 57");
     REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 58");
-    REG_ENSURE(!myRegistry->open(OUString::createFromAscii("destroytest.rdb"), REG_READWRITE), "test_registry_CppApi error 59");
+    REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("destroytest.rdb")), REG_READWRITE), "test_registry_CppApi error 59");
     REG_ENSURE(!myRegistry->destroy(OUString()), "test_registry_CppApi error 60");
 
-    REG_ENSURE(!myRegistry->open(OUString::createFromAscii("test.rdb"), REG_READWRITE), "test_registry_CppApi error 61");
-    REG_ENSURE(!myRegistry->destroy(OUString::createFromAscii("ucrtest.rdb")), "test_registry_CppApi error 62");
+    REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("test.rdb")), REG_READWRITE), "test_registry_CppApi error 61");
+    REG_ENSURE(!myRegistry->destroy(OUString(RTL_CONSTASCII_USTRINGPARAM("ucrtest.rdb"))), "test_registry_CppApi error 62");
     REG_ENSURE(!myRegistry->destroy(OUString()), "test_registry_CppApi error 63");
     delete(myRegistry);
 
@@ -705,3 +709,4 @@ void test_registry_CppApi()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/checksingleton.cxx b/registry/tools/checksingleton.cxx
index 903e059ac896..e1995d6fdfd1 100644
--- a/registry/tools/checksingleton.cxx
+++ b/registry/tools/checksingleton.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -230,7 +231,7 @@ static sal_Bool checkSingletons(Options_Impl const & options, RegistryKey& singl
     return bRet;
 }
 
-#if (defined UNX) || (defined OS2) || (defined __MINGW32__)
+#if (defined UNX) || (defined __MINGW32__)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -307,7 +308,7 @@ int _cdecl main( int argc, char * argv[] )
     }
 
     RegistryKey singletonKey;
-    if ( indexRoot.createKey(OUString::createFromAscii("SINGLETONS"), singletonKey) )
+    if ( indexRoot.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("SINGLETONS")), singletonKey) )
     {
         fprintf(stderr, "%s: open/create SINGLETONS key of registry \"%s\" failed\n",
                 options.getProgramName().c_str(), options.getIndexReg().c_str());
@@ -342,3 +343,5 @@ int _cdecl main( int argc, char * argv[] )
         return (11);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk
index 06ca753ff044..6a759b1289b3 100644
--- a/registry/tools/makefile.mk
+++ b/registry/tools/makefile.mk
@@ -39,6 +39,8 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE :  ..$/version.mk
 
+.IF "$(OS)"!="IOS"
+
 # --- Files --------------------------------------------------------
 CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)"
 
@@ -85,4 +87,6 @@ APP5STDLIBS=\
 
 OBJFILES = $(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS)
 
+.ENDIF
+
 .INCLUDE :  target.mk
diff --git a/registry/tools/rdbedit.cxx b/registry/tools/rdbedit.cxx
index c2b3d6a3dcf3..370c82bea4d3 100644
--- a/registry/tools/rdbedit.cxx
+++ b/registry/tools/rdbedit.cxx
@@ -120,15 +120,15 @@ public:
     OString prepareHelp();
     OString prepareVersion();
 
-    const OString& getProgramName()
+    const OString& getProgramName() const
         { return m_program; }
-    const OString& getTypeReg()
+    const OString& getTypeReg() const
         { return m_typeRegName; }
-    const OString& getKeyName()
+    const OString& getKeyName() const
         { return m_keyName; }
-    const Command getCommand()
+    Command getCommand() const
         { return m_command; }
-    bool verbose()
+    bool verbose() const
         { return m_bVerbose; }
 protected:
     OString     m_program;
@@ -262,7 +262,7 @@ OString Options::prepareVersion()
 static Options options;
 
 
-#if (defined UNX) || (defined OS2) || (defined __MINGW32__)
+#if (defined UNX) || (defined __MINGW32__)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index 0eaa220ae2de..44f725ce0d49 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1961,7 +1962,7 @@ static sal_uInt32 compareKeys(
     return nError;
 }
 
-#if (defined UNX) || (defined OS2) || defined __MINGW32__
+#if (defined UNX) || defined __MINGW32__
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -2088,3 +2089,5 @@ int _cdecl main( int argc, char * argv[] )
 
     return ((nError > 0) ? 11 : 0);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index 6ca47a18c795..193209be2733 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,7 +92,7 @@ bool Options_Impl::initOptions_Impl (std::vector< std::string > & rArgs)
     return true;
 }
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -177,3 +178,5 @@ int _cdecl main( int argc, char * argv[] )
 
     return(0);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index 4c588449a1d8..2cb11b815c86 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,7 @@
 using rtl::OUString;
 using namespace registry::tools;
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -113,3 +114,4 @@ int _cdecl main( int argc, char * argv[] )
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/util/makefile.mk b/registry/util/makefile.mk
index 1fb4cdc0fe38..0b6be7e6e7f5 100644
--- a/registry/util/makefile.mk
+++ b/registry/util/makefile.mk
@@ -33,12 +33,12 @@ TARGET=reg
 UNIXVERSIONNAMES=UDK
 
 # --- Settings -----------------------------------------------------
+
 .INCLUDE :  settings.mk
 
 # ------------------------------------------------------------------
 
 USE_LDUMP2=TRUE
-#USE_DEFFILE=TRUE
 LDUMP2=LDUMP3
 
 DOCPPFILES= $(INC)$/registry$/registry.hxx \
diff --git a/registry/workben/makefile.mk b/registry/workben/makefile.mk
index 2813d696516a..b7b8037f64b4 100644
--- a/registry/workben/makefile.mk
+++ b/registry/workben/makefile.mk
@@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS := TRUE
 CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)"
 
 RGTLIB = rgt.lib
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="UNX"
 RGTLIB = -lrgt$(DLLPOSTFIX)
 .ENDIF
 
diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx
index 21a67c89ed35..83b5db8dd2e4 100644
--- a/registry/workben/regspeed.cxx
+++ b/registry/workben/regspeed.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,11 +67,7 @@ public:
     };
 
 protected:
-#ifdef OS2
-    struct timeb m_start, m_stop;
-#else
     struct _timeb m_start, m_stop;
-#endif
     double m_diff;
 };
 #else
@@ -102,9 +99,10 @@ protected:
 };
 #endif
 
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -193,7 +191,7 @@ int _cdecl main( int argc, char * argv[] )
 
             for (sal_Int32 i=0; i < S1; i++)
             {
-                keyName1 = OUString::createFromAscii("/");
+                keyName1 = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                 keyName1 += sName1;
                 keyName1 += OUString().valueOf(i);
                 if (reg_openKey(hRootKey, keyName1.pData, &hKey))
@@ -202,10 +200,10 @@ int _cdecl main( int argc, char * argv[] )
 
                 for (sal_Int32 j=0; j < S2; j++)
                 {
-                    keyName2 = OUString::createFromAscii("/");
+                    keyName2 = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                     keyName2 += sName1;
                     keyName2 += OUString().valueOf(i);
-                    keyName2 += OUString::createFromAscii("/");
+                    keyName2 += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                     keyName2 += sName2;
                     keyName2 += OUString().valueOf(j);
                     if (reg_openKey(hRootKey, keyName2.pData, &hSubKey))
@@ -214,13 +212,13 @@ int _cdecl main( int argc, char * argv[] )
 
                         for (sal_Int32 n=0; n < S3; n++)
                         {
-                            keyName3 = OUString::createFromAscii("/");
+                            keyName3 = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                             keyName3 += sName1;
                             keyName3 += OUString().valueOf(i);
-                            keyName3 += OUString::createFromAscii("/");
+                            keyName3 += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                             keyName3 += sName2;
                             keyName3 += OUString().valueOf(j);
-                            keyName3 += OUString::createFromAscii("/");
+                            keyName3 += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                             keyName3 += sName3;
                             keyName3 += OUString().valueOf(n);
                             if (reg_openKey(hRootKey, keyName3.pData, &hSubSubKey))
@@ -269,3 +267,4 @@ int _cdecl main( int argc, char * argv[] )
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx
index ace25ed64d86..ef9c106fd0cc 100644
--- a/registry/workben/regtest.cxx
+++ b/registry/workben/regtest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,9 +37,11 @@
 #include    <rtl/alloc.h>
 
 using namespace std;
-using namespace rtl;
 
-#if (defined UNX) || (defined OS2)
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
+#if (defined UNX)
 int main()
 #else
 int _cdecl main()
@@ -49,7 +52,7 @@ int _cdecl main()
 
     cout << "\n     Simple Registry Test !!!     \n\n";
 
-    if (reg_createRegistry(OUString::createFromAscii("test4.rdb").pData, &hReg))
+    if (reg_createRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test4.rdb")).pData, &hReg))
         cout << "\t0. creating registry \"test4.rdb\" failed\n";
     else
         cout << "0. registry test4.rdb is created\n";
@@ -59,23 +62,23 @@ int _cdecl main()
     else
         cout << "1. root key of \"test4.rdb\" is opened\n";
 
-    if (reg_createKey(hRootKey, OUString::createFromAscii("myFirstKey").pData, &hKey1))
+    if (reg_createKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")).pData, &hKey1))
         cout << "\t2. creating key \"myFirstKey\" failed\n";
     else
         cout << "2. key \"myFirstKey\" is created\n";
-    if (reg_createKey(hRootKey, OUString::createFromAscii("mySecondKey").pData, &hKey2))
+    if (reg_createKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")).pData, &hKey2))
         cout << "\t3. creating key \"mySecondKey\" failed\n";
     else
         cout << "3. key \"mySecondKey\" is created\n";
-    if (reg_createKey(hKey1, OUString::createFromAscii("myFirstSubKey").pData, &hKey3))
+    if (reg_createKey(hKey1, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstSubKey")).pData, &hKey3))
         cout << "\t4. creating subkey \"myFirstSubKey\" failed\n";
     else
         cout << "4. subkey \"myFirstSubKey\" is created\n";
-    if (reg_createKey(hKey1, OUString::createFromAscii("mySecondSubKey").pData, &hKey4))
+    if (reg_createKey(hKey1, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondSubKey")).pData, &hKey4))
         cout << "\t5. creating subkey \"mySecondSubKey\" failed\n";
     else
         cout << "5. subkey \"mySecondSubKey\" is created\n";
-    if (reg_createKey(hRootKey, OUString::createFromAscii("myThirdKey").pData, &hKey5))
+    if (reg_createKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")).pData, &hKey5))
         cout << "\t6. creating key \"myThirdKey\" is created\n\n";
     else
         cout << "6. key \"myThirdKey\" is created\n\n";
@@ -83,7 +86,7 @@ int _cdecl main()
 
     RegKeyHandle*   phSubKeys;
     sal_uInt32      nSubKeys;
-    if (reg_openSubKeys(hRootKey, OUString::createFromAscii("myFirstKey").pData, &phSubKeys, &nSubKeys))
+    if (reg_openSubKeys(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")).pData, &phSubKeys, &nSubKeys))
         cout << "\t7. open subkeys of \"myfirstKey\" failed\n";
     else
         cout << "7. open " << nSubKeys << "subkeys of \"myfirstKey\"\n";
@@ -101,7 +104,7 @@ int _cdecl main()
 
 
     char* Value=(char*)"Mein erster Value";
-    if (reg_setValue(hRootKey, OUString::createFromAscii("mySecondKey").pData, RG_VALUETYPE_STRING, Value, 18))
+    if (reg_setValue(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")).pData, RG_VALUETYPE_STRING, Value, 18))
         cout << "\t9. setValue of key \"mySecondKey\" failed\n";
     else
         cout << "9. setValue (string Value)  of key \"mySecondKey\"\n";
@@ -109,7 +112,7 @@ int _cdecl main()
     RegValueType    valueType;
     sal_uInt32      valueSize;
     sal_Char*       readValue;
-    if (reg_getValueInfo(hRootKey, OUString::createFromAscii("mySecondKey").pData, &valueType, &valueSize))
+    if (reg_getValueInfo(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")).pData, &valueType, &valueSize))
         cout << "\t10. getValueInfo of key \"mySecondKey\" failed\n";
     else
         cout << "10. getValueInfo of key \"mySecondKey\"\n";
@@ -134,7 +137,7 @@ int _cdecl main()
     else
         cout << "12. keys \"myFirstKey\" \"myfistSubKey\" \"mySecondSubKey\" are closed\n";
 
-    if (reg_deleteKey(hRootKey, OUString::createFromAscii("myFirstKey").pData))
+    if (reg_deleteKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")).pData))
         cout << "13.\t delete key \"myFirstKey\" failed\n";
     else
         cout << "13. key \"myFirstKey\" is deleted\n";
@@ -144,7 +147,7 @@ int _cdecl main()
     else
         cout << "14. key \"mySecondKey\" is closed\n";
 
-    if (reg_openKey(hRootKey, OUString::createFromAscii("mySecondKey").pData, &hKey2))
+    if (reg_openKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")).pData, &hKey2))
         cout << "\n15. open key \"mySecondKey\" failed\n";
     else
         cout << "15. key \"mySecondKey\" is opended\n";
@@ -153,12 +156,12 @@ int _cdecl main()
         cout << "\t15. closing key \"myThirdSubKey\" failed\n";
     else
         cout << "15. key \"myThirdSubKey\" is closed\n";
-    if (reg_deleteKey(hRootKey, OUString::createFromAscii("myThirdKey").pData))
+    if (reg_deleteKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")).pData))
         cout << "\t16. delete key \"myThirdKey\" failed\n";
     else
         cout << "16. key \"myThirdKey\" is deleted\n";
 
-    if (reg_openKey(hRootKey, OUString::createFromAscii("myThirdKey").pData, &hKey5))
+    if (reg_openKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")).pData, &hKey5))
         cout << "\t17. open key \"myThirdKey\" failed\n";
     else
         cout << "17. key \"myThirdKey\" is opened\n";
@@ -186,7 +189,7 @@ int _cdecl main()
     RegHandle       hReg2;
     RegKeyHandle    hRootKey2, h2Key1, h2Key2, h2Key3, h2Key4, h2Key5;
 
-    if (reg_createRegistry(OUString::createFromAscii("test5.rdb").pData, &hReg2))
+    if (reg_createRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test5.rdb")).pData, &hReg2))
         cout << "\t21. creating registry \"test5.rdb\" failed\n";
     else
         cout << "21. registry \"test5.rdb\" is created\n";
@@ -196,23 +199,23 @@ int _cdecl main()
     else
         cout << "22. root key of \"test5.rdb\" is opened\n";
 
-    if (reg_createKey(hRootKey2, OUString::createFromAscii("reg2FirstKey").pData, &h2Key1))
+    if (reg_createKey(hRootKey2, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2FirstKey")).pData, &h2Key1))
         cout << "\t23. creating key \"reg2FirstKey\" failed\n";
     else
         cout << "23. key \"reg2FirstKey\" is created\n";
-    if (reg_createKey(hRootKey2, OUString::createFromAscii("reg2SecondKey").pData, &h2Key2))
+    if (reg_createKey(hRootKey2, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2SecondKey")).pData, &h2Key2))
         cout << "\t24. creating key \"reg2SecondKey\" failed\n";
     else
         cout << "24. key \"reg2SecondKey\" is created\n";
-    if (reg_createKey(h2Key1, OUString::createFromAscii("reg2FirstSubKey").pData, &h2Key3))
+    if (reg_createKey(h2Key1, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2FirstSubKey")).pData, &h2Key3))
         cout << "\t25. creating key \"reg2FirstSubKey\" failed\n";
     else
         cout << "25. key \"reg2FirstSubKey\" is created\n";
-    if (reg_createKey(h2Key1, OUString::createFromAscii("reg2SecondSubKey").pData, &h2Key4))
+    if (reg_createKey(h2Key1, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2SecondSubKey")).pData, &h2Key4))
         cout << "\26. creating key \"reg2SecondSubKey\" failed\n";
     else
         cout << "26. key \"reg2SecondSubKey\" is created\n";
-    if (reg_createKey(hRootKey2, OUString::createFromAscii("reg2ThirdKey").pData, &h2Key5))
+    if (reg_createKey(hRootKey2, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2ThirdKey")).pData, &h2Key5))
         cout << "\n27. creating key \"reg2ThirdKey\" failed\n";
     else
         cout << "27. key \"reg2ThirdKey\" is created\n";
@@ -242,7 +245,7 @@ int _cdecl main()
     else
         cout << "30. registry test5.rdb is closed\n";
 
-    if (reg_openRegistry(OUString::createFromAscii("test4.rdb").pData, &hReg, REG_READWRITE))
+    if (reg_openRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test4.rdb")).pData, &hReg, REG_READWRITE))
         cout << "\t31. registry test4.rdb is opened\n";
     else
         cout << "31. registry test4.rdb is opened\n";
@@ -252,34 +255,34 @@ int _cdecl main()
     else
         cout << "32. root key of \"test4.rdb\" is opened\n";
 
-    if (reg_loadKey(hRootKey, OUString::createFromAscii("allFromTest2").pData,
-                    OUString::createFromAscii("test5.rdb").pData))
+    if (reg_loadKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest2")).pData,
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("test5.rdb")).pData))
         cout << "\n\t33. load all keys from \"test5.rdb\" under key \"allFromTest2\" failed\n";
     else
         cout << "\n33. load all keys from test5.rdb under key \"allFromTest2\"\n";
 
-    if (reg_saveKey(hRootKey, OUString::createFromAscii("allFromTest2").pData,
-                    OUString::createFromAscii("test6.rdb").pData))
+    if (reg_saveKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest2")).pData,
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("test6.rdb")).pData))
         cout << "\n\t34. save all keys under \"allFromTest2\" in test6.rdb\n";
     else
         cout << "\n34. save all keys under \"allFromTest2\" in test6.rdb\n";
 
 
-    if (reg_createKey(hRootKey, OUString::createFromAscii("allFromTest3").pData, &hKey1))
+    if (reg_createKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")).pData, &hKey1))
         cout << "\t35. creating key \"allFromTest3\" failed\n";
     else
         cout << "36. key \"allFromTest3\" is created\n";
-    if (reg_createKey(hKey1, OUString::createFromAscii("myFirstKey2").pData, &hKey2))
+    if (reg_createKey(hKey1, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey2")).pData, &hKey2))
         cout << "\t37. creating key \"myFirstKey2\" failed\n";
     else
         cout << "37. key \"myFirstKey2\" is created\n";
-    if (reg_createKey(hKey1, OUString::createFromAscii("mySecondKey2").pData, &hKey3))
+    if (reg_createKey(hKey1, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey2")).pData, &hKey3))
         cout << "\t38. creating key \"mySecondKey2\" failed\n";
     else
         cout << "38. key \"mySecondKey2\" is created\n";
 
-    if (reg_mergeKey(hRootKey, OUString::createFromAscii("allFromTest3").pData,
-                    OUString::createFromAscii("test6.rdb").pData, sal_False, sal_False))
+    if (reg_mergeKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")).pData,
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("test6.rdb")).pData, sal_False, sal_False))
         cout << "\n\t39. merge all keys under \"allFromTest2\" with all in test6.rdb\n";
     else
         cout << "\n39. merge all keys under \"allFromTest2\" with all in test6.rdb\n";
@@ -298,18 +301,18 @@ int _cdecl main()
         cout << "\n42. closing key \"mySecondKey2\" of \"test5.rdb\"\n";
 
 
-    if (reg_deleteKey(hRootKey, OUString::createFromAscii("/allFromTest3/reg2FirstKey/reg2FirstSubKey").pData))
+    if (reg_deleteKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("/allFromTest3/reg2FirstKey/reg2FirstSubKey")).pData))
         cout << "\n\t43. delete key \"/allFromTest3/reg2FirstKey/reg2FirstSubKey\" failed\n";
     else
         cout << "\n43. key \"/allFromTest3/reg2FirstKey/reg2FirstSubKey\" is deleted\n";
 
-    if (reg_openRegistry(OUString::createFromAscii("test4.rdb").pData, &hReg2, REG_READONLY))
+    if (reg_openRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test4.rdb")).pData, &hReg2, REG_READONLY))
         cout << "\n\t44. registry test4.rdb is opened for read only\n";
     else
         cout << "\n44. registry test4.rdb is opened for read only\n";
 
     RegHandle hReg3;
-    if (reg_openRegistry(OUString::createFromAscii("test4.rdb").pData, &hReg3, REG_READONLY))
+    if (reg_openRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test4.rdb")).pData, &hReg3, REG_READONLY))
         cout << "\n\t44.a). registry test4.rdb is opened for read only\n";
     else
         cout << "\n44.a). registry test4.rdb is opened for read only\n";
@@ -338,3 +341,4 @@ int _cdecl main()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/workben/test.cxx b/registry/workben/test.cxx
index 98b49618ea60..4f225722b7ca 100644
--- a/registry/workben/test.cxx
+++ b/registry/workben/test.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 #include <stdio.h>
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main()
 #else
 int _cdecl main()
@@ -52,3 +53,4 @@ int _cdecl main()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/remotebridges/examples/makefile.mk b/remotebridges/examples/makefile.mk
index 64b948d66651..ec268788b3fe 100644
--- a/remotebridges/examples/makefile.mk
+++ b/remotebridges/examples/makefile.mk
@@ -43,7 +43,6 @@ SHL1TARGET= officeclientsample
 
 SHL1STDLIBS= \
         $(SALLIB)	\
-        $(VOSLIB)	\
         $(CPPULIB) 	\
         $(CPPUHELPERLIB) 
 
diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx
index b6d5ea60c801..1ae0d29b871e 100644
--- a/remotebridges/examples/officeclient.cxx
+++ b/remotebridges/examples/officeclient.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,7 +92,7 @@ void OfficeClientMain::testWriter( const Reference< XComponent > & rComponent )
     Reference< XTextCursor > rCursor = rText->createTextCursor();
     Reference< XTextRange > rRange ( rCursor , UNO_QUERY );
 
-    rText->insertString( rRange, OUString::createFromAscii( "This text has been posted by the officeclient component" ), sal_False );
+    rText->insertString( rRange, OUString(RTL_CONSTASCII_USTRINGPARAM("This text has been posted by the officeclient component")), sal_False );
 }
 
 /********************
@@ -104,7 +105,7 @@ void OfficeClientMain::registerServices( )
     Reference < XImplementationRegistration > rImplementationRegistration(
 
         m_xSMgr->createInstance(
-            OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" )),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration"))),
         UNO_QUERY );
 
     if( ! rImplementationRegistration.is() )
@@ -115,13 +116,13 @@ void OfficeClientMain::registerServices( )
 
     OUString aSharedLibrary[4];
     aSharedLibrary[0] =
-        OUString::createFromAscii( "connector.uno" SAL_DLLEXTENSION );
+        OUString(RTL_CONSTASCII_USTRINGPARAM( "connector.uno" SAL_DLLEXTENSION ));
     aSharedLibrary[1] =
-        OUString::createFromAscii( "remotebridge.uno" SAL_DLLEXTENSION );
+        OUString(RTL_CONSTASCII_USTRINGPARAM( "remotebridge.uno" SAL_DLLEXTENSION ));
     aSharedLibrary[2] =
-        OUString::createFromAscii( "bridgefac.uno" SAL_DLLEXTENSION );
+        OUString(RTL_CONSTASCII_USTRINGPARAM( "bridgefac.uno" SAL_DLLEXTENSION ));
     aSharedLibrary[3] =
-        OUString::createFromAscii( "uuresolver.uno" SAL_DLLEXTENSION );
+        OUString(RTL_CONSTASCII_USTRINGPARAM( "uuresolver.uno" SAL_DLLEXTENSION ));
 
     sal_Int32 i;
     for( i = 0 ; i < 4 ; i ++ )
@@ -134,7 +135,7 @@ void OfficeClientMain::registerServices( )
         {
             // register the needed services in the servicemanager
             rImplementationRegistration->registerImplementation(
-                OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
                 aDllName,
                 Reference< XSimpleRegistry > () );
         }
@@ -155,7 +156,7 @@ sal_Int32 OfficeClientMain::run( const Sequence< OUString > & aArguments ) throw
         try {
             registerServices();
             Reference < XInterface > r =
-                m_xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.bridge.UnoUrlResolver" ) );
+                m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) );
             Reference < XUnoUrlResolver > rResolver( r , UNO_QUERY );
             r = rResolver->resolve( aArguments.getConstArray()[0] );
 
@@ -164,7 +165,7 @@ sal_Int32 OfficeClientMain::run( const Sequence< OUString > & aArguments ) throw
             {
                 printf( "got the remote NamingService\n" );
 
-                r = rNamingService->getRegisteredObject(OUString::createFromAscii("StarOffice.ServiceManager"));
+                r = rNamingService->getRegisteredObject(OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")));
 
                 Reference< XMultiServiceFactory > rRemoteSMgr( r , UNO_QUERY );
 
@@ -261,7 +262,7 @@ Sequence< OUString > getSupportedServiceNames()
         if( !pNames )
         {
             static Sequence< OUString > seqNames(2);
-            seqNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.bridge.example.OfficeClientExample" );
+            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.example.OfficeClientExample"));
             pNames = &seqNames;
         }
     }
@@ -277,7 +278,7 @@ using namespace remotebridges_officeclient;
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -292,7 +293,7 @@ sal_Bool SAL_CALL component_writeInfo(
         {
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                    OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
 
             const Sequence< OUString > & rSNL = getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
@@ -303,13 +304,13 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+            OSL_FAIL( "### InvalidRegistryException!" );
         }
     }
     return sal_False;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     void * pRet = 0;
@@ -331,3 +332,5 @@ void * SAL_CALL component_getFactory(
     return pRet;
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/remotebridges/prj/d.lst b/remotebridges/prj/d.lst
index b8b46ae7089c..8f9c063f196d 100755..100644
--- a/remotebridges/prj/d.lst
+++ b/remotebridges/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\uuresolver.uno.dll %_DEST%\bin%_EXT%\uuresolver.uno.dll
-..\%__SRC%\lib\uuresolver.uno.dylib %_DEST%\lib%_EXT%\uuresolver.uno.dylib
-..\%__SRC%\lib\uuresolver.uno.so %_DEST%\lib%_EXT%\uuresolver.uno.so
-..\%__SRC%\misc\uuresolver.component %_DEST%\xml%_EXT%\uuresolver.component
+..\%__SRC%\bin\uuresolver.uno.dll %_DEST%\bin\uuresolver.uno.dll
+..\%__SRC%\lib\uuresolver.uno.dylib %_DEST%\lib\uuresolver.uno.dylib
+..\%__SRC%\lib\uuresolver.uno.so %_DEST%\lib\uuresolver.uno.so
+..\%__SRC%\misc\uuresolver.component %_DEST%\xml\uuresolver.component
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index 33077795bf4d..422241e6dbe5 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,7 +45,6 @@
 #include <com/sun/star/bridge/XUnoUrlResolver.hpp>
 
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -52,6 +52,8 @@ using namespace com::sun::star::connection;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::registry;
 
+using ::rtl::OUString;
+
 #define SERVICENAME     "com.sun.star.bridge.UnoUrlResolver"
 #define IMPLNAME        "com.sun.star.comp.bridge.UnoUrlResolver"
 
@@ -61,34 +63,14 @@ namespace unourl_resolver
 //--------------------------------------------------------------------------------------------------
 Sequence< OUString > resolver_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 OUString resolver_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName(
-                RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 
 //==================================================================================================
@@ -233,15 +215,17 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ridljar/com/sun/star/lib/util/WeakMap.java b/ridljar/com/sun/star/lib/util/WeakMap.java
index 7c2ccde1ded1..9d49eef2b2c6 100644
--- a/ridljar/com/sun/star/lib/util/WeakMap.java
+++ b/ridljar/com/sun/star/lib/util/WeakMap.java
@@ -48,7 +48,7 @@ import java.util.Set;
  *
  * <p>Unlike other map implementations, <code>WeakMap</code> is asymmetric in
  * that <code>put</code> expects the given value to be a plain object that is
- * then wrapped in a <code>WeakReference</code>, while the occurences of values
+ * then wrapped in a <code>WeakReference</code>, while the occurrences of values
  * in all other methods (<code>containsValue</code>, <code>entrySet</code>,
  * <code>equals</code>, <code>get</code>, <code>hashCode</code>,
  * <code>remove</code>, <code>values</code>, and also the return value of
diff --git a/ridljar/prj/d.lst b/ridljar/prj/d.lst
index 12cde6f2815e..007fd9dd4e15 100644
--- a/ridljar/prj/d.lst
+++ b/ridljar/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\ridl_src.zip %COMMON_DEST%\bin%_EXT%\ridl_src.zip
-..\%__SRC%\class\ridl.jar %_DEST%\bin%_EXT%\ridl.jar
-..\%__SRC%\class\unoloader\unoloader.jar %_DEST%\bin%_EXT%\unoloader.jar
-..\%__SRC%\bin\unoloader_src.zip %COMMON_DEST%\bin%_EXT%\unoloader_src.zip
+..\%__SRC%\bin\ridl_src.zip %COMMON_DEST%\bin\ridl_src.zip
+..\%__SRC%\class\ridl.jar %_DEST%\bin\ridl.jar
+..\%__SRC%\class\unoloader\unoloader.jar %_DEST%\bin\unoloader.jar
+..\%__SRC%\bin\unoloader_src.zip %COMMON_DEST%\bin\unoloader_src.zip
diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk
new file mode 100755
index 000000000000..dffa14882479
--- /dev/null
+++ b/sal/CppunitTest_sal_osl_mutex.mk
@@ -0,0 +1,39 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_mutex))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_mutex, \
+	sal/qa/osl/mutex/osl_Mutex \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_mutex, \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk
new file mode 100755
index 000000000000..b4cd7e623a00
--- /dev/null
+++ b/sal/CppunitTest_sal_osl_pipe.mk
@@ -0,0 +1,40 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_pipe))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_pipe, \
+    sal/qa/osl/pipe/osl_Pipe \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_pipe, \
+    sal \
+    test \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk
new file mode 100755
index 000000000000..dd396c6f1104
--- /dev/null
+++ b/sal/CppunitTest_sal_osl_profile.mk
@@ -0,0 +1,39 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_profile))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_profile, \
+    sal/qa/osl/profile/osl_old_testprofile \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_profile, \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk
new file mode 100755
index 000000000000..2bc5642cf37e
--- /dev/null
+++ b/sal/CppunitTest_sal_osl_setthreadname.mk
@@ -0,0 +1,39 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_setthreadname))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \
+	sal/qa/osl/setthreadname/test-setthreadname \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_setthreadname, \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk
new file mode 100755
index 000000000000..55f467009bd6
--- /dev/null
+++ b/sal/CppunitTest_sal_rtl_math.mk
@@ -0,0 +1,39 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_math))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_math, \
+    sal/qa/rtl/math/test-rtl-math \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_math, \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/qa/osl/thread/version.map b/sal/Makefile
index 7321bbca16ad..a79aff831024 100644
--- a/sal/qa/osl/thread/version.map
+++ b/sal/Makefile
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -25,10 +25,14 @@
 #
 #*************************************************************************
 
-UDK_3_0_0 {
-    global:
-        registerAllTestFunction;
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-    local:
-        *;
-};
+# vim: set noet sw=4 ts=4:
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
new file mode 100644
index 000000000000..89ced157bb44
--- /dev/null
+++ b/sal/Module_sal.mk
@@ -0,0 +1,38 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,sal))
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,sal,\
+	CppunitTest_sal_osl_mutex \
+	CppunitTest_sal_osl_pipe \
+	CppunitTest_sal_osl_profile \
+	CppunitTest_sal_osl_setthreadname \
+	CppunitTest_sal_rtl_math \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx
index dfbf04d336cb..103e8f0d5914 100644
--- a/sal/cpprt/operators_new_delete.cxx
+++ b/sal/cpprt/operators_new_delete.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,7 +93,7 @@ struct AllocatorTraits
         p = static_cast<char*>(p) - sizeof(signature_type);
         if (memcmp (p, m_signature, sizeof(signature_type)) != 0)
         {
-            OSL_ENSURE(0, "operator delete mismatch");
+            OSL_FAIL("operator delete mismatch");
         }
 #endif  /* OSL_DEBUG_LEVEL */
         return p;
@@ -249,3 +250,5 @@ void SAL_CALL operator delete[] (void * p, std::nothrow_t const &) throw ()
 }
 
 // =======================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index c89a350d6708..96d23472c53e 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +29,10 @@
 #include "precompiled_sal.hxx"
 #include "sal/config.h"
 
+#ifdef WNT
+#include <windows.h>
+#endif
+
 #include <cstdlib>
 #include <iostream>
 #include <limits>
@@ -45,7 +50,6 @@
 #include "sal/main.h"
 #include "sal/types.h"
 
-#include "preextstl.h"
 #include "cppunit/CompilerOutputter.h"
 #include "cppunit/TestResult.h"
 #include "cppunit/TestResultCollector.h"
@@ -53,7 +57,6 @@
 #include "cppunit/extensions/TestFactoryRegistry.h"
 #include "cppunit/plugin/PlugInManager.h"
 #include "cppunit/portability/Stream.h"
-#include "postextstl.h"
 
 namespace {
 
@@ -76,32 +79,21 @@ std::string convertLazy(rtl::OUString const & s16) {
     return std::string(
         s8.getStr(),
         ((static_cast< sal_uInt32 >(s8.getLength())
-          > std::numeric_limits< std::string::size_type >::max())
-         ? std::numeric_limits< std::string::size_type >::max()
+          > (std::numeric_limits< std::string::size_type >::max)())
+         ? (std::numeric_limits< std::string::size_type >::max)()
          : static_cast< std::string::size_type >(s8.getLength())));
 }
 
-std::string convertStrict(rtl::OUString const & s16) {
-    rtl::OString s8;
-    if (!s16.convertToString(
-            &s8, osl_getThreadTextEncoding(),
-            (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
-             | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))
-        || (static_cast< sal_uInt32 >(s8.getLength())
-            > std::numeric_limits< std::string::size_type >::max()))
-    {
-        std::cerr
-            << "Failure converting argument from UTF-16 back to system encoding"
-            << std::endl;
-        std::exit(EXIT_FAILURE);
-    }
-    return std::string(
-        s8.getStr(), static_cast< std::string::size_type >(s8.getLength()));
-}
-
 }
 
 SAL_IMPLEMENT_MAIN() {
+#ifdef WNT
+    //Disable Dr-Watson in order to crash simply without popup dialogs under
+    //windows
+    DWORD dwMode = SetErrorMode(SEM_NOGPFAULTERRORBOX);
+    SetErrorMode(SEM_NOGPFAULTERRORBOX|dwMode);
+#endif
+
     CppUnit::TestResult result;
     sal_uInt32 index = 0;
     for (; index < rtl_getAppCommandArgCount(); index += 3) {
@@ -128,11 +120,27 @@ SAL_IMPLEMENT_MAIN() {
         }
         result.pushProtector(p);
     }
-    if (rtl_getAppCommandArgCount() - index != 1) {
+    if (rtl_getAppCommandArgCount() - index < 1) {
         usageFailure();
     }
+
+    std::string testlib;
+    {
+        rtl::OUString path;
+        rtl_getAppCommandArg(index, &path.pData);
+        testlib = rtl::OUStringToOString(path, osl_getThreadTextEncoding()).getStr();
+    }
+    std::string args = testlib;
+    for (sal_uInt32 i = index + 1; i < rtl_getAppCommandArgCount(); ++i)
+    {
+        rtl::OUString arg;
+        rtl_getAppCommandArg(i, &arg.pData);
+        args += ' ';
+        args += rtl::OUStringToOString(arg, osl_getThreadTextEncoding()).getStr();
+    }
+
     CppUnit::PlugInManager manager;
-    manager.load(convertStrict(getArgument(index)));
+    manager.load(testlib, args);
     CppUnit::TestRunner runner;
     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
     CppUnit::TestResultCollector collector;
@@ -141,3 +149,5 @@ SAL_IMPLEMENT_MAIN() {
     CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write();
     return collector.wasSuccessful() ? EXIT_SUCCESS : EXIT_FAILURE;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
index 61fe7868c9f3..65b600b05bd7 100644
--- a/sal/cppunittester/makefile.mk
+++ b/sal/cppunittester/makefile.mk
@@ -33,12 +33,7 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
+.IF "$(CROSS_COMPILING)"!="YES"
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
@@ -49,4 +44,6 @@ APP1RPATH = NONE
 APP1STDLIBS = $(CPPUNITLIB) $(SALLIB)
 APP1TARGET = cppunittester
 
+.ENDIF
+
 .INCLUDE: target.mk
diff --git a/sal/inc/internal/once.h b/sal/inc/internal/once.h
index 4438f281215c..45f9c37a8113 100644
--- a/sal/inc/internal/once.h
+++ b/sal/inc/internal/once.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
  *  (platform dependent)
  */
 
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
 
 #include <pthread.h>
 
@@ -77,3 +78,5 @@ struct sal_once_st
 #endif /* SAL_UNX | SAL_W32 */
 
 #endif /* INCLUDED_SAL_INTERNAL_ONCE_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/armarch.h b/sal/inc/osl/armarch.h
new file mode 100644
index 000000000000..ab50f5bac1cd
--- /dev/null
+++ b/sal/inc/osl/armarch.h
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -----------------------------------------------------------------------
+   Copyright (c) 1998, 2008 Red Hat, Inc.
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   ``Software''), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+   ----------------------------------------------------------------------- */
+
+// shamelessly copied from libffi src/arm/sysv.h
+#ifndef _OSL_ARMARCH_H_
+#define _OSL_ARMARCH_H_
+#ifdef ARM
+
+#define __ARM_ARCH__ 3
+
+#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
+# undef __ARM_ARCH__
+# define __ARM_ARCH__ 4
+#endif
+
+#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) \
+    || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) \
+    || defined(__ARM_ARCH_5TEJ__)
+# undef __ARM_ARCH__
+# define __ARM_ARCH__ 5
+#endif
+
+#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
+    || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
+    || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \
+    || defined(__ARM_ARCH_6M__)
+# undef __ARM_ARCH__
+# define __ARM_ARCH__ 6
+#endif
+
+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
+    || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__)
+# undef __ARM_ARCH__
+# define __ARM_ARCH__ 7
+#endif
+
+#endif
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/conditn.h b/sal/inc/osl/conditn.h
index debcdd882179..88478c377bf3 100644
--- a/sal/inc/osl/conditn.h
+++ b/sal/inc/osl/conditn.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,7 @@ typedef void* oslCondition;
 
 typedef enum {
     osl_cond_result_ok,     /* successful completion */
-    osl_cond_result_error,  /* error occured, check osl_getLastSocketError() for details */
+    osl_cond_result_error,  /* error occurred, check osl_getLastSocketError() for details */
     osl_cond_result_timeout, /* blocking operation timed out */
     osl_cond_result_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslConditionResult;
@@ -90,3 +91,4 @@ sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition);
 
 #endif /* _OSL_CONDITION_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/conditn.hxx b/sal/inc/osl/conditn.hxx
index e0393ca98302..bfd5169bd028 100644
--- a/sal/inc/osl/conditn.hxx
+++ b/sal/inc/osl/conditn.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -126,3 +127,4 @@ namespace osl
 #endif  /* __cplusplus */
 #endif  /* _OSL_CONDITN_HXX_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h
index 033b24c84360..fa722d3ef1e2 100644
--- a/sal/inc/osl/diagnose.h
+++ b/sal/inc/osl/diagnose.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,6 +32,50 @@
 
 #include <sal/types.h>
 
+/** provides simple diagnostic support
+
+    The functions defined in this header are not intended to be used directly,
+    but through defined macros. The macros can be divided into three categories:
+    assertions, traces and other stuff .-) Their usability depends on the value
+    of OSL_DEBUG_LEVEL macro: assertions are only active if OSL_DEBUG_LEVEL is 1
+    or greater, traces if OSL_DEBUG_LEVEL is 2 or greater.
+
+    Assertions (cond is bool, msg is char*):
+    OSL_ASSERT(cond)
+        If cond is false, reports an error.
+
+    OSL_ENSURE(cond, msg)
+        If cond is false, reports an error with message msg.
+
+    OSL_FAIL(msg)
+        Reports an error with message msg unconditionally.
+
+    OSL_PRECOND(cond, msg)
+    OSL_POSTCOND(cond, msg)
+        These two are functionally equivalent to OSL_ENSURE(cond, msg). They are
+        intended to be used for checking pre- and postconditions of functions.
+
+    Traces:
+    OSL_TRACE(fmt, args...)
+        Prints trace message. The arguments have the same meaning as the
+        arguments of printf.
+
+    Other:
+    OSL_VERIFY(expr)
+        Evaluates the expression and if it is false, reports an error. The
+        expression is evaluated once without regard of the value of
+        OSL_DEBUG_LEVEL.
+
+        Example:
+
+        void extractBool(Any const& rAny, bool& rBool)
+        {
+            OSL_VERIFY(rAny >>= rBool);
+        }
+
+    OSL_DEBUG_ONLY(expr)
+ */
+
 #ifdef __cplusplus
 extern "C" {
 #endif  /* __cplusplus */
@@ -77,9 +122,6 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 
 #define OSL_THIS_FILE       __FILE__
 
-/* the macro OSL_THIS_FUNC is intended to be an office internal macro for now */
-#define OSL_THIS_FUNC "<unknown>"
-
 /* the macro OSL_TO_STRING is intended to be an office internal macro for now */
 #define OSL_TO_STRING( x ) #x
 
@@ -87,12 +129,13 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 #define OSL_MACRO_VALUE_TO_STRING( x ) OSL_TO_STRING( x )
 
 /* the macro OSL_LOG_PREFIX is intended to be an office internal macro for now */
-#define OSL_LOG_PREFIX OSL_THIS_FILE ":" OSL_THIS_FUNC ":" OSL_MACRO_VALUE_TO_STRING( __LINE__ ) "; "
+#define OSL_LOG_PREFIX OSL_THIS_FILE ":" OSL_MACRO_VALUE_TO_STRING( __LINE__ ) "; "
 
 #define OSL_DEBUG_ONLY(s)   _OSL_DEBUG_ONLY(s)
 #define OSL_TRACE           _OSL_TRACE
-#define OSL_ASSERT(c)       _OSL_ASSERT(c, OSL_THIS_FILE, __LINE__)
+#define OSL_ASSERT(c)       _OSL_ENSURE(c, OSL_THIS_FILE, __LINE__, 0)
 #define OSL_ENSURE(c, m)   _OSL_ENSURE(c, OSL_THIS_FILE, __LINE__, m)
+#define OSL_FAIL(m)        _OSL_ENSURE(0, OSL_THIS_FILE, __LINE__, m)
 
 #define OSL_VERIFY(c) do { if (!(c)) OSL_ASSERT(0); } while (0)
 #define OSL_PRECOND(c, m)   OSL_ENSURE(c, m)
@@ -105,25 +148,9 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 #define _OSL_GLOBAL
 #endif  /* __cplusplus */
 
-#ifdef _WIN16
-#if OSL_DEBUG_LEVEL > 0
-#undef OSL_DEBUG_LEVEL
-#define OSL_DEBUG_LEVEL 0
-#endif
-#endif
-
-
-
 #if OSL_DEBUG_LEVEL > 0
 
 #define _OSL_DEBUG_ONLY(f)  (f)
-#define _OSL_ASSERT(c, f, l) \
-    do \
-    {  \
-        if (!(c) && _OSL_GLOBAL osl_assertFailedLine(f, l, 0)) \
-            _OSL_GLOBAL osl_breakDebug(); \
-    } while (0)
-
 #define _OSL_ENSURE(c, f, l, m) \
     do \
     {  \
@@ -134,7 +161,6 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 #else
 
 #define _OSL_DEBUG_ONLY(f)          ((void)0)
-#define _OSL_ASSERT(c, f, l)        ((void)0)
 #define _OSL_ENSURE(c, f, l, m)     ((void)0)
 
 #endif /* OSL_DEBUG_LEVEL */
@@ -149,4 +175,29 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 
 #endif /* OSL_DEBUG_LEVEL */
 
+/* the macro OSL_THIS_FUNC is intended to be an office internal macro for now */
+/* copied from boost/current_function.hpp to make it usable from C
+ * sources as well
+ *
+ * Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt) */
+#if defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000)) || (defined(__ICC) && (__ICC >= 600))
+#define OSL_THIS_FUNC __PRETTY_FUNCTION__
+#elif defined(__DMC__) && (__DMC__ >= 0x810)
+#define OSL_THIS_FUNC __PRETTY_FUNCTION__
+#elif defined(__FUNCSIG__)
+#define OSL_THIS_FUNC __FUNCSIG__
+#elif (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 600)) || (defined(__IBMCPP__) && (__IBMCPP__ >= 500))
+#define OSL_THIS_FUNC __FUNCTION__
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)
+#define OSL_THIS_FUNC __func__
+#else
+#define OSL_THIS_FUNC ""
+#endif
+
 #endif /* _OSL_DIAGNOSE_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx
index e7360e93349e..a9aba130d72b 100644
--- a/sal/inc/osl/diagnose.hxx
+++ b/sal/inc/osl/diagnose.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,7 +43,7 @@
 #if ! defined(_RTL_INSTANCE_HXX_)
 #include "rtl/instance.hxx"
 #endif
-#include <hash_set>
+#include <boost/unordered_set.hpp>
 #include <functional>
 #include <typeinfo>
 
@@ -95,7 +96,7 @@ struct VoidPtrHash : ::std::unary_function<void const*, ::std::size_t> {
     }
 };
 
-typedef ::std::hash_set<void const*, VoidPtrHash, ::std::equal_to<void const*>,
+typedef ::boost::unordered_set<void const*, VoidPtrHash, ::std::equal_to<void const*>,
                         ::rtl::Allocator<void const*> > VoidPointerSet;
 
 struct ObjectRegistryData {
@@ -203,3 +204,4 @@ private:
 
 #endif // ! defined(OSL_DIAGNOSE_HXX_INCLUDED)
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/doublecheckedlocking.h b/sal/inc/osl/doublecheckedlocking.h
index 1be9f2467c7a..346f23787379 100644
--- a/sal/inc/osl/doublecheckedlocking.h
+++ b/sal/inc/osl/doublecheckedlocking.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,3 +80,5 @@ extern "C" {
 #endif /* __cplusplus */
 
 #endif /* INCLUDED_OSL_DOUBLECHECKEDLOCKING_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index e8701bdc768a..7069c3ba1465 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,6 +40,8 @@ extern "C" {
 #ifdef _WIN32
 #   if defined(_M_IX86)
 #       define _LITTLE_ENDIAN
+#   elif defined(_M_AMD64)
+#       define _LITTLE_ENDIAN
 #   elif defined(_M_MRX000)
 #       define _LITTLE_ENDIAN
 #   elif defined(_M_ALPHA)
@@ -63,14 +66,32 @@ extern "C" {
 #   endif
 #endif
 
+#ifdef ANDROID
+#   include <endian.h>
+#   if __BYTE_ORDER == __LITTLE_ENDIAN
+#           ifndef _LITTLE_ENDIAN
+#       define _LITTLE_ENDIAN
+#           endif
+#   elif __BYTE_ORDER == __BIG_ENDIAN
+#           ifndef _BIG_ENDIAN
+#       define _BIG_ENDIAN
+#           endif
+#   elif __BYTE_ORDER == __PDP_ENDIAN
+#       define _PDP_ENDIAN
+#   endif
+#endif
+
 #ifdef NETBSD
 #   include <machine/endian.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
+#   undef _BIG_ENDIAN
+#   undef _PDP_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
+#   undef _LITTLE_ENDIAN
+#   undef _PDP_ENDIAN
 #   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
+#   undef _LITTLE_ENDIAN
+#   undef _BIG_ENDIAN
 #   endif
 #endif
 
@@ -88,46 +109,43 @@ extern "C" {
 #endif
 #endif
 
-#ifdef SCO
-#   include <sys/types.h>
-#   include <sys/byteorder.h>
+#ifdef AIX
+#   include <sys/machine.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
+#       ifndef _LITTLE_ENDIAN
+#           define _LITTLE_ENDIAN
+#       endif
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
+#       ifndef _BIG_ENDIAN
+#           define _BIG_ENDIAN
+#       endif
 #   elif BYTE_ORDER == PDP_ENDIAN
 #       define _PDP_ENDIAN
 #   endif
 #endif
 
-#ifdef AIX
-#   include <sys/machine.h>
+#ifdef SOLARIS
+#   include <sys/isa_defs.h>
+#endif
+
+#ifdef MACOSX
+#   include <machine/endian.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
+#       ifndef _LITTLE_ENDIAN
 #       define _LITTLE_ENDIAN
+#       endif
 #   elif BYTE_ORDER == BIG_ENDIAN
+#       ifndef _BIG_ENDIAN
 #       define _BIG_ENDIAN
+#       endif
 #   elif BYTE_ORDER == PDP_ENDIAN
+#       ifndef _PDP_ENDIAN
 #       define _PDP_ENDIAN
+#       endif
 #   endif
 #endif
 
-#ifdef HPUX
-#   include <machine/param.h>
-#endif
-
-#ifdef _WIN16
-#   define  _LITTLE_ENDIAN
-#endif
-
-#ifdef OS2
-#   include <machine/endian.h>
-#endif
-
-#ifdef SOLARIS
-#   include <sys/isa_defs.h>
-#endif
-
-#ifdef MACOSX
+#ifdef IOS
 #   include <machine/endian.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
 #       ifndef _LITTLE_ENDIAN
@@ -146,10 +164,12 @@ extern "C" {
 
 /** Check supported platform.
  */
-#if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)   && \
-    !defined(LINUX)   && !defined(NETBSD) && !defined(SCO)   && \
-    !defined(AIX)     && !defined(HPUX)   && \
-    !defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD)
+#if !defined(_WIN32)  && \
+    !defined(LINUX)   && !defined(NETBSD) && \
+    !defined(AIX)     && !defined(OPENBSD) && \
+    !defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD) && \
+    !defined(DRAGONFLY) && \
+    !defined(IOS)     && !defined(ANDROID)
 #   error "Target platform not specified !"
 #endif
 
@@ -233,3 +253,4 @@ extern "C" {
 
 #endif /*_OSL_ENDIAN_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h
index 29196469fa61..e148b41073b7 100644
--- a/sal/inc/osl/file.h
+++ b/sal/inc/osl/file.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1591,3 +1592,4 @@ oslFileError SAL_CALL osl_createTempFile(
 #endif  /* _OSL_FILE_H_ */
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 02b134540d20..bf9547655586 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -332,15 +333,9 @@ public:
 
     @see VolumeInfo
 */
-#ifdef OS2
-class VolumeInfo;
-#endif
 
 class VolumeDevice : public FileBase
 {
-#ifdef OS2
-public:
-#endif
     oslVolumeDeviceHandle   _aHandle;
 
 public:
@@ -440,15 +435,6 @@ public:
 
 // -----------------------------------------------------------------------------
 
-#define VolumeInfoMask_Attributes             osl_VolumeInfo_Mask_Attributes
-#define VolumeInfoMask_TotalSpace             osl_VolumeInfo_Mask_TotalSpace
-#define VolumeInfoMask_UsedSpace              osl_VolumeInfo_Mask_UsedSpace
-#define VolumeInfoMask_FreeSpace              osl_VolumeInfo_Mask_FreeSpace
-#define VolumeInfoMask_MaxNameLength          osl_VolumeInfo_Mask_MaxNameLength
-#define VolumeInfoMask_MaxPathLength          osl_VolumeInfo_Mask_MaxPathLength
-#define VolumeInfoMask_FileSystemName         osl_VolumeInfo_Mask_FileSystemName
-#define VolumeInfoMask_FileSystemCaseHandling osl_VolumeInfo_Mask_FileSystemCaseHandling
-
 class Directory;
 
 /** The VolumeInfo class.
@@ -480,7 +466,7 @@ public:
     /** Constructor.
 
         @param nMask
-        Set of flaggs decribing the demanded information.
+        Set of flags decribing the demanded information.
     */
 
     VolumeInfo( sal_uInt32 nMask ): _nMask( nMask )
@@ -690,32 +676,6 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-
-#define FileStatusMask_Type             osl_FileStatus_Mask_Type
-#define FileStatusMask_Attributes       osl_FileStatus_Mask_Attributes
-#define FileStatusMask_CreationTime     osl_FileStatus_Mask_CreationTime
-#define FileStatusMask_AccessTime       osl_FileStatus_Mask_AccessTime
-#define FileStatusMask_ModifyTime       osl_FileStatus_Mask_ModifyTime
-#define FileStatusMask_FileSize         osl_FileStatus_Mask_FileSize
-#define FileStatusMask_FileName         osl_FileStatus_Mask_FileName
-#define FileStatusMask_FileURL          osl_FileStatus_Mask_FileURL
-#define FileStatusMask_LinkTargetURL    osl_FileStatus_Mask_LinkTargetURL
-#define FileStatusMask_All              osl_FileStatus_Mask_All
-#define FileStatusMask_Validate         osl_FileStatus_Mask_Validate
-
-#define Attribute_ReadOnly     osl_File_Attribute_ReadOnly
-#define Attribute_Hidden       osl_File_Attribute_Hidden
-#define Attribute_Executable   osl_File_Attribute_Executable
-#define Attribute_GrpWrite     osl_File_Attribute_GrpWrite
-#define Attribute_GrpRead      osl_File_Attribute_GrpRead
-#define Attribute_GrpExe       osl_File_Attribute_GrpExe
-#define Attribute_OwnWrite     osl_File_Attribute_OwnWrite
-#define Attribute_OwnRead      osl_File_Attribute_OwnRead
-#define Attribute_OwnExe       osl_File_Attribute_OwnExe
-#define Attribute_OthWrite     osl_File_Attribute_OthWrite
-#define Attribute_OthRead      osl_File_Attribute_OthRead
-#define Attribute_OthExe       osl_File_Attribute_OthExe
-
 class DirectoryItem;
 
 /** The FileStatus class.
@@ -754,7 +714,7 @@ public:
     /** Constructor.
 
         @param nMask
-        Set of flaggs decribing the demanded information.
+        Set of flags decribing the demanded information.
     */
 
     FileStatus( sal_uInt32 nMask ): _nMask( nMask )
@@ -797,7 +757,7 @@ public:
     */
     inline Type getFileType() const
     {
-        return (_aStatus.uValidFields & FileStatusMask_Type) ?  (Type) _aStatus.eType : Unknown;
+        return (_aStatus.uValidFields & osl_FileStatus_Mask_Type) ?  (Type) _aStatus.eType : Unknown;
     }
 
     /** Get the file attributes.
@@ -936,11 +896,6 @@ public:
         close();
     }
 
-    #define OpenFlag_Read   osl_File_OpenFlag_Read
-    #define OpenFlag_Write  osl_File_OpenFlag_Write
-    #define OpenFlag_Create osl_File_OpenFlag_Create
-    #define OpenFlag_NoLock osl_File_OpenFlag_NoLock
-
     /** Open a regular file.
 
         Open a file. Only regular files can be openend.
@@ -1016,11 +971,6 @@ public:
         return (RC) Error;
     }
 
-
-    #define Pos_Absolut osl_Pos_Absolut
-    #define Pos_Current osl_Pos_Current
-    #define Pos_End     osl_Pos_End
-
     /** Set the internal position pointer of an open file.
 
         @param uHow [in]
@@ -1599,7 +1549,7 @@ public:
 class DirectoryCreationObserver
 {
 public:
-    virtual ~DirectoryCreationObserver() {};
+    virtual ~DirectoryCreationObserver() {}
 
     /** This method will be called when a new directory has been
         created and needs to be overwritten by derived classes.
@@ -1697,7 +1647,7 @@ public:
         @see close()
     */
 
-    inline sal_Bool isOpen() { return _pData != NULL; };
+    inline sal_Bool isOpen() { return _pData != NULL; }
 
     /** Close a directory.
 
@@ -1951,3 +1901,4 @@ public:
 #endif  /* __cplusplus */
 #endif  /* _OSL_FILE_HXX_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/getglobalmutex.hxx b/sal/inc/osl/getglobalmutex.hxx
index 43d463c2d1cd..974c1f48b42a 100644
--- a/sal/inc/osl/getglobalmutex.hxx
+++ b/sal/inc/osl/getglobalmutex.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,3 +49,5 @@ public:
 }
 
 #endif // INCLUDED_OSL_GETGLOBALMUTEX_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/interlck.h b/sal/inc/osl/interlck.h
index 0785ef350965..63a4adfaa3fa 100644
--- a/sal/inc/osl/interlck.h
+++ b/sal/inc/osl/interlck.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,4 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
 #endif  /* _OSL_INTERLOCK_H_ */
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/module.h b/sal/inc/osl/module.h
index 78558fed4105..c103e41af7eb 100644
--- a/sal/inc/osl/module.h
+++ b/sal/inc/osl/module.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,7 +44,7 @@ extern "C" {
 #define SAL_MODULENAME(name) name SAL_DLLEXTENSION
 #endif
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #define SAL_MODULENAME_WITH_VERSION(name, version) name version SAL_DLLEXTENSION
 
 #elif defined(SAL_UNX)
@@ -74,6 +75,13 @@ typedef void ( SAL_CALL *oslGenericFunction )( void );
 */
 oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMode);
 
+/** Load a shared library or module.
+    @param pModuleName denotes the name of the module to be loaded.
+    @return NULL if the module could not be loaded, otherwise a handle to the module.
+    @since UDK 3.6
+*/
+oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nRtldMode);
+
 /** Load a module located relative to some other module.
 
     @param baseModule
@@ -209,3 +217,5 @@ sal_Bool SAL_CALL osl_getModuleURLFromFunctionAddress( oslGenericFunction pf, rt
 #endif
 
 #endif  /* _OSL_MODULE_H_  */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/module.hxx b/sal/inc/osl/module.hxx
index fd787569b454..cfc1c5e02fc1 100644
--- a/sal/inc/osl/module.hxx
+++ b/sal/inc/osl/module.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -156,3 +157,5 @@ private:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/mutex.h b/sal/inc/osl/mutex.h
index 2c779aadf566..ca5e978111c9 100644
--- a/sal/inc/osl/mutex.h
+++ b/sal/inc/osl/mutex.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ oslMutex * SAL_CALL osl_getGlobalMutex(void);
 #endif
 
 #endif  /* _OSL_MUTEX_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/mutex.hxx b/sal/inc/osl/mutex.hxx
index 0fe0bd1b653e..8e8945a51df1 100644
--- a/sal/inc/osl/mutex.hxx
+++ b/sal/inc/osl/mutex.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -246,8 +247,35 @@ namespace osl
     typedef Guard<Mutex> MutexGuard;
     typedef ClearableGuard<Mutex> ClearableMutexGuard;
     typedef ResettableGuard< Mutex > ResettableMutexGuard;
+
+    /** SolarMutex interface, needed for SolarMutex.
+        Deprecated, used just for Application::GetSolarMutex().
+    */
+    class SolarMutex
+    {
+        public:
+            /** Blocks if mutex is already in use
+            */
+            virtual void SAL_CALL acquire() = 0;
+
+            /** Tries to get the mutex without blocking.
+            */
+            virtual sal_Bool SAL_CALL tryToAcquire() = 0;
+
+            /** Releases the mutex.
+            */
+            virtual void SAL_CALL release() = 0;
+
+        protected:
+            SolarMutex() {}
+            virtual ~SolarMutex() {}
+    };
+    typedef osl::Guard< SolarMutex > SolarGuard;
+    typedef osl::ClearableGuard< SolarMutex > ClearableSolarGuard;
+    typedef osl::ResettableGuard< SolarMutex > ResettableSolarGuard;
 }
 
 #endif  /* __cplusplus */
 #endif  /* _OSL_MUTEX_HXX_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/nlsupport.h b/sal/inc/osl/nlsupport.h
index 7ded09293442..9c04d8cd0996 100644
--- a/sal/inc/osl/nlsupport.h
+++ b/sal/inc/osl/nlsupport.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,4 @@ rtl_TextEncoding SAL_CALL osl_getTextEncodingFromLocale( rtl_Locale * pLocale );
 #endif  /* _OSL_NLSUPPORT_H_ */
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/pipe.h b/sal/inc/osl/pipe.h
index aec479777cdb..f29b9f0b925d 100644
--- a/sal/inc/osl/pipe.h
+++ b/sal/inc/osl/pipe.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,4 @@ oslPipeError SAL_CALL osl_getLastPipeError(oslPipe Pipe);
 
 #endif  /* _OSL_PIPE_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/pipe.hxx b/sal/inc/osl/pipe.hxx
index 7ad85d86bcfc..93a6d40e5102 100644
--- a/sal/inc/osl/pipe.hxx
+++ b/sal/inc/osl/pipe.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -210,3 +211,5 @@ namespace osl
 
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/pipe_decl.hxx b/sal/inc/osl/pipe_decl.hxx
index 65756ddd2f6b..54ccb93f5375 100644
--- a/sal/inc/osl/pipe_decl.hxx
+++ b/sal/inc/osl/pipe_decl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -133,8 +134,8 @@ public:
 
 
     /** Delivers a constant decribing the last error for the pipe system.
-        @return ENONE if no error occured, invalid_PipeError if
-        an unknown (unmapped) error occured, otherwise an enum describing the
+        @return ENONE if no error occurred, invalid_PipeError if
+        an unknown (unmapped) error occurred, otherwise an enum describing the
         error.
     */
     inline oslPipeError SAL_CALL getError() const;
@@ -233,3 +234,5 @@ public:
 
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/process.h b/sal/inc/osl/process.h
index 0a0d3f6eaf7c..8a64b82f5a4e 100644
--- a/sal/inc/osl/process.h
+++ b/sal/inc/osl/process.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,7 +69,7 @@ typedef sal_uInt32 oslProcessExitCode;
 typedef enum {
     osl_Process_E_None,                 /* no error */
     osl_Process_E_NotFound,             /* image not found */
-    osl_Process_E_TimedOut,             /* timout occured */
+    osl_Process_E_TimedOut,             /* timout occurred */
     osl_Process_E_NoPermission,         /* permission denied */
     osl_Process_E_Unknown,              /* unknown error */
     osl_Process_E_InvalidError,         /* unmapped error */
@@ -89,8 +90,6 @@ typedef sal_Int32 oslDescriptorFlag;
 
 #ifdef SAL_W32
 #   pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#   pragma pack(push, 4)
 #endif
 
 typedef struct {
@@ -103,7 +102,7 @@ typedef struct {
     sal_uInt32              HeapUsage;
 } oslProcessInfo;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #   pragma pack(pop)
 #endif
 
@@ -322,7 +321,7 @@ oslProcessError SAL_CALL osl_joinProcess(oslProcess Process);
     @return
     osl_Process_E_None on success
     osl_Process_E_TimedOut waiting for the child process timed out
-    osl_Process_E_Unknown an error occured or the parameter are invalid
+    osl_Process_E_Unknown an error occurred or the parameter are invalid
 
     @see osl_executeProcess
 */
@@ -441,3 +440,4 @@ oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe Pipe);
 
 #endif    /* _OSL_PROCESS_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/profile.h b/sal/inc/osl/profile.h
index d4d7299aebff..341085918104 100644
--- a/sal/inc/osl/profile.h
+++ b/sal/inc/osl/profile.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -138,3 +139,4 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff
 
 #endif  /* _OSL_PROFILE_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/profile.hxx b/sal/inc/osl/profile.hxx
index a1fc0499172d..88476e03f533 100644
--- a/sal/inc/osl/profile.hxx
+++ b/sal/inc/osl/profile.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,17 +80,17 @@ namespace osl {
         {
             sal_Char aBuf[1024];
             return osl_readProfileString( profile,
-                                          rSection,
-                                          rEntry,
+                                          rSection.getStr(),
+                                          rEntry.getStr(),
                                           aBuf,
                                           sizeof( aBuf ),
-                                          rDefault ) ? rtl::OString( aBuf ) : rtl::OString();
+                                          rDefault.getStr() ) ? rtl::OString( aBuf ) : rtl::OString();
 
         }
 
         sal_Bool readBool( const rtl::OString& rSection, const rtl::OString& rEntry, sal_Bool bDefault )
         {
-            return osl_readProfileBool( profile, rSection, rEntry, bDefault );
+            return osl_readProfileBool( profile, rSection.getStr(), rEntry.getStr(), bDefault );
         }
 
         sal_uInt32 readIdent(const rtl::OString& rSection, const rtl::OString& rEntry,
@@ -102,11 +103,11 @@ namespace osl {
             nItems = 0;
             while( it != rStrings.end() )
             {
-                pStrings[ nItems++ ] = *it;
+                pStrings[ nItems++ ] = it->getStr();
                 ++it;
             }
             pStrings[ nItems ] = NULL;
-            sal_uInt32 nRet = osl_readProfileIdent(profile, rSection, rEntry, nFirstId, pStrings, nDefault);
+            sal_uInt32 nRet = osl_readProfileIdent(profile, rSection.getStr(), rEntry.getStr(), nFirstId, pStrings, nDefault);
             delete pStrings;
             return nRet;
         }
@@ -114,12 +115,12 @@ namespace osl {
         sal_Bool writeString(const rtl::OString& rSection, const rtl::OString& rEntry,
                              const rtl::OString& rString)
         {
-            return osl_writeProfileString(profile, rSection, rEntry, rString);
+            return osl_writeProfileString(profile, rSection.getStr(), rEntry.getStr(), rString.getStr());
         }
 
         sal_Bool writeBool(const rtl::OString& rSection, const rtl::OString& rEntry, sal_Bool Value)
         {
-            return osl_writeProfileBool(profile, rSection, rEntry, Value);
+            return osl_writeProfileBool(profile, rSection.getStr(), rEntry.getStr(), Value);
         }
 
         sal_Bool writeIdent(const rtl::OString& rSection, const rtl::OString& rEntry,
@@ -132,12 +133,12 @@ namespace osl {
             nItems = 0;
             while( it != rStrings.end() )
             {
-                pStrings[ nItems++ ] = *it;
+                pStrings[ nItems++ ] = it->getStr();
                 ++it;
             }
             pStrings[ nItems ] = NULL;
             sal_Bool bRet =
-                osl_writeProfileIdent(profile, rSection, rEntry, nFirstId, pStrings, nValue );
+                osl_writeProfileIdent(profile, rSection.getStr(), rEntry.getStr(), nFirstId, pStrings, nValue );
             delete pStrings;
             return bRet;
         }
@@ -148,7 +149,7 @@ namespace osl {
         */
         sal_Bool removeEntry(const rtl::OString& rSection, const rtl::OString& rEntry)
         {
-            return osl_removeProfileEntry(profile, rSection, rEntry);
+            return osl_removeProfileEntry(profile, rSection.getStr(), rEntry.getStr());
         }
 
         /** Get all entries belonging to the specified section.
@@ -160,11 +161,11 @@ namespace osl {
             std::list< rtl::OString > aEntries;
 
             // count buffer size necessary
-            int n = osl_getProfileSectionEntries( profile, rSection, NULL, 0 );
+            int n = osl_getProfileSectionEntries( profile, rSection.getStr(), NULL, 0 );
             if( n > 1 )
             {
                 sal_Char* pBuf = new sal_Char[ n+1 ];
-                osl_getProfileSectionEntries( profile, rSection, pBuf, n+1 );
+                osl_getProfileSectionEntries( profile, rSection.getStr(), pBuf, n+1 );
                 int nLen;
                 for( n = 0; ( nLen = strlen( pBuf+n ) ); n += nLen+1 )
                     aEntries.push_back( rtl::OString( pBuf+n ) );
@@ -202,3 +203,4 @@ namespace osl {
 #endif  /* _OSL_PROFILE_HXX_ */
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/security.h b/sal/inc/osl/security.h
index 9a6233a61702..6c26df96a397 100644
--- a/sal/inc/osl/security.h
+++ b/sal/inc/osl/security.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,7 +58,8 @@ typedef void* oslSecurity;
 */
 oslSecurity SAL_CALL osl_getCurrentSecurity(void);
 
-/** Create a security handle for the denoted user.
+/** Deprecated API
+    Create a security handle for the denoted user.
     Try to log in the user on the local system.
     @param strzUserName [in] denotes the name of the user to logg in.
     @param strPasswd [in] the password for this user.
@@ -156,3 +158,4 @@ void SAL_CALL osl_unloadUserProfile(oslSecurity Security);
 
 #endif  /* _OSL_SECURITY_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/security.hxx b/sal/inc/osl/security.hxx
index 966e3279837d..aa98bd240a0e 100644
--- a/sal/inc/osl/security.hxx
+++ b/sal/inc/osl/security.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,4 @@ inline oslSecurity Security::getHandle() const
 
 #endif  // _OSL_SECURITY_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/security_decl.hxx b/sal/inc/osl/security_decl.hxx
index 753469dff026..a6078ea62c8b 100644
--- a/sal/inc/osl/security_decl.hxx
+++ b/sal/inc/osl/security_decl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -115,3 +116,4 @@ public:
 
 #endif  // _OSL_SECURITY_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/semaphor.h b/sal/inc/osl/semaphor.h
index c0c74515404a..8b117451f646 100644
--- a/sal/inc/osl/semaphor.h
+++ b/sal/inc/osl/semaphor.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,4 @@ sal_Bool SAL_CALL osl_releaseSemaphore(oslSemaphore Semaphore);
 #endif  /* _OSL_SEMAPHORE_H_  */
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/semaphor.hxx b/sal/inc/osl/semaphor.hxx
index a45737d27524..a36db2a8a6a8 100644
--- a/sal/inc/osl/semaphor.hxx
+++ b/sal/inc/osl/semaphor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -124,3 +125,5 @@ namespace osl
 
 #endif  /* __cplusplus */
 #endif  /* _OSL_SEMAPHORE_HXX_  */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/signal.h b/sal/inc/osl/signal.h
index b9e8520a9194..9314a6f4fd82 100644
--- a/sal/inc/osl/signal.h
+++ b/sal/inc/osl/signal.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,8 +67,6 @@ typedef enum
 
 #ifdef SAL_W32
 #   pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#   pragma pack(push, 4)
 #endif
 
 typedef struct
@@ -77,7 +76,7 @@ typedef struct
     void*       UserData;
 } oslSignalInfo;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #   pragma pack(pop)
 #endif
 
@@ -112,3 +111,4 @@ sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable );
 #endif  /* _OSL_SIGNAL_H_ */
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/socket.h b/sal/inc/osl/socket.h
index d1cf998c94e3..f936102cdc43 100644
--- a/sal/inc/osl/socket.h
+++ b/sal/inc/osl/socket.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -194,7 +195,7 @@ typedef enum {
  */
 typedef enum {
     osl_Socket_Ok,          /* successful completion */
-    osl_Socket_Error,       /* error occured, check osl_getLastSocketError() for details */
+    osl_Socket_Error,       /* error occurred, check osl_getLastSocketError() for details */
     osl_Socket_TimedOut,    /* blocking operation timed out */
     osl_Socket_Interrupted, /* blocking operation was interrupted */
     osl_Socket_InProgress,  /* nonblocking operation is in progress */
@@ -593,7 +594,7 @@ sal_Int32 SAL_CALL osl_sendToSocket(oslSocket Socket,
     how long the operation will block if the Socket is not ready.
 
     @return <code>sal_True</code> if read operations (recv, recvFrom, accept) on the Socket
-    will NOT block; <code>sal_False</code> if it would block or if an error occured.
+    will NOT block; <code>sal_False</code> if it would block or if an error occurred.
 
     @param Socket the Socket to perfom the operation on.
     @param pTimeout if NULL, the operation will block without a timeout.
@@ -604,7 +605,7 @@ sal_Bool SAL_CALL osl_isReceiveReady(oslSocket Socket, const TimeValue* pTimeout
     You can specify a timeout-value in seconds/microseconds that denotes
     how long the operation will block if the Socket is not ready.
     @return <code>sal_True</code> if send operations (send, sendTo) on the Socket
-    will NOT block; <code>sal_False</code> if it would block or if an error occured.
+    will NOT block; <code>sal_False</code> if it would block or if an error occurred.
 
     @param Socket the Socket to perfom the operation on.
     @param pTimeout if NULL, the operation will block without a timeout. Otherwise
@@ -616,7 +617,7 @@ sal_Bool SAL_CALL osl_isSendReady(oslSocket Socket, const TimeValue* pTimeout);
     You can specify a timeout-value in seconds/microseconds that denotes
     how long the operation will block if the Socket has no pending OOB data.
     @return <code>sal_True</code> if OOB-request operations (recv with appropriate flags)
-    on the Socket will NOT block; <code>sal_False</code> if it would block or if an error occured.
+    on the Socket will NOT block; <code>sal_False</code> if it would block or if an error occurred.
 
     @param Socket the Socket to perfom the operation on.
     @param pTimeout if NULL, the operation will block without a timeout.
@@ -716,7 +717,7 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket Socket,
 
     @param BufferSize contains the length of the Buffer.
 
-    @return -1 if an error occured or else the size of the data copied into
+    @return -1 if an error occurred or else the size of the data copied into
     pBuffer.
     @see osl_setSocketOption()
 */
@@ -777,7 +778,7 @@ sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket Socket);
     <li> osl_Socket_TypeRaw
     <li> osl_Socket_TypeRdm
     <li> osl_Socket_TypeSeqPacket
-    <li> osl_invalid_SocketType, if an error occured
+    <li> osl_invalid_SocketType, if an error occurred
     </ul>
 
 */
@@ -789,9 +790,9 @@ oslSocketType SAL_CALL osl_getSocketType(oslSocket Socket);
 void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString **strError);
 
 /** returns a constant decribing the last error for the socket system.
-    @return <code>osl_Socket_E_NONE</code> if no error occured,
+    @return <code>osl_Socket_E_NONE</code> if no error occurred,
             <code>osl_invalid_SocketError</code> if an unknown (unmapped)
-            error occured, otherwise an enum describing the error.
+            error occurred, otherwise an enum describing the    error.
 */
 oslSocketError SAL_CALL osl_getLastSocketError(oslSocket Socket);
 
@@ -889,3 +890,4 @@ sal_Int32 SAL_CALL osl_writeSocket( oslSocket Socket, const void *pBuffer, sal_I
 
 #endif  /* _OSL_SOCKET_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/socket.hxx b/sal/inc/osl/socket.hxx
index db05fe242982..8e6115996bae 100644
--- a/sal/inc/osl/socket.hxx
+++ b/sal/inc/osl/socket.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -563,3 +564,5 @@ namespace osl
     }
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/socket_decl.hxx b/sal/inc/osl/socket_decl.hxx
index 138c110c0719..6376c1bc3613 100644
--- a/sal/inc/osl/socket_decl.hxx
+++ b/sal/inc/osl/socket_decl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -164,7 +165,7 @@ namespace osl
         */
         static inline sal_Int32 SAL_CALL getServicePort(
             const ::rtl::OUString& strServiceName,
-            const ::rtl::OUString & strProtocolName= ::rtl::OUString::createFromAscii( "tcp" ) );
+            const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) );
     };
 
 
@@ -276,7 +277,7 @@ namespace osl
             You can specify a timeout-value in seconds/nanoseconds that denotes
             how the operation will block if the Socket is not ready.
             @return <code>sal_True</code> if read operations (recv, recvFrom, accept) on the Socket
-            will NOT block; <code>sal_False</code> if it would block or if an error occured.
+            will NOT block; <code>sal_False</code> if it would block or if an error occurred.
 
             @param pTimeout if 0, the operation will block without a timeout. Otherwise
             the specified amout of time.
@@ -288,7 +289,7 @@ namespace osl
             You can specify a timeout-value in seconds/nanoseconds that denotes
             how the operation will block if the Socket is not ready.
             @return <code>sal_True</code> if send operations (send, sendTo) on the Socket
-            will NOT block; <code>sal_False</code> if it would block or if an error occured.
+            will NOT block; <code>sal_False</code> if it would block or if an error occurred.
 
             @param pTimeout if 0, the operation will block without a timeout. Otherwise
             the specified amout of time.
@@ -303,7 +304,7 @@ namespace osl
 
             @return <code>sal_True</code> if OOB-request operations (recv with appropriate flags)
             on the Socket will NOT block; <code>sal_False</code> if it would block or if
-            an error occured.
+            an error occurred.
 
             @param pTimeout if 0, the operation will block without a timeout. Otherwise
             the specified amout of time.
@@ -319,7 +320,7 @@ namespace osl
             <li> <code>osl_Socket_TypeRaw</code>
             <li> <code>osl_Socket_TypeRdm</code>
             <li> <code>osl_Socket_TypeSeqPacket</code>
-            <li> <code>osl_invalid_SocketType</code>, if an error occured
+            <li> <code>osl_invalid_SocketType</code>, if an error occurred
             </ul>
         */
         inline oslSocketType    SAL_CALL getType() const;
@@ -403,7 +404,7 @@ namespace osl
             <li><code>osl_Socket_LevelTcp</code>    : Level of Transmission Control Protocol
             </ul>
             @return The size of the attribute copied into pBuffer or -1 if an error
-            occured.
+            occurred.
         */
         inline sal_Int32 SAL_CALL getOption(
             oslSocketOption Option,
@@ -487,8 +488,8 @@ namespace osl
 
         /** returns a constant decribing the last error for the socket system.
 
-            @return osl_Socket_E_NONE if no error occured, invalid_SocketError if
-            an unknown (unmapped) error occured, otherwise an enum describing the
+            @return osl_Socket_E_NONE if no error occurred, invalid_SocketError if
+            an unknown (unmapped) error occurred, otherwise an enum describing the
             error.
             @see osl_getLastSocketError()
         */
@@ -720,3 +721,5 @@ namespace osl
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/thread.h b/sal/inc/osl/thread.h
index 4c53b001fcd6..14b4cbfd8b7e 100644
--- a/sal/inc/osl/thread.h
+++ b/sal/inc/osl/thread.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -201,3 +202,4 @@ rtl_TextEncoding SAL_CALL osl_setThreadTextEncoding(rtl_TextEncoding Encoding);
 
 #endif  /* _OSL_THREAD_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/thread.hxx b/sal/inc/osl/thread.hxx
index c3ca49926456..2bcc82fd07eb 100644
--- a/sal/inc/osl/thread.hxx
+++ b/sal/inc/osl/thread.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -234,3 +235,5 @@ private:
 } // end namespace osl
 #endif
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/time.h b/sal/inc/osl/time.h
index 95bac4c89ec2..9ccd653b6018 100644
--- a/sal/inc/osl/time.h
+++ b/sal/inc/osl/time.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,8 +41,6 @@ extern "C" {
 
 #ifdef SAL_W32
 #   pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#   pragma pack(push, 4)
 #endif
 
 /* Time since Jan-01-1970 */
@@ -51,7 +50,7 @@ typedef struct {
     sal_uInt32 Nanosec;
 } TimeValue;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined(SAL_W32)
 #   pragma pack(pop)
 #endif
 
@@ -158,3 +157,4 @@ sal_uInt32 SAL_CALL osl_getGlobalTimer(void);
 
 #endif  /* _OSL_TIME_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/util.h b/sal/inc/osl/util.h
index aa988afbbff3..e72cb7a9e172 100644
--- a/sal/inc/osl/util.h
+++ b/sal/inc/osl/util.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,5 @@ sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 *pEthernetAddr );
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/pch/precompiled_sal.cxx b/sal/inc/pch/precompiled_sal.cxx
index 79ca1ead5bab..90b35cb1dbae 100644
--- a/sal/inc/pch/precompiled_sal.cxx
+++ b/sal/inc/pch/precompiled_sal.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_sal.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx
index cd20926ac377..2f285e5685a7 100644
--- a/sal/inc/pch/precompiled_sal.hxx
+++ b/sal/inc/pch/precompiled_sal.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/alloc.h b/sal/inc/rtl/alloc.h
index 7b3967de716b..dac0a2c42e53 100644
--- a/sal/inc/rtl/alloc.h
+++ b/sal/inc/rtl/alloc.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -264,3 +265,4 @@ SAL_CALL rtl_cache_free (
 
 #endif /*_RTL_ALLOC_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
index c753a98189a3..5b27beec8259 100644
--- a/sal/inc/rtl/allocator.hxx
+++ b/sal/inc/rtl/allocator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -147,6 +148,7 @@ public:
     void destroy (pointer p)
     {
         p->~T();
+        (void)p; //MSVC2005 annoyingly warns this is unused
     }
 };
 
@@ -190,3 +192,4 @@ namespace _STL
 
 #endif /* INCLUDED_RTL_ALLOCATOR_HXX */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/bootstrap.h b/sal/inc/rtl/bootstrap.h
index 1c33c45b1fa1..cd0507bef5df 100644
--- a/sal/inc/rtl/bootstrap.h
+++ b/sal/inc/rtl/bootstrap.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -217,7 +218,7 @@ void SAL_CALL rtl_bootstrap_expandMacros(
     an arbitrary, non-NULL value
 
     @param encoded
-    non-NULL out parameter, receiving the given value with all occurences of
+    non-NULL out parameter, receiving the given value with all occurrences of
     special characters ("$" and "\") escaped
 
     @since UDK 3.2.9
@@ -231,3 +232,5 @@ void SAL_CALL rtl_bootstrap_encode(
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/bootstrap.hxx b/sal/inc/rtl/bootstrap.hxx
index f8f1f7a95f48..dca3e84ce4c8 100644
--- a/sal/inc/rtl/bootstrap.hxx
+++ b/sal/inc/rtl/bootstrap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -149,7 +150,7 @@ namespace rtl
             an arbitrary value
 
             @return
-            the given value, with all occurences of special characters ("$" and
+            the given value, with all occurrences of special characters ("$" and
             "\") escaped
 
             @since UDK 3.2.9
@@ -232,3 +233,5 @@ namespace rtl
     }
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/byteseq.h b/sal/inc/rtl/byteseq.h
index 3c0b6862b70b..d19db147d677 100644
--- a/sal/inc/rtl/byteseq.h
+++ b/sal/inc/rtl/byteseq.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -320,3 +321,5 @@ public:
 }
 #endif
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/byteseq.hxx b/sal/inc/rtl/byteseq.hxx
index 698e4f01df05..c0ccc13f7b94 100644
--- a/sal/inc/rtl/byteseq.hxx
+++ b/sal/inc/rtl/byteseq.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -141,3 +142,5 @@ inline sal_Bool ByteSequence::operator != ( const ByteSequence & rSeq ) const SA
 
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/cipher.h b/sal/inc/rtl/cipher.h
index 8cb2a2f2256b..7656eb6b4d2a 100644
--- a/sal/inc/rtl/cipher.h
+++ b/sal/inc/rtl/cipher.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #ifndef _RTL_CIPHER_H_
-#define _RTL_CIPHER_H_ "$Revision: 1.7 $"
+#define _RTL_CIPHER_H_
 
 #include <sal/types.h>
 
@@ -317,3 +318,4 @@ void SAL_CALL rtl_cipher_destroyARCFOUR (
 
 #endif /* !_RTL_CIPHER_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/crc.h b/sal/inc/rtl/crc.h
index f30a873c67f2..8313795b85cf 100644
--- a/sal/inc/rtl/crc.h
+++ b/sal/inc/rtl/crc.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #ifndef _RTL_CRC_H_
-#define _RTL_CRC_H_ "$Revision: 1.4 $"
+#define _RTL_CRC_H_
 
 #include <sal/types.h>
 
@@ -64,3 +65,4 @@ sal_uInt32 SAL_CALL rtl_crc32 (
 
 #endif /* _RTL_CRC_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/digest.h b/sal/inc/rtl/digest.h
index c0e3a346b90b..5a87e024b298 100644
--- a/sal/inc/rtl/digest.h
+++ b/sal/inc/rtl/digest.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #ifndef _RTL_DIGEST_H_
-#define _RTL_DIGEST_H_ "$Revision: 1.8 $"
+#define _RTL_DIGEST_H_
 
 #include <sal/types.h>
 
@@ -637,3 +638,4 @@ rtlDigestError SAL_CALL rtl_digest_PBKDF2 (
 
 #endif /* _RTL_DIGEST_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx
index 0bf4806bafd4..7080cecda44e 100644
--- a/sal/inc/rtl/instance.hxx
+++ b/sal/inc/rtl/instance.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -231,10 +232,10 @@ namespace {
     Some comments:
 
     For any instantiation of rtl_Instance, at most one call to a create method
-    may occur in the program code:  Each occurance of a create method within
+    may occur in the program code:  Each occurrence of a create method within
     the program code is supposed to return a fresh object instance on the
     first call, and that same object instance on subsequent calls; but
-    independent occurances of create methods are supposed to return
+    independent occurrences of create methods are supposed to return
     independent object instances.  Since there is a one-to-one correspondence
     between object instances and instantiations of rtl_Instance, the
     requirement should be clear.  One measure to enforce the requirement is
@@ -244,7 +245,7 @@ namespace {
     needs a funny "hand coded" prefix "rtl_" instead of a proper namespace
     prefix like "::rtl::".
 
-    A known problem with this template is when two occurences of calls to
+    A known problem with this template is when two occurrences of calls to
     create methods with identical template arguments appear in one translation
     unit.  Those two places will share a single object instance.  This can be
     avoided by using different Init structs (see the above code samples) in
@@ -322,6 +323,31 @@ public:
         return p;
     }
 
+    static inline Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor,
+                                const Data &rData)
+    {
+#if defined _MSC_VER
+        static Inst * m_pInstance = 0;
+#endif // _MSC_VER
+        Inst * p = m_pInstance;
+        if (!p)
+        {
+            Guard aGuard(aGuardCtor());
+            p = m_pInstance;
+            if (!p)
+            {
+                p = aInstCtor(rData);
+                OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+                m_pInstance = p;
+            }
+        }
+        else
+        {
+            OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+        }
+        return p;
+    }
+
 private:
 #if !defined _MSC_VER
     static Inst * m_pInstance;
@@ -360,6 +386,22 @@ namespace rtl {
               using the outer class
               (the one that derives from this base class)
 */
+#if (__GNUC__ >= 4)
+template<typename T, typename Unique>
+class Static {
+public:
+    /** Gets the static.  Mutual exclusion is implied by a functional
+        -fthreadsafe-statics
+
+        @return
+                static variable
+    */
+    static T & get() {
+        static T instance;
+        return instance;
+    }
+};
+#else
 template<typename T, typename Unique>
 class Static {
 public:
@@ -383,6 +425,100 @@ private:
         }
     };
 };
+#endif
+
+/** Helper base class for a late-initialized (default-constructed)
+    static variable, implementing the double-checked locking pattern correctly.
+
+    @derive
+    Derive from this class (common practice), e.g.
+    <pre>
+    struct MyStatic : public rtl::Static<MyType, MyStatic> {};
+    ...
+    MyType & rStatic = MyStatic::get();
+    ...
+    </pre>
+
+    @tplparam T
+              variable's type
+    @tplparam Unique
+              Implementation trick to make the inner static holder unique,
+              using the outer class
+              (the one that derives from this base class)
+*/
+#if (__GNUC__ >= 4)
+template<typename T, typename Data, typename Unique>
+class StaticWithArg {
+public:
+    /** Gets the static.  Mutual exclusion is implied by a functional
+        -fthreadsafe-statics
+
+        @return
+                static variable
+    */
+    static T & get(const Data& rData) {
+        static T instance(rData);
+        return instance;
+    }
+
+    /** Gets the static.  Mutual exclusion is implied by a functional
+        -fthreadsafe-statics
+
+        @return
+                static variable
+    */
+    static T & get(Data& rData) {
+        static T instance(rData);
+        return instance;
+    }
+};
+#else
+template<typename T, typename Data, typename Unique>
+class StaticWithArg {
+public:
+    /** Gets the static.  Mutual exclusion is performed using the
+        osl global mutex.
+
+        @return
+                static variable
+    */
+    static T & get(const Data& rData) {
+        return *rtl_Instance<
+            T, StaticInstanceWithArg,
+            ::osl::MutexGuard, ::osl::GetGlobalMutex,
+            Data >::create( StaticInstanceWithArg(),
+                                      ::osl::GetGlobalMutex(),
+                                      rData );
+    }
+
+    /** Gets the static.  Mutual exclusion is performed using the
+        osl global mutex.
+
+        @return
+                static variable
+    */
+    static T & get(Data& rData) {
+        return *rtl_Instance<
+            T, StaticInstanceWithArg,
+            ::osl::MutexGuard, ::osl::GetGlobalMutex,
+            Data >::create( StaticInstanceWithArg(),
+                                      ::osl::GetGlobalMutex(),
+                                      rData );
+    }
+private:
+    struct StaticInstanceWithArg {
+        T * operator () (const Data& rData) {
+            static T instance(rData);
+            return &instance;
+        }
+
+        T * operator () (Data& rData) {
+            static T instance(rData);
+            return &instance;
+         }
+    };
+};
+#endif
 
 /** Helper class for a late-initialized static aggregate, e.g. an array,
     implementing the double-checked locking pattern correctly.
@@ -392,6 +528,23 @@ private:
     @tplparam InitAggregate
               initializer functor class
 */
+#if (__GNUC__ >= 4)
+template<typename T, typename InitAggregate>
+class StaticAggregate {
+public:
+    /** Gets the static aggregate, late-initializing.
+        Mutual exclusion is implied by a functional
+        -fthreadsafe-statics
+
+        @return
+                aggregate
+    */
+    static T * get() {
+        static T *instance = InitAggregate()();
+        return instance;
+    }
+};
+#else
 template<typename T, typename InitAggregate>
 class StaticAggregate {
 public:
@@ -408,7 +561,7 @@ public:
                 InitAggregate(), ::osl::GetGlobalMutex() );
     }
 };
-
+#endif
 /** Helper base class for a late-initialized static variable,
     implementing the double-checked locking pattern correctly.
 
@@ -440,6 +593,23 @@ public:
               Initializer functor's return type.
               Default is T (common practice).
 */
+#if (__GNUC__ >= 4)
+template<typename T, typename InitData,
+         typename Unique = InitData, typename Data = T>
+class StaticWithInit {
+public:
+    /** Gets the static.  Mutual exclusion is implied by a functional
+        -fthreadsafe-statics
+
+        @return
+                static variable
+    */
+    static T & get() {
+        static T instance = InitData()();
+        return instance;
+    }
+};
+#else
 template<typename T, typename InitData,
          typename Unique = InitData, typename Data = T>
 class StaticWithInit {
@@ -466,7 +636,9 @@ private:
         }
     };
 };
-
+#endif
 } // namespace rtl
 
 #endif // INCLUDED_RTL_INSTANCE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/locale.h b/sal/inc/rtl/locale.h
index f2b0016942a3..f671800656c0 100644
--- a/sal/inc/rtl/locale.h
+++ b/sal/inc/rtl/locale.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,8 +37,6 @@ extern "C" {
 
 #ifdef SAL_W32
 #   pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#   pragma pack(push, 4)
 #endif
 
 /**
@@ -66,7 +65,7 @@ typedef struct _rtl_Locale
     sal_Int32       HashCode;
 } rtl_Locale;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
@@ -138,3 +137,4 @@ sal_Int32 SAL_CALL rtl_locale_equals( rtl_Locale * This, rtl_Locale * obj  );
 #endif /* _RTL_LOCALE_H_ */
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/locale.hxx b/sal/inc/rtl/locale.hxx
index 7e6526c0e9bc..97f7c290a8f8 100644
--- a/sal/inc/rtl/locale.hxx
+++ b/sal/inc/rtl/locale.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -185,7 +186,7 @@ public:
     static OLocale registerLocale( const OUString & language, const OUString & country,
                             const OUString & variant )
     {
-        return rtl_locale_register( language, country, variant );
+        return rtl_locale_register( language.getStr(), country.getStr(), variant.getStr() );
     }
 
     /**
@@ -195,7 +196,7 @@ public:
      */
     static OLocale registerLocale( const OUString & language, const OUString & country )
     {
-        return rtl_locale_register( language, country, NULL );
+        return rtl_locale_register( language.getStr(), country.getStr(), NULL );
     }
 
     /** @deprecated
@@ -206,7 +207,7 @@ public:
      */
     static void setDefault( const OUString & language, const OUString & country,
                             const OUString & variant )
-             { rtl_locale_setDefault(language, country, variant); }
+             { rtl_locale_setDefault(language.getStr(), country.getStr(), variant.getStr()); }
 
     /**
          Getter for programmatic name of field,
@@ -264,3 +265,4 @@ private:
 #endif /* _RTL_LOCALE_HXX_ */
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/logfile.h b/sal/inc/rtl/logfile.h
index dbb9e9c258cf..fab9ed4d0264 100644
--- a/sal/inc/rtl/logfile.h
+++ b/sal/inc/rtl/logfile.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -132,3 +133,5 @@ sal_Bool SAL_CALL rtl_logfile_hasLogFile( void );
 #define RTL_LOGFILE_TRACE_AUTHOR3( project, author, frmt, arg1 , arg2 , arg3 ) ((void)0)
 #endif // TIMELOG
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/logfile.hxx b/sal/inc/rtl/logfile.hxx
index 685637d504b0..c67e67cb7fb5 100644
--- a/sal/inc/rtl/logfile.hxx
+++ b/sal/inc/rtl/logfile.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -203,3 +204,4 @@ namespace rtl
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/malformeduriexception.hxx b/sal/inc/rtl/malformeduriexception.hxx
index 731d762e23cb..a119e44f601d 100644
--- a/sal/inc/rtl/malformeduriexception.hxx
+++ b/sal/inc/rtl/malformeduriexception.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,5 @@ private:
 }
 
 #endif // INCLUDED_RTL_MALFORMEDURIEXCEPTION_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/math.h b/sal/inc/rtl/math.h
index fa81108df29f..26a1029095b1 100644
--- a/sal/inc/rtl/math.h
+++ b/sal/inc/rtl/math.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -476,3 +477,5 @@ double SAL_CALL rtl_math_acosh(double fValue) SAL_THROW_EXTERN_C();
 #endif /* __cplusplus */
 
 #endif /* INCLUDED_RTL_MATH_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/math.hxx b/sal/inc/rtl/math.hxx
index 31308b561185..8a70f7db51da 100644
--- a/sal/inc/rtl/math.hxx
+++ b/sal/inc/rtl/math.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -430,3 +431,5 @@ inline double tan(double d)
 }
 
 #endif // INCLUDED_RTL_MATH_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/memory.h b/sal/inc/rtl/memory.h
index 11e50e9dc963..5ead5914c1e5 100644
--- a/sal/inc/rtl/memory.h
+++ b/sal/inc/rtl/memory.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,4 @@ void* SAL_CALL rtl_findInMemory(const void *MemA, sal_uInt8 ch, sal_Size Bytes);
 
 #endif /*_RTL_MEMORY_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/process.h b/sal/inc/rtl/process.h
index b2e471f2def6..ae27cda80fe5 100644
--- a/sal/inc/rtl/process.h
+++ b/sal/inc/rtl/process.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,5 @@ sal_uInt32 SAL_CALL rtl_getAppCommandArgCount();
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/random.h b/sal/inc/rtl/random.h
index 52e2d56968b9..5e034161374b 100644
--- a/sal/inc/rtl/random.h
+++ b/sal/inc/rtl/random.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #ifndef _RTL_RANDOM_H_
-#define _RTL_RANDOM_H_ "$Revision: 1.7 $"
+#define _RTL_RANDOM_H_
 
 #include <sal/types.h>
 
@@ -112,3 +113,4 @@ rtlRandomError SAL_CALL rtl_random_getBytes (
 
 #endif /* _RTL_RANDOM_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/ref.hxx b/sal/inc/rtl/ref.hxx
index 66e621cc29a5..abe96e947eed 100644
--- a/sal/inc/rtl/ref.hxx
+++ b/sal/inc/rtl/ref.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -240,3 +241,5 @@ inline T * get_pointer( Reference<T> const& r )
 } // namespace rtl
 
 #endif /* !_RTL_REF_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/strbuf.h b/sal/inc/rtl/strbuf.h
index b471cf8f5f83..584137f6d38c 100644
--- a/sal/inc/rtl/strbuf.h
+++ b/sal/inc/rtl/strbuf.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,3 +118,5 @@ void SAL_CALL rtl_stringbuffer_insert( /*inout*/rtl_String ** This,
 #endif
 
 #endif  /* _RTL_STRBUF_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index b6920049f2fb..ed3ea2c1b637 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -274,6 +275,11 @@ public:
      */
     const sal_Char* getStr() const { return pData->buffer; }
 
+    /**
+        Return a OString instance reflecting the current content
+        of this OStringBuffer.
+     */
+    const OString toString() const { return OString(pData->buffer); }
 
     /**
         The character at the specified index of this string buffer is set
@@ -663,3 +669,4 @@ private:
 #endif  /* _RTL_STRBUF_HXX_ */
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h
index fe8548078227..65ecae5010f2 100644
--- a/sal/inc/rtl/string.h
+++ b/sal/inc/rtl/string.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -741,8 +742,6 @@ double SAL_CALL rtl_str_toDouble( const sal_Char * str ) SAL_THROW_EXTERN_C();
 
 #ifdef SAL_W32
 #   pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#   pragma pack(push, 4)
 #endif
 
 /** The implementation of a byte string.
@@ -756,7 +755,7 @@ typedef struct _rtl_String
     sal_Char            buffer[1];
 } rtl_String;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined(SAL_W32)
 #pragma pack(pop)
 #endif
 
@@ -1087,7 +1086,7 @@ sal_Int32 SAL_CALL rtl_string_getToken( rtl_String ** newStr , rtl_String * str,
     its value should be 0x00.  Depending on where this macro is used, the nature
     of the supplied expression might be further restricted.
 */
-#define RTL_CONSTASCII_STRINGPARAM( constAsciiStr ) constAsciiStr, ((sal_Int32)sizeof(constAsciiStr)-1)
+#define RTL_CONSTASCII_STRINGPARAM( constAsciiStr ) constAsciiStr, ((sal_Int32)SAL_N_ELEMENTS(constAsciiStr)-1)
 
 /** Supply the length of an ASCII string literal.
 
@@ -1102,7 +1101,7 @@ sal_Int32 SAL_CALL rtl_string_getToken( rtl_String ** newStr , rtl_String * str,
     its value should be 0x00.  Depending on where this macro is used, the nature
     of the supplied expression might be further restricted.
 */
-#define RTL_CONSTASCII_LENGTH( constAsciiStr ) ((sal_Int32)(sizeof(constAsciiStr)-1))
+#define RTL_CONSTASCII_LENGTH( constAsciiStr ) ((sal_Int32)(SAL_N_ELEMENTS(constAsciiStr)-1))
 
 /* ======================================================================= */
 
@@ -1191,3 +1190,5 @@ sal_Bool SAL_CALL rtl_convertUStringToString(rtl_String ** pTarget,
 #endif
 
 #endif /* _RTL_STRING_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index c85da92c177b..daf95802a489 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
 
 #ifdef __cplusplus
 
-#ifndef _RTL_DIAGNOSE_H_
 #include <osl/diagnose.h>
-#endif
 #include <rtl/memory.h>
 #include <rtl/textenc.h>
 #include <rtl/string.h>
@@ -224,6 +223,22 @@ public:
     sal_Int32 getLength() const SAL_THROW(()) { return pData->length; }
 
     /**
+      Checks if a string is empty.
+
+      @return   sal_True if the string is empty;
+                sal_False, otherwise.
+
+      @since LibreOffice 3.4
+    */
+    sal_Bool isEmpty() const SAL_THROW(())
+    {
+        if ( pData->length )
+            return sal_False;
+        else
+            return sal_True;
+    }
+
+    /**
       Returns a pointer to the characters of this string.
 
       <p>The returned pointer is not guaranteed to point to a null-terminated
@@ -423,7 +438,7 @@ public:
 
       @return   a hash code value for this object.
 
-      @see rtl::OStringHash for convenient use of STLPort's hash_map
+      @see rtl::OStringHash for convenient use of boost::unordered_map
     */
     sal_Int32 hashCode() const SAL_THROW(())
     {
@@ -915,7 +930,7 @@ public:
 /** A helper to use OStrings with hash maps.
 
     Instances of this class are unary function objects that can be used as
-    hash function arguments to STLPort's hash_map and similar constructs.
+    hash function arguments to boost::unordered_map and similar constructs.
  */
 struct OStringHash
 {
@@ -939,3 +954,5 @@ struct OStringHash
 #endif /* __cplusplus */
 
 #endif /* _RTL_STRING_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/tencinfo.h b/sal/inc/rtl/tencinfo.h
index 49c010ebd374..cc70d30423ed 100644
--- a/sal/inc/rtl/tencinfo.h
+++ b/sal/inc/rtl/tencinfo.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,7 +104,7 @@ typedef struct _rtl_TextEncodingInfo
         ASCII control codes 0x00--1F are not included here, as they are used for
         special purposes in some encodings.
 
-        If an encoding has this property, it is easy to search for occurences of
+        If an encoding has this property, it is easy to search for occurrences of
         ASCII characters within strings of this encoding---you do not need to
         keep track whether a byte in the range 0x20--7F really represents an
         ASCII character or rather is part of some multi-byte character.
@@ -274,3 +275,5 @@ rtl_getWindowsCodePageFromTextEncoding(rtl_TextEncoding nEncoding);
 #endif
 
 #endif /* _RTL_TENCINFO_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/textcvt.h b/sal/inc/rtl/textcvt.h
index b22813daf754..8968c06f17b5 100644
--- a/sal/inc/rtl/textcvt.h
+++ b/sal/inc/rtl/textcvt.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -178,3 +179,5 @@ sal_Size SAL_CALL rtl_convertUnicodeToText( rtl_UnicodeToTextConverter hConverte
 #endif
 
 #endif /* _RTL_TEXTCVT_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/textenc.h b/sal/inc/rtl/textenc.h
index 6b0b67e3c8ab..1c9b1904fc32 100644
--- a/sal/inc/rtl/textenc.h
+++ b/sal/inc/rtl/textenc.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -277,3 +278,4 @@ Japanese (JIS 0212)                             RTL_TEXTENCODING_JISX_0212
 
 #endif /* _RTL_TEXTENC_H */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/tres.h b/sal/inc/rtl/tres.h
index 9535d0b2adc2..102c2ee2319b 100644
--- a/sal/inc/rtl/tres.h
+++ b/sal/inc/rtl/tres.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef _RTL_TRES_H_
 #define _RTL_TRES_H_
 
@@ -104,3 +105,5 @@ void SAL_CALL rtl_tres_destroy( rtl_TestResult* res );
 #endif
 
 #endif  /* _RTL_TRES_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/tres.hxx b/sal/inc/rtl/tres.hxx
index 6fcd5b7c61e7..2c0ee9906809 100644
--- a/sal/inc/rtl/tres.hxx
+++ b/sal/inc/rtl/tres.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,11 +29,8 @@
 #ifndef _RTL_TRES_HXX_
 #define _RTL_TRES_HXX_
 
-
 #include <rtl/tres.h>
 
-//#include <stdarg.h>
-
 // <namespace_rtl>
 namespace rtl
 {
@@ -110,3 +108,4 @@ public:
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/unload.h b/sal/inc/rtl/unload.h
index 30a8ddbe4a8f..d67afb1ee961 100644
--- a/sal/inc/rtl/unload.h
+++ b/sal/inc/rtl/unload.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -313,3 +314,5 @@ sal_Bool rtl_moduleCount_canUnload( rtl_StandardModuleCount * that, TimeValue* l
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/uri.h b/sal/inc/rtl/uri.h
index aace6e934d27..16c7ed592359 100644
--- a/sal/inc/rtl/uri.h
+++ b/sal/inc/rtl/uri.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -352,3 +353,5 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef,
 #endif /* __cplusplus */
 
 #endif /* _RTL_URI_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/uri.hxx b/sal/inc/rtl/uri.hxx
index 9dfe1d5ec80e..c4bb81bd0e02 100644
--- a/sal/inc/rtl/uri.hxx
+++ b/sal/inc/rtl/uri.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -152,3 +153,5 @@ inline rtl::OUString Uri::convertRelToAbs(rtl::OUString const & rBaseUriRef,
 }
 
 #endif // _RTL_URI_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/ustrbuf.h b/sal/inc/rtl/ustrbuf.h
index 632040818f21..a7295f5e5324 100644
--- a/sal/inc/rtl/ustrbuf.h
+++ b/sal/inc/rtl/ustrbuf.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -163,3 +164,5 @@ void SAL_CALL rtl_uStringbuffer_insert_ascii(   /*inout*/rtl_uString ** This,
 #endif
 
 #endif  /* _RTL_USTRBUF_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 3f8421b1f3c7..3f3498aa2ecf 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
 
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.h>
-#ifndef _RTL_USTRING_HXX
 #include <rtl/ustring.hxx>
-#endif
 
 #ifdef __cplusplus
 
@@ -275,6 +274,12 @@ public:
      */
     const sal_Unicode*  getStr() const { return pData->buffer; }
 
+    /**
+        Return a OUString instance reflecting the current content
+        of this OUStringBuffer.
+     */
+    const OUString toString() const { return OUString(pData->buffer); }
+
 
     /**
         The character at the specified index of this string buffer is set
@@ -772,3 +777,5 @@ private:
 
 #endif  /* __cplusplus */
 #endif  /* _RTL_USTRBUF_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h
index 22e697e370e8..062070dadffc 100644
--- a/sal/inc/rtl/ustring.h
+++ b/sal/inc/rtl/ustring.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1061,7 +1062,7 @@ double SAL_CALL rtl_ustr_toDouble( const sal_Unicode * str ) SAL_THROW_EXTERN_C(
 
 /* ======================================================================= */
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined(SAL_W32)
 #pragma pack(push, 4)
 #endif
 
@@ -1076,7 +1077,7 @@ typedef struct _rtl_uString
     sal_Unicode         buffer[1];
 } rtl_uString;
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined(SAL_W32)
 #pragma pack(pop)
 #endif
 
@@ -1448,7 +1449,7 @@ sal_Int32 SAL_CALL rtl_uString_getToken( rtl_uString ** newStr , rtl_uString * s
     its value should be 0x00.  Depending on where this macro is used, the nature
     of the supplied expression might be further restricted.
 */
-#define RTL_CONSTASCII_USTRINGPARAM( constAsciiStr ) constAsciiStr, ((sal_Int32)(sizeof(constAsciiStr)-1)), RTL_TEXTENCODING_ASCII_US
+#define RTL_CONSTASCII_USTRINGPARAM( constAsciiStr ) constAsciiStr, ((sal_Int32)(SAL_N_ELEMENTS(constAsciiStr)-1)), RTL_TEXTENCODING_ASCII_US
 
 /* ======================================================================= */
 
@@ -1658,3 +1659,5 @@ sal_Bool SAL_CALL rtl_convertStringToUString(
 #endif
 
 #endif /* _RTL_USTRING_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 9a2ef8b9edc9..3cdf121f1526 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
 
 #ifdef __cplusplus
 
-#ifndef _RTL_DIAGNOSE_H_
 #include "osl/diagnose.h"
-#endif
 #include <rtl/ustring.h>
 #include <rtl/string.hxx>
 #include <rtl/memory.h>
@@ -50,7 +49,7 @@ namespace rtl
 /**
   This String class provide base functionality for C++ like Unicode
   character array handling. The advantage of this class is, that it
-  handle all the memory managament for you - and it do it
+  handle all the memory management for you - and it do it
   more efficient. If you assign a string to another string, the
   data of both strings are shared (without any copy operation or
   memory allocation) as long as you do not change the string. This class
@@ -279,6 +278,22 @@ public:
     sal_Int32 getLength() const SAL_THROW(()) { return pData->length; }
 
     /**
+      Checks if a string is empty.
+
+      @return   sal_True if the string is empty;
+                sal_False, otherwise.
+
+      @since LibreOffice 3.4
+    */
+    sal_Bool isEmpty() const SAL_THROW(())
+    {
+        if ( pData->length )
+            return sal_False;
+        else
+            return sal_True;
+    }
+
+    /**
       Returns a pointer to the Unicode character buffer from this string.
 
       It isn't necessarily NULL terminated.
@@ -733,7 +748,7 @@ public:
 
       @return   a hash code value for this object.
 
-      @see rtl::OUStringHash for convenient use of STLPort's hash_map
+      @see rtl::OUStringHash for convenient use of boost::unordered_map
     */
     sal_Int32 hashCode() const SAL_THROW(())
     {
@@ -949,8 +964,7 @@ public:
     */
     OUString copy( sal_Int32 beginIndex, sal_Int32 count ) const SAL_THROW(())
     {
-        OSL_ASSERT(beginIndex >= 0 && beginIndex <= getLength()
-                   && count >= 0 && count <= getLength() - beginIndex);
+        OSL_ASSERT(beginIndex >= 0 && beginIndex <= getLength() && count >= 0);
         if ( (beginIndex == 0) && (count == getLength()) )
             return *this;
         else
@@ -1464,7 +1478,7 @@ public:
 /** A helper to use OUStrings with hash maps.
 
     Instances of this class are unary function objects that can be used as
-    hash function arguments to STLPort's hash_map and similar constructs.
+    hash function arguments to boost::unordered_map and similar constructs.
  */
 struct OUStringHash
 {
@@ -1538,3 +1552,5 @@ inline OString OUStringToOString( const OUString & rUnicode,
 #endif /* __cplusplus */
 
 #endif /* _RTL_USTRING_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/uuid.h b/sal/inc/rtl/uuid.h
index 3ff5bb2c1232..ed0180a88985 100644
--- a/sal/inc/rtl/uuid.h
+++ b/sal/inc/rtl/uuid.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -178,32 +179,10 @@ void SAL_CALL rtl_createNamedUuid(
       0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8\
     }
 
-
-/*
-    This macro must have a value below the system time resolution of the
-    system. The uuid routines use this value  as an upper limit for adding ticks to the
-    the predecessor time value if system times are equal.
- */
-#ifdef SAL_W32
-#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 1000
-#elif defined SAL_OS2 // YD we use posix functions for time
-#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
-#elif LINUX
-#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
-#elif NETBSD
-#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
-#elif FREEBSD
-#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
-#elif SOLARIS
-#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
-#elif MACOSX
-#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 100000
-#else
-#error "System time resolution must be calculated!"
-#endif
-
 #ifdef __cplusplus
 }
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/sal/alloca.h b/sal/inc/sal/alloca.h
index 17c242c4d1e2..a0c2ce66fd95 100644
--- a/sal/inc/sal/alloca.h
+++ b/sal/inc/sal/alloca.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,14 +29,14 @@
 #ifndef INCLUDED_SAL_ALLOCA_H
 #define INCLUDED_SAL_ALLOCA_H
 
-#if defined (SOLARIS) || defined (LINUX) || defined(__EMX__)
+#if defined (SOLARIS) || defined (LINUX) || defined(__EMX__) || defined(AIX) || defined(ANDROID)
 
 #ifndef INCLUDED_ALLOCA_H
 #include <alloca.h>
 #define INCLUDED_ALLOCA_H
 #endif
 
-#elif defined (FREEBSD) || defined(NETBSD)
+#elif defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
 
 #ifndef INCLUDED_STDLIB_H
 #include <stdlib.h>
@@ -49,6 +50,13 @@
 #define INCLUDED_SYS_TYPES_H
 #endif
 
+#elif defined (IOS)
+
+#ifndef INCLUDED_SYS_TYPES_H
+#include <sys/types.h>
+#define INCLUDED_SYS_TYPES_H
+#endif
+
 #elif defined (WNT)
 
 #ifndef INCLUDED_MALLOC_H
@@ -64,3 +72,4 @@
 
 #endif  /* INCLUDED_SAL_ALLOCA_H */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index 7b2bd5154bc8..e4ed257e4a3f 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,14 +29,6 @@
 #ifndef _SAL_CONFIG_H_
 #define _SAL_CONFIG_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
 #ifndef INCLUDED_STDLIB_H
 #include <stdlib.h>
 #define INCLUDED_STDLIB_H
@@ -48,7 +41,6 @@ extern "C" {
 #define SAL_PATHSEPARATOR ';'
 #define SAL_PATHDELIMITER '\\'
 #define SAL_CONFIGFILE( name ) name ".ini"
-#define SAL_SYSCONFIGFILE( name ) name ".ini"
 
 #ifdef _MSC_VER
 
@@ -82,24 +74,8 @@ extern "C" {
 
 #endif /* defined WIN32 */
 
-/* BR: 16bit fuer Borland-Compiler */
-#ifdef __BORLANDC__
-#define SAL_W16
-#define SAL_DLLEXTENSION ".dll"
-#endif
-/* BR: 16bit fuer Borland-Compiler */
-
-#ifdef OS2
-#define SAL_OS2
-#define SAL_DLLEXTENSION ".dll"
-#define SAL_PRGEXTENSION ".exe"
-#define SAL_PATHSEPARATOR ';'
-#define SAL_PATHDELIMITER '\\'
-#define SAL_CONFIGFILE( name ) name ".ini"
-#define SAL_SYSCONFIGFILE( name ) name ".ini"
-#endif
-
-#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(SCO)
+#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || \
+    defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY) || defined(ANDROID)
 #define SAL_UNX
 #define SAL_DLLEXTENSION ".so"
 #define SAL_DLLPREFIX "lib"
@@ -107,7 +83,6 @@ extern "C" {
 #define SAL_PATHSEPARATOR ':'
 #define SAL_PATHDELIMITER '/'
 #define SAL_CONFIGFILE( name ) name "rc"
-#define SAL_SYSCONFIGFILE( name ) "." name "rc"
 #endif
 
 #ifdef MACOSX
@@ -118,16 +93,22 @@ extern "C" {
 #define SAL_PATHSEPARATOR ':'
 #define SAL_PATHDELIMITER '/'
 #define SAL_CONFIGFILE( name ) name "rc"
-#define SAL_SYSCONFIGFILE( name ) "." name "rc"
 #endif
 
-#ifdef HPUX
+#ifdef IOS
 #define SAL_UNX
-#define SAL_DLLEXTENSION ".sl"
+/* SAL_DLLEXTENSION should not really be used on iOS, as iOS apps are
+ * not allowed to load own dynamic libraries.
+ */
+#define SAL_DLLEXTENSION ".dylib"
 #define SAL_DLLPREFIX "lib"
+/* This is fairly pointless too, an iOS app consists of a single
+ * executable (plus data files).
+ */
 #define SAL_PRGEXTENSION ".bin"
+#define SAL_PATHSEPARATOR ':'
+#define SAL_PATHDELIMITER '/'
 #define SAL_CONFIGFILE( name ) name "rc"
-#define SAL_SYSCONFIGFILE( name ) "." name "rc"
 #endif
 
 #ifdef sun
@@ -150,3 +131,4 @@ extern "C" {
 #endif /*_SAL_CONFIG_H_ */
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/sal/cppunit.h b/sal/inc/sal/cppunit.h
index daaa630219de..d0b3e6099d8a 100644
--- a/sal/inc/sal/cppunit.h
+++ b/sal/inc/sal/cppunit.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,13 +31,13 @@
 
 #include <sal/types.h>
 
-#include "preextstl.h"
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 #undef CPPUNIT_PLUGIN_EXPORT
 #define CPPUNIT_PLUGIN_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT
-#include "postextstl.h"
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/sal/macros.h b/sal/inc/sal/macros.h
index 800629ab095d..e4c35138266d 100644
--- a/sal/inc/sal/macros.h
+++ b/sal/inc/sal/macros.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,24 +29,54 @@
 #ifndef _SAL_MACROS_H_
 #define _SAL_MACROS_H_
 
+#include <stddef.h>
+
 #ifndef SAL_MAX
-#   define SAL_MAX(a,b)            (((a) > (b)) ? (a) : (b))
+#    define SAL_MAX(a,b)            (((a) > (b)) ? (a) : (b))
 #endif
+
 #ifndef SAL_MIN
-#   define SAL_MIN(a,b)            (((a) < (b)) ? (a) : (b))
+#    define SAL_MIN(a,b)            (((a) < (b)) ? (a) : (b))
 #endif
 
 #ifndef SAL_FIELDOFFSET
-#   define SAL_FIELDOFFSET(type, field) ((sal_Int32)(&((type *)16)->field) - 16)
+#    define SAL_FIELDOFFSET(type, field) ((sal_Int32)(&((type *)16)->field) - 16)
 #endif
 
-#ifndef SAL_BOUND
-#   define SAL_BOUND(x,l,h)        ((x) <= (l) ? (l) : ((x) >= (h) ? (h) : (x)))
+#ifndef SAL_N_ELEMENTS
+#    if defined(__cplusplus) && defined(__GXX_EXPERIMENTAL_CXX0X__)
+        /*
+         * Magic template to calculate at compile time the number of elements
+         * in an array. Enforcing that the argument must be a array and not
+         * a pointer, e.g.
+         *  char *pFoo="foo";
+         *  SAL_N_ELEMENTS(pFoo);
+         * fails while
+         *  SAL_N_ELEMENTS("foo");
+         * or
+         *  char aFoo[]="foo";
+         *  SAL_N_ELEMENTS(aFoo);
+         * pass
+         *
+         * Unfortunately if arr is an array of an anonymous class then we need
+         * C++0x, i.e. see
+         * http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#757
+         */
+         template <typename T, size_t S> char (&sal_n_array_size( T(&)[S] ))[S];
+#        define SAL_N_ELEMENTS(arr)     (sizeof(sal_n_array_size(arr)))
+#    else
+#        define SAL_N_ELEMENTS(arr)     (sizeof (arr) / sizeof ((arr)[0]))
+#    endif
 #endif
 
-#ifndef SAL_SWAP
-#   define SAL_SWAP(a,b)           ((a) ^= (b) ^= (a) ^= (b))
+#ifndef SAL_BOUND
+#    define SAL_BOUND(x,l,h)        ((x) <= (l) ? (l) : ((x) >= (h) ? (h) : (x)))
 #endif
 
+#ifndef SAL_ABS
+#    define SAL_ABS(a)              (((a) < 0) ? (-(a)) : (a))
+#endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index f360e4c95f19..536bf328a43a 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,6 +30,9 @@
 #define _SAL_MAIN_H_
 
 #include <sal/types.h>
+#if defined(AIX)
+#   include <unistd.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,7 +61,6 @@ int SAL_CALL main(int argc, char ** argv) \
     return ret; \
 }
 
-
 /* Definition macros for CRT entries */
 
 #ifdef SAL_W32
@@ -69,14 +72,6 @@ int SAL_CALL main(int argc, char ** argv) \
 
 /* Sorry but this is neccessary cause HINSTANCE is a typedef that differs (C++ causes an error) */
 
-#if 0
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#else /* Simulated what windows.h does */
-
 #ifndef WINAPI
 #   define WINAPI   __stdcall
 #endif
@@ -93,7 +88,7 @@ int SAL_CALL main(int argc, char ** argv) \
 DECLARE_HANDLE(HINSTANCE);
 #endif
 
-#endif
+
 
 #define SAL_WIN_WinMain \
 int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nshow ) \
@@ -150,3 +145,4 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nsh
 
 #endif  /* _SAL_MAIN_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index bb623e2f2812..d673f34ed473 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,11 +61,16 @@ extern "C" {
 /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
 #if defined( WNT)
 #define SAL_MATH_FINITE(d) _finite(d)
-#elif defined OS2
-#define SAL_MATH_FINITE(x)              \
-    ((sizeof (x) == sizeof (float)) ? __isfinitef(x)    \
-    : (sizeof (x) == sizeof (double)) ? __isfinite(x)   \
-    : __isfinitel(x))
+#elif defined IOS
+/* C++ is so nice. This is the only way I could come up with making
+ * this actually work in all cases (?), even when <cmath> has been
+ * included which #undefs isfinite: copy the definition of isfinite()
+ * from <architecture/arm/math.h>
+ */
+#define SAL_MATH_FINITE(d) \
+  ( sizeof (d) == sizeof(float ) ?  __inline_isfinitef((float)(d)) \
+  : sizeof (d) == sizeof(double) ?  __inline_isfinited((double)(d)) \
+                                 :  __inline_isfinite ((long double)(d)))
 #elif defined LINUX || defined UNX
 #define SAL_MATH_FINITE(d) finite(d)
 #else /* WNT, LINUX, UNX */
@@ -145,3 +151,5 @@ union sal_math_Double
 #endif /* __cplusplus */
 
 #endif /* INCLUDED_SAL_MATHCONF_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 2db057b2fa12..863185167088 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,11 +30,12 @@
 #define _SAL_TYPES_H_
 
 #include <sal/config.h>
+#include <sal/macros.h>
 
 /* Grab __SIZEOFxxx constants from typesconfig tool on Unix */
 #if defined UNX
   #include <sal/typesizes.h>
-#elif defined(WNT) || defined(OS2)
+#elif defined(WNT)
   /* FIXME: autogeneration of type sizes on Win32/Win64? */
   #define SAL_TYPES_ALIGNMENT2      1
   #define SAL_TYPES_ALIGNMENT4      1
@@ -41,8 +43,12 @@
   #define SAL_TYPES_SIZEOFSHORT     2
   #define SAL_TYPES_SIZEOFINT       4
   #define SAL_TYPES_SIZEOFLONG      4
-  #define SAL_TYPES_SIZEOFLONGLONG      8
-  #define SAL_TYPES_SIZEOFPOINTER       4
+  #define SAL_TYPES_SIZEOFLONGLONG  8
+  #ifdef _WIN64
+    #define SAL_TYPES_SIZEOFPOINTER 8
+  #else
+    #define SAL_TYPES_SIZEOFPOINTER 4
+  #endif
 #endif
 
 #ifdef __cplusplus
@@ -99,7 +105,7 @@ typedef unsigned char       sal_uInt8;
     #define SAL_PRIuUINT64 "I64u"
     #define SAL_PRIxUINT64 "I64x"
     #define SAL_PRIXUINT64 "I64X"
-#elif defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined (__GNUC__) || defined(__hpux) || defined (sgi)
+#elif defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined (__GNUC__) || defined (sgi)
     #if SAL_TYPES_SIZEOFLONG == 8
         typedef signed long int         sal_Int64;
         typedef unsigned long int       sal_uInt64;
@@ -233,7 +239,7 @@ typedef void *                   sal_Handle;
 #define SAL_MAX_SIZE        SAL_MAX_UINT64
 #endif
 
-#if defined(SAL_W32) || defined(SAL_OS2) || defined(SAL_UNX)
+#if defined(SAL_W32) || defined(SAL_UNX)
 #   define SAL_MAX_ENUM 0x7fffffff
 #elif defined(SAL_W16)
 #   define SAL_MAX_ENUM 0x7fff
@@ -254,13 +260,6 @@ typedef void *                   sal_Handle;
 #   define SAL_CALL
 #   define SAL_CALL_ELLIPSE
 #endif
-#elif defined SAL_OS2 // YD
-/* YD 25/09/2007 gcc doesn't like imports inside class members */
-#   define SAL_DLLPUBLIC_EXPORT
-#   define SAL_DLLPUBLIC_IMPORT
-#   define SAL_DLLPRIVATE
-#   define SAL_CALL
-#   define SAL_CALL_ELLIPSE
 #elif defined SAL_UNX
 #   if   defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x550)
 #     define SAL_DLLPUBLIC_EXPORT  __global
@@ -311,8 +310,6 @@ typedef void *                   sal_Handle;
 
 #ifdef SAL_W32
 #   pragma pack(push, 8)
-#elif defined(SAL_OS2)
-#   pragma pack(push, 4)
 #endif
 
 /** This is the binary specification of a SAL sequence.
@@ -333,7 +330,7 @@ typedef struct _sal_Sequence
 
 #define SAL_SEQUENCE_HEADER_SIZE ((sal_Size)&((sal_Sequence *)0)->elements)
 
-#if defined( SAL_W32) ||  defined(SAL_OS2)
+#if defined( SAL_W32)
 #pragma pack(pop)
 #endif
 
@@ -343,7 +340,9 @@ typedef struct _sal_Sequence
     lack RTTI support, dynamic_cast is not included here).
  */
 #ifdef __cplusplus
-#if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || defined FREEBSD || defined NETBSD || defined AIX || defined OS2
+#if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || \
+    defined FREEBSD || defined NETBSD || defined AIX || \
+    defined OPENBSD || defined DRAGONFLY
 #define SAL_CONST_CAST(type, expr) (const_cast< type >(expr))
 #define SAL_REINTERPRET_CAST(type, expr) (reinterpret_cast< type >(expr))
 #define SAL_STATIC_CAST(type, expr) (static_cast< type >(expr))
@@ -433,3 +432,4 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) {
 
 #endif /*_SAL_TYPES_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/AutoSystoolInit.hxx b/sal/inc/systools/win32/AutoSystoolInit.hxx
index d212ff83c334..3ebc7a6b5b36 100644
--- a/sal/inc/systools/win32/AutoSystoolInit.hxx
+++ b/sal/inc/systools/win32/AutoSystoolInit.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,3 +61,5 @@ private:
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/StrConvert.h b/sal/inc/systools/win32/StrConvert.h
index f22f68cda46a..80c24513a993 100644
--- a/sal/inc/systools/win32/StrConvert.h
+++ b/sal/inc/systools/win32/StrConvert.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -130,3 +131,5 @@ if( wcList ) \
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/SyncObjects.hxx b/sal/inc/systools/win32/SyncObjects.hxx
index 87057bab6296..3966fca14391 100644
--- a/sal/inc/systools/win32/SyncObjects.hxx
+++ b/sal/inc/systools/win32/SyncObjects.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ private:
 typedef CLockGuard< CSyncObject > SyncObjLockGuard_t;
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/advapi9x.h b/sal/inc/systools/win32/advapi9x.h
deleted file mode 100644
index 302df89c50c3..000000000000
--- a/sal/inc/systools/win32/advapi9x.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#pragma once
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the shlobj.h file in order to avoid
-// warnings because of multiple defines
-//------------------------------------------------------------------------
-
-// begin obsolete Win32 API functions -->
-#ifdef RegOpenKey
-#undef RegOpenKey
-#endif
-#ifdef RegEnumKey
-#undef RegEnumKey
-#endif
-#ifdef RegCreateKey
-#undef RegCreateKey
-#endif
-#ifdef RegQueryValue
-#undef RegQueryValue
-#endif
-#ifdef RegSetValue
-#undef RegSetValue
-#endif
-// <-- end obsolete Win32 functions
-
-#ifdef RegOpenKeyExW
-#undef RegOpenKeyExW
-#endif
-#ifdef RegEnumKeyExW
-#undef RegEnumKeyExW
-#endif
-#ifdef RegCreateKeyExW
-#undef RegCreateKeyExW
-#endif
-#ifdef RegDeleteKeyW
-#undef RegDeleteKeyW
-#endif
-#ifdef RegEnumValueW
-#undef RegEnumValueW
-#endif
-#ifdef RegQueryValueExW
-#undef RegQueryValueExW
-#endif
-#ifdef RegSetValueExW
-#undef RegSetValueExW
-#endif
-#ifdef RegDeleteValueW
-#undef RegDeleteValueW
-#endif
-#ifdef RegQueryInfoKeyW
-#undef RegQueryInfoKeyW
-#endif
-
-//------------------------------------------------------------------------
-// set the compiler directives for the function pointer we declare below
-// if we build sal or sal will be used as static library we define extern
-// else sal exports the function pointers from a dll and we use __declspec
-//------------------------------------------------------------------------
-
-#define ADVAPI9X_API extern
-
-    //------------------------------------------------------------------------
-// declare function pointers to the appropriate shell functions
-//------------------------------------------------------------------------
-
-ADVAPI9X_API LONG (WINAPI * lpfnRegOpenKeyExW) (
-  HKEY hKey,         // handle to open key
-  LPCWSTR lpSubKey,  // subkey name
-  DWORD ulOptions,   // reserved
-  REGSAM samDesired, // security access mask
-  PHKEY phkResult    // handle to open key
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegEnumKeyExW) (
-  HKEY hKey,                  // handle to key to enumerate
-  DWORD dwIndex,              // subkey index
-  LPWSTR lpName,              // subkey name
-  LPDWORD lpcName,            // size of subkey buffer
-  LPDWORD lpReserved,         // reserved
-  LPWSTR lpClass,             // class string buffer
-  LPDWORD lpcClass,           // size of class string buffer
-  PFILETIME lpftLastWriteTime // last write time
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegCreateKeyExW)(
-  HKEY hKey,                                  // handle to open key
-  LPCWSTR lpSubKey,                           // subkey name
-  DWORD Reserved,                             // reserved
-  LPWSTR lpClass,                             // class string
-  DWORD dwOptions,                            // special options
-  REGSAM samDesired,                          // desired security access
-  LPSECURITY_ATTRIBUTES lpSecurityAttributes, // inheritance
-  PHKEY phkResult,                            // key handle
-  LPDWORD lpdwDisposition                     // disposition value buffer
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegDeleteKeyW) (
-  HKEY hKey,         // handle to open key
-  LPCWSTR lpSubKey   // subkey name
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegEnumValueW) (
-  HKEY hKey,             // handle to key to query
-  DWORD dwIndex,         // index of value to query
-  LPWSTR lpValueName,    // value buffer
-  LPDWORD lpcValueName,  // size of value buffer
-  LPDWORD lpReserved,    // reserved
-  LPDWORD lpType,        // type buffer
-  LPBYTE lpData,         // data buffer
-  LPDWORD lpcbData       // size of data buffer
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegQueryValueExW) (
-  HKEY hKey,            // handle to key
-  LPCWSTR lpValueName,  // value name
-  LPDWORD lpReserved,   // reserved
-  LPDWORD lpType,       // type buffer
-  LPBYTE lpData,        // data buffer
-  LPDWORD lpcbData      // size of data buffer
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegSetValueExW)(
-  HKEY hKey,           // handle to key
-  LPCWSTR lpValueName, // value name
-  DWORD Reserved,      // reserved
-  DWORD dwType,        // value type
-  CONST BYTE *lpData,  // value data
-  DWORD cbData         // size of value data
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegDeleteValueW) (
-  HKEY hKey,            // handle to key
-  LPCWSTR lpValueName   // value name
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegQueryInfoKeyW) (
-    HKEY hKey,                      // handle to key to query
-    LPWSTR lpClassW,                // address of buffer for class string
-    LPDWORD lpcbClass,              // address of size of class string buffer
-    LPDWORD lpReserved,             // reserved
-    LPDWORD lpcSubKeys,             // address of buffer for number of
-                                    // subkeys
-    LPDWORD lpcbMaxSubKeyLen,       // address of buffer for longest subkey
-                                    // name length
-    LPDWORD lpcbMaxClassLen,        // address of buffer for longest class
-                                    // string length
-    LPDWORD lpcValues,              // address of buffer for number of value
-                                    // entries
-    LPDWORD lpcbMaxValueNameLen,    // address of buffer for longest
-                                    // value name length
-    LPDWORD lpcbMaxValueLen,        // address of buffer for longest value
-                                    // data length
-    LPDWORD lpcbSecurityDescriptor, // address of buffer for security
-                                    // descriptor length
-    PFILETIME lpftLastWriteTime     // address of buffer for last write time
-);
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define RegOpenKeyExW    lpfnRegOpenKeyExW
-#define RegEnumKeyExW    lpfnRegEnumKeyExW
-#define RegCreateKeyExW  lpfnRegCreateKeyExW
-#define RegDeleteKeyW    lpfnRegDeleteKeyW
-#define RegEnumValueW    lpfnRegEnumValueW
-#define RegQueryValueExW lpfnRegQueryValueExW
-#define RegSetValueExW   lpfnRegSetValueExW
-#define RegDeleteValueW  lpfnRegDeleteValueW
-#define RegQueryInfoKeyW lpfnRegQueryInfoKeyW
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/sal/inc/systools/win32/comdlg9x.h b/sal/inc/systools/win32/comdlg9x.h
deleted file mode 100644
index ce51bbe61ced..000000000000
--- a/sal/inc/systools/win32/comdlg9x.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#pragma once
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifndef _COMMDLG_H_
-#include <commdlg.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the shlobj.h file in order to avoid
-// warnings because of multiple defines
-//------------------------------------------------------------------------
-
-#ifdef GetOpenFileNameW
-#undef GetOpenFileNameW
-#endif
-
-#ifdef GetSaveFileNameW
-#undef GetSaveFileNameW
-#endif
-
-//------------------------------------------------------------------------
-// set the compiler directives for the function pointer we declare below
-// if we build sal or sal will be used as static library we define extern
-// else sal exports the function pointers from a dll and we use __declspec
-//------------------------------------------------------------------------
-
-#define COMDLG9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate comdlg functions
-//------------------------------------------------------------------------
-
-COMDLG9X_API BOOL ( WINAPI * lpfnGetOpenFileNameW ) ( LPOPENFILENAMEW lpofn );
-COMDLG9X_API BOOL ( WINAPI * lpfnGetSaveFileNameW ) ( LPOPENFILENAMEW lpofn );
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define GetOpenFileNameW    lpfnGetOpenFileNameW
-#define GetSaveFileNameW    lpfnGetSaveFileNameW
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/sal/inc/systools/win32/comptr.hxx b/sal/inc/systools/win32/comptr.hxx
index 1e880494b0ea..22bce969cad0 100644
--- a/sal/inc/systools/win32/comptr.hxx
+++ b/sal/inc/systools/win32/comptr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -231,3 +232,5 @@ class ComPtr
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/comtools.hxx b/sal/inc/systools/win32/comtools.hxx
index 096015517a35..b4051f20e897 100644
--- a/sal/inc/systools/win32/comtools.hxx
+++ b/sal/inc/systools/win32/comtools.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -192,3 +193,4 @@ typedef sal::systools::COMReference<IDataObject> IDataObjectPtr;
 typedef sal::systools::COMReference<IStream> IStreamPtr;
 typedef sal::systools::COMReference<IEnumFORMATETC> IEnumFORMATETCPtr;
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/kernel9x.h b/sal/inc/systools/win32/kernel9x.h
deleted file mode 100644
index 647e7d58542d..000000000000
--- a/sal/inc/systools/win32/kernel9x.h
+++ /dev/null
@@ -1,383 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#pragma once
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the winbase.h file in order to avoid
-// warnings because of multiple defines
-//------------------------------------------------------------------------
-
-#ifdef LoadLibraryW
-#undef LoadLibraryW
-#endif
-
-#ifdef LoadLibraryExW
-#undef LoadLibraryExW
-#endif
-
-#ifdef GetModuleFileNameW
-#undef GetModuleFileNameW
-#endif
-
-#ifdef GetLogicalDriveStringsW
-#undef GetLogicalDriveStringsW
-#endif
-
-#ifdef DeleteFileW
-#undef DeleteFileW
-#endif
-
-#ifdef CopyFileW
-#undef CopyFileW
-#endif
-
-#ifdef MoveFileW
-#undef MoveFileW
-#endif
-
-#ifdef MoveFileExW
-#undef MoveFileExW
-#endif
-
-#ifdef CreateFileW
-#undef CreateFileW
-#endif
-
-#ifdef RemoveDirectoryW
-#undef RemoveDirectoryW
-#endif
-
-#ifdef CreateDirectoryW
-#undef CreateDirectoryW
-#endif
-
-#ifdef CreateDirectoryExW
-#undef CreateDirectoryExW
-#endif
-
-#ifdef CreateFileW
-#undef CreateFileW
-#endif
-
-#ifdef GetLongPathNameW
-#undef GetLongPathNameW
-#endif
-
-#ifdef GetLocaleInfoW
-#undef GetLocaleInfoW
-#endif
-
-#ifdef GetFullPathNameW
-#undef GetFullPathNameW
-#endif
-
-#ifdef CreateProcessW
-#undef CreateProcessW
-#endif
-
-#ifdef CreateProcessAsUserW
-#undef CreateProcessAsUserW
-#endif
-
-#ifdef GetEnvironmentVariableW
-#undef GetEnvironmentVariableW
-#endif
-
-#ifdef GetDriveTypeW
-#undef GetDriveTypeW
-#endif
-
-#ifdef GetCurrentDirectoryW
-#undef GetCurrentDirectoryW
-#endif
-
-#ifdef SetCurrentDirectoryW
-#undef SetCurrentDirectoryW
-#endif
-
-#ifdef GetVolumeInformationW
-#undef GetVolumeInformationW
-#endif
-
-
-#ifdef GetDiskFreeSpaceExA
-#undef GetDiskFreeSpaceExA
-#endif
-
-#ifdef GetDiskFreeSpaceExW
-#undef GetDiskFreeSpaceExW
-#endif
-
-//------------------------------------------------------------------------
-// set the compiler directives for the function pointer we declare below
-// if we build sal or sal will be used as static library we define extern
-// else sal exports the function pointers from a dll and we use __declspec
-//------------------------------------------------------------------------
-
-#define KERNEL9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate kernel functions
-//------------------------------------------------------------------------
-
-//BOOL WINAPI RegisterServiceProcess( DWORD dwProcessID, BOOL fRegister );
-
-KERNEL9X_API HMODULE (WINAPI *lpfnLoadLibraryExW ) (
-    LPCWSTR lpLibFileName,  // file name of module
-    HANDLE hFile,           // reserved, must be NULL
-    DWORD dwFlags           // entry-point execution option
-);
-
-KERNEL9X_API DWORD (WINAPI *lpfnGetModuleFileNameW ) (
-    HMODULE hModule,    // handle to module
-    LPWSTR lpFilename,  // file name of module
-    DWORD nSize         // size of buffer
-);
-
-KERNEL9X_API DWORD (WINAPI *lpfnGetLogicalDriveStringsW ) (
-    DWORD nBufferLength,    // size of buffer
-    LPWSTR lpBuffer         // drive strings buffer
-);
-
-KERNEL9X_API HANDLE ( WINAPI *lpfnCreateFileW )(
-    LPCWSTR lpFileName,
-    DWORD   dwDesiredAccess,
-    DWORD   dwShareMode,
-    LPSECURITY_ATTRIBUTES   lpSecurityAttributes,
-    DWORD   dwCreationDisposition,
-    DWORD   dwFlagsAndAttributes,
-    HANDLE  hTemplateFile
-);
-
-KERNEL9X_API DWORD WINAPI GetCanonicalPathNameA(
-    LPCSTR lpszPath,            // file name
-    LPSTR lpszCanonicalPath,    // path buffer
-    DWORD cchBuffer             // size of path buffer
-);
-
-KERNEL9X_API DWORD WINAPI GetCanonicalPathNameW(
-    LPCWSTR lpszPath,           // file name
-    LPWSTR lpszCanonicalPath,   // path buffer
-    DWORD cchBuffer             // size of path buffer
-);
-
-KERNEL9X_API HANDLE ( WINAPI * lpfnCreateFileW ) (
-    LPCWSTR lpFileName,
-    DWORD   dwDesiredAccess,
-    DWORD   dwShareMode,
-    LPSECURITY_ATTRIBUTES   lpSecurityAttributes,
-    DWORD   dwCreationDisposition,
-    DWORD   dwFlagsAndAttributes,
-    HANDLE  hTemplateFile );
-
-KERNEL9X_API BOOL (WINAPI *lpfnDeleteFileW ) (
-    LPCWSTR lpFileName          // file name
-);
-
-KERNEL9X_API BOOL (WINAPI *lpfnCopyFileW ) (
-    LPCWSTR lpExistingFileName, // file name
-    LPCWSTR lpNewFileName,      // new file name
-    BOOL    bFailIfExist        // operation if file exists
-);
-
-KERNEL9X_API BOOL (WINAPI *lpfnMoveFileW ) (
-    LPCWSTR lpExistingFileName, // file name
-    LPCWSTR lpNewFileName       // new file name
-);
-
-KERNEL9X_API BOOL (WINAPI *lpfnMoveFileExW ) (
-  LPCWSTR lpExistingFileName,   // file name
-  LPCWSTR lpNewFileName,        // new file name
-  DWORD dwFlags                 // move options
-);
-
-KERNEL9X_API BOOL (WINAPI *lpfnRemoveDirectoryW ) (
-    LPCWSTR lpPathName          // directory name
-);
-
-KERNEL9X_API BOOL ( WINAPI * lpfnCreateDirectoryW ) (
-    LPCWSTR lpNewDirectory, LPSECURITY_ATTRIBUTES lpSecurityAttributes );
-
-KERNEL9X_API BOOL ( WINAPI * lpfnCreateDirectoryExW ) (
-    LPCWSTR lpTemplateDirectory,
-    LPCWSTR lpNewDirectory,
-    LPSECURITY_ATTRIBUTES   lpSecurityAttributes );
-
-KERNEL9X_API DWORD ( WINAPI * lpfnGetLongPathNameW ) (
-  LPCWSTR lpszShortPath, // file name
-  LPWSTR lpszLongPath,   // path buffer
-  DWORD cchBuffer        // size of path buffer
-);
-
-// GetCanonicalPath is a tool function with no exact counterpart
-// in the win32 api; we use nevertheless a function pointer
-// because every variable etc. must root in the Kernel9x.lib else
-// we loose our AutoSystoolInit object during linking
-KERNEL9X_API DWORD ( WINAPI * lpfnGetCanonicalPathW ) (
-    LPCWSTR lpszPath,           // file name
-    LPWSTR lpszCanonicalPath,   // path buffer
-    DWORD cchBuffer             // size of path buffer
-);
-
-KERNEL9X_API int ( WINAPI* lpfnGetLocaleInfoW ) (
-    LCID Locale,        // locale identifier
-    LCTYPE LCType,      // information type
-    LPWSTR lpLCData,    // information buffer
-    int cchData         // size of buffer
-);
-
-KERNEL9X_API DWORD ( WINAPI * lpfnGetFullPathNameW )(
-    LPCWSTR lpFileName,     // file name
-    DWORD   nBufferLength,  // size of path buffer
-    LPWSTR  lpBuffer,       // path buffer
-    LPWSTR  *lpFilePart     // address of file name in path
-);
-
-KERNEL9X_API BOOL ( WINAPI * lpfnCreateProcessW )(
-    LPCWSTR lpApplicationName,                 // name of executable module
-    LPWSTR lpCommandLine,                      // command line string
-    LPSECURITY_ATTRIBUTES lpProcessAttributes, // SD
-    LPSECURITY_ATTRIBUTES lpThreadAttributes,  // SD
-    BOOL bInheritHandles,                      // handle inheritance option
-    DWORD dwCreationFlags,                     // creation flags
-    LPVOID lpEnvironment,                      // new environment block
-    LPCWSTR lpCurrentDirectory,                // current directory name
-    LPSTARTUPINFOW lpStartupInfo,              // startup information
-    LPPROCESS_INFORMATION lpProcessInformation // process information
-);
-
-KERNEL9X_API BOOL ( WINAPI * lpfnCreateProcessAsUserW )(
-    HANDLE hToken,                             // handle to user token
-    LPCWSTR lpApplicationName,                 // name of executable module
-    LPWSTR lpCommandLine,                      // command-line string
-    LPSECURITY_ATTRIBUTES lpProcessAttributes, // SD
-    LPSECURITY_ATTRIBUTES lpThreadAttributes,  // SD
-    BOOL bInheritHandles,                      // inheritance option
-    DWORD dwCreationFlags,                     // creation flags
-    LPVOID lpEnvironment,                      // new environment block
-    LPCWSTR lpCurrentDirectory,                // current directory name
-    LPSTARTUPINFOW lpStartupInfo,              // startup information
-    LPPROCESS_INFORMATION lpProcessInformation // process information
-);
-
-KERNEL9X_API DWORD ( WINAPI * lpfnGetEnvironmentVariableW )(
-    LPCWSTR lpName,  // environment variable name
-    LPWSTR lpBuffer, // buffer for variable value
-    DWORD nSize      // size of buffer
-);
-
-
-KERNEL9X_API UINT ( WINAPI * lpfnGetDriveTypeW )(
-    LPCWSTR lpRootPathName  // root directory
-);
-
-KERNEL9X_API DWORD ( WINAPI * lpfnGetCurrentDirectoryW )(
-    DWORD  nBufferLength,   // size of directory buffer
-    LPWSTR lpBuffer         // directory buffer
-);
-
-KERNEL9X_API BOOL ( WINAPI * lpfnSetCurrentDirectoryW )(
-    LPCWSTR lpPathName  // new directory name
-);
-
-// GetVolumeInformation
-KERNEL9X_API BOOL ( WINAPI* lpfnGetVolumeInformationW )(
-    LPCWSTR lpRootPathName,             // root directory
-    LPWSTR  lpVolumeNameBuffer,         // volume name buffer
-    DWORD   nVolumeNameSize,            // length of name buffer
-    LPDWORD lpVolumeSerialNumber,       // volume serial number
-    LPDWORD lpMaximumComponentLength,   // maximum file name length
-    LPDWORD lpFileSystemFlags,          // file system options
-    LPWSTR  lpFileSystemName,           // file system name buffer
-    DWORD   nFileSystemNameSize         // length of file system name buffer
-);
-
-// GetDiskFreeSpaceExA
-KERNEL9X_API BOOL (WINAPI *lpfnGetDiskFreeSpaceExA)(
-  LPCSTR lpDirectoryName,                  // directory name
-  PULARGE_INTEGER lpFreeBytesAvailable,    // bytes available to caller
-  PULARGE_INTEGER lpTotalNumberOfBytes,    // bytes on disk
-  PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
-);
-
-// GetDiskFreeSpaceExW
-KERNEL9X_API BOOL (WINAPI *lpfnGetDiskFreeSpaceExW)(
-  LPCWSTR lpDirectoryName,                 // directory name
-  PULARGE_INTEGER lpFreeBytesAvailable,    // bytes available to caller
-  PULARGE_INTEGER lpTotalNumberOfBytes,    // bytes on disk
-  PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
-);
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define LoadLibraryExW              lpfnLoadLibraryExW
-#define LoadLibraryW(c)             LoadLibraryExW(c, NULL, 0)
-#define GetModuleFileNameW          lpfnGetModuleFileNameW
-#define GetLogicalDriveStringsW     lpfnGetLogicalDriveStringsW
-#define CreateFileW                 lpfnCreateFileW
-#define DeleteFileW                 lpfnDeleteFileW
-#define CopyFileW                   lpfnCopyFileW
-#define MoveFileW                   lpfnMoveFileW
-#define MoveFileExW                 lpfnMoveFileExW
-#define RemoveDirectoryW            lpfnRemoveDirectoryW
-#define CreateDirectoryW            lpfnCreateDirectoryW
-#define CreateDirectoryExW          lpfnCreateDirectoryExW
-#define GetLongPathNameW            lpfnGetLongPathNameW
-#define GetFullPathNameW            lpfnGetFullPathNameW
-
-#define GetCanonicalPath            lpfnGetCanonicalPathW
-#define GetLocaleInfoW              lpfnGetLocaleInfoW
-
-#define CreateProcessW              lpfnCreateProcessW
-#define CreateProcessAsUserW        lpfnCreateProcessAsUserW
-#define GetEnvironmentVariableW     lpfnGetEnvironmentVariableW
-#define GetDriveTypeW               lpfnGetDriveTypeW
-
-#define GetCurrentDirectoryW        lpfnGetCurrentDirectoryW
-#define SetCurrentDirectoryW        lpfnSetCurrentDirectoryW
-
-#define GetVolumeInformationW       lpfnGetVolumeInformationW
-#define GetDiskFreeSpaceExA         lpfnGetDiskFreeSpaceExA
-#define GetDiskFreeSpaceExW         lpfnGetDiskFreeSpaceExW
-
-#ifdef __cplusplus
-}
-#endif
-
-
diff --git a/sal/inc/systools/win32/mpr9x.h b/sal/inc/systools/win32/mpr9x.h
deleted file mode 100644
index 15b122025381..000000000000
--- a/sal/inc/systools/win32/mpr9x.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#pragma once
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the winuser.h file in order to avoid
-// warnings because of multiple defines
-//------------------------------------------------------------------------
-
-#ifdef WNetGetConnectionW
-#undef WNetGetConnectionW
-#endif
-
-//------------------------------------------------------------------------
-// defines
-//------------------------------------------------------------------------
-
-#define MPR9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate user32 functions
-//------------------------------------------------------------------------
-
-MPR9X_API DWORD (WINAPI *lpfnWNetGetConnectionW)(
-    LPCWSTR lpLocalName,    // pointer to local name
-    LPWSTR  lpRemoteName,   // pointer to buffer for remote name
-    LPDWORD lpnLength       // pointer to buffer size, in characters
-);
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define WNetGetConnectionW          lpfnWNetGetConnectionW
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/sal/inc/systools/win32/shell9x.h b/sal/inc/systools/win32/shell9x.h
deleted file mode 100644
index 30716314830d..000000000000
--- a/sal/inc/systools/win32/shell9x.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#pragma once
-
-#ifndef _SHELL9X_H_
-#define _SHELL9X_H_
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifndef _SHLOBJ_H_
-#include <shlobj.h>
-#endif
-
-#include <shellapi.h>
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the shlobj.h file in order to avoid
-// warnings because of multiple defines
-//------------------------------------------------------------------------
-
-#ifdef CommandLineToArgvW
-#undef CommandLineToArgvW
-#endif
-
-#ifdef SHBrowseForFolderW
-#undef SHBrowseForFolderW
-#endif
-
-#ifdef SHGetPathFromIDListW
-#undef SHGetPathFromIDListW
-#endif
-
-#ifdef ShellExecuteExW
-#undef ShellExecuteExW
-#endif
-
-//------------------------------------------------------------------------
-// set the compiler directives for the function pointer we declare below
-// if we build sal or sal will be used as static library we define extern
-// else sal exports the function pointers from a dll and we use __declspec
-//------------------------------------------------------------------------
-
-#define SHELL9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate shell functions
-//------------------------------------------------------------------------
-
-SHELL9X_API LPWSTR *     ( WINAPI * lpfnCommandLineToArgvW ) ( LPCWSTR lpCmdLine, int *pNumArgs );
-SHELL9X_API LPITEMIDLIST ( WINAPI * lpfnSHBrowseForFolderW ) ( LPBROWSEINFOW lpbi );
-SHELL9X_API BOOL         ( WINAPI * lpfnSHGetPathFromIDListW ) ( LPCITEMIDLIST pidl, LPWSTR pszPath );
-
-SHELL9X_API BOOL ( WINAPI * lpfnShellExecuteExW ) ( LPSHELLEXECUTEINFOW lpExecInfo );
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define CommandLineToArgvW   lpfnCommandLineToArgvW
-#define SHBrowseForFolderW   lpfnSHBrowseForFolderW
-#define SHGetPathFromIDListW lpfnSHGetPathFromIDListW
-
-#define ShellExecuteExW lpfnShellExecuteExW
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/sal/inc/systools/win32/snprintf.h b/sal/inc/systools/win32/snprintf.h
index 79441f032fee..cfed10fcaee2 100644
--- a/sal/inc/systools/win32/snprintf.h
+++ b/sal/inc/systools/win32/snprintf.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef _SNPRINTF_H
 #define _SNPRINTF_H
 
@@ -17,27 +18,18 @@
 
 /* Define needed types if they are not yet defined */
 
-#if 0
-#   ifndef _INC_STDARG
-#   include <stdarg.h>
-#   endif
-#else
+
 #   ifndef _VA_LIST_DEFINED
     typedef char *  va_list;
 #   define _VA_LIST_DEFINED
 #   endif
-#endif
 
-#if 0
-#   ifndef _INC_WCHAR
-#   include <wchar.h>
-#   endif
-#else
+
 #   ifndef _WCHAR_T_DEFINED
     typedef unsigned short wchar_t;
 #   define _WCHAR_T_DEFINED
 #   endif
-#endif
+
 
 #ifndef _SNPRINTF_DLLIMPORT
 #define _SNPRINTF_DLLIMPORT __declspec( dllimport )
@@ -65,16 +57,11 @@ _SNPRINTF_DLLIMPORT int __cdecl snwprintf( wchar_t *buffer, size_t count, const
 _SNPRINTF_DLLIMPORT int __cdecl snprintf( char *buffer, size_t count, const char *format, ... );
 
 /* Conflict with STL_port inline implementation */
-#if 0
-/* UNICODE version */
-_SNPRINTF_DLLIMPORT int __cdecl vsnwprintf( wchar_t *buffer, size_t count, const wchar_t *format, va_list ap );
-
-/* SBCS and MBCS version */
-_SNPRINTF_DLLIMPORT int __cdecl vsnprintf( char *buffer, size_t count, const char *format, va_list ap );
-#endif
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* _SNPRINTF_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/user9x.h b/sal/inc/systools/win32/user9x.h
deleted file mode 100644
index da30bf222836..000000000000
--- a/sal/inc/systools/win32/user9x.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#pragma once
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the winuser.h file in order to avoid
-// warnings because of multiple defines
-//------------------------------------------------------------------------
-
-#ifdef SendMessageW
-#undef SendMessageW
-#endif
-
-#ifdef CreateWindowExW
-#undef CreateWindowExW
-#endif
-
-#ifdef RegisterClassExW
-#undef RegisterClassExW
-#endif
-
-#ifdef UnregisterClassW
-#undef UnregisterClassW
-#endif
-
-#ifdef RegisterClipboardFormatW
-#undef RegisterClipboardFormatW
-#endif
-
-#ifdef GetClipboardFormatNameW
-#undef GetClipboardFormatNameW
-#endif
-
-#ifdef SetWindowTextW
-#undef SetWindowTextW
-#endif
-
-#ifdef GetWindowTextW
-#undef GetWindowTextW
-#endif
-
-#ifdef InsertMenuItemW
-#undef InsertMenuItemW
-#endif
-
-#ifndef DrawTextW
-#undef DrawTextW
-#endif
-
-//------------------------------------------------------------------------
-// defines
-//------------------------------------------------------------------------
-
-#define USER9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate user32 functions
-//------------------------------------------------------------------------
-
-USER9X_API LRESULT ( WINAPI * lpfnSendMessageW) (
-    HWND hWnd,      // handle to the destination window
-    UINT Msg,       // message
-    WPARAM wParam,  // first message parameter
-    LPARAM lParam   // second message parameter
-);
-
-USER9X_API HWND ( WINAPI * lpfnCreateWindowExW ) (
-    DWORD dwExStyle,      // extended window style
-    LPCWSTR lpClassName,  // registered class name
-    LPCWSTR lpWindowName, // window name
-    DWORD dwStyle,        // window style
-    int x,                // horizontal position of window
-    int y,                // vertical position of window
-    int nWidth,           // window width
-    int nHeight,          // window height
-    HWND hWndParent,      // handle to parent or owner window
-    HMENU hMenu,          // menu handle or child identifier
-    HINSTANCE hInstance,  // handle to application instance
-    LPVOID lpParam        // window-creation data
-);
-
-USER9X_API ATOM ( WINAPI * lpfnRegisterClassExW ) (
-    CONST WNDCLASSEXW* lpwcx // class data
-);
-
-USER9X_API BOOL ( WINAPI * lpfnUnregisterClassW ) (
-    LPCWSTR lpClassName, // class name
-    HINSTANCE hInstance  // handle to application instance
-);
-
-USER9X_API UINT (WINAPI * lpfnRegisterClipboardFormatW) (
-    LPCWSTR lpszFormat // name of new format
-);
-
-USER9X_API int ( WINAPI * lpfnGetClipboardFormatNameW ) (
-    UINT   format,          // clipboard format to retrieve
-    LPWSTR lpszFormatName,  // format name
-    int    cchMaxCount      // length of format name buffer
-);
-
-USER9X_API BOOL ( WINAPI * lpfnSetWindowTextW ) (
-    HWND hWnd,
-    LPCWSTR lpString
-);
-
-USER9X_API int ( WINAPI * lpfnGetWindowTextW ) (
-    HWND hWnd,          // handle to the window or control
-    LPWSTR lpString,    // text buffer
-    int    nMaxCount        // length of text buffer
-);
-
-USER9X_API BOOL ( WINAPI * lpfnInsertMenuItemW ) (
-    HMENU hMenu,            // handle to menu
-    UINT uItem,             // identifier or position
-    BOOL fByPosition,       // meaning of uItem
-    LPCMENUITEMINFOW lpmii  // menu item information
-);
-
-USER9X_API int ( WINAPI * lpfnDrawTextW ) (
-  HDC hDC,          // handle to DC
-  LPCWSTR lpString, // text to draw
-  int nCount,       // text length
-  LPRECT lpRect,    // formatting dimensions
-  UINT uFormat      // text-drawing options
-);
-
-USER9X_API BOOL ( WINAPI * lpfnDrawStateW ) (
-  HDC hdc,                     // handle to device context
-  HBRUSH hbr,                  // handle to brush
-  DRAWSTATEPROC lpOutputFunc,  // callback function
-  LPARAM lData,                // image information
-  WPARAM wData,                // more image information
-  int x,                       // horizontal location
-  int y,                       // vertical location
-  int cx,                      // image width
-  int cy,                      // image height
-  UINT fuFlags                 // image type and state
-);
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define SendMessageW                lpfnSendMessageW
-#define CreateWindowExW             lpfnCreateWindowExW
-#define RegisterClassExW            lpfnRegisterClassExW
-#define UnregisterClassW            lpfnUnregisterClassW
-#define RegisterClipboardFormatW    lpfnRegisterClipboardFormatW
-#define GetClipboardFormatNameW     lpfnGetClipboardFormatNameW
-#define SetWindowTextW              lpfnSetWindowTextW
-#define GetWindowTextW              lpfnGetWindowTextW
-#define InsertMenuItemW             lpfnInsertMenuItemW
-#define DrawTextW                   lpfnDrawTextW
-#define DrawStateW                  lpfnDrawStateW
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/sal/inc/systools/win32/uwinapi.h b/sal/inc/systools/win32/uwinapi.h
index 8c55ae6cf275..b01554e8f47c 100644
--- a/sal/inc/systools/win32/uwinapi.h
+++ b/sal/inc/systools/win32/uwinapi.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #pragma once
-
+#include <sal/macros.h>
 #ifdef _UWINAPI_
 #   define _KERNEL32_
 #   define _USER32_
@@ -102,10 +103,6 @@ EXTERN_C WINBASEAPI DWORD WINAPI GetUserDomainW( LPWSTR lpBuffer, DWORD nBuffser
 
 EXTERN_C WINBASEAPI DWORD WINAPI GetProcessId( HANDLE hProcess );
 
-/* macro that calculates the count of elements of a static array */
-
-#define elementsof(buf) (sizeof(buf) / sizeof((buf)[0]))
-
 #ifdef __cplusplus
 
 inline bool IsValidHandle(HANDLE handle)
@@ -119,3 +116,4 @@ inline bool IsValidHandle(HANDLE handle)
 
 #endif  /* __cplusplus */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 10679cb45ccb..5db51aa570b8 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,8 +51,8 @@ namespace {
 typedef std::vector<rtl::OString, rtl::Allocator<rtl::OString> > OStringVec;
 
 struct StaticDebugBaseAddressFilter
-    : rtl::StaticWithInit<OStringVec const, StaticDebugBaseAddressFilter> {
-    OStringVec const operator()() const {
+    : rtl::StaticWithInit<OStringVec, StaticDebugBaseAddressFilter> {
+    OStringVec operator()() const {
         OStringVec vec;
         rtl_uString * pStr = 0;
         rtl::OUString const name(
@@ -159,3 +160,4 @@ void SAL_CALL osl_detail_ObjectRegistry_revokeObject(
 
 } // extern "C"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/filepath.c b/sal/osl/all/filepath.c
index e9461a538840..2139a1803fa2 100644
--- a/sal/osl/all/filepath.c
+++ b/sal/osl/all/filepath.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -121,3 +122,4 @@ oslFileError SAL_CALL osl_abbreviateSystemPath( rtl_uString *ustrSystemPath, rtl
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx
index 39bea770e8a1..52637a3573cd 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,7 +57,7 @@ oslModule SAL_CALL osl_loadModuleRelative(
     ::rtl::OUString abs;
     try {
         abs = ::rtl::Uri::convertRelToAbs(base, relativePath);
-    } catch (::rtl::MalformedUriException & e) {
+    } catch (const ::rtl::MalformedUriException & e) {
         (void) e; // avoid warnings
         OSL_TRACE(
             "rtl::MalformedUriException <%s>",
@@ -69,3 +70,5 @@ oslModule SAL_CALL osl_loadModuleRelative(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/makefile.mk b/sal/osl/all/makefile.mk
index 5da61e8b2ec3..fa928412ffc3 100644
--- a/sal/osl/all/makefile.mk
+++ b/sal/osl/all/makefile.mk
@@ -38,10 +38,6 @@ PROJECTPCHSOURCE=cont_pch
 
 MULTITHREAD_OBJ=TRUE
 
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
@@ -58,9 +54,6 @@ SLOFILES=	\
             $(SLO)$/loadmodulerelative.obj \
             $(SLO)/printtrace.obj
 
-#			$(SLO)$/readline.obj\
-
-#.IF "$(UPDATER)"=="YES"
 OBJFILES=	\
             $(OBJ)$/utility.obj\
             $(OBJ)$/filepath.obj\
@@ -68,11 +61,6 @@ OBJFILES=	\
             $(OBJ)$/loadmodulerelative.obj \
             $(OBJ)/printtrace.obj
 
-#			$(OBJ)$/readline.obj\
-#.ENDIF
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-
diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx
index 21c392ba1793..fbb91d7ea318 100755..100644
--- a/sal/osl/all/utility.cxx
+++ b/sal/osl/all/utility.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -101,3 +102,5 @@ void debug_oustring(rtl::OUString& ustr)
 
     return;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/conditn.c b/sal/osl/os2/conditn.c
deleted file mode 100644
index 9ad2459fd851..000000000000
--- a/sal/osl/os2/conditn.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "system.h"
-
-#include <osl/conditn.h>
-#include <osl/diagnose.h>
-#include <osl/time.h>
-
-
-
-/*
-    under WIN32, we use the void* oslCondition
-    as a WIN32 HANDLE (which is also a 32-bit value)
-*/
-
-/*****************************************************************************/
-/* osl_createCondition */
-/*****************************************************************************/
-oslCondition SAL_CALL osl_createCondition()
-{
-    HEV hevCondition;
-    APIRET rc;
-
-    rc = DosCreateEventSem( NULL,       /* unnamed semaphore */
-                            &hevCondition,  /* pointer to variable */
-                                                   /* for the sem-handle */
-                            DC_SEM_SHARED,  /* shared semaphore */
-                            FALSE );         /* initial state is posted */
-
-    if( rc == NO_ERROR )
-        return (oslCondition)hevCondition;
-    else
-        return NULL;
-}
-
-/*****************************************************************************/
-/* osl_destroyCondition */
-/*****************************************************************************/
-void SAL_CALL osl_destroyCondition(oslCondition Condition)
-{
-    if( Condition )
-        DosCloseEventSem( (HEV) Condition );
-}
-
-/*****************************************************************************/
-/* osl_setCondition */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_setCondition(oslCondition Condition)
-{
-    OSL_ASSERT(Condition);
-
-    return DosPostEventSem((HEV)Condition) == NO_ERROR;
-}
-
-/*****************************************************************************/
-/* osl_resetCondition */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition)
-{
-    ULONG ulPostCount;
-
-    OSL_ASSERT(Condition);
-
-    return DosResetEventSem((HEV)Condition, &ulPostCount) == NO_ERROR;
-}
-
-/*****************************************************************************/
-/* osl_waitCondition */
-/*****************************************************************************/
-oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const TimeValue * pTimeout )
-{
-    long nTimeout;
-    APIRET rc;
-    OSL_ASSERT(Condition);
-
-    if( pTimeout )
-        nTimeout = pTimeout->Seconds * 1000 + pTimeout->Nanosec / 1000000;
-    else
-        nTimeout = SEM_INDEFINITE_WAIT;
-
-    rc = DosWaitEventSem((HEV)Condition, nTimeout );
-    if( rc == ERROR_TIMEOUT )
-        return osl_cond_result_timeout;
-    if( rc != NO_ERROR )
-        return osl_cond_result_error;
-
-    return osl_cond_result_ok;
-}
-
-/*****************************************************************************/
-/* osl_checkCondition */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition)
-{
-    OSL_ASSERT(Condition);
-
-    return( DosWaitEventSem((HEV)Condition, SEM_IMMEDIATE_RETURN) == NO_ERROR);
-}
-
diff --git a/sal/osl/os2/debug.c b/sal/osl/os2/debug.c
deleted file mode 100644
index f2d0f915f375..000000000000
--- a/sal/osl/os2/debug.c
+++ /dev/null
@@ -1,2152 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
- *@@sourcefile debug.c:
- *      this file contains debugging functions for the
- *      exception handlers in except.c.
- *
- *      This code is capable of unwinding the stack from
- *      a given address and trying to get function names
- *      and source line numbers, either from the respective
- *      module's debug code (if present) or from a SYM file,
- *      which is searched for in the directory of the module
- *      or in ?:\OS2\PDPSI\PMDF\WARP4.
- *
- *      This file incorporates code from the following:
- *      -- Marc Fiammante, John Currier, Kim Rasmussen,
- *         Anthony Cruise (EXCEPT3.ZIP package for a generic
- *         exception handling DLL, available at Hobbes).
- *
- *      Usage: All OS/2 programs.
- *
- *      Note: Version numbering in this file relates to XWorkplace version
- *            numbering.
- *
- *@@changed V0.9.0 [umoeller]: made some declarations C++-compatible
- *@@changed V0.9.1 (2000-01-30) [umoeller]: greatly cleaned up this file
- *
- *@@header "helpers\debug.h"
- */
-
-/*
- *      This file Copyright (C) 1992-99 Ulrich M�ller,
- *                                      Kim Rasmussen,
- *                                      Marc Fiammante,
- *                                      John Currier,
- *                                      Anthony Cruise.
- *      This file is part of the "XWorkplace helpers" source package.
- *
- *      2009-06-15 published under LGPL3 with Ulrich M�ller permission.
- *
- */
-
-//#define DEBUG_SYMDUMP // enable to dump sym file to log
-
-//YD commented, since we need unsigned char BYTE!
-//#define OS2EMX_PLAIN_CHAR
-//Also gcc char is signed, while most structures requires unsigned data!
-//Raised limits for all fields!
-
-    // this is needed for "os2emx.h"; if this is defined,
-    // emx will define PSZ as _signed_ char, otherwise
-    // as unsigned char
-
-#define INCL_DOSPROCESS
-#define INCL_DOSMODULEMGR
-#define INCL_DOSMISC
-#define INCL_DOSERRORS
-#include <os2.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#define DONT_REPLACE_MALLOC
-#include "helpers\setup.h"                      // code generation and debugging options
-
-#include "helpers\debug.h"
-#include "helpers\dosh.h"
-
-#pragma hdrstop
-
-#include <fcntl.h>
-#ifdef __EMX__
-    #include <sys\types.h>      // required for sys\stat.h; UM 99-10-22
-#endif
-#include <sys\stat.h>
-#include <share.h>
-#include <io.h>
-
-#ifndef DWORD
-#define DWORD unsigned long
-#endif
-#ifndef WORD
-#define WORD  unsigned short
-#endif
-
-#pragma stack16(512)
-#define HF_STDERR 2
-
-/*
- *@@category: Helpers\Control program helpers\Exceptions/debugging
- *      See except.c and debug.c.
- */
-
-/* ******************************************************************
- *
- *   Global variables
- *
- ********************************************************************/
-
-// this specifies whether we're dealing with 32-bit code;
-// this gets changed whenever 16-bit count is detected
-static BOOL     f32bit = TRUE;
-
-/*
- * Global variables for Read32PmDebug:
- *
- */
-
-ULONG           func_ofs;
-ULONG           pubfunc_ofs;
-//YD 17/07/06 c++ namespace can generate really long
-//YD names, use a large buffer!
-char            func_name[16*1024];
-ULONG           var_ofs = 0;
-
-struct {
-    BYTE            name[128];
-    ULONG           stack_offset;
-    USHORT          type_idx;
-} autovar_def[1024];
-
-#pragma pack(1)
-
-BYTE           *type_name[] =
-{
-    "8 bit signed                     ",
-    "16 bit signed                    ",
-    "32 bit signed                    ",
-    "Unknown (0x83)                   ",
-    "8 bit unsigned                   ",
-    "16 bit unsigned                  ",
-    "32 bit unsigned                  ",
-    "Unknown (0x87)                   ",
-    "32 bit real                      ",
-    "64 bit real                      ",
-    "80 bit real                      ",
-    "Unknown (0x8B)                   ",
-    "64 bit complex                   ",
-    "128 bit complex                  ",
-    "160 bit complex                  ",
-    "Unknown (0x8F)                   ",
-    "8 bit boolean                    ",
-    "16 bit boolean                   ",
-    "32 bit boolean                   ",
-    "Unknown (0x93)                   ",
-    "8 bit character                  ",
-    "16 bit characters                ",
-    "32 bit characters                ",
-    "void                             ",
-    "15 bit unsigned                  ",
-    "24 bit unsigned                  ",
-    "31 bit unsigned                  ",
-    "Unknown (0x9B)                   ",
-    "Unknown (0x9C)                   ",
-    "Unknown (0x9D)                   ",
-    "Unknown (0x9E)                   ",
-    "Unknown (0x9F)                   ",
-    "near pointer to 8 bit signed     ",
-    "near pointer to 16 bit signed    ",
-    "near pointer to 32 bit signed    ",
-    "Unknown (0xA3)                   ",
-    "near pointer to 8 bit unsigned   ",
-    "near pointer to 16 bit unsigned  ",
-    "near pointer to 32 bit unsigned  ",
-    "Unknown (0xA7)                   ",
-    "near pointer to 32 bit real      ",
-    "near pointer to 64 bit real      ",
-    "near pointer to 80 bit real      ",
-    "Unknown (0xAB)                   ",
-    "near pointer to 64 bit complex   ",
-    "near pointer to 128 bit complex  ",
-    "near pointer to 160 bit complex  ",
-    "Unknown (0xAF)                   ",
-    "near pointer to 8 bit boolean    ",
-    "near pointer to 16 bit boolean   ",
-    "near pointer to 32 bit boolean   ",
-    "Unknown (0xB3)                   ",
-    "near pointer to 8 bit character  ",
-    "near pointer to 16 bit characters",
-    "near pointer to 32 bit characters",
-    "near pointer to void             ",
-    "near pointer to 15 bit unsigned  ",
-    "near pointer to 24 bit unsigned  ",
-    "near pointer to 31 bit unsigned  ",
-    "Unknown (0xBB)                   ",
-    "Unknown (0xBC)                   ",
-    "Unknown (0xBD)                   ",
-    "Unknown (0xBE)                   ",
-    "Unknown (0xBF)                   ",
-    "far pointer to 8 bit signed      ",
-    "far pointer to 16 bit signed     ",
-    "far pointer to 32 bit signed     ",
-    "Unknown (0xC3)                   ",
-    "far pointer to 8 bit unsigned    ",
-    "far pointer to 16 bit unsigned   ",
-    "far pointer to 32 bit unsigned   ",
-    "Unknown (0xC7)                   ",
-    "far pointer to 32 bit real       ",
-    "far pointer to 64 bit real       ",
-    "far pointer to 80 bit real       ",
-    "Unknown (0xCB)                   ",
-    "far pointer to 64 bit complex    ",
-    "far pointer to 128 bit complex   ",
-    "far pointer to 160 bit complex   ",
-    "Unknown (0xCF)                   ",
-    "far pointer to 8 bit boolean     ",
-    "far pointer to 16 bit boolean    ",
-    "far pointer to 32 bit boolean    ",
-    "Unknown (0xD3)                   ",
-    "far pointer to 8 bit character   ",
-    "far pointer to 16 bit characters ",
-    "far pointer to 32 bit characters ",
-    "far pointer to void              ",
-    "far pointer to 15 bit unsigned   ",
-    "far pointer to 24 bit unsigned   ",
-    "far pointer to 31 bit unsigned   ",
-};
-
-// Thanks to John Currier:
-// Do not call 16 bit code in myHandler function to prevent call
-// to __EDCThunkProlog and problems is guard page exception handling
-// Also reduce the stack size to 1K for true 16 bit calls.
-// 16 bit calls thunk will now only occur on fatal exceptions
-#pragma stack16(1024)
-
-// ------------------------------------------------------------------
-// Last 8 bytes of 16:16 file when CODEVIEW debugging info is present
-#pragma pack(1)
-struct _eodbug
-{
-    unsigned short  dbug;       // 'NB' signature
-    unsigned short  ver;        // version
-    unsigned long   dfaBase;    // size of codeview info
-} G_eodbug;
-
-#define         DBUGSIG         0x424E
-#define         SSTMODULES      0x0101
-#define         SSTPUBLICS      0x0102
-#define         SSTTYPES        0x0103
-#define         SSTSYMBOLS      0x0104
-#define         SSTSRCLINES     0x0105
-#define         SSTLIBRARIES    0x0106
-#define         SSTSRCLINES2    0x0109
-#define         SSTSRCLINES32   0x010B
-
-typedef struct _SYMBASE
-{
-    unsigned short  dbug;       // 'NB' signature
-    unsigned short  ver;        // version
-    unsigned long   lfoDir;     // file offset to dir entries
-} SYMBASE;
-
-typedef struct _SSDIR
-{
-    unsigned short  sst;        // SubSection Type
-    unsigned short  modindex;   // Module index number
-    unsigned long   lfoStart;   // Start of section
-    unsigned short  cb;         // Size of section
-} SSDIR;
-
-typedef struct _SSDIR32
-{
-    unsigned short  sst;        // SubSection Type
-    unsigned short  modindex;   // Module index number
-    unsigned long   lfoStart;   // Start of section
-    unsigned long   cb;         // Size of section
-} SSDIR32;
-
-typedef struct _SSMODULE
-{
-    unsigned short  csBase;     // code segment base
-    unsigned short  csOff;      // code segment offset
-    unsigned short  csLen;      // code segment length
-    unsigned short  ovrNum;     // overlay number
-    unsigned short  indxSS;     // Index into sstLib or 0
-    unsigned short  reserved;
-    BYTE            csize;      // size of prefix string
-} SSMODULE;
-
-typedef struct _SSMOD32
-{
-    unsigned short  csBase;     // code segment base
-    unsigned long   csOff;      // code segment offset
-    unsigned long   csLen;      // code segment length
-    unsigned long   ovrNum;     // overlay number
-    unsigned short  indxSS;     // Index into sstLib or 0
-    unsigned long   reserved;
-    BYTE            csize;      // size of prefix string
-} SSMOD32;
-
-typedef struct _SSPUBLIC
-{
-    unsigned short  offset;
-    unsigned short  segment;
-    unsigned short  type;
-    BYTE            csize;
-} SSPUBLIC;
-
-typedef struct _SSPUBLIC32
-{
-    unsigned long   offset;
-    unsigned short  segment;
-    unsigned short  type;
-    BYTE            csize;
-} SSPUBLIC32;
-
-typedef struct _SSLINEENTRY32
-{
-    unsigned short  LineNum;
-    unsigned short  FileNum;
-    unsigned long   Offset;
-} SSLINEENTRY32;
-
-typedef struct _FIRSTLINEENTRY32
-{
-    unsigned short  LineNum;
-    unsigned char   entry_type;
-    unsigned char   reserved;
-    unsigned short  numlines;
-    unsigned short  segnum;
-} FIRSTLINEENTRY32;
-
-typedef struct _SSFILENUM32
-{
-    unsigned long   first_displayable;  // Not used
-    unsigned long   number_displayable;     // Not used
-    unsigned long   file_count; // number of source files
-} SSFILENUM32;
-
-/*
- *@@ XDEBUGINFO:
- *      buffers for Read... funcs.
- *
- *@@added V0.9.4 (2000-06-15) [umoeller]
- */
-
-typedef struct _XDEBUGINFO
-{
-    char            szNrFile[300];      // receives source file
-    char            szNrLine[300];      // receives line number
-    //YD 17/07/06 c++ namespace can generate really long
-    //YD names, use a large buffer!
-    char            szNrPub[16*1024];   // receives function name
-
-    struct new_seg  *pseg;
-    struct o32_obj  *pobj;              // flat .EXE object table entry
-
-    SYMBASE         base;
-
-    SSDIR           *pDirTab;
-    SSDIR32         *pDirTab32;
-    unsigned char   *pEntTab;
-    unsigned long   lfaBase;
-    SSMOD32         ssmod32;
-    SSPUBLIC32      sspub32;
-
-    SSMODULE        ssmod;
-    SSPUBLIC        sspub;
-} XDEBUGINFO, *PXDEBUGINFO;
-
-
-USHORT _THUNK_FUNCTION (Dos16SizeSeg) ();
-//APIRET16 APIENTRY16 DOS16SIZESEG(USHORT Seg, PULONG16 Size);
-USHORT DosSizeSeg (USHORT Seg, PULONG16 Size)
-{
-  return ((USHORT)
-          (_THUNK_PROLOG (2+4);
-           _THUNK_SHORT (Seg);
-           _THUNK_FLAT (Size);
-           _THUNK_CALL (Dos16SizeSeg)));
-}
-
-#pragma pack()
-
-/* ******************************************************************
- *
- *   PART 1: ANALYZE DEBUG CODE
- *
- ********************************************************************/
-
-static int Read16CodeView(FILE *LogFile, PXDEBUGINFO pxdi, int fh, int TrapSeg, int TrapOff, CHAR *FileName);
-static int Read32PmDebug(FILE *LogFile, PXDEBUGINFO pxdi, int fh, int TrapSeg, int TrapOff, CHAR *FileName);
-
-/*
- *@@ WriteAddressInfo:
- *      formats and writes a line into the trap log
- *      file.
- *
- *      This gets called for each line from the
- *      stack dump. At this point, the line in the
- *      trap log already has:
- *
- +          CS:EIP  : 000109FF  XMLVIEW :0
- +                                          ^^^ and we write here
- *      After this call, we have.
- *
- +          CS:EIP  : 000109FF  XMLVIEW :0  xxx.c  123 ConfirmCreate__Fv
- +                                          ^^^ and we write here
- *
- *@@added V0.9.12 (2001-05-12) [umoeller]
- */
-
-static VOID WriteDebugInfo(FILE *LogFile,              // in: open log file
-                           PXDEBUGINFO pxdi)           // in: debug info
-{
-    fprintf(LogFile,
-            "%s%s%s",
-            pxdi->szNrFile,
-            pxdi->szNrLine,
-            pxdi->szNrPub);
-}
-
-/*
- *@@ dbgPrintDebugInfo:
- *      this is the main entry point into analyzing debug
- *      code.
- *
- *      This analyzes a given address and tries to find
- *      debug code descriptions for this address. If found,
- *      the information is written to the given log file.
- *
- *      Gets called from dbgPrintStack.
- *
- *      This returns NO_ERROR if the could was successfully
- *      analyzed or something != 0 if we failed.
- *
- *      New with V0.84.
- */
-
-APIRET dbgPrintDebugInfo(FILE *LogFile,         // out: log file to write to
-                         CHAR *FileName,        // in: EXE/DLL module file name
-                         ULONG Object,          // in: trapping object (from DosQueryModFromEIP)
-                         ULONG TrapOffset)      // in: trapping address (from DosQueryModFromEIP)
-{
-    APIRET                  rc = 0;
-    int                     ModuleFile = 0;
-    static struct exe_hdr   OldExeHeader;
-    static struct new_exe   NewExeHeader;
-
-    ULONG                   ulSegment = Object + 1;     // segment no. is object no. + 1
-
-    XDEBUGINFO              xdi;
-    memset(&xdi, 0, sizeof(xdi));
-
-    // open the module file for reading to analyze the code
-    ModuleFile = sopen(FileName, O_RDONLY | O_BINARY, SH_DENYNO);
-
-    if (ModuleFile != -1)
-    {
-        // file found:
-        // read old Exe header
-        if (read(ModuleFile, (void*)&OldExeHeader, 64) == -1L)
-        {
-            fprintf(LogFile, "errno %d reading old exe header\n", errno);
-            close(ModuleFile);
-            return 2;
-        }
-        // seek to new Exe header
-        if (lseek(ModuleFile, (long)E_LFANEW(OldExeHeader), SEEK_SET) == -1L)
-        {
-            fprintf(LogFile, "errno %d seeking to new exe header\n", errno);
-            close(ModuleFile);
-            return 3;
-        }
-        if (read(ModuleFile, (void *)&NewExeHeader, 64) == -1L)
-        {
-            fprintf(LogFile, "errno %d reading new exe header\n", errno);
-            close(ModuleFile);
-            return 4;
-        }
-
-        // check EXE signature
-        if (NE_MAGIC(NewExeHeader) == E32MAGIC)
-        {
-            /*
-             * flat 32 executable:
-             *
-             */
-
-            // do analysis for 32-bit code
-            if (!(rc = Read32PmDebug(LogFile,
-                                     &xdi,                // output
-                                     ModuleFile,
-                                     ulSegment,
-                                     TrapOffset,
-                                     FileName)))
-                WriteDebugInfo(LogFile, &xdi);
-
-            close(ModuleFile);
-
-            // rc !=0 try with DBG file
-            if (rc != 0)
-            {
-                strcpy(FileName + strlen(FileName) - 3, "DBG");     // Build DBG File name
-                ModuleFile = sopen(FileName, O_RDONLY | O_BINARY, SH_DENYNO);
-                if (ModuleFile != -1)
-                {
-                    if (!(rc = Read32PmDebug(LogFile,
-                                             &xdi,
-                                             ModuleFile,
-                                             ulSegment,
-                                             TrapOffset,
-                                             FileName)))
-                        WriteDebugInfo(LogFile, &xdi);
-
-                    close(ModuleFile);
-                }
-            }
-
-            return rc;
-        }
-        else
-        {
-            if (NE_MAGIC(NewExeHeader) == NEMAGIC)
-            {
-                /*
-                 * 16:16 executable:
-                 *
-                 */
-
-                if ((xdi.pseg = (struct new_seg *)calloc(NE_CSEG(NewExeHeader),
-                                                         sizeof(struct new_seg)))
-                            == NULL)
-                {
-                    fprintf(LogFile, "Out of memory!");
-                    close(ModuleFile);
-                    return -1;
-                }
-                if (  lseek(ModuleFile,
-                            E_LFANEW(OldExeHeader) + NE_SEGTAB(NewExeHeader),
-                            SEEK_SET) == -1L)
-                {
-                    fprintf(LogFile, "Error %u seeking segment table in %s\n", errno, FileName);
-                    free(xdi.pseg);
-                    close(ModuleFile);
-                    return 9;
-                }
-
-                if (read(ModuleFile,
-                         (void *)xdi.pseg,
-                         NE_CSEG(NewExeHeader) * sizeof(struct new_seg))
-                      == -1)
-                {
-                    fprintf(LogFile, "Error %u reading segment table from %s\n", errno, FileName);
-                    free(xdi.pseg);
-                    close(ModuleFile);
-                    return 10;
-                }
-
-                if (!(rc = Read16CodeView(LogFile,
-                                          &xdi,
-                                          ModuleFile,
-                                          ulSegment,
-                                          TrapOffset,
-                                          FileName)))
-                    WriteDebugInfo(LogFile, &xdi);
-
-                free(xdi.pseg);
-                close(ModuleFile);
-
-                // rc !=0 try with DBG file
-                if (rc != 0)
-                {
-                    strcpy(FileName + strlen(FileName) - 3, "DBG");     // Build DBG File name
-                    ModuleFile = sopen(FileName,
-                                       O_RDONLY | O_BINARY, SH_DENYNO);
-                    if (ModuleFile != -1)
-                    {
-                        if (!(rc = Read16CodeView(LogFile,
-                                                  &xdi,
-                                                  ModuleFile,
-                                                  ulSegment,
-                                                  TrapOffset,
-                                                  FileName)))
-                            WriteDebugInfo(LogFile, &xdi);
-
-                        close(ModuleFile);
-                    }
-                }
-                return rc;
-            }
-            else
-            {
-                /*
-                 * Unknown executable:
-                 *
-                 */
-
-                fprintf(LogFile, "Error, could not find exe signature");
-                close(ModuleFile);
-                return 11;
-            }
-        }
-    } // end if (ModuleFile != -1)
-    else
-    {
-        fprintf(LogFile, "Error %d opening module file %s", errno, FileName);
-        return 1;
-    }                           // endif
-
-    // return 0;        we never get here
-}
-
-char            fname[256],
-                ModName[80];
-char            ename[256],
-                dummy[256];
-
-#define MAX_USERDEFS 300        // raised from 150 V0.9.1 (2000-01-30) [umoeller]
-#define MAX_POINTERS 300        // raised from 150 V0.9.1 (2000-01-30) [umoeller]
-
-USHORT          userdef_count;
-USHORT          pointer_count;
-
-struct one_userdef_rec
-{
-    USHORT          idx;
-    USHORT          type_index;
-    BYTE            name[33];
-} one_userdef[MAX_USERDEFS];
-
-struct one_pointer_rec
-{
-    USHORT          idx;
-    USHORT          type_index;
-    BYTE            type_qual;
-    BYTE            name[33];
-} one_pointer[MAX_POINTERS];
-
-/*
- * Read32PmDebug:
- *      parses 32-bit debug code.
- *      Called from dbgPrintDebugInfo for 32-bit modules.
- */
-
-static int Read32PmDebug(FILE *LogFile,        // in: text log file to write to
-                         PXDEBUGINFO pxdi,
-                         int ModuleFile,       // in: module file opened with sopen()
-                         int TrapSeg,
-                         int TrapOff,
-                         CHAR *FileName)
-{
-    static unsigned int CurrSymSeg, NrSymbol,
-                        /* offset, */ NrPublic,
-                        NrFile, NrLine, /* NrEntry */
-                        numdir, namelen,
-                        numlines /* , line */;
-    static int      ModIndex;
-    static int      bytesread, i, j;
-    static SSLINEENTRY32 LineEntry;
-    static SSFILENUM32 FileInfo;
-    static FIRSTLINEENTRY32 FirstLine;
-    static BYTE     dump_vars = FALSE;
-    static USHORT   idx;
-    static BOOL     read_types;
-    static LONG     lSize;
-
-    ModIndex = 0;
-    // See if any CODEVIEW info
-    if (lseek(ModuleFile, -8L, SEEK_END) == -1)
-    {
-        fprintf(LogFile, "Error %u seeking CodeView table in %s\n", errno, FileName);
-        return (18);
-    }
-
-    if (read(ModuleFile,
-             (void *)&G_eodbug, 8)
-            == -1)
-    {
-        fprintf(LogFile, "Error %u reading debug info from %s\n", errno, FileName);
-        return (19);
-    }
-    if (G_eodbug.dbug != DBUGSIG)
-    {
-        // fprintf(LogFile,"\nNo CodeView information stored.\n");
-        return (100);
-    }
-
-    if (    (pxdi->lfaBase = lseek(ModuleFile,
-                                   -(LONG)G_eodbug.dfaBase,
-                                   SEEK_END))
-         == -1L)
-    {
-        fprintf(LogFile, "Error %u seeking base codeview data in %s\n", errno, FileName);
-        return (20);
-    }
-
-    if (read(ModuleFile,
-             (void *)&pxdi->base, 8)
-        == -1)
-    {
-        fprintf(LogFile, "Error %u reading base codeview data in %s\n", errno, FileName);
-        return (21);
-    }
-
-    if (lseek(ModuleFile,
-              pxdi->base.lfoDir - 8 + 4,
-              SEEK_CUR)
-        == -1)
-    {
-        fprintf(LogFile, "Error %u seeking dir codeview data in %s\n", errno, FileName);
-        return (22);
-    }
-
-    if (read(ModuleFile,
-             (void *)&numdir, 4)
-        == -1)
-    {
-        fprintf(LogFile, "Error %u reading dir codeview data in %s\n", errno, FileName);
-        return (23);
-    }
-
-    // Read dir table into buffer
-    if (    (pxdi->pDirTab32 = (SSDIR32*)calloc(numdir,
-                                             sizeof(SSDIR32)))
-        == NULL)
-    {
-        fprintf(LogFile, "Out of memory!");
-        return (-1);
-    }
-
-    if (read(ModuleFile,
-             (void*)pxdi->pDirTab32,
-             numdir * sizeof(SSDIR32))
-        == -1)
-    {
-        fprintf(LogFile, "Error %u reading codeview dir table from %s\n", errno, FileName);
-        free(pxdi->pDirTab32);
-        return (24);
-    }
-
-    i = 0;
-    while (i < numdir)
-    {
-        if (pxdi->pDirTab32[i].sst != SSTMODULES)
-        {
-            i++;
-            continue;
-        }
-
-        NrPublic = 0x0;
-        NrSymbol = 0;
-        NrLine = 0x0;
-        NrFile = 0x0;
-        CurrSymSeg = 0;
-        // point to subsection
-        lseek(ModuleFile,
-              pxdi->pDirTab32[i].lfoStart + pxdi->lfaBase,
-              SEEK_SET);
-        read(ModuleFile,
-             (void*)&pxdi->ssmod32.csBase,
-             sizeof(SSMOD32));
-        read(ModuleFile,
-             (void*)ModName,
-             (unsigned)pxdi->ssmod32.csize);
-        ModIndex = pxdi->pDirTab32[i].modindex;
-        ModName[pxdi->ssmod32.csize] = '\0';
-        i++;
-
-        read_types = FALSE;
-
-        while (     (pxdi->pDirTab32[i].modindex == ModIndex)
-                 && (i < numdir)
-              )
-        {
-            // point to subsection
-            lseek(ModuleFile,
-                  pxdi->pDirTab32[i].lfoStart + pxdi->lfaBase,
-                  SEEK_SET);
-
-            switch (pxdi->pDirTab32[i].sst)
-            {
-                case SSTPUBLICS:
-                    bytesread = 0;
-                    while (bytesread < pxdi->pDirTab32[i].cb)
-                    {
-                        bytesread += read(ModuleFile,
-                                          (void *)&pxdi->sspub32.offset,
-                                          sizeof(pxdi->sspub32));
-                        bytesread += read(ModuleFile,
-                                          (void*)ename,
-                                          (unsigned)pxdi->sspub32.csize);
-                        ename[pxdi->sspub32.csize] = '\0';
-                        if (    (pxdi->sspub32.segment == TrapSeg)
-                             && (pxdi->sspub32.offset <= TrapOff)
-                             && (pxdi->sspub32.offset >= NrPublic)
-                           )
-                        {
-                            NrPublic = pubfunc_ofs = pxdi->sspub32.offset;
-                            read_types = TRUE;
-                            sprintf(pxdi->szNrPub,
-                                    "%s %s (%s)\n",
-                                    (pxdi->sspub32.type == 1)
-                                            ? " Abs"
-                                            : " ",
-                                    ename,
-                                    ModName
-                                );
-                            // but continue, because there might be a
-                            // symbol that comes closer
-                        }
-                    }
-                    break;
-
-                // Read symbols, so we can dump the variables on the stack
-                case SSTSYMBOLS:
-                    if (TrapSeg != pxdi->ssmod32.csBase)
-                        break;
-
-                    bytesread = 0;
-                    while (bytesread < pxdi->pDirTab32[i].cb)
-                    {
-                        static USHORT   usLength;
-                        static USHORT   usLengthSym;
-                        static BYTE     b1,
-                                        b2;
-                        static BYTE     bType;
-                                       // *ptr;
-                        static ULONG    ofs;
-                        // static ULONG    last_addr = 0;
-                        //YD 17/07/06 c++ namespace can generate really long
-                        //YD names, use a large buffer!
-                        static BYTE     str[16*1024];
-                        static struct symseg_rec symseg;
-                        static struct symauto_rec symauto;
-                        static struct symproc_rec symproc;
-
-                        // Read the length of this subentry
-                        bytesread += read(ModuleFile, &b1, 1);
-                        if (b1 & 0x80)
-                        {
-                            bytesread += read(ModuleFile, &b2, 1);
-                            usLength = ((b1 & 0x7F) << 8) + b2;
-                        }
-                        else
-                            usLength = b1;
-
-                        ofs = tell(ModuleFile);
-
-                        bytesread += read(ModuleFile, &bType, 1);
-
-                        switch (bType)
-                        {
-                            case SYM_CHANGESEG:
-                                read(ModuleFile, &symseg, sizeof(symseg));
-                                CurrSymSeg = symseg.seg_no;
-                                break;
-
-                            case SYM_PROC:
-                            case SYM_CPPPROC:
-                                read(ModuleFile, &symproc, sizeof(symproc));
-                                if (symproc.name_len & 0x80)
-                                {
-                                    read(ModuleFile, &b2, 1);
-                                       usLengthSym  = ((symproc.name_len & 0x7F) << 8) + b2;
-                                }
-                                else
-                                {
-                                   usLengthSym  = symproc.name_len;
-                                }
-                                read(ModuleFile, str, usLengthSym);
-                                 str[usLengthSym] = 0;
-
-                                if ((CurrSymSeg == TrapSeg) &&
-                                    (symproc.offset <= TrapOff) &&
-                                    (symproc.offset >= NrSymbol))
-                                {
-
-                                    dump_vars = TRUE;
-                                    var_ofs = 0;
-                                    NrSymbol = symproc.offset;
-                                    func_ofs = symproc.offset;
-
-                                    strcpy(func_name, str);
-                                }
-                                else
-                                {
-                                    dump_vars = FALSE;
-                                }
-                                break;
-
-                            case SYM_AUTO:
-                                if (!dump_vars)
-                                    break;
-
-                                read(ModuleFile, &symauto, sizeof(symauto));
-                                read(ModuleFile, str, symauto.name_len);
-                                if (symauto.name_len==0x80)
-                                    printf("symauto.name_len==0x80\n");
-                                str[symauto.name_len] = 0;
-
-                                strcpy(autovar_def[var_ofs].name, str);
-                                autovar_def[var_ofs].stack_offset = symauto.stack_offset;
-                                autovar_def[var_ofs].type_idx = symauto.type_idx;
-                                var_ofs++;
-                                break;
-
-                        }
-
-                        bytesread += usLength;
-
-                        lseek(ModuleFile, ofs + usLength, SEEK_SET);
-                    }
-                    break;
-
-                case SSTTYPES:
-                    // if (ModIndex != TrapSeg)
-                    if (!read_types)
-                        break;
-
-                    bytesread = 0;
-                    idx = 0x200;
-                    userdef_count = 0;
-                    pointer_count = 0;
-                    while (bytesread < pxdi->pDirTab32[i].cb)
-                    {
-                        static struct type_rec type;
-                        static struct type_userdefrec udef;
-                        static struct type_pointerrec point;
-                        static ULONG    ofs;
-                        static BYTE     str[256];
-
-                        // Read the length of this subentry
-                        ofs = tell(ModuleFile);
-
-                        read(ModuleFile, &type, sizeof(type));
-                        bytesread += sizeof(type);
-
-                        switch (type.type)
-                        {
-                            case TYPE_USERDEF:
-                                if (userdef_count >= MAX_USERDEFS)
-                                    break;
-
-                                read(ModuleFile, &udef, sizeof(udef));
-                                read(ModuleFile, str, udef.name_len);
-                                str[udef.name_len] = 0;
-
-                                // Insert userdef in table
-                                one_userdef[userdef_count].idx = idx;
-                                one_userdef[userdef_count].type_index = udef.type_index;
-                                memcpy(one_userdef[userdef_count].name,
-                                       str,
-                                       _min(udef.name_len + 1, 32));
-                                one_userdef[userdef_count].name[32] = 0;
-                                userdef_count++;
-                                break;
-
-                            case TYPE_POINTER:
-                                if (pointer_count >= MAX_POINTERS)
-                                    break;
-
-                                read(ModuleFile, &point, sizeof(point));
-                                read(ModuleFile, str, point.name_len);
-                                str[point.name_len] = 0;
-
-                                // Insert userdef in table
-                                one_pointer[pointer_count].idx = idx;
-                                one_pointer[pointer_count].type_index = point.type_index;
-                                memcpy(one_pointer[pointer_count].name,
-                                       str,
-                                       _min(point.name_len + 1, 32));
-                                one_pointer[pointer_count].name[32] = 0;
-                                one_pointer[pointer_count].type_qual = type.type_qual;
-                                pointer_count++;
-                                break;
-                        }
-
-                        ++idx;
-
-                        bytesread += type.length;
-
-                        lseek(ModuleFile, ofs + type.length + 2, SEEK_SET);
-                    }
-                    break;
-
-                case SSTSRCLINES32:
-                    if (TrapSeg != pxdi->ssmod32.csBase)
-                        break;
-
-                    // read first line
-                    do
-                    {
-                        read(ModuleFile, (void *)&FirstLine, sizeof(FirstLine));
-
-                        if (FirstLine.LineNum != 0)
-                        {
-                            fprintf(LogFile, "Missing Line table information\n");
-                            break;
-                        }       // endif
-                        numlines = FirstLine.numlines;
-                        // Other type of data skip 4 more bytes
-                        if (FirstLine.entry_type < 4)
-                        {
-                            read(ModuleFile, (void *)&lSize, 4);
-                            if (FirstLine.entry_type == 3)
-                                lseek(ModuleFile, lSize, SEEK_CUR);
-                        }
-                    }
-                    while (FirstLine.entry_type == 3);
-
-                    for (j = 0; j < numlines; j++)
-                    {
-                        switch (FirstLine.entry_type)
-                        {
-                            case 0:
-                                read(ModuleFile, (void *)&LineEntry, sizeof(LineEntry));
-                                // Changed by Kim Rasmussen 26/06 1996 to ignore linenumber 0
-                                // if (LineEntry.Offset+ssmod32.csOff<=TrapOff && LineEntry.Offset+ssmod32.csOff>=NrLine) {
-                                if (    (LineEntry.LineNum)
-                                     && (LineEntry.Offset + pxdi->ssmod32.csOff
-                                            <= TrapOff)
-                                     && (LineEntry.Offset + pxdi->ssmod32.csOff >= NrLine)
-                                   )
-                                {
-                                    NrLine = LineEntry.Offset;
-                                    NrFile = LineEntry.FileNum;
-                                    /*pOffset =sprintf(szNrLine,"%04X:%08X  line #%hu ",
-                                     * ssmod32.csBase,LineEntry.Offset,
-                                     * LineEntry.LineNum); */
-                                    sprintf(pxdi->szNrLine, "% 6hu", LineEntry.LineNum);
-                                }
-                                break;
-
-                            case 1:
-                                lseek(ModuleFile, sizeof(struct linlist_rec), SEEK_CUR);
-                                break;
-
-                            case 2:
-                                lseek(ModuleFile, sizeof(struct linsourcelist_rec), SEEK_CUR);
-                                break;
-
-                            case 3:
-                                lseek(ModuleFile, sizeof(struct filenam_rec), SEEK_CUR);
-                                break;
-
-                            case 4:
-                                lseek(ModuleFile, sizeof(struct pathtab_rec), SEEK_CUR);
-                                break;
-
-                        }
-                    }
-
-                    if (NrFile != 0)
-                    {
-                        // file found:
-                        read(ModuleFile, (void*)&FileInfo, sizeof(FileInfo));
-                        namelen = 0;
-                        for (j = 1; j <= FileInfo.file_count; j++)
-                        {
-                            namelen = 0;
-                            read(ModuleFile, (void *)&namelen, 1);
-                            read(ModuleFile, (void *)ename, namelen);
-                            if (j == NrFile)
-                                break;
-                        }
-                        ename[namelen] = '\0';
-                        //  pOffset=sprintf(szNrLine+pOffset," (%s) (%s)\n",ename,ModName);
-                        sprintf(pxdi->szNrFile, "%11.11s ", ename);
-                    }
-                    else
-                    {
-                        // strcat(szNrLine,"\n"); avoid new line for empty name fill
-                        strcpy(pxdi->szNrFile, "file?       ");
-                    } // endif
-                    break;
-            } // end switch
-
-            i++;
-        } // end while modindex
-    } // End While i < numdir
-    free(pxdi->pDirTab32);
-    return (0);
-}
-
-/*
- * Read16CodeView:
- *      parses 16-bit debug code.
- *      Called from dbgPrintDebugInfo for 16-bit modules.
- */
-
-static int Read16CodeView(FILE *LogFile,       // in: text log file to write to
-                          PXDEBUGINFO pxdi,
-                          int fh,
-                          int TrapSeg,
-                          int TrapOff,
-                          CHAR *FileName)
-{
-    static unsigned short int offset,
-                    NrPublic, NrLine,
-                    numdir,
-                    namelen, numlines,
-                    line;
-    static int      ModIndex;
-    static int      bytesread, i, j;
-
-    ModIndex = 0;
-    // See if any CODEVIEW info
-    if (lseek(fh, -8L, SEEK_END) == -1)
-    {
-        fprintf(LogFile, "Error %u seeking CodeView table in %s\n", errno, FileName);
-        return (18);
-    }
-
-    if (read(fh, (void *)&G_eodbug, 8) == -1)
-    {
-        fprintf(LogFile, "Error %u reading debug info from %s\n", errno, FileName);
-        return (19);
-    }
-    if (G_eodbug.dbug != DBUGSIG)
-    {
-        // fprintf(LogFile,"\nNo CodeView information stored.\n");
-        return (100);
-    }
-
-    if ((pxdi->lfaBase = lseek(fh, -(LONG)G_eodbug.dfaBase, SEEK_END)) == -1L)
-    {
-        fprintf(LogFile, "Error %u seeking base codeview data in %s\n", errno, FileName);
-        return (20);
-    }
-
-    if (read(fh, (void *)&pxdi->base, 8) == -1)
-    {
-        fprintf(LogFile, "Error %u reading base codeview data in %s\n", errno, FileName);
-        return (21);
-    }
-
-    if (lseek(fh, pxdi->base.lfoDir - 8, SEEK_CUR) == -1)
-    {
-        fprintf(LogFile, "Error %u seeking dir codeview data in %s\n", errno, FileName);
-        return (22);
-    }
-
-    if (read(fh, (void *)&numdir, 2) == -1)
-    {
-        fprintf(LogFile, "Error %u reading dir codeview data in %s\n", errno, FileName);
-        return (23);
-    }
-
-    // Read dir table into buffer
-    if ((pxdi->pDirTab = (SSDIR*)calloc(numdir, sizeof(SSDIR))) == NULL)
-    {
-        fprintf(LogFile, "Out of memory!");
-        return (-1);
-    }
-
-    if (read(fh, (void*)pxdi->pDirTab, numdir * sizeof(SSDIR)) == -1)
-    {
-        fprintf(LogFile, "Error %u reading codeview dir table from %s\n", errno, FileName);
-        free(pxdi->pDirTab);
-        return (24);
-    }
-
-    i = 0;
-    while (i < numdir)
-    {
-        if (pxdi->pDirTab[i].sst != SSTMODULES)
-        {
-            i++;
-            continue;
-        }
-        NrPublic = 0x0;
-        NrLine = 0x0;
-        // point to subsection
-        lseek(fh, pxdi->pDirTab[i].lfoStart + pxdi->lfaBase, SEEK_SET);
-        read(fh, (void *)&pxdi->ssmod.csBase, sizeof(SSMODULE));
-        read(fh, (void *)ModName, (unsigned)pxdi->ssmod.csize);
-        ModIndex = pxdi->pDirTab[i].modindex;
-        ModName[pxdi->ssmod.csize] = '\0';
-        i++;
-        while (pxdi->pDirTab[i].modindex == ModIndex && i < numdir)
-        {
-            // point to subsection
-            lseek(fh, pxdi->pDirTab[i].lfoStart + pxdi->lfaBase, SEEK_SET);
-            switch (pxdi->pDirTab[i].sst)
-            {
-                case SSTPUBLICS:
-                    bytesread = 0;
-                    while (bytesread < pxdi->pDirTab[i].cb)
-                    {
-                        bytesread += read(fh, (void *)&pxdi->sspub.offset, sizeof(pxdi->sspub));
-                        bytesread += read(fh, (void *)ename, (unsigned)pxdi->sspub.csize);
-                        ename[pxdi->sspub.csize] = '\0';
-                        if ((pxdi->sspub.segment == TrapSeg) &&
-                            (pxdi->sspub.offset <= TrapOff) &&
-                            (pxdi->sspub.offset >= NrPublic))
-                        {
-                            NrPublic = pxdi->sspub.offset;
-                            sprintf(pxdi->szNrPub, "%s %s (%s) %04hX:%04hX\n",
-                                    (pxdi->sspub.type == 1) ? " Abs" : " ", ename,
-                                    ModName, // ()
-                                    pxdi->sspub.segment,
-                                    pxdi->sspub.offset
-                                );
-                        }
-                    }
-                    break;
-
-                case SSTSRCLINES2:
-                case SSTSRCLINES:
-                    if (TrapSeg != pxdi->ssmod.csBase)
-                        break;
-                    namelen = 0;
-                    read(fh, (void *)&namelen, 1);
-                    read(fh, (void *)ename, namelen);
-                    ename[namelen] = '\0';
-                    // skip 2 zero bytes
-                    if (pxdi->pDirTab[i].sst == SSTSRCLINES2)
-                        read(fh, (void *)&numlines, 2);
-                    read(fh, (void *)&numlines, 2);
-                    for (j = 0; j < numlines; j++)
-                    {
-                        read(fh, (void *)&line, 2);
-                        read(fh, (void *)&offset, 2);
-                        if (offset <= TrapOff && offset >= NrLine)
-                        {
-                            NrLine = offset;
-                            sprintf(pxdi->szNrFile, "% 12.12s ", ename);
-                            sprintf(pxdi->szNrLine, "% 6hu", line);
-                            /*sprintf(szNrLine,"%04hX:%04hX  line #%hu  (%s) (%s)\n",
-                             * ssmod.csBase,offset,line,ModName,ename); */
-                        }
-                    }
-                    break;
-            }                   // end switch
-            i++;
-        }                       // end while modindex
-    }                           // End While i < numdir
-    free(pxdi->pDirTab);
-    return (0);
-}
-
-/* ******************************************************************
- *
- *   PART 2: ANALYZE VARIABLES
- *
- ********************************************************************/
-
-/*
- * var_value:
- *      writes a description of a variable type to
- *      the specified buffer, depending on "type".
- *
- *@@changed V0.9.1 (2000-01-30) [umoeller]: changed prototype to use external buffer
- */
-
-static VOID var_value(void *varptr,        // in: address of the variable on the stack
-                      char *pszBuf,        // out: information
-                      BYTE type)           // in: type; if >= 32, we'll call DosQueryMem
-{
-    ULONG           Size = 1,
-                    Attr = 0;
-
-    if (DosQueryMem(varptr, &Size, &Attr) != NO_ERROR)
-    {
-        sprintf(pszBuf, "type %d, DosQueryMem failed", type);
-        return;
-    }
-
-    if ((Attr & PAG_READ) == 0)
-    {
-        sprintf(pszBuf, "type %d, read-access to value denied", type);
-        return;
-    }
-
-    if (type == 0)
-        sprintf(pszBuf, "%hd", *(signed char*)varptr);
-    else if (type == 1)
-        sprintf(pszBuf, "%hd", *(signed short*)varptr);
-    else if (type == 2)
-        sprintf(pszBuf, "%ld", *(signed long*)varptr);
-    else if (type == 4)
-        sprintf(pszBuf, "%hu", *(BYTE*) varptr);
-    else if (type == 5)
-        sprintf(pszBuf, "%hu", *(USHORT*)varptr);
-    else if (type == 6)
-        sprintf(pszBuf, "0x%lX (%lu)", *((ULONG*)varptr), *((ULONG*)varptr));
-    else if (type == 8)
-        sprintf(pszBuf, "%f", *(float*)varptr);
-    else if (type == 9)
-        sprintf(pszBuf, "%f", *(double*)varptr);
-    else if (type == 10)
-        sprintf(pszBuf, "%f", (double)(*(long double*)varptr));
-    else if (type == 16)
-        sprintf(pszBuf, "%s", *(char*)varptr ? "TRUE" : "FALSE");
-    else if (type == 17)
-        sprintf(pszBuf, "%s", *(short*)varptr ? "TRUE" : "FALSE");
-    else if (type == 18)
-        sprintf(pszBuf, "%s", *(long*)varptr ? "TRUE" : "FALSE");
-    else if (type == 20)
-        sprintf(pszBuf, "%c", *(char*)varptr);
-    else if (type == 21)
-        sprintf(pszBuf, "%hd", (*(short*)varptr));
-    else if (type == 22)
-        sprintf(pszBuf, "%ld", *(long*)varptr);
-    else if (type == 23)
-        sprintf(pszBuf, "void");
-    else if (type >= 32)
-    {
-        sprintf(pszBuf, "0x%p", (void*)(*(ULONG*)varptr));
-        if (Attr & PAG_FREE)
-        {
-            strcat(pszBuf, " unallocated memory");
-        }
-        else
-        {
-            if ((Attr & PAG_COMMIT) == 0x0U)
-            {
-                strcat(pszBuf, " uncommitted");
-            }               // endif
-            if ((Attr & PAG_WRITE) == 0x0U)
-            {
-                strcat(pszBuf, " unwritable");
-            }               // endif
-            if ((Attr & PAG_READ) == 0x0U)
-            {
-                strcat(pszBuf, " unreadable");
-            }               // endif
-        }                   // endif
-    }                       // endif
-    else
-        sprintf(pszBuf, "Unknown type %d", type);
-}
-
-/*
- * search_userdefs:
- *      searches the table of userdef's-
- *      Return TRUE if found.
- */
-
-static BOOL search_userdefs(FILE *LogFile,     // in: text log file to write to
-                            ULONG stackofs,
-                            USHORT var_no)
-{
-    USHORT          pos;
-
-    for (pos = 0;
-         pos < userdef_count;
-         pos++)
-    {
-        if (one_userdef[pos].idx == autovar_def[var_no].type_idx)
-        {
-            if (    (one_userdef[pos].type_index >= 0x80)
-                // &&  (one_userdef[pos].type_index <= 0xDA)
-               )
-            {
-                static char sszVar3[500] = "complex";
-                if (one_userdef[pos].type_index <= 0xDA)
-                    var_value((void*)(stackofs + autovar_def[var_no].stack_offset),
-                              sszVar3,
-                              one_userdef[pos].type_index - 0x80);
-
-                fprintf(LogFile,
-                        "     %- 6ld %- 20.20s %- 33.33s %s (user)\n",
-                        autovar_def[var_no].stack_offset,       // stack offset
-                        autovar_def[var_no].name,               // identifier
-                        one_userdef[pos].name,                  // type name
-                        sszVar3                                 // composed by var_value
-                       );
-                return TRUE;
-            }
-            else
-                return FALSE;
-        }
-    }
-
-    return FALSE;
-}
-
-/*
- * search_pointers:
- *
- */
-
-static BOOL search_pointers(FILE *LogFile,     // in: text log file to write to
-                            ULONG stackofs,
-                            USHORT var_no)
-{
-    USHORT          pos, upos;
-    static BYTE     str[35];
-    static char     sszVar[500];
-
-    // BYTE            type_index;
-
-    for (pos = 0;
-         (   (pos < pointer_count)
-          && (one_pointer[pos].idx != autovar_def[var_no].type_idx)
-         );
-         pos++);
-
-    if (pos < pointer_count)
-    {
-        if (    (one_pointer[pos].type_index >= 0x80)
-             && (one_pointer[pos].type_index <= 0xDA)
-           )
-        {
-            strcpy(str, type_name[one_pointer[pos].type_index - 0x80]);
-            strcat(str, " *");
-            var_value((void*)(stackofs + autovar_def[var_no].stack_offset),
-                      sszVar,
-                      32);
-            fprintf(LogFile, "     %- 6ld %- 20.20s %- 33.33s %s (ptr1)\n",
-                    autovar_def[var_no].stack_offset,
-                    autovar_def[var_no].name,
-                    str,
-                    sszVar);
-            return TRUE;
-        }
-        else
-        {
-            // If the result isn't a simple type, look for it in the other lists
-            for (upos = 0;
-                 (   (upos < userdef_count)
-                  && (one_userdef[upos].idx != one_pointer[pos].type_index)
-                 );
-                 upos++)
-                ;
-
-            if (upos < userdef_count)
-            {
-                strcpy(str, one_userdef[upos].name);
-                strcat(str, " *");
-                var_value((void *)(stackofs + autovar_def[var_no].stack_offset),
-                          sszVar,
-                          32);
-                fprintf(LogFile, "     %- 6ld %- 20.20s %- 33.33s %s (ptr2)\n",
-                        autovar_def[var_no].stack_offset,
-                        autovar_def[var_no].name,
-                        str,
-                        sszVar);
-                return TRUE;
-            }
-            else
-            {
-                // if it isn't a userdef, for now give up and just print
-                // as much as we know
-                sprintf(str, "Pointer to type 0x%X", one_pointer[pos].type_index);
-
-                var_value((void *)(stackofs + autovar_def[var_no].stack_offset),
-                          sszVar,
-                          32);
-                fprintf(LogFile, "     %- 6ld %- 20.20s %- 33.33s %s (ptr3)\n",
-                        autovar_def[var_no].stack_offset,
-                        autovar_def[var_no].name,
-                        str,
-                        sszVar);
-
-                return TRUE;
-            }
-        }
-    }
-
-    return FALSE;
-}
-
-/*
- *@@ dbgPrintVariables:
- *      Dumps variables for the specified stack offset
- *      to the specified log file.
- *
- *      New with V0.84.
- */
-
-void dbgPrintVariables(FILE *LogFile,   // in: text log file to write to
-                       ULONG stackofs)
-{
-    USHORT          n; // , pos;
-    BOOL            AutoVarsFound = FALSE;
-
-    if (/* 1 || */ func_ofs == pubfunc_ofs)
-    {
-        for (n = 0;
-             n < var_ofs;
-             n++)
-        {
-            if (AutoVarsFound == FALSE)
-            {
-                AutoVarsFound = TRUE;
-                fprintf(LogFile, "     List of auto variables at EBP %p in %s:\n",
-                        (PVOID)stackofs,
-                        func_name);
-                fprintf(LogFile, "     Offset Name                 Type                              Value            \n");
-                fprintf(LogFile, "     ������ �������������������� ��������������������������������� �����������������\n");
-            }
-
-            // If it's one of the simple types
-            if (   (autovar_def[n].type_idx >= 0x80)
-                && (autovar_def[n].type_idx <= 0xDA)
-                )
-            {
-                static char sszVar2[500];
-
-                var_value((void *)(stackofs + autovar_def[n].stack_offset),
-                          sszVar2,
-                          autovar_def[n].type_idx - 0x80);
-
-                fprintf(LogFile, "     %- 6ld %- 20.20s %- 33.33s %s (simple)\n",
-                        autovar_def[n].stack_offset,
-                        autovar_def[n].name,
-                        type_name[autovar_def[n].type_idx - 0x80],
-                        sszVar2);
-            }
-            else
-            {                   // Complex type, check if we know what it is
-                if (!search_userdefs(LogFile, stackofs, n))
-                {
-                    if (!search_pointers(LogFile, stackofs, n))
-                    {
-                        fprintf(LogFile, "     %- 6ld %-20.20s 0x%X (unknown)\n",
-                                autovar_def[n].stack_offset,
-                                autovar_def[n].name,
-                                autovar_def[n].type_idx);
-                    }
-                }
-            }
-        }
-        /* if (AutoVarsFound == FALSE)
-        {
-            fprintf(LogFile, "  No auto variables found in %s.\n", func_name);
-        } */
-        fprintf(LogFile, "\n");
-    }
-}
-
-/* ******************************************************************
- *
- *   PART 3: ANALYZE SYMBOL (.SYM) FILE
- *
- ********************************************************************/
-
-/*
- *@@ dbgPrintSYMInfo:
- *      this gets called by dbgPrintStack if dbgPrintDebugInfo
- *      failed (because no debug code was found) to check if
- *      maybe a SYM file with the same filename exists and try
- *      to get the info from there.
- *
- *      This gets called for every line of the stack
- *      walk, but only if getting the information from
- *      the debug code failed, e.g. because no debug code
- *      was available for an address.
- *
- *      The file pointer is in the "Source file" column
- *      every time this gets called.
- *
- *      New with V0.84.
- *
- *      Returns 0 if reading the SYM file was successful.
- *
- *@@changed V0.9.1 (2000-01-30) [umoeller]: added return code; this used to be VOID
- */
-
-int dbgPrintSYMInfo(FILE *LogFile,      // in: text log file to write to
-                    CHAR *SymFileName,  // in: SYM file name (can be fully q'fied)
-                    ULONG Object,
-                    ULONG TrapOffset)
-{
-    static FILE    *SymFile;
-    static MAPDEF   MapDef;
-    static SEGDEF   SegDef;
-    static SYMDEF32 SymDef32;
-    static SYMDEF16 SymDef16;
-    static char     Buffer[256];
-    static int      SegNum, SymNum, LastVal;
-    static unsigned long int SegOffset,
-                    SymOffset, SymPtrOffset;
-
-    // open .SYM file
-#ifdef DEBUG_SYMDUMP
-    fprintf(LogFile,"Dump of '%s' for object %d\n",SymFileName,Object);
-#endif
-    SymFile = fopen(SymFileName, "rb");
-    if (SymFile == 0)
-        return (2);
-
-    // read in first map definition
-    fread(&MapDef, sizeof(MAPDEF), 1, SymFile);
-#ifdef DEBUG_SYMDUMP
-    Buffer[0] = MapDef.achModName[0];
-    fread(&Buffer[1], 1, MapDef.cbModName-1, SymFile);
-    Buffer[MapDef.cbModName] = 0x00;
-    fprintf(LogFile,"Module name '%s'\n",Buffer);
-#endif
-
-    SegOffset = SEGDEFOFFSET(MapDef);
-#ifdef DEBUG_SYMDUMP
-    fprintf(LogFile,"SegOffset %0x\n",SegOffset);
-#endif
-
-    // go thru all segments
-    for (SegNum = 0;
-         SegNum < MapDef.cSegs;
-         SegNum++)
-    {
-#ifdef DEBUG_SYMDUMP
-        fprintf(LogFile,"Scanning segment #%d Offset %08X\n",SegNum,SegOffset);
-#endif
-        if (fseek(SymFile, SegOffset, SEEK_SET))
-            // seek error
-            return (3);
-
-        // read in segment definition
-        fread(&SegDef, sizeof(SEGDEF), 1, SymFile);
-#ifdef DEBUG_SYMDUMP
-        Buffer[0] = 0x00;
-        if (SegDef.cbSegName>0) {
-            Buffer[0] = SegDef.achSegName[0];
-            fread(&Buffer[1], 1, SegDef.cbSegName-1, SymFile);
-            Buffer[SegDef.cbSegName] = 0x00;
-        }
-        fprintf(LogFile,"Segment name '%s', number %d, flags %02x\n",Buffer,SegNum,SegDef.bFlags);
-#endif
-
-        if (SegNum == Object)
-        {
-            // stack object found:
-            Buffer[0] = 0x00;
-            LastVal = 0;
-
-            // go thru all symbols in this object
-#ifdef DEBUG_SYMDUMP
-            fprintf(LogFile,"Scanning #%d symbols\n",SegDef.cSymbols);
-#endif
-            for (SymNum = 0; SymNum < SegDef.cSymbols; SymNum++)
-            {
-                SymPtrOffset=SYMDEFOFFSET(SegOffset,SegDef,SymNum);
-                fseek(SymFile,SymPtrOffset,SEEK_SET);
-                fread(&SymOffset,sizeof(unsigned short int),1,SymFile);
-                fseek(SymFile,SymOffset+SegOffset,SEEK_SET);
-                if (SegDef.bFlags & 0x01)
-                {
-                    // 32-bit symbol:
-                    fread(&SymDef32, sizeof(SYMDEF32), 1, SymFile);
-                    if (SymDef32.wSymVal > TrapOffset)
-                    {
-                        // symbol found
-                        fprintf(LogFile,
-                                "between %s + 0x%lX ",
-                                Buffer,
-                                TrapOffset - LastVal);
-                        /* fprintf(LogFile, "(ppLineDef: 0x%lX) ",
-                                    LINEDEFOFFSET(SegDef)
-                                    ); */
-                        fprintf(LogFile, "\n");
-                    }
-
-                    LastVal = SymDef32.wSymVal;
-                    Buffer[0] = SymDef32.achSymName[0];
-                    fread(&Buffer[1], 1, SymDef32.cbSymName-1, SymFile);
-                    Buffer[SymDef32.cbSymName] = 0x00;
-#ifdef DEBUG_SYMDUMP
-                    fprintf(LogFile,"32 Bit Symbol Address %08p <%s> \n",SymDef32.wSymVal,Buffer);
-#endif
-
-                    if (SymDef32.wSymVal > TrapOffset)
-                    {
-                        // symbol found, as above
-                        fprintf(LogFile,
-                                "                                     "
-                                "and %s - 0x%lX ",
-                                Buffer,
-                                LastVal - TrapOffset);
-                        fprintf(LogFile, "\n");
-                        break;
-                    }
-                }
-                else
-                {
-                    // 16-bit symbol:
-                    fread(&SymDef16, sizeof(SYMDEF16), 1, SymFile);
-                    if (SymDef16.wSymVal > TrapOffset)
-                    {
-                        fprintf(LogFile,
-                                "between %s + %lX\n",
-                                Buffer,
-                                TrapOffset - LastVal);
-                    }
-                    LastVal = SymDef16.wSymVal;
-                    Buffer[0] = SymDef16.achSymName[0];
-                    fread(&Buffer[1], 1, SymDef16.cbSymName-1, SymFile);
-                    Buffer[SymDef16.cbSymName] = 0x00;
-                    if (SymDef16.wSymVal > TrapOffset)
-                    {
-                        fprintf(LogFile,
-                                "                                     "
-                                "and %s - %lX\n",
-                                Buffer,
-                                LastVal - TrapOffset);
-                        break;
-                    }
-#ifdef DEBUG_SYMDUMP
-                    fprintf(LogFile,"16 Bit Symbol <%s> Address %p\n",Buffer,SymDef16.wSymVal);
-#endif
-                }               // endif
-            }
-            break;
-        }                       // endif
-        SegOffset = NEXTSEGDEFOFFSET(SegDef);
-    }                           // endwhile
-    fclose(SymFile);
-    return (0);         // no error
-}
-
-/* ******************************************************************
- *
- *   PART 4: dbgPrintStack
- *
- ********************************************************************/
-
-/*
- *@@ dbgPrintStackFrame:
- *      parses and dumps one stack frame.
- *      Called from excPrintStackFrame.
- *
- *      This calls dbgPrintDebugInfo and, if
- *      that fails, dbgPrintSYMInfo.
- *
- *@@added V0.9.2 (2000-03-10) [umoeller]
- *@@changed V0.9.3 (2000-04-10) [umoeller]: added support for non-Warp 4 SYM files
- *@@changed V0.9.3 (2000-04-26) [umoeller]: this broke Warp 4 FP 13, fixed
- */
-
-BOOL dbgPrintStackFrame(FILE *LogFile,
-                        PSZ pszModuleName,  // in: module name (fully q'fied)
-                        ULONG ulObject,
-                        ULONG ulOffset)
-{
-    APIRET arc = 0;
-    // "Source file"... columns
-
-//YD do not use debug info
-#define ENABLE_DEBUG_INFO
-#ifdef ENABLE_DEBUG_INFO
-    // first attempt to analyze the debug code
-    arc = dbgPrintDebugInfo(LogFile,
-                            pszModuleName,
-                            ulObject,
-                            ulOffset);
-#else
-    arc = 1;
-#endif
-
-    // if no debug code is available, analyze
-    // the SYM file instead
-    if (arc != NO_ERROR)
-    {
-        CHAR szSymName[CCHMAXPATH];
-        strcpy(szSymName, pszModuleName);
-        strcpy(szSymName + strlen(szSymName) - 3, "SYM");
-        arc = dbgPrintSYMInfo(LogFile,
-                              szSymName,
-                              ulObject,
-                              ulOffset);
-        if (arc != 0)
-        {
-            // SYM file not found in current directory:
-            // check the SYM files in the \OS2 directory,
-            // depending on the OS/2 version level:
-            CHAR szSymFile2[CCHMAXPATH];
-            PSZ  pszFilename = strrchr(szSymName, '\\');
-            if (pszFilename)
-            {
-                PSZ         pszVersionDir = "WARP4";
-                ULONG       aulBuf[3];
-
-                DosQuerySysInfo(QSV_VERSION_MAJOR,      // 11
-                                QSV_VERSION_MINOR,      // 12
-                                &aulBuf, sizeof(aulBuf));
-                // Warp 3 is reported as 20.30
-                // Warp 4 is reported as 20.40
-                // Aurora is reported as 20.45
-
-                if (aulBuf[0] == 20)
-                {
-                    if (aulBuf[1] == 30)
-                        // Warp 3:
-                        pszVersionDir = "WARP3";
-                    else if (aulBuf[1] >= 40)
-                        // Warp 4 or higher:
-                        // (NOTE: Warp 4 FP 13 now returns 45 also,
-                        // but the SYM files are still in the WARP4 directory...)
-                        // V0.9.3 (2000-04-26) [umoeller]
-                        pszVersionDir = "WARP4";
-                }
-
-                pszFilename++;
-                sprintf(szSymFile2,
-                        "%c:\\OS2\\PDPSI\\PMDF\\%s\\%s",
-                        doshQueryBootDrive(),
-                        pszVersionDir,
-                        pszFilename);
-                arc = dbgPrintSYMInfo(LogFile,
-                                      szSymFile2,
-                                      ulObject,
-                                      ulOffset);
-
-                // V0.9.3 (2000-04-26) [umoeller]
-                if (    (arc != 0)  // still not found
-                     && (aulBuf[1] == 45) // and running Aurora or Warp 4 FP13?
-                   )
-                {
-                    // Warp Server for e-Business (aka Warp 4.5):
-                    // we use the SYM files for the UNI kernel,
-                    // I have found no way to find out whether
-                    // we're running on an SMP kernel
-                    sprintf(szSymFile2,
-                            "%c:\\OS2\\PDPSI\\PMDF\\%s\\%s",
-                            doshQueryBootDrive(),
-                            "WARP45_U",
-                            pszFilename);
-                    arc = dbgPrintSYMInfo(LogFile,
-                                          szSymFile2,
-                                          ulObject,
-                                          ulOffset);
-                }
-            }
-        }
-
-        if (arc == 2)       // file not found
-            fprintf(LogFile,
-                    "Cannot find symbol file %s\n",
-                    szSymName);
-        else if (arc != 0)
-            fprintf(LogFile,
-                    "Error %lu reading symbol file %s\n",
-                    arc,
-                    szSymName);
-    }
-
-    return (arc == NO_ERROR);
-}
-
-/*
- *@@ dbgPrintStack:
- *      this takes stack data from the TIB and
- *      context record data structures and tries
- *      to analyse what the different stack frames
- *      point to.
- *
- *      For each stack frame, this calls dbgPrintDebugInfo,
- *      and, if that fails, dbgPrintSYMInfo.
- *
- *      New with V0.84.
- *
- *@@changed V0.9.2 (2000-03-08) [umoeller]: now searching OS2\PDPSI\PMDF for SYM files also
- */
-
-VOID dbgPrintStack(FILE *LogFile,           // in: text log file to write to
-                   PUSHORT StackBottom,
-                   PUSHORT StackTop,
-                   PUSHORT Ebp,
-                   PUSHORT ExceptionAddress)
-{
-    PUSHORT         RetAddr = 0;
-    PUSHORT         LastEbp = 0;
-    APIRET          rc = 0;
-    ULONG           Size = 0,
-                    Attr = 0;
-    USHORT          Cs = 0,
-                    Ip = 0,
-                    // Bp,
-                    Sp = 0;
-    static char     Name[CCHMAXPATH];
-    HMODULE         hMod = 0;
-    ULONG           ObjNum = 0;
-    ULONG           Offset = 0;
-    BOOL            fExceptionAddress = TRUE;   // Use Exception Addr 1st time thru
-
-    // Note: we can't handle stacks bigger than 64K for now...
-    Sp = (USHORT) (((ULONG) StackBottom) >> 16);
-    // Bp = ;
-
-    if (!f32bit)
-        Ebp = (PUSHORT) MAKEULONG(((USHORT)(ULONG)Ebp), Sp);
-
-    fprintf(LogFile, "\n\nCall stack:\n");
-    fprintf(LogFile, "                                        Source    Line      Nearest\n");
-    fprintf(LogFile, "   EBP      Address    Module  Obj#      File     Numbr  Public Symbol\n");
-    fprintf(LogFile, " ��������  ��������-  �������� ����  ������������ �����  ������������-\n");
-
-    do
-    {
-        Size = 10;
-        rc = DosQueryMem((PVOID) (Ebp + 2), &Size, &Attr);
-        if (rc != NO_ERROR)
-        {
-            fprintf(LogFile, "Invalid EBP %8.8lX (DosQueryMem returned %lu)\n", (ULONG)Ebp, rc);
-            break;
-        }
-        if (!(Attr & PAG_COMMIT))
-        {
-            fprintf(LogFile, "Invalid EBP %8.8lX (not committed)\n", (ULONG)Ebp);
-            break;
-        }
-        if (Size < 10)
-        {
-            fprintf(LogFile, "Invalid EBP %8.8lX (mem block size < 10)\n", (ULONG)Ebp);
-            break;
-        }
-
-        if (fExceptionAddress)
-            RetAddr = ExceptionAddress;
-        else
-            RetAddr = (PUSHORT) (*((PULONG) (Ebp + 2)));
-
-        if (RetAddr == (PUSHORT) 0x00000053)
-        {
-            // For some reason there's a "return address" of 0x53 following
-            // EBP on the stack and we have to adjust EBP by 44 bytes to get
-            // at the real return address.  This has something to do with
-            // thunking from 32bits to 16bits...
-            // Serious kludge, and it's probably dependent on versions of C(++)
-            // runtime or OS, but it works for now!
-            Ebp += 22;
-            RetAddr = (PUSHORT) (*((PULONG) (Ebp + 2)));
-        }
-
-        // Get the (possibly) 16bit CS and IP
-        if (fExceptionAddress)
-        {
-            Cs = (USHORT) (((ULONG) ExceptionAddress) >> 16);
-            Ip = (USHORT) (ULONG) ExceptionAddress;
-        }
-        else
-        {
-            Cs = *(Ebp + 2);
-            Ip = *(Ebp + 1);
-        }
-
-        // if the return address points to the stack then it's really just
-        // a pointer to the return address (UGH!).
-        if (    (USHORT) (((ULONG) RetAddr) >> 16) == Sp
-           )
-            RetAddr = (PUSHORT) (*((PULONG) RetAddr));
-
-        if (Ip == 0 && *Ebp == 0)
-        {
-            // End of the stack so these are both shifted by 2 bytes:
-            Cs = *(Ebp + 3);
-            Ip = *(Ebp + 2);
-        }
-
-        // 16bit programs have on the stack:
-        //   BP:IP:CS
-        //   where CS may be thunked
-        //
-        //         in dump                 swapped
-        //    BP        IP   CS          BP   CS   IP
-        //   4677      53B5 F7D0        7746 D0F7 B553
-        //
-        // 32bit programs have:
-        //   EBP:EIP
-        // and you'd have something like this (with SP added) (not
-        // accurate values)
-        //
-        //         in dump               swapped
-        //      EBP       EIP         EBP       EIP
-        //   4677 2900 53B5 F7D0   0029 7746 D0F7 B553
-        //
-        // So the basic difference is that 32bit programs have a 32bit
-        // EBP and we can attempt to determine whether we have a 32bit
-        // EBP by checking to see if its 'selector' is the same as SP.
-        // Note that this technique limits us to checking stacks < 64K.
-        //
-        // Soooo, if IP (which maps into the same USHORT as the swapped
-        // stack page in EBP) doesn't point to the stack (i.e. it could
-        // be a 16bit IP) then see if CS is valid (as is or thunked).
-        //
-        // Note that there's the possibility of a 16bit return address
-        // that has an offset that's the same as SP so we'll think it's
-        // a 32bit return address and won't be able to successfully resolve
-        // its details.
-        if (Ip != Sp)
-        {
-            if (DosSizeSeg(Cs, &Size) == NO_ERROR)
-            {
-                RetAddr = (USHORT * _Seg16) MAKEULONG(Ip, Cs);
-                f32bit = FALSE;
-            }
-            else if (DosSizeSeg((Cs << 3) + 7, &Size) == NO_ERROR)
-            {
-                Cs = (Cs << 3) + 7;
-                RetAddr = (USHORT * _Seg16) MAKEULONG(Ip, Cs);
-                f32bit = FALSE;
-            }
-            else
-                f32bit = TRUE;
-        }
-        else
-            f32bit = TRUE;
-
-
-        // "EBP" column
-        if (fExceptionAddress)
-            fprintf(LogFile, " Trap  ->  ");
-        else
-            fprintf(LogFile, " %8.8lX  ", (ULONG)Ebp);
-
-        // "Address" column
-        if (f32bit)
-            fprintf(LogFile, ":%8.8lX  ", (ULONG)RetAddr);
-        else
-            fprintf(LogFile, "%04.04X:%04.04X  ", Cs, Ip);
-
-        // Version check omitted; the following requires
-        // OS/2 2.10 or later (*UM)
-        // if (Version[0] >= 20 && Version[1] >= 10)
-        {
-            // Make a 'tick' sound to let the user know we're still alive
-            DosBeep(2000, 10);
-
-            Size = 10;    // Inserted by Kim Rasmussen 26/06 1996 to avoid error 87 when Size is 0
-
-            // "Module"/"Object" columns
-            rc = DosQueryMem((PVOID) RetAddr, &Size, &Attr);
-            if (rc != NO_ERROR || !(Attr & PAG_COMMIT))
-            {
-                fprintf(LogFile, "Invalid RetAddr: %8.8lX\n", (ULONG)RetAddr);
-                break;          // avoid infinite loops
-            }
-            else
-            {
-                rc = DosQueryModFromEIP(&hMod,
-                                        &ObjNum,
-                                        sizeof(Name), Name,
-                                        &Offset,
-                                        (PVOID)RetAddr);
-                if (    (rc == NO_ERROR)
-                     // && (ObjNum != -1)
-                   )
-                {
-                    // static char     szJunk[_MAX_FNAME];
-                    static char     szName[_MAX_FNAME];
-
-                    DosQueryModuleName(hMod, sizeof(Name), Name);
-                    // _splitpath(Name, szJunk, szJunk, szName, szJunk);
-
-                    // print module and object
-                    fprintf(LogFile, "%-8s %04lX  ", szName, ObjNum + 1);
-
-                    if (strlen(Name) > 3)
-                    {
-                        dbgPrintStackFrame(LogFile,
-                                           Name,
-                                           ObjNum,
-                                           Offset);
-                    }
-                }
-                else
-                    fprintf(LogFile,
-                            "DosQueryModFromEIP failed, returned %lu\n",
-                            rc);
-            }
-        }
-
-        if (    ((*Ebp) == 0)
-             && ((*Ebp + 1) == 0)
-           )
-        {
-            fprintf(LogFile, "End of call stack\n");
-            break;
-        }
-
-        if (!fExceptionAddress)
-        {
-            LastEbp = Ebp;
-#if 0
-            Ebp = (PUSHORT) MAKEULONG(Bp, Sp);
-#else // Inserted by Kim Rasmussen 26/06 1996 to allow big stacks
-            if (f32bit)
-                Ebp = (PUSHORT) *(PULONG) LastEbp;
-            else
-                Ebp = (PUSHORT) MAKEULONG((*Ebp), Sp);
-#endif
-            if (f32bit)
-            {
-                dbgPrintVariables(LogFile, (ULONG) Ebp);
-            }                   // endif
-
-            if (Ebp < LastEbp)
-            {
-                fprintf(LogFile, "... lost stack chain - new EBP below previous\n");
-                break;
-            }
-        }
-        else
-            fExceptionAddress = FALSE;
-
-        Size = 4;
-        rc = DosQueryMem((PVOID) Ebp, &Size, &Attr);
-        if ((rc != NO_ERROR) || (Size < 4))
-        {
-            fprintf(LogFile, "... lost stack chain - invalid EBP: %8.8lX\n", (ULONG)Ebp);
-            break;
-        }
-    } while (TRUE);
-
-    fprintf(LogFile, "\n");
-}
-
-/*
- *@@ doshQueryBootDrive:
- *      returns the letter of the boot drive as a
- *      single (capital) character, which is useful for
- *      constructing file names using sprintf and such.
- *
- *@@changed V0.9.16 (2002-01-13) [umoeller]: optimized
- */
-
-CHAR doshQueryBootDrive(VOID)
-{
-    // this can never change, so query this only once
-    // V0.9.16 (2002-01-13) [umoeller]
-    static CHAR     cBootDrive = '\0';
-
-    if (!cBootDrive)
-    {
-        ULONG ulBootDrive;
-        DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE,
-                        &ulBootDrive,
-                        sizeof(ulBootDrive));
-        cBootDrive = (CHAR)ulBootDrive + 'A' - 1;
-    }
-
-    return (cBootDrive);
-}
diff --git a/sal/osl/os2/diagnose.c b/sal/osl/os2/diagnose.c
deleted file mode 100644
index b412a65ff090..000000000000
--- a/sal/osl/os2/diagnose.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "system.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include <osl/diagnose.h>
-#include <osl/thread.h>
-
-#include "printtrace.h"
-
-BYTE oslTraceEnv[] = "OSL_TRACE_TO_FILE";
-
-typedef pfunc_osl_printDebugMessage oslDebugMessageFunc;
-static oslDebugMessageFunc volatile g_pDebugMessageFunc = 0;
-
-typedef pfunc_osl_printDetailedDebugMessage oslDetailedDebugMessageFunc;
-static oslDetailedDebugMessageFunc volatile g_pDetailedDebugMessageFunc = 0;
-
-/*----------------------------------------------------------------------------*/
-
-void SAL_CALL osl_breakDebug()
-{
-    __asm__("int $3\n");
-}
-
-/************************************************************************/
-/* osl_trace */
-/************************************************************************/
-void osl_trace(char const * pszFormat, ...) {
-    va_list args;
-    va_start(args, pszFormat);
-    printTrace(0, pszFormat, args); /* TODO: pid */
-    va_end(args);
-}
-
-/*----------------------------------------------------------------------------*/
-
-void SAL_CALL osl_trace__yd_os2(const sal_Char* lpszFormat, ...)
-{
-
-    int     nBuf;
-    sal_Char    szBuffer[512];
-    sal_Char    szPID[ 12 ];
-    va_list args;
-    FILE*   pFile;
-    PID     pid;
-    PSZ     pszOslTraceFile;
-
-    /* if environment variable not set, do nothing */
-    if(DosScanEnv(oslTraceEnv, (PSZ*)&pszOslTraceFile))
-    {
-        return;
-    }
-
-    va_start(args, lpszFormat);
-
-    nBuf = vsprintf(szBuffer, lpszFormat, args);
-    OSL_ASSERT(nBuf < sizeof(szBuffer));
-
-    va_end(args);
-
-    /* get process ID */
-    {
-    PTIB pptib = NULL;
-    PPIB pppib = NULL;
-
-    DosGetInfoBlocks( &pptib, &pppib );
-    pid = pppib->pib_ulpid;
-    }
-
-    pFile = fopen( (const char*)pszOslTraceFile, "a+" );
-    fputs(_itoa( pid, szPID, 10 ), pFile );
-    fputs( ": ", pFile );
-    fputs(szBuffer, pFile);
-    fclose( pFile );
-
-}
-
-/*----------------------------------------------------------------------------*/
-
-sal_Bool SAL_CALL osl_assertFailedLine( const sal_Char* pszFileName, sal_Int32 nLine, const sal_Char* pszMessage)
-{
-    sal_Char szMessage[512];
-
-    /* get app name or NULL if unknown (don't call assert) */
-    sal_Char* lpszAppName = "OSL";
-
-    /* format message into buffer */
-    sprintf(szMessage, "Assertion Failed: %s: File %s, Line %d:\n",
-            lpszAppName, pszFileName, nLine);
-    if(pszMessage != 0)
-        strcat( szMessage, pszMessage );
-
-    szMessage[sizeof(szMessage)-1] = '\0';
-
-    fputs(szMessage, stderr);
-
-    char const * env = getenv( "SAL_DIAGNOSE_ABORT" );
-    return ( ( env != NULL ) && ( *env != '\0' ) );
-}
-
-/*----------------------------------------------------------------------------*/
-
-sal_Int32 SAL_CALL osl_reportError(sal_uInt32 nType, const sal_Char* pszMessage)
-{
-    fputs(pszMessage, stderr);
-
-    return 0;
-}
-
-/*----------------------------------------------------------------------------*/
-
-
-/************************************************************************/
-/* osl_setDebugMessageFunc */
-/************************************************************************/
-oslDebugMessageFunc SAL_CALL osl_setDebugMessageFunc (
-    oslDebugMessageFunc pNewFunc)
-{
-    oslDebugMessageFunc pOldFunc = g_pDebugMessageFunc;
-    g_pDebugMessageFunc = pNewFunc;
-    return pOldFunc;
-}
-
-/************************************************************************/
-/* osl_setDetailedDebugMessageFunc */
-/************************************************************************/
-pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc (
-    pfunc_osl_printDetailedDebugMessage pNewFunc)
-{
-    oslDetailedDebugMessageFunc pOldFunc = g_pDetailedDebugMessageFunc;
-    g_pDetailedDebugMessageFunc = pNewFunc;
-    return pOldFunc;
-}
diff --git a/sal/osl/os2/except.c b/sal/osl/os2/except.c
deleted file mode 100644
index 29962889fb01..000000000000
--- a/sal/osl/os2/except.c
+++ /dev/null
@@ -1,1059 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
- *@@sourcefile except.c:
- *      this file contains powerful exception handlers.
- *      except.h also defines easy-to-use macros for them.
- *
- *      Usage: All OS/2 programs, PM or text mode.
- *
- *      <B>Introduction</B>
- *
- *      OS/2 exception handlers are a mess to program and,
- *      if installed wrongly, almost impossible to debug.
- *      The problem is that for any program that does a bit
- *      more than showing a message box, using exception
- *      handlers is a must to avoid system hangs. This
- *      especially applies to multi-thread programs using
- *      mutex semaphores (more on that below). The functions
- *      and macros in here are designed to make that more
- *      simple.
- *
- *      The macros in except.h automatically insert code for
- *      properly registering and deregistering the handlers
- *      in except.c. You should ALWAYS use these macros
- *      instead  of directly registering the handlers to avoid
- *      accidentally  forgetting to deregister them. If you
- *      forget to deregister an exception handler, this can
- *      lead to really strange errors (crashes, hangs) which
- *      are nearly impossible to debug because the thread's
- *      stack probably got completely messed up.
- *
- *      The general idea of these macros is to define
- *      TRY / CATCH blocks similar to C++. If an exception
- *      occurs in the TRY block, execution is transferred to
- *      the CATCH block. (This works in both C and C++, by the
- *      way.)
- *
- *      The "OnKill" function that was added with V0.9.0 has
- *      been removed again with V0.9.7.
- *
- *      The general usage is like this:
- *
- +          int your_protected_func(int ...)
- +          {
- +              TRY_LOUD(excptid)         // or: TRY_QUIET(excptid)
- +              {
- +                  char *p = NULL;
- +
- +                  ....        // the stuff in here is protected by
- +                              // the excHandlerLoud or excHandlerQuiet
- +                              // exception handler
- +                  *p = "A";
- +              }
- +              CATCH(excptid)
- +              {
- +                  ....        // exception occured: react here
- +              } END_CATCH();  // always needed!
- +          } // end of your_func
- *
- *      TRY_LOUD  is for installing excHandlerLoud.
- *      TRY_QUIET is for installing excHandlerQuiet.
- *      CATCH / END_CATCH are the same for the two. This
- *      is where the exception handler jumps to if an
- *      exception occurs.
- *      The CATCH block is _required_ even if you do nothing
- *      in there, because the CATCH() macro will deregister
- *      the handler.
- *
- *      "excptid" can be any C identifier which is not used in
- *      your current variable scope, e.g. "excpt1". This
- *      is used for creating an EXCEPTSTRUCT variable of
- *      that name on the stack. The "excptid"'s in TRY_* and
- *      CATCH must match, since this is where the macros
- *      store the exception handler data.
- *
- *      These macros may be nested if you use different
- *      "excptid"'s for sub-macros.
- *
- *      Inside the TRY and CATCH blocks, you must not use
- *      "goto" (to a location outside the block) or "return",
- *      because this will not deregister the handler.
- *
- *      Keep in mind that all the code in the TRY_* block is
- *      protected by the handler, including all functions that
- *      get called. So if you enclose your main() code in a
- *      TRY_* block, your entire application is protected.
- *      If any subfunction fails, execution is transferred to
- *      the closest CATCH() that was installed (as with C++
- *      try and catch).
- *
- *      <B>Asynchronous exceptions</B>
- *
- *      The exception handlers in this file (which are installed
- *      with the TRY/CATCH mechanism) only intercept synchronous
- *      exceptions, most importantly, XCPT_ACCESS_VIOLATION (see
- *      excHandlerLoud for a list). They do not protect your code
- *      against asynchronous exceptions.
- *
- *      OS/2 defines asynchronous exceptions to be those that
- *      can be delayed. With OS/2, there are only three of these:
- *
- *      -- XCPT_PROCESS_TERMINATE
- *      -- XCPT_ASYNC_PROCESS_TERMINATE
- *      -- XCPT_SIGNAL (thread 1 only)
- *
- *      To protect yourself against these also, put the section
- *      in question in a DosEnterMustComplete/DosExitMustComplete
- *      block as well.
- *
- *      <B>Mutex semaphores</B>
- *
- *      The problem with OS/2 mutex semaphores is that they are
- *      sometimes not automatically released when a thread terminates.
- *      If there are several mutexes involved and they are released
- *      in improper order, you can get zombie threads on exit.
- *      Even worse, if this happens to a PM thread, this will hang
- *      the system.
- *
- *      As a result, you should protect any section of code which
- *      requests a semaphore with the exception handlers.
- *
- *      So _whenever_ you request a mutex semaphore, enclose
- *      the block with TRY/CATCH in case the code crashes.
- *      Besides, enclose the TRY/CATCH block in a must-complete
- *      section, like this:
- *
- +          HMTX hmtx = ...
- +
- +          int your_func(int)
- +          {
- +              BOOL    fSemOwned = FALSE;
- +
- +              TRY_QUIET(excpt1)           // or TRY_LOUD
- +              {
- +                  if (fSemOwned = !DosRequestMutexSem(hmtx, ...))
- +                  {       ... // work on your protected data
- +                  }
- +                  // mutex gets released below
- +              }
- +              CATCH(excpt1) { } END_CATCH();    // always needed!
- +
- +              if (fSemOwned)
- +                  // this gets executed always, even if an exception occured
- +                  DosReleaseMutexSem(hmtx);
- +          } // end of your_func
- *
- *      This way your mutex semaphore gets released in every
- *      possible condition.
- *
- *      <B>Customizing</B>
- *
- *      As opposed to versions before 0.9.0, this code is now
- *      completely independent of XWorkplace. This file now
- *      contains "pure" exception handlers only.
- *
- *      However, you can customize these exception handlers by
- *      calling excRegisterHooks. This is what XWorkplace does now.
- *      This should be done upon initialization of your application.
- *      If excRegisterHooks is not called, the following safe
- *      defaults are used:
- *
- *          --  the trap log file is TRAP.LOG in the root
- *              directory of your boot drive.
- *
- *      For details on the provided exception handlers, refer
- *      to excHandlerLoud and excHandlerQuiet.
- *
- *      More useful debug information can be found in the "OS/2 Debugging
- *      Handbook", which is now available in INF format on the IBM
- *      DevCon site ("http://service2.boulder.ibm.com/devcon/").
- *      This book shows worked examples of how to unwind a stack dump.
- *
- *      This file incorporates code from the following:
- *      -- Monte Copeland, IBM Boca Ration, Florida, USA (1993)
- *      -- Roman Stangl, from the Program Commander/2 sources
- *         (1997-98)
- *      -- Marc Fiammante, John Currier, Kim Rasmussen,
- *         Anthony Cruise (EXCEPT3.ZIP package for a generic
- *         exception handling DLL, available at Hobbes).
- *
- *      If not explicitly stated otherwise, the code has been written
- *      by me, Ulrich M�ller.
- *
- *      Note: Version numbering in this file relates to XWorkplace version
- *            numbering.
- *
- *@@header "helpers\except.h"
- */
-
-/*
- *      This file Copyright (C) 1992-99 Ulrich M�ller,
- *                                      Monte Copeland,
- *                                      Roman Stangl,
- *                                      Kim Rasmussen,
- *                                      Marc Fiammante,
- *                                      John Currier,
- *                                      Anthony Cruise.
- *      This file is part of the "XWorkplace helpers" source package.
- *
- *      2009-06-15 published under LGPL3 with Ulrich M�ller permission.
- *
- */
-
-#define OS2EMX_PLAIN_CHAR
-    // this is needed for "os2emx.h"; if this is defined,
-    // emx will define PSZ as _signed_ char, otherwise
-    // as unsigned char
-
-#define INCL_DOSMODULEMGR
-#define INCL_DOSEXCEPTIONS
-#define INCL_DOSPROCESS
-#define INCL_DOSMISC
-#define INCL_DOSERRORS
-#include <os2.h>
-
-// C library headers
-#include <stdio.h>              // needed for except.h
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-#include <setjmp.h>             // needed for except.h
-#include <assert.h>             // needed for except.h
-
-#define DONT_REPLACE_MALLOC
-#include "helpers\setup.h"                      // code generation and debugging options
-
-// headers in /helpers
-#include "helpers\dosh.h"               // Control Program helper routines
-#include "helpers\except.h"             // exception handling
-#include "helpers\debug.h"              // symbol/debug code analysis
-
-#pragma hdrstop
-
-/* ******************************************************************
- *
- *   Global variables
- *
- ********************************************************************/
-
-// hooks to be registered using excRegisterHooks
-PFNEXCOPENFILE  G_pfnExcOpenFile = 0;
-PFNEXCHOOK      G_pfnExcHook = 0;
-PFNEXCHOOKERROR G_pfnExcHookError = 0;
-// beep flag for excHandlerLoud
-BOOL            G_fBeepOnException = TRUE;
-
-ULONG           G_ulExplainExceptionRunning = 0;
-    // global flag which is != 0 if some exception handler
-    // is inside excExplainException, so that XShutdown can
-    // wait until the trap log is done;
-    // this is exported thru except.h
-    // V0.9.13 (2001-06-19) [umoeller]
-
-/*
- *@@category: Helpers\Control program helpers\Exceptions/debugging
- *      See except.c.
- */
-
-/* ******************************************************************
- *
- *   Exception helper routines
- *
- ********************************************************************/
-
-/*
- *@@ excDescribePage:
- *
- */
-
-VOID excDescribePage(FILE *file, ULONG ulCheck)
-{
-    APIRET arc;
-    ULONG ulCountPages = 1;
-    ULONG ulFlagsPage = 0;
-    arc = DosQueryMem((PVOID)ulCheck, &ulCountPages, &ulFlagsPage);
-
-    if (arc == NO_ERROR)
-    {
-        fprintf(file, "valid, flags: ");
-        if (ulFlagsPage & PAG_READ)
-            fprintf(file, "read ");
-        if (ulFlagsPage & PAG_WRITE)
-            fprintf(file, "write ");
-        if (ulFlagsPage & PAG_EXECUTE)
-            fprintf(file, "execute ");
-        if (ulFlagsPage & PAG_GUARD)
-            fprintf(file, "guard ");
-        if (ulFlagsPage & PAG_COMMIT)
-            fprintf(file, "committed ");
-        if (ulFlagsPage & PAG_SHARED)
-            fprintf(file, "shared ");
-        if (ulFlagsPage & PAG_FREE)
-            fprintf(file, "free ");
-        if (ulFlagsPage & PAG_BASE)
-            fprintf(file, "base ");
-    }
-    else if (arc == ERROR_INVALID_ADDRESS)
-        fprintf(file, "invalid");
-}
-
-/*
- *@@ excPrintStackFrame:
- *      wrapper for dbgPrintStackFrame to format
- *      output stuff right.
- *
- *@@added V0.9.2 (2000-03-10) [umoeller]
- *@@changed V0.9.12 (2001-05-12) [umoeller]: added seg:ofs to output always
- */
-
-VOID excPrintStackFrame(FILE *file,         // in: output log file
-                        PSZ pszDescription, // in: description for stack frame (should be eight chars)
-                        ULONG ulAddress)    // in: address to debug
-{
-    APIRET  arc = NO_ERROR;
-    HMODULE hmod1 = NULLHANDLE;
-    CHAR    szMod1[2*CCHMAXPATH] = "unknown";
-    ULONG   ulObject = 0,
-            ulOffset = 0;
-    fprintf(file,
-            "    %-8s: %08lX ",
-            pszDescription,
-            ulAddress);
-    arc = DosQueryModFromEIP(&hmod1,
-                             &ulObject,
-                             sizeof(szMod1), szMod1,
-                             &ulOffset,
-                             ulAddress);
-
-    if (arc != NO_ERROR)
-    {
-        // error:
-        fprintf(file,
-                " %-8s Error: DosQueryModFromEIP returned %lu\n",
-                szMod1,
-                arc);
-    }
-    else
-    {
-        CHAR szFullName[2*CCHMAXPATH];
-
-        fprintf(file,
-                " %-8s %02lX:%08lX\n                                 ",
-                szMod1,
-                ulObject + 1,       // V0.9.12 (2001-05-12) [umoeller]
-                ulOffset);          // V0.9.12 (2001-05-12) [umoeller]
-
-        DosQueryModuleName(hmod1, sizeof(szFullName), szFullName);
-        dbgPrintStackFrame(file,
-                           szFullName,
-                           ulObject,
-                           ulOffset);
-
-        fprintf(file, "\n");
-
-        // make a 'tick' sound to let the user know we're still alive
-        DosBeep(2000, 10);
-    }
-}
-
-/*
- *@@ excDumpStackFrames:
- *      called from excExplainException to dump the
- *      thread's stack frames. This calls excPrintStackFrame
- *      for each stack frame found.
- *
- *@@added V0.9.4 (2000-06-15) [umoeller]
- */
-
-VOID excDumpStackFrames(FILE *file,                   // in: logfile from fopen()
-                        PTIB ptib,
-                        PCONTEXTRECORD pContextRec)   // in: excpt info
-{
-    PULONG pulStackWord = 0;
-
-    fprintf(file, "\n\nStack frames:\n              Address   Module   seg:ofs\n");
-
-    // first the trapping address itself
-    excPrintStackFrame(file,
-                       "CS:EIP  ",
-                       pContextRec->ctx_RegEip);
-
-
-    pulStackWord = (PULONG)pContextRec->ctx_RegEbp;
-    /* if (pContextRec->ctx_RegEbp < pContextRec->ctx_RegEsp)
-        pulStackWord = (PULONG)(pContextRec->ctx_RegEbp & 0xFFFFFFF0);
-    else
-        pulStackWord = (PULONG)(pContextRec->ctx_RegEsp & 0xFFFFFFF0); */
-
-    while (    (pulStackWord != 0)
-            && (pulStackWord < (PULONG)ptib->tib_pstacklimit)
-          )
-    {
-        CHAR szAddress[20];
-
-        if (((ULONG)pulStackWord & 0x00000FFF) == 0x00000000)
-        {
-            // we're on a page boundary: check access
-            ULONG ulCountPages = 0x1000;
-            ULONG ulFlagsPage = 0;
-            APIRET arc = DosQueryMem((void *)pulStackWord,
-                                     &ulCountPages,
-                                     &ulFlagsPage);
-            if (    (arc != NO_ERROR)
-                 || (   (arc == NO_ERROR)
-                      && ( !( ((ulFlagsPage & (PAG_COMMIT|PAG_READ))
-                               == (PAG_COMMIT|PAG_READ)
-                              )
-                            )
-                         )
-                    )
-               )
-            {
-                fprintf(file, "\n    %08lX: ", (ULONG)pulStackWord);
-                fprintf(file, "Page inaccessible");
-                pulStackWord += 0x1000;
-                continue; // for
-            }
-        }
-
-        sprintf(szAddress, "%08lX",
-                (ULONG)pulStackWord);
-        excPrintStackFrame(file,
-                           szAddress,
-                           *(pulStackWord+1));
-        pulStackWord = (PULONG)*(pulStackWord);
-
-        if (pulStackWord == 0)
-            fprintf(file, "\n    pulStackWord == 0");
-        else if (pulStackWord >= (PULONG)ptib->tib_pstacklimit)
-            fprintf(file, "\n    pulStackWord >= (PULONG)ptib->tib_pstacklimit");
-    } // end while
-}
-
-/*
- *@@ excExplainException:
- *      used by the exception handlers below to write
- *      LOTS of information about the exception into a logfile.
- *
- *      This calls excPrintStackFrame for each stack frame.
- *
- *@@changed V0.9.0 [umoeller]: added support for application hook
- *@@changed V0.9.0 (99-11-02) [umoeller]: added TID to dump
- *@@changed V0.9.2 (2000-03-10) [umoeller]: now using excPrintStackFrame
- *@@changed V0.9.3 (2000-05-03) [umoeller]: fixed crashes
- *@@changed V0.9.6 (2000-11-06) [umoeller]: added more register dumps
- *@@changed V0.9.13 (2001-06-19) [umoeller]: added global flag for whether this is running
- *@@changed V0.9.16 (2001-11-02) [pr]: make object display signed
- *@@changed V0.9.19 (2002-03-28) [umoeller]: added thread ordinal
- */
-
-VOID excExplainException(FILE *file,                   // in: logfile from fopen()
-                         PSZ pszHandlerName,           // in: descriptive string
-                         PEXCEPTIONREPORTRECORD pReportRec, // in: excpt info
-                         PCONTEXTRECORD pContextRec)   // in: excpt info
-{
-    ULONG       aulBuf[3];
-    const char  *pcszVersion = "unknown";
-
-    PTIB        ptib = NULL;
-    PPIB        ppib = NULL;
-    HMODULE     hMod1, hMod2;
-    CHAR        szMod1[CCHMAXPATH] = "unknown",
-                szMod2[CCHMAXPATH] = "unknown";
-    ULONG       ulObjNum,
-                ulOffset;
-    ULONG       ul;
-
-    ULONG       ulOldPriority = 0x0100; // regular, delta 0
-
-    // raise global flag for whether this func is running
-    // V0.9.13 (2001-06-19) [umoeller]
-    G_ulExplainExceptionRunning++;
-
-    // raise this thread's priority, because this
-    // might take some time
-    if (DosGetInfoBlocks(&ptib, &ppib) == NO_ERROR)
-        if (ptib)
-            if (ptib->tib_ptib2)
-            {
-                ulOldPriority = ptib->tib_ptib2->tib2_ulpri;
-                DosSetPriority(PRTYS_THREAD,
-                               PRTYC_REGULAR,
-                               PRTYD_MAXIMUM,
-                               0);     // current thread
-            }
-
-    // make some noise
-#ifndef __NOEXCEPTIONBEEPS__        // V0.9.19 (2002-04-17) [umoeller]
-    if (G_fBeepOnException)
-    {
-        DosBeep( 250, 30);
-        DosBeep( 500, 30);
-        DosBeep(1000, 30);
-        DosBeep(2000, 30);
-        DosBeep(4000, 30);
-        DosBeep(2000, 30);
-        DosBeep(1000, 30);
-        DosBeep( 500, 30);
-        DosBeep( 250, 30);
-    }
-#endif
-
-    // generic exception info
-    DosQuerySysInfo(QSV_VERSION_MAJOR,      // 11
-                    QSV_VERSION_MINOR,      // 12
-                    &aulBuf, sizeof(aulBuf));
-    // Warp 3 is reported as 20.30
-    // Warp 4 is reported as 20.40
-    // Aurora is reported as 20.45
-
-    if (aulBuf[0] == 20)
-    {
-        switch (aulBuf[1])
-        {
-            case 30: pcszVersion = "Warp 3"; break;
-            case 40: pcszVersion = "Warp 4"; break;
-            case 45: pcszVersion = "WSeB kernel"; break;
-        }
-    }
-    fprintf(file,
-            "Running OS/2 version: %u.%u (%s)\n",
-            aulBuf[0],                      // major
-            aulBuf[1],
-            pcszVersion);
-
-
-    // generic exception info
-    fprintf(file,
-            "\n%s:\n    Exception type: %08lX\n    Address:        %08lX\n    Params:         ",
-            pszHandlerName,
-            pReportRec->ExceptionNum,
-            (ULONG)pReportRec->ExceptionAddress);
-    for (ul = 0;  ul < pReportRec->cParameters;  ul++)
-    {
-        fprintf(file, "%08lX  ",
-                pReportRec->ExceptionInfo[ul]);
-    }
-
-    // now explain the exception in a bit more detail;
-    // depending on the exception, pReportRec->ExceptionInfo
-    // contains some useful data
-    switch (pReportRec->ExceptionNum)
-    {
-        case XCPT_ACCESS_VIOLATION:
-            fprintf(file, "\nXCPT_ACCESS_VIOLATION: ");
-            if (pReportRec->ExceptionInfo[0] & XCPT_READ_ACCESS)
-                fprintf(file, "Invalid read access from 0x%04lX:%08lX.\n",
-                        pContextRec->ctx_SegDs, pReportRec->ExceptionInfo[1]);
-            else if (pReportRec->ExceptionInfo[0] & XCPT_WRITE_ACCESS)
-                fprintf(file, "Invalid write access to 0x%04lX:%08lX.\n",
-                        pContextRec->ctx_SegDs, pReportRec->ExceptionInfo[1]);
-            else if (pReportRec->ExceptionInfo[0] & XCPT_SPACE_ACCESS)
-                fprintf(file, "Invalid space access at 0x%04lX.\n",
-                        pReportRec->ExceptionInfo[1]);
-            else if (pReportRec->ExceptionInfo[0] & XCPT_LIMIT_ACCESS)
-                fprintf(file, "Invalid limit access occurred.\n");
-            else if (pReportRec->ExceptionInfo[0] == XCPT_UNKNOWN_ACCESS)
-                fprintf(file, "unknown at 0x%04lX:%08lX\n",
-                            pContextRec->ctx_SegDs, pReportRec->ExceptionInfo[1]);
-            fprintf(file,
-                    "Explanation: An attempt was made to access a memory object which does\n"
-                    "             not belong to the current process. Most probable causes\n"
-                    "             for this are that an invalid pointer was used, there was\n"
-                    "             confusion with administering memory or error conditions \n"
-                    "             were not properly checked for.\n");
-        break;
-
-        case XCPT_INTEGER_DIVIDE_BY_ZERO:
-            fprintf(file, "\nXCPT_INTEGER_DIVIDE_BY_ZERO.\n");
-            fprintf(file,
-                    "Explanation: An attempt was made to divide an integer value by zero,\n"
-                    "             which is not defined.\n");
-        break;
-
-        case XCPT_ILLEGAL_INSTRUCTION:
-            fprintf(file, "\nXCPT_ILLEGAL_INSTRUCTION.\n");
-            fprintf(file,
-                    "Explanation: An attempt was made to execute an instruction that\n"
-                    "             is not defined on this machine's architecture.\n");
-        break;
-
-        case XCPT_PRIVILEGED_INSTRUCTION:
-            fprintf(file, "\nXCPT_PRIVILEGED_INSTRUCTION.\n");
-            fprintf(file,
-                    "Explanation: An attempt was made to execute an instruction that\n"
-                    "             is not permitted in the current machine mode or that\n"
-                    "             the program had no permission to execute.\n");
-        break;
-
-        case XCPT_INTEGER_OVERFLOW:
-            fprintf(file, "\nXCPT_INTEGER_OVERFLOW.\n");
-            fprintf(file,
-                    "Explanation: An integer operation generated a carry-out of the most\n"
-                    "             significant bit. This is a sign of an attempt to store\n"
-                    "             a value which does not fit into an integer variable.\n");
-        break;
-
-        default:
-            fprintf(file, "\nUnknown OS/2 exception number %d.\n", pReportRec->ExceptionNum);
-            fprintf(file, "Look this up in the OS/2 header files.\n");
-        break;
-    }
-
-    // V0.9.16 (2001-11-02) [pr]: We already got this info. above - this overwrites the
-    // original values before the priority change, which is rather confusing.
-    // if (DosGetInfoBlocks(&ptib, &ppib) == NO_ERROR)
-    {
-        /*
-         * process info:
-         *
-         */
-
-        if ((ptib) && (ppib))       // (99-11-01) [umoeller]
-        {
-            if (pContextRec->ContextFlags & CONTEXT_CONTROL)
-            {
-                // get the main module
-                hMod1 = ppib->pib_hmte;
-                DosQueryModuleName(hMod1,
-                                   sizeof(szMod1),
-                                   szMod1);
-
-                // get the trapping module
-                DosQueryModFromEIP(&hMod2,
-                                   &ulObjNum,
-                                   sizeof(szMod2),
-                                   szMod2,
-                                   &ulOffset,
-                                   pContextRec->ctx_RegEip);
-                DosQueryModuleName(hMod2,
-                                   sizeof(szMod2),
-                                   szMod2);
-            }
-
-            fprintf(file,
-                    "\nProcess information:"
-                    "\n    Process ID:      0x%lX"
-                    "\n    Process module:  0x%lX (%s)"
-                    "\n    Trapping module: 0x%lX (%s)"
-                    "\n    Object: %ld\n",  // V0.9.16 (2001-11-02) [pr]: make this display signed
-                    ppib->pib_ulpid,
-                    hMod1, szMod1,
-                    hMod2, szMod2,
-                    ulObjNum);
-
-            fprintf(file,
-                    "\nTrapping thread information:"
-                    "\n    Thread ID:       0x%lX (%lu)"
-                    "\n    Thread slot ID:  0x%lX (%lu)"        // added V0.9.19 (2002-03-28) [umoeller]
-                    "\n    Priority:        0x%lX\n",
-                    ptib->tib_ptib2->tib2_ultid, ptib->tib_ptib2->tib2_ultid,
-                    ptib->tib_ordinal, ptib->tib_ordinal,
-                    ulOldPriority);
-        }
-        else
-            fprintf(file, "\nProcess information was not available.");
-
-        /*
-         *  now call the hook, if one has been defined,
-         *  so that the application can write additional
-         *  information to the traplog (V0.9.0)
-         */
-
-        if (G_pfnExcHook)
-            G_pfnExcHook(file, ptib, ulOldPriority);  // V0.9.16 (2001-12-02) [pr]
-
-        // *** registers
-
-        fprintf(file, "\nRegisters:");
-        if (pContextRec->ContextFlags & CONTEXT_INTEGER)
-        {
-            // DS the following 4 added V0.9.6 (2000-11-06) [umoeller]
-            fprintf(file, "\n    DS  = %08lX  ", pContextRec->ctx_SegDs);
-            excDescribePage(file, pContextRec->ctx_SegDs);
-            // ES
-            fprintf(file, "\n    ES  = %08lX  ", pContextRec->ctx_SegEs);
-            excDescribePage(file, pContextRec->ctx_SegEs);
-            // FS
-            fprintf(file, "\n    FS  = %08lX  ", pContextRec->ctx_SegFs);
-            excDescribePage(file, pContextRec->ctx_SegFs);
-            // GS
-            fprintf(file, "\n    GS  = %08lX  ", pContextRec->ctx_SegGs);
-            excDescribePage(file, pContextRec->ctx_SegGs);
-
-            // EAX
-            fprintf(file, "\n    EAX = %08lX  ", pContextRec->ctx_RegEax);
-            excDescribePage(file, pContextRec->ctx_RegEax);
-            // EBX
-            fprintf(file, "\n    EBX = %08lX  ", pContextRec->ctx_RegEbx);
-            excDescribePage(file, pContextRec->ctx_RegEbx);
-            // ECX
-            fprintf(file, "\n    ECX = %08lX  ", pContextRec->ctx_RegEcx);
-            excDescribePage(file, pContextRec->ctx_RegEcx);
-            // EDX
-            fprintf(file, "\n    EDX = %08lX  ", pContextRec->ctx_RegEdx);
-            excDescribePage(file, pContextRec->ctx_RegEdx);
-            // ESI
-            fprintf(file, "\n    ESI = %08lX  ", pContextRec->ctx_RegEsi);
-            excDescribePage(file, pContextRec->ctx_RegEsi);
-            // EDI
-            fprintf(file, "\n    EDI = %08lX  ", pContextRec->ctx_RegEdi);
-            excDescribePage(file, pContextRec->ctx_RegEdi);
-            fprintf(file, "\n");
-        }
-        else
-            fprintf(file, " not available\n");
-
-        if (pContextRec->ContextFlags & CONTEXT_CONTROL)
-        {
-
-            // *** instruction
-
-            fprintf(file, "Instruction pointer (where exception occured):\n    CS:EIP = %04lX:%08lX  ",
-                    pContextRec->ctx_SegCs,
-                    pContextRec->ctx_RegEip);
-            excDescribePage(file, pContextRec->ctx_RegEip);
-
-            // *** CPU flags
-
-            fprintf(file, "\n    EFLAGS = %08lX", pContextRec->ctx_EFlags);
-
-            /*
-             * stack:
-             *
-             */
-
-            fprintf(file, "\nStack:\n    Base:         %08lX\n    Limit:        %08lX",
-                   (ULONG)(ptib ? ptib->tib_pstack : 0),
-                   (ULONG)(ptib ? ptib->tib_pstacklimit : 0));
-            fprintf(file, "\n    SS:ESP = %04lX:%08lX  ",
-                    pContextRec->ctx_SegSs,
-                    pContextRec->ctx_RegEsp);
-            excDescribePage(file, pContextRec->ctx_RegEsp);
-
-            fprintf(file, "\n    EBP    =      %08lX  ", pContextRec->ctx_RegEbp);
-            excDescribePage(file, pContextRec->ctx_RegEbp);
-
-            /*
-             * stack dump:
-             */
-
-            if (ptib != 0)
-            {
-                excDumpStackFrames(file, ptib, pContextRec);
-            }
-        }
-    }
-    fprintf(file, "\n");
-
-    // reset old priority
-    DosSetPriority(PRTYS_THREAD,
-                   (ulOldPriority & 0x0F00) >> 8,
-                   (UCHAR)ulOldPriority,
-                   0);     // current thread
-
-    // lower global flag again V0.9.13 (2001-06-19) [umoeller]
-    G_ulExplainExceptionRunning--;
-}
-
-/* ******************************************************************
- *
- *   Exported routines
- *
- ********************************************************************/
-
-/*
- *@@ excRegisterHooks:
- *      this registers hooks which get called for
- *      exception handlers. You can set any of the
- *      hooks to NULL for safe defaults (see top of
- *      except.c for details). You can set none,
- *      one, or both of the hooks, and you can call
- *      this function several times.
- *
- *      Both hooks get called whenever an exception
- *      occurs, so there better be no bugs in these
- *      routines. ;-) They only get called from
- *      within excHandlerLoud (because excHandlerQuiet
- *      writes no trap logs).
- *
- *      The hooks are as follows:
- *
- *      --  pfnExcOpenFileNew gets called to open
- *          the trap log file. This must return a FILE*
- *          pointer from fopen(). If this is not defined,
- *          ?:\TRAP.LOG is used. Use this to specify a
- *          different file and have some notes written
- *          into it before the actual exception info.
- *
- *      --  pfnExcHookNew gets called while the trap log
- *          is being written. At this point,
- *          the following info has been written into
- *          the trap log already:
- *          -- exception type/address block
- *          -- exception explanation
- *          -- process information
- *
- *          _After_ the hook, the exception handler
- *          continues with the "Registers" information
- *          and stack dump/analysis.
- *
- *          Use this hook to write additional application
- *          info into the trap log, such as the state
- *          of your own threads and mutexes.
- *
- *      --  pfnExcHookError gets called when the TRY_* macros
- *          fail to install an exception handler (when
- *          DosSetExceptionHandler fails). I've never seen
- *          this happen.
- *
- *@@added V0.9.0 [umoeller]
- *@@changed V0.9.2 (2000-03-10) [umoeller]: pfnExcHookError added
- */
-
-VOID excRegisterHooks(PFNEXCOPENFILE pfnExcOpenFileNew,
-                      PFNEXCHOOK pfnExcHookNew,
-                      PFNEXCHOOKERROR pfnExcHookError,
-                      BOOL fBeepOnExceptionNew)
-{
-    // adjust the global variables
-    G_pfnExcOpenFile = pfnExcOpenFileNew;
-    G_pfnExcHook = pfnExcHookNew;
-    G_pfnExcHookError = pfnExcHookError;
-    G_fBeepOnException = fBeepOnExceptionNew;
-}
-
-/*
- *@@ excHandlerLoud:
- *      this is the "sophisticated" exception handler;
- *      which gives forth a loud sequence of beeps thru the
- *      speaker, writes a trap log and then returns back
- *      to the thread to continue execution, i.e. the
- *      default OS/2 exception handler will never get
- *      called.
- *
- *      This requires a setjmp() call on
- *      EXCEPTIONREGISTRATIONRECORD2.jmpThread before
- *      being installed. The TRY_LOUD macro will take
- *      care of this for you (see except.c).
- *
- *      This intercepts the following exceptions (see
- *      the OS/2 Control Program Reference for details):
- *
- *      --  XCPT_ACCESS_VIOLATION         (traps 0x0d, 0x0e)
- *      --  XCPT_INTEGER_DIVIDE_BY_ZERO   (trap 0)
- *      --  XCPT_ILLEGAL_INSTRUCTION      (trap 6)
- *      --  XCPT_PRIVILEGED_INSTRUCTION
- *      --  XCPT_INTEGER_OVERFLOW         (trap 4)
- *
- *      For these exceptions, we call the functions in debug.c
- *      to try to find debug code or SYM file information about
- *      what source code corresponds to the error.
- *
- *      See excRegisterHooks for the default setup of this.
- *
- *      Note that to get meaningful debugging information
- *      in this handler's traplog, you need the following:
- *
- *      a)  have a MAP file created at link time (/MAP)
- *
- *      b)  convert the MAP to a SYM file using MAPSYM
- *
- *      c)  put the SYM file in the same directory of
- *          the module (EXE or DLL). This must have the
- *          same filestem as the module.
- *
- *      All other exceptions are passed to the next handler
- *      in the exception handler chain. This might be the
- *      C/C++ compiler handler or the default OS/2 handler,
- *      which will probably terminate the process.
- *
- *@@changed V0.9.0 [umoeller]: added support for thread termination
- *@@changed V0.9.2 (2000-03-10) [umoeller]: switched date format to ISO
- *@@changed V0.9.19 (2002-05-07) [umoeller]: added EXCEPTIONREPORTRECORD info so that catch block can check that
- */
-
-ULONG _System excHandlerLoud(PEXCEPTIONREPORTRECORD pReportRec,
-                             PEXCEPTIONREGISTRATIONRECORD2 pRegRec2,
-                             PCONTEXTRECORD pContextRec,
-                             PVOID pv)
-{
-    /* From the VAC++3 docs:
-     *     "The first thing an exception handler should do is check the
-     *     exception flags. If EH_EXIT_UNWIND is set, meaning
-     *     the thread is ending, the handler tells the operating system
-     *     to pass the exception to the next exception handler. It does the
-     *     same if the EH_UNWINDING flag is set, the flag that indicates
-     *     this exception handler is being removed.
-     *     The EH_NESTED_CALL flag indicates whether the exception
-     *     occurred within an exception handler. If the handler does
-     *     not check this flag, recursive exceptions could occur until
-     *     there is no stack remaining."
-     * So for all these conditions, we exit immediately.
-     */
-
-    if (pReportRec->fHandlerFlags & EH_EXIT_UNWIND)
-       return (XCPT_CONTINUE_SEARCH);
-    if (pReportRec->fHandlerFlags & EH_UNWINDING)
-       return (XCPT_CONTINUE_SEARCH);
-    if (pReportRec->fHandlerFlags & EH_NESTED_CALL)
-       return (XCPT_CONTINUE_SEARCH);
-
-    switch (pReportRec->ExceptionNum)
-    {
-        case XCPT_ACCESS_VIOLATION:
-        case XCPT_INTEGER_DIVIDE_BY_ZERO:
-        case XCPT_ILLEGAL_INSTRUCTION:
-        case XCPT_PRIVILEGED_INSTRUCTION:
-        case XCPT_INVALID_LOCK_SEQUENCE:
-        case XCPT_INTEGER_OVERFLOW:
-        {
-            // "real" exceptions:
-            FILE *file;
-
-            // open traplog file;
-            if (G_pfnExcOpenFile)
-                // hook defined for this: call it
-                file = (*G_pfnExcOpenFile)();
-            else
-            {
-                CHAR szFileName[100];
-                // no hook defined: open some
-                // default traplog file in root directory of
-                // boot drive
-                sprintf(szFileName, "%c:\\trap.log", doshQueryBootDrive());
-                file = fopen(szFileName, "a");
-
-                if (file)
-                {
-                    DATETIME DT;
-                    DosGetDateTime(&DT);
-                    fprintf(file,
-                            "\nTrap message -- Date: %04d-%02d-%02d, Time: %02d:%02d:%02d\n",
-                            DT.year, DT.month, DT.day,
-                            DT.hours, DT.minutes, DT.seconds);
-                    fprintf(file, "------------------------------------------------\n");
-
-                }
-            }
-
-            // write error log
-            excExplainException(file,
-                                "excHandlerLoud",
-                                pReportRec,
-                                pContextRec);
-            fclose(file);
-
-            // copy report rec to user buffer
-            // V0.9.19 (2002-05-07) [umoeller]
-            memcpy(&pRegRec2->err,
-                   pReportRec,
-                   sizeof(EXCEPTIONREPORTRECORD));
-
-            // jump back to failing routine
-            longjmp(pRegRec2->jmpThread, pReportRec->ExceptionNum);
-        break; }
-    }
-
-    // not handled
-    return (XCPT_CONTINUE_SEARCH);
-}
-
-/*
- *@@ excHandlerQuiet:
- *      "quiet" xcpt handler, which simply suppresses exceptions;
- *      this is useful for certain error-prone functions, where
- *      exceptions are likely to appear, for example used by
- *      wpshCheckObject to implement a fail-safe SOM object check.
- *
- *      This does _not_ write an error log and makes _no_ sound.
- *      This simply jumps back to the trapping thread or
- *      calls EXCEPTIONREGISTRATIONRECORD2.pfnOnKill.
- *
- *      Other than that, this behaves like excHandlerLoud.
- *
- *      This is best registered thru the TRY_QUIET macro
- *      (new with V0.84, described in except.c), which
- *      does the necessary setup.
- *
- *@@changed V0.9.0 [umoeller]: added support for thread termination
- *@@changed V0.9.19 (2002-05-07) [umoeller]: added EXCEPTIONREPORTRECORD info so that catch block can check that
- */
-
-ULONG _System excHandlerQuiet(PEXCEPTIONREPORTRECORD pReportRec,
-                              PEXCEPTIONREGISTRATIONRECORD2 pRegRec2,
-                              PCONTEXTRECORD pContextRec,
-                              PVOID pv)
-{
-    if (pReportRec->fHandlerFlags & EH_EXIT_UNWIND)
-       return (XCPT_CONTINUE_SEARCH);
-    if (pReportRec->fHandlerFlags & EH_UNWINDING)
-       return (XCPT_CONTINUE_SEARCH);
-    if (pReportRec->fHandlerFlags & EH_NESTED_CALL)
-       return (XCPT_CONTINUE_SEARCH);
-
-    switch (pReportRec->ExceptionNum)
-    {
-        case XCPT_ACCESS_VIOLATION:
-        case XCPT_INTEGER_DIVIDE_BY_ZERO:
-        case XCPT_ILLEGAL_INSTRUCTION:
-        case XCPT_PRIVILEGED_INSTRUCTION:
-        case XCPT_INVALID_LOCK_SEQUENCE:
-        case XCPT_INTEGER_OVERFLOW:
-            // write excpt explanation only if the
-            // resp. debugging #define is set (setup.h)
-            #ifdef DEBUG_WRITEQUIETEXCPT
-            {
-                FILE *file = excOpenTraplogFile();
-                excExplainException(file,
-                                    "excHandlerQuiet",
-                                    pReportRec,
-                                    pContextRec);
-                fclose(file);
-            }
-            #endif
-
-            // copy report rec to user buffer
-            // V0.9.19 (2002-05-07) [umoeller]
-            memcpy(&pRegRec2->err,
-                   pReportRec,
-                   sizeof(EXCEPTIONREPORTRECORD));
-
-            // jump back to failing routine
-            longjmp(pRegRec2->jmpThread, pReportRec->ExceptionNum);
-        break;
-
-        default:
-             break;
-    }
-
-    return (XCPT_CONTINUE_SEARCH);
-}
-
-
diff --git a/sal/osl/os2/file.cxx b/sal/osl/os2/file.cxx
deleted file mode 100644
index 2e668d23d638..000000000000
--- a/sal/osl/os2/file.cxx
+++ /dev/null
@@ -1,3129 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-/************************************************************************
- *   ToDo
- *
- *   Fix osl_getCanonicalName
- *
- *   - Fix: check for corresponding struct sizes in exported functions
- *   - check size/use of oslDirectory
- *   - check size/use of oslDirectoryItem
- *   - check size/use of oslFileStatus
- *   - check size/use of oslVolumeDeviceHandle
- *   - check size/use of oslVolumeInfo
- *   - check size/use of oslFileHandle
- ***********************************************************************/
-
-#define INCL_DOSDEVIOCTL                        // OS2 device definitions
-
-#include "system.h"
-#include <rtl/alloc.h>
-
-#include "osl/file.hxx"
-
-
-#include <sal/types.h>
-#include <osl/thread.h>
-#include <osl/diagnose.h>
-#include "file_error_transl.h"
-#include <osl/time.h>
-
-#ifndef _FILE_URL_H_
-#include "file_url.h"
-#endif
-
-#include "file_path_helper.hxx"
-#include "uunxapi.hxx"
-
-#ifndef _STRING_H_
-#include <string.h>
-#endif
-
-#ifndef _CTYPE_H_
-#include <ctype.h>
-#endif
-
-#ifndef _WCHAR_H_
-#include <wchar.h>
-#endif
-
-#if OSL_DEBUG_LEVEL > 1
-    extern void debug_ustring(rtl_uString*);
-#endif
-
-
-#ifdef DEBUG_OSL_FILE
-#   define PERROR( a, b ) perror( a ); fprintf( stderr, b )
-#else
-#   define PERROR( a, b )
-#endif
-
-extern "C" oslFileHandle osl_createFileHandleFromFD( int fd );
-
-    struct errentry errtable[] = {
-        {  NO_ERROR,             osl_File_E_None     },  /* 0 */
-        {  ERROR_INVALID_FUNCTION,       osl_File_E_INVAL    },  /* 1 */
-        {  ERROR_FILE_NOT_FOUND,         osl_File_E_NOENT    },  /* 2 */
-        {  ERROR_PATH_NOT_FOUND,         osl_File_E_NOENT    },  /* 3 */
-        {  ERROR_TOO_MANY_OPEN_FILES,    osl_File_E_MFILE    },  /* 4 */
-        {  ERROR_ACCESS_DENIED,          osl_File_E_ACCES    },  /* 5 */
-        {  ERROR_INVALID_HANDLE,         osl_File_E_BADF     },  /* 6 */
-        {  ERROR_ARENA_TRASHED,          osl_File_E_NOMEM    },  /* 7 */
-        {  ERROR_NOT_ENOUGH_MEMORY,      osl_File_E_NOMEM    },  /* 8 */
-        {  ERROR_INVALID_BLOCK,          osl_File_E_NOMEM    },  /* 9 */
-        {  ERROR_BAD_ENVIRONMENT,        osl_File_E_2BIG     },  /* 10 */
-        {  ERROR_BAD_FORMAT,             osl_File_E_NOEXEC   },  /* 11 */
-        {  ERROR_INVALID_ACCESS,         osl_File_E_INVAL    },  /* 12 */
-        {  ERROR_INVALID_DATA,           osl_File_E_INVAL    },  /* 13 */
-        {  ERROR_INVALID_DRIVE,          osl_File_E_NOENT    },  /* 15 */
-        {  ERROR_CURRENT_DIRECTORY,      osl_File_E_ACCES    },  /* 16 */
-        {  ERROR_NOT_SAME_DEVICE,        osl_File_E_XDEV     },  /* 17 */
-        {  ERROR_NO_MORE_FILES,          osl_File_E_NOENT    },  /* 18 */
-        {  ERROR_NOT_READY,              osl_File_E_NOTREADY },  /* 21 */
-        {  ERROR_LOCK_VIOLATION,         osl_File_E_ACCES    },  /* 33 */
-        {  ERROR_BAD_NETPATH,            osl_File_E_NOENT    },  /* 53 */
-        {  ERROR_NETWORK_ACCESS_DENIED,  osl_File_E_ACCES    },  /* 65 */
-        {  ERROR_BAD_NET_NAME,           osl_File_E_NOENT    },  /* 67 */
-        {  ERROR_FILE_EXISTS,            osl_File_E_EXIST    },  /* 80 */
-        {  ERROR_CANNOT_MAKE,            osl_File_E_ACCES    },  /* 82 */
-        {  ERROR_FAIL_I24,               osl_File_E_ACCES    },  /* 83 */
-        {  ERROR_INVALID_PARAMETER,      osl_File_E_INVAL    },  /* 87 */
-        {  ERROR_NO_PROC_SLOTS,          osl_File_E_AGAIN    },  /* 89 */
-        {  ERROR_DRIVE_LOCKED,           osl_File_E_ACCES    },  /* 108 */
-        {  ERROR_BROKEN_PIPE,            osl_File_E_PIPE     },  /* 109 */
-        {  ERROR_DISK_FULL,              osl_File_E_NOSPC    },  /* 112 */
-        {  ERROR_INVALID_TARGET_HANDLE,  osl_File_E_BADF     },  /* 114 */
-        {  ERROR_INVALID_HANDLE,         osl_File_E_INVAL    },  /* 124 */
-        {  ERROR_WAIT_NO_CHILDREN,       osl_File_E_CHILD    },  /* 128 */
-        {  ERROR_CHILD_NOT_COMPLETE,     osl_File_E_CHILD    },  /* 129 */
-        {  ERROR_DIRECT_ACCESS_HANDLE,   osl_File_E_BADF     },  /* 130 */
-        {  ERROR_NEGATIVE_SEEK,          osl_File_E_INVAL    },  /* 131 */
-        {  ERROR_SEEK_ON_DEVICE,         osl_File_E_ACCES    },  /* 132 */
-        {  ERROR_DIR_NOT_EMPTY,          osl_File_E_NOTEMPTY },  /* 145 */
-        {  ERROR_NOT_LOCKED,             osl_File_E_ACCES    },  /* 158 */
-        {  ERROR_BAD_PATHNAME,           osl_File_E_NOENT    },  /* 161 */
-        {  ERROR_MAX_THRDS_REACHED,      osl_File_E_AGAIN    },  /* 164 */
-        {  ERROR_LOCK_FAILED,            osl_File_E_ACCES    },  /* 167 */
-        {  ERROR_ALREADY_EXISTS,         osl_File_E_EXIST    },  /* 183 */
-        {  ERROR_FILENAME_EXCED_RANGE,   osl_File_E_NOENT    },  /* 206 */
-        {  ERROR_NESTING_NOT_ALLOWED,    osl_File_E_AGAIN    },  /* 215 */
-        {  ERROR_DIRECTORY,              osl_File_E_NOENT    },  /* 267 */
-        //{  ERROR_NOT_ENOUGH_QUOTA,       osl_File_E_NOMEM    }    /* 1816 */
-    };
-
-    #define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0])))
-
-    //#####################################################
-    oslFileError MapError(APIRET dwError)
-    {
-        for (int i = 0; i < ELEMENTS_OF_ARRAY(errtable); ++i )
-        {
-            if (dwError == errtable[i].oscode)
-                return static_cast<oslFileError>(errtable[i].errnocode);
-        }
-        return osl_File_E_INVAL;
-    }
-
-/******************************************************************************
- *
- *                  static members
- *
- *****************************************************************************/
-
-static const char * pFileLockEnvVar = (char *) -1;
-
-
-/******************************************************************************
- *
- *                  C-String Function Declarations
- *
- *****************************************************************************/
-
-static oslFileError osl_psz_getVolumeInformation(const sal_Char* , oslVolumeInfo* pInfo, sal_uInt32 uFieldMask);
-static oslFileError osl_psz_removeFile(const sal_Char* pszPath);
-static oslFileError osl_psz_createDirectory(const sal_Char* pszPath);
-static oslFileError osl_psz_removeDirectory(const sal_Char* pszPath);
-static oslFileError osl_psz_copyFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
-static oslFileError osl_psz_moveFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
-static oslFileError osl_psz_setFileTime(const sal_Char* strFilePath, const TimeValue* pCreationTime, const TimeValue* pLastAccessTime, const TimeValue* pLastWriteTime);
-
-
-/******************************************************************************
- *
- *                  Static Module Utility Function Declarations
- *
- *****************************************************************************/
-
-static oslFileError  oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, mode_t nMode, size_t nSourceSize, int DestFileExists);
-static oslFileError  oslChangeFileModes(const sal_Char* pszFileName, mode_t nMode, time_t nAcTime, time_t nModTime, uid_t nUID, gid_t nGID);
-static int           oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName);
-static int           oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode);
-static oslFileError  oslDoMoveFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
-rtl_uString*  oslMakeUStrFromPsz(const sal_Char* pszStr,rtl_uString** uStr);
-
-/******************************************************************************
- *
- *                  Non-Static Utility Function Declarations
- *
- *****************************************************************************/
-
-extern "C" int UnicodeToText( char *, size_t, const sal_Unicode *, sal_Int32 );
-extern "C" int TextToUnicode(
-    const char* text, size_t text_buffer_size,  sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
-
-/******************************************************************************
- *
- *                  'removeable device' aka floppy functions
- *
- *****************************************************************************/
-
-static oslVolumeDeviceHandle  osl_isFloppyDrive(const sal_Char* pszPath);
-static oslFileError   osl_mountFloppy(oslVolumeDeviceHandle hFloppy);
-static oslFileError   osl_unmountFloppy(oslVolumeDeviceHandle hFloppy);
-
-#ifdef DEBUG_OSL_FILE
-static void           osl_printFloppyHandle(oslVolumeDeviceHandleImpl* hFloppy);
-#endif
-
-/**********************************************
- * _osl_openLocalRoot
- * enumerate available drives
- *********************************************/
-static oslFileError _osl_openLocalRoot( rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
-{
-    rtl_uString     *ustrSystemPath = NULL;
-    oslFileError    error;
-
-    if ( !pDirectory )
-        return osl_File_E_INVAL;
-
-    *pDirectory = NULL;
-
-    error = osl_getSystemPathFromFileURL_Ex( strDirectoryPath, &ustrSystemPath, sal_False );
-
-    if ( osl_File_E_None == error )
-    {
-        /* create and initialize impl structure */
-        DirectoryImpl* pDirImpl = (DirectoryImpl*) rtl_allocateMemory( sizeof(DirectoryImpl) );
-        if( pDirImpl )
-        {
-            ULONG   ulDriveNum;
-            APIRET  rc;
-            pDirImpl->uType = DIRECTORYTYPE_LOCALROOT;
-            pDirImpl->ustrPath = ustrSystemPath;
-            rc = DosQueryCurrentDisk (&ulDriveNum, &pDirImpl->ulDriveMap);
-            pDirImpl->pDirStruct = 0;
-            pDirImpl->ulNextDrive = 1;
-            pDirImpl->ulNextDriveMask = 1;
-
-            // determine number of floppy-drives
-            BYTE nFloppies;
-            rc = DosDevConfig( (void*) &nFloppies, DEVINFO_FLOPPY );
-            if (nFloppies == 0) {
-                // if no floppies, start with 3rd drive (C:)
-                pDirImpl->ulNextDrive = 3;
-                pDirImpl->ulNextDriveMask <<= 2;
-            } else if (nFloppies == 1) {
-                // mask drive B (second bit) in this case
-                pDirImpl->ulDriveMap &= ~0x02;
-            }
-            *pDirectory = (oslDirectory) pDirImpl;
-            return osl_File_E_None;
-        }
-        else
-        {
-            errno = osl_File_E_NOMEM;
-        }
-
-    }
-
-    rtl_uString_release( ustrSystemPath );
-    return error;
-}
-
-/**********************************************
- * _osl_getNextDrive
- *********************************************/
-static oslFileError SAL_CALL _osl_getNextDrive(
-    oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint )
-{
-    DirectoryImpl   *pDirImpl = (DirectoryImpl *)Directory;
-    DirectoryItem_Impl  *pItemImpl = NULL;
-    rtl_uString         * ustrDrive = NULL;
-    BOOL                fSuccess;
-    char                buffer[3];
-
-    uHint = uHint; /* avoid warnings */
-
-    if ( !pItem )
-        return osl_File_E_INVAL;
-
-    *pItem = NULL;
-
-    if ( !pDirImpl )
-        return osl_File_E_INVAL;
-
-    while( pDirImpl->ulNextDrive <= 26)
-    {
-        // exit if  bit==1 -> drive found
-        if (pDirImpl->ulDriveMap & pDirImpl->ulNextDriveMask) {
-
-            /* convert file name to unicode */
-            buffer[0] = '@' + pDirImpl->ulNextDrive;
-            buffer[1] = ':';
-            buffer[2] = 0;
-
-            pItemImpl = (DirectoryItem_Impl*) rtl_allocateMemory(sizeof(DirectoryItem_Impl));
-            if ( !pItemImpl )
-                return osl_File_E_NOMEM;
-
-            memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
-            pItemImpl->uType = DIRECTORYITEM_DRIVE;
-            pItemImpl->nRefCount = 1;
-
-            rtl_string2UString( &pItemImpl->ustrDrive, buffer, 3,
-                osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
-            OSL_ASSERT(pItemImpl->ustrDrive != 0);
-
-            /* use drive as directory item */
-            *pItem = (oslDirectoryItem) pItemImpl;
-        }
-        // scan next bit position
-        pDirImpl->ulNextDrive++;
-        pDirImpl->ulNextDriveMask <<= 1;
-
-        if (*pItem) // item assigned, return now.
-            return osl_File_E_None;
-    }
-
-    // no more items
-    return osl_File_E_NOENT;
-}
-
-/**********************************************
- * _osl_readdir_impl_
- *
- * readdir wrapper, filters out "." and ".."
- * on request
- *********************************************/
-
-static struct dirent* _osl_readdir_impl_(DIR* pdir, sal_Bool bFilterLocalAndParentDir)
-{
-    struct dirent* pdirent;
-
-    while ((pdirent = readdir(pdir)) != NULL)
-    {
-        if (bFilterLocalAndParentDir &&
-            ((0 == strcmp(pdirent->d_name, ".")) || (0 == strcmp(pdirent->d_name, ".."))))
-            continue;
-        else
-            break;
-    }
-
-    return pdirent;
-}
-
-/*******************************************************************
- *  osl_openDirectory
- ******************************************************************/
-
-oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirectory* pDirectory)
-{
-    rtl_uString* ustrSystemPath = NULL;
-    oslFileError eRet;
-
-    char path[PATH_MAX];
-
-    OSL_ASSERT(ustrDirectoryURL && (ustrDirectoryURL->length > 0));
-    OSL_ASSERT(pDirectory);
-
-    if (0 == ustrDirectoryURL->length )
-        return osl_File_E_INVAL;
-
-    if ( 0 == rtl_ustr_compareIgnoreAsciiCase( ustrDirectoryURL->buffer, (const sal_Unicode*)L"file:///" ) )
-        return _osl_openLocalRoot( ustrDirectoryURL, pDirectory );
-
-    /* convert file URL to system path */
-    eRet = osl_getSystemPathFromFileURL_Ex(ustrDirectoryURL, &ustrSystemPath, sal_False);
-
-    if( osl_File_E_None != eRet )
-        return eRet;
-
-    osl_systemPathRemoveSeparator(ustrSystemPath);
-
-    /* convert unicode path to text */
-    if ( UnicodeToText( path, PATH_MAX, ustrSystemPath->buffer, ustrSystemPath->length ) )
-    {
-        // if only the drive is specified (x:), add a \ (x:\) otherwise current
-        // directory is browsed instead of root.
-        if (strlen( path) == 2 && path[1] == ':')
-            strcat( path, "\\");
-        /* open directory */
-        DIR *pdir = opendir( path );
-
-        if( pdir )
-        {
-            /* create and initialize impl structure */
-            DirectoryImpl* pDirImpl = (DirectoryImpl*) rtl_allocateMemory( sizeof(DirectoryImpl) );
-
-            if( pDirImpl )
-            {
-                pDirImpl->uType = DIRECTORYTYPE_FILESYSTEM;
-                pDirImpl->pDirStruct = pdir;
-                pDirImpl->ustrPath = ustrSystemPath;
-
-                *pDirectory = (oslDirectory) pDirImpl;
-                return osl_File_E_None;
-            }
-            else
-            {
-                errno = ENOMEM;
-                closedir( pdir );
-            }
-        }
-        else
-            /* should be removed by optimizer in product version */
-            PERROR( "osl_openDirectory", path );
-    }
-
-    rtl_uString_release( ustrSystemPath );
-
-    return oslTranslateFileError(OSL_FET_ERROR, errno);
-}
-
-
-/****************************************************************************
- *  osl_getNextDirectoryItem
- ***************************************************************************/
-
-oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirectoryItem* pItem, sal_uInt32 uHint)
-{
-    DirectoryImpl* pDirImpl     = (DirectoryImpl*)Directory;
-    DirectoryItem_Impl  *pItemImpl = NULL;
-    rtl_uString*      ustrFileName = NULL;
-    rtl_uString*      ustrFilePath = NULL;
-    struct dirent*    pEntry;
-
-    OSL_ASSERT(Directory);
-    OSL_ASSERT(pItem);
-
-    if ((NULL == Directory) || (NULL == pItem))
-        return osl_File_E_INVAL;
-
-    if ( pDirImpl->uType == DIRECTORYTYPE_LOCALROOT)
-        return _osl_getNextDrive( Directory, pItem, uHint );
-
-    pEntry = _osl_readdir_impl_(pDirImpl->pDirStruct, sal_True);
-
-    if (NULL == pEntry)
-        return osl_File_E_NOENT;
-
-    pItemImpl = (DirectoryItem_Impl*) rtl_allocateMemory(sizeof(DirectoryItem_Impl));
-    if ( !pItemImpl )
-        return osl_File_E_NOMEM;
-
-    memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
-    pItemImpl->uType = DIRECTORYITEM_FILE;
-    pItemImpl->nRefCount = 1;
-    pItemImpl->d_attr = pEntry->d_attr;
-
-    /* convert file name to unicode */
-    rtl_string2UString( &ustrFileName, pEntry->d_name, strlen( pEntry->d_name ),
-        osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
-    OSL_ASSERT(ustrFileName != 0);
-
-    osl_systemPathMakeAbsolutePath(pDirImpl->ustrPath, ustrFileName, &pItemImpl->ustrFilePath);
-    rtl_uString_release( ustrFileName );
-
-    *pItem = (oslDirectoryItem)pItemImpl;
-    return osl_File_E_None;
-}
-
-/****************************************************************************/
-/*  osl_closeDirectory */
-/****************************************************************************/
-
-oslFileError SAL_CALL osl_closeDirectory( oslDirectory Directory )
-{
-    DirectoryImpl* pDirImpl = (DirectoryImpl*) Directory;
-    oslFileError err = osl_File_E_None;
-
-    OSL_ASSERT( Directory );
-
-    if( NULL == pDirImpl )
-        return osl_File_E_INVAL;
-
-    switch ( pDirImpl->uType )
-    {
-    case DIRECTORYTYPE_FILESYSTEM:
-        if( closedir( pDirImpl->pDirStruct ) )
-            err = oslTranslateFileError(OSL_FET_ERROR, errno);
-        break;
-    case DIRECTORYTYPE_LOCALROOT:
-        err = osl_File_E_None;
-        break;
-#if 0
-    case DIRECTORYTYPE_NETROOT:
-        {
-            DWORD err = WNetCloseEnum(pDirImpl->hDirectory);
-            eError = (err == NO_ERROR) ? osl_File_E_None : MapError(err);
-        }
-        break;
-#endif
-    default:
-        OSL_ENSURE( 0, "Invalid directory type" );
-        break;
-    }
-
-    /* cleanup members */
-    rtl_uString_release( pDirImpl->ustrPath );
-
-    rtl_freeMemory( pDirImpl );
-
-    return err;
-}
-
-/****************************************************************************/
-/*  osl_getDirectoryItem */
-/****************************************************************************/
-
-oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirectoryItem* pItem )
-{
-    rtl_uString*    strSysFilePath = NULL;
-    oslFileError    error      = osl_File_E_INVAL;
-    ULONG           dwPathType;
-    PATHTYPE        type = PATHTYPE_FILE;
-
-    OSL_ASSERT(ustrFileURL);
-    OSL_ASSERT(pItem);
-
-    /* Assume failure */
-    if ( !pItem )
-        return osl_File_E_INVAL;
-    *pItem = NULL;
-
-    if (0 == ustrFileURL->length || NULL == pItem)
-        return osl_File_E_INVAL;
-
-    error = osl_getSystemPathFromFileURL_Ex(ustrFileURL, &strSysFilePath, sal_False);
-
-    if (osl_File_E_None != error)
-        return error;
-
-    dwPathType = IsValidFilePath( strSysFilePath->buffer, NULL, VALIDATEPATH_NORMAL );
-
-    if ( dwPathType & PATHTYPE_IS_VOLUME )
-        type = PATHTYPE_VOLUME;
-    else if ( dwPathType & PATHTYPE_IS_SERVER )
-        type = PATHTYPE_NETSERVER;
-    else
-        type = PATHTYPE_FILE;
-
-    switch ( type )
-    {
-    case PATHTYPE_NETSERVER:
-        {
-            DirectoryItem_Impl* pItemImpl =
-                reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
-
-            if ( !pItemImpl )
-                error = osl_File_E_NOMEM;
-
-            if ( osl_File_E_None == error )
-            {
-                memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
-                pItemImpl->uType = DIRECTORYITEM_SERVER;
-                pItemImpl->nRefCount = 1;
-                rtl_uString_assign( &pItemImpl->ustrFilePath, strSysFilePath );
-
-                *pItem = pItemImpl;
-            }
-        }
-        break;
-    case PATHTYPE_VOLUME:
-        {
-            DirectoryItem_Impl* pItemImpl =
-                reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
-
-            if ( !pItemImpl )
-                error = osl_File_E_NOMEM;
-
-            if ( osl_File_E_None == error )
-            {
-                memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
-                pItemImpl->uType = DIRECTORYITEM_DRIVE;
-                pItemImpl->nRefCount = 1;
-                rtl_uString_assign( &pItemImpl->ustrDrive, strSysFilePath );
-
-                if ( pItemImpl->ustrDrive->buffer[pItemImpl->ustrDrive->length-1] != sal_Unicode('\\') )
-                    rtl_uString_newConcat( &pItemImpl->ustrDrive,
-                                            pItemImpl->ustrDrive, rtl::OUString::createFromAscii( "\\" ).pData);
-
-                *pItem = pItemImpl;
-            }
-        }
-        break;
-    default:
-    case PATHTYPE_FILE:
-        {
-            if ( strSysFilePath->length > 0 && strSysFilePath->buffer[strSysFilePath->length - 1] == '\\' )
-                rtl_uString_newFromStr_WithLength( &strSysFilePath, strSysFilePath->buffer, strSysFilePath->length - 1 );
-
-            if (0 == access_u(strSysFilePath, F_OK))
-            {
-                DirectoryItem_Impl  *pItemImpl =
-                    reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
-
-                memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
-                pItemImpl->uType = DIRECTORYITEM_FILE;
-                pItemImpl->nRefCount = 1;
-                rtl_uString_assign( &pItemImpl->ustrFilePath, strSysFilePath );
-
-                *pItem = pItemImpl;
-            }
-            else
-                error = oslTranslateFileError(OSL_FET_ERROR, errno);
-        }
-        break;
-    }
-
-    if ( strSysFilePath )
-        rtl_uString_release( strSysFilePath );
-
-    return error;
-}
-
-/****************************************************************************/
-/*  osl_acquireDirectoryItem */
-/****************************************************************************/
-
-oslFileError osl_acquireDirectoryItem( oslDirectoryItem Item )
-{
-    OSL_ASSERT( Item );
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
-
-    if ( !pItemImpl )
-        return osl_File_E_INVAL;
-
-    pItemImpl->nRefCount++;
-    return osl_File_E_None;
-}
-
-/****************************************************************************/
-/*  osl_releaseDirectoryItem */
-/****************************************************************************/
-
-oslFileError osl_releaseDirectoryItem( oslDirectoryItem Item )
-{
-    OSL_ASSERT( Item );
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
-
-    if ( !pItemImpl )
-        return osl_File_E_INVAL;
-
-    if ( ! --pItemImpl->nRefCount )
-    {
-        if (pItemImpl->ustrFilePath)
-            rtl_uString_release( pItemImpl->ustrFilePath );
-        if (pItemImpl->ustrDrive)
-            rtl_uString_release( pItemImpl->ustrDrive );
-        rtl_freeMemory( pItemImpl );
-    }
-    return osl_File_E_None;
-}
-
-/****************************************************************************
- *  osl_createFileHandleFromFD
- ***************************************************************************/
-
-oslFileHandle osl_createFileHandleFromFD( int fd )
-{
-    oslFileHandleImpl* pHandleImpl = NULL;
-
-    if ( fd >= 0 )
-    {
-        pHandleImpl = (oslFileHandleImpl*) rtl_allocateMemory( sizeof(oslFileHandleImpl) );
-
-        if( pHandleImpl )
-        {
-            pHandleImpl->ustrFilePath = NULL;
-            rtl_uString_new( &pHandleImpl->ustrFilePath );
-            pHandleImpl->fd = fd;
-
-            /* FIXME: should detect whether the file has been locked */
-            pHandleImpl->bLocked = sal_True;
-        }
-    }
-
-    return (oslFileHandle)pHandleImpl;
-}
-
-/****************************************************************************
- *  osl_openFile
- ***************************************************************************/
-
-oslFileError osl_openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, sal_uInt32 uFlags )
-{
-    oslFileHandleImpl* pHandleImpl = NULL;
-    oslFileError eRet;
-    rtl_uString* ustrFilePath = NULL;
-
-    char buffer[PATH_MAX];
-    int  fd;
-    int  mode  = S_IRUSR | S_IRGRP | S_IROTH;
-    int  flags = O_RDONLY;
-
-    struct flock aflock;
-
-    /* locking the complete file */
-    aflock.l_type = 0;
-    aflock.l_whence = SEEK_SET;
-    aflock.l_start = 0;
-    aflock.l_len = 0;
-
-    OSL_ASSERT( ustrFileURL );
-    OSL_ASSERT( pHandle );
-
-    if( ( 0 == ustrFileURL->length ) )
-        return osl_File_E_INVAL;
-
-    /* convert file URL to system path */
-    eRet = osl_getSystemPathFromFileURL( ustrFileURL, &ustrFilePath );
-
-    if( osl_File_E_None != eRet )
-        return eRet;
-
-    osl_systemPathRemoveSeparator(ustrFilePath);
-
-    /* convert unicode path to text */
-    if( UnicodeToText( buffer, PATH_MAX, ustrFilePath->buffer, ustrFilePath->length ) )
-    {
-        /* we do not open devices or such here */
-        if( !( uFlags & osl_File_OpenFlag_Create ) )
-        {
-            struct stat aFileStat;
-
-            if( 0 > stat( buffer, &aFileStat ) )
-            {
-                PERROR( "osl_openFile", buffer );
-                eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-            }
-
-            else if( !S_ISREG( aFileStat.st_mode ) )
-            {
-                eRet = osl_File_E_INVAL;
-            }
-        }
-
-        if( osl_File_E_None == eRet )
-        {
-            /*
-             * set flags and mode
-             */
-
-            if ( uFlags & osl_File_OpenFlag_Write )
-            {
-                mode |= S_IWUSR | S_IWGRP | S_IWOTH;
-                flags = O_RDWR;
-                aflock.l_type = F_WRLCK;
-            }
-
-            if ( uFlags & osl_File_OpenFlag_Create )
-            {
-                mode |= S_IWUSR | S_IWGRP | S_IWOTH;
-                flags = O_CREAT | O_EXCL | O_RDWR;
-            }
-
-            /* open the file */
-            fd = open( buffer, flags | O_BINARY, mode);
-            if ( fd >= 0 )
-            {
-                sal_Bool bNeedsLock = ( ( uFlags & osl_File_OpenFlag_NoLock ) == 0 );
-                sal_Bool bLocked = sal_False;
-                if( bNeedsLock )
-                {
-                    /* check if file lock is enabled and clear l_type member of flock otherwise */
-                    if( (char *) -1 == pFileLockEnvVar )
-                    {
-                        /* FIXME: this is not MT safe */
-                        pFileLockEnvVar = getenv("SAL_ENABLE_FILE_LOCKING");
-
-                        if( NULL == pFileLockEnvVar)
-                            pFileLockEnvVar = getenv("STAR_ENABLE_FILE_LOCKING");
-                    }
-
-                    if( NULL == pFileLockEnvVar )
-                        aflock.l_type = 0;
-
-                    /* lock the file if flock.l_type is set */
-                    bLocked = ( F_WRLCK != aflock.l_type || -1 != fcntl( fd, F_SETLK, &aflock ) );
-                }
-
-                if ( !bNeedsLock || bLocked )
-                {
-                    /* allocate memory for impl structure */
-                    pHandleImpl = (oslFileHandleImpl*) rtl_allocateMemory( sizeof(oslFileHandleImpl) );
-                    if( pHandleImpl )
-                    {
-                        pHandleImpl->ustrFilePath = ustrFilePath;
-                        pHandleImpl->fd = fd;
-                        pHandleImpl->bLocked = bLocked;
-
-                        *pHandle = (oslFileHandle) pHandleImpl;
-
-                        return osl_File_E_None;
-                    }
-                    else
-                    {
-                        errno = ENOMEM;
-                    }
-                }
-
-                close( fd );
-            }
-
-            PERROR( "osl_openFile", buffer );
-            eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-        }
-    }
-    else
-        eRet = osl_File_E_INVAL;
-
-    rtl_uString_release( ustrFilePath );
-    return eRet;
-}
-
-/****************************************************************************/
-/*  osl_closeFile */
-/****************************************************************************/
-
-oslFileError osl_closeFile( oslFileHandle Handle )
-{
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl *) Handle;
-    oslFileError eRet = osl_File_E_INVAL;
-
-    OSL_ASSERT( Handle );
-
-    if( pHandleImpl )
-    {
-        rtl_uString_release( pHandleImpl->ustrFilePath );
-
-        /* release file lock if locking is enabled */
-        if( pFileLockEnvVar )
-        {
-            struct flock aflock;
-
-            aflock.l_type = F_UNLCK;
-            aflock.l_whence = SEEK_SET;
-            aflock.l_start = 0;
-            aflock.l_len = 0;
-
-            if ( pHandleImpl->bLocked )
-            {
-                /* FIXME: check if file is really locked ?  */
-
-                /* release the file share lock on this file */
-                if( -1 == fcntl( pHandleImpl->fd, F_SETLK, &aflock ) )
-                    PERROR( "osl_closeFile", "unlock failed" );
-            }
-        }
-
-        if( 0 > close( pHandleImpl->fd ) )
-        {
-            eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-        }
-        else
-            eRet = osl_File_E_None;
-
-        rtl_freeMemory( pHandleImpl );
-    }
-
-    return eRet;
-}
-
-/****************************************************************************/
-/*  osl_isEndOfFile */
-/****************************************************************************/
-
-oslFileError SAL_CALL osl_isEndOfFile( oslFileHandle Handle, sal_Bool *pIsEOF )
-{
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl *) Handle;
-    oslFileError eRet = osl_File_E_INVAL;
-
-    if ( pHandleImpl)
-    {
-        long curPos = lseek( pHandleImpl->fd, 0, SEEK_CUR );
-
-        if ( curPos >= 0 )
-        {
-            long endPos = lseek( pHandleImpl->fd, 0, SEEK_END  );
-
-            if ( endPos >= 0 )
-            {
-                *pIsEOF = ( curPos == endPos );
-                curPos = lseek( pHandleImpl->fd, curPos, SEEK_SET );
-
-                if ( curPos >= 0 )
-                    eRet = osl_File_E_None;
-                else
-                    eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-            }
-            else
-                eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-        }
-        else
-            eRet = oslTranslateFileError(OSL_FET_ERROR, errno );
-    }
-
-    return eRet;
-}
-
-
-/****************************************************************************/
-/*  osl_moveFile */
-/****************************************************************************/
-
-oslFileError osl_moveFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
-{
-    char srcPath[PATH_MAX];
-    char destPath[PATH_MAX];
-    oslFileError eRet;
-    APIRET rc;
-
-    OSL_ASSERT( ustrFileURL );
-    OSL_ASSERT( ustrDestURL );
-
-    /* convert source url to system path */
-    eRet = FileURLToPath( srcPath, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    /* convert destination url to system path */
-    eRet = FileURLToPath( destPath, PATH_MAX, ustrDestURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    //YD 01/05/06 rename() can overwrite existing files.
-    rc = DosDelete( (PCSZ)destPath);
-    rc = DosMove( (PCSZ)srcPath, (PCSZ)destPath);
-    if (!rc)
-        eRet = osl_File_E_None;
-    else
-        eRet = MapError( rc);
-
-    return eRet;
-}
-
-/****************************************************************************/
-/*  osl_copyFile */
-/****************************************************************************/
-
-#define TMP_DEST_FILE_EXTENSION ".osl-tmp"
-
-static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, mode_t nMode, size_t nSourceSize, int DestFileExists)
-{
-    int      nRet=0;
-    sal_Char pszTmpDestFile[PATH_MAX];
-    size_t   size_tmp_dest_buff = sizeof(pszTmpDestFile);
-
-    /* Quick fix for #106048, the whole copy file function seems
-       to be erroneous anyway and needs to be rewritten.
-       Besides osl_copyFile is currently not used from OO/SO code.
-    */
-    memset(pszTmpDestFile, 0, size_tmp_dest_buff);
-
-    if ( DestFileExists )
-    {
-        strncpy(pszTmpDestFile, pszDestFileName, size_tmp_dest_buff - 1);
-
-        if ((strlen(pszTmpDestFile) + strlen(TMP_DEST_FILE_EXTENSION)) >= size_tmp_dest_buff)
-            return osl_File_E_NAMETOOLONG;
-
-        strncat(pszTmpDestFile, TMP_DEST_FILE_EXTENSION, strlen(TMP_DEST_FILE_EXTENSION));
-
-        /* FIXME: what if pszTmpDestFile already exists? */
-        /*        with getcanonical??? */
-        nRet=rename(pszDestFileName,pszTmpDestFile);
-    }
-
-    /* mfe: should be S_ISREG */
-    if ( !S_ISLNK(nMode) )
-    {
-        /* copy SourceFile to DestFile */
-        nRet = oslDoCopyFile(pszSourceFileName,pszDestFileName,nSourceSize, nMode);
-    }
-    /* mfe: OK redundant at the moment */
-    else if ( S_ISLNK(nMode) )
-    {
-        nRet = oslDoCopyLink(pszSourceFileName,pszDestFileName);
-    }
-    else
-    {
-        /* mfe: what to do here? */
-        nRet=ENOSYS;
-    }
-
-    if ( nRet > 0 && DestFileExists == 1 )
-    {
-        unlink(pszDestFileName);
-        rename(pszTmpDestFile,pszDestFileName);
-    }
-
-    if ( nRet > 0 )
-    {
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    if ( DestFileExists == 1 )
-    {
-        unlink(pszTmpDestFile);
-    }
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * oslChangeFileModes
- ****************************************/
-
-static oslFileError oslChangeFileModes( const sal_Char* pszFileName, mode_t nMode, time_t nAcTime, time_t nModTime, uid_t nUID, gid_t nGID)
-{
-    int nRet=0;
-    struct utimbuf aTimeBuffer;
-
-    nRet = chmod(pszFileName,nMode);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    aTimeBuffer.actime=nAcTime;
-    aTimeBuffer.modtime=nModTime;
-    nRet=utime(pszFileName,&aTimeBuffer);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    if ( nUID != getuid() )
-    {
-        nUID=getuid();
-    }
-
-    nRet=chown(pszFileName,nUID,nGID);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-
-        /* mfe: do not return an error here! */
-        /* return oslTranslateFileError(nRet);*/
-    }
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * oslDoCopyLink
- ****************************************/
-
-static int oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName)
-{
-    int nRet=0;
-
-    /* mfe: if dest file is symbolic link remove the link and place the file instead (hro says so) */
-    /* mfe: if source is a link copy the link and not the file it points to (hro says so) */
-    sal_Char pszLinkContent[PATH_MAX];
-
-    pszLinkContent[0] = '\0';
-
-    nRet = readlink(pszSourceFileName,pszLinkContent,PATH_MAX);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return nRet;
-    }
-    else
-        pszLinkContent[ nRet ] = 0;
-
-    nRet = symlink(pszLinkContent,pszDestFileName);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return nRet;
-    }
-
-    return 0;
-}
-
-/*****************************************
- * oslDoCopyFile
- ****************************************/
-
-static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode)
-{
-    int SourceFileFD=0;
-    int DestFileFD=0;
-    int nRet=0;
-    void* pSourceFile=0;
-    char    buffer[ 4096];
-
-    SourceFileFD=open(pszSourceFileName,O_RDONLY | O_BINARY);
-    if ( SourceFileFD < 0 )
-    {
-        nRet=errno;
-        return nRet;
-    }
-
-    DestFileFD=open(pszDestFileName, O_WRONLY | O_CREAT | O_BINARY, mode);
-    if ( DestFileFD < 0 )
-    {
-        nRet=errno;
-        close(SourceFileFD);
-        return nRet;
-    }
-
-    /* HACK: because memory mapping fails on various
-       platforms if the size of the source file is  0 byte */
-    if (0 == nSourceSize)
-    {
-        close(SourceFileFD);
-        close(DestFileFD);
-        return 0;
-    }
-
-    while( (nRet = read(SourceFileFD, buffer, sizeof(buffer))) !=0 )
-    {
-        nRet = write( DestFileFD, buffer, nRet);
-    }
-
-    close(SourceFileFD);
-    close(DestFileFD);
-
-    return nRet;
-}
-
-static oslFileError osl_psz_copyFile( const sal_Char* pszPath, const sal_Char* pszDestPath )
-{
-    time_t nAcTime=0;
-    time_t nModTime=0;
-    uid_t nUID=0;
-    gid_t nGID=0;
-    int nRet=0;
-    mode_t nMode=0;
-    struct stat aFileStat;
-    oslFileError tErr=osl_File_E_invalidError;
-    size_t nSourceSize=0;
-    int DestFileExists=1;
-
-    /* mfe: does the source file really exists? */
-    nRet = lstat(pszPath,&aFileStat);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    /* mfe: we do only copy files here! */
-    if ( S_ISDIR(aFileStat.st_mode) )
-    {
-        return osl_File_E_ISDIR;
-    }
-
-    nSourceSize=(size_t)aFileStat.st_size;
-    nMode=aFileStat.st_mode;
-    nAcTime=aFileStat.st_atime;
-    nModTime=aFileStat.st_mtime;
-    nUID=aFileStat.st_uid;
-    nGID=aFileStat.st_gid;
-
-    nRet = stat(pszDestPath,&aFileStat);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-
-        if ( nRet == ENOENT )
-        {
-            DestFileExists=0;
-        }
-/*        return oslTranslateFileError(nRet);*/
-    }
-
-    /* mfe: the destination file must not be a directory! */
-    if ( nRet == 0 && S_ISDIR(aFileStat.st_mode) )
-    {
-        return osl_File_E_ISDIR;
-    }
-    else
-    {
-        /* mfe: file does not exists or is no dir */
-    }
-
-    tErr = oslDoCopy(pszPath,pszDestPath,nMode,nSourceSize,DestFileExists);
-
-    if ( tErr != osl_File_E_None )
-    {
-        return tErr;
-    }
-
-    /*
-     *   mfe: ignore return code
-     *        since only  the success of the copy is
-     *        important
-     */
-    oslChangeFileModes(pszDestPath,nMode,nAcTime,nModTime,nUID,nGID);
-
-    return tErr;
-}
-
-oslFileError osl_copyFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
-{
-    char srcPath[PATH_MAX];
-    char destPath[PATH_MAX];
-    oslFileError eRet;
-    APIRET rc;
-
-    OSL_ASSERT( ustrFileURL );
-    OSL_ASSERT( ustrDestURL );
-
-    /* convert source url to system path */
-    eRet = FileURLToPath( srcPath, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    /* convert destination url to system path */
-    eRet = FileURLToPath( destPath, PATH_MAX, ustrDestURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    return osl_psz_copyFile( srcPath, destPath );
-}
-
-/****************************************************************************/
-/*  osl_removeFile */
-/****************************************************************************/
-
-oslFileError osl_removeFile( rtl_uString* ustrFileURL )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-    APIRET rc;
-
-    OSL_ASSERT( ustrFileURL );
-
-    /* convert file url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    rc = DosDelete( (PCSZ)path);
-    if (!rc)
-        eRet = osl_File_E_None;
-    else
-        eRet = MapError( rc);
-
-    return eRet;
-}
-
-/****************************************************************************/
-/*  osl_getVolumeInformation */
-/****************************************************************************/
-
-#define TXFSDC_BLOCKR         0x00              // block device removable
-#define TXFSDC_GETBPB         0x00              // get device bpb info
-#define TXFSBPB_REMOVABLE     0x08              // BPB attribute for removable
-
-typedef struct drivecmd
-{
-   BYTE                cmd;                     // 0=unlock 1=lock 2=eject
-   BYTE                drv;                     // 0=A, 1=B 2=C ...
-} DRIVECMD;                                     // end of struct "drivecmd"
-
-#pragma pack(push, 1)                           // byte packing
-typedef struct txfs_ebpb                        // ext. boot parameter block
-{                                               // at offset 0x0b in bootsector
-   USHORT              SectSize;                // 0B bytes per sector
-   BYTE                ClustSize;               // 0D sectors per cluster
-   USHORT              FatOffset;               // 0E sectors to 1st FAT
-   BYTE                NrOfFats;                // 10 nr of FATS     (FAT only)
-   USHORT              RootEntries;             // 11 Max entries \ (FAT only)
-   USHORT              Sectors;                 // 13 nr of sectors if <  64K
-   BYTE                MediaType;               // 15 mediatype (F8 for HD)
-   USHORT              FatSectors;              // 16 sectors/FAT (FAT only)
-   USHORT              LogGeoSect;              // 18 sectors/Track
-   USHORT              LogGeoHead;              // 1a nr of heads
-   ULONG               HiddenSectors;           // 1c sector-offset from MBR/EBR
-   ULONG               BigSectors;              // 20 nr of sectors if >= 64K
-} TXFS_EBPB;                                    // last byte is at offset 0x23
-
-typedef struct drivebpb
-{
-   TXFS_EBPB           ebpb;                    // extended BPB
-   BYTE                reserved[6];
-   USHORT              cyls;
-   BYTE                type;
-   USHORT              attributes;              // device attributes
-   BYTE                fill[6];                 // documented for IOCtl
-} DRIVEBPB;                                     // end of struct "drivebpb"
-
-struct CDInfo {
-    USHORT usCount;
-    USHORT usFirst;
-};
-
-#pragma pack(pop)
-
-/*****************************************************************************/
-// Get number of cdrom readers
-/*****************************************************************************/
-BOOL GetCDInfo( CDInfo * pCDInfo )
-{
-    HFILE hFileCD;
-    ULONG ulAction;
-
-    if( NO_ERROR == DosOpen( (PCSZ)"\\DEV\\CD-ROM2$",
-                            &hFileCD, &ulAction, 0, FILE_NORMAL,
-                            OPEN_ACTION_OPEN_IF_EXISTS,
-                            OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY, NULL )) {
-        ULONG  ulDataSize = sizeof(CDInfo);
-        APIRET rc = DosDevIOCtl( hFileCD, 0x82, 0x60, NULL, 0,
-                                 NULL, (PVOID)pCDInfo, ulDataSize, &ulDataSize);
-        DosClose( hFileCD);
-        if(rc == NO_ERROR)
-            return TRUE;
-    }
-    // failed
-    pCDInfo->usFirst = 0;
-    pCDInfo->usCount = 0;
-    return FALSE;
-}
-
-/*****************************************************************************/
-// Determine if unit is a cdrom or not
-/*****************************************************************************/
-BOOL DriveIsCDROM(UINT uiDrive, CDInfo *pCDInfo)
-{
-    return (uiDrive >= pCDInfo->usFirst)
-            && (uiDrive < (pCDInfo->usFirst + pCDInfo->usCount));
-}
-
-/*****************************************************************************/
-// Determine attached fstype, e.g. HPFS for specified drive
-/*****************************************************************************/
-BOOL TxFsType                                   // RET   FS type resolved
-(
-   char               *drive,                   // IN    Drive specification
-   char               *fstype,                  // OUT   Attached FS type
-   char               *details                  // OUT   details (UNC) or NULL
-)
-{
-   BOOL                rc = FALSE;
-   FSQBUFFER2         *fsinfo;                     // Attached FS info
-   ULONG               fsdlen = 2048;              // Fs info data length
-
-   strcpy(fstype, "none");
-   if (details)
-   {
-      strcpy(details, "");
-   }
-   if ((fsinfo = (FSQBUFFER2*)calloc(1, fsdlen)) != NULL)
-   {
-      if (DosQFSAttach((PCSZ)drive, 0, 1, fsinfo, &fsdlen) == NO_ERROR)
-      {
-         strcpy(fstype, (char*) fsinfo->szName + fsinfo->cbName +1);
-         if (details && (fsinfo->cbFSAData != 0))
-         {
-            strcpy( details, (char*) fsinfo->szName + fsinfo->cbName +
-                                              fsinfo->cbFSDName +2);
-         }
-         rc = TRUE;
-      }
-      free(fsinfo);
-   }
-   return (rc);
-}                                               // end 'TxFsType'
-/*---------------------------------------------------------------------------*/
-
-
-/*****************************************************************************/
-// Determine if a driveletter represents a removable medium/device
-/*****************************************************************************/
-BOOL TxFsIsRemovable                            // RET   drive is removable
-(
-   char               *drive                    // IN    Driveletter to test
-)
-{
-   BOOL                rc = FALSE;
-   DRIVECMD            IOCtl;
-   DRIVEBPB            RemAt;
-   ULONG               DataLen;
-   ULONG               ParmLen;
-   BYTE                NoRem;
-
-   DosError( FERR_DISABLEHARDERR);              // avoid 'not ready' popups
-
-   ParmLen   = sizeof(IOCtl);
-   IOCtl.cmd = TXFSDC_BLOCKR;
-   IOCtl.drv = toupper(drive[0]) - 'A';
-   DataLen   = sizeof(NoRem);
-
-   if (DosDevIOCtl((HFILE) -1, IOCTL_DISK,
-                               DSK_BLOCKREMOVABLE,
-                               &IOCtl, ParmLen, &ParmLen,
-                               &NoRem, DataLen, &DataLen) == NO_ERROR)
-   {
-      if (NoRem)                                // non-removable sofar, check
-      {                                         // BPB as well (USB devices)
-         ParmLen   = sizeof(IOCtl);
-         IOCtl.cmd = TXFSDC_GETBPB;
-         IOCtl.drv = toupper(drive[0]) - 'A';
-         DataLen   = sizeof(RemAt);
-
-         if (DosDevIOCtl((HFILE) -1, IOCTL_DISK,
-                                     DSK_GETDEVICEPARAMS,
-                                     &IOCtl, ParmLen, &ParmLen,
-                                     &RemAt, DataLen, &DataLen) == NO_ERROR)
-
-         {
-            if (RemAt.attributes & TXFSBPB_REMOVABLE)
-            {
-               rc = TRUE;                       // removable, probably USB
-            }
-         }
-      }
-      else
-      {
-         rc = TRUE;                             // removable block device
-      }
-   }
-   DosError( FERR_ENABLEHARDERR);               // enable criterror handler
-   return (rc);
-}                                               // end 'TxFsIsRemovable'
-/*---------------------------------------------------------------------------*/
-
-static oslFileError get_drive_type(const char* path, oslVolumeInfo* pInfo)
-{
-    char        Drive_Letter = toupper( *path);
-    char        fstype[ 64];
-
-    pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
-
-    // check for floppy A/B
-    BYTE    nFloppies;
-    APIRET  rc;
-    rc = DosDevConfig( (void*) &nFloppies, DEVINFO_FLOPPY );
-    if ((Drive_Letter - 'A') < nFloppies) {
-        pInfo->uAttributes |= osl_Volume_Attribute_Removeable;
-        pInfo->uAttributes |= osl_Volume_Attribute_FloppyDisk;
-        return osl_File_E_None;
-    }
-
-    // query system for CD drives
-    CDInfo cdInfo;
-    GetCDInfo(&cdInfo);
-
-    // query if drive is a CDROM
-    if (DriveIsCDROM( Drive_Letter - 'A', &cdInfo))
-        pInfo->uAttributes |= osl_Volume_Attribute_CompactDisc | osl_Volume_Attribute_Removeable;
-
-    if (TxFsIsRemovable( (char*)path))
-        pInfo->uAttributes |= osl_Volume_Attribute_Removeable;
-
-    if (TxFsType( (char*)path, fstype, NULL) == FALSE) {
-        // query failed, assume fixed disk
-        pInfo->uAttributes |= osl_Volume_Attribute_FixedDisk;
-        return osl_File_E_None;
-    }
-
-    //- Note, connected Win-NT drives use the REAL FS-name like NTFS!
-    if ((strncasecmp( fstype, "LAN", 3) == 0)           //- OS/2 LAN drives
-        || (strncasecmp( fstype, "NDFS", 4) == 0)   //- NetDrive
-        || (strncasecmp( fstype, "REMOTE", 5) == 0)  )  //- NT disconnected
-        pInfo->uAttributes |= osl_Volume_Attribute_Remote;
-    else if (strncasecmp( fstype, "RAMFS", 5) == 0)
-        pInfo->uAttributes |= osl_Volume_Attribute_RAMDisk;
-    else if ((strncasecmp( fstype, "CD",  2) == 0)      // OS2:CDFS, DOS/WIN:CDROM
-        || (strncasecmp( fstype, "UDF", 3) == 0)   )    // OS2:UDF DVD's
-        pInfo->uAttributes |= osl_Volume_Attribute_CompactDisc | osl_Volume_Attribute_Removeable;
-    else
-        pInfo->uAttributes |= osl_Volume_Attribute_FixedDisk;
-
-    return osl_File_E_None;
-}
-
-//#############################################
-inline bool is_volume_space_info_request(sal_uInt32 field_mask)
-{
-    return (field_mask &
-            (osl_VolumeInfo_Mask_TotalSpace |
-             osl_VolumeInfo_Mask_UsedSpace  |
-             osl_VolumeInfo_Mask_FreeSpace));
-}
-
-//#############################################
-static void get_volume_space_information(const char* path, oslVolumeInfo *pInfo)
-{
-    FSALLOCATE aFSInfoBuf;
-    ULONG nDriveNumber = toupper( *path) - 'A' + 1;
-
-    // disable error popups
-    DosError(FERR_DISABLEHARDERR);
-    APIRET rc = DosQueryFSInfo( nDriveNumber, FSIL_ALLOC,
-                                &aFSInfoBuf, sizeof(aFSInfoBuf) );
-    // enable error popups
-    DosError(FERR_ENABLEHARDERR);
-    if (!rc)
-    {
-        uint64_t aBytesPerCluster( uint64_t(aFSInfoBuf.cbSector) *
-                                 uint64_t(aFSInfoBuf.cSectorUnit) );
-        pInfo->uFreeSpace = aBytesPerCluster * uint64_t(aFSInfoBuf.cUnitAvail);
-        pInfo->uTotalSpace = aBytesPerCluster * uint64_t(aFSInfoBuf.cUnit);
-        pInfo->uUsedSpace    = pInfo->uTotalSpace - pInfo->uFreeSpace;
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace |
-                               osl_VolumeInfo_Mask_UsedSpace |
-                               osl_VolumeInfo_Mask_FreeSpace;
-    }
-}
-
-//#############################################
-inline bool is_filesystem_attributes_request(sal_uInt32 field_mask)
-{
-    return (field_mask &
-            (osl_VolumeInfo_Mask_MaxNameLength |
-             osl_VolumeInfo_Mask_MaxPathLength |
-             osl_VolumeInfo_Mask_FileSystemName |
-             osl_VolumeInfo_Mask_FileSystemCaseHandling));
-}
-
-//#############################################
-inline bool is_drivetype_request(sal_uInt32 field_mask)
-{
-    return (field_mask & osl_VolumeInfo_Mask_Attributes);
-}
-
-typedef struct _FSQBUFFER_
-{
-    FSQBUFFER2  aBuf;
-    UCHAR       sBuf[64];
-} FSQBUFFER_;
-
-//#############################################
-static oslFileError get_filesystem_attributes(const char* path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
-{
-    pInfo->uAttributes = 0;
-
-    oslFileError osl_error = osl_File_E_None;
-
-    // osl_get_drive_type must be called first because
-    // this function resets osl_VolumeInfo_Mask_Attributes
-    // on failure
-    if (is_drivetype_request(field_mask))
-        osl_error = get_drive_type(path, pInfo);
-
-    if ((osl_File_E_None == osl_error) && is_filesystem_attributes_request(field_mask))
-    {
-        FSQBUFFER_  aBuf;
-        ULONG       nBufLen;
-        APIRET      nRet;
-
-        nBufLen = sizeof( aBuf );
-        // disable error popups
-        DosError(FERR_DISABLEHARDERR);
-        nRet = DosQueryFSAttach( (PCSZ)path, 0, FSAIL_QUERYNAME, (_FSQBUFFER2*) &aBuf, &nBufLen );
-        if ( !nRet )
-        {
-            char *pType = (char*)(aBuf.aBuf.szName + aBuf.aBuf.cbName + 1);
-            pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxNameLength;
-            pInfo->uMaxNameLength  = _MAX_FNAME;
-
-            pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxPathLength;
-            pInfo->uMaxPathLength  = _MAX_PATH;
-
-            pInfo->uValidFields   |= osl_VolumeInfo_Mask_FileSystemName;
-            rtl_uString_newFromAscii(&pInfo->ustrFileSystemName, pType);
-
-            // case is preserved always except for FAT
-            if (strcmp( pType, "FAT" ))
-                pInfo->uAttributes |= osl_Volume_Attribute_Case_Is_Preserved;
-
-            pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
-        }
-        // enable error popups
-        DosError(FERR_ENABLEHARDERR);
-    }
-    return osl_error;
-}
-
-oslFileError SAL_CALL osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeInfo* pInfo, sal_uInt32 uFieldMask )
-{
-    char volume_root[PATH_MAX];
-    oslFileError error;
-
-    OSL_ASSERT( ustrDirectoryURL );
-    OSL_ASSERT( pInfo );
-
-    /* convert directory url to system path */
-    error = FileURLToPath( volume_root, PATH_MAX, ustrDirectoryURL );
-    if( error != osl_File_E_None )
-        return error;
-
-    if (!pInfo)
-        return osl_File_E_INVAL;
-
-    pInfo->uValidFields = 0;
-
-    if ((error = get_filesystem_attributes(volume_root, uFieldMask, pInfo)) != osl_File_E_None)
-        return error;
-
-    if (is_volume_space_info_request(uFieldMask))
-        get_volume_space_information(volume_root, pInfo);
-
-    if (uFieldMask & osl_VolumeInfo_Mask_DeviceHandle)
-    {
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_DeviceHandle;
-        rtl_uString* uVolumeRoot;
-        rtl_uString_newFromAscii( &uVolumeRoot, volume_root);
-        osl_getFileURLFromSystemPath( uVolumeRoot, (rtl_uString**)&pInfo->pDeviceHandle);
-        rtl_uString_release( uVolumeRoot);
-    }
-
-    return osl_File_E_None;
-}
-
-/****************************************************************************/
-/*  osl_getFileStatus */
-/****************************************************************************/
-static oslFileError _osl_getDriveInfo(
-    oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask)
-{
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
-    sal_Unicode         cDrive[3];
-    sal_Unicode         cRoot[4];
-
-    if ( !pItemImpl )
-        return osl_File_E_INVAL;
-
-    pStatus->uValidFields = 0;
-
-    cDrive[0] = pItemImpl->ustrDrive->buffer[0];
-    cDrive[1] = (sal_Unicode)':';
-    cDrive[2] = 0;
-    cRoot[0] = pItemImpl->ustrDrive->buffer[0];
-    cRoot[1] = (sal_Unicode)':';
-    cRoot[2] = 0;
-
-    if ( uFieldMask & osl_FileStatus_Mask_FileName )
-    {
-        if ( pItemImpl->ustrDrive->buffer[0] == '\\' &&
-            pItemImpl->ustrDrive->buffer[1] == '\\' )
-        {
-            LPCWSTR lpFirstBkSlash = wcschr( (const wchar_t*)&pItemImpl->ustrDrive->buffer[2], '\\' );
-
-            if ( lpFirstBkSlash && lpFirstBkSlash[1] )
-            {
-                LPCWSTR lpLastBkSlash = wcschr( (const wchar_t*)&lpFirstBkSlash[1], '\\' );
-
-                if ( lpLastBkSlash )
-                    rtl_uString_newFromStr_WithLength( &pStatus->ustrFileName, (sal_Unicode*)&lpFirstBkSlash[1], lpLastBkSlash - lpFirstBkSlash - 1 );
-                else
-                    rtl_uString_newFromStr( &pStatus->ustrFileName, (sal_Unicode*)&lpFirstBkSlash[1] );
-                pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-            }
-        }
-        else
-        {
-            FSINFO  aFSInfoBuf;
-            ULONG   ulFSInfoLevel = FSIL_VOLSER;
-            ULONG   nDriveNumber;
-            char    szFileName[ _MAX_PATH];
-
-            nDriveNumber = toupper(*cDrive) - 'A' + 1;
-            memset( &aFSInfoBuf, 0, sizeof(FSINFO) );
-            // disable error popups
-            DosError(FERR_DISABLEHARDERR);
-            APIRET rc = DosQueryFSInfo( nDriveNumber, ulFSInfoLevel, &aFSInfoBuf, sizeof(FSINFO) );
-            // enable error popups
-            DosError(FERR_ENABLEHARDERR);
-            memset( szFileName, 0, sizeof( szFileName));
-            *szFileName = toupper(*cDrive);
-            strcat( szFileName, ": [");
-            if ( !rc || aFSInfoBuf.vol.cch)
-                strncat( szFileName, aFSInfoBuf.vol.szVolLabel, aFSInfoBuf.vol.cch);
-            strcat( szFileName, "]");
-            rtl_uString_newFromAscii( &pStatus->ustrFileName, szFileName );
-
-            pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-        }
-    }
-
-    pStatus->eType = osl_File_Type_Volume;
-    pStatus->uValidFields |= osl_FileStatus_Mask_Type;
-
-    if ( uFieldMask & osl_FileStatus_Mask_FileURL )
-    {
-        rtl_uString *ustrSystemPath = NULL;
-
-        rtl_uString_newFromStr( &ustrSystemPath, pItemImpl->ustrDrive->buffer );
-        osl_getFileURLFromSystemPath( ustrSystemPath, &pStatus->ustrFileURL );
-        rtl_uString_release( ustrSystemPath );
-        pStatus->uValidFields |= osl_FileStatus_Mask_FileURL;
-    }
-
-    return osl_File_E_None;
-}
-
-oslFileError SAL_CALL osl_getFileStatus(
-    oslDirectoryItem Item,
-    oslFileStatus *pStatus,
-    sal_uInt32 uFieldMask )
-{
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
-    struct stat file_stat;
-
-    if ( !pItemImpl )
-        return osl_File_E_INVAL;
-
-    if ( pItemImpl->uType == DIRECTORYITEM_DRIVE)
-        return _osl_getDriveInfo( Item, pStatus, uFieldMask );
-
-    osl::lstat(pItemImpl->ustrFilePath, file_stat);
-    if ( uFieldMask & osl_FileStatus_Mask_Validate )
-    {
-        uFieldMask &= ~ osl_FileStatus_Mask_Validate;
-    }
-
-    /* If no fields to retrieve left ignore pStatus */
-    if ( !uFieldMask )
-        return osl_File_E_None;
-
-    /* Otherwise, this must be a valid pointer */
-    if ( !pStatus )
-        return osl_File_E_INVAL;
-
-    if ( pStatus->uStructSize != sizeof(oslFileStatus) )
-        return osl_File_E_INVAL;
-
-    pStatus->uValidFields = 0;
-
-    /* File time stamps */
-
-    if ( (uFieldMask & osl_FileStatus_Mask_ModifyTime))
-    {
-        pStatus->aModifyTime.Seconds  = file_stat.st_mtime;
-        pStatus->aModifyTime.Nanosec  = 0;
-        pStatus->uValidFields |= osl_FileStatus_Mask_ModifyTime;
-    }
-
-    if ( (uFieldMask & osl_FileStatus_Mask_AccessTime))
-    {
-        pStatus->aAccessTime.Seconds  = file_stat.st_atime;
-        pStatus->aAccessTime.Nanosec  = 0;
-        pStatus->uValidFields |= osl_FileStatus_Mask_AccessTime;
-    }
-
-    if ( (uFieldMask & osl_FileStatus_Mask_CreationTime))
-    {
-        pStatus->aAccessTime.Seconds  = file_stat.st_birthtime;
-        pStatus->aAccessTime.Nanosec  = 0;
-        pStatus->uValidFields |= osl_FileStatus_Mask_CreationTime;
-    }
-
-    /* Most of the fields are already set, regardless of requiered fields */
-
-    osl_systemPathGetFileNameOrLastDirectoryPart(pItemImpl->ustrFilePath, &pStatus->ustrFileName);
-    pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-
-    if (S_ISLNK(file_stat.st_mode))
-       pStatus->eType = osl_File_Type_Link;
-    else if (S_ISDIR(file_stat.st_mode))
-       pStatus->eType = osl_File_Type_Directory;
-    else if (S_ISREG(file_stat.st_mode))
-       pStatus->eType = osl_File_Type_Regular;
-    else if (S_ISFIFO(file_stat.st_mode))
-       pStatus->eType = osl_File_Type_Fifo;
-    else if (S_ISSOCK(file_stat.st_mode))
-       pStatus->eType = osl_File_Type_Socket;
-    else if (S_ISCHR(file_stat.st_mode) || S_ISBLK(file_stat.st_mode))
-       pStatus->eType = osl_File_Type_Special;
-    else
-       pStatus->eType = osl_File_Type_Unknown;
-
-    pStatus->uValidFields |= osl_FileStatus_Mask_Type;
-
-    pStatus->uAttributes = pItemImpl->d_attr;
-    pStatus->uValidFields |= osl_FileStatus_Mask_Attributes;
-
-    pStatus->uFileSize = file_stat.st_size;
-    pStatus->uValidFields |= osl_FileStatus_Mask_FileSize;
-
-    if ( uFieldMask & osl_FileStatus_Mask_LinkTargetURL )
-    {
-        rtl_uString *ustrFullPath = NULL;
-
-        rtl_uString_newFromStr( &ustrFullPath, rtl_uString_getStr(pItemImpl->ustrFilePath) );
-        osl_getFileURLFromSystemPath( ustrFullPath, &pStatus->ustrLinkTargetURL );
-        rtl_uString_release( ustrFullPath );
-
-        pStatus->uValidFields |= osl_FileStatus_Mask_LinkTargetURL;
-    }
-
-    if ( uFieldMask & osl_FileStatus_Mask_FileURL )
-    {
-        rtl_uString *ustrFullPath = NULL;
-
-        rtl_uString_newFromStr( &ustrFullPath, rtl_uString_getStr(pItemImpl->ustrFilePath) );
-        osl_getFileURLFromSystemPath( ustrFullPath, &pStatus->ustrFileURL );
-        rtl_uString_release( ustrFullPath );
-        pStatus->uValidFields |= osl_FileStatus_Mask_FileURL;
-    }
-
-    return osl_File_E_None;
-}
-
-/****************************************************************************/
-/*  osl_createDirectory */
-/****************************************************************************/
-
-oslFileError osl_createDirectory( rtl_uString* ustrDirectoryURL )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-    APIRET rc;
-
-    OSL_ASSERT( ustrDirectoryURL );
-
-    /* convert directory url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrDirectoryURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    rc = DosCreateDir( (PCSZ)path, NULL);
-    if (rc == ERROR_ACCESS_DENIED)
-       rc=ERROR_FILE_EXISTS;
-
-    if (!rc)
-        eRet = osl_File_E_None;
-    else
-        eRet = MapError( rc);
-
-    return eRet;
-}
-
-/****************************************************************************/
-/*  osl_removeDirectory */
-/****************************************************************************/
-
-oslFileError osl_removeDirectory( rtl_uString* ustrDirectoryURL )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-    APIRET rc;
-
-    OSL_ASSERT( ustrDirectoryURL );
-
-    /* convert directory url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrDirectoryURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    rc = DosDeleteDir( (PCSZ)path);
-    if (!rc)
-        eRet = osl_File_E_None;
-    else
-        eRet = MapError( rc);
-
-    return eRet;
-}
-
-//#############################################
-int path_make_parent(sal_Unicode* path)
-{
-    int i = rtl_ustr_lastIndexOfChar(path, '/');
-
-    if (i > 0)
-    {
-        *(path + i) = 0;
-        return i;
-    }
-    else
-        return 0;
-}
-
-//#############################################
-int create_dir_with_callback(
-    sal_Unicode* directory_path,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
-    void* pData)
-{
-    int mode = S_IRWXU | S_IRWXG | S_IRWXO;
-
-    if (osl::mkdir(directory_path, mode) == 0)
-    {
-        if (aDirectoryCreationCallbackFunc)
-        {
-            rtl::OUString url;
-            osl::FileBase::getFileURLFromSystemPath(directory_path, url);
-            aDirectoryCreationCallbackFunc(pData, url.pData);
-        }
-        return 0;
-    }
-    return errno;
-}
-
-//#############################################
-oslFileError create_dir_recursively_(
-    sal_Unicode* dir_path,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
-    void* pData)
-{
-    OSL_PRECOND((rtl_ustr_getLength(dir_path) > 0) && ((dir_path + (rtl_ustr_getLength(dir_path) - 1)) != (dir_path + rtl_ustr_lastIndexOfChar(dir_path, '/'))), \
-    "Path must not end with a slash");
-
-    int native_err = create_dir_with_callback(
-        dir_path, aDirectoryCreationCallbackFunc, pData);
-
-    if (native_err == 0)
-        return osl_File_E_None;
-
-    if (native_err != ENOENT)
-        return oslTranslateFileError(OSL_FET_ERROR, native_err);
-
-    // we step back until '/a_dir' at maximum because
-    // we should get an error unequal ENOENT when
-    // we try to create 'a_dir' at '/' and would so
-    // return before
-    int pos = path_make_parent(dir_path);
-
-    oslFileError osl_error = create_dir_recursively_(
-        dir_path, aDirectoryCreationCallbackFunc, pData);
-
-    if (osl_File_E_None != osl_error)
-        return osl_error;
-
-       dir_path[pos] = '/';
-
-    return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, pData);
-}
-
-//#######################################
-oslFileError SAL_CALL osl_createDirectoryPath(
-    rtl_uString* aDirectoryUrl,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
-    void* pData)
-{
-    if (aDirectoryUrl == NULL)
-        return osl_File_E_INVAL;
-
-    rtl::OUString sys_path;
-    oslFileError osl_error = osl_getSystemPathFromFileURL_Ex(
-        aDirectoryUrl, &sys_path.pData, sal_False);
-
-    if (osl_error != osl_File_E_None)
-        return osl_error;
-
-    osl::systemPathRemoveSeparator(sys_path);
-
-    // const_cast because sys_path is a local copy which we want to modify inplace instead of
-    // coyp it into another buffer on the heap again
-    return create_dir_recursively_(sys_path.pData->buffer, aDirectoryCreationCallbackFunc, pData);
-}
-
-/****************************************************************************/
-/*  osl_getCanonicalName */
-/****************************************************************************/
-
-oslFileError osl_getCanonicalName( rtl_uString* ustrFileURL, rtl_uString** pustrValidURL )
-{
-    OSL_ENSURE(sal_False, "osl_getCanonicalName not implemented");
-
-    rtl_uString_newFromString(pustrValidURL, ustrFileURL);
-    return osl_File_E_None;
-}
-
-
-/****************************************************************************/
-/*  osl_setFileAttributes */
-/****************************************************************************/
-
-oslFileError osl_setFileAttributes( rtl_uString* ustrFileURL, sal_uInt64 uAttributes )
-{
-    char         path[PATH_MAX];
-    oslFileError eRet;
-    FILESTATUS3  fsts3ConfigInfo;
-    ULONG        ulBufSize     = sizeof(FILESTATUS3);
-    APIRET       rc            = NO_ERROR;
-
-    OSL_ASSERT( ustrFileURL );
-
-    /* convert file url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    /* query current attributes */
-    rc = DosQueryPathInfo( (PCSZ)path, FIL_STANDARD, &fsts3ConfigInfo, ulBufSize);
-    if (rc != NO_ERROR)
-        return MapError( rc);
-
-    /* set/reset readonly/hidden (see w32\file.cxx) */
-    fsts3ConfigInfo.attrFile &= ~(FILE_READONLY | FILE_HIDDEN);
-    if ( uAttributes & osl_File_Attribute_ReadOnly )
-        fsts3ConfigInfo.attrFile |= FILE_READONLY;
-    if ( uAttributes & osl_File_Attribute_Hidden )
-        fsts3ConfigInfo.attrFile |= FILE_HIDDEN;
-
-    /* write new attributes */
-    rc = DosSetPathInfo( (PCSZ)path, FIL_STANDARD, &fsts3ConfigInfo, ulBufSize, 0);
-    if (rc != NO_ERROR)
-        return MapError( rc);
-
-    /* everything ok */
-    return osl_File_E_None;
-}
-
-/****************************************************************************/
-/*  osl_setFileTime */
-/****************************************************************************/
-
-oslFileError osl_setFileTime( rtl_uString* ustrFileURL, const TimeValue* pCreationTime,
-                              const TimeValue* pLastAccessTime, const TimeValue* pLastWriteTime )
-{
-    char path[PATH_MAX];
-    oslFileError eRet;
-
-    OSL_ASSERT( ustrFileURL );
-
-    /* convert file url to system path */
-    eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
-    if( eRet != osl_File_E_None )
-        return eRet;
-
-    return osl_psz_setFileTime( path, pCreationTime, pLastAccessTime, pLastWriteTime );
-}
-
-/******************************************************************************
- *
- *                  Exported Module Functions
- *             (independent of C or Unicode Strings)
- *
- *****************************************************************************/
-
-
-/*******************************************
-    osl_readFile
-********************************************/
-
-oslFileError osl_readFile(oslFileHandle Handle, void* pBuffer, sal_uInt64 uBytesRequested, sal_uInt64* pBytesRead)
-{
-    ssize_t            nBytes      = 0;
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl*)Handle;
-
-    if ((0 == pHandleImpl) || (pHandleImpl->fd < 0) || (0 == pBuffer) || (0 == pBytesRead))
-        return osl_File_E_INVAL;
-
-    nBytes = read(pHandleImpl->fd, pBuffer, uBytesRequested);
-
-    if (-1 == nBytes)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    *pBytesRead = nBytes;
-    return osl_File_E_None;
-}
-
-/*******************************************
-    osl_writeFile
-********************************************/
-
-oslFileError osl_writeFile(oslFileHandle Handle, const void* pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64* pBytesWritten)
-{
-    ssize_t            nBytes      = 0;
-    oslFileHandleImpl* pHandleImpl = (oslFileHandleImpl*)Handle;
-
-    OSL_ASSERT(pHandleImpl);
-    OSL_ASSERT(pBuffer);
-    OSL_ASSERT(pBytesWritten);
-
-    if ((0 == pHandleImpl) || (0 == pBuffer) || (0 == pBytesWritten))
-        return osl_File_E_INVAL;
-
-    OSL_ASSERT(pHandleImpl->fd >= 0);
-
-    if (pHandleImpl->fd < 0)
-        return osl_File_E_INVAL;
-
-    nBytes = write(pHandleImpl->fd, pBuffer, uBytesToWrite);
-
-    if (-1 == nBytes)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    *pBytesWritten = nBytes;
-    return osl_File_E_None;
-}
-
-/*******************************************
-    osl_writeFile
-********************************************/
-
-oslFileError osl_setFilePos( oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uPos )
-{
-    oslFileHandleImpl* pHandleImpl=0;
-    int nRet=0;
-    off_t nOffset=0;
-
-    pHandleImpl = (oslFileHandleImpl*) Handle;
-    if ( pHandleImpl == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pHandleImpl->fd < 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    /* FIXME mfe: setFilePos: Do we have any runtime function to determine LONG_MAX? */
-    if ( uPos > LONG_MAX )
-    {
-        return osl_File_E_OVERFLOW;
-    }
-
-    nOffset=(off_t)uPos;
-
-    switch(uHow)
-    {
-        case osl_Pos_Absolut:
-            nOffset = lseek(pHandleImpl->fd,nOffset,SEEK_SET);
-            break;
-
-        case osl_Pos_Current:
-            nOffset = lseek(pHandleImpl->fd,nOffset,SEEK_CUR);
-            break;
-
-        case osl_Pos_End:
-            nOffset = lseek(pHandleImpl->fd,nOffset,SEEK_END);
-            break;
-
-        default:
-            return osl_File_E_INVAL;
-    }
-
-    if ( nOffset < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-
-/************************************************
- * osl_getFilePos
- ***********************************************/
-
-oslFileError osl_getFilePos( oslFileHandle Handle, sal_uInt64* pPos )
-{
-    oslFileHandleImpl* pHandleImpl=0;
-    off_t nOffset=0;
-    int nRet=0;
-
-    pHandleImpl = (oslFileHandleImpl*) Handle;
-    if ( pHandleImpl == 0 || pPos == 0)
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pHandleImpl->fd < 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    nOffset = lseek(pHandleImpl->fd,0,SEEK_CUR);
-
-    if (nOffset < 0)
-    {
-        nRet  =errno;
-
-        /* *pPos =0; */
-
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    *pPos=nOffset;
-
-    return osl_File_E_None;
-}
-
-/****************************************************************************
- *  osl_getFileSize
- ****************************************************************************/
-
-oslFileError osl_getFileSize( oslFileHandle Handle, sal_uInt64* pSize )
-{
-    oslFileHandleImpl* pHandleImpl=(oslFileHandleImpl*) Handle;
-    if (pHandleImpl == 0)
-        return osl_File_E_INVAL;
-
-    struct stat file_stat;
-    if (fstat(pHandleImpl->fd, &file_stat) == -1)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    *pSize = file_stat.st_size;
-    return osl_File_E_None;
-}
-
-/************************************************
- * osl_setFileSize
- ***********************************************/
-
-oslFileError osl_setFileSize( oslFileHandle Handle, sal_uInt64 uSize )
-{
-    oslFileHandleImpl* pHandleImpl=0;
-    off_t nOffset=0;
-
-    pHandleImpl = (oslFileHandleImpl*) Handle;
-    if ( pHandleImpl == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pHandleImpl->fd < 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    /* FIXME: mfe: setFileSize: Do we have any runtime function to determine LONG_MAX? */
-    if ( uSize > LONG_MAX )
-    {
-        return osl_File_E_OVERFLOW;
-    }
-
-    nOffset = (off_t)uSize;
-    if (ftruncate (pHandleImpl->fd, nOffset) < 0)
-    {
-        /* Failure. Try fallback algorithm */
-        oslFileError result;
-        struct stat  aStat;
-        off_t        nCurPos;
-
-        /* Save original result */
-        result = oslTranslateFileError (OSL_FET_ERROR, errno);
-        PERROR("ftruncate", "Try osl_setFileSize [fallback]\n");
-
-        /* Check against current size. Fail upon 'shrink' */
-        if (fstat (pHandleImpl->fd, &aStat) < 0)
-        {
-            PERROR("ftruncate: fstat", "Out osl_setFileSize [error]\n");
-            return (result);
-        }
-        if ((0 <= nOffset) && (nOffset <= aStat.st_size))
-        {
-            /* Failure upon 'shrink'. Return original result */
-            return (result);
-        }
-
-        /* Save current position */
-        nCurPos = (off_t)lseek (pHandleImpl->fd, (off_t)0, SEEK_CUR);
-        if (nCurPos == (off_t)(-1))
-        {
-            PERROR("ftruncate: lseek", "Out osl_setFileSize [error]\n");
-            return (result);
-        }
-
-        /* Try 'expand' via 'lseek()' and 'write()' */
-        if (lseek (pHandleImpl->fd, (off_t)(nOffset - 1), SEEK_SET) < 0)
-        {
-            PERROR("ftruncate: lseek", "Out osl_setFileSize [error]\n");
-            return (result);
-        }
-        if (write (pHandleImpl->fd, (char*)"", (size_t)1) < 0)
-        {
-            /* Failure. Restore saved position */
-            PERROR("ftruncate: write", "Out osl_setFileSize [error]\n");
-            if (lseek (pHandleImpl->fd, (off_t)nCurPos, SEEK_SET) < 0)
-            {
-#ifdef DEBUG_OSL_FILE
-                perror("ftruncate: lseek");
-#endif /* DEBUG_OSL_FILE */
-            }
-            return (result);
-        }
-
-        /* Success. Restore saved position */
-        if (lseek (pHandleImpl->fd, (off_t)nCurPos, SEEK_SET) < 0)
-        {
-            PERROR("ftruncate: lseek", "Out osl_setFileSize [error]");
-            return (result);
-        }
-    }
-
-    return (osl_File_E_None);
-}
-
-/*###############################################*/
-oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle)
-{
-    oslFileHandleImpl* handle_impl = (oslFileHandleImpl*)Handle;
-
-    if (handle_impl == 0)
-        return osl_File_E_INVAL;
-
-    if (fsync(handle_impl->fd) == -1)
-        return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    return osl_File_E_None;
-}
-
-/******************************************************************************
- *
- *                  C-String Versions of Exported Module Functions
- *
- *****************************************************************************/
-
-#ifdef HAVE_STATFS_H
-
-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
-#   define __OSL_STATFS_STRUCT                  struct statfs
-#   define __OSL_STATFS(dir, sfs)               statfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)               ((sal_uInt64)((a).f_bsize))
-#   define __OSL_STATFS_TYPENAME(a)             ((a).f_fstypename)
-#   define __OSL_STATFS_ISREMOTE(a)             (((a).f_type & MNT_LOCAL) == 0)
-
-/* always return true if queried for the properties of
-   the file system. If you think this is wrong under any
-   of the target platforms fix it!!!! */
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* FREEBSD || NETBSD */
-
-#if defined(LINUX)
-#   define __OSL_NFS_SUPER_MAGIC                 0x6969
-#   define __OSL_SMB_SUPER_MAGIC                 0x517B
-#   define __OSL_MSDOS_SUPER_MAGIC               0x4d44
-#   define __OSL_NTFS_SUPER_MAGIC                0x5346544e
-#   define __OSL_STATFS_STRUCT                   struct statfs
-#   define __OSL_STATFS(dir, sfs)                statfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)                ((sal_uInt64)((a).f_bsize))
-#   define __OSL_STATFS_IS_NFS(a)                (__OSL_NFS_SUPER_MAGIC == (a).f_type)
-#   define __OSL_STATFS_IS_SMB(a)                (__OSL_SMB_SUPER_MAGIC == (a).f_type)
-#   define __OSL_STATFS_ISREMOTE(a)              (__OSL_STATFS_IS_NFS((a)) || __OSL_STATFS_IS_SMB((a)))
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type) && (__OSL_NTFS_SUPER_MAGIC != (a).f_type))
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
-#endif /* LINUX */
-
-#if defined(SOLARIS)
-#   define __OSL_STATFS_STRUCT                   struct statvfs
-#   define __OSL_STATFS(dir, sfs)                statvfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)                ((sal_uInt64)((a).f_frsize))
-#   define __OSL_STATFS_TYPENAME(a)              ((a).f_basetype)
-#   define __OSL_STATFS_ISREMOTE(a)              (rtl_str_compare((a).f_basetype, "nfs") == 0)
-
-/* always return true if queried for the properties of
-   the file system. If you think this is wrong under any
-   of the target platforms fix it!!!! */
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* SOLARIS */
-
-#   define __OSL_STATFS_INIT(a)         (memset(&(a), 0, sizeof(__OSL_STATFS_STRUCT)))
-
-#else /* no statfs available */
-
-#   define __OSL_STATFS_STRUCT                   struct dummy {int i;}
-#   define __OSL_STATFS_INIT(a)                  ((void)0)
-#   define __OSL_STATFS(dir, sfs)                (1)
-#   define __OSL_STATFS_ISREMOTE(sfs)            (0)
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* HAVE_STATFS_H */
-
-
-static oslFileError osl_psz_getVolumeInformation (
-    const sal_Char* pszDirectory, oslVolumeInfo* pInfo, sal_uInt32 uFieldMask)
-{
-    __OSL_STATFS_STRUCT sfs;
-
-    if (!pInfo)
-        return osl_File_E_INVAL;
-
-    __OSL_STATFS_INIT(sfs);
-
-    pInfo->uValidFields = 0;
-    pInfo->uAttributes  = 0;
-
-    if ((__OSL_STATFS(pszDirectory, &sfs)) < 0)
-    {
-        oslFileError result = oslTranslateFileError(OSL_FET_ERROR, errno);
-        return (result);
-    }
-
-    /* FIXME: how to detect the kind of storage (fixed, cdrom, ...) */
-    if (uFieldMask & osl_VolumeInfo_Mask_Attributes)
-    {
-        if (__OSL_STATFS_ISREMOTE(sfs))
-            pInfo->uAttributes  |= osl_Volume_Attribute_Remote;
-
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
-    }
-
-    if (uFieldMask & osl_VolumeInfo_Mask_FileSystemCaseHandling)
-    {
-        if (__OSL_STATFS_IS_CASE_SENSITIVE_FS(sfs))
-            pInfo->uAttributes |= osl_Volume_Attribute_Case_Sensitive;
-
-        if (__OSL_STATFS_IS_CASE_PRESERVING_FS(sfs))
-            pInfo->uAttributes |= osl_Volume_Attribute_Case_Is_Preserved;
-
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
-    }
-
-    pInfo->uTotalSpace = 0;
-    pInfo->uFreeSpace  = 0;
-    pInfo->uUsedSpace  = 0;
-
-#if defined(__OSL_STATFS_BLKSIZ)
-
-    if ((uFieldMask & osl_VolumeInfo_Mask_TotalSpace) ||
-        (uFieldMask & osl_VolumeInfo_Mask_UsedSpace))
-    {
-        pInfo->uTotalSpace   = __OSL_STATFS_BLKSIZ(sfs);
-        pInfo->uTotalSpace  *= (sal_uInt64)(sfs.f_blocks);
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace;
-    }
-
-    if ((uFieldMask & osl_VolumeInfo_Mask_FreeSpace) ||
-        (uFieldMask & osl_VolumeInfo_Mask_UsedSpace))
-    {
-        pInfo->uFreeSpace = __OSL_STATFS_BLKSIZ(sfs);
-
-        if (getuid() == 0)
-            pInfo->uFreeSpace *= (sal_uInt64)(sfs.f_bfree);
-        else
-            pInfo->uFreeSpace *= (sal_uInt64)(sfs.f_bavail);
-
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_FreeSpace;
-    }
-
-#endif  /* __OSL_STATFS_BLKSIZ */
-
-    if ((pInfo->uValidFields & osl_VolumeInfo_Mask_TotalSpace) &&
-        (pInfo->uValidFields & osl_VolumeInfo_Mask_FreeSpace ))
-    {
-        pInfo->uUsedSpace    = pInfo->uTotalSpace - pInfo->uFreeSpace;
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_UsedSpace;
-    }
-
-    pInfo->uMaxNameLength = 0;
-    if (uFieldMask & osl_VolumeInfo_Mask_MaxNameLength)
-    {
-        long nLen = pathconf(pszDirectory, _PC_NAME_MAX);
-        if (nLen > 0)
-        {
-            pInfo->uMaxNameLength = (sal_uInt32)nLen;
-            pInfo->uValidFields |= osl_VolumeInfo_Mask_MaxNameLength;
-        }
-    }
-
-    pInfo->uMaxPathLength = 0;
-    if (uFieldMask & osl_VolumeInfo_Mask_MaxPathLength)
-    {
-        long nLen = pathconf (pszDirectory, _PC_PATH_MAX);
-        if (nLen > 0)
-        {
-            pInfo->uMaxPathLength  = (sal_uInt32)nLen;
-            pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxPathLength;
-        }
-    }
-
-#if defined(__OSL_STATFS_TYPENAME)
-
-    if (uFieldMask & osl_VolumeInfo_Mask_FileSystemName)
-    {
-        rtl_string2UString(
-            &(pInfo->ustrFileSystemName),
-            __OSL_STATFS_TYPENAME(sfs),
-            rtl_str_getLength(__OSL_STATFS_TYPENAME(sfs)),
-            osl_getThreadTextEncoding(),
-            OUSTRING_TO_OSTRING_CVTFLAGS);
-        OSL_ASSERT(pInfo->ustrFileSystemName != 0);
-
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_FileSystemName;
-    }
-
-#endif /* __OSL_STATFS_TYPENAME */
-
-    if (uFieldMask & osl_VolumeInfo_Mask_DeviceHandle)
-    {
-        /* FIXME: check also entries in mntent for the device
-           and fill it with correct values */
-
-        *pInfo->pDeviceHandle = osl_isFloppyDrive(pszDirectory);
-
-        if (*pInfo->pDeviceHandle)
-        {
-            pInfo->uValidFields |= osl_VolumeInfo_Mask_DeviceHandle;
-            pInfo->uAttributes  |= osl_Volume_Attribute_Removeable;
-            pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
-        }
-    }
-    return osl_File_E_None;
-}
-
-/******************************************
- * osl_psz_setFileTime
- *****************************************/
-
-static oslFileError osl_psz_setFileTime( const sal_Char* pszFilePath,
-                                  const TimeValue* /*pCreationTime*/,
-                                  const TimeValue* pLastAccessTime,
-                                  const TimeValue* pLastWriteTime )
-{
-    int nRet=0;
-    struct utimbuf aTimeBuffer;
-    struct stat aFileStat;
-#ifdef DEBUG_OSL_FILE
-    struct tm* pTM=0;
-#endif
-
-    nRet = lstat(pszFilePath,&aFileStat);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"File Times are (in localtime):\n");
-    pTM=localtime(&aFileStat.st_ctime);
-    fprintf(stderr,"CreationTime is '%s'\n",asctime(pTM));
-    pTM=localtime(&aFileStat.st_atime);
-    fprintf(stderr,"AccessTime   is '%s'\n",asctime(pTM));
-    pTM=localtime(&aFileStat.st_mtime);
-    fprintf(stderr,"Modification is '%s'\n",asctime(pTM));
-
-    fprintf(stderr,"File Times are (in UTC):\n");
-    fprintf(stderr,"CreationTime is '%s'\n",ctime(&aFileStat.st_ctime));
-    fprintf(stderr,"AccessTime   is '%s'\n",ctime(&aTimeBuffer.actime));
-    fprintf(stderr,"Modification is '%s'\n",ctime(&aTimeBuffer.modtime));
-#endif
-
-    if ( pLastAccessTime != 0 )
-    {
-        aTimeBuffer.actime=pLastAccessTime->Seconds;
-    }
-    else
-    {
-        aTimeBuffer.actime=aFileStat.st_atime;
-    }
-
-    if ( pLastWriteTime != 0 )
-    {
-        aTimeBuffer.modtime=pLastWriteTime->Seconds;
-    }
-    else
-    {
-        aTimeBuffer.modtime=aFileStat.st_mtime;
-    }
-
-    /* mfe: Creation time not used here! */
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"File Times are (in localtime):\n");
-    pTM=localtime(&aFileStat.st_ctime);
-    fprintf(stderr,"CreationTime now '%s'\n",asctime(pTM));
-    pTM=localtime(&aTimeBuffer.actime);
-    fprintf(stderr,"AccessTime   now '%s'\n",asctime(pTM));
-    pTM=localtime(&aTimeBuffer.modtime);
-    fprintf(stderr,"Modification now '%s'\n",asctime(pTM));
-
-    fprintf(stderr,"File Times are (in UTC):\n");
-    fprintf(stderr,"CreationTime now '%s'\n",ctime(&aFileStat.st_ctime));
-    fprintf(stderr,"AccessTime   now '%s'\n",ctime(&aTimeBuffer.actime));
-    fprintf(stderr,"Modification now '%s'\n",ctime(&aTimeBuffer.modtime));
-#endif
-
-    nRet=utime(pszFilePath,&aTimeBuffer);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-
-
-/*****************************************
- * osl_psz_removeFile
- ****************************************/
-#if 0
-static oslFileError osl_psz_removeFile( const sal_Char* pszPath )
-{
-    int nRet=0;
-    struct stat aStat;
-
-    nRet = stat(pszPath,&aStat);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    if ( S_ISDIR(aStat.st_mode) )
-    {
-        return osl_File_E_ISDIR;
-    }
-
-    nRet = unlink(pszPath);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-#endif
-
-/*****************************************
- * osl_psz_createDirectory
- ****************************************/
-#if 0
-static oslFileError osl_psz_createDirectory( const sal_Char* pszPath )
-{
-    int nRet=0;
-    int mode = S_IRWXU | S_IRWXG | S_IRWXO;
-
-    nRet = mkdir(pszPath,mode);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-#endif
-/*****************************************
- * osl_psz_removeDirectory
- ****************************************/
-#if 0
-static oslFileError osl_psz_removeDirectory( const sal_Char* pszPath )
-{
-    int nRet=0;
-
-    nRet = rmdir(pszPath);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-#endif
-/*****************************************
- * oslDoMoveFile
- ****************************************/
-#if 0
-static oslFileError oslDoMoveFile( const sal_Char* pszPath, const sal_Char* pszDestPath)
-{
-    oslFileError tErr=osl_File_E_invalidError;
-
-    tErr = osl_psz_moveFile(pszPath,pszDestPath);
-    if ( tErr == osl_File_E_None )
-    {
-        return tErr;
-    }
-
-    if ( tErr != osl_File_E_XDEV )
-    {
-        return tErr;
-    }
-
-    tErr=osl_psz_copyFile(pszPath,pszDestPath);
-
-    if ( tErr != osl_File_E_None )
-    {
-        oslFileError tErrRemove;
-        tErrRemove=osl_psz_removeFile(pszDestPath);
-        return tErr;
-    }
-
-    tErr=osl_psz_removeFile(pszPath);
-
-    return tErr;
-}
-#endif
-/*****************************************
- * osl_psz_moveFile
- ****************************************/
-#if 0
-static oslFileError osl_psz_moveFile(const sal_Char* pszPath, const sal_Char* pszDestPath)
-{
-
-    int nRet = 0;
-
-    nRet = rename(pszPath,pszDestPath);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    return osl_File_E_None;
-}
-#endif
-/*****************************************
- * osl_psz_copyFile
- ****************************************/
-#if 0
-static oslFileError osl_psz_copyFile( const sal_Char* pszPath, const sal_Char* pszDestPath )
-{
-    time_t nAcTime=0;
-    time_t nModTime=0;
-    uid_t nUID=0;
-    gid_t nGID=0;
-    int nRet=0;
-    mode_t nMode=0;
-    struct stat aFileStat;
-    oslFileError tErr=osl_File_E_invalidError;
-    size_t nSourceSize=0;
-    int DestFileExists=1;
-
-    /* mfe: does the source file really exists? */
-    nRet = lstat(pszPath,&aFileStat);
-
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-        return oslTranslateFileError(OSL_FET_ERROR, nRet);
-    }
-
-    /* mfe: we do only copy files here! */
-    if ( S_ISDIR(aFileStat.st_mode) )
-    {
-        return osl_File_E_ISDIR;
-    }
-
-    nSourceSize=(size_t)aFileStat.st_size;
-    nMode=aFileStat.st_mode;
-    nAcTime=aFileStat.st_atime;
-    nModTime=aFileStat.st_mtime;
-    nUID=aFileStat.st_uid;
-    nGID=aFileStat.st_gid;
-
-    nRet = stat(pszDestPath,&aFileStat);
-    if ( nRet < 0 )
-    {
-        nRet=errno;
-
-        if ( nRet == ENOENT )
-        {
-            DestFileExists=0;
-        }
-/*        return oslTranslateFileError(nRet);*/
-    }
-
-    /* mfe: the destination file must not be a directory! */
-    if ( nRet == 0 && S_ISDIR(aFileStat.st_mode) )
-    {
-        return osl_File_E_ISDIR;
-    }
-    else
-    {
-        /* mfe: file does not exists or is no dir */
-    }
-
-    tErr = oslDoCopy(pszPath,pszDestPath,nMode,nSourceSize,DestFileExists);
-
-    if ( tErr != osl_File_E_None )
-    {
-        return tErr;
-    }
-
-    /*
-     *   mfe: ignore return code
-     *        since only  the success of the copy is
-     *        important
-     */
-    oslChangeFileModes(pszDestPath,nMode,nAcTime,nModTime,nUID,nGID);
-
-    return tErr;
-}
-#endif
-
-/******************************************************************************
- *
- *                  Utility Functions
- *
- *****************************************************************************/
-
-
-/*****************************************
- * oslMakeUStrFromPsz
- ****************************************/
-
-rtl_uString* oslMakeUStrFromPsz(const sal_Char* pszStr, rtl_uString** ustrValid)
-{
-    rtl_string2UString(
-        ustrValid,
-        pszStr,
-        rtl_str_getLength( pszStr ),
-        osl_getThreadTextEncoding(),
-        OUSTRING_TO_OSTRING_CVTFLAGS );
-    OSL_ASSERT(*ustrValid != 0);
-
-    return *ustrValid;
-}
-
-/*****************************************************************************
- * UnicodeToText
- * converting unicode to text manually saves us the penalty of a temporary
- * rtl_String object.
- ****************************************************************************/
-
-int UnicodeToText( char * buffer, size_t bufLen, const sal_Unicode * uniText, sal_Int32 uniTextLen )
-{
-    rtl_UnicodeToTextConverter hConverter;
-    sal_uInt32   nInfo;
-    sal_Size   nSrcChars, nDestBytes;
-
-    /* stolen from rtl/string.c */
-    hConverter = rtl_createUnicodeToTextConverter( osl_getThreadTextEncoding() );
-
-    nDestBytes = rtl_convertUnicodeToText( hConverter, 0, uniText, uniTextLen,
-                                           buffer, bufLen,
-                                           OUSTRING_TO_OSTRING_CVTFLAGS | RTL_UNICODETOTEXT_FLAGS_FLUSH,
-                                           &nInfo, &nSrcChars );
-
-    rtl_destroyUnicodeToTextConverter( hConverter );
-
-    if( nInfo & RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL )
-    {
-        errno = EOVERFLOW;
-        return 0;
-    }
-
-    /* ensure trailing '\0' */
-    buffer[nDestBytes] = '\0';
-
-    return nDestBytes;
-}
-
-/*****************************************************************************
-   TextToUnicode
-
-   @param text
-          The text to convert.
-
-   @param text_buffer_size
-          The number of characters.
-
-   @param unic_text
-          The unicode buffer.
-
-   @param unic_text_buffer_size
-             The size in characters of the unicode buffer.
-
- ****************************************************************************/
-
-int TextToUnicode(
-    const char*  text,
-    size_t       text_buffer_size,
-    sal_Unicode* unic_text,
-    sal_Int32    unic_text_buffer_size)
-{
-    rtl_TextToUnicodeConverter hConverter;
-    sal_uInt32 nInfo;
-    sal_Size nSrcChars;
-    sal_Size nDestBytes;
-
-    /* stolen from rtl/string.c */
-    hConverter = rtl_createTextToUnicodeConverter(osl_getThreadTextEncoding());
-
-    nDestBytes = rtl_convertTextToUnicode(hConverter,
-                                          0,
-                                          text,  text_buffer_size,
-                                          unic_text, unic_text_buffer_size,
-                                          OSTRING_TO_OUSTRING_CVTFLAGS | RTL_TEXTTOUNICODE_FLAGS_FLUSH,
-                                          &nInfo, &nSrcChars);
-
-    rtl_destroyTextToUnicodeConverter(hConverter);
-
-    if (nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL)
-    {
-        errno = EOVERFLOW;
-        return 0;
-    }
-
-    /* ensure trailing '\0' */
-    unic_text[nDestBytes] = '\0';
-
-    return nDestBytes;
-}
-
-/******************************************************************************
- *
- *                  GENERIC FLOPPY FUNCTIONS
- *
- *****************************************************************************/
-
-
-/*****************************************
- * osl_unmountVolumeDevice
- ****************************************/
-
-oslFileError osl_unmountVolumeDevice( oslVolumeDeviceHandle Handle )
-{
-    oslFileError tErr = osl_File_E_NOSYS;
-
-    tErr = osl_unmountFloppy(Handle);
-
-     /* Perhaps current working directory is set to mount point */
-
-     if ( tErr )
-    {
-        sal_Char *pszHomeDir = getenv("HOME");
-
-        if ( pszHomeDir && strlen( pszHomeDir ) && 0 == chdir( pszHomeDir ) )
-        {
-            /* try again */
-
-            tErr = osl_unmountFloppy(Handle);
-
-            OSL_ENSURE( tErr, "osl_unmountvolumeDevice: CWD was set to volume mount point" );
-        }
-    }
-
-    return tErr;
-}
-
-/*****************************************
- * osl_automountVolumeDevice
- ****************************************/
-
-oslFileError osl_automountVolumeDevice( oslVolumeDeviceHandle Handle )
-{
-    oslFileError tErr = osl_File_E_NOSYS;
-
-    tErr = osl_mountFloppy(Handle);
-
-    return tErr;
-}
-
-/*****************************************
- * osl_getVolumeDeviceMountPath
- ****************************************/
-
-oslFileError osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle, rtl_uString **pstrPath )
-{
-    oslVolumeDeviceHandleImpl* pItem = (oslVolumeDeviceHandleImpl*) Handle;
-    sal_Char Buffer[PATH_MAX];
-
-    Buffer[0] = '\0';
-
-    if ( pItem == 0 || pstrPath == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-        return osl_File_E_INVAL;
-    }
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"Handle is:\n");
-    osl_printFloppyHandle(pItem);
-#endif
-
-    snprintf(Buffer, sizeof(Buffer), "file://%s", pItem->pszMountPoint);
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"Mount Point is: '%s'\n",Buffer);
-#endif
-
-    oslMakeUStrFromPsz(Buffer, pstrPath);
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * osl_acquireVolumeDeviceHandle
- ****************************************/
-
-oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
-{
-    oslVolumeDeviceHandleImpl* pItem =(oslVolumeDeviceHandleImpl*) Handle;
-
-    if ( pItem == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    ++pItem->RefCount;
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * osl_releaseVolumeDeviceHandle
- ****************************************/
-
-oslFileError osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
-{
-    oslVolumeDeviceHandleImpl* pItem =(oslVolumeDeviceHandleImpl*) Handle;
-
-    if ( pItem == 0 )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    --pItem->RefCount;
-
-    if ( pItem->RefCount == 0 )
-    {
-        rtl_freeMemory(pItem);
-    }
-
-    return osl_File_E_None;
-}
-
-/*****************************************
- * osl_newVolumeDeviceHandleImpl
- ****************************************/
-
-static oslVolumeDeviceHandleImpl* osl_newVolumeDeviceHandleImpl()
-{
-    oslVolumeDeviceHandleImpl* pHandle;
-    const size_t               nSizeOfHandle = sizeof(oslVolumeDeviceHandleImpl);
-
-    pHandle = (oslVolumeDeviceHandleImpl*) rtl_allocateMemory (nSizeOfHandle);
-    if (pHandle != NULL)
-    {
-        pHandle->ident[0]         = 'O';
-        pHandle->ident[1]         = 'V';
-        pHandle->ident[2]         = 'D';
-        pHandle->ident[3]         = 'H';
-        pHandle->pszMountPoint[0] = '\0';
-        pHandle->pszFilePath[0]   = '\0';
-        pHandle->pszDevice[0]     = '\0';
-        pHandle->RefCount         = 1;
-    }
-    return pHandle;
-}
-
-/*****************************************
- * osl_freeVolumeDeviceHandleImpl
- ****************************************/
-
-static void osl_freeVolumeDeviceHandleImpl (oslVolumeDeviceHandleImpl* pHandle)
-{
-    if (pHandle != NULL)
-        rtl_freeMemory (pHandle);
-}
-
-
-/******************************************************************************
- *
- *                  OS/2 FLOPPY FUNCTIONS
- *
- *****************************************************************************/
-
-#if defined(OS2)
-static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
-{
-    return NULL;
-}
-
-static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
-{
-    return osl_File_E_BUSY;
-}
-
-static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
-{
-    return osl_File_E_BUSY;
-}
-
-static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
-{
-    return sal_False;
-}
-
-static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice)
-{
-    return sal_False;
-}
-
-
-#ifdef DEBUG_OSL_FILE
-static void osl_printFloppyHandle(oslVolumeDeviceHandleImpl* pItem)
-{
-    if (pItem == 0 )
-    {
-        fprintf(stderr,"NULL Handle\n");
-        return;
-    }
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Invalid Handle]\n");
-#endif
-        return;
-    }
-
-
-    fprintf(stderr,"MountPoint : '%s'\n",pItem->pszMountPoint);
-    fprintf(stderr,"FilePath   : '%s'\n",pItem->pszFilePath);
-    fprintf(stderr,"Device     : '%s'\n",pItem->pszDevice);
-
-    return;
-}
-#endif
-
-#endif /* OS2 */
diff --git a/sal/osl/os2/file_error_transl.cxx b/sal/osl/os2/file_error_transl.cxx
deleted file mode 100644
index fd296d9dd3d2..000000000000
--- a/sal/osl/os2/file_error_transl.cxx
+++ /dev/null
@@ -1,252 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
- #ifndef _ERRNO_H
- #include <errno.h>
- #endif
-
- #ifndef _FILE_ERROR_TRANSL_H_
- #include "file_error_transl.h"
- #endif
-
- #ifndef _OSL_DIAGNOSE_H_
- #include <osl/diagnose.h>
- #endif
-
-
-/********************************************
- * oslTranslateFileError
- *******************************************/
-
-oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
-{
-    oslFileError osl_error = osl_File_E_invalidError;
-
-    OSL_ENSURE((bIsError && (0 != Errno)) || (!bIsError && (0 == Errno)), "oslTranslateFileError strange input combination!");
-
-    /* Have a look at file_error_transl.h for
-       the reason that we do this here */
-    if (bIsError && (0 == Errno))
-        return osl_error;
-
-    switch(Errno)
-    {
-        case 0:
-            osl_error = osl_File_E_None;
-            break;
-
-        case EPERM:
-            osl_error = osl_File_E_PERM;
-            break;
-
-        case ENOENT:
-            osl_error = osl_File_E_NOENT;
-            break;
-
-        case ESRCH:
-            osl_error = osl_File_E_SRCH;
-            break;
-
-        case EINTR:
-            osl_error = osl_File_E_INTR;
-            break;
-
-        case EIO:
-            osl_error = osl_File_E_IO;
-            break;
-
-        case ENXIO:
-            osl_error = osl_File_E_IO;
-            break;
-
-        case E2BIG:
-            osl_error = osl_File_E_2BIG;
-            break;
-
-        case ENOEXEC:
-            osl_error = osl_File_E_NOEXEC;
-            break;
-
-        case EBADF:
-            osl_error = osl_File_E_BADF;
-            break;
-
-        case ECHILD:
-            osl_error = osl_File_E_CHILD;
-            break;
-
-        case EAGAIN:
-            osl_error = osl_File_E_AGAIN;
-            break;
-
-        case ENOMEM:
-            osl_error = osl_File_E_NOMEM;
-            break;
-
-        case EACCES:
-            osl_error = osl_File_E_ACCES;
-            break;
-
-        case EFAULT:
-            osl_error = osl_File_E_FAULT;
-            break;
-
-        case EBUSY:
-            osl_error = osl_File_E_BUSY;
-            break;
-
-        case EEXIST:
-            osl_error = osl_File_E_EXIST;
-            break;
-
-        case EXDEV:
-            osl_error = osl_File_E_XDEV;
-            break;
-
-        case ENODEV:
-            osl_error = osl_File_E_NODEV;
-            break;
-
-        case ENOTDIR:
-            osl_error = osl_File_E_NOTDIR;
-            break;
-
-        case EISDIR:
-            osl_error = osl_File_E_ISDIR;
-            break;
-
-        case EINVAL:
-            osl_error = osl_File_E_INVAL;
-            break;
-
-        case ENFILE:
-            osl_error = osl_File_E_NFILE;
-            break;
-
-        case EMFILE:
-            osl_error = osl_File_E_MFILE;
-            break;
-
-        case ENOTTY:
-            osl_error = osl_File_E_NOTTY;
-            break;
-
-        case EFBIG:
-            osl_error = osl_File_E_FBIG;
-            break;
-
-        case ENOSPC:
-            osl_error = osl_File_E_NOSPC;
-            break;
-
-        case ESPIPE:
-            osl_error = osl_File_E_SPIPE;
-            break;
-
-        case EROFS:
-            osl_error = osl_File_E_ROFS;
-            break;
-
-        case EMLINK:
-            osl_error = osl_File_E_MLINK;
-            break;
-
-        case EPIPE:
-            osl_error = osl_File_E_PIPE;
-            break;
-
-        case EDOM:
-            osl_error = osl_File_E_DOM;
-            break;
-
-        case ERANGE:
-            osl_error = osl_File_E_RANGE;
-            break;
-
-        case EDEADLK:
-            osl_error = osl_File_E_DEADLK;
-            break;
-
-        case ENAMETOOLONG:
-            osl_error = osl_File_E_NAMETOOLONG;
-            break;
-
-        case ENOLCK:
-            osl_error = osl_File_E_NOLCK;
-            break;
-
-        case ENOSYS:
-           osl_error = osl_File_E_NOSYS;
-            break;
-
-        case ENOTEMPTY:
-            osl_error = osl_File_E_NOTEMPTY;
-            break;
-
-        case ELOOP:
-            osl_error = osl_File_E_LOOP;
-            break;
-
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
-        case EILSEQ:
-            osl_error = osl_File_E_ILSEQ;
-            break;
-#endif /* MACOSX */
-
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2))
-        case ENOLINK:
-            osl_error = osl_File_E_NOLINK;
-            break;
-#endif /* MACOSX */
-
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2))
-        case EMULTIHOP:
-            osl_error = osl_File_E_MULTIHOP;
-            break;
-#endif /* MACOSX */
-
-        case EUSERS:
-            osl_error = osl_File_E_USERS;
-            break;
-
-        case EOVERFLOW:
-            osl_error = osl_File_E_OVERFLOW;
-            break;
-
-        case ETIMEDOUT:
-            osl_error = osl_File_E_TIMEDOUT;
-            break;
-
-        default:
-            /* FIXME translateFileError: is this alright? Or add a new one: osl_File_E_Unknown? */
-            osl_error = osl_File_E_invalidError;
-            break;
-    }
-
-    return osl_error;
-}
-
diff --git a/sal/osl/os2/file_path_helper.cxx b/sal/osl/os2/file_path_helper.cxx
deleted file mode 100644
index 1aa5840deca4..000000000000
--- a/sal/osl/os2/file_path_helper.cxx
+++ /dev/null
@@ -1,377 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
- /*******************************************
-     Includes
-  ******************************************/
-
- #ifndef _OSL_THREAD_H_
- #include "osl/thread.h"
- #endif
-
- #ifndef _OSL_FILE_PATH_HELPER_H_
- #include "file_path_helper.h"
- #endif
-
- #ifndef _OSL_FILE_PATH_HELPER_HXX_
- #include "file_path_helper.hxx"
- #endif
-
- #ifndef _OSL_UUNXAPI_HXX_
- #include "uunxapi.hxx"
- #endif
-
- #ifndef _OSL_DIAGNOSE_H_
- #include <osl/diagnose.h>
- #endif
-
- #ifndef _RTL_USTRING_HXX_
- #include <rtl/ustring.hxx>
- #endif
-
- /*******************************************
-     Constants
-  ******************************************/
-
-  const sal_Unicode FPH_CHAR_PATH_SEPARATOR = (sal_Unicode)'\\';
-  const sal_Unicode FPH_CHAR_DOT            = (sal_Unicode)'.';
-  const sal_Unicode FPH_CHAR_COLON          = (sal_Unicode)':';
-
-  inline const rtl::OUString FPH_PATH_SEPARATOR()
-      { return rtl::OUString::createFromAscii("\\"); }
-  inline const rtl::OUString FPH_LOCAL_DIR_ENTRY()
-      { return rtl::OUString::createFromAscii("."); }
-  inline const rtl::OUString FPH_PARENT_DIR_ENTRY()
-      { return rtl::OUString::createFromAscii(".."); }
-
- /*******************************************
-  *  osl_systemPathRemoveSeparator
-  ******************************************/
-
- void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath)
- {
-     OSL_PRECOND(pustrPath, "osl_systemPathRemoveSeparator: Invalid parameter");
-
-    // maybe there are more than one separator at end
-    // so we run in a loop
-    while ((pustrPath->length > 1) && (FPH_CHAR_PATH_SEPARATOR == pustrPath->buffer[pustrPath->length - 1]))
-    {
-        pustrPath->length--;
-        pustrPath->buffer[pustrPath->length] = (sal_Unicode)'\0';
-    }
-
-    OSL_POSTCOND((0 == pustrPath->length) || (1 == pustrPath->length) || \
-                 (pustrPath->length > 1 && pustrPath->buffer[pustrPath->length - 1] != FPH_CHAR_PATH_SEPARATOR), \
-                 "osl_systemPathRemoveSeparator: Post condition failed");
- }
-
- /*******************************************
-    osl_systemPathEnsureSeparator
-  ******************************************/
-
- void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath)
- {
-     OSL_PRECOND(ppustrPath && (NULL != *ppustrPath), \
-                "osl_systemPathEnsureSeparator: Invalid parameter");
-
-     rtl::OUString path(*ppustrPath);
-    sal_Int32     lp = path.getLength();
-    sal_Int32     i  = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);
-
-    if ((lp > 1 && i != (lp - 1)) || ((lp < 2) && i < 0))
-    {
-        path += FPH_PATH_SEPARATOR();
-        rtl_uString_assign(ppustrPath, path.pData);
-    }
-
-    OSL_POSTCOND(path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR) == (path.getLength() - 1), \
-                 "osl_systemPathEnsureSeparator: Post condition failed");
- }
-
- /*******************************************
-  *  osl_systemPathIsRelativePath
-  ******************************************/
-
- sal_Bool SAL_CALL osl_systemPathIsRelativePath(const rtl_uString* pustrPath)
- {
-     OSL_PRECOND(pustrPath, "osl_systemPathIsRelativePath: Invalid parameter");
-     return (!osl_systemPathIsAbsolutePath(pustrPath));
- }
-
- /******************************************
-  *  osl_systemPathIsAbsolutePath
-  *****************************************/
-
- sal_Bool SAL_CALL osl_systemPathIsAbsolutePath(const rtl_uString* pustrPath)
- {
-     OSL_PRECOND(pustrPath, "osl_systemPathIsAbsolutePath: Invalid parameter");
-    if (pustrPath->length == 0)
-        return sal_False;
-    if (pustrPath->buffer[0] == FPH_CHAR_PATH_SEPARATOR)
-        return sal_True;
-    if (pustrPath->buffer[1] == FPH_CHAR_COLON
-            && pustrPath->buffer[2] == FPH_CHAR_PATH_SEPARATOR)
-        return sal_True;
-    return sal_False;
- }
-
- /******************************************
-    osl_systemPathMakeAbsolutePath
-  *****************************************/
-
- void SAL_CALL osl_systemPathMakeAbsolutePath(
-     const rtl_uString* pustrBasePath,
-    const rtl_uString* pustrRelPath,
-    rtl_uString**      ppustrAbsolutePath)
-{
-    rtl::OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath)));
-    rtl::OUString rel(const_cast<rtl_uString*>(pustrRelPath));
-
-    if (base.getLength() > 0)
-        osl_systemPathEnsureSeparator(&base.pData);
-
-    base += rel;
-
-    rtl_uString_acquire(base.pData);
-    *ppustrAbsolutePath = base.pData;
-}
-
-
- /*****************************************
-    osl_systemPathGetParent
-  ****************************************/
-
- sal_Int32 SAL_CALL osl_systemPathGetParent(rtl_uString* pustrPath)
- {
-     return 0;
- }
-
- /*******************************************
-     osl_systemPathGetFileOrLastDirectoryPart
-  ******************************************/
-
- void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart(
-     const rtl_uString*     pustrPath,
-    rtl_uString**       ppustrFileNameOrLastDirPart)
-{
-    OSL_PRECOND(pustrPath && ppustrFileNameOrLastDirPart, \
-                "osl_systemPathGetFileNameOrLastDirectoryPart: Invalid parameter");
-
-    rtl::OUString path(const_cast<rtl_uString*>(pustrPath));
-
-    osl_systemPathRemoveSeparator(path.pData);
-
-    rtl::OUString last_part;
-
-    if (path.getLength() > 1 || (1 == path.getLength() && *path.getStr() != FPH_CHAR_PATH_SEPARATOR))
-    {
-        sal_Int32 idx_ps = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);
-        idx_ps++; // always right to increment by one even if idx_ps == -1!
-        last_part = rtl::OUString(path.getStr() + idx_ps);
-    }
-    rtl_uString_assign(ppustrFileNameOrLastDirPart, last_part.pData);
-}
-
-
- /********************************************
-     osl_systemPathIsHiddenFileOrDirectoryEntry
- *********************************************/
-
- sal_Bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
-     const rtl_uString* pustrPath)
-{
-    OSL_PRECOND(pustrPath, "osl_systemPathIsHiddenFileOrDirectoryEntry: Invalid parameter");
-
-    sal_Bool is_hidden = sal_False;
-
-    if (pustrPath->length > 0)
-    {
-        rtl::OUString fdp;
-
-        osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &fdp.pData);
-
-        is_hidden = ((fdp.pData->length > 0) && (fdp.pData->buffer[0] == FPH_CHAR_DOT) &&
-                     !osl_systemPathIsLocalOrParentDirectoryEntry(fdp.pData));
-     }
-
-    return is_hidden;
-}
-
-
- /************************************************
-     osl_systemPathIsLocalOrParentDirectoryEntry
- ************************************************/
-
-sal_Bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
-    const rtl_uString* pustrPath)
-{
-    OSL_PRECOND(pustrPath, "osl_systemPathIsLocalOrParentDirectoryEntry: Invalid parameter");
-
-    rtl::OUString dirent;
-
-    osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &dirent.pData);
-
-    return (
-            (dirent == FPH_LOCAL_DIR_ENTRY()) ||
-            (dirent == FPH_PARENT_DIR_ENTRY())
-           );
-}
-
-/***********************************************
- Simple iterator for a path list separated by
- the specified character
- **********************************************/
-
-class path_list_iterator
-{
-public:
-
-    /******************************************
-      constructor
-
-     after construction get_current_item
-     returns the first path in list, no need
-     to call reset first
-     *****************************************/
-    path_list_iterator(const rtl::OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) :
-        m_path_list(path_list),
-        m_end(m_path_list.getStr() + m_path_list.getLength() + 1),
-        m_separator(list_separator)
-    {
-        reset();
-    }
-
-    /******************************************
-     reset the iterator
-     *****************************************/
-    void reset()
-    {
-        m_path_segment_begin = m_path_segment_end = m_path_list.getStr();
-        advance();
-    }
-
-    /******************************************
-     move the iterator to the next position
-     *****************************************/
-    void next()
-    {
-        OSL_PRECOND(!done(), "path_list_iterator: Already done!");
-
-        m_path_segment_begin = ++m_path_segment_end;
-        advance();
-    }
-
-    /******************************************
-     check if done
-     *****************************************/
-    bool done() const
-    {
-        return (m_path_segment_end >= m_end);
-    }
-
-    /******************************************
-     return the current item
-     *****************************************/
-    rtl::OUString get_current_item() const
-    {
-        return rtl::OUString(
-            m_path_segment_begin,
-            (m_path_segment_end - m_path_segment_begin));
-    }
-
-private:
-
-    /******************************************
-     move m_path_end to the next separator or
-     to the edn of the string
-     *****************************************/
-    void advance()
-    {
-        while (!done() && *m_path_segment_end && (*m_path_segment_end != m_separator))
-            ++m_path_segment_end;
-
-        OSL_ASSERT(m_path_segment_end <= m_end);
-    }
-
-private:
-    rtl::OUString       m_path_list;
-    const sal_Unicode*  m_end;
-    const sal_Unicode   m_separator;
-    const sal_Unicode*  m_path_segment_begin;
-    const sal_Unicode*  m_path_segment_end;
-
-// prevent copy and assignment
-private:
-    /******************************************
-     copy constructor
-     remember: do not simply copy m_path_begin
-     and m_path_end because they point to
-     the memory of other.m_path_list!
-     *****************************************/
-    path_list_iterator(const path_list_iterator& other);
-
-    /******************************************
-     assignment operator
-      remember: do not simply copy m_path_begin
-     and m_path_end because they point to
-     the memory of other.m_path_list!
-     *****************************************/
-    path_list_iterator& operator=(const path_list_iterator& other);
-};
-
- /************************************************
-      osl_searchPath
-  ***********************************************/
-
-sal_Bool SAL_CALL osl_searchPath(
-     const rtl_uString* pustrFilePath,
-    const rtl_uString* pustrSearchPathList,
-    rtl_uString**      ppustrPathFound)
-{
-    OSL_PRECOND(pustrFilePath && pustrSearchPathList && ppustrPathFound, "osl_searchPath: Invalid parameter");
-
-    bool               bfound = false;
-    rtl::OUString      fp(const_cast<rtl_uString*>(pustrFilePath));
-    rtl::OUString      pl = rtl::OUString(const_cast<rtl_uString*>(pustrSearchPathList));
-    path_list_iterator pli(pl);
-
-    while (!pli.done())
-    {
-        rtl::OUString p = pli.get_current_item();
-        osl::systemPathEnsureSeparator(p);
-        p += fp;
-
-        if (osl::access(p, F_OK) > -1)
-        {
-            bfound = true;
-            rtl_uString_assign(ppustrPathFound, p.pData);
-            break;
-        }
-        pli.next();
-    }
-    return bfound;
-}
diff --git a/sal/osl/os2/file_path_helper.h b/sal/osl/os2/file_path_helper.h
deleted file mode 100644
index 88b8ccbe9b6a..000000000000
--- a/sal/osl/os2/file_path_helper.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
- #ifndef _OSL_FILE_PATH_HELPER_H_
- #define _OSL_FILE_PATH_HELPER_H_
-
-
- #ifndef _SAL_TYPES_H_
- #include <sal/types.h>
- #endif
-
- #ifndef _RTL_USTRING_H_
- #include <rtl/ustring.h>
- #endif
-
-
- #ifdef __cplusplus
- extern "C"
- {
- #endif
-
-
- /*******************************************
-    osl_systemPathRemoveSeparator
-    Removes the last separator from the
-    given system path if any and if the path
-    is not the root path '/'
-
-    @param  ppustrPath [inout] a system path
-            if the path is not the root path
-            and the last character is a
-            path separator it will be cut off
-               ppustrPath must not be NULL and
-            must point to a valid rtl_uString
-
-    @returns nothing
-
-  ******************************************/
-
- void SAL_CALL osl_systemPathRemoveSeparator(
-     /*inout*/ rtl_uString* pustrPath);
-
- /*******************************************
-    osl_systemPathEnsureSeparator
-    Adds a trailing path separator to the
-    given system path if not already there
-    and if the path is not the root path '/'
-
-      @param    pustrPath [inout] a system path
-            if the path is not the root path
-            '/' and has no trailing separator
-            a separator will be added
-            ppustrPath must not be NULL and
-            must point to a valid rtl_uString
-
-    @returns nothing
-
-  ******************************************/
-
- void SAL_CALL osl_systemPathEnsureSeparator(
-     /*inout*/ rtl_uString** ppustrPath);
-
- /*******************************************
-    osl_systemPathIsRelativePath
-    Returns true if the given path is a
-    relative path and so starts not with '/'
-
-    @param  pustrPath [in] a system path
-            pustrPath must not be NULL
-
-    @returns sal_True if the given path
-             doesn't start with a separator
-             else sal_False will be returned
-
-  ******************************************/
-
- sal_Bool SAL_CALL osl_systemPathIsRelativePath(
-     const rtl_uString* pustrPath);
-
- /******************************************
-    osl_systemPathIsAbsolutePath
-    Returns true if the given path is an
-    absolute path and so starts with a '/'
-
-    @param pustrPath [in] a system path
-           pustrPath must not be NULL
-
-    @returns sal_True if the given path
-             start's with a separator else
-             sal_False will be returned
-
-  *****************************************/
-
- sal_Bool SAL_CALL osl_systemPathIsAbsolutePath(
-     const rtl_uString* pustrPath);
-
- /******************************************
-    osl_systemPathMakeAbsolutePath
-    Append a relative path to a base path
-
-    @param  pustrBasePath [in] a system
-            path that will be considered as
-            base path
-            pustrBasePath must not be NULL
-
-    @param  pustrRelPath [in] a system path
-            that will be considered as
-            relative path
-            pustrBasePath must not be NULL
-
-    @param  ppustrAbsolutePath [out] the
-            resulting path which is a
-            concatination of the base and
-            the relative path
-            if base path is empty the
-            resulting absolute path is the
-            relative path
-            if relative path is empty the
-            resulting absolute path is the
-            base path
-            if base and relative path are
-            empty the resulting absolute
-            path is also empty
-            ppustrAbsolutePath must not be
-            NULL and *ppustrAbsolutePath
-            must be 0 or point to a valid
-            rtl_uString
-
-  *****************************************/
-
- void SAL_CALL osl_systemPathMakeAbsolutePath(
-     const rtl_uString* pustrBasePath,
-    const rtl_uString* pustrRelPath,
-    rtl_uString**      ppustrAbsolutePath);
-
- /*****************************************
-    osl_systemPathGetParent
-    Replaces the last occurrance of a path
-    separator with '\0' and returns the
-    position where the '/' was replaced
-
-    @param  pustrPath [inout] a system
-            path, the last separator of
-            this path will be replaced by
-            a '\0'
-            if the path is the root path
-            '/' or the path is considered
-            as to have no parent, e.g.
-            '/NoParent' or 'NoParent' or
-            the path is empty no
-            replacement will be made
-            pustrPath must not be NULL
-
-    @returns the position of the last path
-             separator that was replaced
-             or 0 if no replacement took
-             place
-
-  ****************************************/
-
- sal_Int32 SAL_CALL osl_systemPathGetParent(
-    /*inout*/ rtl_uString* pustrPath);
-
- /*****************************************
-     osl_systemPathGetFileOrLastDirectoryPart
-    Returns the file or the directory part
-    of the given path
-
-    @param pustrPath [in] a system path,
-           must not be NULL
-
-    @param ppustrFileOrDirPart [out] on
-           return receives the last part
-           of the given directory or the
-           file name
-           if pustrPath is the root path
-           '/' an empty string will be
-           returned
-           if pustrPath has a trailing
-           '/' the last part before the
-           '/' will be returned else
-           the part after the last '/'
-           will be returned
-
-    @returns nothing
-
-  ****************************************/
- void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart(
-     const rtl_uString*     pustrPath,
-    rtl_uString**       ppustrFileNameOrLastDirPart);
-
-
- /********************************************
-     osl_systemPathIsHiddenFileOrDirectoryEntry
-    Returns sal_True if the last part of
-    given system path is not '.' or '..'
-    alone and starts with a '.'
-
-    @param pustrPath [in] a system path,
-           must not be NULL
-
-    @returns sal_True if the last part of
-             the given system path starts
-             with '.' or sal_False the last
-             part is '.' or '..' alone or
-             doesn't start with a dot
-
- *********************************************/
-
- sal_Bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
-     const rtl_uString* pustrPath);
-
-
- /************************************************
-     osl_systemPathIsLocalOrParentDirectoryEntry
-    Returns sal_True if the last part of the given
-    system path is the local directory entry '.'
-    or the parent directory entry '..'
-
-    @param pustrPath [in] a system path,
-           must not be NULL
-
-    @returns sal_True if the last part of the
-             given system path is '.' or '..'
-             else sal_False
-
- ************************************************/
-
- sal_Bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
-     const rtl_uString* pustrPath);
-
-
- /************************************************
-      osl_searchPath
-    Searches for a file name or path name in all
-    directories specified by a given path list.
-    Symbolic links in the resulting path will not be
-    resolved, it's up to the caller to do this.
-
-    @param pustrFilePath [in] a file name or
-    directory name to search for, the name must
-    be provided as system path not as a file URL
-
-    @param pustrSearchPathList [in] a ':'
-    separated list of paths in which to search for
-    the file or directory name
-
-    @ppustrPathFound [out] on success receives the
-    complete path of the file or directory found
-    as a system path
-
-    @returns sal_True if the specified file or
-    directory was found else sal_False
-  ***********************************************/
-
- sal_Bool SAL_CALL osl_searchPath(
-     const rtl_uString* pustrFilePath,
-    const rtl_uString* pustrSearchPathList,
-    rtl_uString**      ppustrPathFound);
-
-
- #ifdef __cplusplus
- }
- #endif
-
-
- #endif /* #ifndef _OSL_PATH_HELPER_H_ */
-
diff --git a/sal/osl/os2/file_path_helper.hxx b/sal/osl/os2/file_path_helper.hxx
deleted file mode 100644
index 5310f462efc0..000000000000
--- a/sal/osl/os2/file_path_helper.hxx
+++ /dev/null
@@ -1,296 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _OSL_FILE_PATH_HELPER_HXX_
-#define _OSL_FILE_PATH_HELPER_HXX_
-
-
-#ifndef _OSL_FILE_PATH_HELPER_H_
-#include "file_path_helper.h"
-#endif
-
-#include <rtl/ustring.hxx>
-
-
-namespace osl
-{
-
- /*******************************************
-    systemPathRemoveSeparator
-    Removes the last separator from the
-    given system path if any and if the path
-    is not the root path '/'
-
-    @param  ppustrPath [inout] a system path
-            if the path is not the root path
-            and the last character is a
-            path separator it will be cut off
-               ppustrPath must not be NULL and
-            must point to a valid rtl_uString
-
-    @returns nothing
-
-  ******************************************/
-
- inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
- {
-     osl_systemPathRemoveSeparator(Path.pData);
- }
-
- /*******************************************
-    systemPathEnsureSeparator
-    Adds a trailing path separator to the
-    given system path if not already there
-    and if the path is not the root path '/'
-
-      @param    pustrPath [inout] a system path
-            if the path is not the root path
-            '/' and has no trailing separator
-            a separator will be added
-            ppustrPath must not be NULL and
-            must point to a valid rtl_uString
-
-    @returns nothing
-
-  ******************************************/
-
- inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
- {
-     osl_systemPathEnsureSeparator(&Path.pData);
- }
-
- /*******************************************
-    systemPathIsRelativePath
-    Returns true if the given path is a
-    relative path and so starts not with '/'
-
-    @param  pustrPath [in] a system path
-            pustrPath must not be NULL
-
-    @returns sal_True if the given path
-             doesn't start with a separator
-             else sal_False will be returned
-
-  ******************************************/
-
- inline bool systemPathIsRelativePath(const rtl::OUString& Path)
- {
-    return osl_systemPathIsRelativePath(Path.pData);
- }
-
- /******************************************
-    systemPathIsAbsolutePath
-    Returns true if the given path is an
-    absolute path and so starts with a '/'
-
-    @param pustrPath [in] a system path
-           pustrPath must not be NULL
-
-    @returns sal_True if the given path
-             start's with a separator else
-             sal_False will be returned
-
-  *****************************************/
-
- inline bool systemPathIsAbsolutePath(const rtl::OUString& Path)
- {
-     return osl_systemPathIsAbsolutePath(Path.pData);
- }
-
- /******************************************
-    systemPathMakeAbsolutePath
-    Append a relative path to a base path
-
-    @param  pustrBasePath [in] a system
-            path that will be considered as
-            base path
-            pustrBasePath must not be NULL
-
-    @param  pustrRelPath [in] a system path
-            that will be considered as
-            relative path
-            pustrBasePath must not be NULL
-
-    @param  ppustrAbsolutePath [out] the
-            resulting path which is a
-            concatination of the base and
-            the relative path
-            if base path is empty the
-            resulting absolute path is the
-            relative path
-            if relative path is empty the
-            resulting absolute path is the
-            base path
-            if base and relative path are
-            empty the resulting absolute
-            path is also empty
-            ppustrAbsolutePath must not be
-            NULL and *ppustrAbsolutePath
-            must be 0 or point to a valid
-            rtl_uString
-
-  *****************************************/
-
- inline void systemPathMakeAbsolutePath(
-     const rtl::OUString& BasePath,
-    const rtl::OUString& RelPath,
-    rtl::OUString&       AbsolutePath)
- {
-    osl_systemPathMakeAbsolutePath(
-        BasePath.pData, RelPath.pData, &AbsolutePath.pData);
- }
-
- /*****************************************
-    systemPathGetParent
-    Replaces the last occurrance of a path
-    separator with '\0' and returns the
-    position where the '/' was replaced
-
-    @param  pustrPath [inout] a system
-            path, the last separator of
-            this path will be replaced by
-            a '\0'
-            if the path is the root path
-            '/' or the path is considered
-            as to have no parent, e.g.
-            '/NoParent' or 'NoParent' or
-            the path is empty no
-            replacement will be made
-            pustrPath must not be NULL
-
-    @returns the position of the last path
-             separator that was replaced
-             or 0 if no replacement took
-             place
-
-  ****************************************/
-
- inline sal_Int32 systemPathGetParent(/*inout*/ rtl::OUString& Path)
- {
-    return osl_systemPathGetParent(Path.pData);
- }
-
- /*****************************************
-     systemPathGetFileOrLastDirectoryPart
-    Returns the file or the directory part
-    of the given path
-
-    @param pustrPath [in] a system path,
-           must not be NULL
-
-    @param ppustrFileOrDirPart [out] on
-           return receives the last part
-           of the given directory or the
-           file name
-           if pustrPath is the root path
-           '/' an empty string will be
-           returned
-           if pustrPath has a trailing
-           '/' the last part before the
-           '/' will be returned else
-           the part after the last '/'
-           will be returned
-
-    @returns nothing
-
-  ****************************************/
-
- inline void systemPathGetFileNameOrLastDirectoryPart(
-     const rtl::OUString& Path,
-    rtl::OUString&       FileNameOrLastDirPart)
- {
-    osl_systemPathGetFileNameOrLastDirectoryPart(
-        Path.pData, &FileNameOrLastDirPart.pData);
- }
-
-
- /********************************************
-     systemPathIsHiddenFileOrDirectoryEntry
-    Returns sal_True if the last part of
-    given system path is not '.' or '..'
-    alone and starts with a '.'
-
-    @param pustrPath [in] a system path,
-           must not be NULL
-
-    @returns sal_True if the last part of
-             the given system path starts
-             with '.' or sal_False the last
-             part is '.' or '..' alone or
-             doesn't start with a dot
-
- *********************************************/
-
- inline bool systemPathIsHiddenFileOrDirectoryEntry(
-     const rtl::OUString& Path)
- {
-    return osl_systemPathIsHiddenFileOrDirectoryEntry(Path.pData);
- }
-
-
- /************************************************
-     systemPathIsLocalOrParentDirectoryEntry
-    Returns sal_True if the last part of the given
-    system path is the local directory entry '.'
-    or the parent directory entry '..'
-
-    @param pustrPath [in] a system path,
-           must not be NULL
-
-    @returns sal_True if the last part of the
-             given system path is '.' or '..'
-             else sal_False
-
- ************************************************/
-
- inline bool systemPathIsLocalOrParentDirectoryEntry(
-     const rtl::OUString& Path)
- {
-    return osl_systemPathIsLocalOrParentDirectoryEntry(Path.pData);
- }
-
- /************************************************
-  searchPath
-  ***********************************************/
-
- inline bool searchPath(
-     const rtl::OUString& ustrFilePath,
-    const rtl::OUString& ustrSearchPathList,
-    rtl::OUString& ustrPathFound)
- {
-     return osl_searchPath(
-        ustrFilePath.pData,
-        ustrSearchPathList.pData,
-        &ustrPathFound.pData);
- }
-
-
- } // namespace osl
-
-
- #endif /* #ifndef _OSL_PATH_HELPER_HXX_ */
-
diff --git a/sal/osl/os2/file_url.cxx b/sal/osl/os2/file_url.cxx
deleted file mode 100644
index e3b5fbf00c48..000000000000
--- a/sal/osl/os2/file_url.cxx
+++ /dev/null
@@ -1,1626 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <ctype.h>
-#include "system.h"
-
-#ifndef _LIMITS_H
-#include <limits.h>
-#endif
-
-#ifndef _ERRNO_H
-#include <errno.h>
-#endif
-
-#ifndef _STDLIB_H_
-#include <stdlib.h>
-#endif
-
-#ifndef _STRINGS_H
-#include <strings.h>
-#endif
-
-#ifndef _UNISTD_H
-#include <unistd.h>
-#endif
-#include <osl/file.h>
-#include <osl/security.h>
-#include <rtl/uri.h>
-#include <osl/diagnose.h>
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.h>
-
-#ifndef _OSL_TREAD_H_
-#include <osl/thread.h>
-#endif
-#include <osl/file.hxx>
-#include <osl/mutex.h>
-#include <osl/process.h>
-#include "file_error_transl.h"
-
-#ifndef _FILE_URL_H_
-#include "file_url.h"
-#endif
-#include "file_path_helper.hxx"
-
-#ifndef _OSL_UUNXAPI_HXX_
-#include "uunxapi.hxx"
-#endif
-
-#include <wchar.h>
-#include <wctype.h>
-
-/***************************************************
-
- General note
-
- This file contains the part that handles File URLs.
-
- File URLs as scheme specific notion of URIs
- (RFC2396) may be handled platform independend, but
- will not in osl which is considered wrong.
- Future version of osl should handle File URLs this
- way. In rtl/uri there is already an URI parser etc.
- so this code should be consolidated.
-
- **************************************************/
-
-oslMutex g_CurrentDirectoryMutex;
-
-
-/***************************************************
- * forward
- **************************************************/
-
-void _osl_warnFile(const char*, rtl_uString*);
-rtl_uString*  oslMakeUStrFromPsz(const sal_Char* pszStr,rtl_uString** uStr);
-
-extern "C" int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
-extern "C" int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
-
-/***************************************************
- * namespace directives
- **************************************************/
-
-using namespace osl;
-
-/******************************************************************************
- *
- *                  Exported Module Functions
- *
- *****************************************************************************/
-
-/* a slightly modified version of Pchar in rtl/source/uri.c */
-const sal_Bool uriCharClass[128] =
-{
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* Pchar but without encoding slashes */
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* !"#$%&'()*+,-./  */
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, /* 0123456789:;<=>? */
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* @ABCDEFGHIJKLMNO */
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* PQRSTUVWXYZ[\]^_ */
-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* `abcdefghijklmno */
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0  /* pqrstuvwxyz{|}~  */
-};
-
-
-/* check for top wrong usage strings */
-/*
-static sal_Bool findWrongUsage( const sal_Unicode *path, sal_Int32 len )
-{
-    rtl_uString *pTmp = NULL;
-    sal_Bool bRet;
-
-    rtl_uString_newFromStr_WithLength( &pTmp, path, len );
-
-    rtl_ustr_toAsciiLowerCase_WithLength( pTmp->buffer, pTmp->length );
-
-    bRet = ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "ftp://", 6 ) ) ||
-           ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "http://", 7 ) ) ||
-           ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "vnd.sun.star", 12 ) ) ||
-           ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "private:", 8 ) ) ||
-           ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "slot:", 5) );
-
-    rtl_uString_release( pTmp );
-    return bRet;
-}
-*/
-
-
-/****************************************************************************/
-/*  osl_getFileURLFromSystemPath */
-/****************************************************************************/
-
-BOOL WINAPI IsValidFilePathComponent(
-    LPCTSTR lpComponent, LPCTSTR *lppComponentEnd, DWORD dwFlags)
-{
-    LPCTSTR lpComponentEnd = NULL;
-    LPCTSTR lpCurrent = lpComponent;
-    BOOL    fValid = TRUE;  /* Assume success */
-    TCHAR   cLast = 0;
-
-    /* Path component length must not exceed MAX_PATH */
-
-    while ( !lpComponentEnd && lpCurrent && lpCurrent - lpComponent < _MAX_PATH )
-    {
-        switch ( *lpCurrent )
-        {
-            /* Both backslash and slash determine the end of a path component */
-        case '\0':
-        case '/':
-        case '\\':
-            switch ( cLast )
-            {
-                /* Component must not end with '.' or blank and can't be empty */
-
-            case '.':
-                if ( dwFlags & VALIDATEPATH_ALLOW_ELLIPSE )
-                {
-                    if ( 1 == lpCurrent - lpComponent )
-                    {
-                        /* Current directory is O.K. */
-                        lpComponentEnd = lpCurrent;
-                        break;
-                    }
-                    else if ( 2 == lpCurrent - lpComponent && '.' == *lpComponent )
-                    {
-                        /* Parent directory is O.K. */
-                        lpComponentEnd = lpCurrent;
-                        break;
-                    }
-                }
-            case 0:
-            case ' ':
-                lpComponentEnd = lpCurrent - 1;
-                fValid = FALSE;
-                break;
-            default:
-                lpComponentEnd = lpCurrent;
-                break;
-            }
-            break;
-            /* '?' and '*' are valid wildcards but not valid file name characters */
-        case '?':
-        case '*':
-            if ( dwFlags & VALIDATEPATH_ALLOW_WILDCARDS )
-                break;
-            /* The following characters are reserved */
-        case '<':
-        case '>':
-        case '\"':
-        case '|':
-        case ':':
-            lpComponentEnd = lpCurrent;
-            fValid = FALSE;
-            break;
-        default:
-            /* Characters below ASCII 32 are not allowed */
-            if ( *lpCurrent < ' ' )
-            {
-                lpComponentEnd = lpCurrent;
-                fValid = FALSE;
-            }
-            break;
-        }
-        cLast = *lpCurrent++;
-    }
-
-    /*  If we don't reached the end of the component the length of the component was to long
-        ( See condition of while loop ) */
-    if ( !lpComponentEnd )
-    {
-        fValid = FALSE;
-        lpComponentEnd = lpCurrent;
-    }
-
-    /* Test wether the component specifies a device name what is not allowed */
-
-    // MT: PERFORMANCE:
-    // This is very expensive. A lot of calls to _tcsicmp.
-    // in SRC6870m71 67.000 calls of this method while empty office start result into more than 1.500.00 calls of _tcsicmp!
-    // Possible optimizations
-    // - Array should be const static
-    // - Sorted array, use binary search
-    // - More intelligent check for com1-9, lpt1-9
-    // Maybe make szComponent upper case, don't search case intensitive
-    // Talked to HRO: Could be removed. Shouldn't be used in OOo, and if used for something like a filename, it will lead to an error anyway.
-    /*
-    if ( fValid )
-    {
-        LPCTSTR alpDeviceNames[] =
-        {
-            TEXT("CON"),
-            TEXT("PRN"),
-            TEXT("AUX"),
-            TEXT("CLOCK$"),
-            TEXT("NUL"),
-            TEXT("LPT1"),
-            TEXT("LPT2"),
-            TEXT("LPT3"),
-            TEXT("LPT4"),
-            TEXT("LPT5"),
-            TEXT("LPT6"),
-            TEXT("LPT7"),
-            TEXT("LPT8"),
-            TEXT("LPT9"),
-            TEXT("COM1"),
-            TEXT("COM2"),
-            TEXT("COM3"),
-            TEXT("COM4"),
-            TEXT("COM5"),
-            TEXT("COM6"),
-            TEXT("COM7"),
-            TEXT("COM8"),
-            TEXT("COM9")
-        };
-
-        TCHAR   szComponent[MAX_PATH];
-        int     nComponentLength;
-        LPCTSTR lpDot;
-        int     i;
-
-        // A device name with an extension is also invalid
-        lpDot = _tcschr( lpComponent, '.' );
-
-        if ( !lpDot || lpDot > lpComponentEnd )
-            nComponentLength = lpComponentEnd - lpComponent;
-        else
-            nComponentLength = lpDot - lpComponent;
-
-        _tcsncpy( szComponent, lpComponent, nComponentLength );
-        szComponent[nComponentLength] = 0;
-
-        for ( i = 0; i < sizeof( alpDeviceNames ) / sizeof(LPCTSTR); i++ )
-        {
-            if ( 0 == _tcsicmp( szComponent, alpDeviceNames[i] ) )
-            {
-                lpComponentEnd = lpComponent;
-                fValid = FALSE;
-                break;
-            }
-        }
-    }
-    */
-
-    if ( fValid )
-    {
-        // Empty components are not allowed
-        if ( lpComponentEnd - lpComponent < 1 )
-            fValid = FALSE;
-
-        // If we reached the end of the string NULL is returned
-        else if ( !*lpComponentEnd )
-            lpComponentEnd = NULL;
-
-    }
-
-    if ( lppComponentEnd )
-        *lppComponentEnd = lpComponentEnd;
-
-    return fValid;
-}
-
-//#####################################################
-DWORD WINAPI IsValidFilePath(LPCTSTR lpszPath, LPCTSTR *lppError, DWORD dwFlags)
-{
-    LPCTSTR lpComponent;
-    BOOL    fValid = TRUE;
-    DWORD   dwPathType = PATHTYPE_ERROR;
-
-    if ( dwFlags & VALIDATEPATH_ALLOW_RELATIVE )
-        dwFlags |= VALIDATEPATH_ALLOW_ELLIPSE;
-
-    if ( !lpszPath )
-    {
-        fValid = FALSE;
-        lpComponent = lpszPath;
-    }
-
-    /* Test for UNC path notation */
-    if ( 2 == _tcsspn( lpszPath, CHARSET_SEPARATOR ) )
-    {
-        /* Place the pointer behind the leading to backslashes */
-
-        lpComponent = lpszPath + 2;
-
-        fValid = IsValidFilePathComponent( lpComponent, &lpComponent, VALIDATEPATH_ALLOW_ELLIPSE );
-
-        /* So far we have a valid servername. Now let's see if we also have a network resource */
-
-        dwPathType = PATHTYPE_ABSOLUTE_UNC;
-
-        if ( fValid )
-        {
-            if ( lpComponent &&  !*++lpComponent )
-                lpComponent = NULL;
-
-            if ( !lpComponent )
-            {
-#if 0
-                /* We only have a Server specification what is invalid */
-
-                lpComponent = lpszPath;
-                fValid = FALSE;
-#else
-                dwPathType |= PATHTYPE_IS_SERVER;
-#endif
-            }
-            else
-            {
-                /* Now test the network resource */
-
-                fValid = IsValidFilePathComponent( lpComponent, &lpComponent, 0 );
-
-                /* If we now reached the end of the path, everything is O.K. */
-
-
-                if ( fValid && (!lpComponent || lpComponent && !*++lpComponent ) )
-                {
-                    lpComponent = NULL;
-                    dwPathType |= PATHTYPE_IS_VOLUME;
-                }
-            }
-        }
-    }
-
-    /* Local path verification. Must start with <drive>: */
-    else if ( _istalpha( lpszPath[0] ) && ':' == lpszPath[1] )
-    {
-        /* Place pointer behind correct drive specification */
-
-        lpComponent = lpszPath + 2;
-
-        if ( 1 == _tcsspn( lpComponent, CHARSET_SEPARATOR ) )
-            lpComponent++;
-        else if ( *lpComponent )
-            fValid = FALSE;
-
-        dwPathType = PATHTYPE_ABSOLUTE_LOCAL;
-
-        /* Now we are behind the backslash or it was a simple drive without backslash */
-
-        if ( fValid && !*lpComponent )
-        {
-            lpComponent = NULL;
-            dwPathType |= PATHTYPE_IS_VOLUME;
-        }
-    }
-
-    /* Can be a relative path */
-    else if ( dwFlags & VALIDATEPATH_ALLOW_RELATIVE )
-    {
-        lpComponent = lpszPath;
-
-        /* Relative path can start with a backslash */
-
-        if ( 1 == _tcsspn( lpComponent, CHARSET_SEPARATOR ) )
-        {
-            lpComponent++;
-            if ( !*lpComponent )
-                lpComponent = NULL;
-        }
-
-        dwPathType = PATHTYPE_RELATIVE;
-    }
-
-    /* Anything else is an error */
-    else
-    {
-        fValid = FALSE;
-        lpComponent = lpszPath;
-    }
-
-    /* Now validate each component of the path */
-    while ( fValid && lpComponent )
-    {
-        fValid = IsValidFilePathComponent( lpComponent, &lpComponent, dwFlags );
-
-        if ( fValid && lpComponent )
-        {
-            lpComponent++;
-
-            /* If the string behind the backslash is empty, we've done */
-
-            if ( !*lpComponent )
-                lpComponent = NULL;
-        }
-    }
-
-    if ( fValid && _tcslen( lpszPath ) >= _MAX_PATH )
-    {
-        fValid = FALSE;
-        lpComponent = lpszPath + _MAX_PATH;
-    }
-
-    if ( lppError )
-        *lppError = lpComponent;
-
-    return fValid ? dwPathType : PATHTYPE_ERROR;
-}
-
-sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedURL )
-{
-    sal_Char        *pBuffer;
-    const sal_Char  *pSrcEnd;
-    const sal_Char  *pSrc;
-    sal_Char        *pDest;
-    sal_Int32       nSrcLen;
-    sal_Bool        bValidEncoded = sal_True;   /* Assume success */
-
-    /* The resulting decoded string length is shorter or equal to the source length */
-
-    nSrcLen = rtl_string_getLength(strUTF8);
-    pBuffer = reinterpret_cast<sal_Char*>(rtl_allocateMemory(nSrcLen + 1));
-
-    pDest = pBuffer;
-    pSrc = rtl_string_getStr(strUTF8);
-    pSrcEnd = pSrc + nSrcLen;
-
-    /* Now decode the URL what should result in an UTF8 string */
-    while ( bValidEncoded && pSrc < pSrcEnd )
-    {
-        switch ( *pSrc )
-        {
-        case '%':
-            {
-                sal_Char    aToken[3];
-                sal_Char    aChar;
-
-                pSrc++;
-                aToken[0] = *pSrc++;
-                aToken[1] = *pSrc++;
-                aToken[2] = 0;
-
-                aChar = (sal_Char)strtoul( aToken, NULL, 16 );
-
-                /* The chars are path delimiters and must not be encoded */
-
-                if ( 0 == aChar || '\\' == aChar || '/' == aChar || ':' == aChar )
-                    bValidEncoded = sal_False;
-                else
-                    *pDest++ = aChar;
-            }
-            break;
-        default:
-            *pDest++ = *pSrc++;
-            break;
-        }
-    }
-
-    *pDest++ = 0;
-
-    if ( bValidEncoded ) {
-        rtl_string2UString( pstrDecodedURL, pBuffer, rtl_str_getLength(pBuffer), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
-        OSL_ASSERT(*pstrDecodedURL != 0);
-    }
-
-    rtl_freeMemory( pBuffer );
-
-    return bValidEncoded;
-}
-
-//#############################################
-void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL )
-{
-    /* Encode non ascii characters within the URL */
-
-    rtl_String      *strUTF8 = NULL;
-    sal_Char        *pszEncodedURL;
-    const sal_Char  *pURLScan;
-    sal_Char        *pURLDest;
-    sal_Int32       nURLScanLen;
-    sal_Int32       nURLScanCount;
-
-    rtl_uString2String( &strUTF8, rtl_uString_getStr( strURL ), rtl_uString_getLength( strURL ), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
-
-    pszEncodedURL = (sal_Char*) rtl_allocateMemory( (rtl_string_getLength( strUTF8 ) * 3 + 1)  * sizeof(sal_Char) );
-
-    pURLDest = pszEncodedURL;
-    pURLScan = rtl_string_getStr( strUTF8 );
-    nURLScanLen = rtl_string_getLength( strUTF8 );
-    nURLScanCount = 0;
-
-    while ( nURLScanCount < nURLScanLen )
-    {
-        sal_Char    cCurrent = *pURLScan;
-
-        switch ( cCurrent )
-        {
-        default:
-            if (!( ( cCurrent >= 'a' && cCurrent <= 'z' ) || ( cCurrent >= 'A' && cCurrent <= 'Z' ) || ( cCurrent >= '0' && cCurrent <= '9' ) ) )
-            {
-                sprintf( pURLDest, "%%%02X", (unsigned char)cCurrent );
-                pURLDest += 3;
-                break;
-            }
-        case '!':
-        case '\'':
-        case '(':
-        case ')':
-        case '*':
-        case '-':
-        case '.':
-        case '_':
-        case '~':
-        case '$':
-        case '&':
-        case '+':
-        case ',':
-        case '=':
-        case '@':
-        case ':':
-        case '/':
-        case '\\':
-        case '|':
-            *pURLDest++ = cCurrent;
-            break;
-        case 0:
-            break;
-        }
-
-        pURLScan++;
-        nURLScanCount++;
-    }
-
-
-    *pURLDest = 0;
-
-    rtl_string_release( strUTF8 );
-    rtl_string_newFromStr( pstrEncodedURL, pszEncodedURL );
-    rtl_freeMemory( pszEncodedURL );
-}
-
-//#############################################
-oslFileError SAL_CALL _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** pstrURL )
-{
-    oslFileError nError = osl_File_E_INVAL; /* Assume failure */
-    rtl_uString *strTempURL = NULL;
-    DWORD dwPathType = PATHTYPE_ERROR;
-
-    if (strPath)
-        dwPathType = IsValidFilePath(strPath->buffer, NULL, VALIDATEPATH_ALLOW_RELATIVE);
-
-    if (dwPathType)
-    {
-        rtl_uString *strTempPath = NULL;
-
-        /* Replace backslashes */
-
-        rtl_uString_newReplace( &strTempPath, strPath, '\\', '/' );
-
-        switch ( dwPathType & PATHTYPE_MASK_TYPE )
-        {
-        case PATHTYPE_RELATIVE:
-            rtl_uString_assign( &strTempURL, strTempPath );
-            nError = osl_File_E_None;
-            break;
-        case PATHTYPE_ABSOLUTE_UNC:
-            rtl_uString_newFromAscii( &strTempURL, "file:" );
-            rtl_uString_newConcat( &strTempURL, strTempURL, strTempPath );
-            nError = osl_File_E_None;
-            break;
-        case PATHTYPE_ABSOLUTE_LOCAL:
-            rtl_uString_newFromAscii( &strTempURL, "file:///" );
-            rtl_uString_newConcat( &strTempURL, strTempURL, strTempPath );
-            nError = osl_File_E_None;
-            break;
-        default:
-            break;
-        }
-
-        /* Release temp path */
-
-        rtl_uString_release( strTempPath );
-    }
-
-    if ( osl_File_E_None == nError )
-    {
-        rtl_String  *strEncodedURL = NULL;
-
-        /* Encode the URL */
-
-        _osl_encodeURL( strTempURL, &strEncodedURL );
-
-        /* Provide URL via unicode string */
-
-        rtl_string2UString( pstrURL, rtl_string_getStr(strEncodedURL), rtl_string_getLength(strEncodedURL), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-        OSL_ASSERT(*pstrURL != 0);
-        rtl_string_release( strEncodedURL );
-    }
-
-    /* Release temp URL */
-
-    if ( strTempURL )
-        rtl_uString_release( strTempURL );
-
-    /*
-    OSL_ENSURE_FILE( !nError, "osl_getFileURLFromSystemPath: \"%s\" is not a systemPath !!!", strPath );
-    */
-
-    return nError;
-}
-
-oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath, rtl_uString **pustrFileURL )
-{
-    return _osl_getFileURLFromSystemPath( ustrSystemPath, pustrFileURL );
-#if 0
-    static const sal_Unicode pDoubleSlash[2] = { '/', '/' };
-
-    rtl_uString *pTmp = NULL;
-    sal_Int32 nIndex;
-
-    if( 0 == ustrSystemPath->length )
-        return osl_File_E_INVAL;
-
-    /* YD convert '\' to '/' */
-    rtl_ustr_replaceChar( ustrSystemPath->buffer, '\\', '/' );
-
-    /* temporary hack: if already file url, return ustrSystemPath */
-    if( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( ustrSystemPath->buffer, ustrSystemPath->length,"file:", 5 ) )
-    {
-    /*
-        if( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( ustrSystemPath->buffer, ustrSystemPath->length,"file://", 7 ) )
-        {
-            OSL_ENSURE( 0, "osl_getFileURLFromSystemPath: input is already file URL" );
-            rtl_uString_assign( pustrFileURL, ustrSystemPath );
-        }
-        else
-        {
-            rtl_uString *pTmp2 = NULL;
-
-            OSL_ENSURE( 0, "osl_getFileURLFromSystemPath: input is wrong file URL" );
-            rtl_uString_newFromStr_WithLength( pustrFileURL, ustrSystemPath->buffer + 5, ustrSystemPath->length - 5 );
-            rtl_uString_newFromAscii( &pTmp2, "file://" );
-            rtl_uString_newConcat( pustrFileURL, *pustrFileURL, pTmp2 );
-            rtl_uString_release( pTmp2 );
-        }
-        return osl_File_E_None;
-        */
-        return osl_File_E_INVAL;
-    }
-
-
-    /* check if system path starts with ~ or ~user and replace it with the appropriate home dir */
-    if( (sal_Unicode) '~' == ustrSystemPath->buffer[0] )
-    {
-        /* check if another user is specified */
-        if( ( 1 == ustrSystemPath->length ) || ( (sal_Unicode)'/' == ustrSystemPath->buffer[1] ) )
-        {
-            /* osl_getHomeDir returns file URL */
-            osl_getHomeDir( osl_getCurrentSecurity(), &pTmp );
-
-            /* remove "file://" prefix */
-            rtl_uString_newFromStr_WithLength( &pTmp, pTmp->buffer + 7, pTmp->length - 7 );
-
-            /* replace '~' in original string */
-            rtl_uString_newReplaceStrAt( &pTmp, ustrSystemPath, 0, 1, pTmp );
-        }
-
-        else
-        {
-            /* FIXME: replace ~user with users home directory */
-            return osl_File_E_INVAL;
-        }
-    }
-
-    /* check if initial string contains double instances of '/' */
-    nIndex = rtl_ustr_indexOfStr_WithLength( ustrSystemPath->buffer, ustrSystemPath->length, pDoubleSlash, 2 );
-    if( -1 != nIndex )
-    {
-        sal_Int32 nSrcIndex;
-        sal_Int32 nDeleted = 0;
-
-        /* if pTmp is not already allocated, copy ustrSystemPath for modification */
-        if( NULL == pTmp )
-            rtl_uString_newFromString( &pTmp, ustrSystemPath );
-
-        /* adapt index to pTmp */
-        nIndex += pTmp->length - ustrSystemPath->length;
-
-        /* remove all occurances of '//' */
-        for( nSrcIndex = nIndex + 1; nSrcIndex < pTmp->length; nSrcIndex++ )
-        {
-            if( ((sal_Unicode) '/' == pTmp->buffer[nSrcIndex]) && ((sal_Unicode) '/' == pTmp->buffer[nIndex]) )
-                nDeleted++;
-            else
-                pTmp->buffer[++nIndex] = pTmp->buffer[nSrcIndex];
-        }
-
-        /* adjust length member */
-        pTmp->length -= nDeleted;
-    }
-
-    if( NULL == pTmp )
-        rtl_uString_assign( &pTmp, ustrSystemPath );
-
-    /* temporary check for top 5 wrong usage strings (which are valid but unlikly filenames) */
-    /*
-    OSL_ASSERT( !findWrongUsage( pTmp->buffer, pTmp->length ) );
-    */
-
-    /* file URLs must be URI encoded */
-    rtl_uriEncode( pTmp, uriCharClass, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8, pustrFileURL );
-
-    rtl_uString_release( pTmp );
-
-    /* absolute urls should start with 'file://' */
-    if( (sal_Unicode)'/' == (*pustrFileURL)->buffer[0] )
-    {
-        rtl_uString *pProtocol = NULL;
-
-        rtl_uString_newFromAscii( &pProtocol, "file://" );
-        rtl_uString_newConcat( pustrFileURL, pProtocol, *pustrFileURL );
-        rtl_uString_release( pProtocol );
-    }
-
-    return osl_File_E_None;
-#endif
-}
-
-//#############################################
-oslFileError SAL_CALL _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **pustrPath, sal_Bool bAllowRelative )
-{
-    rtl_String          *strUTF8 = NULL;
-    rtl_uString         *strDecodedURL = NULL;
-    rtl_uString         *strTempPath = NULL;
-    const sal_Unicode   *pDecodedURL;
-    sal_uInt32          nDecodedLen;
-    sal_Bool            bValidEncoded;
-    oslFileError        nError = osl_File_E_INVAL;  /* Assume failure */
-
-    /*  If someone hasn't encoded the complete URL we convert it to UTF8 now to prevent from
-        having a mixed encoded URL later */
-
-    rtl_uString2String( &strUTF8, rtl_uString_getStr( strURL ), rtl_uString_getLength( strURL ), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
-
-    /* If the length of strUTF8 and strURL differs it indicates that the URL was not correct encoded */
-
-    OSL_ENSURE_FILE(
-        strUTF8->length == strURL->length ||
-        0 != rtl_ustr_ascii_shortenedCompare_WithLength( strURL->buffer, strURL->length, "file:\\\\", 7 )
-        ,"osl_getSystemPathFromFileURL: \"%s\" is not encoded !!!", strURL );
-
-    bValidEncoded = _osl_decodeURL( strUTF8, &strDecodedURL );
-
-    /* Release the encoded UTF8 string */
-
-    rtl_string_release( strUTF8 );
-
-
-    if ( bValidEncoded )
-    {
-        /* Replace backslashes and pipes */
-
-        rtl_uString_newReplace( &strDecodedURL, strDecodedURL, '/', '\\' );
-        rtl_uString_newReplace( &strDecodedURL, strDecodedURL, '|', ':' );
-
-        pDecodedURL = rtl_uString_getStr( strDecodedURL );
-        nDecodedLen = rtl_uString_getLength( strDecodedURL );
-
-        /* Must start with "file://" */
-
-        if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\", 7 ) )
-        {
-            sal_uInt32  nSkip;
-
-            if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\\\", 8 ) )
-                nSkip = 8;
-            else if (
-                0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\localhost\\", 17 ) ||
-                0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\127.0.0.1\\", 17 )
-            )
-                nSkip = 17;
-            else
-                nSkip = 5;
-
-            /* Indicates local root */
-            if ( nDecodedLen == nSkip )
-                rtl_uString_newFromStr_WithLength( &strTempPath, (const sal_Unicode*)WSTR_SYSTEM_ROOT_PATH, ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1 );
-            else
-                rtl_uString_newFromStr_WithLength( &strTempPath, pDecodedURL + nSkip, nDecodedLen - nSkip );
-
-            if ( IsValidFilePath( strTempPath->buffer, NULL, VALIDATEPATH_ALLOW_ELLIPSE ) )
-                nError = osl_File_E_None;
-        }
-        else if ( bAllowRelative )  /* This maybe a relative file URL */
-        {
-            rtl_uString_assign( &strTempPath, strDecodedURL );
-
-            if ( IsValidFilePath( strTempPath->buffer, NULL, VALIDATEPATH_ALLOW_RELATIVE | VALIDATEPATH_ALLOW_ELLIPSE ) )
-                nError = osl_File_E_None;
-        }
-    /*
-        else
-            OSL_ENSURE_FILE( !nError, "osl_getSystemPathFromFileURL: \"%s\" is not an absolute FileURL !!!", strURL );
-     */
-
-    }
-
-    if ( strDecodedURL )
-        rtl_uString_release( strDecodedURL );
-
-    if ( osl_File_E_None == nError )
-        rtl_uString_assign( pustrPath, strTempPath );
-
-    if ( strTempPath )
-        rtl_uString_release( strTempPath );
-
-    /*
-    OSL_ENSURE_FILE( !nError, "osl_getSystemPathFromFileURL: \"%s\" is not a FileURL !!!", strURL );
-    */
-
-    return nError;
-}
-
-/****************************************************************************/
-/*  osl_getSystemPathFromFileURL */
-/****************************************************************************/
-
-oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath )
-{
-    return _osl_getSystemPathFromFileURL( ustrFileURL, pustrSystemPath, sal_True );
-#if 0
-    sal_Int32 nIndex = 0;
-    rtl_uString * pTmp = NULL;
-
-    sal_Unicode encodedSlash[3] = { '%', '2', 'F' };
-
-    /* temporary hack: if already system path, return ustrFileURL */
-    /*
-    if( (sal_Unicode) '/' == ustrFileURL->buffer[0] )
-    {
-        OSL_ENSURE( 0, "osl_getSystemPathFromFileURL: input is already system path" );
-        rtl_uString_assign( pustrSystemPath, ustrFileURL );
-        return osl_File_E_None;
-    }
-    */
-
-    /* a valid file url may not start with '/' */
-    if( ( 0 == ustrFileURL->length ) || ( (sal_Unicode) '/' == ustrFileURL->buffer[0] ) )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    /* search for encoded slashes (%2F) and decode every single token if we find one */
-    if( -1 != rtl_ustr_indexOfStr_WithLength( ustrFileURL->buffer, ustrFileURL->length, encodedSlash, 3 ) )
-    {
-        rtl_uString * ustrPathToken = NULL;
-        sal_Int32 nOffset = 7;
-
-        do
-        {
-            nOffset += nIndex;
-
-            /* break url down in '/' devided tokens tokens */
-            nIndex = rtl_ustr_indexOfChar_WithLength( ustrFileURL->buffer + nOffset, ustrFileURL->length - nOffset, (sal_Unicode) '/' );
-
-            /* copy token to new string */
-            rtl_uString_newFromStr_WithLength( &ustrPathToken, ustrFileURL->buffer + nOffset,
-                -1 == nIndex ? ustrFileURL->length - nOffset : nIndex++ );
-
-            /* decode token */
-            rtl_uriDecode( ustrPathToken, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &pTmp );
-
-            /* the result should not contain any '/' */
-            if( -1 != rtl_ustr_indexOfChar_WithLength( pTmp->buffer, pTmp->length, (sal_Unicode) '/' ) )
-            {
-                rtl_uString_release( pTmp );
-                rtl_uString_release( ustrPathToken );
-
-                return osl_File_E_INVAL;
-            }
-
-        } while( -1 != nIndex );
-
-        /* release temporary string and restore index variable */
-        rtl_uString_release( ustrPathToken );
-        nIndex = 0;
-    }
-
-    /* protocol and server should not be encoded, so decode the whole string */
-    rtl_uriDecode( ustrFileURL, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &pTmp );
-
-    /* check if file protocol specified */
-    /* FIXME: use rtl_ustr_ascii_shortenedCompareIgnoreCase_WithLength when available */
-    if( 7 <= pTmp->length )
-    {
-        rtl_uString * pProtocol = NULL;
-        rtl_uString_newFromStr_WithLength( &pProtocol, pTmp->buffer, 7 );
-
-        /* protocol is case insensitive */
-        rtl_ustr_toAsciiLowerCase_WithLength( pProtocol->buffer, pProtocol->length );
-
-        if( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pProtocol->buffer, pProtocol->length,"file://", 7 ) )
-            nIndex = 7;
-
-        rtl_uString_release( pProtocol );
-    }
-
-    /* skip "localhost" or "127.0.0.1" if "file://" is specified */
-    /* FIXME: use rtl_ustr_ascii_shortenedCompareIgnoreCase_WithLength when available */
-    if( nIndex && ( 10 <= pTmp->length - nIndex ) )
-    {
-        rtl_uString * pServer = NULL;
-        rtl_uString_newFromStr_WithLength( &pServer, pTmp->buffer + nIndex, 10 );
-
-        /* server is case insensitive */
-        rtl_ustr_toAsciiLowerCase_WithLength( pServer->buffer, pServer->length );
-
-        if( ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pServer->buffer, pServer->length,"localhost/", 10 ) ) ||
-            ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pServer->buffer, pServer->length,"127.0.0.1/", 10 ) ) )
-        {
-            /* don't exclude the '/' */
-            nIndex += 9;
-        }
-
-        rtl_uString_release( pServer );
-    }
-
-    if( nIndex )
-        rtl_uString_newFromStr_WithLength( &pTmp, pTmp->buffer + nIndex, pTmp->length - nIndex );
-
-    /* check if system path starts with ~ or ~user and replace it with the appropriate home dir */
-    if( (sal_Unicode) '~' == pTmp->buffer[0] )
-    {
-        /* check if another user is specified */
-        if( ( 1 == pTmp->length ) || ( (sal_Unicode)'/' == pTmp->buffer[1] ) )
-        {
-            rtl_uString *pTmp2 = NULL;
-
-            /* osl_getHomeDir returns file URL */
-            osl_getHomeDir( osl_getCurrentSecurity(), &pTmp2 );
-
-            /* remove "file://" prefix */
-            rtl_uString_newFromStr_WithLength( &pTmp2, pTmp2->buffer + 7, pTmp2->length - 7 );
-
-            /* replace '~' in original string */
-            rtl_uString_newReplaceStrAt( &pTmp, pTmp, 0, 1, pTmp2 );
-            rtl_uString_release( pTmp2 );
-        }
-
-        else
-        {
-            /* FIXME: replace ~user with users home directory */
-            return osl_File_E_INVAL;
-        }
-    }
-
-    /* temporary check for top 5 wrong usage strings (which are valid but unlikly filenames) */
-    /*
-    OSL_ASSERT( !findWrongUsage( pTmp->buffer, pTmp->length ) );
-    */
-
-    *pustrSystemPath = pTmp;
-    return osl_File_E_None;
-#endif // 0
-}
-
-
-/****************************************************************************
- * osl_getSystemPathFromFileURL_Ex - helper function
- * clients may specify if they want to accept relative
- * URLs or not
- ****************************************************************************/
-
-oslFileError osl_getSystemPathFromFileURL_Ex(
-    rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath, sal_Bool bAllowRelative)
-{
-    return _osl_getSystemPathFromFileURL( ustrFileURL, pustrSystemPath, bAllowRelative);
-#if 0
-    rtl_uString* temp = 0;
-    oslFileError osl_error = osl_getSystemPathFromFileURL(ustrFileURL, &temp);
-
-    if (osl_File_E_None == osl_error)
-    {
-        if (bAllowRelative
-            || (UNICHAR_SLASH == temp->buffer[0])
-            || (UNICHAR_COLON == temp->buffer[1] && UNICHAR_SLASH == temp->buffer[2]))
-        {
-            *pustrSystemPath = temp;
-        }
-        else
-        {
-            rtl_uString_release(temp);
-            osl_error = osl_File_E_INVAL;
-        }
-    }
-
-    return osl_error;
-#endif
-}
-
-namespace /* private */
-{
-
-#if 0 // YD
-
-    /******************************************************
-     * Helper function, return a pinter to the final '\0'
-     * of a string
-     ******************************************************/
-
-    sal_Unicode* ustrtoend(sal_Unicode* pStr)
-    {
-        return (pStr + rtl_ustr_getLength(pStr));
-    }
-
-    /*********************************************
-
-     ********************************************/
-    sal_Unicode* ustrcpy(const sal_Unicode* s, sal_Unicode* d)
-    {
-        const sal_Unicode* sc = s;
-        sal_Unicode*       dc = d;
-
-        while ((*dc++ = *sc++))
-            /**/;
-
-        return d;
-    }
-
-    /*********************************************
-
-     ********************************************/
-
-    sal_Unicode* ustrncpy(const sal_Unicode* s, sal_Unicode* d, unsigned int n)
-    {
-        const sal_Unicode* sc = s;
-        sal_Unicode*       dc = d;
-        unsigned int       i  = n;
-
-        while (i--)
-            *dc++ = *sc++;
-
-        if (n)
-            *dc = 0;
-
-        return d;
-    }
-
-    /*********************************************
-
-     ********************************************/
-
-    sal_Unicode* ustrchrcat(const sal_Unicode chr, sal_Unicode* d)
-    {
-        sal_Unicode* p = ustrtoend(d);
-        *p++ = chr;
-        *p   = 0;
-        return d;
-    }
-
-    /*********************************************
-
-     ********************************************/
-
-    sal_Unicode* ustrcat(const sal_Unicode* s, sal_Unicode* d)
-    {
-        sal_Unicode* dc = ustrtoend(d);
-        ustrcpy(s, dc);
-        return d;
-    }
-
-    /******************************************************
-     *
-     ******************************************************/
-
-    bool _islastchr(sal_Unicode* pStr, sal_Unicode Chr)
-    {
-           sal_Unicode* p = ustrtoend(pStr);
-           if (p > pStr)
-               p--;
-           return (*p == Chr);
-    }
-
-    /******************************************************
-     * Ensure that the given string has the specified last
-     * character if necessary append it
-     ******************************************************/
-
-    sal_Unicode* _strensurelast(sal_Unicode* pStr, sal_Unicode Chr)
-    {
-        if (!_islastchr(pStr, Chr))
-            ustrchrcat(Chr, pStr);
-        return pStr;
-    }
-
-    /******************************************************
-     * Remove the last part of a path, a path that has
-     * only a '/' or no '/' at all will be returned
-     * unmodified
-     ******************************************************/
-
-    sal_Unicode* _rmlastpathtoken(sal_Unicode* aPath)
-    {
-        /*  we always may skip -2 because we
-               may at least stand on a '/' but
-               either there is no other character
-               before this '/' or it's another
-               character than the '/'
-        */
-        sal_Unicode* p = ustrtoend(aPath) - 2;
-
-        // move back to the next path separator
-        // or to the start of the string
-        while ((p > aPath) && (*p != UNICHAR_SLASH))
-            p--;
-
-        if (p >= aPath)
-        {
-            if (UNICHAR_SLASH == *p)
-            {
-                p++;
-               *p = '\0';
-            }
-            else
-            {
-                   *p = '\0';
-            }
-        }
-
-        return aPath;
-    }
-
-    /******************************************************
-     *
-     ******************************************************/
-
-    oslFileError _osl_resolvepath(
-        /*inout*/ sal_Unicode* path,
-        /*inout*/ sal_Unicode* current_pos,
-        /*in   */ sal_Unicode* sentinel,
-        /*inout*/ bool* failed)
-    {
-        oslFileError ferr = osl_File_E_None;
-
-        if (!*failed)
-        {
-            char unresolved_path[PATH_MAX];
-            if (!UnicodeToText(unresolved_path, sizeof(unresolved_path), path, rtl_ustr_getLength(path)))
-                return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-            char resolved_path[PATH_MAX];
-            if (realpath(unresolved_path, resolved_path))
-            {
-                if (!TextToUnicode(resolved_path, strlen(resolved_path), path, PATH_MAX))
-                    return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-                current_pos = ustrtoend(path) - 1;
-            }
-            else
-            {
-                if (EACCES == errno || ENOTDIR == errno || ENOENT == errno)
-                    *failed = true;
-                else
-                    ferr = oslTranslateFileError(OSL_FET_ERROR, errno);
-            }
-        }
-
-        return ferr;
-    }
-
-    /******************************************************
-     * Works even with non existing paths. The resulting
-     * path must not exceed PATH_MAX else
-     * osl_File_E_NAMETOOLONG is the result
-     ******************************************************/
-
-    oslFileError osl_getAbsoluteFileURL_impl_(const rtl::OUString& unresolved_path, rtl::OUString& resolved_path)
-    {
-        // the given unresolved path must not exceed PATH_MAX
-        if (unresolved_path.getLength() >= (PATH_MAX - 2))
-            return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-        sal_Unicode        path_resolved_so_far[PATH_MAX];
-        const sal_Unicode* punresolved = unresolved_path.getStr();
-        sal_Unicode*       presolvedsf = path_resolved_so_far;
-
-        // reserve space for leading '/' and trailing '\0'
-        // do not exceed this limit
-        sal_Unicode* sentinel = path_resolved_so_far + PATH_MAX - 2;
-
-        // if realpath fails with error ENOTDIR, EACCES or ENOENT
-        // we will not call it again, because _osl_realpath should also
-        // work with non existing directories etc.
-        bool realpath_failed = false;
-        oslFileError ferr;
-
-        path_resolved_so_far[0] = '\0';
-
-        while (*punresolved != '\0')
-        {
-            // ignore '/.' , skip one part back when '/..'
-
-            if ((UNICHAR_DOT == *punresolved) && (UNICHAR_SLASH == *presolvedsf))
-            {
-                if ('\0' == *(punresolved + 1))
-                {
-                    punresolved++;
-                    continue;
-                }
-                else if (UNICHAR_SLASH == *(punresolved + 1))
-                {
-                    punresolved += 2;
-                    continue;
-                }
-                else if ((UNICHAR_DOT == *(punresolved + 1)) && ('\0' == *(punresolved + 2) || (UNICHAR_SLASH == *(punresolved + 2))))
-                {
-                    _rmlastpathtoken(path_resolved_so_far);
-
-                    presolvedsf = ustrtoend(path_resolved_so_far) - 1;
-
-                    if (UNICHAR_SLASH == *(punresolved + 2))
-                        punresolved += 3;
-                    else
-                        punresolved += 2;
-
-                    continue;
-                }
-                else // a file or directory name may start with '.'
-                {
-                    if ((presolvedsf = ustrtoend(path_resolved_so_far)) > sentinel)
-                        return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-                    ustrchrcat(*punresolved++, path_resolved_so_far);
-
-                    if ('\0' == *punresolved && !realpath_failed)
-                    {
-                        ferr = _osl_resolvepath(
-                            path_resolved_so_far,
-                            presolvedsf,
-                            sentinel,
-                            &realpath_failed);
-
-                        if (osl_File_E_None != ferr)
-                            return ferr;
-                    }
-                }
-            }
-            else if (UNICHAR_SLASH == *punresolved)
-            {
-                if ((presolvedsf = ustrtoend(path_resolved_so_far)) > sentinel)
-                    return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-                ustrchrcat(*punresolved++, path_resolved_so_far);
-
-                if (!realpath_failed)
-                {
-                    ferr = _osl_resolvepath(
-                        path_resolved_so_far,
-                        presolvedsf,
-                        sentinel,
-                        &realpath_failed);
-
-                    if (osl_File_E_None != ferr)
-                        return ferr;
-
-                    if (!_islastchr(path_resolved_so_far, UNICHAR_SLASH))
-                    {
-                        if ((presolvedsf = ustrtoend(path_resolved_so_far)) > sentinel)
-                            return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-                        ustrchrcat(UNICHAR_SLASH, path_resolved_so_far);
-                    }
-                }
-            }
-            else // any other character
-            {
-                if ((presolvedsf = ustrtoend(path_resolved_so_far)) > sentinel)
-                    return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-                ustrchrcat(*punresolved++, path_resolved_so_far);
-
-                if ('\0' == *punresolved && !realpath_failed)
-                {
-                    ferr = _osl_resolvepath(
-                        path_resolved_so_far,
-                        presolvedsf,
-                        sentinel,
-                        &realpath_failed);
-
-                    if (osl_File_E_None != ferr)
-                        return ferr;
-                }
-            }
-        }
-
-        sal_Int32 len = rtl_ustr_getLength(path_resolved_so_far);
-
-        OSL_ASSERT(len < PATH_MAX);
-
-        resolved_path = rtl::OUString(path_resolved_so_far, len);
-
-        return osl_File_E_None;
-    }
-
-#endif // 0 // YD
-
-} // end namespace private
-
-#if OSL_DEBUG_LEVEL > 0
-
-    //#####################################################
-    void _osl_warnFile( const char *message, rtl_uString *ustrFile )
-    {
-        char szBuffer[2048];
-
-        if (ustrFile)
-        {
-            rtl_String  *strFile = NULL;
-
-            rtl_uString2String( &strFile, rtl_uString_getStr( ustrFile ), rtl_uString_getLength( ustrFile ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
-            snprintf( szBuffer, sizeof(szBuffer), message, strFile->buffer );
-            rtl_string_release( strFile );
-
-            message = szBuffer;
-        }
-        OSL_ENSURE( 0, message );
-    }
-
-#endif // OSL_DEBUG_LEVEL > 0
-
-/******************************************************
- * osl_getAbsoluteFileURL
- ******************************************************/
-
-//oslFileError osl_getAbsoluteFileURL(rtl_uString*  ustrBaseDirURL, rtl_uString* ustrRelativeURL, rtl_uString** pustrAbsoluteURL)
-oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uString* ustrRelativeURL, rtl_uString** pustrAbsoluteURL )
-{
-    oslFileError    eError;
-    rtl_uString     *ustrRelSysPath = NULL;
-    rtl_uString     *ustrBaseSysPath = NULL;
-
-    if ( ustrBaseURL && ustrBaseURL->length )
-    {
-        eError = _osl_getSystemPathFromFileURL( ustrBaseURL, &ustrBaseSysPath, sal_False );
-        OSL_ENSURE( osl_File_E_None == eError, "osl_getAbsoluteFileURL called with relative or invalid base URL" );
-
-        eError = _osl_getSystemPathFromFileURL( ustrRelativeURL, &ustrRelSysPath, sal_True );
-    }
-    else
-    {
-        eError = _osl_getSystemPathFromFileURL( ustrRelativeURL, &ustrRelSysPath, sal_False );
-        OSL_ENSURE( osl_File_E_None == eError, "osl_getAbsoluteFileURL called with empty base URL and/or invalid relative URL" );
-    }
-
-    if ( !eError )
-    {
-        CHAR    szBuffer[_MAX_PATH];
-        CHAR    szRelSysPath[_MAX_PATH];
-        CHAR    szCurrentDir[_MAX_PATH];
-        int     result;
-        char*   cwd;
-        int     rc;
-
-/*@@@ToDo
-  Bad, bad hack, this only works if the base path
-  really exists which is not necessary according
-  to RFC2396
-  The whole FileURL implementation should be merged
-  with the rtl/uri class.
-*/
-        if ( ustrBaseSysPath )
-        {
-            CHAR    szBaseSysPath[_MAX_PATH];
-
-            if (!g_CurrentDirectoryMutex)
-                g_CurrentDirectoryMutex = osl_createMutex();
-
-            osl_acquireMutex( g_CurrentDirectoryMutex );
-
-            cwd = getcwd( szCurrentDir, sizeof(szCurrentDir) );
-            UnicodeToText( szBaseSysPath, sizeof(szBaseSysPath), ustrBaseSysPath->buffer, ustrBaseSysPath->length);
-            rc = chdir( szBaseSysPath);
-        }
-
-        UnicodeToText( szRelSysPath, sizeof(szRelSysPath), ustrRelSysPath->buffer, ustrRelSysPath->length);
-        result = !_abspath( szBuffer, szRelSysPath, sizeof(szBuffer));
-
-        if ( ustrBaseSysPath )
-        {
-            rc = chdir( szCurrentDir );
-
-            osl_releaseMutex( g_CurrentDirectoryMutex );
-        }
-
-        if ( result )
-        {
-                rtl_uString *ustrAbsSysPath = NULL;
-
-                oslMakeUStrFromPsz( szBuffer, &ustrAbsSysPath);
-
-                eError = osl_getFileURLFromSystemPath( ustrAbsSysPath, pustrAbsoluteURL );
-
-                if ( ustrAbsSysPath )
-                    rtl_uString_release( ustrAbsSysPath );
-        }
-        else
-            eError = osl_File_E_INVAL;
-    }
-
-    if ( ustrBaseSysPath )
-        rtl_uString_release( ustrBaseSysPath );
-
-    if ( ustrRelSysPath )
-        rtl_uString_release( ustrRelSysPath );
-
-    return  eError;
-#if 0
-    FileBase::RC  rc;
-    rtl::OUString unresolved_path;
-
-    rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrRelativeURL), unresolved_path);
-
-    if(FileBase::E_None != rc)
-        return oslFileError(rc);
-
-    if (systemPathIsRelativePath(unresolved_path))
-    {
-        rtl::OUString base_path;
-        rc = (FileBase::RC) osl_getSystemPathFromFileURL_Ex(ustrBaseDirURL, &base_path.pData, sal_False);
-
-        if (FileBase::E_None != rc)
-            return oslFileError(rc);
-
-        rtl::OUString abs_path;
-        systemPathMakeAbsolutePath(base_path, unresolved_path, abs_path);
-
-        unresolved_path = abs_path;
-    }
-
-    rtl::OUString resolved_path;
-    rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
-
-    if (FileBase::E_None == rc)
-    {
-        rc = (FileBase::RC) osl_getFileURLFromSystemPath(resolved_path.pData, pustrAbsoluteURL);
-        OSL_ASSERT(FileBase::E_None == rc);
-    }
-
-    return oslFileError(rc);
-#endif // 0
-}
-
-
-namespace /* private */
-{
-
-    /*********************************************
-     No separate error code if unicode to text
-     conversion or getenv fails because for the
-     caller there is no difference why a file
-     could not be found in $PATH
-     ********************************************/
-
-    bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result)
-    {
-        bool          bfound = false;
-        rtl::OUString path   = rtl::OUString::createFromAscii("PATH");
-        rtl::OUString env_path;
-
-        if (osl_Process_E_None == osl_getEnvironment(path.pData, &env_path.pData))
-            bfound = osl::searchPath(file_path, env_path, result);
-
-        return bfound;
-    }
-
-    /*********************************************
-     No separate error code if unicode to text
-     conversion or getcwd fails because for the
-     caller there is no difference why a file
-     could not be found in CDW
-     ********************************************/
-
-    bool find_in_CWD(const rtl::OUString& file_path, rtl::OUString& result)
-    {
-        bool bfound = false;
-        rtl::OUString cwd_url;
-
-        if (osl_Process_E_None == osl_getProcessWorkingDir(&cwd_url.pData))
-        {
-            rtl::OUString cwd;
-            FileBase::getSystemPathFromFileURL(cwd_url, cwd);
-            bfound = osl::searchPath(file_path, cwd, result);
-        }
-        return bfound;
-    }
-
-    /*********************************************
-
-     ********************************************/
-
-    bool find_in_searchPath(const rtl::OUString& file_path, rtl_uString* search_path, rtl::OUString& result)
-    {
-        return (search_path && osl::searchPath(file_path, rtl::OUString(search_path), result));
-    }
-
-} // end namespace private
-
-
-/****************************************************************************
- *  osl_searchFileURL
- ***************************************************************************/
-
-oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearchPath, rtl_uString** pustrURL)
-{
-    OSL_PRECOND(ustrFilePath && pustrURL, "osl_searchFileURL: invalid parameter");
-
-    FileBase::RC  rc;
-    rtl::OUString file_path;
-
-    // try to interpret search path as file url else assume it's a system path list
-    rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrFilePath), file_path);
-    if ((FileBase::E_None != rc) && (FileBase::E_INVAL == rc))
-        file_path = ustrFilePath;
-    else if (FileBase::E_None != rc)
-        return oslFileError(rc);
-
-    bool          bfound = false;
-    rtl::OUString result;
-
-    if (find_in_searchPath(file_path, ustrSearchPath, result) ||
-        find_in_PATH(file_path, result) ||
-        find_in_CWD(file_path, result))
-    {
-        rtl::OUString resolved;
-
-        if (osl::realpath(result, resolved))
-        {
-#if OSL_DEBUG_LEVEL > 0
-            oslFileError osl_error =
-#endif
-                osl_getFileURLFromSystemPath(resolved.pData, pustrURL);
-            OSL_ASSERT(osl_File_E_None == osl_error);
-            bfound = true;
-        }
-    }
-    return bfound ? osl_File_E_None : osl_File_E_NOENT;
-}
-
-
-/****************************************************************************
- * FileURLToPath
- ***************************************************************************/
-
-oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileURL)
-{
-    rtl_uString* ustrSystemPath = NULL;
-    oslFileError osl_error      = osl_getSystemPathFromFileURL(ustrFileURL, &ustrSystemPath);
-
-    if(osl_File_E_None != osl_error)
-        return osl_error;
-
-    osl_systemPathRemoveSeparator(ustrSystemPath);
-
-    /* convert unicode path to text */
-    if(!UnicodeToText( buffer, bufLen, ustrSystemPath->buffer, ustrSystemPath->length))
-        osl_error = oslTranslateFileError(OSL_FET_ERROR, errno);
-
-    rtl_uString_release(ustrSystemPath);
-
-    return osl_error;
-}
diff --git a/sal/osl/os2/file_url.h b/sal/osl/os2/file_url.h
deleted file mode 100644
index 052858503b24..000000000000
--- a/sal/osl/os2/file_url.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
- /***************************************************
-  * Internal header file, declares all functions
-  * that are not part of the offical API and are
-  * not defined in the osl header files
-  **************************************************/
-
- #ifndef _FILE_URL_H_
- #define _FILE_URL_H_
-
- #ifndef _FILE_H_
- #include <osl/file.h>
- #endif
-
-
-/***************************************************
- * constants
- **************************************************/
-
-#define _tcslen(a)      wcslen((const wchar_t *) a)
-#define _tcsspn(a,b)    wcsspn((const wchar_t *) a, (const wchar_t *) b)
-#define _istalpha(a)    iswalpha((wint_t) a)
-
-const sal_Unicode UNICHAR_SLASH = ((sal_Unicode)'/');
-const sal_Unicode UNICHAR_COLON = ((sal_Unicode)':');
-const sal_Unicode UNICHAR_DOT   = ((sal_Unicode)'.');
-
-#define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0])))
-
-#if OSL_DEBUG_LEVEL > 0
-#define OSL_ENSURE_FILE( cond, msg, file ) ( (cond) ?  (void)0 : _osl_warnFile( msg, file ) )
-#else
-#define OSL_ENSURE_FILE( cond, msg, file ) ((void)0)
-#endif
-
-typedef sal_Unicode                         TCHAR;
-typedef sal_Unicode                         *LPTSTR;
-typedef const sal_Unicode                   *LPCTSTR;
-typedef wchar_t                         *LPWSTR;
-typedef const wchar_t                   *LPCWSTR;
-typedef sal_Unicode                         DWORD;
-#define WINAPI
-
-#define CHARSET_SEPARATOR                   L"\\/"
-#define WSTR_SYSTEM_ROOT_PATH               L"\\\\.\\"
-
-
-/******************************************************************************
- *
- *                  Data Type Definition
- *
- ******************************************************************************/
-
-#define PATHTYPE_ERROR                      0
-#define PATHTYPE_RELATIVE                   1
-#define PATHTYPE_ABSOLUTE_UNC               2
-#define PATHTYPE_ABSOLUTE_LOCAL             3
-#define PATHTYPE_MASK_TYPE                  0xFF
-#define PATHTYPE_IS_VOLUME                  0x0100
-#define PATHTYPE_IS_SERVER                  0x0200
-
-#define VALIDATEPATH_NORMAL                 0x0000
-#define VALIDATEPATH_ALLOW_WILDCARDS        0x0001
-#define VALIDATEPATH_ALLOW_ELLIPSE          0x0002
-#define VALIDATEPATH_ALLOW_RELATIVE         0x0004
-#define VALIDATEPATH_ALLOW_UNC              0x0008
-
-typedef struct {
-    UINT            uType;
-    rtl_uString*    ustrDrive;
-    rtl_uString*    ustrFilePath;   /* holds native directory path */
-    int             d_attr;         /* OS/2 file attributes */
-    int             nRefCount;
-}DirectoryItem_Impl;
-
-#define DIRECTORYTYPE_LOCALROOT     0
-#define DIRECTORYTYPE_NETROOT       1
-#define DIRECTORYTYPE_NETRESORCE    2
-#define DIRECTORYTYPE_FILESYSTEM    3
-
-#define DIRECTORYITEM_DRIVE     0
-#define DIRECTORYITEM_FILE      1
-#define DIRECTORYITEM_SERVER    2
-
-typedef struct
-{
-    UINT         uType;
-    rtl_uString* ustrPath;           /* holds native directory path */
-    DIR*         pDirStruct;
-    ULONG        ulDriveMap;
-    ULONG        ulNextDrive;
-    ULONG        ulNextDriveMask;
-} DirectoryImpl;
-
-/* Different types of paths */
-typedef enum _PATHTYPE
-{
-    PATHTYPE_SYNTAXERROR = 0,
-    PATHTYPE_NETROOT,
-    PATHTYPE_NETSERVER,
-    PATHTYPE_VOLUME,
-    PATHTYPE_FILE
-} PATHTYPE;
-
-DWORD WINAPI IsValidFilePath(LPCTSTR, LPCTSTR*, DWORD);
-
-typedef struct
-{
-    rtl_uString* ustrFilePath;      /* holds native file path */
-    int fd;
-    sal_Bool bLocked;
-} oslFileHandleImpl;
-
-
-typedef struct _oslVolumeDeviceHandleImpl
-{
-    sal_Char pszMountPoint[PATH_MAX];
-    sal_Char pszFilePath[PATH_MAX];
-    sal_Char pszDevice[PATH_MAX];
-    sal_Char ident[4];
-    sal_uInt32   RefCount;
-} oslVolumeDeviceHandleImpl;
-
-/* OS error to errno values mapping table */
-struct errentry {
-    unsigned long oscode;   /* OS return value */
-    int errnocode;          /* System V error code */
-};
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/**************************************************
-* _osl_getSystemPathFromFileURL
-*************************************************/
-
-#define FURL_ALLOW_RELATIVE sal_True
-#define FURL_DENY_RELATIVE  sal_False
-
-oslFileError osl_getSystemPathFromFileURL_Ex(rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath, sal_Bool bAllowRelative);
-
-/**************************************************
-* FileURLToPath
-*************************************************/
-
-oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileURL);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* #define _FILE_URL_H_ */
-
diff --git a/sal/osl/os2/helpers/debug.h b/sal/osl/os2/helpers/debug.h
deleted file mode 100644
index 83edca5db676..000000000000
--- a/sal/osl/os2/helpers/debug.h
+++ /dev/null
@@ -1,1779 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
- *@@sourcefile debug.h:
- *      header file for debug.c (exception handling and debugging).
- *      See remarks there.
- *
- *      Note: Version numbering in this file relates to XWorkplace version
- *            numbering.
- *
- *@@changed V0.9.0: included contents of newexe.h
- *
- *@@include #define INCL_BASE
- *@@include #include <os2.h>
- *@@include #include <stdio.h>
- *@@include #include "helpers\debug.h"
- */
-
-/*
- *      This file incorporates code from the following:
- *      -- Marc Fiammante, John Currier, Kim Rasmussen,
- *         Anthony Cruise (EXCEPT3.ZIP package for a generic
- *         exception handling DLL, available at Hobbes).
- *
- *      This file Copyright (C) 1992-99 Ulrich M�ller,
- *                                      Kim Rasmussen,
- *                                      Marc Fiammante,
- *                                      John Currier,
- *                                      Anthony Cruise.
- *
- *      2009-06-15 published under LGPL3 with Ulrich M�ller permission.
- *
- */
-
-#ifndef DEBUG_HEADER_INCLUDED
-    #define DEBUG_HEADER_INCLUDED
-
-    /********************************************************************
-     *
-     *   SYM file declarations
-     *
-     ********************************************************************/
-
-    // Pointer means offset from beginning of file or beginning of struct
-    #pragma pack(1)
-
-    typedef struct
-    {
-        unsigned short int ppNextMap;     // paragraph pointer to next map
-        unsigned char      bFlags;        // symbol types
-        unsigned char      bReserved1;    // reserved
-        unsigned short int pSegEntry;     // segment entry point value
-        unsigned short int cConsts;       // count of constants in map
-        unsigned short int pConstDef;     // pointer to constant chain
-        unsigned short int cSegs;         // count of segments in map
-        unsigned short int ppSegDef;      // paragraph pointer to first segment
-        unsigned char      cbMaxSym;      // maximum symbol-name length
-        unsigned char      cbModName;     // length of module name
-        char               achModName[1]; // cbModName Bytes of module-name member
-    } MAPDEF;
-
-    typedef struct
-    {
-        unsigned short int ppNextMap;     // always zero
-        unsigned char      release;       // release number (minor version number)
-        unsigned char      version;       // major version number
-    } LAST_MAPDEF;
-
-    typedef struct
-    {
-        unsigned short int ppNextSeg;     // paragraph pointer to next segment
-        unsigned short int cSymbols;      // count of symbols in list
-        unsigned short int pSymDef;       // offset of symbol chain
-        unsigned short int wReserved1;    // reserved
-        unsigned short int wReserved2;    // reserved
-        unsigned short int wReserved3;    // reserved
-        unsigned short int wReserved4;    // reserved
-        unsigned char      bFlags;        // symbol types; bit 0 signals 32-bit (*UM)
-        unsigned char      bReserved1;    // reserved
-        unsigned short int ppLineDef;     // offset of line number record
-        unsigned char      bReserved2;    // reserved
-        unsigned char      bReserved3;    // reserved
-        unsigned char      cbSegName;     // length of segment name
-        char               achSegName[1]; /* cbSegName Bytes of segment-name member*/
-    } SEGDEF;
-
-    typedef struct
-    {
-        unsigned short int wSymVal;       // symbol address or constant
-        unsigned char      cbSymName;     // length of symbol name
-        char               achSymName[1]; // cbSymName Bytes of symbol-name member
-    } SYMDEF16;
-
-    typedef struct
-    {
-        unsigned       int wSymVal;       // symbol address or constant
-        unsigned char      cbSymName;     // length of symbol name
-        char               achSymName[1]; // cbSymName Bytes of symbol-name member
-    } SYMDEF32;
-
-    typedef struct
-    {
-        unsigned short int ppNextLine;    // ptr to next linedef (0 if last)
-        unsigned short int wReserved1;    // reserved
-        unsigned short int pLines;        // pointer to line numbers
-        unsigned short int cLines;        // reserved
-        unsigned char      cbFileName;    // length of filename
-        char               achFileName[1];// cbFileName Bytes of filename
-    } LINEDEF;
-
-    typedef struct
-    {
-        unsigned short int wCodeOffset;   // executable offset
-        unsigned short int dwFileOffset;  // source offset
-    } LINEINF;
-
-    #define SEGDEFOFFSET(MapDef)     (MapDef.ppSegDef*16)
-    #define NEXTSEGDEFOFFSET(SegDef)  (SegDef.ppNextSeg*16)
-
-    #define ASYMPTROFFSET(SegDefOffset,Segdef) (SegDefOffset+SegDef.pSymDef)
-    #define SYMDEFOFFSET(SegDefOffset,SegDef,n) (ASYMPTROFFSET(SegDefOffset,SegDef)+(n)*(sizeof(unsigned short int)))
-
-    #define ACONSTPTROFFSET(MapDef) (MapDef.ppConstDef)
-    #define CONSTDEFOFFSET(MapDef,n) ((MapDef.ppConstDef)+(n)*(sizeof(unsigned short int)))
-
-    #define LINEDEFOFFSET(SegDef) (SegDef.ppLineDef*16)
-    #define NEXTLINEDEFOFFSET(LineDef) (LineDef.ppNextLine*16)
-    #define LINESOFFSET(LinedefOffset,LineDef) ((LinedefOffset)+LineDef.pLines)
-
-    /********************************************************************
-     *
-     *   EXE declarations taken from exe.h
-     *
-     ********************************************************************/
-
-    #ifndef WORD
-    typedef unsigned short WORD;
-    #endif
-
-    typedef WORD bbmask;
-
-    struct exe {
-            WORD eid;                       // contains EXEID, below
-            WORD elast;                     // # of bytes in last page
-            WORD epagsiz;                   // # of pages in whole file
-            WORD erelcnt;                   // # of relocation entrys
-            WORD ehdrsiz;                   // size of header, in paragraphs
-            WORD eminfre;                   // min # of free paragraphs needed
-            WORD emaxfre;                   // max # of free paragraphs needed
-            WORD eiSS;                      // initial SS value
-            WORD eiSP;                      // initial SP value
-            WORD enegsum;                   // negative sum of entire file
-            WORD eiIP;                      // initial IP value
-            WORD eiCS;                      // initial CS value
-            WORD ereloff;                   // offset in file of relocation table
-            WORD eovlnum;                   // number of the overlay
-
-    /*      the following fields may not be present.
-     *              ereloff = 28            not present
-     *                      = 30            exe.ever present and valid
-     *                      = 32            exe.ever field contains garbage
-     *              ereloff > 32            exe.ever present and valid
-     *                                              = 0 if "don't know"
-     */
-
-            WORD ever;                      // version # of producing linker
-            WORD dumy;                      // unused
-
-    /*      the following fields may not be present - if the exe.ereloff
-     *      value encompasses the fields then they are present and valid.
-     */
-
-            bbmask  ebb;                    // behavior bits
-            WORD dumy2[7];                  // must be 0 until defined
-    };
-
-
-    #define EXEID 0x5a4d                    // magic ID value
-
-    /********************************************************************
-     *
-     *   Object Module Format (OMF) declarations
-     *
-     ********************************************************************/
-
-    struct exehdr_rec
-    {
-       BYTE     signature[2];              // Must be "MZ"
-       USHORT   image_len;                 // Image Length
-       USHORT   pages;                     // Pages
-       USHORT   reloc_items;               // Relocation table items
-       USHORT   min_paragraphs;            // Mininum 16-bytes paragraphs
-       USHORT   max_paragraphs;            // Maximum 16-bytes paragraphs
-       USHORT   stack_pos;                 // Stack position
-       USHORT   offset_in_sp;              // Offset in SP
-       USHORT   checksum;                  // Checksum
-       USHORT   offset_in_ip;              // Offset in IP
-       USHORT   code_pos;                  // Code segment pos.
-       USHORT   reloc_item_pos;            // Position of first relocation item
-       USHORT   overlay_number;            // Overlay number
-       BYTE     unused[8];                 // Unused bytes
-       USHORT   oem_id;                    // OEM Identifier
-       BYTE     oem_info[24];              // OEM Info
-       ULONG    lexe_offset;               // Offset to linear header
-    };
-
-    struct lexehdr_rec
-    {
-       BYTE     signature[2];              // Must be "LX"
-       BYTE     b_ord;                     // Byte ordering
-       BYTE     w_ord;                     // Word ordering
-       ULONG    format_level;              // Format level
-       USHORT   cpu_type;                  // CPU Type
-       USHORT   os_type;                   // Operating system
-       ULONG    module_version;            // Module version
-       ULONG    mod_flags;                 // Module flags
-       ULONG    mod_pages;                 // Module pages
-       ULONG    EIP_object;                // EIP Object no.
-       ULONG    EIP;                       // EIP Value
-       ULONG    ESP_object;                // ESP Object no
-       ULONG    ESP;                       // ESP Value
-       ULONG    page_size;                 // Page size
-       ULONG    page_ofs_shift;            // Page offset shift
-       ULONG    fixup_sect_size;           // Fixup section size
-       ULONG    fixup_sect_checksum;       // Fixup section checksum
-       ULONG    loader_sect_size;          // Loader section size
-       ULONG    loader_sect_checksum;      // Loader section checksum
-       ULONG    obj_table_ofs;             // Object table offset
-       ULONG    obj_count;                 // Object count
-       ULONG    obj_page_tab_ofs;          // Object page table offset
-       ULONG    obj_iter_page_ofs;         // Object iteration pages offset
-       ULONG    res_tab_ofs;               // Resource table offset
-       ULONG    res_table_entries;         // Resource table entries
-       ULONG    res_name_tab_ofs;          // Resident name table offset;
-       ULONG    ent_tab_ofs;               // Entry table offset
-       ULONG    mod_dir_ofs;               // Module directives offset
-       ULONG    mod_dir_count;             // Number of module directives
-       ULONG    fixup_page_tab_ofs;        // Fixup page table offset
-       ULONG    fixup_rec_tab_ofs;         // Fixup record table offset
-       ULONG    imp_tab_ofs;               // Import module table offset
-       ULONG    imp_mod_entries;           // Import module entries
-       ULONG    imp_proc_tab_ofs;          // Import proc table offset
-       ULONG    per_page_check_ofs;        // Per page checksum offset
-       ULONG    data_page_offset;          // Data pages offset
-       ULONG    preload_page_count;        // Preload pages count
-       ULONG    nonres_tab_ofs;            // Nonresident name table offset
-       ULONG    nonres_tab_len;            // Nonresident name table len
-       ULONG    nonres_tab_check;          // Nonresident tables checksum
-       ULONG    auto_ds_objectno;          // Auto DS object number
-       ULONG    debug_info_ofs;            // Debug info offset
-       ULONG    debug_info_len;            // Debug info length
-       ULONG    inst_preload_count;        // Instance preload count
-       ULONG    inst_demand_count;         // Instance demand count
-       ULONG    heapsize;                  // Heap size
-       ULONG    stacksize;                 // Stack size
-    };
-
-    struct debug_head_rec
-    {
-       BYTE signature[3];                  // Debug signature
-       BYTE type;                          // Debug info type
-    };
-
-    struct dir_inf_rec
-    {
-       USHORT   dirstruct_size;            // Size of directory structure
-       USHORT   number_of_entries;         // Number of dnt_rec's in the array
-       USHORT   unknown;                   // Unknown data
-       // Followed by an array of dnt_rec structures
-    };
-
-    struct dnt_rec
-    {
-       USHORT   subsect_type;              // sst Subsection type
-       USHORT   mod_index;                 // Module index (1-based)
-       ULONG    offset;                    // Offset of start of section
-       ULONG    size;                      // Size of section
-    };
-
-    // Modules subsection
-    struct modules_rec
-    {
-       USHORT   code_seg_base;             // Code segment base
-       ULONG    code_seg_offset;           // Code segment offset
-       ULONG    code_seg_len;              // Code segment length
-       USHORT   overlay_no;                // Overlay number
-       USHORT   lib_idx;                   // Index into library section or 0
-       BYTE     segments;                  // Number of segments
-       BYTE     reserved;
-       BYTE     debug_style[2];            // "HL" for HLL, "CV" or 0 for CodeView
-       BYTE     debug_version[2];          // 00 01 or 00 03 for HLL, 00 00 for CV
-       BYTE     name_len;                  // Length of name (which follows)
-    };
-
-    // Publics subsection
-    struct publics_rec
-    {
-       ULONG    offset;                    // Offset
-       USHORT   segment;                   // Segment
-       USHORT   type;                      // Type index
-       BYTE     name_len;                  // Length of name (wich follows)
-    };
-
-    #if 0
-    // Linenumbers header
-    struct linhead_rec
-    {
-       BYTE     id;                        // 0x95 for flat mem, 32 bit progs
-       USHORT   length;                    // Record length
-       USHORT   base_group;                // Base group
-       USHORT   base_segment;              // Base segment
-    };
-    #endif
-
-    // First linenumber record
-    struct linfirst_rec
-    {
-       USHORT   lineno;                    // Line number (0)
-       BYTE     entry_type;                // Entry type
-       BYTE     reserved;                  // Reserved
-       USHORT   entries_count;             // Number of table entries
-       USHORT   segment_no;                // Segment number
-       ULONG    filename_tabsize;          // File names table size
-    };
-
-    // Source line numbers
-    struct linsource_rec
-    {
-       USHORT   source_line;               // Source file line number
-       USHORT   source_idx;                // Source file index
-       ULONG    offset;                    // Offset into segment
-    };
-
-    // Listing statement numbers
-    struct linlist_rec
-    {
-       ULONG    list_line;                 // Listing file linenumber
-       ULONG    statement;                 // Listing file statement number
-       ULONG    offset;                    // Offset into segment
-    };
-
-    // Source and Listing statement numbers
-    struct linsourcelist_rec
-    {
-       USHORT   source_line;               // Source file line number
-       USHORT   source_idx;                // Source file index
-       ULONG    list_line;                 // Listing file linenumber
-       ULONG    statement;                 // Listing file statement number
-       ULONG    offset;                    // Offset into segment
-    };
-
-    // Path table
-    struct pathtab_rec
-    {
-       ULONG    offset;                    // Offset into segment
-       USHORT   path_code;                 // Path code
-       USHORT   source_idx;                // Source file index
-    };
-
-    // File names table
-    struct filenam_rec
-    {
-       ULONG    first_char;                // First displayable char in list file
-       ULONG    disp_chars;                // Number of displayable chars in list line
-       ULONG    filecount;                 // Number of source/listing files
-    };
-
-    // Symbol types
-    #define SYM_BEGIN          0x00        // Begin block
-    #define SYM_PROC           0x01        // Function
-    #define SYM_END            0x02        // End block of function
-    #define SYM_AUTO           0x04        // Auto variable
-    #define SYM_STATIC         0x05        // Static variable
-    #define SYM_LABEL          0x0B        // Label
-    #define SYM_WITH           0x0C        // With start symbol (not used)
-    #define SYM_REG            0x0D        // Register variable
-    #define SYM_CONST          0x0E        // Constant
-    #define SYM_ENTRY          0x0F        // Secondary entry (not in C)
-    #define SYM_SKIP           0x10        // For incremental linking (not used)
-    #define SYM_CHANGESEG      0x11        // Change segment (#pragma alloc_text)
-    #define SYM_TYPEDEF        0x12        // Typedef variable
-    #define SYM_PUBLIC         0x13        // Public reference
-    #define SYM_MEMBER         0x14        // Member of minor or major structure
-    #define SYM_BASED          0x15        // Based variable
-    #define SYM_TAG            0x16        // Tag in struct, union, enum ...
-    #define SYM_TABLE          0x17        // Table (used in RPG - not C)
-    #define SYM_MAP            0x18        // Map variable (extern in C)
-    #define SYM_CLASS          0x19        // Class symbol (C++)
-    #define SYM_MEMFUNC        0x1A        // Member function
-    #define SYM_AUTOSCOPE      0x1B        // Scoped auto for C++ (not used)
-    #define SYM_STATICSCOPE    0x1C        // scoped static for C++ (not used)
-    #define SYM_CPPPROC        0x1D        // C++ Proc
-    #define SYM_CPPSTAT        0x1E        // C++ Static var
-    #define SYM_COMP           0x40        // Compiler information
-
-    // Symbolic begin record
-    struct symbegin_rec
-    {
-       ULONG    offset;                    // Segment offset
-       ULONG    length;                    // Length of block
-       BYTE     name_len;                  // Length of block name
-       // Block name follows
-    };
-
-    // Symbolic auto var record
-    struct symauto_rec
-    {
-       ULONG    stack_offset;              // Stack offset
-       USHORT   type_idx;                  // Type index
-       BYTE     name_len;                  // Length of name
-       // Var name follows
-    };
-
-    // Symbolic procedure record
-    struct symproc_rec
-    {
-       ULONG    offset;                    // Segment offset
-       USHORT   type_idx;                  // Type index
-       ULONG    length;                    // Length of procedure
-       USHORT   pro_len;                   // Length of prologue
-       ULONG    pro_bodylen;               // Length of prologue + body
-       USHORT   class_type;                // Class type
-       BYTE     near_far;                  // Near or far
-       BYTE     name_len;                  // Length of name
-       // Function name follows
-    };
-
-    // Symbolic static var record
-    struct symstatic_rec
-    {
-       ULONG    offset;                    // Segment offset
-       USHORT   segaddr;                   // Segment address
-       USHORT   type_idx;                  // Type index
-       BYTE     name_len;                  // Length of name
-       // Var name follows
-    };
-
-    // Symbolic label var record
-    struct symlabel_rec
-    {
-       ULONG    offset;                    // Segment offset
-       BYTE     near_far;                  // Near or far
-       BYTE     name_len;                  // Length of name
-       // Var name follows
-    };
-
-    // Symbolic register var record
-    struct symreg_rec
-    {
-       USHORT   type_idx;                  // Type index
-       BYTE     reg_no;                    // Register number
-       BYTE     name_len;                  // Length of name
-       // Var name follows
-    };
-
-    // Symbolic change-segment record
-    struct symseg_rec
-    {
-       USHORT   seg_no;                    // Segment number
-    };
-
-    // Symbolic typedef record
-    struct symtypedef_rec
-    {
-       USHORT   type_idx;                  // Type index
-       BYTE     name_len;                  // Length of name
-       // Name follows
-    };
-
-    // Symbolic public record
-    struct sympublic_rec
-    {
-       ULONG    offset;                    // Segment offset
-       USHORT   segaddr;                   // Segment address
-       USHORT   type_idx;                  // Type index
-       BYTE     name_len;                  // Length of name
-       // Name follows
-    };
-
-    // Symbolic member record
-    struct symmember_rec
-    {
-       ULONG    offset;                    // Offset to subrecord
-       BYTE     name_len;                  // Length of name
-       // Name follows
-    };
-
-    // Symbolic based record
-    struct symbased_rec
-    {
-       ULONG    offset;                    // Offset to subrecord
-       USHORT   type_idx;                  // Type index
-       BYTE     name_len;                  // Length of name
-       // Name follows
-    };
-
-    // Symbolic tag record
-    struct symtag_rec
-    {
-       USHORT   type_idx;                  // Type index
-       BYTE     name_len;                  // Length of name
-       // Name follows
-    };
-
-    // Symbolic table record
-    struct symtable_rec
-    {
-       ULONG    offset;                    // Segment offset
-       USHORT   segaddr;                   // Segment address
-       USHORT   type_idx;                  // Type index
-       ULONG    idx_ofs;                   // Index offset to subrecord
-       BYTE     name_len;                  // Length of name
-       // Name follows
-    };
-
-    // Type record
-    struct type_rec
-    {
-       USHORT   length;                    // Length of sub-record
-       BYTE     type;                      // Sub-record type
-       BYTE     type_qual;                 // Type qualifier
-    };
-
-    // Types
-    #define TYPE_CLASS         0x40        // Class
-    #define TYPE_BASECLASS     0x41        // Base class
-    #define TYPE_FRIEND        0x42        // Friend
-    #define TYPE_CLASSDEF      0x43        // Class definition
-    #define TYPE_MEMBERFUNC    0x45        // Member function
-    #define TYPE_CLASSMEMBER   0x46        // Class member
-    #define TYPE_REF           0x48        // Reference
-    #define TYPE_MEMBERPTR     0x49        // Member pointer
-    #define TYPE_SCALARS       0x51        // Scalars
-    #define TYPE_SET           0x52        // Set
-    #define TYPE_ENTRY         0x53        // Entry
-    #define TYPE_FUNCTION      0x54        // Function
-    #define TYPE_AREA          0x55        // Area
-    #define TYPE_LOGICAL       0x56        // Logical
-    #define TYPE_STACK         0x57        // Stack
-    #define TYPE_MACRO         0x59        // Macro
-    #define TYPE_BITSTRING     0x5C        // Bit string
-    #define TYPE_USERDEF       0x5D        // User defined
-    #define TYPE_CHARSTR       0x60        // Character string
-    #define TYPE_PICTURE       0x61        // Picture
-    #define TYPE_GRAPHIC       0x62        // Graphic
-    #define TYPE_FORMATLAB     0x65        // Format label
-    #define TYPE_FILE          0x67        // File
-    #define TYPE_SUBRANGE      0x6F        // Subrange
-    #define TYPE_CODELABEL     0x72        // Code label
-    #define TYPE_PROCEDURE     0x75        // Procedure
-    #define TYPE_ARRAY         0x78        // Array
-    #define TYPE_STRUCT        0x79        // Structure / Union / Record
-    #define TYPE_POINTER       0x7A        // Pointer
-    #define TYPE_ENUM          0x7B        // Enum
-    #define TYPE_LIST          0x7F        // List
-
-    // Type userdef
-    struct type_userdefrec
-    {
-       BYTE     FID_index;                 // Field ID
-       USHORT   type_index;                // Type index
-       BYTE     FID_string;                // String ID
-       BYTE     name_len;                  // Length of name which follows
-    };
-
-    // Type function
-    struct type_funcrec
-    {
-       USHORT   params;
-       USHORT   max_params;
-       BYTE     FID_index;                 // Field ID
-       USHORT   type_index;                // Type index of return value
-       BYTE     FID_index1;                // String ID
-       USHORT   typelist_index;            // Index of list of params
-    };
-
-    // Type struct
-    struct type_structrec
-    {
-       ULONG    size;                      // Size of structure
-       USHORT   field_count;               // Number of fields in structure
-       BYTE     FID_index;                 // Field ID
-       USHORT   type_list_idx;             // Index to type list
-       BYTE     FID_index1;                // Field ID
-       USHORT   type_name_idx;             // Index to names / offsets
-       BYTE     dont_know;                 // Haven't a clue, but it seems to be needed
-       BYTE     name_len;                  // Length of structure name which follows
-    };
-
-    // Type list, type qualifier 1: contains types for structures
-    // This record is repeated for the number of items in the structure definition
-    struct type_list1
-    {
-       BYTE     FID_index;                 // Field identifier for index
-       USHORT   type_index;                // Type index.
-    };
-
-    // Type list, type qualifier 2: contains names and offsets for structure items
-    // This record is repeated for the number of items in the structure definition
-    struct type_list2
-    {
-       BYTE     FID_string;                // String identifier
-       BYTE     name_len;                  // Length of name which follows
-    };
-
-    // Type list, subrecord to the above, contains offset of variable in the structure
-    struct type_list2_1
-    {
-       BYTE     FID_span;                  // Defines what type of variable follows
-       union {
-          BYTE   b_len;
-          USHORT s_len;
-          ULONG  l_len;
-       } u;
-    };
-
-    // Type pointer
-    struct type_pointerrec
-    {
-       BYTE     FID_index;                 // Index identifier
-       USHORT   type_index;                // Type index
-       BYTE     FID_string;                // String identifier
-       BYTE     name_len;                  // Length of name which follows
-    };
-
-    /********************************************************************
-     *
-     *   Prototypes
-     *
-     ********************************************************************/
-
-    BOOL dbgPrintStackFrame(FILE *LogFile,
-                            PSZ pszModuleName,  // in: module name (fully q'fied)
-                            ULONG ulObject,
-                            ULONG ulOffset);
-
-    VOID dbgPrintStack(FILE *file,
-                       PUSHORT StackBottom,
-                       PUSHORT StackTop,
-                       PUSHORT Ebp,
-                       PUSHORT ExceptionAddress);
-
-    APIRET APIENTRY DosQueryModFromEIP(HMODULE *phMod,   // out: trapping module
-                                       ULONG *pulObjNum, // out: object/segment number
-                                       ULONG ulBuffLen,  // in:  sizeof(*pszBuff)
-                                       CHAR *pszBuff,    // out: module name
-                                       ULONG *pulOffset, // out: offset in module
-                                       ULONG ulAddress); // in:  address to be analyzed
-
-    APIRET APIENTRY DOSQUERYMODFROMEIP(HMODULE * phMod,
-                                       ULONG * pObjNum,
-                                       ULONG BuffLen,
-                                       PCHAR pBuff,
-                                       ULONG * pOffset,
-                                       PVOID Address);
-
-    typedef ULONG  *_Seg16 PULONG16;
-    APIRET16 APIENTRY16 DOS16SIZESEG(USHORT Seg, PULONG16 Size);
-    typedef         APIRET16(APIENTRY16 _PFN16) (VOID);
-    ULONG APIENTRY  DosSelToFlat(ULONG);
-
-    APIRET16 APIENTRY16 DOSQPROCSTATUS(ULONG * _Seg16 pBuf, USHORT cbBuf);
-
-    #define CONVERT(fp,QSsel) MAKEP((QSsel),OFFSETOF(fp))
-
-    #pragma pack()              // added V0.9.0
-
-
-    /********************************************************************
-     *
-     *   Executable definitions
-     *
-     ********************************************************************/
-
-    #define EXE386 1
-
-    #ifndef __NEWEXE__
-        #define __NEWEXE__
-
-        #pragma pack(1)
-
-        /*_________________________________________________________________*
-         |                                                                 |
-         |                                                                 |
-         |  DOS3 .EXE FILE HEADER DEFINITION                               |
-         |                                                                 |
-         |_________________________________________________________________|
-         *                                                                 */
-
-
-        #define EMAGIC          0x5A4D          // Old magic number
-        #define ENEWEXE         sizeof(struct exe_hdr)
-                                                // Value of E_LFARLC for new .EXEs
-        #define ENEWHDR         0x003C          // Offset in old hdr. of ptr. to new
-        #define ERESWDS         0x0010          // No. of reserved words (OLD)
-        #define ERES1WDS        0x0004          // No. of reserved words in e_res
-        #define ERES2WDS        0x000A          // No. of reserved words in e_res2
-        #define ECP             0x0004          // Offset in struct of E_CP
-        #define ECBLP           0x0002          // Offset in struct of E_CBLP
-        #define EMINALLOC       0x000A          // Offset in struct of E_MINALLOC
-
-        /*
-         *@@ exe_hdr:
-         *      DOS 1, 2, 3 .EXE header.
-         */
-
-        struct exe_hdr
-        {
-            unsigned short      e_magic;        // Magic number
-            unsigned short      e_cblp;         // Bytes on last page of file
-            unsigned short      e_cp;           // Pages in file
-            unsigned short      e_crlc;         // Relocations
-            unsigned short      e_cparhdr;      // Size of header in paragraphs
-            unsigned short      e_minalloc;     // Minimum extra paragraphs needed
-            unsigned short      e_maxalloc;     // Maximum extra paragraphs needed
-            unsigned short      e_ss;           // Initial (relative) SS value
-            unsigned short      e_sp;           // Initial SP value
-            unsigned short      e_csum;         // Checksum
-            unsigned short      e_ip;           // Initial IP value
-            unsigned short      e_cs;           // Initial (relative) CS value
-            unsigned short      e_lfarlc;       // File address of relocation table
-            unsigned short      e_ovno;         // Overlay number
-            unsigned short      e_res[ERES1WDS];// Reserved words
-            unsigned short      e_oemid;        // OEM identifier (for e_oeminfo)
-            unsigned short      e_oeminfo;      // OEM information; e_oemid specific
-            unsigned short      e_res2[ERES2WDS];// Reserved words
-            long                e_lfanew;       // File address of new exe header
-        };
-
-        #define E_MAGIC(x)      (x).e_magic
-        #define E_CBLP(x)       (x).e_cblp
-        #define E_CP(x)         (x).e_cp
-        #define E_CRLC(x)       (x).e_crlc
-        #define E_CPARHDR(x)    (x).e_cparhdr
-        #define E_MINALLOC(x)   (x).e_minalloc
-        #define E_MAXALLOC(x)   (x).e_maxalloc
-        #define E_SS(x)         (x).e_ss
-        #define E_SP(x)         (x).e_sp
-        #define E_CSUM(x)       (x).e_csum
-        #define E_IP(x)         (x).e_ip
-        #define E_CS(x)         (x).e_cs
-        #define E_LFARLC(x)     (x).e_lfarlc
-        #define E_OVNO(x)       (x).e_ovno
-        #define E_RES(x)        (x).e_res
-        #define E_OEMID(x)      (x).e_oemid
-        #define E_OEMINFO(x)    (x).e_oeminfo
-        #define E_RES2(x)       (x).e_res2
-        #define E_LFANEW(x)     (x).e_lfanew
-
-
-            /*_________________________________________________________________*
-             |                                                                 |
-             |                                                                 |
-             |  OS/2 & WINDOWS .EXE FILE HEADER DEFINITION - 286 version       |
-             |                                                                 |
-             |_________________________________________________________________|
-             *                                                                 */
-
-        #define NEMAGIC         0x454E          // New magic number
-        #define NERESBYTES      8               // Eight bytes reserved (now)
-        #define NECRC           8               // Offset into new header of NE_CRC
-
-        /*
-         *@@ new_exe:
-         *      New Executable (NE) header.
-         *      Follows DOS header in the executable file.
-         */
-
-        struct new_exe
-        {
-            unsigned short      ne_magic;       // Magic number NE_MAGIC
-            unsigned char       ne_ver;         // Version number
-            unsigned char       ne_rev;         // Revision number
-            unsigned short      ne_enttab;      // Offset of Entry Table
-            unsigned short      ne_cbenttab;    // Number of bytes in Entry Table
-            long                ne_crc;         // Checksum of whole file
-            unsigned short      ne_flags;       // Flag word
-            unsigned short      ne_autodata;    // Automatic data segment number
-            unsigned short      ne_heap;        // Initial heap allocation
-            unsigned short      ne_stack;       // Initial stack allocation
-            long                ne_csip;        // Initial CS:IP setting
-            long                ne_sssp;        // Initial SS:SP setting
-            unsigned short      ne_cseg;        // Count of file segments
-            unsigned short      ne_cmod;        // Entries in Module Reference Table
-            unsigned short      ne_cbnrestab;   // Size of non-resident name table
-            unsigned short      ne_segtab;      // Offset of Segment Table
-            unsigned short      ne_rsrctab;     // Offset of Resource Table
-            unsigned short      ne_restab;      // Offset of resident name table
-            unsigned short      ne_modtab;      // Offset of Module Reference Table
-            unsigned short      ne_imptab;      // Offset of Imported Names Table
-            long                ne_nrestab;     // Offset of Non-resident Names Table
-            unsigned short      ne_cmovent;     // Count of movable entries
-            unsigned short      ne_align;       // Segment alignment shift count
-            unsigned short      ne_cres;        // Count of resource entries
-            unsigned char       ne_exetyp;      // Target operating system
-            unsigned char       ne_flagsothers; // Other .EXE flags
-            char                ne_res[NERESBYTES]; // Pad structure to 64 bytes
-        };
-
-        #pragma pack()
-
-        #define NE_MAGIC(x)         (x).ne_magic
-        #define NE_VER(x)           (x).ne_ver
-        #define NE_REV(x)           (x).ne_rev
-        #define NE_ENTTAB(x)        (x).ne_enttab
-        #define NE_CBENTTAB(x)      (x).ne_cbenttab
-        #define NE_CRC(x)           (x).ne_crc
-        #define NE_FLAGS(x)         (x).ne_flags
-        #define NE_AUTODATA(x)      (x).ne_autodata
-        #define NE_HEAP(x)          (x).ne_heap
-        #define NE_STACK(x)         (x).ne_stack
-        #define NE_CSIP(x)          (x).ne_csip
-        #define NE_SSSP(x)          (x).ne_sssp
-        #define NE_CSEG(x)          (x).ne_cseg
-        #define NE_CMOD(x)          (x).ne_cmod
-        #define NE_CBNRESTAB(x)     (x).ne_cbnrestab
-        #define NE_SEGTAB(x)        (x).ne_segtab
-        #define NE_RSRCTAB(x)       (x).ne_rsrctab
-        #define NE_RESTAB(x)        (x).ne_restab
-        #define NE_MODTAB(x)        (x).ne_modtab
-        #define NE_IMPTAB(x)        (x).ne_imptab
-        #define NE_NRESTAB(x)       (x).ne_nrestab
-        #define NE_CMOVENT(x)       (x).ne_cmovent
-        #define NE_ALIGN(x)         (x).ne_align
-        #define NE_CRES(x)          (x).ne_cres
-        #define NE_RES(x)           (x).ne_res
-        #define NE_EXETYP(x)        (x).ne_exetyp
-        #define NE_FLAGSOTHERS(x)   (x).ne_flagsothers
-
-        #define NE_USAGE(x)     (WORD)*((WORD *)(x)+1)
-        #define NE_PNEXTEXE(x)  (WORD)(x).ne_cbenttab
-        #define NE_ONEWEXE(x)   (WORD)(x).ne_crc
-        #define NE_PFILEINFO(x) (WORD)((DWORD)(x).ne_crc >> 16)
-
-
-        /*
-         *  Target operating systems
-         */
-
-        #define NE_UNKNOWN      0x0             /* Unknown (any "new-format" OS) */
-        #define NE_OS2          0x1             /* OS/2 (default)  */
-        #define NE_WINDOWS      0x2             /* Windows */
-        #define NE_DOS4         0x3             /* DOS 4.x */
-        #define NE_DEV386       0x4             /* Windows 386 */
-
-
-        /*
-         *  Format of NE_FLAGS(x):
-         *
-         *  p                                   Not-a-process
-         *   x                                  Unused
-         *    e                                 Errors in image
-         *     x                                Unused
-         *      b                               Bound Family/API
-         *       ttt                            Application type
-         *          f                           Floating-point instructions
-         *           3                          386 instructions
-         *            2                         286 instructions
-         *             0                        8086 instructions
-         *              P                       Protected mode only
-         *               p                      Per-process library initialization
-         *                i                     Instance data
-         *                 s                    Solo data
-         */
-        #define NENOTP          0x8000          /* Not a process */
-        #define NEIERR          0x2000          /* Errors in image */
-        #define NEBOUND         0x0800          /* Bound Family/API */
-        #define NEAPPTYP        0x0700          /* Application type mask */
-        #define NENOTWINCOMPAT  0x0100          /* Not compatible with P.M. Windowing */
-        #define NEWINCOMPAT     0x0200          /* Compatible with P.M. Windowing */
-        #define NEWINAPI        0x0300          /* Uses P.M. Windowing API */
-        #define NEFLTP          0x0080          /* Floating-point instructions */
-        #define NEI386          0x0040          /* 386 instructions */
-        #define NEI286          0x0020          /* 286 instructions */
-        #define NEI086          0x0010          /* 8086 instructions */
-        #define NEPROT          0x0008          /* Runs in protected mode only */
-        #define NEPPLI          0x0004          /* Per-Process Library Initialization */
-        #define NEINST          0x0002          /* Instance data */
-        #define NESOLO          0x0001          /* Solo data */
-
-        /*
-         *  Format of NE_FLAGSOTHERS(x):
-         *
-         *      7 6 5 4 3 2 1 0  - bit no
-         *      |         | | |
-         *      |         | | +---------------- Support for long file names
-         *      |         | +------------------ Windows 2.x app runs in prot mode
-         *      |         +-------------------- Windows 2.x app gets prop. font
-         *      +------------------------------ WLO appl on OS/2 (markwlo.exe)
-         *
-         */
-
-        #define NELONGNAMES     0x01
-        #define NEWINISPROT     0x02
-        #define NEWINGETPROPFON 0x04
-        #define NEWLOAPPL       0x80
-
-
-
-        struct new_seg                          /* New .EXE segment table entry */
-          {
-            unsigned short      ns_sector;      /* File sector of start of segment */
-            unsigned short      ns_cbseg;       /* Number of bytes in file */
-            unsigned short      ns_flags;       /* Attribute flags */
-            unsigned short      ns_minalloc;    /* Minimum allocation in bytes */
-          };
-
-        #define NS_SECTOR(x)    (x).ns_sector
-        #define NS_CBSEG(x)     (x).ns_cbseg
-        #define NS_FLAGS(x)     (x).ns_flags
-        #define NS_MINALLOC(x)  (x).ns_minalloc
-
-
-        /*
-         *  Format of NS_FLAGS(x)
-         *
-         *  Flag word has the following format:
-         *
-         *      15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0  - bit no
-         *          |  |  |  |  | | | | | | | | | | |
-         *          |  |  |  |  | | | | | | | | +-+-+--- Segment type DATA/CODE
-         *          |  |  |  |  | | | | | | | +--------- Iterated segment
-         *          |  |  |  |  | | | | | | +----------- Movable segment
-         *          |  |  |  |  | | | | | +------------- Segment can be shared
-         *          |  |  |  |  | | | | +--------------- Preload segment
-         *          |  |  |  |  | | | +----------------- Execute/read-only for code/data segment
-         *          |  |  |  |  | | +------------------- Segment has relocations
-         *          |  |  |  |  | +--------------------- Code conforming/Data is expand down
-         *          |  |  |  +--+----------------------- I/O privilege level
-         *          |  |  +----------------------------- Discardable segment
-         *          |  +-------------------------------- 32-bit code segment
-         *          +----------------------------------- Huge segment/GDT allocation requested
-         *
-         */
-
-        #define NSTYPE          0x0007          /* Segment type mask */
-
-        #ifdef EXE386
-            #define NSCODE          0x0000          /* Code segment */
-            #define NSDATA          0x0001          /* Data segment */
-            #define NSITER          0x0008          /* Iterated segment flag */
-            #define NSMOVE          0x0010          /* Movable segment flag */
-            #define NSSHARED        0x0020          /* Shared segment flag */
-            #define NSPRELOAD       0x0040          /* Preload segment flag */
-            #define NSEXRD          0x0080          /* Execute-only (code segment), or
-                                                    *  read-only (data segment)
-                                                    */
-            #define NSRELOC         0x0100          /* Segment has relocations */
-            #define NSCONFORM       0x0200          /* Conforming segment */
-            #define NSEXPDOWN       0x0200          /* Data segment is expand down */
-            #define NSDPL           0x0C00          /* I/O privilege level (286 DPL bits) */
-            #define SHIFTDPL        10              /* Left shift count for SEGDPL field */
-            #define NSDISCARD       0x1000          /* Segment is discardable */
-            #define NS32BIT         0x2000          /* 32-bit code segment */
-            #define NSHUGE          0x4000          /* Huge memory segment, length of
-                                                     * segment and minimum allocation
-                                                     * size are in segment sector units
-                                                     */
-            #define NSGDT           0x8000          /* GDT allocation requested */
-
-            #define NSPURE          NSSHARED        /* For compatibility */
-
-            #define NSALIGN 9       /* Segment data aligned on 512 byte boundaries */
-
-            #define NSLOADED    0x0004      /* ns_sector field contains memory addr */
-        #endif
-
-
-        struct new_segdata                      /* Segment data */
-          {
-            union
-              {
-                struct
-                  {
-                    unsigned short      ns_niter;       /* number of iterations */
-                    unsigned short      ns_nbytes;      /* number of bytes */
-                    char                ns_iterdata;    /* iterated data bytes */
-                  } ns_iter;
-                struct
-                  {
-                    char                ns_data;        /* data bytes */
-                  } ns_noniter;
-              } ns_union;
-          };
-
-        struct new_rlcinfo                      /* Relocation info */
-          {
-            unsigned short      nr_nreloc;      /* number of relocation items that */
-          };                                    /* follow */
-
-        #pragma pack(1)
-
-
-        struct new_rlc                          /* Relocation item */
-          {
-            char                nr_stype;       /* Source type */
-            char                nr_flags;       /* Flag byte */
-            unsigned short      nr_soff;        /* Source offset */
-            union
-              {
-                struct
-                  {
-                    char        nr_segno;       /* Target segment number */
-                    char        nr_res;         /* Reserved */
-                    unsigned short nr_entry;    /* Target Entry Table offset */
-                  }             nr_intref;      /* Internal reference */
-                struct
-                  {
-                    unsigned short nr_mod;      /* Index into Module Reference Table */
-                    unsigned short nr_proc;     /* Procedure ordinal or name offset */
-                  }             nr_import;      /* Import */
-                struct
-                  {
-                    unsigned short nr_ostype;   /* OSFIXUP type */
-                    unsigned short nr_osres;    /* reserved */
-                  }             nr_osfix;       /* Operating system fixup */
-              }                 nr_union;       /* Union */
-          };
-
-        #pragma pack()
-
-
-        #define NR_STYPE(x)     (x).nr_stype
-        #define NR_FLAGS(x)     (x).nr_flags
-        #define NR_SOFF(x)      (x).nr_soff
-        #define NR_SEGNO(x)     (x).nr_union.nr_intref.nr_segno
-        #define NR_RES(x)       (x).nr_union.nr_intref.nr_res
-        #define NR_ENTRY(x)     (x).nr_union.nr_intref.nr_entry
-        #define NR_MOD(x)       (x).nr_union.nr_import.nr_mod
-        #define NR_PROC(x)      (x).nr_union.nr_import.nr_proc
-        #define NR_OSTYPE(x)    (x).nr_union.nr_osfix.nr_ostype
-        #define NR_OSRES(x)     (x).nr_union.nr_osfix.nr_osres
-
-
-
-        /*
-         *  Format of NR_STYPE(x) and R32_STYPE(x):
-         *
-         *       7 6 5 4 3 2 1 0  - bit no
-         *               | | | |
-         *               +-+-+-+--- source type
-         *
-         */
-
-        #define NRSTYP          0x0f            /* Source type mask */
-        #define NRSBYT          0x00            /* lo byte (8-bits)*/
-        #define NRSSEG          0x02            /* 16-bit segment (16-bits) */
-        #define NRSPTR          0x03            /* 16:16 pointer (32-bits) */
-        #define NRSOFF          0x05            /* 16-bit offset (16-bits) */
-        #define NRPTR48         0x06            /* 16:32 pointer (48-bits) */
-        #define NROFF32         0x07            /* 32-bit offset (32-bits) */
-        #define NRSOFF32        0x08            /* 32-bit self-relative offset (32-bits) */
-
-
-        /*
-         *  Format of NR_FLAGS(x) and R32_FLAGS(x):
-         *
-         *       7 6 5 4 3 2 1 0  - bit no
-         *                 | | |
-         *                 | +-+--- Reference type
-         *                 +------- Additive fixup
-         */
-
-        #define NRADD           0x04            /* Additive fixup */
-        #define NRRTYP          0x03            /* Reference type mask */
-        #define NRRINT          0x00            /* Internal reference */
-        #define NRRORD          0x01            /* Import by ordinal */
-        #define NRRNAM          0x02            /* Import by name */
-        #define NRROSF          0x03            /* Operating system fixup */
-
-
-        #if (EXE386 == 0)
-
-        /* Resource type or name string */
-        struct rsrc_string
-            {
-            char rs_len;            /* number of bytes in string */
-            char rs_string[ 1 ];    /* text of string */
-            };
-
-        #define RS_LEN( x )    (x).rs_len
-        #define RS_STRING( x ) (x).rs_string
-
-        /* Resource type information block */
-        struct rsrc_typeinfo
-            {
-            unsigned short rt_id;
-            unsigned short rt_nres;
-            long rt_proc;
-            };
-
-        #define RT_ID( x )   (x).rt_id
-        #define RT_NRES( x ) (x).rt_nres
-        #define RT_PROC( x ) (x).rt_proc
-
-        /* Resource name information block */
-        struct rsrc_nameinfo
-            {
-            /* The following two fields must be shifted left by the value of  */
-            /* the rs_align field to compute their actual value.  This allows */
-            /* resources to be larger than 64k, but they do not need to be    */
-            /* aligned on 512 byte boundaries, the way segments are           */
-            unsigned short rn_offset;   /* file offset to resource data */
-            unsigned short rn_length;   /* length of resource data */
-            unsigned short rn_flags;    /* resource flags */
-            unsigned short rn_id;       /* resource name id */
-            unsigned short rn_handle;   /* If loaded, then global handle */
-            unsigned short rn_usage;    /* Initially zero.  Number of times */
-                                        /* the handle for this resource has */
-                                        /* been given out */
-            };
-
-        #define RN_OFFSET( x ) (x).rn_offset
-        #define RN_LENGTH( x ) (x).rn_length
-        #define RN_FLAGS( x )  (x).rn_flags
-        #define RN_ID( x )     (x).rn_id
-        #define RN_HANDLE( x ) (x).rn_handle
-        #define RN_USAGE( x )  (x).rn_usage
-
-        #define RSORDID     0x8000      /* if high bit of ID set then integer id */
-                                        /* otherwise ID is offset of string from
-                                           the beginning of the resource table */
-
-                                        /* Ideally these are the same as the */
-                                        /* corresponding segment flags */
-        #define RNMOVE      0x0010      /* Moveable resource */
-        #define RNPURE      0x0020      /* Pure (read-only) resource */
-        #define RNPRELOAD   0x0040      /* Preloaded resource */
-        #define RNDISCARD   0xF000      /* Discard priority level for resource */
-
-        /* Resource table */
-        struct new_rsrc
-            {
-            unsigned short rs_align;    /* alignment shift count for resources */
-            struct rsrc_typeinfo rs_typeinfo;
-            };
-
-        #define RS_ALIGN( x ) (x).rs_align
-
-
-        #endif /* NOT EXE386 */
-
-    #endif /* __NEWEXE__ */
-
-    #ifndef DWORD
-    #define DWORD long int
-    #endif
-
-    #ifndef WORD
-    #define WORD  short int
-    #endif
-
-    #ifndef __EXE386__
-        #define __EXE386__
-
-        #pragma pack(1)    /* Force byte alignment */
-
-            /*_________________________________________________________________*
-             |                                                                 |
-             |                                                                 |
-             |  OS/2 .EXE FILE HEADER DEFINITION - 386 version 0:32            |
-             |                                                                 |
-             |_________________________________________________________________|
-             *                                                                 */
-
-        #define BITPERWORD      16
-        #define BITPERBYTE      8
-        #define OBJPAGELEN      4096
-        #define E32MAGIC1       'L'        /* New magic number  "LX" */
-        #define E32MAGIC2       'X'        /* New magic number  "LX" */
-        #define E32MAGIC        0x584c     /* New magic number  "LX" */
-        #define E32RESBYTES1    0          /* First bytes reserved */
-        #define E32RESBYTES2    0          /* Second bytes reserved */
-        #define E32RESBYTES3    20         /* Third bytes reserved */
-        #define E32LEBO         0x00       /* Little Endian Byte Order */
-        #define E32BEBO         0x01       /* Big Endian Byte Order */
-        #define E32LEWO         0x00       /* Little Endian Word Order */
-        #define E32BEWO         0x01       /* Big Endian Word Order */
-        #define E32LEVEL        0L         /* 32-bit EXE format level */
-        #define E32CPU286       0x001      /* Intel 80286 or upwardly compatibile */
-        #define E32CPU386       0x002      /* Intel 80386 or upwardly compatibile */
-        #define E32CPU486       0x003      /* Intel 80486 or upwardly compatibile */
-
-
-
-        struct e32_exe                          /* New 32-bit .EXE header */
-        {
-            unsigned char       e32_magic[2];   /* Magic number E32_MAGIC */
-            unsigned char       e32_border;     /* The byte ordering for the .EXE */
-            unsigned char       e32_worder;     /* The word ordering for the .EXE */
-            unsigned long       e32_level;      /* The EXE format level for now = 0 */
-            unsigned short      e32_cpu;        /* The CPU type */
-            unsigned short      e32_os;         /* The OS type */
-            unsigned long       e32_ver;        /* Module version */
-            unsigned long       e32_mflags;     /* Module flags */
-            unsigned long       e32_mpages;     /* Module # pages */
-            unsigned long       e32_startobj;   /* Object # for instruction pointer */
-            unsigned long       e32_eip;        /* Extended instruction pointer */
-            unsigned long       e32_stackobj;   /* Object # for stack pointer */
-            unsigned long       e32_esp;        /* Extended stack pointer */
-            unsigned long       e32_pagesize;   /* .EXE page size */
-            unsigned long       e32_pageshift;  /* Page alignment shift in .EXE */
-            unsigned long       e32_fixupsize;  /* Fixup section size */
-            unsigned long       e32_fixupsum;   /* Fixup section checksum */
-            unsigned long       e32_ldrsize;    /* Loader section size */
-            unsigned long       e32_ldrsum;     /* Loader section checksum */
-            unsigned long       e32_objtab;     /* Object table offset */
-            unsigned long       e32_objcnt;     /* Number of objects in module */
-            unsigned long       e32_objmap;     /* Object page map offset */
-            unsigned long       e32_itermap;    /* Object iterated data map offset */
-            unsigned long       e32_rsrctab;    /* Offset of Resource Table */
-            unsigned long       e32_rsrccnt;    /* Number of resource entries */
-            unsigned long       e32_restab;     /* Offset of resident name table */
-            unsigned long       e32_enttab;     /* Offset of Entry Table */
-            unsigned long       e32_dirtab;     /* Offset of Module Directive Table */
-            unsigned long       e32_dircnt;     /* Number of module directives */
-            unsigned long       e32_fpagetab;   /* Offset of Fixup Page Table */
-            unsigned long       e32_frectab;    /* Offset of Fixup Record Table */
-            unsigned long       e32_impmod;     /* Offset of Import Module Name Table */
-            unsigned long       e32_impmodcnt;  /* Number of entries in Import Module Name Table */
-            unsigned long       e32_impproc;    /* Offset of Import Procedure Name Table */
-            unsigned long       e32_pagesum;    /* Offset of Per-Page Checksum Table */
-            unsigned long       e32_datapage;   /* Offset of Enumerated Data Pages */
-            unsigned long       e32_preload;    /* Number of preload pages */
-            unsigned long       e32_nrestab;    /* Offset of Non-resident Names Table */
-            unsigned long       e32_cbnrestab;  /* Size of Non-resident Name Table */
-            unsigned long       e32_nressum;    /* Non-resident Name Table Checksum */
-            unsigned long       e32_autodata;   /* Object # for automatic data object */
-            unsigned long       e32_debuginfo;  /* Offset of the debugging information */
-            unsigned long       e32_debuglen;   /* The length of the debugging info. in bytes */
-            unsigned long       e32_instpreload;/* Number of instance pages in preload section of .EXE file */
-            unsigned long       e32_instdemand; /* Number of instance pages in demand load section of .EXE file */
-            unsigned long       e32_heapsize;   /* Size of heap - for 16-bit apps */
-            unsigned long       e32_stacksize;  /* Size of stack */
-            unsigned char       e32_res3[E32RESBYTES3];
-                                                /* Pad structure to 196 bytes */
-          };
-
-
-
-        #define E32_MAGIC1(x)       (x).e32_magic[0]
-        #define E32_MAGIC2(x)       (x).e32_magic[1]
-        #define E32_BORDER(x)       (x).e32_border
-        #define E32_WORDER(x)       (x).e32_worder
-        #define E32_LEVEL(x)        (x).e32_level
-        #define E32_CPU(x)          (x).e32_cpu
-        #define E32_OS(x)           (x).e32_os
-        #define E32_VER(x)          (x).e32_ver
-        #define E32_MFLAGS(x)       (x).e32_mflags
-        #define E32_MPAGES(x)       (x).e32_mpages
-        #define E32_STARTOBJ(x)     (x).e32_startobj
-        #define E32_EIP(x)          (x).e32_eip
-        #define E32_STACKOBJ(x)     (x).e32_stackobj
-        #define E32_ESP(x)          (x).e32_esp
-        #define E32_PAGESIZE(x)     (x).e32_pagesize
-        #define E32_PAGESHIFT(x)    (x).e32_pageshift
-        #define E32_FIXUPSIZE(x)    (x).e32_fixupsize
-        #define E32_FIXUPSUM(x)     (x).e32_fixupsum
-        #define E32_LDRSIZE(x)      (x).e32_ldrsize
-        #define E32_LDRSUM(x)       (x).e32_ldrsum
-        #define E32_OBJTAB(x)       (x).e32_objtab
-        #define E32_OBJCNT(x)       (x).e32_objcnt
-        #define E32_OBJMAP(x)       (x).e32_objmap
-        #define E32_ITERMAP(x)      (x).e32_itermap
-        #define E32_RSRCTAB(x)      (x).e32_rsrctab
-        #define E32_RSRCCNT(x)      (x).e32_rsrccnt
-        #define E32_RESTAB(x)       (x).e32_restab
-        #define E32_ENTTAB(x)       (x).e32_enttab
-        #define E32_DIRTAB(x)       (x).e32_dirtab
-        #define E32_DIRCNT(x)       (x).e32_dircnt
-        #define E32_FPAGETAB(x)     (x).e32_fpagetab
-        #define E32_FRECTAB(x)      (x).e32_frectab
-        #define E32_IMPMOD(x)       (x).e32_impmod
-        #define E32_IMPMODCNT(x)    (x).e32_impmodcnt
-        #define E32_IMPPROC(x)      (x).e32_impproc
-        #define E32_PAGESUM(x)      (x).e32_pagesum
-        #define E32_DATAPAGE(x)     (x).e32_datapage
-        #define E32_PRELOAD(x)      (x).e32_preload
-        #define E32_NRESTAB(x)      (x).e32_nrestab
-        #define E32_CBNRESTAB(x)    (x).e32_cbnrestab
-        #define E32_NRESSUM(x)      (x).e32_nressum
-        #define E32_AUTODATA(x)     (x).e32_autodata
-        #define E32_DEBUGINFO(x)    (x).e32_debuginfo
-        #define E32_DEBUGLEN(x)     (x).e32_debuglen
-        #define E32_INSTPRELOAD(x)  (x).e32_instpreload
-        #define E32_INSTDEMAND(x)   (x).e32_instdemand
-        #define E32_HEAPSIZE(x)     (x).e32_heapsize
-        #define E32_STACKSIZE(x)    (x).e32_stacksize
-
-
-
-        /*
-         *  Format of E32_MFLAGS(x):
-         *
-         *  Low word has the following format:
-         *
-         *  15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0  - bit no
-         *   |     |          | |     | | | |
-         *   |     |          | |     | | | +------- Per-Process Library Initialization
-         *   |     |          | |     | | +--------- SystemDLL (internal fixups discarded)
-         *   |     |          | |     | +----------- No Internal Fixups for Module in .EXE
-         *   |     |          | |     +------------- No External Fixups for Module in .EXE
-         *   |     |          | +------------------- Incompatible with PM Windowing
-         *   |     |          +--------------------- Compatible with PM Windowing
-         *   |     |                                 Uses PM Windowing API
-         *   |     +-------------------------------- Module not Loadable
-         *   +-------------------------------------- Library Module
-         */
-
-
-        #define E32NOTP          0x8000L        /* Library Module - used as NENOTP */
-        #define E32NOLOAD        0x2000L        /* Module not Loadable */
-        #define E32PMAPI         0x0300L        /* Uses PM Windowing API */
-        #define E32PMW           0x0200L        /* Compatible with PM Windowing */
-        #define E32NOPMW         0x0100L        /* Incompatible with PM Windowing */
-        #define E32NOEXTFIX      0x0020L        /* NO External Fixups in .EXE */
-        #define E32NOINTFIX      0x0010L        /* NO Internal Fixups in .EXE */
-        #define E32SYSDLL        0x0008L        /* System DLL, Internal Fixups discarded*/
-        #define E32LIBINIT       0x0004L        /* Per-Process Library Initialization */
-        #define E32LIBTERM       0x40000000L    /* Per-Process Library Termination */
-        #define E32APPMASK       0x0300L        /* Application Type Mask */
-
-
-        /*
-         *  Format of E32_MFLAGS(x):
-         *
-         *  High word has the following format:
-         *
-         *  15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0  - bit no
-         *                                    | |
-         *                                    | +--- Protected memory library module
-         *                                    +----- Device driver
-         */
-
-        #define E32PROTDLL       0x10000L       /* Protected memory library module */
-        #define E32DEVICE        0x20000L       /* Device driver                   */
-        #define E32MODEXE        0x00000L       /* .EXE module                     */
-        #define E32MODDLL        0x08000L       /* .DLL module                     */
-        #define E32MODPROTDLL    0x18000L       /* Protected memory library module */
-        #define E32MODPDEV       0x20000L       /* Physical device driver          */
-        #define E32MODVDEV       0x28000L       /* Virtual device driver           */
-        #define E32MODMASK       0x38000L       /* Module type mask                */
-
-        /*
-         *  RELOCATION DEFINITIONS - RUN-TIME FIXUPS
-         */
-
-        typedef union _RELOC_OFS
-        {
-            unsigned short offset16;
-            unsigned long  offset32;
-        } RELOC_OFS;                            /* 16-bit or 32-bit offset */
-
-
-        /***ET+ r32_rlc - Relocation item */
-
-        struct r32_rlc                          /* Relocation item */
-        {
-            unsigned char       nr_stype;       /* Source type - field shared with new_rlc */
-            unsigned char       nr_flags;       /* Flag byte - field shared with new_rlc */
-            short               r32_soff;       /* Source offset */
-            unsigned short      r32_objmod;     /* Target object number or Module ordinal */
-
-            union targetid
-            {
-                RELOC_OFS         intref;      /* Internal fixup */
-
-                union extfixup
-                {
-                    RELOC_OFS      proc;        /* Procedure name offset */
-                    unsigned long  ord;         /* Procedure odrinal */
-                } extref;      /* External fixup */
-
-                struct addfixup
-                {
-                    unsigned short entry;       /* Entry ordinal */
-                    RELOC_OFS      addval;      /* Value added to the address */
-                } addfix;      /* Additive fixup */
-            }
-                                r32_target;     /* Target data */
-            unsigned short      r32_srccount;   /* Number of chained fixup records */
-            unsigned short      r32_chain;      /* Chain head */
-        };
-
-        /*
-         *  In 32-bit .EXE file run-time relocations are written as varying size
-         *  records, so we need many size definitions.
-         */
-
-        #define RINTSIZE16      8
-        #define RINTSIZE32      10
-        #define RORDSIZE        8
-        #define RNAMSIZE16      8
-        #define RNAMSIZE32      10
-        #define RADDSIZE16      10
-        #define RADDSIZE32      12
-
-        #if FALSE
-        /*
-         *  Access macros defined in NEWEXE.H !!!
-         */
-        #define NR_STYPE(x)      (x).nr_stype
-        #define NR_FLAGS(x)      (x).nr_flags
-        #endif
-
-        #define R32_SOFF(x)      (x).r32_soff
-        #define R32_OBJNO(x)     (x).r32_objmod
-        #define R32_MODORD(x)    (x).r32_objmod
-        #define R32_OFFSET16(x)  (x).r32_target.intref.offset16
-        #define R32_OFFSET32(x)  (x).r32_target.intref.offset32
-        #define R32_PROCOFF16(x) (x).r32_target.extref.proc.offset16
-        #define R32_PROCOFF32(x) (x).r32_target.extref.proc.offset32
-        #define R32_PROCORD(x)   (x).r32_target.extref.ord
-        #define R32_ENTRY(x)     (x).r32_target.addfix.entry
-        #define R32_ADDVAL16(x)  (x).r32_target.addfix.addval.offset16
-        #define R32_ADDVAL32(x)  (x).r32_target.addfix.addval.offset32
-        #define R32_SRCCNT(x)    (x).r32_srccount
-        #define R32_CHAIN(x)     (x).r32_chain
-
-
-
-        /*
-         *  Format of NR_STYPE(x)
-         *
-         *       7 6 5 4 3 2 1 0  - bit no
-         *           | | | | | |
-         *           | | +-+-+-+--- Source type
-         *           | +----------- Fixup to 16:16 alias
-         *           +------------- List of source offset follows fixup record
-         */
-
-        #if FALSE
-
-                    /* DEFINED in newexe.h !!! */
-
-        #define NRSTYP          0x0f            /* Source type mask */
-        #define NRSBYT          0x00            /* lo byte (8-bits)*/
-        #define NRSSEG          0x02            /* 16-bit segment (16-bits) */
-        #define NRSPTR          0x03            /* 16:16 pointer (32-bits) */
-        #define NRSOFF          0x05            /* 16-bit offset (16-bits) */
-        #define NRPTR48         0x06            /* 16:32 pointer (48-bits) */
-        #define NROFF32         0x07            /* 32-bit offset (32-bits) */
-        #define NRSOFF32        0x08            /* 32-bit self-relative offset (32-bits) */
-        #endif
-
-
-        #define NRSRCMASK       0x0f            /* Source type mask */
-        #define NRALIAS         0x10            /* Fixup to alias */
-        #define NRCHAIN         0x20            /* List of source offset follows */
-                                                /* fixup record, source offset field */
-                                                /* in fixup record contains number */
-                                                /* of elements in list */
-
-        /*
-         *  Format of NR_FLAGS(x) and R32_FLAGS(x):
-         *
-         *       7 6 5 4 3 2 1 0  - bit no
-         *       | | | |   | | |
-         *       | | | |   | +-+--- Reference type
-         *       | | | |   +------- Additive fixup
-         *       | | | +----------- 32-bit Target Offset Flag (1 - 32-bit; 0 - 16-bit)
-         *       | | +------------- 32-bit Additive Flag (1 - 32-bit; 0 - 16-bit)
-         *       | +--------------- 16-bit Object/Module ordinal (1 - 16-bit; 0 - 8-bit)
-         *       +----------------- 8-bit import ordinal (1 - 8-bit;
-         *                                                0 - NR32BITOFF toggles
-         *                                                    between 16 and 32 bit
-         *                                                    ordinal)
-         */
-
-        #ifdef NEVER_INCLUDE_THE_FOLLWING
-                    /* DEFINED in newexe.h !!! */
-            #define NRRTYP          0x03            /* Reference type mask */
-            #define NRRINT          0x00            /* Internal reference */
-            #define NRRORD          0x01            /* Import by ordinal */
-            #define NRRNAM          0x02            /* Import by name */
-            #define NRADD           0x04            /* Additive fixup */
-        #endif
-
-        #define NRRENT          0x03            /* Internal entry table fixup */
-
-        #define NR32BITOFF      0x10            /* 32-bit Target Offset */
-        #define NR32BITADD      0x20            /* 32-bit Additive fixup */
-        #define NR16OBJMOD      0x40            /* 16-bit Object/Module ordinal */
-        #define NR8BITORD       0x80            /* 8-bit import ordinal */
-        /*end*/
-
-        /*
-         *  Data structures for storing run-time fixups in linker virtual memory.
-         *
-         *  Each object has a list of Object Page Directories which specify
-         *  fixups for given page. Each page has its own hash table which is
-         *  used to detect fixups to the same target.
-         */
-
-        #define PAGEPERDIR      62
-        #define LG2DIR          7
-
-
-        typedef struct _OBJPAGEDIR
-        {
-            DWORD   next;                       /* Virtual pointer to next dir on list */
-            WORD    ht[PAGEPERDIR];             /* Pointers to individual hash tables */
-        }
-            OBJPAGEDIR;
-
-        /*
-         *  OBJECT TABLE
-         */
-
-        /***ET+ o32_obj Object Table Entry */
-
-        struct o32_obj                          /* Flat .EXE object table entry */
-        {
-            unsigned long       o32_size;       /* Object virtual size */
-            unsigned long       o32_base;       /* Object base virtual address */
-            unsigned long       o32_flags;      /* Attribute flags */
-            unsigned long       o32_pagemap;    /* Object page map index */
-            unsigned long       o32_mapsize;    /* Number of entries in object page map */
-            unsigned long       o32_reserved;   /* Reserved */
-        };
-
-
-        #define O32_SIZE(x)     (x).o32_size
-        #define O32_BASE(x)     (x).o32_base
-        #define O32_FLAGS(x)    (x).o32_flags
-        #define O32_PAGEMAP(x)  (x).o32_pagemap
-        #define O32_MAPSIZE(x)  (x).o32_mapsize
-        #define O32_RESERVED(x) (x).o32_reserved
-
-        /*
-         *  Format of O32_FLAGS(x)
-         *
-         *  High word of dword flag field is not used for now.
-         *  Low word has the following format:
-         *
-         *  15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0  - bit no
-         *   |  |  |  |     | | | | | | | | | | |
-         *   |  |  |  |     | | | | | | | | | | +--- Readable Object
-         *   |  |  |  |     | | | | | | | | | +----- Writeable Object
-         *   |  |  |  |     | | | | | | | | +------- Executable Object
-         *   |  |  |  |     | | | | | | | +--------- Resource Object
-         *   |  |  |  |     | | | | | | +----------- Object is Discardable
-         *   |  |  |  |     | | | | | +------------- Object is Shared
-         *   |  |  |  |     | | | | +--------------- Object has preload pages
-         *   |  |  |  |     | | | +----------------- Object has invalid pages
-         *   |  |  |  |     | | +------------------- Object is permanent and swappable
-         *   |  |  |  |     | +--------------------- Object is permanent and resident
-         *   |  |  |  |     +----------------------- Object is permanent and long lockable
-         *   |  |  |  +----------------------------- 16:16 alias required (80x86 specific)
-         *   |  |  +-------------------------------- Big/Default bit setting (80x86 specific)
-         *   |  +----------------------------------- Object is conforming for code (80x86 specific)
-         *   +-------------------------------------- Object I/O privilege level (80x86 specific)
-         *
-         */
-
-        #define OBJREAD         0x0001L             /* Readable Object   */
-        #define OBJWRITE        0x0002L             /* Writeable Object  */
-        #define OBJRSRC         0x0008L             /* Resource Object   */
-        #define OBJINVALID      0x0080L             /* Object has invalid pages  */
-        #define LNKNONPERM      0x0600L             /* Object is nonpermanent - should be */
-        #define OBJNONPERM      0x0000L             /* zero in the .EXE but LINK386 uses 6 */
-        #define OBJPERM         0x0100L             /* Object is permanent and swappable */
-        #define OBJRESIDENT     0x0200L             /* Object is permanent and resident */
-        #define OBJCONTIG       0x0300L             /* Object is resident and contiguous */
-        #define OBJDYNAMIC      0x0400L             /* Object is permanent and long locable */
-        #define OBJTYPEMASK     0x0700L             /* Object type mask */
-        #define OBJALIAS16      0x1000L             /* 16:16 alias required (80x86 specific)           */
-        #define OBJBIGDEF       0x2000L             /* Big/Default bit setting (80x86 specific)        */
-        #define OBJIOPL         0x8000L             /* Object I/O privilege level (80x86 specific)     */
-        #if FOR_EXEHDR
-        /*
-         *  Name these flags differently for EXEHDR.EXE - avoid conflicts with 286 version
-         */
-        #define OBJDISCARD       0x0010L            /* Object is Discardable */
-        #define OBJSHARED        0x0020L            /* Object is Shared */
-        #define OBJPRELOAD       0x0040L            /* Object has preload pages  */
-        #define OBJEXEC          0x0004L            /* Executable Object */
-        #define OBJCONFORM       0x4000L            /* Object is conforming for code (80x86 specific)  */
-        #else
-        /*
-         *  Life will be easier, if we keep the same names for the following flags:
-         */
-        #ifndef NSDISCARD
-            #define NSDISCARD       0x0010L             /* Object is Discardable */
-        #endif
-        #ifndef NSMOVE
-            #define NSMOVE          NSDISCARD           /* Moveable object is for sure Discardable */
-        #endif
-        #ifndef NSSHARED
-            #define NSSHARED        0x0020L             /* Object is Shared */
-        #endif
-        #ifndef NSPRELOAD
-            #define NSPRELOAD       0x0040L             /* Object has preload pages  */
-        #endif
-        #ifndef NSEXRD
-            #define NSEXRD          0x0004L             /* Executable Object */
-        #endif
-        #ifndef NSCONFORM
-            #define NSCONFORM       0x4000L             /* Object is conforming for code (80x86 specific)  */
-        #endif
-        #endif
-        /*end*/
-
-        /***ET+ o32_map - Object Page Map entry */
-
-        struct o32_map                              /* Object Page Table entry */
-        {
-            unsigned long   o32_pagedataoffset;     /* file offset of page */
-            unsigned short  o32_pagesize;           /* # bytes of page data */
-            unsigned short  o32_pageflags;          /* Per-Page attributes */
-        };
-
-
-        #define GETPAGEIDX(x)    ((x).o32_pagedataoffset)
-
-        #define PUTPAGEIDX(x,i)  ((x).o32_pagedataoffset = ((unsigned long)(i)))
-
-        #define PUTPAGESIZ(x,i)  ((x).o32_pagesize = ((unsigned int)(i)))
-
-        #define GETPAGESIZ(x)    ((x).o32_pagesize)
-
-        #define PAGEFLAGS(x)    (x).o32_pageflags
-
-
-        #define VALID           0x0000                /* Valid Physical Page in .EXE */
-        #define ITERDATA        0x0001                /* Iterated Data Page */
-        #define INVALID         0x0002                /* Invalid Page */
-        #define ZEROED          0x0003                /* Zero Filled Page */
-        #define RANGE           0x0004                /* Range of pages */
-        #define ITERDATA2       0x0005                /* Iterated Data Page Type II */
-        /*end*/
-
-        /*
-         *  RESOURCE TABLE
-         */
-
-        /***ET+ rsrc32 - Resource Table Entry */
-
-        struct rsrc32                               /* Resource Table Entry */
-        {
-            unsigned short      type;               /* Resource type */
-            unsigned short      name;               /* Resource name */
-            unsigned long       cb;                 /* Resource size */
-            unsigned short      obj;                /* Object number */
-            unsigned long       offset;             /* Offset within object */
-        };
-        /*end*/
-
-
-         /*
-          * Iteration Record format for 'EXEPACK'ed pages.
-          */
-        struct LX_Iter
-        {
-            unsigned short LX_nIter;            /* number of iterations */
-            unsigned short LX_nBytes;           /* number of bytes */
-            unsigned char  LX_Iterdata;         /* iterated data byte(s) */
-        };
-
-
-        /*
-         *  ENTRY TABLE DEFINITIONS
-         */
-
-        /***ET+ b32_bundle - Entry Table */
-
-        struct b32_bundle
-        {
-            unsigned char       b32_cnt;        /* Number of entries in this bundle */
-            unsigned char       b32_type;       /* Bundle type */
-            unsigned short      b32_obj;        /* Object number */
-        };                                      /* Follows entry types */
-
-        struct e32_entry
-        {
-            unsigned char       e32_flags;      /* Entry point flags */
-            union entrykind
-            {
-                RELOC_OFS       e32_offset;     /* 16-bit/32-bit offset entry */
-                struct callgate
-                {
-                    unsigned short offset;      /* Offset in segment */
-                    unsigned short callgate;    /* Callgate selector */
-                }
-                                e32_callgate;   /* 286 (16-bit) call gate */
-                struct fwd
-                {
-                    unsigned short  modord;     /* Module ordinal number */
-                    unsigned long   value;      /* Proc name offset or ordinal */
-                }
-                                e32_fwd;        /* Forwarder */
-            }
-                                e32_variant;    /* Entry variant */
-        };
-
-
-
-        #define B32_CNT(x)      (x).b32_cnt
-        #define B32_TYPE(x)     (x).b32_type
-        #define B32_OBJ(x)      (x).b32_obj
-
-        #define E32_EFLAGS(x)   (x).e32_flags
-        #define E32_OFFSET16(x) (x).e32_variant.e32_offset.offset16
-        #define E32_OFFSET32(x) (x).e32_variant.e32_offset.offset32
-        #define E32_GATEOFF(x)  (x).e32_variant.e32_callgate.offset
-        #define E32_GATE(x)     (x).e32_variant.e32_callgate.callgate
-        #define E32_MODORD(x)   (x).e32_variant.e32_fwd.modord
-        #define E32_VALUE(x)    (x).e32_variant.e32_fwd.value
-
-        #define FIXENT16        3
-        #define FIXENT32        5
-        #define GATEENT16       5
-        #define FWDENT          7
-
-        /*
-         *  BUNDLE TYPES
-         */
-
-        #define EMPTY        0x00               /* Empty bundle */
-        #define ENTRY16      0x01               /* 16-bit offset entry point */
-        #define GATE16       0x02               /* 286 call gate (16-bit IOPL) */
-        #define ENTRY32      0x03               /* 32-bit offset entry point */
-        #define ENTRYFWD     0x04               /* Forwarder entry point */
-        #define TYPEINFO     0x80               /* Typing information present flag */
-
-
-        /*
-         *  Format for E32_EFLAGS(x)
-         *
-         *       7 6 5 4 3 2 1 0  - bit no
-         *       | | | | | | | |
-         *       | | | | | | | +--- exported entry
-         *       | | | | | | +----- uses shared data
-         *       +-+-+-+-+-+------- parameter word count
-         */
-
-        #define E32EXPORT       0x01            /* Exported entry */
-        #define E32SHARED       0x02            /* Uses shared data */
-        #define E32PARAMS       0xf8            /* Parameter word count mask */
-
-        /*
-         *  Flags for forwarders only:
-         */
-
-        #define FWD_ORDINAL     0x01            /* Imported by ordinal */
-
-
-        #pragma pack()       /* Restore default alignment */
-
-        /*end*/
-
-    #endif /* __EXE386__ */
-
-#endif
diff --git a/sal/osl/os2/helpers/dosh.h b/sal/osl/os2/helpers/dosh.h
deleted file mode 100644
index fe51ee9bc488..000000000000
--- a/sal/osl/os2/helpers/dosh.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*      This file Copyright (C) 1997-2006 Ulrich M�ller,
- *                                        Dmitry A. Steklenev.
- *      This file is part of the "XWorkplace helpers" source package.
- *
- *      2009-06-15 published under LGPL3 with Ulrich M�ller permission.
- *
- */
-
-#if __cplusplus
-extern "C" {
-#endif
-
-#ifndef DOSH_HEADER_INCLUDED
-    #define DOSH_HEADER_INCLUDED
-
-    CHAR doshQueryBootDrive(VOID);
-
-#endif
-
-#if __cplusplus
-}
-#endif
diff --git a/sal/osl/os2/helpers/except.h b/sal/osl/os2/helpers/except.h
deleted file mode 100644
index af303a9827e3..000000000000
--- a/sal/osl/os2/helpers/except.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
- *@@sourcefile except.h:
- *      header file for except.c. See remarks there.
- *
- *      Note: Version numbering in this file relates to XWorkplace version
- *            numbering.
- *
- *@@include #define INCL_DOSEXCEPTIONS
- *@@include #define INCL_DOSPROCESS
- *@@include #include <os2.h>
- *@@include #include <stdio.h>
- *@@include #include <setjmp.h>
- *@@include #include "helpers\except.h"
- */
-
-/*
- *      Copyright (C) 1999-2000 Ulrich M�ller.
- *
- *      2009-06-15 published under LGPL3 with Ulrich M�ller permission.
- *
- */
-
-#if __cplusplus
-extern "C" {
-#endif
-
-#ifndef EXCEPT_HEADER_INCLUDED
-    #define EXCEPT_HEADER_INCLUDED
-
-    #if defined __IBMCPP__ || defined __IBMC__
-        #ifndef INCL_DOSEXCEPTIONS
-            #error except.h requires INCL_DOSEXCEPTIONS to be defined.
-        #endif
-        #ifndef INCL_DOSPROCESS
-            #error except.h requires INCL_DOSPROCESS to be defined.
-        #endif
-
-        #ifndef __stdio_h
-            #error except.h requires stdio.h to be included.
-        #endif
-        #ifndef __setjmp_h
-            #error except.h requires setjmp.h to be included.
-        #endif
-    #endif
-
-    /********************************************************************
-     *
-     *   Declarations
-     *
-     ********************************************************************/
-
-    // forward declaration
-    typedef struct _EXCEPTIONREGISTRATIONRECORD2 *PEXCEPTIONREGISTRATIONRECORD2;
-
-    // "OnKill" function prototype for EXCEPTIONREGISTRATIONRECORD2
-    // added V0.9.0 (99-10-22) [umoeller]
-    // removed V0.9.7 (2000-12-08) [umoeller]
-    // typedef VOID APIENTRY FNEXCONKILL(PEXCEPTIONREGISTRATIONRECORD2);
-    // typedef FNEXCONKILL *PFNEXCONKILL;
-
-    /*
-     *@@ EXCEPTIONREGISTRATIONRECORD2:
-     *      replacement EXCEPTIONREGISTRATIONRECORD
-     *      struct for thread exception handling.
-     *
-     *@@changed V0.9.0 (99-10-22) [umoeller]: pfnOnKill added
-     *@@changed V0.9.0 (99-10-22) [umoeller]: renamed from REGREC2
-     */
-
-    typedef struct _EXCEPTIONREGISTRATIONRECORD2
-    {
-        PVOID           pNext;              // as in EXCEPTIONREGISTRATIONRECORD
-        PFN             pfnHandler;         // as in EXCEPTIONREGISTRATIONRECORD
-        jmp_buf         jmpThread;          // additional buffer for setjmp
-        EXCEPTIONREPORTRECORD err;          // exception handlers copy the report rec here
-        PVOID           pvUser;             // user ptr
-    } EXCEPTIONREGISTRATIONRECORD2;
-
-    /*
-     *@@ EXCEPTSTRUCT:
-     *      structure used with TRY_xxx macros.
-     */
-
-    typedef struct _EXCEPTSTRUCT
-    {
-        EXCEPTIONREGISTRATIONRECORD2 RegRec2;
-        ULONG                 ulExcpt;  // != NULL if exception caught
-        APIRET                arc;      // rc of DosSetExceptionHandler
-    } EXCEPTSTRUCT, *PEXCEPTSTRUCT;
-
-    // function prototypes for exception hooks (V0.9.0)
-
-    // "open traplog file" hook
-    typedef FILE* APIENTRY FNEXCOPENFILE(VOID);
-    typedef FNEXCOPENFILE *PFNEXCOPENFILE;
-
-    // "exception" hook
-    typedef VOID APIENTRY FNEXCHOOK(FILE*, PTIB, ULONG);  // V0.9.16 (2001-12-02) [pr]
-    typedef FNEXCHOOK *PFNEXCHOOK;
-
-    // "error" hook
-    typedef VOID APIENTRY FNEXCHOOKERROR(const char *pcszFile,
-                                         ULONG ulLine,
-                                         const char *pcszFunction,
-                                         APIRET arc);
-    typedef FNEXCHOOKERROR *PFNEXCHOOKERROR;
-
-    /********************************************************************
-     *
-     *   Prototypes
-     *
-     ********************************************************************/
-
-    VOID excExplainException(FILE *file,
-                                      PSZ pszHandlerName,
-                                      PEXCEPTIONREPORTRECORD pReportRec,
-                                      PCONTEXTRECORD pContextRec);
-
-    VOID excRegisterHooks(PFNEXCOPENFILE pfnExcOpenFileNew,
-                          PFNEXCHOOK pfnExcHookNew,
-                          PFNEXCHOOKERROR pfnExcHookError,
-                          BOOL fBeepOnExceptionNew);
-
-    ULONG _System excHandlerLoud(PEXCEPTIONREPORTRECORD pReportRec,
-                                 PEXCEPTIONREGISTRATIONRECORD2 pRegRec2,
-                                 PCONTEXTRECORD pContextRec,
-                                 PVOID pv);
-
-    ULONG _System excHandlerQuiet(PEXCEPTIONREPORTRECORD pReportRec,
-                                  PEXCEPTIONREGISTRATIONRECORD2 pRegRec2,
-                                  PCONTEXTRECORD pContextRec,
-                                  PVOID pv);
-
-    extern PFNEXCHOOKERROR G_pfnExcHookError;
-
-    extern ULONG G_ulExplainExceptionRunning;
-
-    /********************************************************************
-     *
-     *   Macros
-     *
-     ********************************************************************/
-
-    /* See except.c for explanations how to use these. */
-
-    #ifdef __NO_EXCEPTION_HANDLERS__
-        // exception handlers can completely be disabled
-        #define TRY_LOUD(excptstruct)
-    #else
-        #ifdef __NO_LOUD_EXCEPTION_HANDLERS__
-            #define TRY_LOUD(e) TRY_QUIET(e)
-        #else // __NO_LOUD_EXCEPTION_HANDLERS__
-        #define TRY_LOUD(excptstruct)                                           \
-                {                                                               \
-                    EXCEPTSTRUCT          excptstruct = {0};                    \
-                    excptstruct.RegRec2.pfnHandler = (PFN)excHandlerLoud;       \
-                    excptstruct.arc = DosSetExceptionHandler(                   \
-                                (PEXCEPTIONREGISTRATIONRECORD)&(excptstruct.RegRec2)); \
-                    if (excptstruct.arc)                                        \
-                        if (G_pfnExcHookError)                                  \
-                            G_pfnExcHookError(__FILE__, __LINE__, __FUNCTION__, excptstruct.arc);  \
-                        else                                                    \
-                            DosBeep(1000, 1000);                                \
-                    excptstruct.ulExcpt = setjmp(excptstruct.RegRec2.jmpThread); \
-                    if (excptstruct.ulExcpt == 0)                               \
-                    {
-
-        #endif // __NO_LOUD_EXCEPTION_HANDLERS__
-    #endif
-
-    #ifdef __NO_EXCEPTION_HANDLERS__
-        // exception handlers can completely be disabled
-        #define TRY_QUIET(excptstruct)
-    #else
-        #define TRY_QUIET(excptstruct)                                          \
-                {                                                               \
-                    EXCEPTSTRUCT          excptstruct = {0};                    \
-                    excptstruct.RegRec2.pfnHandler = (PFN)excHandlerQuiet;      \
-                    excptstruct.arc = DosSetExceptionHandler(                   \
-                                (PEXCEPTIONREGISTRATIONRECORD)&(excptstruct.RegRec2)); \
-                    if (excptstruct.arc)                                        \
-                        if (G_pfnExcHookError)                                  \
-                            G_pfnExcHookError(__FILE__, __LINE__, __FUNCTION__, excptstruct.arc);  \
-                        else                                                    \
-                            DosBeep(1000, 1000);                                \
-                    excptstruct.ulExcpt = setjmp(excptstruct.RegRec2.jmpThread); \
-                    if (excptstruct.ulExcpt == 0)                               \
-                    {
-
-    #endif
-
-    #ifdef __NO_EXCEPTION_HANDLERS__
-        // exception handlers can completely be disabled
-        #define CATCH(excptstruct) if (FALSE) {
-    #else
-        #define CATCH(excptstruct)                                              \
-                        DosUnsetExceptionHandler(                               \
-                                (PEXCEPTIONREGISTRATIONRECORD)&(excptstruct.RegRec2)); \
-                    } /* end of TRY block */                                    \
-                    else                                                        \
-                    { /* exception occured: */                                  \
-                        DosUnsetExceptionHandler((PEXCEPTIONREGISTRATIONRECORD)&(excptstruct.RegRec2));
-    #endif
-
-    #ifdef __NO_EXCEPTION_HANDLERS__
-        // exception handlers can completely be disabled
-        #define END_CATCH() }
-    #else
-        #define END_CATCH()                                                     \
-                    } /* end of exception-occured block */                      \
-                }
-    #endif
-
-    /*
-     * CRASH:
-     *      this macro is helpful for testing
-     *      the exception handlers.
-     *      This is not for general use. ;-)
-     */
-
-    #define CRASH {PSZ p = NULL; *p = 'a'; }
-
-#endif // EXCEPT_HEADER_INCLUDED
-
-#if __cplusplus
-}
-#endif
-
diff --git a/sal/osl/os2/helpers/setup.h b/sal/osl/os2/helpers/setup.h
deleted file mode 100644
index b9c6e50f0111..000000000000
--- a/sal/osl/os2/helpers/setup.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*
- *  setup.h:
- *      sample master include file which gets included
- *      from all helpers *.c sources.
- */
-
-#ifndef SETUP_HEADER_INCLUDED
-    #define SETUP_HEADER_INCLUDED
-
-    // XWPEXPORT defines the standard linkage for the
-    // XWorkplace helpers.
-    #ifdef __EMX__
-        #define XWPENTRY
-    #elif defined (__IBMCPP__) || defined (__IBMC__)
-        #define XWPENTRY _Optlink
-    #endif
-
-    /*************************************************************
-     *                                                           *
-     *   Additional stuff for EMX                                *
-     *                                                           *
-     *************************************************************/
-
-    #ifdef __EMX__
-        // EMX doesn't have all these 16-bit typedefs;
-        // added (99-10-22) [umoeller]
-        #define APIENTRY16  _Far16 _Pascal
-        #define PASCAL16    _Far16 _Pascal
-        #define CDECL16     _Far16 _Cdecl
-
-        typedef unsigned short APIRET16;
-        typedef unsigned long  APIRET32;
-
-#if 0
-//YD do not use with gcc 3.3.5
-        #define _System
-        #define APIENTRY
-            // with VAC++, this defines _System linkage, which
-            // EMX doesn't have, or does it?!?
-#endif // 0
-
-    #endif
-
-    // the following is a VAC++-specific macro, which doesn't exist
-    // with EMX, so we need to implement this... this was one of
-    // the "undefined symbols" we got (99-10-23) [umoeller]
-    // changed this to prefix underscore, because the STL apparently
-    // redefines this V0.9.3 (2000-05-15) [umoeller]
-    #define _min(a,b) ( ((a) > (b)) ? b : a )
-    #define _max(a,b) ( ((a) > (b)) ? a : b )
-
-    // Uncomment the following if you have trouble with the
-    // exception handlers in helpers\except.c; WarpIN will
-    // then install _no_ additional exception handlers at all
-    // (include\helpers\except.h reacts to these defines).
-    // I'm not sure if the handlers work well with EMX.
-
-    #ifdef __EMX__00
-        #define __NO_EXCEPTION_HANDLERS__
-    #endif
-
-    /*************************************************************
-     *                                                           *
-     *   Additional stuff for VAC++ 3.0                          *
-     *                                                           *
-     *************************************************************/
-
-    // all this added V0.9.2 (2000-03-10) [umoeller]
-    #if ( defined (  __IBMCPP__ ) && (  __IBMCPP__ < 400 ) )
-        typedef int bool;
-        #define true 1
-        #define false 0
-        #define _BooleanConst    // needed for some VAC headers, which define bool also
-    #endif
-
-    #ifndef __stdlib_h          // <stdlib.h>
-        #include <stdlib.h>
-    #endif
-    #ifndef __string_h          // <string.h>
-        #include <string.h>
-    #endif
-
-    /*************************************************************
-     *                                                           *
-     *   Debugging                                               *
-     *                                                           *
-     *************************************************************/
-
-    // All the following redone (99-10-23) [umoeller]:
-    // __DEBUG__ is defined as a macro on the compiler
-    // command line by the makefiles if DEBUG was enabled
-    // in \setup.in
-    #ifdef __DEBUG__
-
-        // with debug code, disable the exception handlers
-        #define __NO_EXCEPTION_HANDLERS__
-
-        // If the following is commented out, no PMPRINTF will be
-        // used at all. WarpIN uses Dennis Bareis' PMPRINTF
-        // package to do this.
-
-        // NOTE: We cannot use PmPrintf with EMX,
-        // because pmprintf.lib imports the VAC++ runtimes.
-        // That's the strange errors I was reporting yesterday.
-        #ifndef __EMX__
-            #ifdef OS2_INCLUDED
-                #define _PMPRINTF_
-                #include "helpers/pmprintf.h"
-            #endif
-        #endif
-    #endif
-
-    #ifndef _PMPRINTF_
-        // not defined: define empty macro so we don't
-        // get compiler errors
-        #define _Pmpf(x)
-    #endif
-
-#endif
-
diff --git a/sal/osl/os2/interlck.c b/sal/osl/os2/interlck.c
deleted file mode 100644
index 589005f215b9..000000000000
--- a/sal/osl/os2/interlck.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <386/builtin.h>
-
-#include "system.h"
-
-#include <osl/interlck.h>
-#include <osl/diagnose.h>
-
-/*****************************************************************************/
-/* osl_incrementInterlockedCount */
-/*****************************************************************************/
-oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
-{
-    return __atomic_increment_s32( pCount);
-}
-
-/*****************************************************************************/
-/* osl_decrementInterlockedCount */
-/*****************************************************************************/
-oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
-{
-    return __atomic_decrement_s32( pCount);
-}
-
-
diff --git a/sal/osl/os2/makefile.mk b/sal/osl/os2/makefile.mk
deleted file mode 100644
index c9bfd3f96771..000000000000
--- a/sal/osl/os2/makefile.mk
+++ /dev/null
@@ -1,118 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sal
-TARGET=cpposl
-USE_LDUMP2=TRUE
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=cont_pch
-PROJECTPCHSOURCE=cont_pch
-
-MULTITHREAD_OBJ=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# Uncomment the following line if you want to compile with -Wall 
-# it disables lots of unnecessary warnings comming from the Win32
-# header files (disabling warnings via command line only works with
-# MSVC >= 7.x)
-#
-# CFLAGS+=/wd4668 /wd4711 /wd4201 /wd4710 /wd4619 /wd4514 /wd4820
-
-# --- Files --------------------------------------------------------
-
-.IF "$(header)" == ""
-
-SLOFILES=   $(SLO)$/conditn.obj  \
-            $(SLO)$/diagnose.obj \
-            $(SLO)$/dllentry.obj \
-            $(SLO)$/semaphor.obj \
-            $(SLO)$/interlck.obj \
-            $(SLO)$/nlsupport.obj\
-            $(SLO)$/mutex.obj    \
-            $(SLO)$/module.obj   \
-            $(SLO)$/process.obj  \
-            $(SLO)$/time.obj     \
-            $(SLO)$/signal.obj   \
-            $(SLO)$/pipe.obj     \
-            $(SLO)$/util.obj     \
-            $(SLO)$/socket.obj   \
-            $(SLO)$/thread.obj   \
-            $(SLO)$/security.obj \
-            $(SLO)$/profile.obj  \
-            $(SLO)$/tempfile.obj  \
-        $(SLO)$/process_impl.obj\
-        $(SLO)$/uunxapi.obj\
-        $(SLO)$/file.obj     \
-        $(SLO)$/file_url.obj \
-        $(SLO)$/file_error_transl.obj \
-        $(SLO)$/file_path_helper.obj \
-        $(SLO)$/debug.obj \
-        $(SLO)$/except.obj \
-        $(SLO)$/salinit.obj
-
-OBJFILES=   $(OBJ)$/conditn.obj  \
-            $(OBJ)$/diagnose.obj \
-            $(OBJ)$/libutil.obj  \
-            $(OBJ)$/semaphor.obj \
-            $(OBJ)$/interlck.obj \
-            $(OBJ)$/nlsupport.obj\
-            $(OBJ)$/mutex.obj    \
-            $(OBJ)$/module.obj   \
-            $(OBJ)$/process.obj  \
-            $(OBJ)$/time.obj     \
-            $(OBJ)$/signal.obj   \
-            $(OBJ)$/pipe.obj     \
-            $(OBJ)$/util.obj     \
-            $(OBJ)$/socket.obj   \
-            $(OBJ)$/thread.obj   \
-            $(OBJ)$/security.obj \
-            $(OBJ)$/profile.obj  \
-            $(OBJ)$/tempfile.obj  \
-        $(OBJ)$/process_impl.obj\
-        $(OBJ)$/uunxapi.obj\
-        $(OBJ)$/file.obj     \
-        $(OBJ)$/file_url.obj \
-        $(OBJ)$/file_error_transl.obj \
-        $(OBJ)$/file_path_helper.obj \
-        $(OBJ)$/debug.obj \
-        $(OBJ)$/except.obj \
-        $(SLO)$/salinit.obj
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
diff --git a/sal/osl/os2/module.c b/sal/osl/os2/module.c
deleted file mode 100644
index 421b78195d83..000000000000
--- a/sal/osl/os2/module.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "system.h"
-
-#include <osl/module.h>
-#include <osl/diagnose.h>
-#include <osl/file.h>
-#include <osl/thread.h>
-
-#include <stdlib.h>
-
-int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
-
-// static data for holding SAL dll module and full path
-static HMODULE hModSal;
-static char szSalDir[ _MAX_PATH];
-static char szSalDrive[ _MAX_PATH];
-
-/*****************************************************************************/
-/* osl_loadModule */
-/*****************************************************************************/
-
-ULONG APIENTRY _DosLoadModule (PSZ pszObject, ULONG uObjectLen, PCSZ pszModule,
-    PHMODULE phmod)
-{
-    APIRET  rc;
-    rc = DosLoadModule( pszObject, uObjectLen, pszModule, phmod);
-    // YD 22/05/06 issue again if first call fails (why?)
-    if (rc == ERROR_INVALID_PARAMETER)
-        rc = DosLoadModule( pszObject, uObjectLen, pszModule, phmod);
-    return rc;
-}
-
-oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMode)
-{
-    HMODULE hModule;
-    BYTE szErrorMessage[256];
-    APIRET rc;
-    oslModule pModule=0;
-    rtl_uString* ustrTmp = NULL;
-
-    OSL_ENSURE(ustrModuleName,"osl_loadModule : string is not valid");
-
-    /* ensure ustrTmp hold valid string */
-    if( osl_File_E_None != osl_getSystemPathFromFileURL( ustrModuleName, &ustrTmp ) )
-        rtl_uString_assign( &ustrTmp, ustrModuleName );
-
-    if( ustrTmp )
-    {
-        char buffer[PATH_MAX];
-
-        if( UnicodeToText( buffer, PATH_MAX, ustrTmp->buffer, ustrTmp->length ) )
-        {
-            char drive[_MAX_DRIVE], dir[_MAX_DIR];
-            char fname[_MAX_FNAME], ext[_MAX_EXT];
-            char* dot;
-            // 21/02/2006 YD dll names must be 8.3: since .uno.dll files
-            // have hardcoded names, I'm truncating names here and also in
-            // the build system
-            _splitpath (buffer, drive, dir, fname, ext);
-            if (strlen(fname)>8)
-                fname[8] = 0;   // truncate to 8.3
-            dot = strchr( fname, '.');
-            if (dot)
-                *dot = '\0';    // truncate on dot
-            // if drive is not specified, remove starting \ from dir name
-            // so dll is loaded from LIBPATH
-            if (drive[0] == 0 && dir[0] == '\\' && dir[1] == '\\') {
-                while( dir[0] == '\\')
-                    strcpy( dir, dir+1);
-            }
-            _makepath( buffer, drive, dir, fname, ext);
-
-            rc = _DosLoadModule( szErrorMessage, sizeof( szErrorMessage), (PCSZ)buffer, &hModule);
-            if (rc == NO_ERROR )
-                pModule = (oslModule)hModule;
-            else
-            {
-                if (rc == NO_ERROR )
-                    pModule = (oslModule)hModule;
-                else
-                {
-                    sal_Char szError[ PATH_MAX*2 ];
-                    sprintf( szError, "Module: %s; rc: %d;\nReason: %s;\n"
-                            "Please contact technical support and report above informations.\n\n",
-                            buffer, rc, szErrorMessage );
-#if OSL_DEBUG_LEVEL>0
-                    fprintf( stderr, szError);
-#endif
-                    //OSL_TRACE(szError);
-#ifndef OSL_DEBUG_LEVEL
-                    WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
-                        szError, "Critical error: DosLoadModule failed",
-                        0, MB_ERROR | MB_OK | MB_MOVEABLE);
-#endif
-                }
-            }
-        }
-    }
-
-    rtl_uString_release( ustrTmp );
-
-    return pModule;
-}
-
-/*****************************************************************************/
-/* osl_getModuleHandle */
-/*****************************************************************************/
-
-sal_Bool SAL_CALL
-osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
-{
-    HMODULE hmod;
-    APIRET  rc;
-    rc = DosQueryModuleHandle(pModuleName->buffer, &hmod);
-    if( rc == NO_ERROR)
-    {
-        *pResult = (oslModule) hmod;
-        return sal_True;
-    }
-
-    return sal_False;
-}
-
-/*****************************************************************************/
-/* osl_unloadModule */
-/*****************************************************************************/
-void SAL_CALL osl_unloadModule(oslModule Module)
-{
-#if OSL_DEBUG_LEVEL>0
-    if (!Module)
-       fprintf( stderr, "osl_unloadModule NULL HANDLE.\n");
-#endif
-
-    DosFreeModule((HMODULE)Module);
-}
-
-/*****************************************************************************/
-/* osl_getSymbol */
-/*****************************************************************************/
-void* SAL_CALL
-osl_getSymbol(oslModule Module, rtl_uString* pSymbolName)
-{
-    return (void *) osl_getFunctionSymbol(Module, pSymbolName);
-}
-
-/*****************************************************************************/
-/* osl_getFunctionSymbol */
-/*****************************************************************************/
-oslGenericFunction SAL_CALL osl_getFunctionSymbol( oslModule Module, rtl_uString *strSymbolName )
-{
-    rtl_String *symbolName = NULL;
-    oslGenericFunction address;
-
-    OSL_ASSERT(Module);
-    OSL_ASSERT(strSymbolName);
-
-    rtl_uString2String(
-        &symbolName,
-        strSymbolName->buffer,
-        strSymbolName->length,
-        RTL_TEXTENCODING_UTF8,
-        OUSTRING_TO_OSTRING_CVTFLAGS
-    );
-
-    address=osl_getAsciiFunctionSymbol(Module, rtl_string_getStr(symbolName));
-    rtl_string_release(symbolName);
-
-    return address;
-}
-
-/*****************************************************************************/
-/* osl_getAsciiFunctionSymbol */
-/*****************************************************************************/
-oslGenericFunction SAL_CALL
-osl_getAsciiFunctionSymbol( oslModule Module, const sal_Char *pSymbol )
-{
-    PFN  pFunction;
-    APIRET rc;
-    void* pHandle=0;
-
-    OSL_ENSURE(Module,"osl_getSymbol : module handle is not valid");
-    OSL_ENSURE(Module,"osl_getSymbol : ustrSymbolName");
-
-    if ( Module!= 0 && pSymbol != 0 )
-    {
-
-        rc = DosQueryProcAddr( (HMODULE) Module, 0, (PCSZ)pSymbol, &pFunction );
-        if( rc == NO_ERROR )
-        {
-            pHandle = (void*)pFunction;
-        }
-        else
-        {
-            // YD try again adding the '_' prefix
-            char _pszSymbolName[255];
-            strcpy( _pszSymbolName, "_");
-            strcat( _pszSymbolName, pSymbol);
-            rc = DosQueryProcAddr( (HMODULE) Module, 0, (PCSZ)_pszSymbolName, &pFunction );
-            if( rc == NO_ERROR )
-                pHandle = (void*)pFunction;
-        }
-
-    }
-
-    return pHandle;
-}
-
-/*****************************************************************************/
-/* osl_getModuleURLFromAddress */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibraryUrl)
-{
-    //APIRET APIENTRY DosQueryModFromEIP (HMODULE *phMod, ULONG *pObjNum,
-    //          ULONG BuffLen, PCHAR pBuff, ULONG *pOffset, ULONG Address)
-    HMODULE hMod;
-    ULONG   ObjNum;
-    CHAR    Buff[2*_MAX_PATH];
-    ULONG   Offset;
-    APIRET  rc;
-
-    // get module handle (and name)
-    rc = DosQueryModFromEIP( &hMod, &ObjNum, sizeof( Buff), Buff, &Offset, (ULONG)addr);
-    if (rc)
-        return sal_False;
-
-    // get module full path
-    rc = DosQueryModuleName( hMod, sizeof( Buff), Buff);
-    if (rc)
-        return sal_False;
-
-#if OSL_DEBUG_LEVEL > 1
-    OSL_TRACE("module.c::osl_getModuleURLFromAddress - %s\n", Buff);
-#endif
-
-    // convert to URL
-    rtl_uString *ustrSysPath = NULL;
-    rtl_string2UString( &ustrSysPath, Buff, strlen(Buff), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
-    OSL_ASSERT(ustrSysPath != NULL);
-    osl_getFileURLFromSystemPath( ustrSysPath, ppLibraryUrl );
-    rtl_uString_release( ustrSysPath );
-
-    return sal_True;
-}
-
-/*****************************************************************************/
-/* osl_getModuleURLFromFunctionAddress */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_getModuleURLFromFunctionAddress( oslGenericFunction addr, rtl_uString ** ppLibraryUrl )
-{
-    return osl_getModuleURLFromAddress( ( void * )addr, ppLibraryUrl );
-}
-
-/*****************************************************************************/
-
diff --git a/sal/osl/os2/mutex.c b/sal/osl/os2/mutex.c
deleted file mode 100644
index e86b3f965608..000000000000
--- a/sal/osl/os2/mutex.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <sys/fmutex.h>
-
-#include "system.h"
-
-#include <osl/mutex.h>
-#include <osl/diagnose.h>
-
-/*
-    Implementation notes:
-    The void* hidden by oslMutex points to an OS/2 mutex semaphore.
-*/
-typedef struct _oslMutexImpl {
-    HMTX                m_Mutex;
-    int                 m_Locks;
-    ULONG               m_Owner;
-    ULONG               m_Requests;
-} oslMutexImpl;
-
-// static mutex to control access to private members of oslMutexImpl
-static HMTX MutexLock = 0;
-
-/*****************************************************************************/
-/* osl_createMutex */
-/*****************************************************************************/
-oslMutex SAL_CALL osl_createMutex()
-{
-    oslMutexImpl *pMutexImpl;
-    HMTX hMutex;
-    APIRET rc;
-
-    pMutexImpl= (oslMutexImpl*)calloc(sizeof(oslMutexImpl), 1);
-    OSL_ASSERT(pMutexImpl); /* alloc successful? */
-
-    /* create semaphore */
-    rc = DosCreateMutexSem( NULL, &pMutexImpl->m_Mutex, 0, FALSE );
-    if( rc != 0 )
-    {
-        free(pMutexImpl);
-        return NULL;
-    }
-
-    // create static mutex for private members
-    if (MutexLock == 0)
-        DosCreateMutexSem( NULL, &MutexLock, 0, FALSE );
-
-    return (oslMutex)pMutexImpl;
-}
-
-/*****************************************************************************/
-/* osl_destroyMutex */
-/*****************************************************************************/
-void SAL_CALL osl_destroyMutex(oslMutex Mutex)
-{
-    oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
-    if (pMutexImpl)
-    {
-        DosCloseMutexSem( pMutexImpl->m_Mutex);
-        free(pMutexImpl);
-    }
-}
-
-/*****************************************************************************/
-/* osl_acquireMutex */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_acquireMutex(oslMutex Mutex)
-{
-    oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
-    APIRET rc = 0;
-    OSL_ASSERT(Mutex);
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-    pMutexImpl->m_Requests++;
-    DosReleaseMutexSem( MutexLock);
-
-    rc = DosRequestMutexSem( pMutexImpl->m_Mutex, SEM_INDEFINITE_WAIT );
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-    pMutexImpl->m_Requests--;
-    if (pMutexImpl->m_Locks++ == 0)
-        pMutexImpl->m_Owner = _gettid();
-    DosReleaseMutexSem( MutexLock);
-
-    return( rc == 0 );
-}
-
-/*****************************************************************************/
-/* osl_tryToAcquireMutex */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex Mutex)
-{
-    sal_Bool     ret = sal_False;
-    oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
-    OSL_ASSERT(Mutex);
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-    if ( ((pMutexImpl->m_Requests == 0) && (pMutexImpl->m_Locks == 0)) ||
-         (pMutexImpl->m_Owner == _gettid()) )
-        ret = osl_acquireMutex(Mutex);
-
-    DosReleaseMutexSem( MutexLock);
-
-    return ret;
-}
-
-/*****************************************************************************/
-/* osl_releaseMutex */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_releaseMutex(oslMutex Mutex)
-{
-    oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
-    APIRET rc;
-    OSL_ASSERT(Mutex);
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-    if (--(pMutexImpl->m_Locks) == 0)
-        pMutexImpl->m_Owner = 0;
-
-    DosReleaseMutexSem( MutexLock);
-
-    rc = DosReleaseMutexSem( pMutexImpl->m_Mutex);
-
-    return sal_True;
-}
-
-
-
-/*****************************************************************************/
-/* osl_getGlobalMutex */
-/*****************************************************************************/
-
-oslMutex g_Mutex = NULL;
-
-oslMutex * SAL_CALL osl_getGlobalMutex(void)
-{
-    if (g_Mutex == NULL)
-        g_Mutex = osl_createMutex();
-    return &g_Mutex;
-}
diff --git a/sal/osl/os2/nlsupport.c b/sal/osl/os2/nlsupport.c
deleted file mode 100644
index ab00443e57d7..000000000000
--- a/sal/osl/os2/nlsupport.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define INCL_WIN
-#include "svpm.h"
-
-#include <osl/nlsupport.h>
-#include <osl/diagnose.h>
-#include <osl/process.h>
-#include <rtl/memory.h>
-
-#include <string.h>
-
-/*****************************************************************************
- typedefs
- *****************************************************************************/
-
-
-typedef struct {
-    const char              *key;
-    const rtl_TextEncoding   value;
-} _pair;
-
-
-/*****************************************************************************
- compare function for binary search
- *****************************************************************************/
-
-static int
-_pair_compare (const char *key, const _pair *pair)
-{
-    int result = rtl_str_compareIgnoreAsciiCase( key, pair->key );
-    return result;
-}
-
-/*****************************************************************************
- binary search on encoding tables
- *****************************************************************************/
-
-static const _pair*
-_pair_search (const char *key, const _pair *base, unsigned int member )
-{
-    unsigned int lower = 0;
-    unsigned int upper = member;
-    unsigned int current;
-    int comparison;
-
-    /* check for validity of input */
-    if ( (key == NULL) || (base == NULL) || (member == 0) )
-        return NULL;
-
-    /* binary search */
-    while ( lower < upper )
-    {
-        current = (lower + upper) / 2;
-        comparison = _pair_compare( key, base + current );
-        if (comparison < 0)
-            upper = current;
-        else if (comparison > 0)
-            lower = current + 1;
-        else
-            return base + current;
-    }
-
-    return NULL;
-}
-
-
-/*****************************************************************************
- convert rtl_Locale to locale string
- *****************************************************************************/
-
-static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n )
-{
-    /* check if a valid locale is specified */
-    if( pLocale && pLocale->Language && (pLocale->Language->length == 2) )
-    {
-        size_t offset = 0;
-
-        /* convert language code to ascii */
-        {
-            rtl_String *pLanguage = NULL;
-
-            rtl_uString2String( &pLanguage,
-                pLocale->Language->buffer, pLocale->Language->length,
-                RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-
-            if( pLanguage->length < n )
-            {
-                strcpy( buffer, pLanguage->buffer );
-                offset = pLanguage->length;
-            }
-
-            rtl_string_release( pLanguage );
-        }
-
-        /* convert country code to ascii */
-        if( pLocale->Country && (pLocale->Country->length == 2) )
-        {
-            rtl_String *pCountry = NULL;
-
-            rtl_uString2String( &pCountry,
-                pLocale->Country->buffer, pLocale->Country->length,
-                RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-
-            if( offset + pCountry->length + 1 < n )
-            {
-                strcpy( buffer + offset++, "_" );
-                strcpy( buffer + offset, pCountry->buffer );
-                offset += pCountry->length;
-            }
-
-            rtl_string_release( pCountry );
-        }
-
-        /* convert variant to ascii - check if there is enough space for the variant string */
-        if( pLocale->Variant && pLocale->Variant->length &&
-            ( pLocale->Variant->length < n - 6 ) )
-        {
-            rtl_String *pVariant = NULL;
-
-            rtl_uString2String( &pVariant,
-                pLocale->Variant->buffer, pLocale->Variant->length,
-                RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-
-            if( offset + pVariant->length + 1 < n )
-            {
-                strcpy( buffer + offset, pVariant->buffer );
-                offset += pVariant->length;
-            }
-
-            rtl_string_release( pVariant );
-        }
-
-        return buffer;
-    }
-
-    return NULL;
-}
-
-/*****************************************************************************
- convert locale string to rtl_Locale
- *****************************************************************************/
-
-static rtl_Locale * _parse_locale( const char * locale )
-{
-    static sal_Unicode c_locale[2] = { (sal_Unicode) 'C', 0 };
-
-    /* check if locale contains a valid string */
-    if( locale )
-    {
-        size_t len = strlen( locale );
-
-        if( len >= 2 )
-        {
-            rtl_uString * pLanguage = NULL;
-            rtl_uString * pCountry  = NULL;
-            rtl_uString * pVariant  = NULL;
-
-            size_t offset = 2;
-
-            /* convert language code to unicode */
-            rtl_string2UString( &pLanguage, locale, 2, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS );
-            OSL_ASSERT(pLanguage != NULL);
-
-            /* convert country code to unicode */
-            if( len >= 5 && '_' == locale[2] )
-            {
-                rtl_string2UString( &pCountry, locale + 3, 2, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS );
-                OSL_ASSERT(pCountry != NULL);
-                offset = 5;
-            }
-
-            /* convert variant code to unicode - do not rely on "." as delimiter */
-            if( len > offset ) {
-                rtl_string2UString( &pVariant, locale + offset, len - offset, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS );
-                OSL_ASSERT(pVariant != NULL);
-            }
-
-            rtl_Locale * ret =  rtl_locale_register( pLanguage->buffer, pCountry ? pCountry->buffer : c_locale + 1, pVariant ? pVariant->buffer : c_locale + 1 );
-
-            if (pVariant) rtl_uString_release(pVariant);
-            if (pCountry) rtl_uString_release(pCountry);
-            if (pLanguage) rtl_uString_release(pLanguage);
-
-            return ret;
-        }
-        else
-            return rtl_locale_register( c_locale, c_locale + 1, c_locale + 1 );
-    }
-
-    return NULL;
-}
-
-/*
- * This implementation of osl_getTextEncodingFromLocale maps
- * from the ISO language codes.
- */
-
-const _pair _full_locale_list[] = {
-    { "ja_JP.eucJP",  RTL_TEXTENCODING_EUC_JP      },
-    { "ja_JP.EUC",    RTL_TEXTENCODING_EUC_JP      },
-    { "ko_KR.EUC",    RTL_TEXTENCODING_EUC_KR      },
-    { "zh_CN.EUC",    RTL_TEXTENCODING_EUC_CN      },
-    { "zh_TW.EUC",    RTL_TEXTENCODING_EUC_TW      }
-};
-
-const _pair _locale_extension_list[] = {
-    { "big5",         RTL_TEXTENCODING_BIG5        },
-    { "big5hk",       RTL_TEXTENCODING_BIG5_HKSCS  },
-    { "gb18030",      RTL_TEXTENCODING_GB_18030    },
-    { "euc",          RTL_TEXTENCODING_EUC_JP      },
-    { "iso8859-1",    RTL_TEXTENCODING_ISO_8859_1  },
-    { "iso8859-10",   RTL_TEXTENCODING_ISO_8859_10 },
-    { "iso8859-13",   RTL_TEXTENCODING_ISO_8859_13 },
-    { "iso8859-14",   RTL_TEXTENCODING_ISO_8859_14 },
-    { "iso8859-15",   RTL_TEXTENCODING_ISO_8859_15 },
-    { "iso8859-2",    RTL_TEXTENCODING_ISO_8859_2  },
-    { "iso8859-3",    RTL_TEXTENCODING_ISO_8859_3  },
-    { "iso8859-4",    RTL_TEXTENCODING_ISO_8859_4  },
-    { "iso8859-5",    RTL_TEXTENCODING_ISO_8859_5  },
-    { "iso8859-6",    RTL_TEXTENCODING_ISO_8859_6  },
-    { "iso8859-7",    RTL_TEXTENCODING_ISO_8859_7  },
-    { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
-    { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
-    { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
-    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
-    { "pck",          RTL_TEXTENCODING_MS_932      },
-#if (0)
-    { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },
-#endif
-    { "utf-16",       RTL_TEXTENCODING_UNICODE     },
-    { "utf-7",        RTL_TEXTENCODING_UTF7        },
-    { "utf-8",        RTL_TEXTENCODING_UTF8        }
-};
-
-const _pair _iso_language_list[] = {
-    { "af",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "ar",  RTL_TEXTENCODING_ISO_8859_6 },
-    { "az",  RTL_TEXTENCODING_ISO_8859_9 },
-    { "be",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "bg",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "ca",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "cs",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "da",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "de",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "el",  RTL_TEXTENCODING_ISO_8859_7 },
-    { "en",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "es",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "et",  RTL_TEXTENCODING_ISO_8859_4 },
-    { "eu",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "fa",  RTL_TEXTENCODING_ISO_8859_6 },
-    { "fi",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "fo",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "fr",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "gr",  RTL_TEXTENCODING_ISO_8859_7 },
-    { "he",  RTL_TEXTENCODING_ISO_8859_8 },
-    { "hi",  RTL_TEXTENCODING_DONTKNOW },
-    { "hr",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "hu",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "hy",  RTL_TEXTENCODING_DONTKNOW },
-    { "id",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "is",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "it",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "iw",  RTL_TEXTENCODING_ISO_8859_8 },
-    { "ja",  RTL_TEXTENCODING_EUC_JP },
-    { "ka",  RTL_TEXTENCODING_DONTKNOW },
-    { "kk",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "ko",  RTL_TEXTENCODING_EUC_KR },
-    { "lt",  RTL_TEXTENCODING_ISO_8859_4 },
-    { "lv",  RTL_TEXTENCODING_ISO_8859_4 },
-    { "mk",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "mr",  RTL_TEXTENCODING_DONTKNOW },
-    { "ms",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "nl",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "no",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "pl",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "pt",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "ro",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "ru",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "sa",  RTL_TEXTENCODING_DONTKNOW },
-    { "sk",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "sl",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "sq",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "sv",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "sw",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "ta",  RTL_TEXTENCODING_DONTKNOW },
-    { "th",  RTL_TEXTENCODING_DONTKNOW },
-    { "tr",  RTL_TEXTENCODING_ISO_8859_9 },
-    { "tt",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "uk",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "ur",  RTL_TEXTENCODING_ISO_8859_6 },
-    { "uz",  RTL_TEXTENCODING_ISO_8859_9 },
-    { "vi",  RTL_TEXTENCODING_DONTKNOW },
-    { "zh",  RTL_TEXTENCODING_BIG5 }
-};
-
-/*****************************************************************************
- return the text encoding corresponding to the given locale
- *****************************************************************************/
-
-rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
-{
-    const _pair *language = 0;
-    char locale_buf[64] = "";
-    char *cp;
-
-    WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
-        "Please contact technical support and report above informations.\n\n",
-        "Critical error: osl_getTextEncodingFromLocale",
-        0, MB_ERROR | MB_OK | MB_MOVEABLE);
-
-    /* default to process locale if pLocale == NULL */
-    if( NULL == pLocale )
-        osl_getProcessLocale( &pLocale );
-
-    /* convert rtl_Locale to locale string */
-    if( _compose_locale( pLocale, locale_buf, 64 ) )
-    {
-        /* check special handling list (EUC) first */
-        const unsigned int members = sizeof( _full_locale_list ) / sizeof( _pair );
-        language = _pair_search( locale_buf, _full_locale_list, members);
-
-        if( NULL == language )
-        {
-            /*
-             *  check if there is a charset qualifier at the end of the given locale string
-             *  e.g. de.ISO8859-15 or de.ISO8859-15@euro which strongly indicates what
-             *  charset to use
-             */
-            cp = strrchr( locale_buf, '.' );
-
-            if( NULL != cp )
-            {
-                const unsigned int members = sizeof( _locale_extension_list ) / sizeof( _pair );
-                language = _pair_search( cp + 1, _locale_extension_list, members);
-            }
-        }
-
-        /* use iso language code to determine the charset */
-        if( NULL == language )
-        {
-            const unsigned int members = sizeof( _iso_language_list ) / sizeof( _pair );
-
-            /* iso lang codes have 2 charaters */
-            locale_buf[2] = '\0';
-
-            language = _pair_search( locale_buf, _iso_language_list, members);
-        }
-    }
-
-    /* a matching item in our list provides a mapping from codeset to
-     * rtl-codeset */
-    if ( language != NULL )
-        return language->value;
-
-    return RTL_TEXTENCODING_DONTKNOW;
-}
-
-/*****************************************************************************
- return the current process locale
- *****************************************************************************/
-
-void _imp_getProcessLocale( rtl_Locale ** ppLocale )
-{
-    /* simulate behavior off setlocale */
-    char * locale = getenv( "LC_ALL" );
-
-    if( NULL == locale )
-        locale = getenv( "LC_CTYPE" );
-
-    if( NULL == locale )
-        locale = getenv( "LANG" );
-
-    if( NULL == locale )
-        locale = "C";
-
-    *ppLocale = _parse_locale( locale );
-}
-
-/*****************************************************************************
- set the current process locale
- *****************************************************************************/
-
-int _imp_setProcessLocale( rtl_Locale * pLocale )
-{
-    char locale_buf[64];
-
-    /* convert rtl_Locale to locale string */
-    if( NULL != _compose_locale( pLocale, locale_buf, 64 ) )
-    {
-        /* only change env vars that exist already */
-        if( getenv( "LC_ALL" ) ) {
-#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( __EMX__ )
-            setenv( "LC_ALL", locale_buf, 1);
-#else
-            setenv( "LC_ALL", locale_buf );
-#endif
-        }
-
-        if( getenv( "LC_CTYPE" ) ) {
-#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( __EMX__ )
-            setenv("LC_CTYPE", locale_buf, 1 );
-#else
-            setenv( "LC_CTYPE", locale_buf );
-#endif
-        }
-
-        if( getenv( "LANG" ) ) {
-#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( __EMX__ )
-            setenv("LC_CTYPE", locale_buf, 1 );
-#else
-            setenv( "LANG", locale_buf );
-#endif
-        }
-    }
-
-    return 0;
-}
-
-
diff --git a/sal/osl/os2/path_helper.cxx b/sal/osl/os2/path_helper.cxx
deleted file mode 100644
index 6425927a0021..000000000000
--- a/sal/osl/os2/path_helper.cxx
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*******************************************************************
- Includes
- ******************************************************************/
-
-#include "path_helper.hxx"
-#include <osl/diagnose.h>
-#include <rtl/ustring.hxx>
-
-#include <algorithm>
-#include <wchar.h>
-#include <wctype.h>
-
-/*******************************************************************
- Constants
- ******************************************************************/
-
-const rtl::OUString BACKSLASH = rtl::OUString::createFromAscii("\\");
-const rtl::OUString SLASH     = rtl::OUString::createFromAscii("/");
-
-/*******************************************************************
- osl_systemPathEnsureSeparator
- ******************************************************************/
-
-void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
-{
-    OSL_PRECOND(ppustrPath && (NULL != *ppustrPath), \
-                "osl_systemPathEnsureSeparator: Invalid parameter");
-
-     rtl::OUString path(*ppustrPath);
-    sal_Int32     i = std::max<sal_Int32>(path.lastIndexOf(BACKSLASH), path.lastIndexOf(SLASH));
-
-    if (i < (path.getLength()-1))
-    {
-        path += BACKSLASH;
-        rtl_uString_assign(ppustrPath, path.pData);
-    }
-
-    OSL_POSTCOND(path.lastIndexOf(BACKSLASH) == (path.getLength() - 1), \
-                 "osl_systemPathEnsureSeparator: Post condition failed");
-}
-
-/*******************************************************************
- osl_systemPathRemoveSeparator
- ******************************************************************/
-
-void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
-{
-    rtl::OUString path(*ppustrPath);
-
-    if (!osl::systemPathIsLogicalDrivePattern(path))
-    {
-        sal_Int32 i = std::max<sal_Int32>(path.lastIndexOf(BACKSLASH), path.lastIndexOf(SLASH));
-
-        if (i > -1 && (i == (path.getLength() - 1)))
-        {
-            path = rtl::OUString(path.getStr(), path.getLength() - 1);
-            rtl_uString_assign(ppustrPath, path.pData);
-        }
-    }
-}
-
-/*******************************************************************
- osl_is_logical_drive_pattern
- ******************************************************************/
-
-// is [A-Za-z]:[/|\]\0
-const sal_Unicode* LDP                    = L":";
-const sal_Unicode* LDP_WITH_BACKSLASH     = L":\\";
-const sal_Unicode* LDP_WITH_SLASH         = L":/";
-
-// degenerated case returned by the Windows FileOpen dialog
-// when someone enters for instance "x:filename", the Win32
-// API accepts this case
-const sal_Unicode* LDP_WITH_DOT_BACKSLASH = L":.\\";
-
-sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPath)
-{
-    const sal_Unicode* p = rtl_uString_getStr(const_cast<rtl_uString*>(pustrPath));
-    if (iswalpha(*p++))
-    {
-        return ((0 == wcscmp(p, LDP)) ||
-                (0 == wcscmp(p, LDP_WITH_BACKSLASH)) ||
-                (0 == wcscmp(p, LDP_WITH_SLASH)) ||
-                (0 == wcscmp(p, LDP_WITH_DOT_BACKSLASH)));
-    }
-    return 0;
-}
-
-
diff --git a/sal/osl/os2/path_helper.h b/sal/osl/os2/path_helper.h
deleted file mode 100644
index 79341f538667..000000000000
--- a/sal/osl/os2/path_helper.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _PATH_HELPER_H_
-#define _PATH_HELPER_H_
-
-#include <sal/types.h>
-#include <rtl/ustring.h>
-#include <osl/file.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/*******************************************************************
- osl_systemPathEnsureSeparator
- Adds a trailing path separator to the given system path if not
- already there and if the path is not the root path or a logical
- drive alone
- ******************************************************************/
-
-void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath);
-
-/*******************************************************************
- osl_systemPathRemoveSeparator
- Removes the last separator from the given system path if any and
- if the path is not the root path '\'
- ******************************************************************/
-
-void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath);
-
-/*******************************************************************
- osl_is_logical_drive_pattern
- Returns whether a given path is only a logical drive pattern or not.
- A logical drive pattern is something like "a:\", "c:\".
- No logical drive pattern is something like "c:\test"
- ******************************************************************/
-
-sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPath);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/sal/osl/os2/path_helper.hxx b/sal/osl/os2/path_helper.hxx
deleted file mode 100644
index 8a301431f610..000000000000
--- a/sal/osl/os2/path_helper.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// YD #pragma warning (disable : 4800)
-
-#ifndef _PATH_HELPER_HXX_
-#define _PATH_HELPER_HXX_
-
-#include "path_helper.h"
-#include <rtl/ustring.hxx>
-
-namespace osl
-{
-
-/*******************************************************************
- osl_systemPathEnsureSeparator
- Adds a trailing path separator to the given system path if not
- already there and if the path is not the root path or a logical
- drive alone
- ******************************************************************/
-
-inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
-{
-    osl_systemPathEnsureSeparator(&Path.pData);
-}
-
-/*******************************************************************
- osl_systemPathRemoveSeparator
- Removes the last separator from the given system path if any and
- if the path is not the root path '\'
- ******************************************************************/
-
-inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
-{
-    osl_systemPathRemoveSeparator(&Path.pData);
-}
-
-/*******************************************************************
- osl_systemPathIsLogicalDrivePattern
- ******************************************************************/
-
-inline bool systemPathIsLogicalDrivePattern(/*in*/ const rtl::OUString& path)
-{
-    return osl_systemPathIsLogicalDrivePattern(path.pData);
-}
-
-} // end namespace osl
-
-#endif
diff --git a/sal/osl/os2/pipe.cxx b/sal/osl/os2/pipe.cxx
deleted file mode 100644
index 20db94bda9eb..000000000000
--- a/sal/osl/os2/pipe.cxx
+++ /dev/null
@@ -1,555 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-//#define INCL_DOSERRORS
-#include "system.h"
-
-#include <osl/pipe.h>
-#include <osl/diagnose.h>
-#include <osl/thread.h>
-#include <osl/mutex.h>
-#include <osl/semaphor.h>
-#include <osl/conditn.h>
-#include <osl/interlck.h>
-#include <osl/process.h>
-#include <rtl/ustring.hxx>
-
-#define PIPENAMEMASK    "OSL_PIPE_%s"
-#define SECPIPENAMEMASK "OSL_PIPE_%s_%s"
-
-typedef enum {
-    MSG_SYN,
-    MSG_FIN,
-    MSG_DATA,
-    MSG_UNKNOWN
-} MessageType;
-
-struct oslPipeImpl {
-    oslInterlockedCount m_Reference;
-    HPIPE               hPipe;
-    HMTX                m_NamedObject;
-    APIRET              nLastError;
-    //oslSecurity       m_Security;
-    sal_Bool            m_bClosed;
-};
-
-/* default size for input/output buffer */
-static const ULONG ulBufSize = 4096;
-
-/* OS/2 path for pipes */
-static const CHAR  pszPipePath[] = "\\PIPE\\";
-static const UCHAR nPipePathLen  = sizeof (pszPipePath) - 1;
-
-/* global last error value to be returned from oslGetLastPipeError */
-static APIRET ngLastError;
-
-using rtl::OString;
-using rtl::OUString;
-using rtl::OUStringToOString;
-
-/*****************************************************************************/
-/* osl_create/destroy-PipeImpl */
-/*****************************************************************************/
-
-static oslInterlockedCount nPipes = 0;
-
-oslPipe __osl_createPipeImpl(void)
-{
-    oslPipe pPipe;
-
-    pPipe = (oslPipe) calloc(1,sizeof(struct oslPipeImpl));
-
-    pPipe->m_bClosed = sal_False;
-    pPipe->m_Reference = 1;
-    pPipe->hPipe = NULL;
-    pPipe->m_NamedObject = NULL;
-
-    return pPipe;
-}
-
-void __osl_destroyPipeImpl(oslPipe pPipe)
-{
-    if (pPipe != NULL)
-    {
-        DosCloseMutexSem( pPipe->m_NamedObject);
-        free(pPipe);
-    }
-}
-
-
-/*****************************************************************************/
-/* osl_createPipe  */
-/*****************************************************************************/
-oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, oslPipeOptions Options,
-                       oslSecurity Security)
-{
-    oslPipe pPipe;
-
-    ULONG  ulAction;
-    CHAR   strPipeNameBuffer [CCHMAXPATHCOMP];
-    rtl_String* strPipeName=0;
-    sal_Char* pszPipeName=0;
-
-    /* check parameters */
-    OSL_ASSERT( ustrPipeName );
-    //YD 17/04/06 OSL_ASSERT( Security == 0 );
-
-    /* allocate impl-structure */
-    pPipe = __osl_createPipeImpl();
-    if (!pPipe)
-    {
-        OSL_TRACE( "osl_createPipe failed allocating memory.\n" );
-        return NULL;
-    }
-
-    /* create pipe name */
-    OString sPipe = OUStringToOString(ustrPipeName, RTL_TEXTENCODING_ASCII_US);
-#if OSL_DEBUG_LEVEL>0
-    debug_printf("osl_createPipe options 0x%x\n", Options);
-#endif
-
-    switch( Options )
-    {
-    case osl_Pipe_OPEN:
-        {
-            APIRET  fPipeAvailable;
-
-            sprintf (strPipeNameBuffer, "\\PIPE\\OSL_PIPE_%s", sPipe.getStr());
-#if OSL_DEBUG_LEVEL>0
-            debug_printf("osl_createPipe %s\n", strPipeNameBuffer);
-#endif
-            ngLastError = DosOpen( (PCSZ)strPipeNameBuffer,
-                                &(pPipe->hPipe), &ulAction,
-                                0, FILE_NORMAL, FILE_OPEN,
-                                OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYREADWRITE,
-                                (PEAOP2) NULL);
-            // if pipe is busy, wait for it
-            if (ngLastError == ERROR_PIPE_BUSY)
-                do
-                {
-                    /* free instance should be available first */
-                    fPipeAvailable = DosWaitNPipe( (PCSZ)strPipeNameBuffer, -1);
-                    /* first try to open system pipe */
-                    if ( fPipeAvailable == NO_ERROR )
-                    {
-                        // We got it !
-                        ngLastError = NO_ERROR;
-                        break;
-                    }
-                    // Pipe instance maybe catched by another client -> try again
-                    printf("osl_createPipe wait for Pipe available\n");
-                } while ( fPipeAvailable );
-        }
-        break;
-    case osl_Pipe_CREATE:
-        {
-            sprintf (strPipeNameBuffer, "\\SEM32\\OSL_SEM_%s", sPipe.getStr());
-            // check if semaphore exists (pipe create must fail for existig pipes)
-            ngLastError = DosCreateMutexSem( (PCSZ)strPipeNameBuffer, &(pPipe->m_NamedObject), 0, TRUE );
-            if (ngLastError)
-                break;
-
-            sprintf (strPipeNameBuffer, "\\PIPE\\OSL_PIPE_%s", sPipe.getStr());
-#if OSL_DEBUG_LEVEL>0
-            debug_printf("osl_createPipe %s\n", strPipeNameBuffer);
-#endif
-            ngLastError = DosCreateNPipe( (PCSZ)strPipeNameBuffer,
-                            &(pPipe->hPipe),
-                            NP_ACCESS_DUPLEX,    /* open pipe for read and write access */
-                            0xFF,                /* allow unlimited number of instances */
-                            ulBufSize,           /* output buffer size */
-                            ulBufSize,           /* input buffer size */
-                            0L                   /* use default time-out time */
-                          );
-        }
-        break;
-    default:
-        ngLastError = ERROR_INVALID_PARAMETER;
-    }
-
-    /* if failed, release allocated memory */
-    if (ngLastError)
-    {
-        OSL_TRACE( "osl_createPipe failed %s the pipe %s, Error Code %d.\n",
-                   Options == osl_Pipe_OPEN ? "opening" : "creating",
-                   strPipeNameBuffer,
-                   ngLastError );
-        __osl_destroyPipeImpl(pPipe);
-        return NULL;
-    }
-
-    pPipe->m_Reference= 1;
-    pPipe->m_bClosed  = sal_False;
-    //pPipe->m_Security = Security;
-    pPipe->nLastError = NO_ERROR;
-    return (oslPipe)pPipe;
-}
-
-/*****************************************************************************/
-/* osl_copyPipe  */
-/*****************************************************************************/
-oslPipe SAL_CALL osl_copyPipe(oslPipe pPipe)
-{
-    //oslPipe* pPipe = (oslPipe*) Pipe;
-    oslPipe pNewPipe;
-
-
-    /* check parameter */
-    OSL_ASSERT (pPipe);
-
-    /* allocate impl-structure */
-    pNewPipe = __osl_createPipeImpl();
-    if (!pNewPipe) return NULL;
-
-    /* create new handle */
-    pNewPipe->hPipe = (HPIPE) -1;
-    ngLastError  = DosDupHandle( pPipe->hPipe, &(pNewPipe->hPipe) );
-
-    /* if failed, release allocated memory */
-    if (ngLastError)
-    {
-        OSL_TRACE( "osl_copyPipe failed duplicating pipe handle, Error-Code: %d.\n",
-                   ngLastError );
-        free (pNewPipe);
-        return NULL;
-    }
-
-    pNewPipe->nLastError = NO_ERROR;
-    return (oslPipe)pNewPipe;
-}
-
-void SAL_CALL osl_acquirePipe( oslPipe pPipe )
-{
-    osl_incrementInterlockedCount( &(pPipe->m_Reference) );
-}
-
-void SAL_CALL osl_releasePipe( oslPipe pPipe )
-{
-//      OSL_ASSERT( pPipe );
-
-    if( 0 == pPipe )
-        return;
-
-    if( 0 == osl_decrementInterlockedCount( &(pPipe->m_Reference) ) )
-    {
-        if( ! pPipe->m_bClosed )
-            osl_closePipe( pPipe );
-
-        __osl_destroyPipeImpl( pPipe );
-    }
-}
-
-/*****************************************************************************/
-/* osl_destroyPipe  */
-/*************close****************************************************************/
-void SAL_CALL osl_closePipe(oslPipe pPipe)
-{
-    //oslPipe* pPipe = (oslPipe*) Pipe;
-    /* check parameter */
-    OSL_ASSERT (pPipe);
-
-    if( pPipe && ! pPipe->m_bClosed )
-    {
-        pPipe->m_bClosed = sal_True;
-        /* if we have a system pipe close it */
-        if (pPipe->hPipe != 0)
-        {
-            /* disconnect client */
-            DosDisConnectNPipe (pPipe->hPipe);
-
-            /* close the pipe */
-            DosClose (pPipe->hPipe);
-        }
-    }
-}
-
-/*****************************************************************************/
-/* osl_acceptPipe  */
-/*****************************************************************************/
-oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
-{
-
-#define PINFO ((PIPEINFO *) &PipeInfoBuffer)
-
-    ///oslPipe* pPipe = (oslPipe*) Pipe;
-    oslPipe pNewPipe;
-    BYTE     PipeInfoBuffer[sizeof(PIPEINFO) + CCHMAXPATHCOMP];
-
-    /* check parameter */
-    OSL_ASSERT (pPipe);
-
-    /* get pipe information */
-    pPipe->nLastError = DosQueryNPipeInfo(pPipe->hPipe,
-                                         1,
-                                         (PVOID) &PipeInfoBuffer,
-                                         sizeof(PipeInfoBuffer));
-
-    if (pPipe->nLastError)
-    {
-        OSL_TRACE( "osl_acceptPipe failed for requesting pipe information.\n",
-                   pPipe->nLastError );
-        return NULL;
-    }
-
-    /* create a new instance of the pipe if possible */
-    if (PINFO->cbMaxInst == -1 ||                   /* unlimited instances */
-        PINFO->cbMaxInst > PINFO->cbCurInst)
-    {
-        HPIPE hPipe;
-
-        pNewPipe = __osl_createPipeImpl();
-
-        if (!pNewPipe)
-        {
-            OSL_TRACE( "osl_acceptPipe failed creating new instance.\n", ngLastError );
-            free(pNewPipe);
-            return NULL;
-        }
-
-        //pNewPipe->m_Security = pPipe->m_Security;
-
-        pNewPipe->nLastError =
-            DosCreateNPipe( (PCSZ)PINFO->szName,
-                            &(pNewPipe->hPipe),
-                            NP_ACCESS_DUPLEX,    /* open pipe for read and write access */
-                            0xFF,                /* allow unlimited number of instances */
-                            ulBufSize,           /* output buffer size */
-                            ulBufSize,           /* input buffer size */
-                            0L                   /* use default time-out time */
-                          );
-
-        if (pNewPipe->nLastError)
-        {
-            OSL_TRACE( "osl_acceptPipe failed creating new named pipe, Error-Code: %d.\n",
-                       pNewPipe->nLastError );
-            free(pNewPipe);
-            return NULL;
-        }
-
-        /* switch pipe handles */
-        hPipe = pPipe->hPipe;
-        pPipe->hPipe  = pNewPipe->hPipe;
-        pNewPipe->hPipe = hPipe;
-
-        /* connect new handle to client */
-        pNewPipe->nLastError = DosConnectNPipe( pNewPipe->hPipe );
-
-        /* if failed, release allocated memory */
-        if (pNewPipe->nLastError)
-        {
-            OSL_TRACE( "osl_acceptPipe failed connecting pipe to client, Error-Code: %d.\n",
-                       pNewPipe->nLastError );
-
-            osl_closePipe((oslPipe)pNewPipe);
-            return NULL;
-        }
-        return (oslPipe)pNewPipe;
-    }
-    else
-    {
-        /* connect original handle to client */
-        pPipe->nLastError = DosConnectNPipe( pPipe->hPipe );
-
-        if (pPipe->nLastError)
-        {
-            OSL_TRACE( "osl_acceptPipe failed connecting pipe to client, Error-Code: %d.\n",
-                       pPipe->nLastError );
-            return NULL;
-        }
-
-        return (oslPipe)pPipe;
-    }
-}
-
-/*****************************************************************************/
-/* osl_receivePipe  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_receivePipe(oslPipe pPipe,
-                        void* pBuffer,
-                        sal_Int32 BytesToRead)
-{
-    //oslPipe* pPipe = (oslPipe*) Pipe;
-    ULONG  ulActual;
-
-    /* check parameter */
-    OSL_ASSERT (pPipe);
-
-    /* read data from pipe */
-    pPipe->nLastError = DosRead( pPipe->hPipe, pBuffer, BytesToRead, &ulActual );
-
-    /* return -1 if failed */
-    if( pPipe->nLastError )
-    {
-        OSL_TRACE( "osl_receivePipe failed receiving from Pipe, Error-Code: %d.\n",
-                   pPipe->nLastError );
-        return -1;
-    }
-
-    return ulActual;
-}
-
-
-/*****************************************************************************/
-/* osl_sendPipe  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe,
-                       const void* pBuffer,
-                       sal_Int32 BytesToSend)
-{
-    //oslPipe* pPipe = (oslPipe*) Pipe;
-    ULONG  ulActual;
-
-    /* check parameter */
-    OSL_ASSERT (pPipe);
-
-    /* read data from pipe */
-    pPipe->nLastError = DosWrite( pPipe->hPipe, (PVOID) pBuffer, BytesToSend, &ulActual );
-
-    /* return -1 if failed */
-    if( pPipe->nLastError )
-    {
-        OSL_TRACE( "osl_receivePipe failed writing to Pipe, Error-Code: %d.\n",
-                   pPipe->nLastError );
-        return -1;
-    }
-
-    return ulActual;
-}
-
-
-/*****************************************************************************/
-/* osl_getLastPipeError  */
-/*****************************************************************************/
-
-oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe)
-{
-    //oslPipe* pPipe = (oslPipe*) Pipe;
-    APIRET rc;
-
-    /* return local error value if possible */
-    if (pPipe)
-    {
-        rc = pPipe->nLastError;
-        pPipe->nLastError = NO_ERROR;
-    } else
-        rc = ngLastError;
-
-    /* map OS/2 error values */
-    switch (rc)
-    {
-    case NO_ERROR:                return osl_Pipe_E_None;
-    case ERROR_PATH_NOT_FOUND:    return osl_Pipe_E_NotFound;
-    case ERROR_NOT_ENOUGH_MEMORY: return osl_Pipe_E_NoBufferSpace;
-    default:                      return osl_Pipe_E_invalidError;
-    }
-}
-
-/*****************************************************************************/
-
-sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 n )
-{
-    /* loop until all desired bytes were send or an error occured */
-    sal_Int32 BytesSend= 0;
-    sal_Int32 BytesToSend= n;
-
-    OSL_ASSERT(pPipe);
-    while (BytesToSend > 0)
-    {
-        sal_Int32 RetVal;
-
-        RetVal= osl_sendPipe(pPipe, pBuffer, BytesToSend);
-
-        /* error occured? */
-        if(RetVal <= 0)
-        {
-            break;
-        }
-
-        BytesToSend -= RetVal;
-        BytesSend += RetVal;
-        pBuffer= (sal_Char*)pBuffer + RetVal;
-    }
-
-    return BytesSend;
-}
-
-sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
-{
-    /* loop until all desired bytes were read or an error occured */
-    sal_Int32 BytesRead= 0;
-    sal_Int32 BytesToRead= n;
-
-    OSL_ASSERT( pPipe );
-    while (BytesToRead > 0)
-    {
-        sal_Int32 RetVal;
-        RetVal= osl_receivePipe(pPipe, pBuffer, BytesToRead);
-
-        /* error occured? */
-        if(RetVal <= 0)
-        {
-            break;
-        }
-
-        BytesToRead -= RetVal;
-        BytesRead += RetVal;
-        pBuffer= (sal_Char*)pBuffer + RetVal;
-    }
-    return BytesRead;
-}
-
-
-/******************************************************************************
- *
- *                  New io resource transfer functions
- *
- *****************************************************************************/
-
-
-/**********************************************
- osl_sendResourcePipe
- *********************************************/
-
-sal_Bool osl_sendResourcePipe(oslPipe pPipe, oslSocket pSocket)
-{
-    sal_Bool bRet = sal_False;
-
-    return bRet;
-}
-
-/**********************************************
- osl_receiveResourcePipe
- *********************************************/
-
-oslSocket osl_receiveResourcePipe(oslPipe pPipe)
-{
-    oslSocket pSocket=0;
-
-    return (oslSocket) pSocket;
-}
-
-
diff --git a/sal/osl/os2/pipeimpl.cxx b/sal/osl/os2/pipeimpl.cxx
deleted file mode 100644
index d08a370c428c..000000000000
--- a/sal/osl/os2/pipeimpl.cxx
+++ /dev/null
@@ -1,755 +0,0 @@
-#   include "pipeimpl.h"
-
-#ifndef _INC_MALLOC
-#   include <malloc.h>
-#endif
-
-#ifndef _INC_TCHAR
-#   ifdef UNICODE
-#       define _UNICODE
-#   endif
-#   include <tchar.h>
-#endif
-
-const TCHAR PIPE_NAME_PREFIX_MAPPING[] = TEXT("PIPE_FILE_MAPPING_");
-const TCHAR PIPE_NAME_PREFIX_SYNCHRONIZE[] = TEXT("PIPE_SYNCHRONIZE_MUTEX_");
-const TCHAR PIPE_NAME_PREFIX_CONNECTION[] = TEXT("PIPE_CONNECTION_SEMAPHORE_");
-
-const DWORD PIPE_BUFFER_SIZE = 4096;
-
-
-//============================================================================
-//  PipeData
-//============================================================================
-
-struct PipeData
-{
-    DWORD   dwProcessId;
-    HANDLE  hReadPipe;
-    HANDLE  hWritePipe;
-};
-
-//============================================================================
-//  Pipe
-//============================================================================
-
-#ifdef UNICODE
-#define Pipe        PipeW
-#define ClientPipe  ClientPipeW
-#define ServerPipe  ServerPipeW
-#else
-#define Pipe        PipeA
-#define ClientPipe  ClientPipeA
-#define ServerPipe  ServerPipeA
-#endif
-
-class Pipe
-{
-protected:
-    HANDLE  m_hReadPipe;    // Handle to use for reading
-    HANDLE  m_hWritePipe;   // Handle to use for writing
-
-    Pipe( HANDLE hReadPipe, HANDLE hWritePipe );
-
-    static HANDLE CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner );
-    static HANDLE CreatePipeDataMapping( LPCTSTR lpName );
-    static HANDLE OpenPipeDataMapping( LPCTSTR lpName );
-    static HANDLE CreatePipeConnectionSemaphore( LPCTSTR lpName, LONG lInitialCount, LONG lMaximumcount );
-
-public:
-    Pipe( const Pipe& );
-    const Pipe& operator = ( const Pipe& );
-    virtual ~Pipe();
-
-    virtual bool Close();
-    virtual bool Write( LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, bool bWait = true );
-    virtual bool Read( LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, bool bWait = true );
-
-    virtual Pipe *AcceptConnection()
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return NULL;
-    }
-
-    void * operator new( size_t nBytes )
-    {
-        return HeapAlloc( GetProcessHeap(), 0, nBytes );
-    }
-
-    void operator delete( void *ptr )
-    {
-        HeapFree( GetProcessHeap(), 0, ptr );
-    }
-
-    bool is() const
-    {
-        return (FALSE != HeapValidate( GetProcessHeap(), 0, this ));
-    }
-
-};
-
-//============================================================================
-//  ClientPipe
-//============================================================================
-
-class ClientPipe : public Pipe
-{
-protected:
-    ClientPipe( HANDLE hReadPipe, HANDLE hWritePipe );
-public:
-    static ClientPipe* Create( LPCTSTR lpName );
-};
-
-//============================================================================
-//  ServerPipe
-//============================================================================
-
-class ServerPipe : public Pipe
-{
-protected:
-    HANDLE  m_hMapping;
-    HANDLE  m_hSynchronize;
-    LPTSTR  m_lpName;
-
-    ServerPipe( LPCTSTR lpName, HANDLE hMapping, HANDLE hSynchronize, HANDLE hReadPipe, HANDLE hWritePipe );
-public:
-    virtual ~ServerPipe();
-
-    static ServerPipe *Create( LPCTSTR lpName );
-
-    virtual Pipe *AcceptConnection();
-};
-
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
-HANDLE  Pipe::CreatePipeDataMapping( LPCTSTR lpName )
-{
-    HANDLE  hMapping = NULL;
-    LPTSTR  lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
-
-    if ( lpMappingName )
-    {
-        _tcscpy( lpMappingName, PIPE_NAME_PREFIX_MAPPING );
-        _tcscat( lpMappingName, lpName );
-
-        LPTSTR  lpMappingFileName = (LPTSTR)alloca( MAX_PATH * sizeof(TCHAR) );
-
-        if ( lpMappingFileName )
-        {
-            DWORD   nChars = GetTempPath( MAX_PATH, lpMappingFileName );
-
-            if ( MAX_PATH + _tcslen(lpName) < nChars + 1 )
-            {
-                lpMappingFileName = (LPTSTR)alloca( (nChars + 1 + _tcslen(lpName)) * sizeof(TCHAR) );
-                if ( lpMappingFileName )
-                    nChars = GetTempPath( nChars, lpMappingFileName );
-                else
-                {
-                    nChars = 0;
-                    SetLastError( ERROR_NOT_ENOUGH_MEMORY );
-                }
-            }
-
-            if ( nChars )
-            {
-                _tcscat( lpMappingFileName, lpMappingName );
-
-                HANDLE hFile = CreateFile(
-                    lpMappingFileName,
-                    GENERIC_READ | GENERIC_WRITE,
-                    FILE_SHARE_READ | FILE_SHARE_WRITE,
-                    NULL,
-                    OPEN_ALWAYS,
-                    FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE,
-                    NULL );
-
-                if ( IsValidHandle(hFile) )
-                {
-                    hMapping = CreateFileMapping(
-                        (HANDLE)hFile,
-                        (LPSECURITY_ATTRIBUTES)NULL,
-                        PAGE_READWRITE,
-                        0,
-                        sizeof(PipeData),
-                        lpMappingName );
-
-                    CloseHandle( hFile );
-                }
-            }
-        }
-        else
-            SetLastError( ERROR_NOT_ENOUGH_MEMORY );
-    }
-
-    return hMapping;
-}
-
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
-HANDLE  Pipe::OpenPipeDataMapping( LPCTSTR lpName )
-{
-    HANDLE  hMapping = NULL;
-    LPTSTR  lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
-
-    if ( lpMappingName )
-    {
-        _tcscpy( lpMappingName, PIPE_NAME_PREFIX_MAPPING );
-        _tcscat( lpMappingName, lpName );
-
-        hMapping = OpenFileMapping( FILE_MAP_ALL_ACCESS, FALSE, lpMappingName );
-    }
-
-    return hMapping;
-}
-
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
-HANDLE  Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
-{
-    HANDLE  hMutex = NULL;
-    LPTSTR  lpMutexName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_SYNCHRONIZE) );
-
-    if ( lpMutexName )
-    {
-        _tcscpy( lpMutexName, PIPE_NAME_PREFIX_SYNCHRONIZE );
-        _tcscat( lpMutexName, lpName );
-
-        hMutex = CreateMutex( NULL, bInitialOwner, lpMutexName );
-    }
-
-    return hMutex;
-}
-
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
-HANDLE Pipe::CreatePipeConnectionSemaphore( LPCTSTR lpName, LONG lInitialCount, LONG lMaximumCount )
-{
-    HANDLE  hSemaphore = NULL;
-    LPTSTR  lpSemaphoreName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_CONNECTION) );
-
-    if ( lpSemaphoreName )
-    {
-        _tcscpy( lpSemaphoreName, PIPE_NAME_PREFIX_CONNECTION );
-        _tcscat( lpSemaphoreName, lpName );
-
-        hSemaphore = CreateSemaphore( NULL, lInitialCount, lMaximumCount, lpSemaphoreName );
-    }
-
-    return hSemaphore;
-}
-
-
-//----------------------------------------------------------------------------
-//  Pipe copy ctor
-//----------------------------------------------------------------------------
-
-Pipe::Pipe( const Pipe& rPipe ) :
-m_hReadPipe( INVALID_HANDLE_VALUE ),
-m_hWritePipe( INVALID_HANDLE_VALUE )
-{
-    DuplicateHandle(
-        GetCurrentProcess(),
-        rPipe.m_hReadPipe,
-        GetCurrentProcess(),
-        &m_hReadPipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    DuplicateHandle(
-        GetCurrentProcess(),
-        rPipe.m_hWritePipe,
-        GetCurrentProcess(),
-        &m_hWritePipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-}
-
-//----------------------------------------------------------------------------
-//  Pipe assignment operator
-//----------------------------------------------------------------------------
-
-const Pipe& Pipe::operator = ( const Pipe& rPipe )
-{
-    Close();
-
-    DuplicateHandle(
-        GetCurrentProcess(),
-        rPipe.m_hReadPipe,
-        GetCurrentProcess(),
-        &m_hReadPipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    DuplicateHandle(
-        GetCurrentProcess(),
-        rPipe.m_hWritePipe,
-        GetCurrentProcess(),
-        &m_hWritePipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-//  Pipe ctor
-//----------------------------------------------------------------------------
-
-Pipe::Pipe( HANDLE hReadPipe, HANDLE hWritePipe ) :
-m_hReadPipe( INVALID_HANDLE_VALUE ),
-m_hWritePipe( INVALID_HANDLE_VALUE )
-{
-    DuplicateHandle(
-        GetCurrentProcess(),
-        hReadPipe,
-        GetCurrentProcess(),
-        &m_hReadPipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    DuplicateHandle(
-        GetCurrentProcess(),
-        hWritePipe,
-        GetCurrentProcess(),
-        &m_hWritePipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-}
-
-//----------------------------------------------------------------------------
-//  Pipe dtor
-//----------------------------------------------------------------------------
-
-Pipe::~Pipe()
-{
-    Close();
-}
-
-//----------------------------------------------------------------------------
-//  Pipe Close
-//----------------------------------------------------------------------------
-
-bool Pipe::Close()
-{
-    bool    fSuccess = false;   // Assume failure
-
-    if ( IsValidHandle(m_hReadPipe) )
-    {
-        CloseHandle( m_hReadPipe );
-        m_hReadPipe = INVALID_HANDLE_VALUE;
-    }
-
-    if ( IsValidHandle(m_hWritePipe) )
-    {
-        CloseHandle( m_hWritePipe );
-        m_hWritePipe = INVALID_HANDLE_VALUE;
-    }
-
-    return fSuccess;
-}
-
-//----------------------------------------------------------------------------
-//  Pipe Write
-//----------------------------------------------------------------------------
-
-bool Pipe::Write( LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, bool bWait )
-{
-    DWORD   dwBytesAvailable = 0;
-    BOOL    fSuccess = TRUE;
-
-    if ( !bWait )
-        fSuccess = PeekNamedPipe( m_hReadPipe, NULL, 0, NULL, &dwBytesAvailable, NULL );
-
-    if ( fSuccess )
-    {
-        if ( !bWait && dwBytesToWrite > PIPE_BUFFER_SIZE - dwBytesAvailable )
-            dwBytesToWrite = PIPE_BUFFER_SIZE - dwBytesAvailable ;
-
-        return !!WriteFile( m_hWritePipe, lpBuffer, dwBytesToWrite, lpBytesWritten, NULL );
-    }
-
-    return false;
-}
-
-//----------------------------------------------------------------------------
-//  Pipe Read
-//----------------------------------------------------------------------------
-
-bool Pipe::Read( LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, bool bWait )
-{
-    DWORD   dwBytesAvailable = 0;
-    BOOL    fSuccess = TRUE;
-
-    if ( !bWait )
-        fSuccess = PeekNamedPipe( m_hReadPipe, NULL, 0, NULL, &dwBytesAvailable, NULL );
-
-    if ( fSuccess )
-    {
-        if ( bWait || dwBytesAvailable )
-            return !!ReadFile( m_hReadPipe, lpBuffer, dwBytesToRead, lpBytesRead, NULL );
-        else
-        {
-            *lpBytesRead = 0;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-
-//----------------------------------------------------------------------------
-//  Client pipe dtor
-//----------------------------------------------------------------------------
-
-ClientPipe::ClientPipe( HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe, hWritePipe )
-{
-}
-
-//----------------------------------------------------------------------------
-//  Client pipe creation
-//----------------------------------------------------------------------------
-
-ClientPipe *ClientPipe::Create( LPCTSTR lpName )
-{
-    ClientPipe  *pPipe = NULL;  // Assume failure
-
-    HANDLE  hMapping = OpenPipeDataMapping( lpName );
-
-    if ( IsValidHandle(hMapping) )
-    {
-        PipeData    *pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
-
-        if ( pData )
-        {
-            HANDLE  hSourceProcess = OpenProcess( PROCESS_DUP_HANDLE, FALSE, pData->dwProcessId );
-
-            if ( IsValidHandle(hSourceProcess) )
-            {
-                BOOL fSuccess;
-                HANDLE  hReadPipe = INVALID_HANDLE_VALUE, hWritePipe = INVALID_HANDLE_VALUE;
-
-                fSuccess = DuplicateHandle(
-                    hSourceProcess,
-                    pData->hReadPipe,
-                    GetCurrentProcess(),
-                    &hReadPipe,
-                    0,
-                    FALSE,
-                    DUPLICATE_SAME_ACCESS );
-
-                fSuccess = fSuccess && DuplicateHandle(
-                    hSourceProcess,
-                    pData->hWritePipe,
-                    GetCurrentProcess(),
-                    &hWritePipe,
-                    0,
-                    FALSE,
-                    DUPLICATE_SAME_ACCESS );
-
-                if ( fSuccess )
-                    pPipe = new ClientPipe( hReadPipe, hWritePipe );
-
-                if ( IsValidHandle(hWritePipe) )
-                    CloseHandle( hWritePipe );
-
-                if ( IsValidHandle(hReadPipe) )
-                    CloseHandle( hReadPipe );
-
-                HANDLE  hConnectionRequest = CreatePipeConnectionSemaphore( lpName, 0, 1 );
-
-                ReleaseSemaphore( hConnectionRequest, 1, NULL );
-
-                CloseHandle( hConnectionRequest );
-
-                CloseHandle( hSourceProcess );
-            }
-
-            UnmapViewOfFile( pData );
-        }
-
-        CloseHandle( hMapping );
-    }
-
-    return pPipe;
-}
-
-
-
-//----------------------------------------------------------------------------
-//  ServerPipe ctor
-//----------------------------------------------------------------------------
-
-ServerPipe::ServerPipe( LPCTSTR lpName, HANDLE hMapping, HANDLE hSynchronize, HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe, hWritePipe ),
-m_hMapping( NULL ),
-m_hSynchronize( NULL ),
-m_lpName( NULL )
-{
-    DuplicateHandle(
-        GetCurrentProcess(),
-        hMapping,
-        GetCurrentProcess(),
-        &m_hMapping,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    DuplicateHandle(
-        GetCurrentProcess(),
-        hSynchronize,
-        GetCurrentProcess(),
-        &m_hSynchronize,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS
-        );
-    m_lpName = new TCHAR[_tcslen(lpName) + 1];
-    if ( m_lpName )
-        _tcscpy( m_lpName, lpName );
-}
-
-//----------------------------------------------------------------------------
-//  ServerPipe dtor
-//----------------------------------------------------------------------------
-
-ServerPipe::~ServerPipe()
-{
-    if ( IsValidHandle(m_hMapping) )
-        CloseHandle( m_hMapping );
-    if ( m_lpName )
-        delete[]m_lpName;
-}
-
-//----------------------------------------------------------------------------
-//  ServerPipe AcceptConnection
-//----------------------------------------------------------------------------
-
-Pipe *ServerPipe::AcceptConnection()
-{
-    Pipe    *pPipe = NULL;  // Assume failure;
-
-    HANDLE  hConnectionRequest = CreatePipeConnectionSemaphore( m_lpName, 0, 1 );
-
-    if ( WAIT_OBJECT_0 == WaitForSingleObject( hConnectionRequest, INFINITE ) )
-    {
-        pPipe = new Pipe( *this );
-        Close();
-
-        // Create new inbound Pipe
-
-        HANDLE  hClientWritePipe = NULL, hServerReadPipe = NULL;
-
-        BOOL    fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
-
-
-        if ( fSuccess )
-        {
-            // Create outbound pipe
-
-            HANDLE  hClientReadPipe = NULL, hServerWritePipe = NULL;
-
-            if ( CreatePipe( &hClientReadPipe, &hServerWritePipe, NULL, PIPE_BUFFER_SIZE ) )
-            {
-                m_hReadPipe = hServerReadPipe;
-                m_hWritePipe = hServerWritePipe;
-
-                PipeData    *pData = (PipeData *)MapViewOfFile( m_hMapping, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(PipeData) );
-
-                HANDLE  hSynchronize = CreatePipeDataMutex( m_lpName, TRUE );
-
-                CloseHandle( pData->hReadPipe );
-                CloseHandle( pData->hWritePipe );
-
-                pData->hReadPipe = hClientReadPipe;
-                pData->hWritePipe = hClientWritePipe;
-
-                ReleaseMutex( hSynchronize );
-
-                CloseHandle( hSynchronize );
-
-            }
-            else
-            {
-                CloseHandle( hClientWritePipe );
-                CloseHandle( hServerWritePipe );
-            }
-        }
-
-        ReleaseMutex( hConnectionRequest );
-    }
-
-    CloseHandle( hConnectionRequest );
-
-    return pPipe;
-}
-
-//----------------------------------------------------------------------------
-//  Pipe creation
-//----------------------------------------------------------------------------
-
-ServerPipe *ServerPipe::Create( LPCTSTR lpName )
-{
-    ServerPipe  *pPipe = NULL;
-
-    HANDLE  hMapping = CreatePipeDataMapping( lpName );
-
-    if ( IsValidHandle(hMapping) )
-    {
-        if ( ERROR_FILE_EXISTS != GetLastError() )
-        {
-            HANDLE  hSynchronize = CreatePipeDataMutex( lpName, FALSE);
-
-            WaitForSingleObject( hSynchronize, INFINITE );
-
-            PipeData    *pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
-
-            if ( pData )
-            {
-
-                // Initialize pipe data
-
-                pData->dwProcessId = 0;
-                pData->hReadPipe = NULL;
-                pData->hWritePipe = NULL;
-
-                // Create inbound pipe
-
-                HANDLE  hServerReadPipe = NULL, hClientWritePipe = NULL;
-
-                BOOL    fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
-
-                if ( fSuccess )
-                {
-                    // Create outbound pipe
-
-                    HANDLE  hServerWritePipe = NULL, hClientReadPipe = NULL;
-
-                    fSuccess = CreatePipe( &hClientReadPipe, &hServerWritePipe, NULL, PIPE_BUFFER_SIZE );
-
-                    if ( fSuccess )
-                    {
-                        pData->dwProcessId = GetCurrentProcessId();
-                        pData->hReadPipe = hClientReadPipe;
-                        pData->hWritePipe = hClientWritePipe;
-                        pPipe = new ServerPipe( lpName, hMapping, hSynchronize, hServerReadPipe, hServerWritePipe );
-
-                        CloseHandle( hServerWritePipe );
-                        CloseHandle( hServerReadPipe );
-                    }
-                    else
-                    {
-                        CloseHandle( hServerReadPipe );
-                        CloseHandle( hClientWritePipe );
-                    }
-                }
-
-                UnmapViewOfFile( pData );
-            }
-
-            ReleaseMutex( hSynchronize );
-            CloseHandle( hSynchronize );
-        }
-
-        CloseHandle( hMapping );
-    }
-
-    return pPipe;
-}
-
-
-//----------------------------------------------------------------------------
-//  C style API
-//----------------------------------------------------------------------------
-
-const TCHAR LOCAL_PIPE_PREFIX[] = TEXT("\\\\.\\PIPE\\" );
-
-extern "C" HANDLE WINAPI CreateSimplePipe( LPCTSTR lpName )
-{
-    int nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
-    if ( 0 == _tcsnicmp( lpName, LOCAL_PIPE_PREFIX, nPrefixLen ) )
-        lpName += nPrefixLen;
-    return (HANDLE)ServerPipe::Create( lpName );
-}
-
-extern "C" HANDLE WINAPI OpenSimplePipe( LPCTSTR lpName )
-{
-    int nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
-    if ( 0 == _tcsnicmp( lpName, LOCAL_PIPE_PREFIX, nPrefixLen ) )
-        lpName += nPrefixLen;
-    return (HANDLE)ClientPipe::Create( lpName );
-}
-
-extern "C" HANDLE WINAPI AcceptSimplePipeConnection( HANDLE hPipe )
-{
-    Pipe    *pPipe = (Pipe *)hPipe;
-
-    if ( pPipe->is() )
-        return (HANDLE)pPipe->AcceptConnection();
-    else
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return NULL;
-    }
-}
-
-extern "C" BOOL WINAPI WaitForSimplePipe( LPCTSTR /*lpName*/, DWORD /*dwTimeOut*/ )
-{
-    return FALSE;
-}
-
-extern "C" BOOL WINAPI WriteSimplePipe( HANDLE hPipe, LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, BOOL bWait )
-{
-    Pipe    *pPipe = (Pipe *)hPipe;
-
-    if ( pPipe->is() )
-        return pPipe->Write( lpBuffer, dwBytesToWrite, lpBytesWritten, bWait );
-    else
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return FALSE;
-    }
-}
-
-extern "C" BOOL WINAPI ReadSimplePipe( HANDLE hPipe, LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, BOOL bWait )
-{
-    Pipe    *pPipe = (Pipe *)hPipe;
-
-    if ( pPipe->is() )
-        return pPipe->Read( lpBuffer, dwBytesToRead, lpBytesRead, bWait );
-    else
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return FALSE;
-    }
-}
-
-extern "C" BOOL WINAPI CloseSimplePipe( HANDLE hPipe )
-{
-    Pipe    *pPipe = (Pipe *)hPipe;
-
-    if ( pPipe->is() )
-    {
-        delete pPipe;
-        return TRUE;
-    }
-    else
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return FALSE;
-    }
-}
diff --git a/sal/osl/os2/pipeimpl.h b/sal/osl/os2/pipeimpl.h
deleted file mode 100644
index cff082dee5a3..000000000000
--- a/sal/osl/os2/pipeimpl.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef _PIPEIMPL_H_
-#define _PIPEIMPL_H_
-
-#ifndef _WINDOWS_
-#   include <windows.h>
-#endif
-
-#ifndef _INC_MALLOC
-#   include <malloc.h>
-#endif
-
-#ifndef _INC_TCHAR
-#   ifdef UNICODE
-#       define _UNICODE
-#   endif
-#   include <tchar.h>
-#endif
-
-#define EXPORT_PIPE_API
-
-//============================================================================
-//  Helper functions
-//============================================================================
-
-// Because the value of an invalid HANDLE returned by API functions differs
-// between different functions and differs on different Windows platforms,
-// this function checks wether the handle has a meaningfull value.
-#ifndef __cplusplus
-
-#define IsValidHandle( handle ) ((DWORD)(handle) + 1 > 1)
-
-#else
-
-inline bool IsValidHandle( HANDLE handle )
-{
-    return INVALID_HANDLE_VALUE != handle && NULL != handle;
-}
-
-extern "C" {
-
-#endif  // __cplusplus
-
-
-EXPORT_PIPE_API HANDLE WINAPI CreateSimplePipeA( LPCSTR lpName );
-EXPORT_PIPE_API HANDLE WINAPI CreateSimplePipeW( LPCWSTR lpName );
-
-#ifdef UNICODE
-#define CreateSimplePipe    CreateSimplePipeW
-#else
-#define CreateSimplePipe    CreateSimplePipeA
-#endif
-
-EXPORT_PIPE_API HANDLE WINAPI OpenSimplePipeA( LPCSTR lpName );
-EXPORT_PIPE_API HANDLE WINAPI OpenSimplePipeW( LPCWSTR lpName );
-
-#ifdef UNICODE
-#define OpenSimplePipe  OpenSimplePipeW
-#else
-#define OpenSimplePipe  OpenSimplePipeA
-#endif
-
-EXPORT_PIPE_API HANDLE WINAPI AcceptSimplePipeConnection( HANDLE hPipe );
-
-EXPORT_PIPE_API BOOL WINAPI WaitForSimplePipeA( LPCSTR lpName, DWORD dwTimeOut );
-EXPORT_PIPE_API BOOL WINAPI WaitForSimplePipeW( LPCWSTR lpName, DWORD dwTimeOut );
-
-#ifdef UNICODE
-#define WaitForSimplePipe   WaitForSimplePipeW
-#else
-#define WaitForSimplePipe   WaitForSimplePipeA
-#endif
-
-
-EXPORT_PIPE_API BOOL WINAPI WriteSimplePipe( HANDLE hPipe, LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, BOOL bWait );
-EXPORT_PIPE_API BOOL WINAPI ReadSimplePipe( HANDLE hPipe, LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, BOOL bWait );
-EXPORT_PIPE_API BOOL WINAPI CloseSimplePipe( HANDLE hPipe );
-
-#ifdef __cplusplus
-}   // extern "C"
-#endif
-
-#endif  // _PIPEIMPL_H_
diff --git a/sal/osl/os2/process.c b/sal/osl/os2/process.c
deleted file mode 100644
index e83552192bfb..000000000000
--- a/sal/osl/os2/process.c
+++ /dev/null
@@ -1,1013 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "system.h"
-#include <osl/thread.h>
-
-#include <osl/diagnose.h>
-//#include <osl/socket.h>
-
-#ifndef _OSL_FILE_PATH_HELPER_H_
-#include "file_path_helper.h"
-#endif
-
-#include "procimpl.h"
-//#include "sockimpl.h"
-//#include "secimpl.h"
-
-#include <ctype.h>
-
-//#ifndef _RTL_USTRING_HXX_
-#include <rtl/ustring.hxx>
-//#endif
-
-// for exception logging
-#include <stdio.h>
-#include <setjmp.h>
-#include "helpers/except.h"
-
-
-#define MAX_ARGS 255
-#define PIPENAMEMASK  "\\PIPE\\OSL_PIPE_%u"
-#define SEMNAMEMASK   "\\SEM32\\OSL_SEM_%u"
-
-typedef enum {
-    MSG_DATA,
-    MSG_END,
-    MSG_ACK,
-    MSG_REL,
-    MSG_UNKNOWN
-} MessageType;
-
-typedef struct {
-    MessageType       m_Type;
-    oslDescriptorFlag m_Flags;
-    oslDescriptorType m_Data;
-    HANDLE            m_Value;
-} Message;
-
-typedef struct {
-    HPIPE   m_hPipe;
-} Pipe;
-
-typedef struct _oslSocketCallbackArg {
-    HANDLE  m_socket;
-    Pipe*   m_pipe;
-} oslSocketCallbackArg;
-
-/* process termination queue */
-static sal_Bool            bInitSessionTerm = sal_False;
-static const sal_Char * const SessionTermQueueName = "\\QUEUES\\SESSIONS.QUE";
-static HQUEUE             SessionTermQueue;
-
-/******************************************************************************
- *
- *                  Function Declarations
- *
- *****************************************************************************/
-
-oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
-                                                sal_Char *pszArguments[],
-                                                oslProcessOption Options,
-                                                oslSecurity Security,
-                                                sal_Char *pszDirectory,
-                                                sal_Char *pszEnvironments[],
-                                                oslProcess *pProcess,
-                                                oslFileHandle *pInputWrite,
-                                                oslFileHandle *pOutputRead,
-                                                oslFileHandle *pErrorRead );
-
-/* implemented in file.c */
-extern oslFileError FileURLToPath( char *, size_t, rtl_uString* );
-
-static sal_Bool InitSessionTerm( void )
-{
-    DosCreateQueue( &SessionTermQueue, QUE_FIFO, (PCSZ) SessionTermQueueName );
-
-    return sal_True;
-}
-
-/******************************************************************************
- *
- *                  Functions for starting a process
- *
- *****************************************************************************/
-
-/**********************************************
- osl_executeProcess_WithRedirectedIO
- *********************************************/
-
-oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
-                                            rtl_uString *ustrImageName,
-                                            rtl_uString *ustrArguments[],
-                                            sal_uInt32   nArguments,
-                                            oslProcessOption Options,
-                                            oslSecurity Security,
-                                            rtl_uString *ustrWorkDir,
-                                            rtl_uString *ustrEnvironment[],
-                                            sal_uInt32   nEnvironmentVars,
-                                            oslProcess *pProcess,
-                                            oslFileHandle   *pInputWrite,
-                                            oslFileHandle   *pOutputRead,
-                                            oslFileHandle   *pErrorRead
-                                            )
-{
-
-    oslProcessError Error;
-    sal_Char* pszWorkDir=0;
-    sal_Char** pArguments=0;
-    sal_Char** pEnvironment=0;
-    unsigned int index;
-
-    char szImagePath[PATH_MAX] = "";
-    char szWorkDir[PATH_MAX] = "";
-
-#if 0
-    if (Options & osl_Process_SEARCHPATH)
-    {
-        const rtl::OUString PATH1;
-        OUString PATH (RTL_CONSTASCII_USTRINGPARAM("PATH"));
-
-        rtl_uString * pSearchPath = 0;
-        osl_getEnvironment (PATH.pData, &pSearchPath);
-        if (pSearchPath)
-        {
-            rtl_uString * pSearchResult = 0;
-            osl_searchPath (ustrImageName, pSearchPath, &pSearchResult);
-            if (pSearchResult)
-            {
-                rtl_uString_assign (ustrImageName, pSearchResult);
-                rtl_uString_release (pSearchResult);
-            }
-            rtl_uString_release (pSearchPath);
-        }
-    }
-#endif
-
-    if ( ustrImageName && ustrImageName->length )
-    {
-        FileURLToPath( szImagePath, PATH_MAX, ustrImageName );
-    }
-
-    if ( ustrWorkDir != 0 && ustrWorkDir->length )
-    {
-        FileURLToPath( szWorkDir, PATH_MAX, ustrWorkDir );
-        pszWorkDir = szWorkDir;
-    }
-
-    if ( pArguments == 0 && nArguments > 0 )
-    {
-        pArguments = (sal_Char**) malloc( ( nArguments + 2 ) * sizeof(sal_Char*) );
-    }
-
-
-    for ( index = 0 ; index < nArguments ; ++index )
-    {
-        rtl_String* strArg =0;
-
-
-        rtl_uString2String( &strArg,
-                            rtl_uString_getStr(ustrArguments[index]),
-                            rtl_uString_getLength(ustrArguments[index]),
-                            osl_getThreadTextEncoding(),
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-
-        pArguments[index]=strdup(rtl_string_getStr(strArg));
-        rtl_string_release(strArg);
-        pArguments[index+1]=0;
-    }
-
-    for ( index = 0 ; index < nEnvironmentVars ; ++index )
-    {
-        rtl_String* strEnv=0;
-
-        if ( pEnvironment == 0 )
-        {
-            pEnvironment = (sal_Char**) malloc( ( nEnvironmentVars + 2 ) * sizeof(sal_Char*) );
-        }
-
-        rtl_uString2String( &strEnv,
-                            rtl_uString_getStr(ustrEnvironment[index]),
-                            rtl_uString_getLength(ustrEnvironment[index]),
-                            osl_getThreadTextEncoding(),
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-
-        pEnvironment[index]=strdup(rtl_string_getStr(strEnv));
-        rtl_string_release(strEnv);
-        pEnvironment[index+1]=0;
-    }
-
-    int     rc, pid;
-    int     saveOutput = -1, saveInput = -1, saveError = -1;
-    int     stdOutput[2] = { -1, -1 }, stdInput[2] = { -1, -1 }, stdError[2] = { -1, -1 };
-    FILE    *i, *o, *e;
-
-    if (pInputWrite)
-        pipe( stdInput);
-    if (pOutputRead)
-        pipe( stdOutput);
-    if (pErrorRead)
-        pipe( stdError);
-
-    fcntl( stdInput[0], F_SETFD, FD_CLOEXEC);
-    fcntl( stdInput[1], F_SETFD, FD_CLOEXEC);
-    fcntl( stdOutput[0], F_SETFD, FD_CLOEXEC);
-    fcntl( stdOutput[1], F_SETFD, FD_CLOEXEC);
-    fcntl( stdError[0], F_SETFD, FD_CLOEXEC);
-    fcntl( stdError[1], F_SETFD, FD_CLOEXEC);
-
-    saveInput = dup( STDIN_FILENO);
-    fcntl( saveInput, F_SETFD, FD_CLOEXEC);
-    dup2( stdInput[0], STDIN_FILENO );
-    close( stdInput[0] );
-
-    saveOutput = dup( STDOUT_FILENO);
-    fcntl( saveOutput, F_SETFD, FD_CLOEXEC);
-    dup2( stdOutput[1], STDOUT_FILENO );
-    close( stdOutput[1] );
-
-    saveError = dup( STDERR_FILENO);
-    fcntl( saveError, F_SETFD, FD_CLOEXEC);
-    dup2( stdError[1], STDERR_FILENO );
-    close( stdError[1] );
-
-    Error = osl_psz_executeProcess(szImagePath,
-                                   pArguments,
-                                   Options,
-                                   Security,
-                                   pszWorkDir,
-                                   pEnvironment,
-                                   pProcess,
-                                   pInputWrite,
-                                   pOutputRead,
-                                   pErrorRead
-                                   );
-
-    if ( pInputWrite )
-        *(pInputWrite) = osl_createFileHandleFromFD( stdInput[1] );
-
-    if ( pOutputRead )
-        *(pOutputRead) = osl_createFileHandleFromFD( stdOutput[0] );
-
-    if ( pErrorRead )
-        *(pErrorRead) = osl_createFileHandleFromFD( stdError[0] );
-
-    // restore handles
-    dup2( saveInput, STDIN_FILENO);
-    close( saveInput);
-    dup2( saveOutput, STDOUT_FILENO);
-    close( saveOutput);
-    dup2( saveError, STDERR_FILENO);
-    close( saveError);
-
-    if ( pArguments != 0 )
-    {
-        for ( index = 0 ; index < nArguments ; ++index )
-        {
-            if ( pArguments[index] != 0 )
-            {
-                free(pArguments[index]);
-            }
-        }
-        free(pArguments);
-    }
-
-    if ( pEnvironment != 0 )
-    {
-        for ( index = 0 ; index < nEnvironmentVars ; ++index )
-        {
-            if ( pEnvironment[index] != 0 )
-            {
-                free(pEnvironment[index]);
-            }
-        }
-        free(pEnvironment);
-    }
-
-    return Error;
-}
-
-/**********************************************
- osl_executeProcess
- *********************************************/
-
-oslProcessError SAL_CALL osl_executeProcess(
-                                            rtl_uString *ustrImageName,
-                                            rtl_uString *ustrArguments[],
-                                            sal_uInt32   nArguments,
-                                            oslProcessOption Options,
-                                            oslSecurity Security,
-                                            rtl_uString *ustrWorkDir,
-                                            rtl_uString *ustrEnvironment[],
-                                            sal_uInt32   nEnvironmentVars,
-                                            oslProcess *pProcess
-                                            )
-{
-    return osl_executeProcess_WithRedirectedIO(
-        ustrImageName,
-        ustrArguments,
-        nArguments,
-        Options,
-        Security,
-        ustrWorkDir,
-        ustrEnvironment,
-        nEnvironmentVars,
-        pProcess,
-        NULL,
-        NULL,
-        NULL
-        );
-}
-
-/**********************************************
- osl_psz_executeProcess
- *********************************************/
-
-oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
-                                                sal_Char *pszArguments[],
-                                                oslProcessOption Options,
-                                                oslSecurity Security,
-                                                sal_Char *pszDirectory,
-                                                sal_Char *pszEnvironments[],
-                                                oslProcess *pProcess,
-                                                oslFileHandle   *pInputWrite,
-                                                oslFileHandle   *pOutputRead,
-                                                oslFileHandle   *pErrorRead
-                                                )
-{
-    ULONG ulSessID  = 0;          /* Session ID returned          */
-    PID pidProcess;
-    APIRET rc;
-    sal_Char* pStr;
-    sal_Char*        args;
-    sal_Char*        envs;
-    int i;
-    int n = 1;
-    oslProcessImpl* pProcImpl;
-    ULONG nAppType, nOwnAppType;
-    ULONG nCurrentDisk, nDriveMap, nBufSize;
-       int   first = 0;
-    sal_Char path[ _MAX_PATH ];
-    sal_Char currentDir[ _MAX_PATH ];
-    sal_Char ownfilename[ _MAX_PATH ];
-    RESULTCODES resultCode;
-    char** p;
-
-    /* get imagename from arg list, if not specified */
-    if (pszImageName == NULL)
-        pszImageName = pszArguments[first++];
-
-    OSL_ASSERT(pszImageName != NULL);
-
-    /* check application type */
-    rc = DosQueryAppType( (PCSZ) pszImageName, &nAppType );
-    if( rc != NO_ERROR )
-    {
-        if( (rc == ERROR_FILE_NOT_FOUND) || (rc == ERROR_PATH_NOT_FOUND) )
-            return osl_Process_E_NotFound;
-        else
-            return osl_Process_E_Unknown;
-    }
-
-    /* backup current disk information */
-    if(DosQueryCurrentDisk(&nCurrentDisk, &nDriveMap))
-    {
-        nCurrentDisk = 0;
-    }
-
-    /* backup current directory information */
-    nBufSize = _MAX_PATH;
-    if(DosQueryCurrentDir(0, (BYTE*)currentDir, &nBufSize))
-    {
-        *currentDir = '\0';
-    }
-
-    /* change to working directory */
-    if(pszDirectory && pszDirectory[1] == ':')
-    {
-        BYTE nDrive = toupper(pszDirectory[0]) - 'A' + 1;
-
-        if(NO_ERROR == DosSetDefaultDisk(nDrive))
-        {
-            DosSetCurrentDir((PSZ) pszDirectory);
-        }
-    }
-
-    /* query current executable filename and application type */
-    {
-        CHAR    szName[CCHMAXPATH];
-        PPIB    ppib;
-        PTIB    ptib;
-        APIRET  rc;
-        rc = DosGetInfoBlocks(&ptib, &ppib);
-        rc = DosQueryModuleName(ppib->pib_hmte, sizeof(szName), szName);
-        DosQueryAppType( (PCSZ)szName, &nOwnAppType );
-    }
-
-    /* combination of flags WAIT and DETACHED not supported */
-    if( (Options & osl_Process_DETACHED) && (Options & osl_Process_WAIT) )
-        Options &= !osl_Process_DETACHED;
-
-    /* start in same session if possible and detached flag not set */
-    if( ((nAppType & 0x00000007) == (nOwnAppType & 0x00000007))
-/*      && ((Options & osl_Process_DETACHED) == 0) */ )
-    {
-        CHAR szbuf[CCHMAXPATH];
-
-        /* calculate needed space for arguments */
-        n = strlen( pszImageName ) + 1;
-        if( pszArguments )
-               for (i = first; pszArguments[i] != NULL; i++)
-                   n += strlen(pszArguments[i]) + 1;
-
-        /* allocate space for arguments */
-        args = (sal_Char*)malloc(n + 1);
-        pStr = args;
-
-        /* add program name as first string to arguments */
-        memcpy(pStr, pszImageName, strlen( pszImageName ) );
-        pStr += strlen( pszImageName );
-        *pStr++ = '\0';
-
-        /* add given strings to arguments */
-        if( pszArguments )
-            for (i = first; pszArguments[i] != NULL; i++)
-            {
-                memcpy(pStr, pszArguments[i], strlen( pszArguments[i] ) );
-                pStr += strlen( pszArguments[i] );
-                if (pszArguments[i+1] != NULL)
-                    *pStr++ = ' ';
-            }
-
-        /* set end marker for arguments */
-        *pStr++ = '\0';
-        *pStr = '\0';
-
-        OSL_TRACE( "osl_executeProcess with DosExecPgm (args: %s)\n", args );
-
-        /* calculate needed space for environment: since enviroment var search
-           is a linear scan of the current enviroment, we place new variables
-           before existing ones; so the child will find new definitions before
-           olders; this doesn't require us to replace existing vars */
-        // existing enviroment size
-        n = 0;
-        p = environ;
-        while( *p)
-        {
-            int l = strlen( *p);
-            n += l + 1;
-            p++;
-        }
-        // new env size (if exists)
-        if( pszEnvironments )
-        {
-            for (i = 0; pszEnvironments[i] != NULL; i++)
-                   n += strlen(pszEnvironments[i]) + 1;
-        }
-        /* allocate space for environment */
-        envs = (sal_Char*)malloc(n + 1);
-        pStr = envs;
-
-        // add new vars
-        if( pszEnvironments )
-        {
-            /* add given strings to environment */
-            for (i = 0; pszEnvironments[i] != NULL; i++)
-            {
-                memcpy(pStr, pszEnvironments[i], strlen( pszEnvironments[i] ) );
-                pStr += strlen( pszEnvironments[i] );
-                *pStr++ = '\0';
-            }
-        }
-        // add existing vars
-        p = environ;
-        while( *p)
-        {
-            memcpy(pStr, *p, strlen( *p ) );
-            pStr += strlen( *p );
-            *pStr++ = '\0';
-            p++;
-        }
-        /* set end marker for environment */
-        *pStr = '\0';
-
-
-        if(Options & osl_Process_DETACHED)
-        {
-            rc = DosExecPgm( szbuf, sizeof( szbuf ), EXEC_BACKGROUND,
-                             (PSZ) args, (PSZ) envs, &resultCode, (PSZ) pszImageName );
-        }
-        else
-        {
-            rc = DosExecPgm( szbuf, sizeof( szbuf ), EXEC_ASYNCRESULT,
-                             (PSZ) args, (PSZ) envs, &resultCode, (PSZ) pszImageName );
-        }
-
-        pidProcess = resultCode.codeTerminate;
-
-        /* cleanup */
-        free(envs);
-           free(args);
-
-        /* error handling */
-        if( rc != NO_ERROR )
-            return osl_Process_E_Unknown;
-    }
-
-    else
-    {
-        STARTDATA SData = { 0 };
-        UCHAR achObjBuf[ 256 ] = { 0 };
-
-        /* combine arguments separated by spaces */
-        if( pszArguments )
-        {
-            for (i = first; pszArguments[i] != NULL; i++)
-                n += strlen(pszArguments[i]) + 1;
-            // YD DosStartSession requires low-mem buffers!
-            args = (sal_Char*)_tmalloc(n);
-            *args = '\0';
-            for (i = first; pszArguments[i] != NULL; i++)
-            {
-                strcat(args, pszArguments[i]);
-                strcat(args, " ");
-            }
-        }
-        else
-            args = NULL;
-
-        /* combine environment separated by NULL */
-        if( pszEnvironments )
-        {
-            for (i = 0; pszEnvironments[i] != NULL; i++)
-                n += strlen(pszEnvironments[i]) + 1;
-            // YD DosStartSession requires low-mem buffers!
-            envs = (sal_Char*)_tmalloc(n + 1);
-            pStr = (sal_Char*)envs;
-            for (i = 0; pszEnvironments[i] != NULL; i++)
-            {
-                memcpy(pStr, pszEnvironments[i], strlen( pszEnvironments[i] ) );
-                pStr += strlen( pszEnvironments[i] );
-                *pStr = '\0';
-                pStr++;
-            }
-            *pStr = '\0';
-        }
-        else
-            envs = NULL;
-
-        /* initialize data structure */
-        memset( &SData, 0, sizeof( STARTDATA ) );
-        SData.Length  = sizeof(STARTDATA);
-
-        OSL_TRACE( "osl_executeProcess with DosStartSession (args: %s)\n", args );
-
-        /* OS/2 Application ? */
-        if(nAppType & 0x00000007)
-        {
-
-            /* inherit options from parent */
-            SData.InheritOpt = SSF_INHERTOPT_PARENT;
-
-            switch (Options & (osl_Process_NORMAL | osl_Process_MINIMIZED |
-                            osl_Process_MAXIMIZED | osl_Process_FULLSCREEN))
-            {
-                case osl_Process_MINIMIZED:
-                    SData.SessionType = SSF_TYPE_DEFAULT;
-                    SData.PgmControl |= SSF_CONTROL_MINIMIZE;
-                    break;
-
-                case osl_Process_MAXIMIZED:
-                    SData.SessionType = SSF_TYPE_DEFAULT;
-                    SData.PgmControl |= SSF_CONTROL_MAXIMIZE;
-                    break;
-
-                case osl_Process_FULLSCREEN:
-                    SData.SessionType = SSF_TYPE_FULLSCREEN;
-                    break;
-
-                default:
-                    SData.SessionType = SSF_TYPE_DEFAULT;
-            } /* switch */
-        }
-
-
-        if( Options & osl_Process_DETACHED )
-        {
-            /* start an independent session */
-            SData.Related = SSF_RELATED_INDEPENDENT;
-            SData.TermQ = NULL;
-        }
-        else
-        {
-            /* start a child session and set Termination Queue */
-            SData.Related = SSF_RELATED_CHILD;
-
-            if(! bInitSessionTerm)
-                bInitSessionTerm = InitSessionTerm();
-
-            SData.TermQ = (BYTE*) SessionTermQueueName;
-        }
-
-        SData.FgBg  = SSF_FGBG_FORE;      /* start session in foreground  */
-        SData.TraceOpt = SSF_TRACEOPT_NONE;   /* No trace                */
-
-        SData.PgmTitle = NULL;
-        SData.PgmInputs = (BYTE*)args;
-        SData.PgmName = (PSZ) pszImageName;
-        SData.Environment = (BYTE*)envs;
-
-        if( Options & osl_Process_HIDDEN )
-            SData.PgmControl |= SSF_CONTROL_INVISIBLE;
-        else
-            SData.PgmControl |= SSF_CONTROL_VISIBLE;
-
-        SData.ObjectBuffer  = (PSZ) achObjBuf;
-        SData.ObjectBuffLen = (ULONG) sizeof(achObjBuf);
-
-
-        /* Start the session */
-        rc = DosStartSession( &SData, &ulSessID, &pidProcess );
-
-        /* ignore error "session started in background" */
-        if( rc == ERROR_SMG_START_IN_BACKGROUND )
-            rc = NO_ERROR;
-
-
-        if(envs)
-            _tfree(envs);
-        if(args)
-            _tfree(args);
-
-        if( rc != NO_ERROR )
-            return osl_Process_E_Unknown;
-
-    } /* else */
-
-
-    /* restore current disk */
-    if(nCurrentDisk)
-    {
-        DosSetDefaultDisk(nCurrentDisk);
-    }
-
-    /* restore current drive information */
-    if(*currentDir)
-    {
-        DosSetCurrentDir((PCSZ)currentDir);
-    }
-
-    /* allocate intern process structure and store child process ID */
-    pProcImpl = (oslProcessImpl*)malloc(sizeof(oslProcessImpl));
-    pProcImpl->pProcess = pidProcess;
-    pProcImpl->nSessionID = ulSessID;
-
-       pProcImpl->bResultCodeValid = FALSE;
-
-    if( Options & osl_Process_WAIT )
-        osl_joinProcess(pProcImpl);
-
-    *pProcess = (oslProcess)pProcImpl;
-
-    if( rc == NO_ERROR )
-        return osl_Process_E_None;
-    else
-
-        return osl_Process_E_Unknown;
-}
-
-/*----------------------------------------------------------------------------*/
-
-oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process)
-{
-    if (Process == NULL)
-        return osl_Process_E_Unknown;
-
-    /* Stop the session */
-    DosStopSession( STOP_SESSION_SPECIFIED, ((oslProcessImpl*)Process)->nSessionID );
-
-    return osl_Process_E_None;
-}
-
-/*----------------------------------------------------------------------------*/
-
-oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident)
-{
-    HANDLE        hProcess;
-    oslProcessImpl* pProcImpl;
-
-    /* check, if given PID is a valid process */
-    if (FALSE)
-    {
-        pProcImpl = (oslProcessImpl*)malloc(sizeof(oslProcessImpl));
-/*
-        pProcImpl->pProcess = pidProcess;
-        pProcImpl->nSessionID = ulSessID;
-*/
-    }
-    else
-        pProcImpl = NULL;
-
-    return (pProcImpl);
-}
-
-/*----------------------------------------------------------------------------*/
-
-void SAL_CALL osl_freeProcessHandle(oslProcess Process)
-{
-    /* free intern process structure */
-    if (Process != NULL)
-        free((oslProcessImpl*)Process);
-}
-
-/*----------------------------------------------------------------------------*/
-
-oslProcessError SAL_CALL osl_joinProcess(oslProcess Process)
-{
-    oslProcessImpl* pProcImpl = (oslProcessImpl*) Process;
-    APIRET rc;
-
-    if (Process == NULL)
-        return osl_Process_E_Unknown;
-
-    /* process of same session ? */
-    if( pProcImpl->nSessionID == 0 )
-    {
-        RESULTCODES resultCode;
-        PID pidEnded;
-
-        rc = DosWaitChild( DCWA_PROCESS, DCWW_WAIT, &resultCode,
-                &pidEnded, pProcImpl->pProcess );
-
-        if( rc == NO_ERROR )
-        {
-            pProcImpl->nResultCode = resultCode.codeResult;
-            pProcImpl->bResultCodeValid = TRUE;
-
-            return osl_Process_E_None;
-        }
-    }
-    else
-    {
-        ULONG pcbData, ulElement = 0;
-        REQUESTDATA rdData;
-        BYTE bPriority;
-        struct {
-            USHORT SessionID;
-            USHORT ReturnValue;
-        } *pvBuffer;
-
-        /* search/wait for the correct entry in termination queue */
-        while( ( rc = DosPeekQueue( SessionTermQueue, &rdData, &pcbData,
-                        (PPVOID) &pvBuffer, &ulElement, DCWW_WAIT,
-                        &bPriority, NULLHANDLE )) == NO_ERROR )
-        {
-
-            if( pvBuffer->SessionID == pProcImpl->nSessionID )
-            {
-                pProcImpl->nResultCode = pvBuffer->ReturnValue;
-                pProcImpl->bResultCodeValid = TRUE;
-
-                /* remove item from queue */
-                rc = DosReadQueue( SessionTermQueue, &rdData, &pcbData,
-                       (PPVOID)&pvBuffer, ulElement, DCWW_WAIT,
-                       &bPriority, NULLHANDLE );
-
-                if( rc == NO_ERROR )
-                    return osl_Process_E_None;
-                else
-                    return osl_Process_E_Unknown;
-            }
-        } /* while */
-    }
-    return osl_Process_E_Unknown;
-}
-
-/***************************************************************************/
-
-//YD FIXME incomplete!
-oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const TimeValue* pTimeout)
-{
-    return osl_joinProcess( Process);
-}
-
-/*----------------------------------------------------------------------------*/
-
-oslProcessError SAL_CALL osl_getCommandArgs( sal_Char* pszBuffer, sal_uInt32 Max)
-{
-
-    static int  CmdLen = -1;
-    static sal_Char CmdLine[_MAX_CMD];
-
-    OSL_ASSERT(pszBuffer);
-    OSL_ASSERT(Max > 1);
-
-    /* Query commandline during first call of function only */
-    if (CmdLen < 0)
-    {
-        sal_Bool bEscaped = sal_False;
-        sal_Bool bSeparated = sal_True;
-        sal_Char* pszBufferOrg = pszBuffer;
-        sal_Char* pszCmdLine;
-
-        /* get pointer to commandline */
-        {
-            PTIB pptib = NULL;
-            PPIB pppib = NULL;
-
-            DosGetInfoBlocks(&pptib, &pppib);
-            pszCmdLine = pppib->pib_pchcmd;
-        }
-
-        /* skip first string */
-        while( *pszCmdLine )
-            pszCmdLine++;
-
-        /* concatenate commandline arguments for the given string */
-        Max -= 2;
-        while ( !((*pszCmdLine == '\0') && (*(pszCmdLine + 1) == '\0')) && (Max > 0))
-        {
-            /*
-             *  C-Runtime expects char to be unsigned and so to be
-             *  preceeded with 00 instead of FF when converting to int
-             */
-            int n = *((unsigned char *) pszCmdLine);
-            if (! (isspace(n) || (*pszCmdLine == '\0')) )
-            {
-                if (*pszCmdLine == '"')
-                {
-                    if (*(pszCmdLine + 1) != '"')
-                        bEscaped = ! bEscaped;
-                    else
-                    {
-                        pszCmdLine++;
-                        *pszBuffer++ = *pszCmdLine;
-                        Max--;
-                    }
-                }
-                else
-                {
-                    *pszBuffer++ = *pszCmdLine;
-                    Max--;
-                }
-                bSeparated = sal_False;
-            }
-            else
-            {
-                if (bEscaped)
-                    *pszBuffer++ = *pszCmdLine;
-                else
-                    if (! bSeparated)
-                    {
-                        *pszBuffer++ = '\0';
-                        bSeparated = sal_True;
-                    }
-                Max--;
-            }
-
-            pszCmdLine++;
-        }
-
-        *pszBuffer++ = '\0';
-        *pszBuffer++ = '\0';
-
-        /* restore pointer and save commandline for next query */
-        CmdLen = pszBuffer - pszBufferOrg;
-        pszBuffer = pszBufferOrg;
-        memcpy( CmdLine, pszBuffer, CmdLen );
-    }
-    else
-       memcpy( pszBuffer, CmdLine, CmdLen );
-
-    OSL_TRACE( "osl_getCommandArgs (args: %s)\n", pszBuffer );
-
-    return osl_Process_E_None;
-}
-
-/*----------------------------------------------------------------------------*/
-
-oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData Fields,
-                                   oslProcessInfo* pInfo)
-{
-    if (! pInfo || (pInfo->Size != sizeof(oslProcessInfo)))
-        return osl_Process_E_Unknown;
-
-    pInfo->Fields = 0;
-
-    if (Fields & osl_Process_IDENTIFIER)
-    {
-        if( Process == NULL )
-        {
-            PTIB pptib = NULL;
-            PPIB pppib = NULL;
-
-            DosGetInfoBlocks( &pptib, &pppib );
-            pInfo->Ident = pppib->pib_ulpid;
-        }
-        else
-            pInfo->Ident = ((oslProcessImpl*)Process)->pProcess;
-
-        pInfo->Fields |= osl_Process_IDENTIFIER;
-    }
-
-    if (Fields & osl_Process_EXITCODE)
-    {
-        oslProcessImpl* pProcImpl = (oslProcessImpl*) Process;
-
-        if( pProcImpl->bResultCodeValid )
-        {
-            pInfo->Code = pProcImpl->nResultCode;
-            pInfo->Fields |= osl_Process_EXITCODE;
-        }
-        else
-        {
-            APIRET rc;
-
-            if( pProcImpl->nSessionID == 0 )
-            {
-                RESULTCODES resultCode;
-                PID pidEnded;
-
-                rc = DosWaitChild( DCWA_PROCESS, DCWW_WAIT, &resultCode,
-                        &pidEnded, pProcImpl->pProcess );
-
-                if( rc == NO_ERROR )
-                {
-                    pProcImpl->nResultCode = resultCode.codeResult;
-                    pProcImpl->bResultCodeValid = TRUE;
-
-                    pInfo->Code = pProcImpl->nResultCode;
-                    pInfo->Fields |= osl_Process_EXITCODE;
-
-                    return osl_Process_E_None;
-                }
-            }
-            else
-            {
-                ULONG pcbData, ulElement = 0;
-                REQUESTDATA rdData;
-                BYTE bPriority;
-                struct {
-                    USHORT SessionID;
-                    USHORT ReturnValue;
-                } *pvBuffer;
-
-                /* search/wait for the correct entry in termination queue */
-                while( ( rc = DosPeekQueue( SessionTermQueue, &rdData, &pcbData,
-                                (PPVOID) &pvBuffer, &ulElement, DCWW_WAIT,
-                                &bPriority, NULLHANDLE )) == NO_ERROR )
-                {
-
-                    if( pvBuffer->SessionID == pProcImpl->nSessionID )
-                    {
-                        pProcImpl->nResultCode = pvBuffer->ReturnValue;
-                        pProcImpl->bResultCodeValid = TRUE;
-
-                        pInfo->Code = pProcImpl->nResultCode;
-                        pInfo->Fields |= osl_Process_EXITCODE;
-
-                        /* remove item from queue */
-                        rc = DosReadQueue( SessionTermQueue, &rdData, &pcbData,
-                               (PPVOID)&pvBuffer, ulElement, DCWW_WAIT,
-                               &bPriority, NULLHANDLE );
-
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    if (Fields & osl_Process_HEAPUSAGE)
-    {
-    }
-    if (Fields & osl_Process_CPUTIMES)
-    {
-    }
-
-    return (pInfo->Fields == Fields) ? osl_Process_E_None : osl_Process_E_Unknown;
-}
diff --git a/sal/osl/os2/process_impl.cxx b/sal/osl/os2/process_impl.cxx
deleted file mode 100644
index be6bb1898e65..000000000000
--- a/sal/osl/os2/process_impl.cxx
+++ /dev/null
@@ -1,463 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#define INCL_DOS
-#include <os2.h>
-
-#include "osl/process.h"
-#include <osl/mutex.h>
-
-#ifndef INCLUDED_LIMITS_H
-#include <limits.h>
-#define INCLUDED_LIMITS_H
-#endif
-
-#ifndef INCLUDED_PTHREAD_H
-#include <pthread.h>
-#define INCLUDED_PTHREAD_H
-#endif
-
-#ifndef INCLUDED_STDLIB_H
-#include <stdlib.h>
-#define INCLUDED_STDLIB_H
-#endif
-
-#ifndef INCLUDED_STRING_H
-#include <string.h>
-#define INCLUDED_STRING_H
-#endif
-#include "osl/diagnose.h"
-#include <osl/file.h>
-#include "osl/module.h"
-#include "osl/thread.h"
-#include "rtl/ustring.hxx"
-
-#ifndef _OSL_FILE_PATH_HELPER_H_
-#include "file_path_helper.h"
-#endif
-
-#ifndef _OSL_UUNXAPI_H_
-#include "uunxapi.h"
-#endif
-
-/***************************************
-  osl_bootstrap_getExecutableFile_Impl().
-
-  @internal
-  @see rtl_bootstrap
-  @see #i37371#
-
- **************************************/
-
-extern "C" oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
-    rtl_uString ** ppFileURL
-) SAL_THROW_EXTERN_C();
-
-
-oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
-    rtl_uString ** ppFileURL
-) SAL_THROW_EXTERN_C()
-{
-    oslProcessError result = osl_Process_E_NotFound;
-    CHAR    szName[CCHMAXPATH];
-    PPIB    ppib;
-    PTIB    ptib;
-    APIRET  rc;
-
-    rc = DosGetInfoBlocks(&ptib, &ppib);
-    rc = DosQueryModuleName(ppib->pib_hmte, sizeof(szName), szName);
-
-    if (rc == 0)
-    {
-        rtl_uString * pAbsPath = 0;
-
-        rtl_string2UString(
-            &pAbsPath,
-            szName, strlen(szName), osl_getThreadTextEncoding(),
-            OSTRING_TO_OUSTRING_CVTFLAGS);
-
-        if (pAbsPath)
-        {
-            /* Convert from path to url. */
-            if (osl_getFileURLFromSystemPath (pAbsPath, ppFileURL) == osl_File_E_None)
-            {
-                /* Success. */
-                result = osl_Process_E_None;
-            }
-            rtl_uString_release (pAbsPath);
-        }
-    }
-
-    return (result);
-}
-
-/***************************************
- CommandArgs_Impl.
- **************************************/
-struct CommandArgs_Impl
-{
-    oslMutex        m_mutex;
-    sal_uInt32      m_nCount;
-    rtl_uString **  m_ppArgs;
-};
-
-static struct CommandArgs_Impl g_command_args =
-{
-    osl_createMutex(),
-    0,
-    0
-};
-
-/***************************************
-  osl_getExecutableFile().
- **************************************/
-oslProcessError SAL_CALL osl_getExecutableFile (rtl_uString ** ppustrFile)
-{
-    oslProcessError result = osl_Process_E_NotFound;
-
-    osl_acquireMutex(g_command_args.m_mutex);
-    OSL_ASSERT(g_command_args.m_nCount > 0);
-    if (g_command_args.m_nCount > 0)
-    {
-        /* CommandArgs set. Obtain argv[0]. */
-        rtl_uString_assign (ppustrFile, g_command_args.m_ppArgs[0]);
-        result = osl_Process_E_None;
-    }
-    osl_releaseMutex(g_command_args.m_mutex);
-
-    return (result);
-}
-
-/***************************************
- osl_getCommandArgCount().
- **************************************/
-sal_uInt32 SAL_CALL osl_getCommandArgCount (void)
-{
-    sal_uInt32 result = 0;
-
-    osl_acquireMutex(g_command_args.m_mutex);
-    OSL_ASSERT(g_command_args.m_nCount > 0);
-    if (g_command_args.m_nCount > 0)
-        result = g_command_args.m_nCount - 1;
-    osl_releaseMutex(g_command_args.m_mutex);
-
-    return (result);
-}
-
-/***************************************
- osl_getCommandArg().
- **************************************/
-oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32 nArg, rtl_uString ** strCommandArg)
-{
-    oslProcessError result = osl_Process_E_NotFound;
-
-    osl_acquireMutex(g_command_args.m_mutex);
-    OSL_ASSERT(g_command_args.m_nCount > 0);
-    if (g_command_args.m_nCount > (nArg + 1))
-    {
-        rtl_uString_assign (strCommandArg, g_command_args.m_ppArgs[nArg + 1]);
-        result = osl_Process_E_None;
-    }
-    osl_releaseMutex(g_command_args.m_mutex);
-
-    return (result);
-}
-
-/***************************************
- osl_setCommandArgs().
- **************************************/
-void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
-{
-    OSL_ASSERT(argc > 0);
-    osl_acquireMutex(g_command_args.m_mutex);
-    OSL_ENSURE (g_command_args.m_nCount == 0, "osl_setCommandArgs(): CommandArgs already set.");
-    if (g_command_args.m_nCount == 0)
-    {
-        rtl_uString** ppArgs = (rtl_uString**)rtl_allocateZeroMemory (argc * sizeof(rtl_uString*));
-        if (ppArgs != 0)
-        {
-            rtl_TextEncoding encoding = osl_getThreadTextEncoding();
-            for (int i = 0; i < argc; i++)
-            {
-                rtl_string2UString (
-                    &(ppArgs[i]),
-                    argv[i], rtl_str_getLength (argv[i]), encoding,
-                    OSTRING_TO_OUSTRING_CVTFLAGS);
-            }
-            if (ppArgs[0] != 0)
-            {
-                /* see @ osl_getExecutableFile(). */
-                if (rtl_ustr_indexOfChar (rtl_uString_getStr(ppArgs[0]), sal_Unicode('/')) == -1)
-                {
-                    const rtl::OUString PATH (RTL_CONSTASCII_USTRINGPARAM("PATH"));
-
-                    rtl_uString * pSearchPath = 0;
-                    osl_getEnvironment (PATH.pData, &pSearchPath);
-                    if (pSearchPath)
-                    {
-                        rtl_uString * pSearchResult = 0;
-                        osl_searchPath (ppArgs[0], pSearchPath, &pSearchResult);
-                        if (pSearchResult)
-                        {
-                            rtl_uString_assign (&(ppArgs[0]), pSearchResult);
-                            rtl_uString_release (pSearchResult);
-                        }
-                        rtl_uString_release (pSearchPath);
-                    }
-                }
-
-                rtl_uString * pArg0 = 0;
-                if (realpath_u (ppArgs[0], &pArg0))
-                {
-                    osl_getFileURLFromSystemPath (pArg0, &(ppArgs[0]));
-                    rtl_uString_release (pArg0);
-                }
-            }
-            g_command_args.m_nCount = argc;
-            g_command_args.m_ppArgs = ppArgs;
-        }
-    }
-    osl_releaseMutex(g_command_args.m_mutex);
-
-}
-
-/***************************************
- osl_getEnvironment().
- **************************************/
-oslProcessError SAL_CALL osl_getEnvironment(rtl_uString* pustrEnvVar, rtl_uString** ppustrValue)
-{
-    oslProcessError  result   = osl_Process_E_NotFound;
-    rtl_TextEncoding encoding = osl_getThreadTextEncoding();
-    rtl_String* pstr_env_var  = 0;
-
-    OSL_PRECOND(pustrEnvVar, "osl_getEnvironment(): Invalid parameter");
-    OSL_PRECOND(ppustrValue, "osl_getEnvironment(): Invalid parameter");
-
-    rtl_uString2String(
-        &pstr_env_var,
-        rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding,
-        OUSTRING_TO_OSTRING_CVTFLAGS);
-    if (pstr_env_var != 0)
-    {
-        const char* p_env_var = getenv (rtl_string_getStr (pstr_env_var));
-        if (p_env_var != 0)
-        {
-            rtl_string2UString(
-                ppustrValue,
-                p_env_var, strlen(p_env_var), encoding,
-                OSTRING_TO_OUSTRING_CVTFLAGS);
-            OSL_ASSERT(*ppustrValue != NULL);
-
-            result = osl_Process_E_None;
-        }
-        rtl_string_release(pstr_env_var);
-    }
-
-    return (result);
-}
-
-/***************************************
- osl_setEnvironment().
- **************************************/
-oslProcessError SAL_CALL osl_setEnvironment(rtl_uString* pustrEnvVar, rtl_uString* pustrValue)
-{
-    oslProcessError  result   = osl_Process_E_Unknown;
-    rtl_TextEncoding encoding = osl_getThreadTextEncoding();
-    rtl_String* pstr_env_var  = 0;
-    rtl_String* pstr_val  = 0;
-
-    OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter");
-    OSL_PRECOND(pustrValue, "osl_setEnvironment(): Invalid parameter");
-
-    rtl_uString2String(
-        &pstr_env_var,
-        rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding,
-        OUSTRING_TO_OSTRING_CVTFLAGS);
-
-    rtl_uString2String(
-        &pstr_val,
-        rtl_uString_getStr(pustrValue), rtl_uString_getLength(pustrValue), encoding,
-        OUSTRING_TO_OSTRING_CVTFLAGS);
-
-    if (pstr_env_var != 0 && pstr_val != 0)
-    {
-        //Can't determine if OS/2 EMX has a working setenv or not, so use putenv,
-        //feel free to use setenv here if its available and works
-        rtl_String * pBuffer = NULL;
-
-        sal_Int32 nCapacity = rtl_stringbuffer_newFromStringBuffer( &pBuffer,
-            rtl_string_getLength(pstr_env_var) + rtl_string_getLength(pstr_val) + 1,
-            pstr_env_var );
-        rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, "=", 1);
-        rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length,
-            rtl_string_getStr(pstr_val), rtl_string_getLength(pstr_val) );
-
-        rtl_string_acquire(pBuffer); // argument to putenv must leak on success
-
-        if (putenv(rtl_string_getStr(pBuffer)) == 0)
-            result = osl_Process_E_None;
-        else
-            rtl_string_release(pBuffer);
-    }
-
-    if (pstr_val)
-        rtl_string_release(pstr_val);
-
-    if (pstr_env_var != 0)
-        rtl_string_release(pstr_env_var);
-
-    return (result);
-}
-
-/***************************************
- osl_clearEnvironment().
- **************************************/
-oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString* pustrEnvVar)
-{
-    oslProcessError  result   = osl_Process_E_Unknown;
-    rtl_TextEncoding encoding = osl_getThreadTextEncoding();
-    rtl_String* pstr_env_var  = 0;
-
-    OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter");
-
-    rtl_uString2String(
-        &pstr_env_var,
-        rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding,
-        OUSTRING_TO_OSTRING_CVTFLAGS);
-
-    if (pstr_env_var)
-    {
-        //Can't determine if OS/2 EMX has a working unsetenv or not, so use putenv,
-        //feel free to use unsetenv here if its available and works
-        rtl_String * pBuffer = NULL;
-
-        sal_Int32 nCapacity = rtl_stringbuffer_newFromStringBuffer( &pBuffer,
-            rtl_string_getLength(pstr_env_var) + 1, pstr_env_var );
-        rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, "=", 1);
-
-        rtl_string_acquire(pBuffer); // argument to putenv must leak on success
-
-        if (putenv(rtl_string_getStr(pBuffer)) == 0)
-            result = osl_Process_E_None;
-        else
-            rtl_string_release(pBuffer);
-
-        rtl_string_release(pstr_env_var);
-    }
-
-    return (result);
-}
-
-/***************************************
- osl_getProcessWorkingDir().
- **************************************/
-oslProcessError SAL_CALL osl_getProcessWorkingDir(rtl_uString **ppustrWorkingDir)
-{
-    oslProcessError result = osl_Process_E_Unknown;
-    char buffer[PATH_MAX];
-
-    OSL_PRECOND(ppustrWorkingDir, "osl_getProcessWorkingDir(): Invalid parameter");
-
-    if (getcwd (buffer, sizeof(buffer)) != 0)
-    {
-        rtl_uString* ustrTmp = 0;
-
-        rtl_string2UString(
-            &ustrTmp,
-            buffer, strlen(buffer), osl_getThreadTextEncoding(),
-            OSTRING_TO_OUSTRING_CVTFLAGS);
-        if (ustrTmp != 0)
-        {
-            if (osl_getFileURLFromSystemPath (ustrTmp, ppustrWorkingDir) == osl_File_E_None)
-                result = osl_Process_E_None;
-            rtl_uString_release (ustrTmp);
-        }
-    }
-
-    return (result);
-}
-
-/******************************************************************************
- *
- *              new functions to set/return the current process locale
- *
- *****************************************************************************/
-
-struct ProcessLocale_Impl
-{
-    oslMutex        m_mutex;
-    rtl_Locale *    m_pLocale;
-};
-
-static struct ProcessLocale_Impl g_process_locale =
-{
-    osl_createMutex(),
-    0
-};
-
-extern "C" void _imp_getProcessLocale( rtl_Locale ** );
-extern "C" int  _imp_setProcessLocale( rtl_Locale * );
-
-/**********************************************
- osl_getProcessLocale().
- *********************************************/
-oslProcessError SAL_CALL osl_getProcessLocale( rtl_Locale ** ppLocale )
-{
-    OSL_PRECOND(ppLocale, "osl_getProcessLocale(): Invalid parameter.");
-
-    osl_acquireMutex(g_process_locale.m_mutex);
-
-    if (g_process_locale.m_pLocale == 0)
-        _imp_getProcessLocale (&(g_process_locale.m_pLocale));
-    *ppLocale = g_process_locale.m_pLocale;
-
-    osl_releaseMutex(g_process_locale.m_mutex);
-
-    return (osl_Process_E_None);
-}
-
-/**********************************************
- osl_setProcessLocale().
- *********************************************/
-oslProcessError SAL_CALL osl_setProcessLocale( rtl_Locale * pLocale )
-{
-    oslProcessError result = osl_Process_E_Unknown;
-
-    OSL_PRECOND(pLocale, "osl_setProcessLocale(): Invalid parameter.");
-
-    osl_acquireMutex(g_process_locale.m_mutex);
-    if (_imp_setProcessLocale (pLocale) == 0)
-    {
-        g_process_locale.m_pLocale = pLocale;
-        result = osl_Process_E_None;
-    }
-    osl_releaseMutex(g_process_locale.m_mutex);
-
-    return (result);
-}
-
diff --git a/sal/osl/os2/profile.c b/sal/osl/os2/profile.c
deleted file mode 100644
index d9d166d0e091..000000000000
--- a/sal/osl/os2/profile.c
+++ /dev/null
@@ -1,2295 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "system.h"
-
-// YD #define min(a,b) (((a) < (b)) ? (a) : (b))
-
-#include <osl/security.h>
-#include <osl/diagnose.h>
-#include <osl/profile.h>
-#include <osl/process.h>
-#include <osl/thread.h>
-#include <osl/file.h>
-
-#define LINES_INI       32
-#define LINES_ADD       10
-#define SECTIONS_INI    5
-#define SECTIONS_ADD    3
-#define ENTRIES_INI     5
-#define ENTRIES_ADD     3
-
-
-#define STR_INI_EXTENSION   ".ini"
-#define STR_INI_METAHOME    "?~"
-#define STR_INI_METASYS     "?$"
-#define STR_INI_METACFG     "?^"
-#define STR_INI_METAINS     "?#"
-
-#define STR_INI_BOOLYES     "yes"
-#define STR_INI_BOOLON      "on"
-#define STR_INI_BOOLONE     "1"
-#define STR_INI_BOOLNO      "no"
-#define STR_INI_BOOLOFF     "off"
-#define STR_INI_BOOLZERO    "0"
-
-#define FLG_USER            0x00FF
-#define FLG_AUTOOPEN        0x0100
-#define FLG_MODIFIED        0x0200
-
-#define SVERSION_LOCATION   STR_INI_METACFG
-#define SVERSION_FALLBACK   STR_INI_METASYS
-#define SVERSION_NAME       "sversion"
-#define SVERSION_SECTION    "Versions"
-#define SVERSION_SOFFICE    "StarOffice"
-#define SVERSION_PROFILE    "soffice.ini"
-#define SVERSION_OPTION     "userid:"
-#define SVERSION_DIRS       { "bin", "program" }
-#define SVERSION_USER       "user"
-
-#define _BUILD_STR_(n)  # n
-#define BUILD_STR(n)    _BUILD_STR_(n)
-
-/* implemented in file.c */
-extern oslFileError FileURLToPath( char *, size_t, rtl_uString* );
-
-/*****************************************************************************/
-/* Data Type Definition */
-/*****************************************************************************/
-
-typedef struct _osl_TStamp
-{
-    FDATE  m_Date;
-    FTIME  m_Time;
-} osl_TStamp;
-
-typedef enum _osl_TLockMode
-{
-    un_lock, read_lock, write_lock
-} osl_TLockMode;
-
-typedef struct _osl_TFile
-{
-    HFILE   m_Handle;
-/*
-    sal_Char*   m_pReadPtr;
-    sal_Char    m_ReadBuf[512];
-    sal_Char*   m_pWritePtr;
-    sal_Char    m_WriteBuf[512];
-*/
-    sal_Char*   m_pReadPtr;
-    sal_Char    m_ReadBuf[512];
-/*      sal_Char*   m_pWritePtr; */
-/*      sal_Char    m_WriteBuf[512]; */
-    sal_Char*   m_pWriteBuf;
-    sal_uInt32  m_nWriteBufLen;
-    sal_uInt32  m_nWriteBufFree;
-} osl_TFile;
-
-typedef struct _osl_TProfileEntry
-{
-    sal_uInt32    m_Line;
-    sal_uInt32    m_Offset;
-    sal_uInt32    m_Len;
-} osl_TProfileEntry;
-
-typedef struct _osl_TProfileSection
-{
-    sal_uInt32            m_Line;
-    sal_uInt32            m_Offset;
-    sal_uInt32            m_Len;
-    sal_uInt32            m_NoEntries;
-    sal_uInt32            m_MaxEntries;
-    osl_TProfileEntry*  m_Entries;
-} osl_TProfileSection;
-
-
-/*
-    Profile-data structure hidden behind oslProfile:
-*/
-typedef struct _osl_TProfileImpl
-{
-    sal_uInt32  m_Flags;
-    osl_TFile*  m_pFile;
-    osl_TStamp  m_Stamp;
-    //sal_Char    m_Filename[_MAX_PATH + 1];
-    sal_uInt32  m_NoLines;
-    sal_uInt32  m_MaxLines;
-    sal_uInt32  m_NoSections;
-    sal_uInt32  m_MaxSections;
-    sal_Char**  m_Lines;
-    rtl_uString *m_strFileName;
-    osl_TProfileSection*    m_Sections;
-    HINI                    m_hIni;
-} osl_TProfileImpl;
-
-
-/*****************************************************************************/
-/* Static Module Function Declarations */
-/*****************************************************************************/
-
-//static osl_TFile* openFile(rtl_uString* pszFilename, sal_Bool bWriteable);
-//static osl_TStamp closeFile(osl_TFile* pFile);
-static osl_TFile*           openFileImpl(rtl_uString * strFileName, oslProfileOption ProfileFlags  );
-static osl_TStamp           closeFileImpl(osl_TFile* pFile);
-static sal_Bool   lockFile(const osl_TFile* pFile, osl_TLockMode eMode);
-static sal_Bool   rewindFile(osl_TFile* pFile, sal_Bool bTruncate);
-static osl_TStamp getFileStamp(osl_TFile* pFile);
-
-static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen);
-static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine);
-static const sal_Char* stripBlanks(const sal_Char* String, sal_uInt32* pLen);
-static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line);
-static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sal_uInt32 LineNo);
-static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo);
-static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection,
-                     sal_uInt32 NoEntry, sal_uInt32 Line,
-                     const sal_Char* Entry, sal_uInt32 Len);
-static sal_Bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection,
-                         int Line, const sal_Char* Entry, sal_uInt32 Len);
-static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry);
-static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len);
-static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection);
-static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const sal_Char* Section,
-                                      const sal_Char* Entry, sal_uInt32 *pNoEntry);
-static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile);
-static sal_Bool storeProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile, sal_Bool bCleanup);
-static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable);
-static sal_Bool releaseProfile(osl_TProfileImpl* pProfile);
-static sal_Bool lookupProfile(const sal_Char *pszPath, const sal_Char *pszFile, sal_Char *pPath);
-
-
-static sal_Bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName);
-
-sal_Bool SAL_CALL osl_getFullPath(rtl_uString* pszFilename, sal_Char* pszPath, sal_uInt32 MaxLen)
-{
-    return NO_ERROR == DosQueryPathInfo( (PCSZ)pszFilename, FIL_QUERYFULLNAME, pszPath, MaxLen);
-}
-
-
-
-/*****************************************************************************/
-/* Exported Module Functions */
-/*****************************************************************************/
-
-oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flags)
-{
-    osl_TFile*        pFile;
-    osl_TProfileImpl* pProfile;
-    rtl_uString       *FileName=NULL;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_openProfile\n");
-#endif
-    OSL_VERIFY(strProfileName);
-
-/*  if (rtl_uString_getLength(strProfileName) == 0 )
-    {
-        OSL_VERIFY(osl_getProfileName(NULL, NULL, &FileName));
-    }
-    else
-*/
-    {
-        rtl_uString_assign(&FileName, strProfileName);
-    }
-
-    osl_getSystemPathFromFileURL(FileName, &FileName);
-
-#ifdef DEBUG_OSL_PROFILE
-    Flags=osl_Profile_FLUSHWRITE;
-
-    // OSL_TRACE("opening '%s'\n",FileName);
-    if ( Flags == osl_Profile_DEFAULT )
-    {
-        OSL_TRACE("with osl_Profile_DEFAULT \n");
-    }
-    if ( Flags & osl_Profile_SYSTEM )
-    {
-        OSL_TRACE("with osl_Profile_SYSTEM \n");
-    }
-    if ( Flags & osl_Profile_READLOCK )
-    {
-        OSL_TRACE("with osl_Profile_READLOCK \n");
-    }
-    if ( Flags & osl_Profile_WRITELOCK )
-    {
-        OSL_TRACE("with osl_Profile_WRITELOCK \n");
-    }
-/*      if ( Flags & osl_Profile_READWRITE ) */
-/*      { */
-/*          OSL_TRACE("with osl_Profile_READWRITE \n"); */
-/*      } */
-    if ( Flags & osl_Profile_FLUSHWRITE )
-    {
-        OSL_TRACE("with osl_Profile_FLUSHWRITE \n");
-    }
-#endif
-
-    if ((! (Flags & osl_Profile_SYSTEM)) &&
-        ((pFile = openFileImpl(FileName, (Flags & osl_Profile_WRITELOCK) ? sal_True : sal_False)) == NULL))
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_openProfile [not opened]\n");
-#endif
-        if( FileName)
-            rtl_uString_release( FileName);
-
-        return (NULL);
-    }
-
-    pProfile = (osl_TProfileImpl*)calloc(1, sizeof(osl_TProfileImpl));
-
-    pProfile->m_Flags = Flags & FLG_USER;
-    osl_getSystemPathFromFileURL(strProfileName, &pProfile->m_strFileName);
-//  rtl_uString_assign(&pProfile->m_strFileName, strProfileName);
-
-    if (Flags & (osl_Profile_READLOCK | osl_Profile_WRITELOCK))
-        pProfile->m_pFile = pFile;
-
-    pProfile->m_Stamp = getFileStamp(pFile);
-
-    loadProfile(pFile, pProfile);
-
-    if (pProfile->m_pFile == NULL)
-        closeFileImpl(pFile);
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_openProfile [ok]\n");
-#endif
-    if( FileName)
-        rtl_uString_release( FileName);
-
-    return pProfile;
-}
-
-sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
-{
-    osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_closeProfile\n");
-#endif
-
-    if ( pProfile == 0 )
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_closeProfile [profile==0]\n");
-#endif
-        return sal_False;
-    }
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        pProfile = acquireProfile(Profile,sal_True);
-
-        if ( pProfile != 0 )
-        {
-            if ( !( pProfile->m_Flags & osl_Profile_READLOCK )  && ( pProfile->m_Flags & FLG_MODIFIED ) )
-            {
-/*                  if (pProfile->m_pFile == NULL) */
-/*                      pProfile->m_pFile = openFileImpl(pProfile->m_Filename, sal_True); */
-
-                storeProfile(pProfile->m_pFile, pProfile, sal_False);
-            }
-        }
-        else
-        {
-            pProfile = acquireProfile(Profile,sal_False);
-        }
-
-        if ( pProfile == 0 )
-        {
-#ifdef TRACE_OSL_PROFILE
-            OSL_TRACE("Out osl_closeProfile [pProfile==0]\n");
-#endif
-            return sal_False;
-        }
-
-        if (pProfile->m_pFile != NULL)
-            closeFileImpl(pProfile->m_pFile);
-    }
-
-    pProfile->m_pFile = NULL;
-    rtl_uString_release(pProfile->m_strFileName);
-    pProfile->m_strFileName = NULL;
-
-    /* release whole profile data types memory */
-    if ( pProfile->m_NoLines > 0)
-    {
-        unsigned int index=0;
-        if ( pProfile->m_Lines != 0 )
-        {
-            for ( index = 0 ; index < pProfile->m_NoLines ; ++index)
-            {
-                if ( pProfile->m_Lines[index] != 0 )
-                {
-                    free(pProfile->m_Lines[index]);
-                }
-            }
-            free(pProfile->m_Lines);
-        }
-        if ( pProfile->m_Sections != 0 )
-        {
-            /*osl_TProfileSection* pSections=pProfile->m_Sections;*/
-            for ( index = 0 ; index < pProfile->m_NoSections ; ++index )
-            {
-                if ( pProfile->m_Sections[index].m_Entries != 0 )
-                {
-                    free(pProfile->m_Sections[index].m_Entries);
-                }
-            }
-            free(pProfile->m_Sections);
-        }
-
-    }
-    free(pProfile);
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_closeProfile [ok]\n");
-#endif
-    return (sal_True);
-}
-
-sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
-{
-    osl_TProfileImpl* pProfile = (osl_TProfileImpl*) Profile;
-    osl_TFile* pFile;
-    sal_Bool bRet = sal_False;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_flushProfile()\n");
-#endif
-
-    if ( pProfile == 0 )
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_flushProfile() [pProfile == 0]\n");
-#endif
-        return sal_False;
-    }
-
-    pFile = pProfile->m_pFile;
-    if ( !( pFile != 0 && pFile->m_Handle >= 0 ) )
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_flushProfile() [invalid file]\n");
-#endif
-        return sal_False;
-    }
-
-    if ( pProfile->m_Flags & FLG_MODIFIED )
-    {
-#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("swapping to storeprofile\n");
-#endif
-        bRet = storeProfile(pFile,pProfile,sal_False);
-    }
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_flushProfile() [ok]\n");
-#endif
-    return bRet;
-}
-
-sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
-                                        const sal_Char* pszSection, const sal_Char* pszEntry,
-                                        sal_Char* pszString, sal_uInt32 MaxLen,
-                                        const sal_Char* pszDefault)
-{
-    sal_uInt32    NoEntry;
-    const sal_Char* pStr = 0;
-    osl_TProfileSection* pSec;
-    osl_TProfileImpl*    pProfile = 0;
-
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_readProfileString\n");
-#endif
-
-    pProfile = acquireProfile(Profile, sal_False);
-
-    if (pProfile == NULL)
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_readProfileString [pProfile==0]\n");
-#endif
-
-
-        return (sal_False);
-    }
-
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != NULL) &&
-            (NoEntry < pSec->m_NoEntries) &&
-            ((pStr = strchr(pProfile->m_Lines[pSec->m_Entries[NoEntry].m_Line],
-                            '=')) != NULL))
-            pStr++;
-        else
-            pStr = pszDefault;
-
-        if ( pStr != 0 )
-        {
-            pStr = stripBlanks(pStr, NULL);
-            MaxLen = (MaxLen - 1 < strlen(pStr)) ? (MaxLen - 1) : strlen(pStr);
-            pStr = stripBlanks(pStr, &MaxLen);
-            strncpy(pszString, pStr, MaxLen);
-            pszString[MaxLen] = '\0';
-        }
-    }
-    else
-        PrfQueryProfileString(pProfile->m_hIni, (PCSZ)pszSection,
-                              (PCSZ)pszEntry, (PCSZ)pszDefault,
-                              pszString, MaxLen);
-
-    releaseProfile(pProfile);
-
-    if ( pStr == 0 )
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_readProfileString [pStr==0]\n");
-#endif
-
-
-        return (sal_False);
-    }
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_readProfileString [ok]\n");
-#endif
-
-    return (sal_True);
-}
-
-
-sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
-                            const sal_Char* pszSection, const sal_Char* pszEntry,
-                            sal_Bool Default)
-{
-    sal_Char Line[32];
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_readProfileBool\n");
-#endif
-
-    if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), ""))
-    {
-        if ((stricmp(Line, STR_INI_BOOLYES) == 0) ||
-            (stricmp(Line, STR_INI_BOOLON)  == 0) ||
-            (stricmp(Line, STR_INI_BOOLONE) == 0))
-            Default = sal_True;
-        else
-            if ((stricmp(Line, STR_INI_BOOLNO)   == 0) ||
-                (stricmp(Line, STR_INI_BOOLOFF)  == 0) ||
-                (stricmp(Line, STR_INI_BOOLZERO) == 0))
-                Default = sal_False;
-    }
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_readProfileBool [ok]\n");
-#endif
-
-    return (Default);
-}
-
-
-sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
-                              const sal_Char* pszSection, const sal_Char* pszEntry,
-                              sal_uInt32 FirstId, const sal_Char* Strings[],
-                              sal_uInt32 Default)
-{
-    sal_uInt32    i;
-    sal_Char        Line[256];
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_readProfileIdent\n");
-#endif
-
-    if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), ""))
-    {
-        i = 0;
-        while (Strings[i] != NULL)
-        {
-            if (stricmp(Line, Strings[i]) == 0)
-            {
-                Default = i + FirstId;
-                break;
-            }
-            i++;
-        }
-    }
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_readProfileIdent [ok]\n");
-#endif
-    return (Default);
-}
-
-
-sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
-                               const sal_Char* pszSection, const sal_Char* pszEntry,
-                               const sal_Char* pszString)
-{
-    sal_uInt32    i;
-    sal_Bool bRet = sal_False;
-    sal_uInt32    NoEntry;
-    const sal_Char* pStr;
-    sal_Char        Line[4096];
-    osl_TProfileSection* pSec;
-    osl_TProfileImpl*    pProfile = 0;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_writeProfileString\n");
-#endif
-
-    pProfile = acquireProfile(Profile, sal_True);
-
-    if (pProfile == NULL)
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_writeProfileString [pProfile==0]\n");
-#endif
-        return (sal_False);
-    }
-
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        if ((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) == NULL)
-        {
-            Line[0] = '\0';
-            addLine(pProfile, Line);
-
-            Line[0] = '[';
-            strcpy(&Line[1], pszSection);
-            Line[1 + strlen(pszSection)] = ']';
-            Line[2 + strlen(pszSection)] = '\0';
-
-            if (((pStr = addLine(pProfile, Line)) == NULL) ||
-                (! addSection(pProfile, pProfile->m_NoLines - 1, &pStr[1], strlen(pszSection))))
-            {
-                releaseProfile(pProfile);
-#ifdef TRACE_OSL_PROFILE
-                OSL_TRACE("Out osl_writeProfileString [not added]\n");
-#endif
-                return (sal_False);
-            }
-
-            pSec = &pProfile->m_Sections[pProfile->m_NoSections - 1];
-            NoEntry = pSec->m_NoEntries;
-        }
-
-        Line[0] = '\0';
-        strcpy(&Line[0], pszEntry);
-        Line[0 + strlen(pszEntry)] = '=';
-        strcpy(&Line[1 + strlen(pszEntry)], pszString);
-
-        if (NoEntry >= pSec->m_NoEntries)
-        {
-            if (pSec->m_NoEntries > 0)
-                i = pSec->m_Entries[pSec->m_NoEntries - 1].m_Line + 1;
-            else
-                i = pSec->m_Line + 1;
-
-            if (((pStr = insertLine(pProfile, Line, i)) == NULL) ||
-                (! addEntry(pProfile, pSec, i, pStr, strlen(pszEntry))))
-            {
-                releaseProfile(pProfile);
-#ifdef TRACE_OSL_PROFILE
-                OSL_TRACE("Out osl_writeProfileString [not inserted]\n");
-#endif
-                return (sal_False);
-            }
-
-            pProfile->m_Flags |= FLG_MODIFIED;
-        }
-        else
-        {
-            i = pSec->m_Entries[NoEntry].m_Line;
-            free(pProfile->m_Lines[i]);
-            pProfile->m_Lines[i] = strdup(Line);
-            setEntry(pProfile, pSec, NoEntry, i, pProfile->m_Lines[i], strlen(pszEntry));
-
-            pProfile->m_Flags |= FLG_MODIFIED;
-        }
-    }
-    else
-        PrfWriteProfileString(pProfile->m_hIni, (PCSZ)pszSection,
-                              (PCSZ)pszEntry, (PCSZ)pszString);
-
-    bRet = releaseProfile(pProfile);
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_writeProfileString [ok]\n");
-#endif
-    return bRet;
-}
-
-
-sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
-                             const sal_Char* pszSection, const sal_Char* pszEntry,
-                             sal_Bool Value)
-{
-    sal_Bool bRet = sal_False;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_writeProfileBool\n");
-#endif
-
-    if (Value)
-        bRet=osl_writeProfileString(Profile, pszSection, pszEntry, STR_INI_BOOLONE);
-    else
-        bRet=osl_writeProfileString(Profile, pszSection, pszEntry, STR_INI_BOOLZERO);
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_writeProfileBool [ok]\n");
-#endif
-
-    return bRet;
-}
-
-
-sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
-                              const sal_Char* pszSection, const sal_Char* pszEntry,
-                              sal_uInt32 FirstId, const sal_Char* Strings[],
-                              sal_uInt32 Value)
-{
-    int i, n;
-    sal_Bool bRet = sal_False;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_writeProfileIdent\n");
-#endif
-
-    for (n = 0; Strings[n] != NULL; n++);
-
-    if ((i = Value - FirstId) >= n)
-        bRet=sal_False;
-    else
-        bRet=osl_writeProfileString(Profile, pszSection, pszEntry, Strings[i]);
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_writeProfileIdent\n");
-#endif
-    return bRet;
-}
-
-
-sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
-                               const sal_Char *pszSection, const sal_Char *pszEntry)
-{
-    sal_uInt32    NoEntry;
-    osl_TProfileSection* pSec;
-    osl_TProfileImpl*    pProfile = 0;
-    sal_Bool bRet = sal_False;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_removeProfileEntry\n");
-#endif
-
-    pProfile = acquireProfile(Profile, sal_True);
-
-    if (pProfile == NULL)
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]\n");
-#endif
-
-
-        return (sal_False);
-    }
-
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != NULL) &&
-            (NoEntry < pSec->m_NoEntries))
-        {
-            removeLine(pProfile, pSec->m_Entries[NoEntry].m_Line);
-            removeEntry(pSec, NoEntry);
-            if (pSec->m_NoEntries == 0)
-            {
-                removeLine(pProfile, pSec->m_Line);
-
-                /* remove any empty separation line */
-                if ((pSec->m_Line > 0) && (pProfile->m_Lines[pSec->m_Line - 1][0] == '\0'))
-                    removeLine(pProfile, pSec->m_Line - 1);
-
-                removeSection(pProfile, pSec);
-            }
-
-            pProfile->m_Flags |= FLG_MODIFIED;
-        }
-    }
-    else
-        PrfWriteProfileString(pProfile->m_hIni, (PCSZ)pszSection, (PCSZ)pszEntry, NULL);
-
-    bRet = releaseProfile(pProfile);
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_removeProfileEntry [ok]\n");
-#endif
-    return bRet;
-}
-
-
-sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_Char *pszSection,
-                                      sal_Char* pszBuffer, sal_uInt32 MaxLen)
-{
-    sal_uInt32    i, n = 0;
-    sal_uInt32    NoEntry;
-    osl_TProfileSection* pSec;
-    osl_TProfileImpl*    pProfile = 0;
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  osl_getProfileSectionEntries\n");
-#endif
-
-    pProfile = acquireProfile(Profile, sal_False);
-
-    if (pProfile == NULL)
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]\n");
-#endif
-
-
-        return (0);
-    }
-
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        if ((pSec = findEntry(pProfile, pszSection, "", &NoEntry)) != NULL)
-        {
-            if (MaxLen != 0)
-            {
-                for (i = 0; i < pSec->m_NoEntries; i++)
-                {
-                    if ((n + pSec->m_Entries[i].m_Len + 1) < MaxLen)
-                    {
-                        strncpy(&pszBuffer[n], &pProfile->m_Lines[pSec->m_Entries[i].m_Line]
-                                [pSec->m_Entries[i].m_Offset], pSec->m_Entries[i].m_Len);
-                        n += pSec->m_Entries[i].m_Len;
-                        pszBuffer[n++] = '\0';
-                    }
-                    else
-                        break;
-
-                }
-
-                pszBuffer[n++] = '\0';
-            }
-            else
-            {
-                for (i = 0; i < pSec->m_NoEntries; i++)
-                    n += pSec->m_Entries[i].m_Len + 1;
-
-                n += 1;
-            }
-        }
-        else
-            n = 0;
-    }
-    else
-        n = PrfQueryProfileString(pProfile->m_hIni, (PCSZ)pszSection, NULL, NULL,
-                                    pszBuffer, MaxLen );
-
-    releaseProfile(pProfile);
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out osl_getProfileSectionEntries [ok]\n");
-#endif
-
-    return (n);
-}
-
-sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuffer, sal_uInt32 MaxLen)
-{
-    sal_uInt32    i, n = 0;
-    osl_TProfileSection* pSec;
-    osl_TProfileImpl*    pProfile = acquireProfile(Profile, sal_False);
-
-    if (pProfile == NULL)
-        return (0);
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        if (MaxLen != 0)
-        {
-             for (i = 0; i < pProfile->m_NoSections; i++)
-            {
-                pSec = &pProfile->m_Sections[i];
-
-                if ((n + pSec->m_Len + 1) < MaxLen)
-                {
-                    strncpy(&pszBuffer[n], &pProfile->m_Lines[pSec->m_Line][pSec->m_Offset],
-                            pSec->m_Len);
-                    n += pSec->m_Len;
-                    pszBuffer[n++] = '\0';
-                }
-                else
-                    break;
-            }
-
-            pszBuffer[n++] = '\0';
-        }
-        else
-        {
-             for (i = 0; i < pProfile->m_NoSections; i++)
-                n += pProfile->m_Sections[i].m_Len + 1;
-
-            n += 1;
-        }
-    }
-    else
-        n = PrfQueryProfileString(pProfile->m_hIni, NULL, NULL, NULL,
-                                    pszBuffer, MaxLen );
-
-    releaseProfile(pProfile);
-
-    return (n);
-}
-
-#if 0 // YD
-sal_Bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName)
-{
-    sal_Bool bFailed;
-    sal_Char File[_MAX_PATH];
-    sal_Char Path[_MAX_PATH];
-    sal_uInt32  nFileLen;
-    sal_uInt32  nPathLen = 0;
-
-    rtl_uString * strTmp = NULL;
-    oslFileError nError;
-
-    /* build file name */
-    if (strName && strName->length)
-    {
-        if(strName->length >= _MAX_PATH)
-            return sal_False;
-
-        strcpy(File, (char*)strName->buffer);
-        nFileLen = strName->length;
-
-        if (rtl_ustr_indexOfChar( File, L'.' ) == -1)
-        {
-            if (nFileLen + strlen(STR_INI_EXTENSION) >= _MAX_PATH)
-                return sal_False;
-
-            /* add default extension */
-            strcpy(File + nFileLen, STR_INI_EXTENSION);
-            nFileLen += strlen(STR_INI_EXTENSION);
-        }
-    }
-    else
-    {
-        rtl_uString *strProgName = NULL;
-        sal_Unicode *pProgName;
-        sal_Int32 nOffset = 0;
-        sal_Int32 nLen;
-        sal_Int32 nPos;
-
-        if (osl_getExecutableFile(&strProgName) != osl_Process_E_None)
-            return sal_False;
-
-        /* remove path and extension from filename */
-        pProgName = strProgName->buffer;
-        nLen = strProgName->length ;
-
-        if ((nPos = rtl_ustr_lastIndexOfChar( pProgName, L'/' )) != -1)
-            nOffset = nPos + 1;
-        else if ((nPos = rtl_ustr_lastIndexOfChar( pProgName, L':' )) != -1)
-            nOffset = nPos + 1;
-
-        if ((nPos = rtl_ustr_lastIndexOfChar( pProgName, L'.' )) != -1 )
-            nLen -= 4;
-
-        if ((nFileLen = nLen - nOffset) >= _MAX_PATH)
-            return sal_False;
-
-        strncpy(File, pProgName + nOffset, nFileLen);
-
-        if (nFileLen + strlen(STR_INI_EXTENSION) >= _MAX_PATH)
-            return sal_False;
-
-        /* add default extension */
-        strcpy(File + nFileLen, STR_INI_EXTENSION);
-        nFileLen += strlen(STR_INI_EXTENSION);
-
-        rtl_uString_release( strProgName );
-    }
-
-    if (File[0] == 0)
-        return sal_False;
-
-    /* build directory path */
-    if (strPath && strPath->length)
-    {
-        sal_Unicode *pPath = rtl_uString_getStr(strPath);
-        sal_Int32 nLen = rtl_uString_getLength(strPath);
-
-        if ((rtl_ustr_ascii_compare_WithLength(pPath, RTL_CONSTASCII_LENGTH(STR_INI_METAHOME) , STR_INI_METAHOME) == 0) &&
-            ((nLen == RTL_CONSTASCII_LENGTH(STR_INI_METAHOME)) || (pPath[RTL_CONSTASCII_LENGTH(STR_INI_METAHOME)] == '/')))
-        {
-            rtl_uString * strHome = NULL;
-            oslSecurity security = osl_getCurrentSecurity();
-
-            bFailed = ! osl_getHomeDir(security, &strHome);
-            osl_freeSecurityHandle(security);
-
-            if (bFailed) return (sal_False);
-
-            if (strHome->length >= _MAX_PATH)
-                return sal_False;
-
-            strcpy( Path, strHome->buffer);
-            nPathLen = strHome->length;
-
-            if (nLen > RTL_CONSTASCII_LENGTH(STR_INI_METAHOME))
-            {
-                pPath += RTL_CONSTASCII_LENGTH(STR_INI_METAHOME);
-                nLen -= RTL_CONSTASCII_LENGTH(STR_INI_METAHOME);
-
-                if (nLen + nPathLen >= _MAX_PATH)
-                    return sal_False;
-
-                strcpy(Path + nPathLen, pPath);
-                nPathLen += nLen;
-            }
-
-            rtl_uString_release(strHome);
-        }
-
-        else if ((rtl_ustr_ascii_compare_WithLength(pPath, RTL_CONSTASCII_LENGTH(STR_INI_METACFG), STR_INI_METACFG) == 0) &&
-            ((nLen == RTL_CONSTASCII_LENGTH(STR_INI_METACFG)) || (pPath[RTL_CONSTASCII_LENGTH(STR_INI_METACFG)] == '/')))
-        {
-            rtl_uString * strConfig = NULL;
-            oslSecurity security = osl_getCurrentSecurity();
-
-            bFailed = ! osl_getConfigDir(security, &strConfig);
-            osl_freeSecurityHandle(security);
-
-            if (bFailed) return (sal_False);
-
-            if (strConfig->length >= _MAX_PATH)
-                return sal_False;
-
-            strcpy( Path, strConfig->buffer);
-            nPathLen = strConfig->length;
-
-            if (nLen > RTL_CONSTASCII_LENGTH(STR_INI_METACFG))
-            {
-                pPath += RTL_CONSTASCII_LENGTH(STR_INI_METACFG);
-                nLen -= RTL_CONSTASCII_LENGTH(STR_INI_METACFG);
-
-                if (nLen + nPathLen >= _MAX_PATH)
-                    return sal_False;
-
-                strcpy(Path + nPathLen, pPath);
-                nPathLen += nLen;
-            }
-
-            rtl_uString_release(strConfig);
-        }
-
-        else if ((rtl_ustr_ascii_compare_WithLength(pPath, RTL_CONSTASCII_LENGTH(STR_INI_METASYS), STR_INI_METASYS) == 0) &&
-            ((nLen == RTL_CONSTASCII_LENGTH(STR_INI_METASYS)) || (pPath[RTL_CONSTASCII_LENGTH(STR_INI_METASYS)] == '/')))
-        {
-            if (((nPathLen = GetWindowsDirectoryW(Path, _MAX_PATH)) == 0) || (nPathLen >= _MAX_PATH))
-                return (sal_False);
-
-            if (nLen > RTL_CONSTASCII_LENGTH(STR_INI_METASYS))
-            {
-                pPath += RTL_CONSTASCII_LENGTH(STR_INI_METASYS);
-                nLen -= RTL_CONSTASCII_LENGTH(STR_INI_METASYS);
-
-                if (nLen + nPathLen >= MAX_PATH)
-                    return sal_False;
-
-                strcpy(Path + nPathLen, pPath);
-                nPathLen += nLen;
-            }
-        }
-
-        else if ((rtl_ustr_ascii_compare_WithLength(pPath, RTL_CONSTASCII_LENGTH(STR_INI_METAINS), STR_INI_METAINS) == 0) &&
-            ((nLen == RTL_CONSTASCII_LENGTH(STR_INI_METAINS)) || (pPath[RTL_CONSTASCII_LENGTH(STR_INI_METAINS)] == '/') ||
-                (pPath[RTL_CONSTASCII_LENGTH(STR_INI_METAINS)] == '"') ) )
-        {
-            if (! lookupProfile(pPath + RTL_CONSTASCII_LENGTH(STR_INI_METAINS), File, Path))
-                return (sal_False);
-
-            nPathLen = strlen(Path);
-        }
-
-        else if(nLen < MAX_PATH)
-        {
-            strcpy(Path, pPath);
-            nPathLen = strlen(Path);
-        }
-        else
-            return sal_False;
-    }
-    else
-    {
-        rtl_uString * strConfigDir = NULL;
-        oslSecurity security = osl_getCurrentSecurity();
-
-        bFailed = ! osl_getConfigDir(security, &strConfigDir);
-        osl_freeSecurityHandle(security);
-
-        if (bFailed) return (sal_False);
-        if (strConfigDir->length >= MAX_PATH)
-            return sal_False;
-
-        strcpy(Path, strConfigDir->buffer);
-        nPathLen = strConfigDir->length;
-    }
-
-    if (nPathLen && (Path[nPathLen - 1] != L'/') && (Path[nPathLen - 1] != L'\\'))
-    {
-        Path[nPathLen++] = L'\\';
-        Path[nPathLen] = 0;
-    }
-
-    if (nPathLen + nFileLen >= MAX_PATH)
-        return sal_False;
-
-    /* append file name */
-    strcpy(Path + nPathLen, File);
-    nPathLen += nFileLen;
-
-    /* copy filename */
-    rtl_uString_newFromStr_WithLength(&strTmp, Path, nPathLen);
-    nError = osl_getFileURLFromSystemPath(strTmp, strProfileName);
-    rtl_uString_release(strTmp);
-
-    return nError == osl_File_E_None;
-}
-#endif // 0 // YD
-
-
-/*****************************************************************************/
-/* Static Module Functions */
-/*****************************************************************************/
-
-static osl_TStamp getFileStamp(osl_TFile* pFile)
-{
-    osl_TStamp  FileTime;
-    FILESTATUS3 FileStatus;
-    sal_uInt32  Bytes;
-
-    Bytes = sizeof( FILESTATUS3 );
-    if ( (!pFile->m_Handle) ||
-        DosQueryFileInfo(pFile->m_Handle, FIL_STANDARD, &FileStatus, Bytes))
-        memset(&FileTime, 0, sizeof(FileTime));
-    else
-    {
-        FileTime.m_Date = FileStatus.fdateLastWrite;
-        FileTime.m_Time = FileStatus.ftimeLastWrite;
-    }
-
-    return (FileTime);
-}
-
-static sal_Bool lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
-{
-    sal_uInt32  status = 1;
-    FILELOCK    Lock;
-
-    if (!pFile->m_Handle)
-        return (sal_False);
-
-    Lock.lOffset = 0;
-    Lock.lRange  = 0xFFFFFFFF;
-
-    switch (eMode)
-    {
-        case un_lock:
-            status = DosSetFileLocks(pFile->m_Handle, &Lock, NULL, 1000, 0);
-            break;
-
-        case read_lock:
-            status = DosSetFileLocks(pFile->m_Handle, NULL, &Lock, 1000, 1);
-            break;
-
-        case write_lock:
-            status = DosSetFileLocks(pFile->m_Handle, NULL, &Lock, 1000, 0);
-            break;
-    }
-
-    return (status == 0);
-}
-
-//static osl_TFile* openFile(rtl_uString* pszFilename, sal_Bool bWriteable)
-static osl_TFile* openFileImpl(rtl_uString *ustrFileName, oslProfileOption ProfileFlags )
-{
-    sal_uInt32  action;
-    APIRET      rc;
-    osl_TFile*  pFile = (osl_TFile*)calloc(1, sizeof(osl_TFile));
-
-        ULONG attributes;
-        ULONG flags;
-        ULONG mode;
-    sal_Bool bWriteable = sal_False;
-    rtl_String* strFileName=0;
-    sal_Char* pszFileName=0;
-
-    /* check parameters */
-    OSL_ASSERT( ustrFileName );
-
-    rtl_uString2String( &strFileName,
-                            rtl_uString_getStr(ustrFileName),
-                            rtl_uString_getLength(ustrFileName),
-                            osl_getThreadTextEncoding(),
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-    pszFileName = rtl_string_getStr(strFileName);
-
-/*    if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE | osl_Profile_READWRITE ) )*/
-    if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) )
-    {
-#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("setting bWriteable to TRUE\n");
-#endif
-        bWriteable=sal_True;
-    }
-
-        if (bWriteable)
-        {
-            flags = FILE_NORMAL | FILE_ARCHIVED;
-            attributes = OPEN_ACTION_CREATE_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS;
-            mode = OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE;
-        }
-        else
-        {
-            flags = FILE_NORMAL;
-            attributes = OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS;
-               mode = OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY;
-        }
-
-        if (rc = DosOpen((PCSZ)pszFileName, &pFile->m_Handle, &action, 0, flags, attributes, mode, NULL))
-        {
-            if (rc == ERROR_TOO_MANY_OPEN_FILES)
-            {
-                LONG fhToAdd = 10;
-                ULONG fhOld = 0;
-                rc = DosSetRelMaxFH(&fhToAdd, &fhOld);
-                rc = DosOpen((PCSZ)pszFileName, &pFile->m_Handle, &action, 0, flags, attributes, mode, NULL);
-            }
-        }
-
-        if ( (rc != NO_ERROR) && bWriteable)
-        {
-            free(pFile);
-            rtl_string_release(strFileName);
-              return (NULL);
-        }
-
-    rtl_string_release(strFileName);
-
-    pFile->m_pWriteBuf=0;
-    pFile->m_nWriteBufFree=0;
-    pFile->m_nWriteBufLen=0;
-
-    if ( ProfileFlags & (osl_Profile_WRITELOCK | osl_Profile_READLOCK ) )
-    {
-#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("locking '%s' file\n",pszFilename);
-#endif
-
-        lockFile(pFile, bWriteable ? write_lock : read_lock);
-    }
-
-    /* mfe: new WriteBuf obsolete */
-/*  pFile->m_pWritePtr = pFile->m_Buf;*/
-/*  pFile->m_pReadPtr  = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);*/
-
-    return (pFile);
-}
-
-//static osl_TStamp closeFile(osl_TFile* pFile)
-static osl_TStamp closeFileImpl(osl_TFile* pFile)
-{
-    osl_TStamp stamp = {0, 0};
-
-    if ( pFile == 0 )
-    {
-        return stamp;
-    }
-
-    if (pFile->m_Handle)
-    {
-        /* mfe: new WriteBuf obsolete */
-        /* we just closing the file here, DO NOT write, it has to be handled in higher levels */
-        //if (pFile->m_pWritePtr > pFile->m_WriteBuf)
-        //{
-        //  sal_uInt32 Bytes;
-
-        //  DosWrite(pFile->m_Handle, pFile->m_WriteBuf,
-        //           pFile->m_pWritePtr - pFile->m_WriteBuf,
-        //           &Bytes);
-        //}
-
-        stamp = getFileStamp(pFile);
-
-        lockFile(pFile, un_lock);
-
-        DosClose(pFile->m_Handle);
-    }
-
-    if ( pFile->m_pWriteBuf != 0 )
-    {
-        free(pFile->m_pWriteBuf);
-    }
-
-    free(pFile);
-
-    return(stamp);
-}
-
-static sal_Bool rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
-{
-    if (pFile->m_Handle)
-    {
-        sal_uInt32 Position;
-
-        /* mfe: new WriteBuf obsolete */
-        /* we just closing the file here, DO NOT write, it has to be handled in higher levels */
-        /* if (pFile->m_pWritePtr > pFile->m_WriteBuf)
-        {
-            sal_uInt32 Bytes;
-
-            DosWrite(pFile->m_Handle, pFile->m_WriteBuf,
-                     pFile->m_pWritePtr - pFile->m_WriteBuf,
-                     &Bytes);
-
-            pFile->m_pWritePtr = pFile->m_WriteBuf;
-        } */
-
-        pFile->m_pReadPtr = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);
-
-        DosSetFilePtr(pFile->m_Handle, 0, FILE_BEGIN, &Position);
-
-        if (bTruncate)
-            DosSetFileSize(pFile->m_Handle, 0);
-    }
-
-    return (sal_True);
-}
-
-static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen)
-{
-    int   Free, Bytes;
-    sal_Char* pChr;
-    sal_Char* pLine = (sal_Char *)pszLine;
-    sal_uInt32  Max;
-
-    if (pFile->m_Handle == 0)
-        return (sal_False);
-
-    MaxLen -= 1;
-
-    do
-    {
-        Bytes = sizeof(pFile->m_ReadBuf) - (pFile->m_pReadPtr - pFile->m_ReadBuf);
-
-        if (Bytes <= 1)
-        {
-            /* refill buffer */
-            memcpy(pFile->m_ReadBuf, pFile->m_pReadPtr, Bytes);
-            pFile->m_pReadPtr = pFile->m_ReadBuf;
-
-            Free = sizeof(pFile->m_ReadBuf) - Bytes;
-
-            if (DosRead(pFile->m_Handle, &pFile->m_ReadBuf[Bytes], Free, &Max))
-            {
-                *pLine = '\0';
-                return (sal_False);
-            }
-
-            if (Max < Free)
-            {
-                if ((Max == 0) && (pLine == pszLine))
-                {
-                    *pLine = '\0';
-                    return (sal_False);
-                }
-
-                pFile->m_ReadBuf[Bytes + Max] = '\0';
-            }
-        }
-
-        for (pChr = pFile->m_pReadPtr;
-             (*pChr != '\n') && (*pChr != '\r') && (*pChr != '\0') &&
-             (pChr < (pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf) - 1));
-             pChr++);
-
-        Max = min(pChr - pFile->m_pReadPtr, MaxLen);
-        memcpy(pLine, pFile->m_pReadPtr, Max);
-        MaxLen -= Max;
-        pLine  += Max;
-
-        if (pChr < (pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf) - 1))
-        {
-            if (*pChr != '\0')
-            {
-                if ((pChr[0] == '\r') && (pChr[1] == '\n'))
-                    pChr += 2;
-                else
-                    pChr += 1;
-            }
-
-            if ((pChr < (pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf))) &&
-                (*pChr == '\0'))
-                pChr = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);
-
-            *pLine = '\0';
-
-            /* setting MaxLen to -1 indicates terminating read loop */
-            MaxLen = -1;
-        }
-
-        pFile->m_pReadPtr = pChr;
-    }
-    while (MaxLen > 0);
-
-    return (sal_True);
-}
-
-static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine)
-{
-    unsigned int Len = strlen(pszLine);
-
-#ifdef DEBUG_OSL_PROFILE
-    int strLen=0;
-#endif
-
-    if ( pFile == 0 || pFile->m_Handle < 0 )
-    {
-        return (sal_False);
-    }
-
-    if ( pFile->m_pWriteBuf == 0 )
-    {
-        pFile->m_pWriteBuf = (sal_Char*) malloc(Len+3);
-        pFile->m_nWriteBufLen = Len+3;
-        pFile->m_nWriteBufFree = Len+3;
-    }
-    else
-    {
-        if ( pFile->m_nWriteBufFree <= Len + 3 )
-        {
-            sal_Char* pTmp;
-
-            pTmp=(sal_Char*) realloc(pFile->m_pWriteBuf,( ( pFile->m_nWriteBufLen + Len ) * 2) );
-            if ( pTmp == 0 )
-            {
-                return sal_False;
-            }
-            pFile->m_pWriteBuf = pTmp;
-            pFile->m_nWriteBufFree = pFile->m_nWriteBufFree + pFile->m_nWriteBufLen + ( 2 * Len );
-            pFile->m_nWriteBufLen = ( pFile->m_nWriteBufLen + Len ) * 2;
-            memset( (pFile->m_pWriteBuf) + ( pFile->m_nWriteBufLen - pFile->m_nWriteBufFree ), 0, pFile->m_nWriteBufFree);
-        }
-    }
-
-
-
-    memcpy(pFile->m_pWriteBuf + ( pFile->m_nWriteBufLen - pFile->m_nWriteBufFree ),pszLine,Len+1);
-#ifdef DEBUG_OSL_PROFILE
-    strLen = strlen(pFile->m_pWriteBuf);
-#endif
-    pFile->m_pWriteBuf[pFile->m_nWriteBufLen - pFile->m_nWriteBufFree + Len]='\r';
-    pFile->m_pWriteBuf[pFile->m_nWriteBufLen - pFile->m_nWriteBufFree + Len + 1]='\n';
-    pFile->m_pWriteBuf[pFile->m_nWriteBufLen - pFile->m_nWriteBufFree + Len + 2]='\0';
-
-    pFile->m_nWriteBufFree-=Len+2;
-
-#ifdef DEBUG_OSL_PROFILE
-/*    OSL_TRACE("File Buffer in _putLine '%s' '%i'(%i)\n",pFile->m_pWriteBuf,strlen(pFile->m_pWriteBuf),pFile->m_nWriteBufLen - pFile->m_nWriteBufFree);*/
-#endif
-
-    return (sal_True);
-}
-
-/* platform specific end */
-
-static const sal_Char* stripBlanks(const sal_Char* String, sal_uInt32* pLen)
-{
-    if  ( (pLen != NULL) && ( *pLen != 0 ) )
-    {
-        while ((String[*pLen - 1] == ' ') || (String[*pLen - 1] == '\t'))
-            (*pLen)--;
-
-        while ((*String == ' ') || (*String == '\t'))
-        {
-            String++;
-            (*pLen)--;
-        }
-    }
-    else
-        while ((*String == ' ') || (*String == '\t'))
-            String++;
-
-    return (String);
-}
-
-static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line)
-{
-    if (pProfile->m_NoLines >= pProfile->m_MaxLines)
-    {
-        if (pProfile->m_Lines == NULL)
-        {
-            pProfile->m_MaxLines = LINES_INI;
-            pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines * sizeof(sal_Char *));
-        }
-        else
-        {
-            pProfile->m_MaxLines += LINES_ADD;
-            pProfile->m_Lines = (sal_Char **)realloc(pProfile->m_Lines,
-                                                 pProfile->m_MaxLines * sizeof(sal_Char *));
-        }
-
-        if (pProfile->m_Lines == NULL)
-        {
-            pProfile->m_NoLines  = 0;
-            pProfile->m_MaxLines = 0;
-            return (NULL);
-        }
-
-    }
-
-    pProfile->m_Lines[pProfile->m_NoLines++] = strdup(Line);
-
-    return (pProfile->m_Lines[pProfile->m_NoLines - 1]);
-}
-
-static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sal_uInt32 LineNo)
-{
-    if (pProfile->m_NoLines >= pProfile->m_MaxLines)
-    {
-        if (pProfile->m_Lines == NULL)
-        {
-            pProfile->m_MaxLines = LINES_INI;
-            pProfile->m_Lines = (sal_Char **)malloc(pProfile->m_MaxLines * sizeof(sal_Char *));
-        }
-        else
-        {
-            pProfile->m_MaxLines += LINES_ADD;
-            pProfile->m_Lines = (sal_Char **)realloc(pProfile->m_Lines,
-                                                 pProfile->m_MaxLines * sizeof(sal_Char *));
-        }
-
-        if (pProfile->m_Lines == NULL)
-        {
-            pProfile->m_NoLines  = 0;
-            pProfile->m_MaxLines = 0;
-            return (NULL);
-        }
-
-    }
-
-    LineNo = LineNo > pProfile->m_NoLines ? pProfile->m_NoLines : LineNo;
-
-    if (LineNo < pProfile->m_NoLines)
-    {
-        sal_uInt32 i, n;
-        osl_TProfileSection* pSec;
-
-        memmove(&pProfile->m_Lines[LineNo + 1], &pProfile->m_Lines[LineNo],
-                (pProfile->m_NoLines - LineNo) * sizeof(sal_Char *));
-
-        /* adjust line references */
-        for (i = 0; i < pProfile->m_NoSections; i++)
-        {
-            pSec = &pProfile->m_Sections[i];
-
-            if (pSec->m_Line >= LineNo)
-                pSec->m_Line++;
-
-            for (n = 0; n < pSec->m_NoEntries; n++)
-                if (pSec->m_Entries[n].m_Line >= LineNo)
-                    pSec->m_Entries[n].m_Line++;
-        }
-    }
-
-    pProfile->m_NoLines++;
-
-    pProfile->m_Lines[LineNo] = strdup(Line);
-
-    return (pProfile->m_Lines[LineNo]);
-}
-
-static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo)
-{
-    if (LineNo < pProfile->m_NoLines)
-    {
-        free(pProfile->m_Lines[LineNo]);
-        if (pProfile->m_NoLines - LineNo > 1)
-        {
-            sal_uInt32 i, n;
-            osl_TProfileSection* pSec;
-
-            memmove(&pProfile->m_Lines[LineNo], &pProfile->m_Lines[LineNo + 1],
-                    (pProfile->m_NoLines - LineNo - 1) * sizeof(sal_Char *));
-
-            /* adjust line references */
-            for (i = 0; i < pProfile->m_NoSections; i++)
-            {
-                pSec = &pProfile->m_Sections[i];
-
-                if (pSec->m_Line > LineNo)
-                    pSec->m_Line--;
-
-                for (n = 0; n < pSec->m_NoEntries; n++)
-                    if (pSec->m_Entries[n].m_Line > LineNo)
-                        pSec->m_Entries[n].m_Line--;
-            }
-        }
-        else
-        {
-            pProfile->m_Lines[LineNo] = 0;
-        }
-
-        pProfile->m_NoLines--;
-    }
-
-    return;
-}
-
-static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection,
-                     sal_uInt32 NoEntry, sal_uInt32 Line,
-                     const sal_Char* Entry, sal_uInt32 Len)
-{
-    Entry = stripBlanks(Entry, &Len);
-    pSection->m_Entries[NoEntry].m_Line   = Line;
-    pSection->m_Entries[NoEntry].m_Offset = Entry - pProfile->m_Lines[Line];
-    pSection->m_Entries[NoEntry].m_Len    = Len;
-
-    return;
-}
-
-static sal_Bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection,
-                        int Line, const sal_Char* Entry, sal_uInt32 Len)
-{
-    if (pSection != NULL)
-    {
-        if (pSection->m_NoEntries >= pSection->m_MaxEntries)
-        {
-            if (pSection->m_Entries == NULL)
-            {
-                pSection->m_MaxEntries = ENTRIES_INI;
-                pSection->m_Entries = (osl_TProfileEntry *)malloc(
-                                pSection->m_MaxEntries * sizeof(osl_TProfileEntry));
-            }
-            else
-            {
-                pSection->m_MaxEntries += ENTRIES_ADD;
-                pSection->m_Entries = (osl_TProfileEntry *)realloc(pSection->m_Entries,
-                                pSection->m_MaxEntries * sizeof(osl_TProfileEntry));
-            }
-
-            if (pSection->m_Entries == NULL)
-            {
-                pSection->m_NoEntries  = 0;
-                pSection->m_MaxEntries = 0;
-                return (sal_False);
-            }
-        }
-
-        pSection->m_NoEntries++;
-
-        Entry = stripBlanks(Entry, &Len);
-        setEntry(pProfile, pSection, pSection->m_NoEntries - 1, Line,
-                 Entry, Len);
-
-        return (sal_True);
-    }
-
-    return (sal_False);
-}
-
-static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry)
-{
-    if (NoEntry < pSection->m_NoEntries)
-    {
-        if (pSection->m_NoEntries - NoEntry > 1)
-            memmove(&pSection->m_Entries[NoEntry],
-                    &pSection->m_Entries[NoEntry + 1],
-                    (pSection->m_NoEntries - NoEntry - 1) * sizeof(osl_TProfileEntry));
-        pSection->m_NoEntries--;
-    }
-
-    return;
-}
-
-static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len)
-{
-    if (pProfile->m_NoSections >= pProfile->m_MaxSections)
-    {
-        if (pProfile->m_Sections == NULL)
-        {
-            pProfile->m_MaxSections = SECTIONS_INI;
-            pProfile->m_Sections = (osl_TProfileSection *)malloc(pProfile->m_MaxSections * sizeof(osl_TProfileSection));
-        }
-        else
-        {
-            pProfile->m_MaxSections += SECTIONS_ADD;
-            pProfile->m_Sections = (osl_TProfileSection *)realloc(pProfile->m_Sections,
-                                          pProfile->m_MaxSections * sizeof(osl_TProfileSection));
-        }
-
-        if (pProfile->m_Sections == NULL)
-        {
-            pProfile->m_NoSections = 0;
-            pProfile->m_MaxSections = 0;
-            return (sal_False);
-        }
-    }
-
-    pProfile->m_NoSections++;
-
-    pProfile->m_Sections[pProfile->m_NoSections - 1].m_Entries    = NULL;
-    pProfile->m_Sections[pProfile->m_NoSections - 1].m_NoEntries  = 0;
-    pProfile->m_Sections[pProfile->m_NoSections - 1].m_MaxEntries = 0;
-
-    Section = (sal_Char *)stripBlanks(Section, &Len);
-    pProfile->m_Sections[pProfile->m_NoSections - 1].m_Line = Line;
-    pProfile->m_Sections[pProfile->m_NoSections - 1].m_Offset = Section - pProfile->m_Lines[Line];
-    pProfile->m_Sections[pProfile->m_NoSections - 1].m_Len = Len;
-
-    return (sal_True);
-}
-
-static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection)
-{
-    sal_uInt32 Section;
-
-    if ((Section = pSection - pProfile->m_Sections) < pProfile->m_NoSections)
-    {
-        free (pSection->m_Entries);
-        if (pProfile->m_NoSections - Section > 1)
-        {
-            memmove(&pProfile->m_Sections[Section], &pProfile->m_Sections[Section + 1],
-                    (pProfile->m_NoSections - Section - 1) * sizeof(osl_TProfileSection));
-        }
-        else
-        {
-            pSection->m_Entries = 0;
-        }
-
-        pProfile->m_NoSections--;
-    }
-
-    return;
-}
-
-static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const sal_Char* Section,
-                                      const sal_Char* Entry, sal_uInt32 *pNoEntry)
-{
-static  sal_uInt32    Sect = 0;
-        sal_uInt32    i, n;
-        sal_uInt32    Len;
-        const sal_Char* pStr;
-        osl_TProfileSection* pSec;
-
-    Len = strlen(Section);
-    Section = (sal_Char *)stripBlanks(Section, &Len);
-
-    n = Sect;
-
-    for (i = 0; i < pProfile->m_NoSections; i++)
-    {
-        n %= pProfile->m_NoSections;
-        pSec = &pProfile->m_Sections[n];
-        if ((Len == pSec->m_Len) &&
-            (strnicmp(Section, &pProfile->m_Lines[pSec->m_Line][pSec->m_Offset], pSec->m_Len)
-             == 0))
-            break;
-        n++;
-    }
-
-    Sect = n;
-
-    if (i < pProfile->m_NoSections)
-    {
-        Len = strlen(Entry);
-        Entry = stripBlanks(Entry, &Len);
-
-        *pNoEntry = pSec->m_NoEntries;
-
-        for (i = 0; i < pSec->m_NoEntries; i++)
-        {
-            pStr = &pProfile->m_Lines[pSec->m_Entries[i].m_Line]
-                                     [pSec->m_Entries[i].m_Offset];
-            if ((Len == pSec->m_Entries[i].m_Len) &&
-                (strnicmp(Entry, pStr, pSec->m_Entries[i].m_Len)
-                 == 0))
-            {
-                *pNoEntry = i;
-                break;
-            }
-        }
-    }
-    else
-        pSec = NULL;
-
-    return (pSec);
-}
-
-static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
-{
-    sal_uInt32    i;
-    sal_Char*       pStr;
-    sal_Char*       pChar;
-    sal_Char        Line[1024];
-
-    pProfile->m_NoLines    = 0;
-    pProfile->m_NoSections = 0;
-
-    OSL_VERIFY(rewindFile(pFile, sal_False));
-
-    while (getLine(pFile, Line, sizeof(Line)))
-    {
-        if (! addLine(pProfile, Line))
-            return (sal_False);
-    }
-
-    for (i = 0; i < pProfile->m_NoLines; i++)
-    {
-        pStr = (sal_Char *)stripBlanks(pProfile->m_Lines[i], NULL);
-
-        if ((*pStr == '\0') || (*pStr == ';'))
-            continue;
-
-        if ((*pStr != '[') || ((pChar = strrchr(pStr, ']')) == NULL) ||
-            ((pChar - pStr) <= 2))
-        {
-            /* insert entry */
-
-            if (pProfile->m_NoSections < 1)
-                continue;
-
-            if ((pChar = strchr(pStr, '=')) == NULL)
-                pChar = pStr + strlen(pStr);
-
-            if (! addEntry(pProfile, &pProfile->m_Sections[pProfile->m_NoSections - 1],
-                           i, pStr, pChar - pStr))
-                return (sal_False);
-        }
-        else
-        {
-            /* new section */
-
-            if (! addSection(pProfile, i, pStr + 1, pChar - pStr - 1))
-                return (sal_False);
-        }
-    }
-
-    return (sal_True);
-}
-
-static sal_Bool storeProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile, sal_Bool bCleanup)
-{
-    if (pProfile->m_Lines != NULL)
-    {
-        if (pProfile->m_Flags & FLG_MODIFIED)
-        {
-            sal_uInt32 i;
-
-            OSL_VERIFY(rewindFile(pFile, sal_True));
-
-            for (i = 0; i < pProfile->m_NoLines; i++)
-                OSL_VERIFY(putLine(pFile, pProfile->m_Lines[i]));
-
-            pProfile->m_Flags &= ~FLG_MODIFIED;
-        }
-
-        if (bCleanup)
-        {
-            while (pProfile->m_NoLines > 0)
-                removeLine(pProfile, pProfile->m_NoLines - 1);
-
-            free(pProfile->m_Lines);
-            pProfile->m_Lines = NULL;
-            pProfile->m_MaxLines = 0;
-
-            while (pProfile->m_NoSections > 0)
-                removeSection(pProfile, &pProfile->m_Sections[pProfile->m_NoSections - 1]);
-
-            free(pProfile->m_Sections);
-            pProfile->m_Sections = NULL;
-            pProfile->m_MaxSections = 0;
-        }
-    }
-
-    return (sal_True);
-}
-
-static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
-{
-    osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;
-    oslProfileOption PFlags=0;
-
-
-    if ( bWriteable )
-    {
-/*          PFlags = osl_Profile_DEFAULT | osl_Profile_READWRITE; */
-        PFlags = osl_Profile_DEFAULT | osl_Profile_WRITELOCK;
-    }
-    else
-    {
-        PFlags = osl_Profile_DEFAULT;
-    }
-
-
-    if (pProfile == NULL)
-    {
-#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("AUTOOPEN MODE\n");
-#endif
-
-        if ((pProfile = (osl_TProfileImpl*)osl_openProfile(NULL, PFlags)) != NULL )
-        {
-            pProfile->m_Flags |= FLG_AUTOOPEN;
-        }
-    }
-    else
-    {
-#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("try to acquire\n");
-#endif
-
-
-
-        if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-        {
-            if (! (pProfile->m_Flags & (osl_Profile_READLOCK |
-                                        osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE)))
-            {
-                osl_TStamp Stamp;
-#ifdef DEBUG_OSL_PROFILE
-                OSL_TRACE("DEFAULT MODE\n");
-#endif
-                if (! (pProfile->m_pFile = openFileImpl(pProfile->m_strFileName, pProfile->m_Flags | PFlags)))
-                    return NULL;
-
-                Stamp = getFileStamp(pProfile->m_pFile);
-
-                if (memcmp(&Stamp, &(pProfile->m_Stamp), sizeof(osl_TStamp)))
-                {
-                    pProfile->m_Stamp = Stamp;
-
-                    loadProfile(pProfile->m_pFile, pProfile);
-                }
-            }
-            else
-            {
-#ifdef DEBUG_OSL_PROFILE
-                OSL_TRACE("READ/WRITELOCK MODE\n");
-#endif
-
-
-                /* A readlock file could not be written */
-                if ((pProfile->m_Flags & osl_Profile_READLOCK) && bWriteable)
-                {
-                    return (NULL);
-                }
-            }
-        }
-        else
-        {
-            sal_Bool bWriteable = sal_False;
-            char pszFilename[PATH_MAX] = "";
-
-            if ( pProfile->m_strFileName != 0  && pProfile->m_strFileName->buffer[0] != 0 )
-                FileURLToPath( pszFilename, PATH_MAX, pProfile->m_strFileName );
-            /* hack: usualy you have a specific HAB, but NULL works here... */
-            pProfile->m_hIni = PrfOpenProfile(NULL, (PCSZ)pszFilename);
-            if (! pProfile->m_hIni)
-                return (NULL);
-        }
-    }
-
-    return (pProfile);
-}
-
-static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
-{
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("In  releaseProfile\n");
-#endif
-
-    if ( pProfile == 0 )
-    {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out releaseProfile [profile==0]\n");
-#endif
-        return sal_False;
-    }
-
-    if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
-    {
-        if (pProfile->m_Flags & FLG_AUTOOPEN)
-        {
-#ifdef TRACE_OSL_PROFILE
-        OSL_TRACE("Out releaseProfile [AUTOOPEN]\n");
-#endif
-            return (osl_closeProfile((oslProfile)pProfile));
-        }
-        else
-        {
-#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("DEFAULT MODE\n");
-#endif
-        if (! (pProfile->m_Flags & (osl_Profile_READLOCK |
-                                    osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE)))
-            {
-                if (pProfile->m_Flags & FLG_MODIFIED)
-                    storeProfile(pProfile->m_pFile, pProfile, sal_False);
-
-                closeFileImpl(pProfile->m_pFile);
-                pProfile->m_pFile = NULL;
-            }
-        }
-    }
-    else
-        PrfCloseProfile(pProfile->m_hIni);
-
-#ifdef TRACE_OSL_PROFILE
-    OSL_TRACE("Out releaseProfile [ok]\n");
-#endif
-    return (sal_True);
-}
-
-#if 0 // YD
-
-static sal_Bool lookupProfile(const sal_Char *pszPath, const sal_Char *pszFile, sal_Char *pPath)
-{
-    sal_Char *pChr, *pStr;
-    sal_Char Path[_MAX_PATH] = "";
-    sal_Char Product[132] = "";
-    sal_Char Buffer[1024];
-
-    if (*pszPath == '"')
-    {
-        int i = 0;
-
-        pszPath++;
-
-        while ((*pszPath != '"') && (*pszPath != '\0'))
-            Product[i++] = *pszPath++;
-
-        Product[i] = '\0';
-
-        if (*pszPath == '"')
-            pszPath++;
-
-        if ( (*pszPath == '/') || (*pszPath == '\\') )
-        {
-            pszPath++;
-        }
-    }
-    else
-    {
-        /* if we have not product identfication, do a special handling for soffice.ini */
-        if (stricmp(SVERSION_PROFILE, pszFile) == 0)
-        {
-            sal_Char   Profile[_MAX_PATH];
-            sal_Char   Dir[_MAX_PATH];
-            oslProfile hProfile;
-
-            /* open sversion.ini in the system directory, and try to locate the entry
-               with the highest version for StarOffice */
-            if ((osl_getProfileName(SVERSION_FALLBACK, SVERSION_NAME, Profile, sizeof(Profile))) &&
-                (hProfile = osl_openProfile(Profile, osl_Profile_READLOCK)))
-            {
-                  osl_getProfileSectionEntries(hProfile, SVERSION_SECTION,
-                                                Buffer, sizeof(Buffer));
-
-                for (pChr = Buffer; *pChr != '\0'; pChr += strlen(pChr) + 1)
-                {
-                    if ((strnicmp(pChr, SVERSION_SOFFICE, sizeof(SVERSION_SOFFICE) - 1) == 0) &&
-                        (stricmp(Product, pChr) < 0))
-                    {
-                        osl_readProfileString(hProfile, SVERSION_SECTION, pChr,
-                                              Dir, sizeof(Dir), "");
-
-                        /* check for existence of path */
-                        if (access(Dir, 0) >= 0)
-                            strcpy(Product, pChr);
-                    }
-                }
-
-                osl_closeProfile(hProfile);
-            }
-
-            /* open sversion.ini in the users directory, and try to locate the entry
-               with the highest version for StarOffice */
-            if ((strcmp(SVERSION_LOCATION, SVERSION_FALLBACK) != 0) &&
-                (osl_getProfileName(SVERSION_LOCATION, SVERSION_NAME, Profile, sizeof(Profile))) &&
-                (hProfile = osl_openProfile(Profile, osl_Profile_READLOCK)))
-            {
-                  osl_getProfileSectionEntries(hProfile, SVERSION_SECTION,
-                                                Buffer, sizeof(Buffer));
-
-                for (pChr = Buffer; *pChr != '\0'; pChr += strlen(pChr) + 1)
-                {
-                    if ((strnicmp(pChr, SVERSION_SOFFICE, sizeof(SVERSION_SOFFICE) - 1) == 0) &&
-                        (stricmp(Product, pChr) < 0))
-                    {
-                        osl_readProfileString(hProfile, SVERSION_SECTION, pChr,
-                                              Dir, sizeof(Dir), "");
-
-                        /* check for existence of path */
-                        if (access(Dir, 0) >= 0)
-                            strcpy(Product, pChr);
-                    }
-                }
-
-                osl_closeProfile(hProfile);
-            }
-
-            /* remove any trailing build number */
-            if ((pChr = strrchr(Product, '/')) != NULL)
-                *pChr = '\0';
-        }
-    }
-
-
-    /* if we have an userid option eg. "-userid:rh[/usr/home/rh/staroffice]",
-       this will supercede all other locations */
-    if (osl_getCommandArgs(Buffer, sizeof(Buffer)) == osl_Process_E_None)
-    {
-        sal_Char *pStart, *pEnd;
-
-        for (pChr = Buffer; *pChr != '\0'; pChr += strlen(pChr) + 1)
-            if (((*pChr == '-') || (*pChr == '+')) &&
-                (strnicmp(pChr + 1, SVERSION_OPTION, sizeof(SVERSION_OPTION) - 1) == 0))
-            {
-                if (((pStart = strchr(pChr + sizeof(SVERSION_OPTION), '[')) != NULL) &&
-                    ((pEnd = strchr(pStart + 1, ']')) != NULL))
-                {
-                    strncpy(Path, pStart + 1, pEnd - (pStart + 1));
-                    Path[pEnd - (pStart + 1)] = '\0';
-
-                    /* build full path */
-                    if ((Path[strlen(Path) - 1] != '/') && (Path[strlen(Path) - 1] != '\\'))
-                    {
-                        strcat(Path, "\\");
-                    }
-
-                    pChr =&Path[strlen(Path)];
-                    if ( strlen(pszPath) <= 0 )
-                    {
-                        strcat(Path,SVERSION_USER);
-
-                        if ( access(Path, 0) < 0 )
-                        {
-                            *pChr='\0';
-                        }
-                    }
-                    else
-                    {
-                        strcat(Path, pszPath);
-                    }
-
-                    break;
-                }
-            }
-    }
-
-    if (strlen(Path) <= 0)
-    {
-        /* try to find the file in the directory of the executbale */
-        if (osl_getExecutableFile(Path, sizeof(Path)) != osl_Process_E_None)
-            return (sal_False);
-
-        /* seperate path from filename */
-        if ((pChr = strrchr(Path, '\\')) == NULL)
-            if ((pChr = strrchr(Path, ':')) == NULL)
-                return (sal_False);
-            else
-                *pChr = '\0';
-        else
-            *pChr = '\0';
-
-        /* if we have no product identification use the executable file name */
-        if (strlen(Product) <= 0)
-        {
-            strcpy(Product, pChr + 1);
-
-            /* remove extension */
-            if ((pChr = strrchr(Product, '.')) != NULL)
-                *pChr = '\0';
-        }
-
-        /* remember last subdir */
-        pStr = strrchr(Path, '\\');
-
-        strcat(Path, "\\");
-
-        if ( strlen(pszPath) <= 0 )
-        {
-            strcat(Path, pszPath);
-        }
-        else
-        {
-            strcat(Path,pszPath);
-        }
-
-        /* if file not exists, remove any specified subdirectories
-           like "bin" or "program" */
-        if (((access(Path, 0) < 0) && (pStr != NULL)) || (strlen(pszPath) <= 0))
-        {
-            static sal_Char *SubDirs[] = SVERSION_DIRS;
-
-            int i = 0;
-
-            for (i = 0; i < (sizeof(SubDirs) / sizeof(SubDirs[0])); i++)
-                if (strnicmp(pStr + 1, SubDirs[i], strlen(SubDirs[i])) == 0)
-                {
-                    if ( strlen(pszPath) <= 0)
-                    {
-                        strcpy(pStr + 1,SVERSION_USER);
-                        if ( access(Path, 0) < 0 )
-                        {
-                            *(pStr+1)='\0';
-                        }
-                    }
-                    else
-                    {
-                        strcpy(pStr + 1, pszPath);
-                    }
-
-                    break;
-                }
-        }
-
-        pChr = &Path[strlen(Path)];
-        if ((Path[strlen(Path) - 1] != '/') && (Path[strlen(Path) - 1] != '\\'))
-            strcat(Path, "\\");
-        strcat(Path, pszFile);
-
-        if ((access(Path, 0) < 0) && (strlen(Product) > 0))
-        {
-            sal_Char   Profile[_MAX_PATH];
-            oslProfile hProfile;
-
-            /* remove appended filename */
-            *pChr = '\0';
-
-            /* open sversion.ini in the system directory, and try to locate the entry
-               with the highest version for StarOffice */
-            if ((osl_getProfileName(SVERSION_LOCATION, SVERSION_NAME, Profile, sizeof(Profile))) &&
-                (hProfile = osl_openProfile(Profile, osl_Profile_READLOCK)))
-            {
-                pChr = &Product[strlen(Product)];
-
-                /* append build number */
-                strcat(Product, "/");
-                strcat(Product, BUILD_STR(SUPD));
-
-                osl_readProfileString(hProfile, SVERSION_SECTION, Product,
-                                      Buffer, sizeof(Buffer), "");
-
-                /* if not found, try it without build number */
-                if (strlen(Buffer) <= 0)
-                {
-                    *pChr = '\0';
-
-                    osl_readProfileString(hProfile, SVERSION_SECTION, Product,
-                                          Buffer, sizeof(Buffer), "");
-
-                    osl_closeProfile(hProfile);
-
-                    /* if not found, try the fallback */
-                    if ((strlen(Buffer) <= 0) && (strcmp(SVERSION_LOCATION, SVERSION_FALLBACK) != 0))
-                    {
-                        if ((osl_getProfileName(SVERSION_FALLBACK, SVERSION_NAME, Profile, sizeof(Profile))) &&
-                            (hProfile = osl_openProfile(Profile, osl_Profile_READLOCK)))
-                        {
-                            /* prepare build number */
-                            *pChr = '/';
-
-                            osl_readProfileString(hProfile, SVERSION_SECTION, Product,
-                                                  Buffer, sizeof(Buffer), "");
-
-                            /* if not found, try it without build number */
-                            if (strlen(Buffer) <= 0)
-                            {
-                                *pChr = '\0';
-
-                                osl_readProfileString(hProfile, SVERSION_SECTION, Product,
-                                                      Buffer, sizeof(Buffer), "");
-                            }
-
-                            osl_closeProfile(hProfile);
-                        }
-                    }
-                }
-                else
-                    osl_closeProfile(hProfile);
-
-                if (strlen(Buffer) > 0)
-                {
-                    strcpy(Path, Buffer);
-
-                    /* build full path */
-                    if ((Path[strlen(Path) - 1] != '/') && (Path[strlen(Path) - 1] != '\\'))
-                    {
-                        if ((*pszPath != '/') && (*pszPath != '\\'))
-                            strcat(Path, "\\");
-                    }
-
-                    pChr=&Path[strlen(pszPath)];
-                    if ( strlen(pszPath) > 0 )
-                    {
-                        strcat(Path, pszPath);
-                    }
-                    else
-                    {
-                        strcat(Path,SVERSION_USER);
-                        if ( access(Path, 0) < 0 )
-                        {
-                            *pChr='\0';
-                        }
-                    }
-                }
-            }
-        }
-        else
-            /* remove appended filename */
-            *pChr = '\0';
-    }
-
-    strcpy(pPath, Path);
-
-    return (sal_True);
-}
-
-#endif // 0 // YD
-
diff --git a/sal/osl/os2/salinit.cxx b/sal/osl/os2/salinit.cxx
deleted file mode 100644
index f932f2ea1b50..000000000000
--- a/sal/osl/os2/salinit.cxx
+++ /dev/null
@@ -1,120 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define INCL_DOS
-#include <os2.h>
-
-#include "precompiled_sal.hxx"
-#include "sal/config.h"
-
-#include "osl/process.h"
-#include "sal/main.h"
-#include "sal/types.h"
-
-// for exception logging
-#include <stdio.h>
-#include <string.h>
-#include <setjmp.h>
-#include "helpers/except.h"
-
-extern "C" {
-
-/*----------------------------------------------------------------------------*/
-
-static CHAR        szOOoExe[CCHMAXPATH];
-
-static FILE* APIENTRY _oslExceptOpenLogFile(VOID)
-{
-   FILE        *file;
-   DATETIME    DT;
-   PPIB        pib;
-   PSZ         slash;
-
-   // get executable fullpath
-   DosGetInfoBlocks(NULL, &pib);
-   DosQueryModuleName(pib->pib_hmte, sizeof(szOOoExe), szOOoExe);
-   // truncate to exe name
-   slash = (PSZ)strrchr( szOOoExe, '.');
-   *slash = '\0';
-   // make log path
-   strcat( szOOoExe, ".log");
-
-   file = fopen( szOOoExe, "a");
-   if (!file) { // e.g. readonly drive
-      // try again, usually C exist and is writable
-      file = fopen( "c:\\OOo.log", "a");
-   }
-   if (file) {
-        DosGetDateTime(&DT);
-        fprintf(file, "\nTrap message -- Date: %04d-%02d-%02d, Time: %02d:%02d:%02d\n",
-            DT.year, DT.month, DT.day,
-            DT.hours, DT.minutes, DT.seconds);
-        fprintf(file, "-------------------------------------------------------\n"
-                      "\nAn internal error occurred (Built " __DATE__ "-" __TIME__ ").\n");
-
-   }
-
-   // ok, return handle
-   return (file);
-}
-
-/*----------------------------------------------------------------------------*/
-
-static EXCEPTSTRUCT     g_excptstruct = {0};
-
-void SAL_CALL sal_detail_initialize(int argc, char ** argv)
-{
-    APIRET rc = -1;
-
-#if OSL_DEBUG_LEVEL == 0
-    excRegisterHooks(_oslExceptOpenLogFile, NULL, NULL, FALSE);
-
-    g_excptstruct.RegRec2.pfnHandler = (PFN)excHandlerLoud;
-    g_excptstruct.arc = DosSetExceptionHandler(
-               (PEXCEPTIONREGISTRATIONRECORD)&(g_excptstruct.RegRec2));
-
-    if (g_excptstruct.arc)
-        if (G_pfnExcHookError)
-            G_pfnExcHookError(__FILE__, __LINE__, __FUNCTION__, g_excptstruct.arc);
-        else
-            DosBeep(1000, 1000);
-    g_excptstruct.ulExcpt = setjmp(g_excptstruct.RegRec2.jmpThread);
-#endif
-
-    osl_setCommandArgs(argc, argv);
-}
-
-void SAL_CALL sal_detail_deinitialize()
-{
-    APIRET rc = -1;
-
-#if OSL_DEBUG_LEVEL == 0
-    rc = DosUnsetExceptionHandler((PEXCEPTIONREGISTRATIONRECORD)&(g_excptstruct.RegRec2));
-#endif
-}
-
-}
diff --git a/sal/osl/os2/security.c b/sal/osl/os2/security.c
deleted file mode 100644
index f03be57acc85..000000000000
--- a/sal/osl/os2/security.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "system.h"
-
-#include <osl/security.h>
-#include <osl/diagnose.h>
-#include <osl/module.h>
-
-#include "osl/thread.h"
-#include "osl/file.h"
-
-#ifdef SOLARIS
-#include <crypt.h>
-#endif
-
-#include "secimpl.h"
-
-#ifndef PAM_BINARY_MSG
-#define PAM_BINARY_MSG 6
-#endif
-
-extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
-extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
-extern oslSecurityError SAL_CALL
-osl_psz_loginUser(const sal_Char* pszUserName, const sal_Char* pszPasswd,
-                  oslSecurity* pSecurity);
-sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax);
-sal_Bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32  nMax);
-sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
-sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
-
-
-
-oslSecurity SAL_CALL osl_getCurrentSecurity()
-{
-
-    oslSecurityImpl *pSecImpl = (oslSecurityImpl*) malloc(sizeof(oslSecurityImpl));
-    struct passwd   *pPasswd  = getpwuid(getuid());
-
-    if (pPasswd)
-    {
-        memcpy(&pSecImpl->m_pPasswd, pPasswd, sizeof(pSecImpl->m_pPasswd));
-        pSecImpl->m_isValid = sal_True;
-    }
-    else
-    {
-        /* Some UNIX-OS don't implement getpwuid, e.g. NC OS (special NetBSD) 1.2.1 */
-        /* so we have to catch this in this else branch */
-        pSecImpl->m_pPasswd.pw_name     = getenv("USER");
-        pSecImpl->m_pPasswd.pw_dir      = getenv("HOME");
-        if (pSecImpl->m_pPasswd.pw_name && pSecImpl->m_pPasswd.pw_dir)
-            pSecImpl->m_isValid             = sal_True;
-        else
-        {
-            pSecImpl->m_pPasswd.pw_name     = "unknown";
-            pSecImpl->m_pPasswd.pw_dir      = "/tmp";
-            pSecImpl->m_isValid             = sal_False;
-        }
-        pSecImpl->m_pPasswd.pw_passwd   = NULL;
-        pSecImpl->m_pPasswd.pw_uid      = getuid();
-        pSecImpl->m_pPasswd.pw_gid      = getgid();
-        pSecImpl->m_pPasswd.pw_gecos    = "unknown";
-        pSecImpl->m_pPasswd.pw_shell    = "unknown";
-    }
-
-
-    return ((oslSecurity)pSecImpl);
-}
-
-
-oslSecurityError SAL_CALL osl_loginUser(
-    rtl_uString *ustrUserName,
-    rtl_uString *ustrPassword,
-    oslSecurity *pSecurity
-    )
-{
-    oslSecurityError ret;
-
-    *pSecurity = osl_getCurrentSecurity();
-    ret = osl_Security_E_None;
-
-    return ret;
-}
-
-
-
-oslSecurityError SAL_CALL osl_loginUserOnFileServer(
-    rtl_uString *strUserName,
-    rtl_uString *strPasswd,
-    rtl_uString *strFileServer,
-    oslSecurity *pSecurity
-    )
-{
-    oslSecurityError erg;
-    return erg = osl_Security_E_UserUnknown;
-}
-
-
-oslSecurityError SAL_CALL osl_psz_loginUserOnFileServer( const sal_Char*  pszUserName,
-                                                     const sal_Char*  pszPasswd,
-                                                     const sal_Char*  pszFileServer,
-                                                     oslSecurity*     pSecurity )
-{
-    oslSecurityError erg;
-    return erg = osl_Security_E_UserUnknown;
-}
-
-sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent)
-{
-    sal_Bool bRet=sal_False;
-    sal_Char pszIdent[1024];
-
-    pszIdent[0] = '\0';
-
-    bRet = osl_psz_getUserIdent(Security,pszIdent,sizeof(pszIdent));
-
-    rtl_string2UString( ustrIdent, pszIdent, rtl_str_getLength( pszIdent ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
-    OSL_ASSERT(*ustrIdent != NULL);
-
-    return bRet;
-}
-
-
-sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax)
-{
-    sal_Char  buffer[32];
-    sal_Int32 nChr;
-
-    oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
-
-    if (pSecImpl == NULL)
-        return sal_False;
-
-    nChr = snprintf(buffer, sizeof(buffer), "%u", pSecImpl->m_pPasswd.pw_uid);
-    if ( nChr < 0 || nChr >= sizeof(buffer) || nChr >= nMax )
-        return sal_False; /* leave *pszIdent unmodified in case of failure */
-
-    memcpy(pszIdent, buffer, nChr+1);
-    return sal_True;
-}
-
-sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **ustrName)
-{
-    sal_Bool bRet=sal_False;
-    sal_Char pszName[1024];
-
-    pszName[0] = '\0';
-
-    bRet = osl_psz_getUserName(Security,pszName,sizeof(pszName));
-
-    rtl_string2UString( ustrName, pszName, rtl_str_getLength( pszName ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
-    OSL_ASSERT(*ustrName != NULL);
-
-    return bRet;
-}
-
-
-
-sal_Bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32  nMax)
-{
-    oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
-
-    if ((pSecImpl == NULL) || (! pSecImpl->m_isValid))
-        return sal_False;
-
-    strncpy(pszName, pSecImpl->m_pPasswd.pw_name, nMax);
-
-    return sal_True;
-}
-
-sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirectory)
-{
-    sal_Bool bRet=sal_False;
-    sal_Char pszDirectory[PATH_MAX];
-
-    pszDirectory[0] = '\0';
-
-    bRet = osl_psz_getHomeDir(Security,pszDirectory,sizeof(pszDirectory));
-
-    if ( bRet == sal_True )
-    {
-        rtl_string2UString( pustrDirectory, pszDirectory, rtl_str_getLength( pszDirectory ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
-        OSL_ASSERT(*pustrDirectory != NULL);
-        osl_getFileURLFromSystemPath( *pustrDirectory, pustrDirectory );
-    }
-
-    return bRet;
-}
-
-
-sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
-{
-    oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
-
-    if (pSecImpl == NULL)
-        return sal_False;
-
-    /* if current user, check also environment for HOME */
-    if (getuid() == pSecImpl->m_pPasswd.pw_uid)
-    {
-        sal_Char *pStr = NULL;
-#ifdef SOLARIS
-        char    buffer[8192];
-
-        struct passwd pwd;
-        struct passwd *ppwd;
-
-#ifdef _POSIX_PTHREAD_SEMANTICS
-        if ( 0 != getpwuid_r(getuid(), &pwd, buffer, sizeof(buffer), &ppwd ) )
-            ppwd = NULL;
-#else
-        ppwd = getpwuid_r(getuid(), &pwd, buffer, sizeof(buffer) );
-#endif
-
-        if ( ppwd )
-            pStr = ppwd->pw_dir;
-#else
-        pStr = getenv("HOME");
-#endif
-
-        if ((pStr != NULL) && (strlen(pStr) > 0) &&
-            (access(pStr, 0) == 0))
-            strncpy(pszDirectory, pStr, nMax);
-        else
-            if (pSecImpl->m_isValid)
-                strncpy(pszDirectory, pSecImpl->m_pPasswd.pw_dir, nMax);
-            else
-                return sal_False;
-    }
-    else
-        strncpy(pszDirectory, pSecImpl->m_pPasswd.pw_dir, nMax);
-
-    return sal_True;
-}
-
-sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDirectory)
-{
-    sal_Bool bRet = sal_False;
-    sal_Char pszDirectory[PATH_MAX];
-
-    pszDirectory[0] = '\0';
-
-    bRet = osl_psz_getConfigDir(Security,pszDirectory,sizeof(pszDirectory));
-
-    if ( bRet == sal_True )
-    {
-        rtl_string2UString( pustrDirectory, pszDirectory, rtl_str_getLength( pszDirectory ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
-        OSL_ASSERT(*pustrDirectory != NULL);
-        osl_getFileURLFromSystemPath( *pustrDirectory, pustrDirectory );
-    }
-
-    return bRet;
-}
-
-
-sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
-{
-    return (osl_psz_getHomeDir(Security, pszDirectory, nMax));
-}
-
-sal_Bool SAL_CALL osl_isAdministrator(oslSecurity Security)
-{
-    oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
-
-    if (pSecImpl == NULL)
-        return sal_False;
-
-    if (pSecImpl->m_pPasswd.pw_uid != 0)
-        return (sal_False);
-
-    return (sal_True);
-}
-
-void SAL_CALL osl_freeSecurityHandle(oslSecurity Security)
-{
-    if (Security)
-        free ((oslSecurityImpl*)Security);
-}
-
-
-sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security)
-{
-    return sal_False;
-}
-
-void SAL_CALL osl_unloadUserProfile(oslSecurity Security)
-{
-    return;
-}
-
-
diff --git a/sal/osl/os2/semaphor.c b/sal/osl/os2/semaphor.c
deleted file mode 100644
index 8613e3ecd352..000000000000
--- a/sal/osl/os2/semaphor.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "system.h"
-
-#include <osl/diagnose.h>
-#include <osl/semaphor.h>
-
-/*
-    Implemetation notes:
-    The void* represented by oslSemaphore is used
-    to store a OS/2 HANDLE.
-*/
-
-typedef struct _oslSemaphoreImpl
-{
-    HEV hevReachedZero;
-    int nCount;
-} oslSemaphoreImpl;
-
-// static mutex to control access to private members of oslMutexImpl
-static HMTX MutexLock = NULL;
-
-/*****************************************************************************/
-/* osl_createSemaphore */
-/*****************************************************************************/
-
-/*
-- Erzeugen der Semaphore
-- Z�hler auf initialCount setzen
-*/
-oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
-{
-    APIRET rc;
-    oslSemaphoreImpl * pSemaphoreImpl;
-
-    /* alloc mem. for our internal data structure */
-    pSemaphoreImpl = (oslSemaphoreImpl *) malloc(sizeof(oslSemaphoreImpl));
-    if( pSemaphoreImpl == NULL )
-        return NULL;
-
-    /* create semaphore */
-    rc = DosCreateEventSem( NULL,
-                            &pSemaphoreImpl->hevReachedZero,
-                            DC_SEM_SHARED,
-                            FALSE );
-    if( rc != NO_ERROR )
-    {
-        free( pSemaphoreImpl );
-        return NULL;
-    }
-
-    pSemaphoreImpl->nCount = initialCount;
-
-    // create static mutex for private members
-    if (MutexLock == NULL)
-        DosCreateMutexSem( NULL, &MutexLock, 0, FALSE );
-
-    return (oslSemaphore) pSemaphoreImpl;
-}
-
-/*****************************************************************************/
-/* osl_destroySemaphore */
-/*****************************************************************************/
-
-/*
-- Semaphore l�schen
-*/
-
-void SAL_CALL osl_destroySemaphore(oslSemaphore Semaphore)
-{
-    oslSemaphoreImpl* pSemaphoreImpl = (oslSemaphoreImpl*)Semaphore;
-    OSL_ASSERT(Semaphore != 0);
-
-    DosCloseEventSem( pSemaphoreImpl->hevReachedZero );
-
-    free( pSemaphoreImpl );
-}
-
-/*****************************************************************************/
-/* osl_acquireSemaphore */
-/*****************************************************************************/
-/*
-- Z�hler -1
-- wenn Z�hler < 0: blockieren
-*/
-
-sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore)
-{
-    APIRET rc;
-    oslSemaphoreImpl* pSemaphoreImpl = (oslSemaphoreImpl*)Semaphore;
-    int nCount;
-    OSL_ASSERT(Semaphore != 0);
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-    while( pSemaphoreImpl->nCount < 1 )
-    {
-        sal_uInt32 nPostCount;
-
-        DosReleaseMutexSem( MutexLock);
-
-        rc = DosWaitEventSem(pSemaphoreImpl->hevReachedZero, SEM_INDEFINITE_WAIT );
-        DosResetEventSem(pSemaphoreImpl->hevReachedZero, &nPostCount);
-
-        DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-    }
-
-    pSemaphoreImpl->nCount--;
-    DosReleaseMutexSem( MutexLock);
-
-    return( rc == NO_ERROR );
-}
-
-/*****************************************************************************/
-/* osl_tryToAcquireSemaphore */
-/*****************************************************************************/
-/*
-- Z�hler -1, wenn vorher > 0
-- wenn Z�hler < 0: mit FALSE zurueck
-*/
-sal_Bool SAL_CALL osl_tryToAcquireSemaphore(oslSemaphore Semaphore)
-{
-    APIRET rc;
-    oslSemaphoreImpl* pSemaphoreImpl = (oslSemaphoreImpl*)Semaphore;
-    int nCount;
-    OSL_ASSERT(Semaphore != 0);
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-    nCount = pSemaphoreImpl->nCount;
-    if( pSemaphoreImpl->nCount > 0 )
-        pSemaphoreImpl->nCount--;
-
-    DosReleaseMutexSem( MutexLock);
-
-    return( nCount > 0 );
-}
-
-/*****************************************************************************/
-/* osl_releaseSemaphore */
-/*****************************************************************************/
-/*
-- Z�hler +1
-*/
-sal_Bool SAL_CALL osl_releaseSemaphore(oslSemaphore Semaphore)
-{
-    APIRET rc;
-    oslSemaphoreImpl* pSemaphoreImpl = (oslSemaphoreImpl*)Semaphore;
-    int nCount;
-    OSL_ASSERT(Semaphore != 0);
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-    nCount = pSemaphoreImpl->nCount;
-    pSemaphoreImpl->nCount++;
-
-    DosReleaseMutexSem( MutexLock);
-
-    if( nCount == 0 )
-        DosPostEventSem(pSemaphoreImpl->hevReachedZero);
-
-    return( rc == NO_ERROR );
-}
-
-
diff --git a/sal/osl/os2/signal.c b/sal/osl/os2/signal.c
deleted file mode 100644
index 881db13fe1e1..000000000000
--- a/sal/osl/os2/signal.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-/* system headers */
-#include "system.h"
-
-#include <osl/diagnose.h>
-#include <osl/mutex.h>
-#include <osl/signal.h>
-
-typedef struct _oslSignalHandlerImpl
-{
-    oslSignalHandlerFunction      Handler;
-    void*                         pData;
-    struct _oslSignalHandlerImpl* pNext;
-} oslSignalHandlerImpl;
-
-static sal_Bool               bErrorReportingEnabled = sal_True;
-static sal_Bool               bInitSignal = sal_False;
-static oslMutex               SignalListMutex;
-static oslSignalHandlerImpl*  SignalList;
-
-/*static*//* ULONG _Export APIENTRY SignalHandlerFunction(PEXCEPTIONREPORTRECORD pERepRec,
-                                            PEXCEPTIONREGISTRATIONRECORD,
-                                            PCONTEXTRECORD, PVOID);
-*/
-/*static*/ ULONG __declspec(dllexport) APIENTRY SignalHandlerFunction(PEXCEPTIONREPORTRECORD pERepRec,
-                                            PEXCEPTIONREGISTRATIONRECORD,
-                                            PCONTEXTRECORD, PVOID);
-static EXCEPTIONREGISTRATIONRECORD ExcptHandler = { 0, SignalHandlerFunction };
-
-static sal_Bool InitSignal( void )
-{
-    SignalListMutex = osl_createMutex();
-
-    ExcptHandler.ExceptionHandler = (_ERR *) &SignalHandlerFunction;
-    /* DosSetExceptionHandler(&ExcptHandler); */
-
-    return sal_True;
-}
-
-static sal_Bool DeInitSignal( void )
-{
-    /* DosUnsetExceptionHandler(&ExcptHandler); */
-
-    osl_destroyMutex(SignalListMutex);
-
-    return sal_False;
-}
-
-static oslSignalAction CallSignalHandler(oslSignalInfo *pInfo)
-{
-    oslSignalHandlerImpl* pHandler = SignalList;
-    oslSignalAction Action = osl_Signal_ActCallNextHdl;
-
-    while (pHandler != NULL)
-    {
-        if ((Action = pHandler->Handler(pHandler->pData, pInfo)) != osl_Signal_ActCallNextHdl)
-            break;
-
-        pHandler = pHandler->pNext;
-    }
-
-    return Action;
-}
-
-/*****************************************************************************/
-/* SignalHandlerFunction    */
-/*****************************************************************************/
-/*static*/ ULONG __declspec(dllexport) APIENTRY SignalHandlerFunction(PEXCEPTIONREPORTRECORD pERepRec,
-                                            PEXCEPTIONREGISTRATIONRECORD pERegRec,
-                                            PCONTEXTRECORD pConRec, PVOID pReserved)
-{
-    oslSignalInfo    Info;
-
-    Info.UserSignal = pERepRec->ExceptionNum;
-    Info.UserData   = NULL;
-
-    switch (pERepRec->ExceptionNum)
-    {
-        case XCPT_ACCESS_VIOLATION:
-            Info.Signal = osl_Signal_AccessViolation;
-            break;
-
-        case XCPT_INTEGER_DIVIDE_BY_ZERO:
-            Info.Signal = osl_Signal_IntegerDivideByZero;
-            break;
-
-        case XCPT_BREAKPOINT:
-            Info.Signal = osl_Signal_DebugBreak;
-            break;
-
-        default:
-            Info.Signal = osl_Signal_System;
-            break;
-    }
-
-    switch (CallSignalHandler(&Info))
-    {
-        case osl_Signal_ActCallNextHdl:
-            return (XCPT_CONTINUE_SEARCH);
-
-        case osl_Signal_ActAbortApp:
-            return (XCPT_CONTINUE_SEARCH);
-
-        case osl_Signal_ActKillApp:
-            exit(255);
-            break;
-    }
-
-    return (XCPT_CONTINUE_SEARCH);
-}
-
-/*****************************************************************************/
-/* osl_addSignalHandler */
-/*****************************************************************************/
-oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction Handler, void* pData)
-{
-    oslSignalHandlerImpl* pHandler;
-
-    OSL_ASSERT(Handler != NULL);
-
-    if (! bInitSignal)
-        bInitSignal = InitSignal();
-
-    pHandler = (oslSignalHandlerImpl*) calloc(1, sizeof(oslSignalHandlerImpl));
-
-    if (pHandler != NULL)
-    {
-        pHandler->Handler = Handler;
-        pHandler->pData   = pData;
-
-        osl_acquireMutex(SignalListMutex);
-
-        pHandler->pNext = SignalList;
-        SignalList      = pHandler;
-
-        osl_releaseMutex(SignalListMutex);
-
-        return (pHandler);
-    }
-
-    return (NULL);
-}
-
-/*****************************************************************************/
-/* osl_removeSignalHandler */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler Handler)
-{
-    oslSignalHandlerImpl *pHandler, *pPrevious = NULL;
-
-    OSL_ASSERT(Handler != NULL);
-
-    if (! bInitSignal)
-        bInitSignal = InitSignal();
-
-    osl_acquireMutex(SignalListMutex);
-
-    pHandler = SignalList;
-
-    while (pHandler != NULL)
-    {
-        if (pHandler == Handler)
-        {
-            if (pPrevious)
-                pPrevious->pNext = pHandler->pNext;
-            else
-                SignalList = pHandler->pNext;
-
-            osl_releaseMutex(SignalListMutex);
-
-            if (SignalList == NULL )
-                bInitSignal = DeInitSignal();
-
-            free(pHandler);
-
-            return (sal_True);
-        }
-
-        pPrevious = pHandler;
-        pHandler  = pHandler->pNext;
-    }
-
-    osl_releaseMutex(SignalListMutex);
-
-    return (sal_False);
-}
-
-/*****************************************************************************/
-/* osl_raiseSignal */
-/*****************************************************************************/
-oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 UserSignal, void* UserData)
-{
-    oslSignalInfo   Info;
-    oslSignalAction Action;
-
-    if (! bInitSignal)
-        bInitSignal = InitSignal();
-
-    osl_acquireMutex(SignalListMutex);
-
-    Info.Signal     = osl_Signal_User;
-    Info.UserSignal = UserSignal;
-    Info.UserData   = UserData;
-
-    Action = CallSignalHandler(&Info);
-
-    osl_releaseMutex(SignalListMutex);
-
-    return (Action);
-}
-
-/*****************************************************************************/
-/* osl_setErrorReporting */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable )
-{
-    sal_Bool bOld = bErrorReportingEnabled;
-    bErrorReportingEnabled = bEnable;
-
-    return bOld;
-}
-
diff --git a/sal/osl/os2/socket.c b/sal/osl/os2/socket.c
deleted file mode 100644
index 6c171016f798..000000000000
--- a/sal/osl/os2/socket.c
+++ /dev/null
@@ -1,3097 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "system.h"
-
-#include <osl/socket.h>
-#include <osl/diagnose.h>
-#include <osl/mutex.h>
-#include <osl/signal.h>
-
-#include <rtl/alloc.h>
-
-#include <ctype.h>
-#include <sal/types.h>
-
-#include "sockimpl.h"
-
-
-/* defines for poll */
-#ifdef HAVE_POLL_H
-#undef HAVE_POLL_H
-#endif
-
-#if defined(LINUX) || defined(NETBSD) || defined ( FREEBSD ) || defined (MACOSX)
-#include <sys/poll.h>
-#define HAVE_POLL_H
-#endif /* HAVE_POLL_H */
-
-#if defined(SOLARIS)
-#include <poll.h>
-#define HAVE_POLL_H
-#endif /* SOLARIS */
-
-#ifndef HAVE_POLL_H
-#define POLLIN  0x0001
-#define POLLOUT 0x0002
-#define POLLPRI 0x0004
-#endif /* HAVE_POLL_H */
-
-
-/* defines for shutdown */
-#define SD_RECEIVE 0
-#define SD_SEND 1
-#define SD_BOTH 2
-
-
-/*
-    oslSocketAddr is a pointer to a Berkeley struct sockaddr.
-    I refrained from using sockaddr_in because of possible further
-    extensions of this socket-interface (IP-NG?).
-    The intention was to hide all Berkeley data-structures from
-    direct access past the osl-interface.
-
-    The current implementation is internet (IP) centered. All
-    the constructor-functions (osl_create...) take parameters
-    that will probably make sense only in the IP-environment
-    (e.g. because of using the dotted-address-format).
-
-    If the interface will be extended to host other protocol-
-    families, I expect no externally visible changes in the
-    existing functions. You'll probably need only new
-    constructor-functions who take the different address
-    formats into consideration (maybe a long dotted address
-    or whatever).
-*/
-
-/* _Note_ that I rely on the fact that oslSocketAddr and struct sockaddr */
-/* are the same! I don't like it very much but see no other easy way to  */
-/* conceal the struct sockaddr from the eyes of the user. */
-
-
-#define OSL_INVALID_SOCKET      -1
-#define OSL_SOCKET_ERROR        -1
-
-
-/* Buffer size for gethostbyname */
-#define MAX_HOSTBUFFER_SIZE 2048
-
-/*****************************************************************************/
-/* enum oslAddrFamily */
-/*****************************************************************************/
-
-/* map */
-static unsigned long FamilyMap[]= {
-    AF_INET,                    /* osl_Socket_FamilyInet    */
-    AF_IPX,                     /* osl_Socket_FamilyIpx     */
-    0                           /* osl_Socket_FamilyInvalid */
-};
-
-/* reverse map */
-static oslAddrFamily osl_AddrFamilyFromNative(sal_uInt32 nativeType)
-{
-    oslAddrFamily i= (oslAddrFamily)0;
-
-    while(i != osl_Socket_FamilyInvalid)
-    {
-        if(FamilyMap[i] == nativeType)
-            return i;
-        i = (oslAddrFamily) ( i + 1 );
-    }
-
-    return i;
-}
-
-/* macros */
-#define FAMILY_FROM_NATIVE(y) osl_AddrFamilyFromNative(y)
-#define FAMILY_TO_NATIVE(x) (short)FamilyMap[x]
-
-/*****************************************************************************/
-/* enum oslProtocol */
-/*****************************************************************************/
-
-/* map */
-static sal_uInt32 ProtocolMap[]= {
-    0,                          /* osl_Socket_ProtocolIp      */
-    NSPROTO_IPX,                /* osl_Socket_ProtocolIpx     */
-    NSPROTO_SPX,                /* osl_Socket_ProtocolSpx     */
-    NSPROTO_SPXII,              /* osl_Socket_ProtocolSpxII   */
-    0                           /* osl_Socket_ProtocolInvalid */
-};
-
-/* reverse map */
-/* mfe: NOT USED
-static oslProtocol osl_ProtocolFromNative(sal_uInt32 nativeType)
-{
-    oslProtocol i= (oslProtocol)0;
-
-    while(i != osl_Socket_ProtocolInvalid)
-    {
-        if(ProtocolMap[i] == nativeType)
-            return i;
-        i = (oslProtocol) ( i + 1);
-    }
-
-    return i;
-}
-*/
-
-/* macros */
-#define PROTOCOL_FROM_NATIVE(y) osl_ProtocolFromNative(y)
-#define PROTOCOL_TO_NATIVE(x)   ProtocolMap[x]
-
-
-/*****************************************************************************/
-/* enum oslSocketType */
-/*****************************************************************************/
-
-/* map */
-static sal_uInt32 TypeMap[]= {
-    SOCK_STREAM,                /* osl_Socket_TypeStream    */
-    SOCK_DGRAM,                 /* osl_Socket_TypeDgram     */
-    SOCK_RAW,                   /* osl_Socket_TypeRaw       */
-    SOCK_RDM,                   /* osl_Socket_TypeRdm       */
-    SOCK_SEQPACKET,             /* osl_Socket_TypeSeqPacket */
-    0                           /* osl_Socket_TypeInvalid   */
-};
-
-/* reverse map */
-static oslSocketType osl_SocketTypeFromNative(sal_uInt32 nativeType)
-{
-    oslSocketType i= (oslSocketType)0;
-
-    while(i != osl_Socket_TypeInvalid)
-    {
-        if(TypeMap[i] == nativeType)
-            return i;
-        i = (oslSocketType)(i + 1);
-    }
-
-    return i;
-}
-
-/* macros */
-#define TYPE_TO_NATIVE(x)       TypeMap[x]
-#define TYPE_FROM_NATIVE(y)     osl_SocketTypeFromNative(y)
-
-
-/*****************************************************************************/
-/* enum oslSocketOption */
-/*****************************************************************************/
-
-/* map */
-static sal_uInt32 OptionMap[]= {
-    SO_DEBUG,                   /* osl_Socket_OptionDebug       */
-    SO_ACCEPTCONN,              /* osl_Socket_OptionAcceptConn  */
-    SO_REUSEADDR,               /* osl_Socket_OptionReuseAddr   */
-    SO_KEEPALIVE,               /* osl_Socket_OptionKeepAlive   */
-    SO_DONTROUTE,               /* osl_Socket_OptionDontRoute   */
-    SO_BROADCAST,               /* osl_Socket_OptionBroadcast   */
-    SO_USELOOPBACK,             /* osl_Socket_OptionUseLoopback */
-    SO_LINGER,                  /* osl_Socket_OptionLinger      */
-    SO_OOBINLINE,               /* osl_Socket_OptionOOBinLine   */
-    SO_SNDBUF,                  /* osl_Socket_OptionSndBuf      */
-    SO_RCVBUF,                  /* osl_Socket_OptionRcvBuf      */
-    SO_SNDLOWAT,                /* osl_Socket_OptionSndLowat    */
-    SO_RCVLOWAT,                /* osl_Socket_OptionRcvLowat    */
-    SO_SNDTIMEO,                /* osl_Socket_OptionSndTimeo    */
-    SO_RCVTIMEO,                /* osl_Socket_OptionRcvTimeo    */
-    SO_ERROR,                   /* osl_Socket_OptionError       */
-    SO_TYPE,                    /* osl_Socket_OptionType        */
-    TCP_NODELAY,                /* osl_Socket_OptionTcpNoDelay  */
-    0                           /* osl_Socket_OptionInvalid     */
-};
-
-/* reverse map */
-/* mfe: NOT USED
-static oslSocketOption osl_SocketOptionFromNative(sal_uInt32 nativeType)
-{
-    oslSocketOption i= (oslSocketOption)0;
-
-    while(i != osl_Socket_OptionInvalid)
-    {
-        if(OptionMap[i] == nativeType)
-            return i;
-        i = (oslSocketOption) ( i + 1 );
-    }
-
-    return i;
-}
-*/
-/* macros */
-#define OPTION_TO_NATIVE(x)     OptionMap[x]
-#define OPTION_FROM_NATIVE(y)       osl_SocketOptionFromNative(y)
-
-
-/*****************************************************************************/
-/* enum oslSocketOptionLevel */
-/*****************************************************************************/
-
-static sal_uInt32 OptionLevelMap[]= {
-    SOL_SOCKET,                 /* osl_Socket_LevelSocket  */
-    IPPROTO_TCP,                /* osl_Socket_LevelTcp     */
-    0                           /* osl_Socket_LevelInvalid */
-};
-
-/* reverse map */
-/* mfe: NOT USED
-static oslSocketOptionLevel osl_SocketOptionLevelFromNative(sal_uInt32 nativeType)
-{
-    oslSocketOptionLevel i= (oslSocketOptionLevel)0;
-
-    while(i != osl_Socket_LevelInvalid)
-    {
-        if(OptionLevelMap[i] == nativeType)
-            return i;
-        i = (oslSocketOptionLevel) ( i + 1 );
-    }
-
-    return i;
-}
-*/
-/* macros */
-#define OPTION_LEVEL_TO_NATIVE(x)       OptionLevelMap[x]
-#define OPTION_LEVEL_FROM_NATIVE(y)     osl_SocketOptionLevelFromNative(y)
-
-/*****************************************************************************/
-/* enum oslSocketMsgFlag */
-/*****************************************************************************/
-
-static sal_uInt32 SocketMsgFlagMap[]= {
-    0,                          /* osl_Socket_MsgNormal    */
-    MSG_OOB,                    /* osl_Socket_MsgOOB       */
-    MSG_PEEK,                   /* osl_Socket_MsgPeek      */
-    MSG_DONTROUTE,              /* osl_Socket_MsgDontRoute */
-    MSG_MAXIOVLEN,              /* osl_Socket_MsgMaxIOVLen */
-    0                           /* osl_Socket_MsgInvalid   */
-};
-
-/* reverse map */
-/* mfe: NOT USED
-static oslSocketMsgFlag osl_SocketMsgFlagFromNative(sal_uInt32 nativeType)
-{
-    oslSocketMsgFlag i= (oslSocketMsgFlag)0;
-
-    while(i != osl_Socket_MsgInvalid)
-    {
-        if(SocketMsgFlagMap[i] == nativeType)
-            return i;
-        i = (oslSocketMsgFlag) ( i + 1 );
-    }
-
-    return i;
-}
-*/
-
-/* macros */
-#define MSG_FLAG_TO_NATIVE(x)       SocketMsgFlagMap[x]
-#define MSG_FLAG_FROM_NATIVE(y)     osl_SocketMsgFlagFromNative(y)
-
-
-/*****************************************************************************/
-/* enum oslSocketDirection */
-/*****************************************************************************/
-
-static sal_uInt32 SocketDirection[]= {
-    SD_RECEIVE,                 /* osl_Socket_DirRead      */
-    SD_SEND,                    /* osl_Socket_DirWrite     */
-    SD_BOTH,                    /* osl_Socket_DirReadWrite */
-    0                           /* osl_Socket_DirInvalid   */
-};
-
-/* reverse map */
-/* mfe: NOT USED
-static oslSocketDirection osl_SocketDirectionFromNative(sal_uInt32 nativeType)
-{
-    oslSocketDirection i= (oslSocketDirection)0;
-
-    while(i != osl_Socket_DirInvalid)
-    {
-        if(SocketDirection[i] == nativeType)
-            return i;
-        i = (oslSocketDirection) ( i + 1 );
-    }
-
-    return i;
-}
-*/
-
-/* macros */
-#define DIRECTION_TO_NATIVE(x)      SocketDirection[x]
-#define DIRECTION_FROM_NATIVE(y)    osl_SocketDirectionFromNative(y)
-
-/*****************************************************************************/
-/* enum oslSocketError */
-/*****************************************************************************/
-
-static struct
-{
-    int            errcode;
-    oslSocketError error;
-} SocketError[]= {
-    { 0,               osl_Socket_E_None              }, /* no error */
-    { ENOTSOCK,        osl_Socket_E_NotSocket         }, /* Socket operation on non-socket */
-    { EDESTADDRREQ,    osl_Socket_E_DestAddrReq       }, /* Destination address required */
-    { EMSGSIZE,        osl_Socket_E_MsgSize           }, /* Message too long */
-    { EPROTOTYPE,      osl_Socket_E_Prototype         }, /* Protocol wrong type for socket */
-    { ENOPROTOOPT,     osl_Socket_E_NoProtocol        }, /* Protocol not available */
-    { EPROTONOSUPPORT, osl_Socket_E_ProtocolNoSupport }, /* Protocol not supported */
-    { ESOCKTNOSUPPORT, osl_Socket_E_TypeNoSupport     }, /* Socket type not supported */
-    { EOPNOTSUPP,      osl_Socket_E_OpNotSupport      }, /* Operation not supported on socket */
-    { EPFNOSUPPORT,    osl_Socket_E_PfNoSupport       }, /* Protocol family not supported */
-    { EAFNOSUPPORT,    osl_Socket_E_AfNoSupport       }, /* Address family not supported by */
-                                                            /* protocol family */
-    { EADDRINUSE,      osl_Socket_E_AddrInUse         }, /* Address already in use */
-    { EADDRNOTAVAIL,   osl_Socket_E_AddrNotAvail      }, /* Can't assign requested address */
-    { ENETDOWN,        osl_Socket_E_NetDown           }, /* Network is down */
-    { ENETUNREACH,     osl_Socket_E_NetUnreachable    }, /* Network is unreachable */
-    { ENETRESET,       osl_Socket_E_NetReset          }, /* Network dropped connection because */
-                                                             /* of reset */
-    { ECONNABORTED,    osl_Socket_E_ConnAborted       }, /* Software caused connection abort */
-    { ECONNRESET,      osl_Socket_E_ConnReset         }, /* Connection reset by peer */
-    { ENOBUFS,         osl_Socket_E_NoBufferSpace     }, /* No buffer space available */
-    { EISCONN,         osl_Socket_E_IsConnected       }, /* Socket is already connected */
-    { ENOTCONN,        osl_Socket_E_NotConnected      }, /* Socket is not connected */
-    { ESHUTDOWN,       osl_Socket_E_Shutdown          }, /* Can't send after socket shutdown */
-    { ETOOMANYREFS,    osl_Socket_E_TooManyRefs       }, /* Too many references: can't splice */
-    { ETIMEDOUT,       osl_Socket_E_TimedOut          }, /* Connection timed out */
-    { ECONNREFUSED,    osl_Socket_E_ConnRefused       }, /* Connection refused */
-    { EHOSTDOWN,       osl_Socket_E_HostDown          }, /* Host is down */
-    { EHOSTUNREACH,    osl_Socket_E_HostUnreachable   }, /* No route to host */
-    { EWOULDBLOCK,     osl_Socket_E_WouldBlock        }, /* call would block on non-blocking socket */
-    { EALREADY,        osl_Socket_E_Already           }, /* operation already in progress */
-    { EINPROGRESS,     osl_Socket_E_InProgress        }, /* operation now in progress */
-    { EAGAIN,          osl_Socket_E_WouldBlock        }, /* same as EWOULDBLOCK */
-    { -1,              osl_Socket_E_InvalidError      }
-};
-
-/* map */
-/* mfe: NOT USED
-static int osl_NativeFromSocketError(oslSocketError errorCode)
-{
-    int i = 0;
-
-    while ((SocketError[i].error != osl_Socket_E_InvalidError) &&
-           (SocketError[i].error != errorCode)) i++;
-
-    return SocketError[i].errcode;
-}
-*/
-
-/* reverse map */
-static oslSocketError osl_SocketErrorFromNative(int nativeType)
-{
-    int i = 0;
-
-    while ((SocketError[i].error != osl_Socket_E_InvalidError) &&
-           (SocketError[i].errcode != nativeType)) i++;
-
-    return SocketError[i].error;
-}
-
-/* macros */
-#define ERROR_TO_NATIVE(x)      osl_NativeFromSocketError(x)
-#define ERROR_FROM_NATIVE(y)    osl_SocketErrorFromNative(y)
-
-/*****************************************************************************/
-/* local function prototypes */
-/*****************************************************************************/
-
-oslSocketAddr SAL_CALL osl_psz_createInetSocketAddr (
-    const sal_Char* pszDottedAddr, sal_Int32 Port);
-
-oslSocketAddr SAL_CALL osl_psz_createIpxSocketAddr (
-    const sal_Char NetNumber[4],
-    const sal_Char NodeNumber[6],
-    sal_uInt32 SocketNumber);
-
-oslHostAddr SAL_CALL osl_psz_createHostAddr (
-    const sal_Char *pszHostname, const oslSocketAddr Addr);
-
-oslHostAddr SAL_CALL osl_psz_createHostAddrByName (
-    const sal_Char *pszHostname);
-
-const sal_Char* SAL_CALL osl_psz_getHostnameOfHostAddr (
-    const oslHostAddr Addr);
-
-oslSocketResult SAL_CALL osl_psz_getLocalHostname (
-    sal_Char *pBuffer, sal_uInt32 nBufLen);
-
-oslSocketAddr SAL_CALL osl_psz_resolveHostname (
-    const sal_Char* pszHostname);
-
-sal_Int32 SAL_CALL osl_psz_getServicePort (
-    const sal_Char* pszServicename, const sal_Char* pszProtocol);
-
-oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr (
-    oslSocketAddr Addr, sal_Char *pBuffer, sal_uInt32 BufferSize);
-
-oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr (
-    oslSocketAddr Addr, sal_Char *pBuffer, sal_uInt32 BufferSize);
-
-void SAL_CALL osl_psz_getLastSocketErrorDescription (
-    oslSocket Socket, sal_Char* pBuffer, sal_uInt32 BufferSize);
-
-/*****************************************************************************/
-/* osl_create/destroy-SocketImpl */
-/*****************************************************************************/
-
-#if OSL_DEBUG_LEVEL > 1
-static sal_uInt32 g_nSocketImpl = 0;
-static sal_uInt32 g_nSocketAddr = 0;
-
-/* sorry, must be implemented otherwise */
-#if 0
-struct LeakWarning
-{
-    ~LeakWarning()
-    {
-        if( g_nSocketImpl )
-            OSL_TRACE( "sal_socket: %d socket instances leak\n" , g_nSocketImpl );
-        if( g_nSocketAddr )
-            OSL_TRACE( "sal_socket: %d socket address instances leak\n" , g_nSocketAddr );
-    }
-};
-LeakWarning socketWarning;
-#endif
-
-#endif /* OSL_DEBUG_LEVEL */
-
-
-oslSocket __osl_createSocketImpl(int Socket)
-{
-    oslSocket pSocket;
-
-    pSocket = (oslSocket)calloc(1, sizeof(struct oslSocketImpl));
-
-    pSocket->m_Socket = Socket;
-    pSocket->m_nLastError = 0;
-    pSocket->m_CloseCallback = 0;
-    pSocket->m_CallbackArg = 0;
-    pSocket->m_nRefCount = 1;
-
-#if defined(LINUX)
-    pSocket->m_bIsAccepting = sal_False;
-#endif
-
-#if OSL_DEBUG_LEVEL > 1
-    g_nSocketImpl ++;
-#endif
-    return pSocket;
-}
-
-void __osl_destroySocketImpl(oslSocket Socket)
-{
-    if ( Socket != NULL)
-        free((struct oslSocketImpl *) Socket);
-#if OSL_DEBUG_LEVEL > 1
-    g_nSocketImpl --;
-#endif
-}
-
-static oslSocketAddr __osl_createSocketAddr(  )
-{
-    oslSocketAddr pAddr = (oslSocketAddr) rtl_allocateZeroMemory( sizeof( struct oslSocketAddrImpl ));
-#if OSL_DEBUG_LEVEL > 1
-    g_nSocketAddr ++;
-#endif
-    return pAddr;
-}
-
-static oslSocketAddr __osl_createSocketAddrWithFamily(
-    oslAddrFamily family, sal_Int32 port, sal_uInt32 nAddr )
-{
-    oslSocketAddr pAddr;
-
-    OSL_ASSERT( family == osl_Socket_FamilyInet );
-
-    pAddr = __osl_createSocketAddr();
-    switch( family )
-    {
-    case osl_Socket_FamilyInet:
-    {
-        struct sockaddr_in* pInetAddr= (struct sockaddr_in*)&(pAddr->m_sockaddr);
-
-        pInetAddr->sin_family = FAMILY_TO_NATIVE(osl_Socket_FamilyInet);
-        pInetAddr->sin_addr.s_addr = nAddr;
-        pInetAddr->sin_port = (sal_uInt16)(port&0xffff);
-        break;
-       }
-    default:
-        pAddr->m_sockaddr.sa_family = FAMILY_TO_NATIVE(family);
-    }
-    return pAddr;
-}
-
-static oslSocketAddr __osl_createSocketAddrFromSystem( struct sockaddr *pSystemSockAddr )
-{
-    oslSocketAddr pAddr = __osl_createSocketAddr();
-    memcpy( &(pAddr->m_sockaddr), pSystemSockAddr, sizeof( struct sockaddr ) );
-    return pAddr;
-}
-
-static void __osl_destroySocketAddr( oslSocketAddr addr )
-{
-#if OSL_DEBUG_LEVEL > 1
-    g_nSocketAddr --;
-#endif
-    rtl_freeMemory( addr );
-}
-
-/*****************************************************************************/
-/* osl_createEmptySocketAddr */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_createEmptySocketAddr(oslAddrFamily Family)
-{
-    oslSocketAddr pAddr = 0;
-
-    /* is it an internet-Addr? */
-    if (Family == osl_Socket_FamilyInet)
-    {
-        pAddr = __osl_createSocketAddrWithFamily(Family, 0 , htonl(INADDR_ANY) );
-    }
-    else
-    {
-        pAddr = __osl_createSocketAddrWithFamily( Family , 0 , 0 );
-    }
-
-    return pAddr;
-}
-
-/*****************************************************************************/
-/* osl_copySocketAddr */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_copySocketAddr(oslSocketAddr Addr)
-{
-    oslSocketAddr pCopy = 0;
-    if (Addr)
-    {
-        pCopy = __osl_createSocketAddr();
-
-        if (pCopy)
-            memcpy(&(pCopy->m_sockaddr),&(Addr->m_sockaddr), sizeof(struct sockaddr));
-    }
-    return pCopy;
-}
-
-/*****************************************************************************/
-/* osl_isEqualSocketAddr */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isEqualSocketAddr (
-    oslSocketAddr Addr1,
-    oslSocketAddr Addr2)
-{
-    struct sockaddr* pAddr1= &(Addr1->m_sockaddr);
-    struct sockaddr* pAddr2= &(Addr2->m_sockaddr);
-
-    OSL_ASSERT(pAddr1);
-    OSL_ASSERT(pAddr2);
-
-    if (pAddr1->sa_family == pAddr2->sa_family)
-    {
-        switch (pAddr1->sa_family)
-        {
-            case AF_INET:
-            {
-                struct sockaddr_in* pInetAddr1= (struct sockaddr_in*)pAddr1;
-                struct sockaddr_in* pInetAddr2= (struct sockaddr_in*)pAddr2;
-
-                if ((pInetAddr1->sin_family == pInetAddr2->sin_family) &&
-                    (pInetAddr1->sin_addr.s_addr == pInetAddr2->sin_addr.s_addr) &&
-                    (pInetAddr1->sin_port == pInetAddr2->sin_port))
-                    return (sal_True);
-            }
-
-            default:
-            {
-                return (memcmp(pAddr1, Addr2, sizeof(struct sockaddr)) == 0);
-            }
-        }
-    }
-
-    return (sal_False);
-}
-
-/*****************************************************************************/
-/* osl_createInetBroadcastAddr */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_createInetBroadcastAddr (
-    rtl_uString *strDottedAddr,
-    sal_Int32    Port)
-{
-    sal_uInt32    nAddr = OSL_INADDR_NONE;
-    oslSocketAddr pAddr;
-
-    if (strDottedAddr && strDottedAddr->length)
-    {
-        /* Dotted host address for limited broadcast */
-        rtl_String *pDottedAddr = NULL;
-
-        rtl_uString2String (
-            &pDottedAddr, strDottedAddr->buffer, strDottedAddr->length,
-            RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS);
-
-        nAddr = inet_addr (pDottedAddr->buffer);
-        rtl_string_release (pDottedAddr);
-    }
-
-    if (nAddr != OSL_INADDR_NONE)
-    {
-        /* Limited broadcast */
-        nAddr = ntohl(nAddr);
-        if (IN_CLASSA(nAddr))
-        {
-            nAddr &= IN_CLASSA_NET;
-            nAddr |= IN_CLASSA_HOST;
-        }
-        else if (IN_CLASSB(nAddr))
-        {
-            nAddr &= IN_CLASSB_NET;
-            nAddr |= IN_CLASSB_HOST;
-        }
-        else if (IN_CLASSC(nAddr))
-        {
-            nAddr &= IN_CLASSC_NET;
-            nAddr |= IN_CLASSC_HOST;
-        }
-        else
-        {
-            /* No broadcast in class D */
-            return ((oslSocketAddr)NULL);
-        }
-        nAddr = htonl(nAddr);
-    }
-
-    pAddr = __osl_createSocketAddrWithFamily( osl_Socket_FamilyInet, htons(Port), nAddr );
-    return pAddr;
-}
-
-/*****************************************************************************/
-/* osl_createInetSocketAddr */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_createInetSocketAddr (
-    rtl_uString *ustrDottedAddr,
-    sal_Int32    Port)
-{
-    rtl_String* strDottedAddr=0;
-    oslSocketAddr Addr;
-    sal_Char* pszDottedAddr=0;
-
-    if ( ustrDottedAddr != 0 )
-    {
-        rtl_uString2String( &strDottedAddr,
-                            rtl_uString_getStr(ustrDottedAddr),
-                            rtl_uString_getLength(ustrDottedAddr),
-                            RTL_TEXTENCODING_UTF8,
-                            OUSTRING_TO_OSTRING_CVTFLAGS);
-        pszDottedAddr = rtl_string_getStr(strDottedAddr);
-    }
-
-
-    Addr = osl_psz_createInetSocketAddr(pszDottedAddr, Port);
-
-    if ( strDottedAddr != 0 )
-    {
-        rtl_string_release(strDottedAddr);
-    }
-
-    return Addr;
-}
-
-oslSocketAddr SAL_CALL osl_psz_createInetSocketAddr (
-    const sal_Char* pszDottedAddr,
-    sal_Int32       Port)
-{
-    oslSocketAddr pAddr = 0;
-    sal_Int32 Addr = inet_addr(pszDottedAddr);
-    if(Addr != -1)
-    {
-        /* valid dotted addr */
-        pAddr = __osl_createSocketAddrWithFamily( osl_Socket_FamilyInet, htons(Port) , Addr );
-    }
-    return pAddr;
-}
-
-/*****************************************************************************/
-/* osl_setAddrOfSocketAddr */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_setAddrOfSocketAddr( oslSocketAddr pAddr, sal_Sequence *pByteSeq )
-{
-    oslSocketResult res = osl_Socket_Error;
-
-    OSL_ASSERT( pAddr );
-    OSL_ASSERT( pByteSeq );
-
-    if( pAddr && pByteSeq )
-    {
-        struct sockaddr_in * pSystemInetAddr;
-
-        OSL_ASSERT( pAddr->m_sockaddr.sa_family == FAMILY_TO_NATIVE( osl_Socket_FamilyInet ) );
-        OSL_ASSERT( pByteSeq->nElements == 4 );
-
-        pSystemInetAddr = (struct sockaddr_in * ) &(pAddr->m_sockaddr);
-        memcpy( &(pSystemInetAddr->sin_addr) , pByteSeq->elements , 4 );
-        res = osl_Socket_Ok;
-    }
-    return res;
-}
-
-/*****************************************************************************/
-/* osl_getAddrOfSocketAddr */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_getAddrOfSocketAddr( oslSocketAddr pAddr, sal_Sequence **ppByteSeq )
-{
-    oslSocketResult res = osl_Socket_Error;
-
-    OSL_ASSERT( pAddr );
-    OSL_ASSERT( ppByteSeq );
-
-    if( pAddr && ppByteSeq )
-    {
-        struct sockaddr_in * pSystemInetAddr = (struct sockaddr_in * ) &(pAddr->m_sockaddr);
-        rtl_byte_sequence_constructFromArray( ppByteSeq , (sal_Int8 *) &(pSystemInetAddr->sin_addr),4);
-        res = osl_Socket_Ok;
-    }
-    return res;
-}
-
-
-/*****************************************************************************/
-/* _osl_getFullQualifiedDomainName */
-/*****************************************************************************/
-
-/** try to figure out a full-qualified hostname, by adding the current domain
-    as given by the domainname program to the given hostname.
-    This function MUST NOT call gethostbyname since pHostName allready points
-    to data returned by gethostname and would be garbled: use gethostname_r
-    instead!
- */
-
-/* wrap around different interfaces to reentrant gethostbyname */
-static struct hostent* _osl_gethostbyname_r (
-    const char *name, struct hostent *result,
-    char *buffer, int buflen, int *h_errnop)
-{
-
-#ifdef LINUX
-    struct hostent *__result; /* will be the same as result */
-    int __error;
-    __error = gethostbyname_r (name, result, buffer, buflen,
-                 &__result, h_errnop);
-    return __error ? NULL : __result ;
-#elif defined OS2
-    // YD FIXME!!!
-    return 0;
-#else
-    return gethostbyname_r( name, result, buffer, buflen, h_errnop);
-#endif
-}
-
-static sal_Bool  _osl_getDomainName (sal_Char *buffer, sal_Int32 bufsiz)
-{
-    sal_Bool result;
-    int      p[2];
-
-    result = sal_False;
-
-#if 0 // YD 17/04/06 libc panic for fork() from thread!=1
-
-    if (pipe (p) == 0)
-    {
-        pid_t pid;
-        int nStatus;
-
-        pid = fork();
-        if (pid == 0)
-        {
-            char *argv[] =
-            {
-                "/bin/domainname",
-                NULL
-            };
-
-            close (p[0]);
-            dup2  (p[1], 1);
-            close (p[1]);
-
-            execv ("/bin/domainname", argv);
-            // arriving here means exec failed
-            _exit(-1);
-        }
-        else if (pid > 0)
-        {
-            sal_Int32 k = 0, n = bufsiz;
-
-            close (p[1]);
-            if ((k = read (p[0], buffer, n - 1)) > 0)
-            {
-                buffer[k] = 0;
-                if (buffer[k - 1] == '\n')
-                    buffer[k - 1] = 0;
-                result = sal_True;
-            }
-            close (p[0]);
-            waitpid (pid, &nStatus, 0);
-        }
-        else
-        {
-            close (p[0]);
-            close (p[1]);
-        }
-    }
-#endif // 0
-
-    return (result);
-}
-
-static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
-{
-#   define DOMAINNAME_LENGTH 512
-    sal_uInt32          nLengthOfHostName;
-    static sal_uInt32   nLengthOfDomainName = 0;
-    static sal_Char    *pDomainName = NULL;
-
-    sal_Char  *pFullQualifiedName;
-#if 0  /* OBSOLETE */
-    FILE      *pPipeToDomainnameExe;
-#endif /* OBSOLETE */
-
-    /* get a '\0' terminated domainname */
-
-    /* read default domainname default from environment */
-    if (nLengthOfDomainName == 0)
-    {
-        sal_Char *pEnvDomain;
-
-        pEnvDomain = getenv ("STAR_OVERRIDE_DOMAINNAME");
-        if (pEnvDomain)
-        {
-            pDomainName = strdup (pEnvDomain);
-            nLengthOfDomainName = strlen (pDomainName);
-        }
-    }
-
-#if 1  /* NEW */
-    if (nLengthOfDomainName == 0)
-    {
-        sal_Char pDomainNameBuffer[ DOMAINNAME_LENGTH ];
-
-        pDomainNameBuffer[0] = '\0';
-
-        if (_osl_getDomainName (pDomainNameBuffer, DOMAINNAME_LENGTH))
-        {
-            pDomainName = strdup (pDomainNameBuffer);
-            nLengthOfDomainName = strlen (pDomainName);
-        }
-    }
-
-#endif /* NEW */
-#if 0  /* OBSOLETE */
-#ifdef SCO
-
-    /* call 'domainname > /usr/tmp/some-tmp-file', since
-       popen read pclose do block or core-dump,
-       (even the pipe-stuff that comes with pthreads) */
-    if (nLengthOfDomainName == 0)
-    {
-        sal_Char  tmp_name[ L_tmpnam ];
-        FILE     *tmp_file;
-        sal_Char  domain_call [ L_tmpnam + 16 ] = "domainname > ";
-
-        tmp_name[0] = '\0';
-
-        tmpnam ( tmp_name );
-        strcat ( domain_call, tmp_name );
-        if (   (system ( domain_call ) == 0)
-            && ((tmp_file = fopen( tmp_name, "r" )) != NULL ) )
-        {
-            sal_Char  pDomainNameBuffer[ DOMAINNAME_LENGTH ];
-
-            pDomainNameBuffer[0] = '\0';
-
-            if ( fgets ( pDomainNameBuffer, DOMAINNAME_LENGTH, tmp_file ) )
-            {
-                pDomainName = strdup( pDomainNameBuffer );
-                nLengthOfDomainName = strlen( pDomainName );
-                if (   ( nLengthOfDomainName > 0 )
-                    && ( pDomainName[ nLengthOfDomainName - 1] == '\n' ) )
-                    pDomainName[ --nLengthOfDomainName ] = '\0';
-            }
-            fclose ( tmp_file );
-        }
-        unlink( tmp_name );
-    }
-
-#else /* !SCO */
-
-    /* read the domainname from pipe to the program domainname */
-    if (   (nLengthOfDomainName == 0)
-        && (pPipeToDomainnameExe = popen( "domainname", "r")) )
-    {
-        sal_Char  c;
-        sal_Char  pDomainNameBuffer[ DOMAINNAME_LENGTH ];
-        sal_Char *pDomainNamePointer;
-
-        pDomainNameBuffer[0] = '\0';
-
-        pDomainNamePointer = pDomainNameBuffer;
-        while (    ((c = getc( pPipeToDomainnameExe )) != EOF)
-                && (nLengthOfDomainName < (DOMAINNAME_LENGTH - 1)) )
-        {
-            if (! isspace(c))
-            {
-                 nLengthOfDomainName++ ;
-                   *pDomainNamePointer++ = (sal_Char)c;
-            }
-        }
-        *pDomainNamePointer = '\0';
-        pDomainName = strdup( pDomainNameBuffer );
-
-        pclose( pPipeToDomainnameExe );
-    }
-
-#endif /* !SCO */
-#endif /* OBSOLETE */
-
-    /* compose hostname and domainname */
-    nLengthOfHostName = strlen( pHostName );
-    pFullQualifiedName = (sal_Char*) malloc( (nLengthOfHostName + 1
-                            + nLengthOfDomainName + 1) * sizeof(sal_Char) );
-    memcpy( pFullQualifiedName, pHostName,
-        (nLengthOfHostName + 1) * sizeof(sal_Char) );
-
-    if ( nLengthOfDomainName > 0 )
-    {
-        /* fqdn = hostname + '.' + domainname + '\0' */
-        pFullQualifiedName[ nLengthOfHostName ] = '.';
-        memcpy( pFullQualifiedName + nLengthOfHostName + 1, pDomainName,
-            nLengthOfDomainName + 1 );
-    }
-
-    /* check whether full-qualified name and hostname point to the same host
-     * should almost always be true */
-    if ( nLengthOfDomainName > 0 )
-    {
-        struct hostent *pQualifiedHostByName;
-        struct hostent *pHostByName;
-        sal_Bool        bHostsAreEqual;
-
-        /* buffer for calls to reentrant version of gethostbyname */
-        struct hostent  aHostByName, aQualifiedHostByName;
-        sal_Char        pHostBuffer[ MAX_HOSTBUFFER_SIZE ];
-        sal_Char        pQualifiedHostBuffer[ MAX_HOSTBUFFER_SIZE ];
-        int     nErrorNo;
-
-        pHostBuffer[0] = '\0';
-        pQualifiedHostBuffer[0] = '\0';
-
-        /* get list of addresses */
-        pQualifiedHostByName = _osl_gethostbyname_r (
-            pFullQualifiedName,
-            &aQualifiedHostByName, pQualifiedHostBuffer,
-            sizeof(pQualifiedHostBuffer), &nErrorNo );
-        pHostByName = _osl_gethostbyname_r (
-            pHostName,
-            &aHostByName, pHostBuffer,
-            sizeof(pHostBuffer), &nErrorNo );
-
-        /* compare addresses */
-        bHostsAreEqual = sal_False;
-        if ( pQualifiedHostByName && pHostByName )
-        {
-            sal_Char **p, **q;
-            struct in_addr in;
-
-            /* lists are expected to be (very) short */
-            for ( p = pQualifiedHostByName->h_addr_list; *p != NULL; p++ )
-            {
-                for ( q = pHostByName->h_addr_list; *q != NULL; q++ )
-                {
-                    /* in.s_addr may be in_addr_t or uint32_t or heaven knows */
-                    if ( memcmp( *p, *q, sizeof(in.s_addr) ) == 0 )
-                    {
-                        bHostsAreEqual = sal_True;
-                        break;
-                    }
-                }
-                if ( bHostsAreEqual )
-                    break;
-            }
-        }
-
-        /* very strange case, but have to believe it: reduce the
-         * full qualified name to the unqualified host name */
-        if ( !bHostsAreEqual )
-        {
-            OSL_TRACE("_osl_getFullQualifiedDomainName: "
-                      "suspect FQDN: %s\n", pFullQualifiedName);
-
-            pFullQualifiedName[ nLengthOfHostName ] = '\0';
-            pFullQualifiedName = (sal_Char*)realloc ( pFullQualifiedName,
-                                (nLengthOfHostName + 1) * sizeof( sal_Char ));
-        }
-    }
-
-    /* always return a hostname looked up as carefully as possible
-     * this string must be freed by the caller */
-    return pFullQualifiedName;
-}
-
-/*****************************************************************************/
-/* _osl_isFullQualifiedDomainName */
-/*****************************************************************************/
-static sal_Bool _osl_isFullQualifiedDomainName (const sal_Char *pHostName)
-{
-    /* a FQDN (aka 'hostname.domain.top_level_domain' )
-     * is a name which contains a dot '.' in it ( would
-     * match as well for 'hostname.' but is good enough
-     * for now )*/
-    return (sal_Bool)( strchr( pHostName, (int)'.' ) != NULL );
-}
-
-/*****************************************************************************/
-/* oslHostAddr */
-/*****************************************************************************/
-struct oslHostAddrImpl
-{
-    sal_Char        *pHostName;
-    oslSocketAddr   pSockAddr;
-};
-
-static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he)
-{
-    oslHostAddr pAddr= NULL;
-    oslSocketAddr pSockAddr = 0;
-
-
-    if ((he == NULL) || (he->h_name == NULL) || (he->h_addr_list[0] == NULL))
-        return ((oslHostAddr)NULL);
-
-    //YD 18/06/2006 win32 does this with unicode, see socket.cxx
-    sal_Char        *cn;
-    cn= (sal_Char *)malloc(strlen (he->h_name) + 1);
-    OSL_ASSERT(cn);
-    if (cn == NULL)
-        return ((oslHostAddr)NULL);
-
-    strcpy(cn, he->h_name);
-
-#if 0 // YD 17/04/06 win32 doesn't it.
-    if (_osl_isFullQualifiedDomainName(he->h_name))
-    {
-        cn= (sal_Char *)malloc(strlen (he->h_name) + 1);
-        OSL_ASSERT(cn);
-        if (cn == NULL)
-            return ((oslHostAddr)NULL);
-
-        strcpy(cn, he->h_name);
-    }
-    else
-    {
-        cn =_osl_getFullQualifiedDomainName (he->h_name);
-        OSL_ASSERT(cn);
-        if (cn == NULL)
-            return ((oslHostAddr)NULL);
-    }
-#endif
-
-    pSockAddr = __osl_createSocketAddr();
-    OSL_ASSERT(pSockAddr);
-    if (pSockAddr == NULL)
-    {
-        free(cn);
-        return ((oslHostAddr)NULL);
-    }
-
-    pSockAddr->m_sockaddr.sa_family= he->h_addrtype;
-    if (pSockAddr->m_sockaddr.sa_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet))
-    {
-        struct sockaddr_in *sin= (struct sockaddr_in *)&(pSockAddr->m_sockaddr);
-        memcpy (
-            &(sin->sin_addr.s_addr),
-            he->h_addr_list[0],
-            he->h_length);
-    }
-    else
-    {
-        /* unknown address family */
-        /* future extensions for new families might be implemented here */
-
-        OSL_TRACE("_osl_hostentToHostAddr: unknown address family.\n");
-        OSL_ASSERT(sal_False);
-
-        __osl_destroySocketAddr( pSockAddr );
-        free (cn);
-        return ((oslHostAddr)NULL);
-    }
-
-    pAddr= (oslHostAddr) malloc(sizeof(struct oslHostAddrImpl));
-    OSL_ASSERT(pAddr);
-    if (pAddr == NULL)
-    {
-        __osl_destroySocketAddr( pSockAddr );
-        free (cn);
-        return ((oslHostAddr)NULL);
-    }
-
-    pAddr->pHostName= cn;
-    pAddr->pSockAddr= pSockAddr;
-
-    return pAddr;
-}
-
-/*****************************************************************************/
-/* osl_createHostAddr */
-/*****************************************************************************/
-oslHostAddr SAL_CALL osl_createHostAddr (
-    rtl_uString        *ustrHostname,
-    const oslSocketAddr Addr)
-{
-    oslHostAddr HostAddr;
-    rtl_String* strHostname=0;
-    sal_Char* pszHostName=0;
-
-    if ( ustrHostname != 0 )
-    {
-        rtl_uString2String( &strHostname,
-                            rtl_uString_getStr(ustrHostname),
-                            rtl_uString_getLength(ustrHostname),
-                            RTL_TEXTENCODING_UTF8,
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-        pszHostName = rtl_string_getStr(strHostname);
-    }
-
-    HostAddr = osl_psz_createHostAddr(pszHostName,Addr);
-
-    if ( strHostname != 0 )
-    {
-        rtl_string_release(strHostname);
-    }
-
-
-    return HostAddr;
-}
-
-oslHostAddr SAL_CALL osl_psz_createHostAddr (
-    const sal_Char     *pszHostname,
-    const oslSocketAddr pAddr)
-{
-    oslHostAddr pHostAddr;
-    sal_Char            *cn;
-
-    OSL_ASSERT(pszHostname && pAddr);
-    if ((pszHostname == NULL) || (pAddr == NULL))
-        return ((oslHostAddr)NULL);
-
-    cn = (sal_Char *)malloc(strlen (pszHostname) + 1);
-    OSL_ASSERT(cn);
-    if (cn == NULL)
-        return ((oslHostAddr)NULL);
-
-    strcpy (cn, pszHostname);
-
-    pHostAddr= (oslHostAddr) malloc(sizeof(struct oslHostAddrImpl));
-    OSL_ASSERT(pHostAddr);
-    if (pAddr == NULL)
-    {
-        free (cn);
-        return ((oslHostAddr)NULL);
-    }
-
-    pHostAddr->pHostName= cn;
-    pHostAddr->pSockAddr= osl_copySocketAddr( pAddr );
-
-    return pHostAddr;
-}
-
-/*****************************************************************************/
-/* osl_createHostAddrByName */
-/*****************************************************************************/
-oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *ustrHostname)
-{
-    oslHostAddr HostAddr;
-    rtl_String* strHostname=0;
-    sal_Char* pszHostName=0;
-
-    if ( ustrHostname != 0 )
-    {
-        rtl_uString2String( &strHostname,
-                            rtl_uString_getStr(ustrHostname),
-                            rtl_uString_getLength(ustrHostname),
-                            RTL_TEXTENCODING_UTF8,
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-        pszHostName=rtl_string_getStr(strHostname);
-    }
-
-    HostAddr = osl_psz_createHostAddrByName(pszHostName);
-
-    if ( strHostname != 0 )
-    {
-        rtl_string_release(strHostname);
-    }
-
-    return HostAddr;
-}
-
-oslHostAddr SAL_CALL osl_psz_createHostAddrByName (const sal_Char *pszHostname)
-{
-    struct hostent *he;
-        oslHostAddr addr;
-
-    static oslMutex mutex = NULL;
-
-    if (mutex == NULL)
-        mutex = osl_createMutex();
-
-    osl_acquireMutex(mutex);
-
-    he = gethostbyname((sal_Char *)pszHostname);
-    addr = _osl_hostentToHostAddr (he);
-
-    osl_releaseMutex(mutex);
-
-    return addr;
-}
-
-/*****************************************************************************/
-/* osl_createHostAddrByAddr */
-/*****************************************************************************/
-oslHostAddr SAL_CALL osl_createHostAddrByAddr (const oslSocketAddr pAddr)
-{
-    OSL_ASSERT(pAddr);
-
-    if (pAddr == NULL)
-        return ((oslHostAddr)NULL);
-
-    if (pAddr->m_sockaddr.sa_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet))
-    {
-        const struct sockaddr_in *sin= (const struct sockaddr_in *)&(pAddr->m_sockaddr);
-        struct hostent *he;
-
-        if (sin->sin_addr.s_addr == htonl(INADDR_ANY))
-            return ((oslHostAddr)NULL);
-
-        he= gethostbyaddr((sal_Char *)&(sin->sin_addr),
-                          sizeof (sin->sin_addr),
-                          sin->sin_family);
-        return _osl_hostentToHostAddr (he);
-    }
-
-    return ((oslHostAddr)NULL);
-}
-
-/*****************************************************************************/
-/* osl_copyHostAddr */
-/*****************************************************************************/
-oslHostAddr SAL_CALL osl_copyHostAddr (const oslHostAddr pAddr)
-{
-    OSL_ASSERT(pAddr);
-
-    if (pAddr)
-        return osl_psz_createHostAddr (pAddr->pHostName, pAddr->pSockAddr);
-    else
-        return ((oslHostAddr)NULL);
-}
-
-/*****************************************************************************/
-/* osl_getHostnameOfHostAddr */
-/*****************************************************************************/
-void SAL_CALL osl_getHostnameOfHostAddr (
-    const oslHostAddr   Addr,
-    rtl_uString       **ustrHostname)
-{
-    const sal_Char* pHostname=0;
-
-    pHostname = osl_psz_getHostnameOfHostAddr(Addr);
-
-    rtl_uString_newFromAscii (ustrHostname, pHostname);
-
-    return;
-}
-
-const sal_Char* SAL_CALL osl_psz_getHostnameOfHostAddr (const oslHostAddr pAddr)
-{
-    OSL_ASSERT(pAddr);
-
-    if (pAddr)
-        return pAddr->pHostName;
-    else
-        return NULL;
-}
-
-/*****************************************************************************/
-/* osl_getSocketAddrOfHostAddr */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_getSocketAddrOfHostAddr (const oslHostAddr pAddr)
-{
-    OSL_ASSERT(pAddr);
-
-    if (pAddr)
-        return ((oslSocketAddr)(pAddr->pSockAddr));
-    else
-        return NULL;
-}
-
-/*****************************************************************************/
-/* osl_destroyHostAddr */
-/*****************************************************************************/
-void SAL_CALL osl_destroyHostAddr (oslHostAddr pAddr)
-{
-    if (pAddr)
-    {
-        if (pAddr->pHostName)
-            free (pAddr->pHostName);
-        if (pAddr->pSockAddr)
-            osl_destroySocketAddr (pAddr->pSockAddr);
-        free (pAddr);
-    }
-}
-
-/*****************************************************************************/
-/* osl_getLocalHostname */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_getLocalHostname(rtl_uString **ustrLocalHostname)
-{
-    oslSocketResult Result;
-    sal_Char pszHostname[1024];
-
-    pszHostname[0] = '\0';
-
-    Result = osl_psz_getLocalHostname(pszHostname,sizeof(pszHostname));
-
-    rtl_uString_newFromAscii(ustrLocalHostname,pszHostname);
-
-    return Result;
-}
-
-oslSocketResult SAL_CALL osl_psz_getLocalHostname (
-    sal_Char *pBuffer, sal_uInt32 nBufLen)
-{
-    static sal_Char LocalHostname[256] = "";
-
-    if (strlen(LocalHostname) == 0)
-    {
-        const sal_Char *pStr;
-
-#ifdef SYSV
-        struct utsname uts;
-
-        if (uname(&uts) < 0)
-            return osl_Socket_Error;
-
-        if ((strlen(uts.nodename) + 1) > nBufLen)
-            return osl_Socket_Error;
-
-        strncpy(LocalHostname, uts.nodename, sizeof( LocalHostname ));
-#else  /* BSD compatible */
-
-        if (gethostname(LocalHostname, sizeof(LocalHostname)-1) != 0)
-            return osl_Socket_Error;
-        LocalHostname[sizeof(LocalHostname)-1] = 0;
-#endif /* SYSV */
-
-        /* check if we have an FQDN */
-        if (strchr(LocalHostname, '.') == NULL)
-        {
-            oslHostAddr Addr;
-
-            /* no, determine it via dns */
-            Addr = osl_psz_createHostAddrByName(LocalHostname);
-
-            if (Addr && (pStr = osl_psz_getHostnameOfHostAddr(Addr)) != NULL)
-            {
-#if 0  /* OBSOLETE */
-                sal_Char* pChr;
-#endif /* OBSOLETE */
-                strcpy(LocalHostname, pStr);
-
-#if 0  /* OBSOLETE */
-                /* already done by _osl_getFullQualifiedDomainName() with
-                   much better heuristics, so this may be contraproductive */
-
-                /* no FQDN, last try append domain name */
-                if ((pChr = strchr(LocalHostname, '.')) == NULL)
-                {
-                    FILE *fp;
-
-                    pChr = &LocalHostname[strlen(LocalHostname)];
-
-                    if ( (fp = popen("domainname", "r")) != 0 )
-                    {
-                        int c;
-
-                        *pChr++ = '.';
-
-                        while ((c = getc(fp)) != EOF)
-                        {
-                            if (! isspace(c))
-                                *pChr++ = (sal_Char)c;
-                        }
-
-                        *pChr = '\0';
-
-                        fclose(fp);
-                    }
-                    else
-                        LocalHostname[0] = '\0';
-                }
-#endif /* OBSOLETE */
-
-            }
-            if (Addr)
-                osl_destroyHostAddr(Addr);
-        }
-    }
-
-    if (strlen(LocalHostname) > 0)
-    {
-        strncpy(pBuffer, LocalHostname, nBufLen);
-        pBuffer[nBufLen - 1] = '\0';
-
-        return osl_Socket_Ok;
-    }
-
-    return osl_Socket_Error;
-}
-
-/*****************************************************************************/
-/* osl_resolveHostname */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_resolveHostname(rtl_uString *ustrHostname)
-{
-    oslSocketAddr Addr;
-    rtl_String* strHostname=0;
-    sal_Char* pszHostName=0;
-
-    if ( ustrHostname != 0 )
-    {
-        rtl_uString2String( &strHostname,
-                            rtl_uString_getStr(ustrHostname),
-                            rtl_uString_getLength(ustrHostname),
-                            RTL_TEXTENCODING_UTF8,
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-        pszHostName = rtl_string_getStr(strHostname);
-    }
-
-
-    Addr = osl_psz_resolveHostname(pszHostName);
-
-    if ( strHostname != 0 )
-    {
-        rtl_string_release(strHostname);
-    }
-
-
-    return Addr;
-}
-
-
-oslSocketAddr SAL_CALL osl_psz_resolveHostname(const sal_Char* pszHostname)
-{
-    struct oslHostAddrImpl *pAddr = (oslHostAddr)osl_psz_createHostAddrByName(pszHostname);
-
-    if (pAddr)
-    {
-        oslSocketAddr SockAddr = osl_copySocketAddr(pAddr->pSockAddr);
-
-        osl_destroyHostAddr(pAddr);
-
-        return (SockAddr);
-    }
-
-    return ((oslSocketAddr)NULL);
-}
-
-/*****************************************************************************/
-/* osl_getServicePort */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_getServicePort(rtl_uString *ustrServicename, rtl_uString *ustrProtocol)
-{
-    sal_Int32 nPort;
-    rtl_String* strServicename=0;
-    rtl_String* strProtocol=0;
-    sal_Char* pszServiceName=0;
-    sal_Char* pszProtocol=0;
-
-    if ( ustrServicename != 0 )
-    {
-        rtl_uString2String( &strServicename,
-                            rtl_uString_getStr(ustrServicename),
-                            rtl_uString_getLength(ustrServicename),
-                            RTL_TEXTENCODING_UTF8,
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-        pszServiceName = rtl_string_getStr(strServicename);
-    }
-
-    if ( ustrProtocol != 0 )
-    {
-        rtl_uString2String( &strProtocol,
-                            rtl_uString_getStr(ustrProtocol),
-                            rtl_uString_getLength(ustrProtocol),
-                            RTL_TEXTENCODING_UTF8,
-                            OUSTRING_TO_OSTRING_CVTFLAGS );
-        pszProtocol = rtl_string_getStr(strProtocol);
-    }
-
-    nPort = osl_psz_getServicePort(pszServiceName,pszProtocol);
-
-    if ( strServicename != 0 )
-    {
-        rtl_string_release(strServicename);
-    }
-
-    if ( strProtocol != 0 )
-    {
-        rtl_string_release(strProtocol);
-    }
-
-
-    return nPort;
-}
-
-
-sal_Int32 SAL_CALL osl_psz_getServicePort(const sal_Char* pszServicename,
-                        const sal_Char* pszProtocol)
-{
-    struct servent* ps;
-
-    ps= getservbyname(pszServicename, pszProtocol);
-
-    if (ps != 0)
-        return ntohs(ps->s_port);
-
-    return OSL_INVALID_PORT;
-}
-
-/*****************************************************************************/
-/* osl_destroySocketAddr */
-/*****************************************************************************/
-void SAL_CALL osl_destroySocketAddr(oslSocketAddr pAddr)
-{
-    __osl_destroySocketAddr( pAddr );
-}
-
-/*****************************************************************************/
-/* osl_getFamilyOfSocketAddr */
-/*****************************************************************************/
-oslAddrFamily SAL_CALL osl_getFamilyOfSocketAddr(oslSocketAddr pAddr)
-{
-    OSL_ASSERT(pAddr);
-
-    if (pAddr)
-        return FAMILY_FROM_NATIVE(pAddr->m_sockaddr.sa_family);
-    else
-        return osl_Socket_FamilyInvalid;
-}
-
-/*****************************************************************************/
-/* osl_getInetPortOfSocketAddr */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_getInetPortOfSocketAddr(oslSocketAddr pAddr)
-{
-    OSL_ASSERT(pAddr);
-    if( pAddr )
-    {
-        struct sockaddr_in* pSystemInetAddr= (struct sockaddr_in*)&(pAddr->m_sockaddr);
-
-        if ( pSystemInetAddr->sin_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet))
-            return ntohs(pSystemInetAddr->sin_port);
-    }
-    return OSL_INVALID_PORT;
-}
-
-/*****************************************************************************/
-/* osl_setInetPortOfSocketAddr */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_setInetPortOfSocketAddr(oslSocketAddr pAddr, sal_Int32 Port)
-{
-    OSL_ASSERT(pAddr);
-    if( pAddr )
-    {
-        struct sockaddr_in* pSystemInetAddr= (struct sockaddr_in*)&(pAddr->m_sockaddr);
-        if ( pSystemInetAddr->sin_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet))
-        {
-            pSystemInetAddr->sin_port= htons((short)Port);
-            return sal_True;
-        }
-    }
-
-    /* this is not a inet-addr => can't set port */
-    return sal_False;
-}
-
-/*****************************************************************************/
-/* osl_getHostnameOfSocketAddr */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_getHostnameOfSocketAddr(oslSocketAddr Addr, rtl_uString **ustrHostname)
-{
-    oslSocketResult Result;
-    sal_Char pszHostname[1024];
-
-    pszHostname[0] = '\0';
-
-    Result = osl_psz_getHostnameOfSocketAddr(Addr,pszHostname,sizeof(pszHostname));
-
-    rtl_uString_newFromAscii(ustrHostname,pszHostname);
-
-    return Result;
-}
-
-
-oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr(oslSocketAddr pAddr,
-                                            sal_Char *pBuffer, sal_uInt32 BufferSize)
-{
-    oslHostAddr pHostAddr= (oslHostAddr )osl_createHostAddrByAddr(pAddr);
-
-    if (pHostAddr)
-    {
-        strncpy(pBuffer, pHostAddr->pHostName, BufferSize);
-
-        pBuffer[BufferSize - 1] = '\0';
-
-        osl_destroyHostAddr(pHostAddr);
-
-        return osl_Socket_Ok;
-    }
-
-    return osl_Socket_Error;
-}
-
-/*****************************************************************************/
-/* osl_getDottedInetAddrOfSocketAddr */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, rtl_uString **ustrDottedInetAddr)
-{
-    oslSocketResult Result;
-    sal_Char pszDottedInetAddr[1024];
-
-    pszDottedInetAddr[0] = '\0';
-
-    Result = osl_psz_getDottedInetAddrOfSocketAddr(Addr,pszDottedInetAddr,sizeof(pszDottedInetAddr));
-
-    rtl_uString_newFromAscii(ustrDottedInetAddr,pszDottedInetAddr);
-
-    return Result;
-
-}
-
-oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAddr,
-                                                  sal_Char *pBuffer, sal_uInt32 BufferSize)
-{
-    OSL_ASSERT(pAddr);
-
-    if( pAddr )
-    {
-        struct sockaddr_in* pSystemInetAddr = ( struct sockaddr_in * ) &(pAddr->m_sockaddr);
-
-        if (pSystemInetAddr->sin_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet))
-        {
-            strncpy(pBuffer, inet_ntoa(pSystemInetAddr->sin_addr), BufferSize);
-            pBuffer[BufferSize - 1] = '\0';
-
-            return osl_Socket_Ok;
-        }
-    }
-
-    return osl_Socket_Error;
-}
-
-#if 0  /* OBSOLETE */
-/*****************************************************************************/
-/* osl_getIpxNetNumber  */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_getIpxNetNumber(oslSocketAddr Addr,
-                                    oslSocketIpxNetNumber NetNumber)
-
-{
-    struct sockaddr_ipx* pAddr;
-
-    pAddr= (struct sockaddr_ipx*)Addr;
-
-    OSL_ASSERT(pAddr);
-
-    if (pAddr && (pAddr->sa_family == FAMILY_TO_NATIVE(osl_Socket_FamilyIpx)))
-     {
-         memcpy(NetNumber, pAddr->sa_netnum, sizeof(NetNumber));
-
-          return osl_Socket_Ok;
-      }
-      else
-          return osl_Socket_Error;
-}
-
-
-/*****************************************************************************/
-/* osl_getIpxNodeNumber  */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_getIpxNodeNumber(oslSocketAddr Addr,
-                                     oslSocketIpxNodeNumber NodeNumber)
-
-{
-      struct sockaddr_ipx* pAddr;
-
-      pAddr= (struct sockaddr_ipx*)Addr;
-
-      OSL_ASSERT(pAddr);
-
-      if (pAddr && (pAddr->sa_family == FAMILY_TO_NATIVE(osl_Socket_FamilyIpx)))
-      {
-          memcpy(NodeNumber, pAddr->sa_nodenum, sizeof(NodeNumber));
-
-          return osl_Socket_Ok;
-      }
-      else
-          return osl_Socket_Error;
-}
-
-
-/*****************************************************************************/
-/* osl_getIpxSocketNumber  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_getIpxSocketNumber(oslSocketAddr Addr)
-{
-    struct sockaddr_ipx* pAddr= (struct sockaddr_ipx*)Addr;
-    OSL_ASSERT(pAddr);
-
-     if (pAddr && (pAddr->sa_family == FAMILY_TO_NATIVE(osl_Socket_FamilyIpx)))
-          return pAddr->sa_socket;
-      else
-          return OSL_INVALID_IPX_SOCKET_NO;
-}
-
-#endif /* OBSOLETE */
-
-/*****************************************************************************/
-/* osl_createSocket  */
-/*****************************************************************************/
-oslSocket SAL_CALL osl_createSocket(oslAddrFamily   Family,
-                           oslSocketType    Type,
-                           oslProtocol      Protocol)
-{
-    int            Flags;
-    oslSocket pSocket;
-
-    /* alloc memory */
-    pSocket= __osl_createSocketImpl(OSL_INVALID_SOCKET);
-
-    /* create socket */
-    pSocket->m_Socket= socket(FAMILY_TO_NATIVE(Family),
-                                TYPE_TO_NATIVE(Type),
-                                PROTOCOL_TO_NATIVE(Protocol));
-
-    /* creation failed => free memory */
-    if(pSocket->m_Socket == OSL_INVALID_SOCKET)
-    {
-        OSL_TRACE("osl_createSocket failed. Errno: %d; %s\n",
-                  errno,
-                  strerror(errno));
-
-        __osl_destroySocketImpl((pSocket));
-        pSocket= 0;
-    }
-    else
-    {
-        /* set close-on-exec flag */
-        if ((Flags = fcntl(pSocket->m_Socket, F_GETFD, 0)) != -1)
-        {
-            Flags |= FD_CLOEXEC;
-            if (fcntl(pSocket->m_Socket, F_SETFD, Flags) == -1)
-            {
-                pSocket->m_nLastError=errno;
-                OSL_TRACE("osl_createSocket failed changing socket flags. Errno: %d; %s\n",
-                          errno,
-                          strerror(errno));
-            }
-        }
-        else
-        {
-            pSocket->m_nLastError=errno;
-        }
-
-
-        pSocket->m_CloseCallback    = NULL;
-        pSocket->m_CallbackArg  = NULL;
-    }
-
-    return pSocket;
-}
-
-void SAL_CALL osl_acquireSocket(oslSocket pSocket)
-{
-    osl_incrementInterlockedCount( &(pSocket->m_nRefCount ) );
-}
-
-void SAL_CALL osl_releaseSocket( oslSocket pSocket )
-{
-    if( pSocket && 0 == osl_decrementInterlockedCount( &(pSocket->m_nRefCount) ) )
-    {
-#if defined(LINUX)
-    if ( pSocket->m_bIsAccepting == sal_True )
-    {
-        OSL_ENSURE(0, "osl_destroySocket : attempt to destroy socket while accepting\n");
-        return;
-    }
-#endif /* LINUX */
-        osl_closeSocket( pSocket );
-        __osl_destroySocketImpl( pSocket );
-    }
-}
-
-
-
-/*****************************************************************************/
-/* osl_closeSocket  */
-/*****************************************************************************/
-void SAL_CALL osl_closeSocket(oslSocket pSocket)
-{
-    int nRet;
-    int nFD;
-
-    /* socket already invalid */
-    if(pSocket==0)
-        return;
-
-    pSocket->m_nLastError=0;
-    nFD = pSocket->m_Socket;
-
-    pSocket->m_Socket = OSL_INVALID_SOCKET;
-
-#if defined(LINUX)
-    pSocket->m_bIsInShutdown = sal_True;
-
-    if ( pSocket->m_bIsAccepting == sal_True )
-    {
-        int nConnFD;
-        struct sockaddr aSockAddr;
-        socklen_t nSockLen = sizeof(aSockAddr);
-
-        nRet = getsockname(nFD, &aSockAddr, &nSockLen);
-#if OSL_DEBUG_LEVEL > 1
-        if ( nRet < 0 )
-        {
-            perror("getsockname");
-        }
-#endif /* OSL_DEBUG_LEVEL */
-
-        if ( aSockAddr.sa_family == AF_INET )
-        {
-            struct sockaddr_in* pSockAddrIn = (struct sockaddr_in*) &aSockAddr;
-
-            if ( pSockAddrIn->sin_addr.s_addr == htonl(INADDR_ANY) )
-            {
-                pSockAddrIn->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-            }
-
-            nConnFD = socket(AF_INET, SOCK_STREAM, 0);
-#if OSL_DEBUG_LEVEL > 1
-            if ( nConnFD < 0 )
-            {
-                perror("socket");
-            }
-#endif /* OSL_DEBUG_LEVEL */
-
-            nRet = connect(nConnFD, &aSockAddr, sizeof(aSockAddr));
-#if OSL_DEBUG_LEVEL > 1
-            if ( nRet < 0 )
-            {
-                perror("connect");
-            }
-#endif /* OSL_DEBUG_LEVEL */
-            close(nConnFD);
-        }
-    }
-#endif /* LINUX */
-
-    /* registrierten Callback ausfuehren */
-    if (pSocket->m_CloseCallback != NULL)
-    {
-        pSocket->m_CloseCallback(pSocket->m_CallbackArg);
-    }
-
-    nRet=close(nFD);
-    if ( nRet != 0 )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("closeSocket close error '%s'\n",strerror(errno));
-    }
-
-    pSocket->m_Socket = OSL_INVALID_SOCKET;
-}
-
-/*****************************************************************************/
-/* osl_getLocalAddrOfSocket  */
-/* Note that I rely on the fact that oslSocketAddr and struct sockaddr */
-/* are the same! I don't like it very much but see no other easy way to conceal */
-/* the struct sockaddr from the eyes of the user. */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket)
-{
-#if defined(LINUX) || defined(FREEBSD)
-    socklen_t AddrLen;
-#else
-    /* mfe: Solaris 'cc +w' means Addrlen should be signed! */
-    /*      it's really defined as 'int*' in /usr/include/sys/socket.h! */
-    /*      the man page says it expects a 'size_t' */
-    int AddrLen;
-#endif
-    struct sockaddr Addr;
-    oslSocketAddr  pAddr;
-
-    if (pSocket == NULL) /* ENOTSOCK */
-        return ((oslSocketAddr)NULL);
-
-    AddrLen= sizeof(struct sockaddr);
-
-    if (getsockname(pSocket->m_Socket, &Addr, PTR_SIZE_T(AddrLen)) == OSL_SOCKET_ERROR)
-        return ((oslSocketAddr)NULL);
-
-    pAddr = __osl_createSocketAddrFromSystem( &Addr );
-    return pAddr;
-}
-
-/*****************************************************************************/
-/* osl_getPeerAddrOfSocket  */
-/*****************************************************************************/
-oslSocketAddr SAL_CALL osl_getPeerAddrOfSocket(oslSocket pSocket)
-{
-    sal_uInt32 AddrLen;
-    struct sockaddr Addr;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return 0;
-    }
-
-    pSocket->m_nLastError=0;
-    AddrLen= sizeof(struct sockaddr);
-
-    if(getpeername(pSocket->m_Socket, &Addr, (int*)PTR_SIZE_T(AddrLen)) == OSL_SOCKET_ERROR)
-    {
-        pSocket->m_nLastError=errno;
-        return 0;
-    }
-    return __osl_createSocketAddrFromSystem( &Addr );
-}
-
-/*****************************************************************************/
-/* osl_bindAddrToSocket  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_bindAddrToSocket(oslSocket pSocket,
-                             oslSocketAddr pAddr)
-{
-    int nRet;
-
-    OSL_ASSERT(pSocket && pAddr );
-    if ( pSocket == 0 || pAddr == 0 )
-    {
-        return sal_False;
-    }
-
-    pSocket->m_nLastError=0;
-
-    nRet = bind(pSocket->m_Socket, &(pAddr->m_sockaddr), sizeof(struct sockaddr));
-
-    if ( nRet == OSL_SOCKET_ERROR)
-    {
-        pSocket->m_nLastError=errno;
-        return sal_False;
-    }
-
-    return sal_True;
-}
-
-
-/*****************************************************************************/
-/* osl_listenOnSocket  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_listenOnSocket(oslSocket pSocket,
-                           sal_Int32 MaxPendingConnections)
-{
-    int nRet;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return sal_False;
-    }
-
-    pSocket->m_nLastError=0;
-
-    nRet = listen(pSocket->m_Socket,
-                  MaxPendingConnections == -1 ?
-                  SOMAXCONN :
-                  MaxPendingConnections);
-    if ( nRet == OSL_SOCKET_ERROR)
-    {
-        pSocket->m_nLastError=errno;
-        return sal_False;
-    }
-
-    return sal_True;
-}
-
-
-/*****************************************************************************/
-/* osl_connectSocketTo  */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_connectSocketTo(oslSocket pSocket,
-                                    oslSocketAddr pAddr,
-                                    const TimeValue* pTimeout)
-{
-    fd_set   WriteSet;
-    fd_set   ExcptSet;
-    int      ReadyHandles;
-    struct timeval  tv;
-    oslSocketResult Result= osl_Socket_Ok;
-
-    OSL_PRECOND(pSocket, "osl_connectSocketTo(): need a valid socket!\n");
-
-    if ( pSocket == 0 )
-    {
-        return osl_Socket_Error;
-    }
-
-    pSocket->m_nLastError=0;
-
-    if (osl_isNonBlockingMode(pSocket))
-    {
-        if (connect(pSocket->m_Socket,
-                    &(pAddr->m_sockaddr),
-                    sizeof(struct sockaddr)) != OSL_SOCKET_ERROR)
-            return osl_Socket_Ok;
-        else
-            if (errno == EWOULDBLOCK || errno == EINPROGRESS)
-            {
-                pSocket->m_nLastError=EINPROGRESS;
-                return osl_Socket_InProgress;
-            }
-
-
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("can't connect : '%s'",strerror(errno));
-        return osl_Socket_Error;
-    }
-
-    /* set socket temporarily to non-blocking */
-    OSL_VERIFY(osl_enableNonBlockingMode(pSocket, sal_True));
-
-    /* initiate connect */
-    if(connect(pSocket->m_Socket,
-               &(pAddr->m_sockaddr),
-               sizeof(struct sockaddr)) != OSL_SOCKET_ERROR)
-    {
-       /* immediate connection */
-        osl_enableNonBlockingMode(pSocket, sal_False);
-
-        return osl_Socket_Ok;
-    }
-    else
-    {
-        /* really an error or just delayed? */
-        if (errno != EINPROGRESS)
-        {
-            pSocket->m_nLastError=errno;
-            OSL_TRACE(
-                "osl_connectSocketTo(): connect failed: errno: %d (%s)\n",
-                errno, strerror(errno));
-
-            osl_enableNonBlockingMode(pSocket, sal_False);
-            return osl_Socket_Error;
-        }
-    }
-
-
-    /* prepare select set for socket  */
-    FD_ZERO(&WriteSet);
-    FD_ZERO(&ExcptSet);
-    FD_SET(pSocket->m_Socket, &WriteSet);
-    FD_SET(pSocket->m_Socket, &ExcptSet);
-
-    /* prepare timeout */
-    if (pTimeout)
-    {
-        /* divide milliseconds into seconds and microseconds */
-        tv.tv_sec=  pTimeout->Seconds;
-        tv.tv_usec= pTimeout->Nanosec / 1000L;
-    }
-
-    /* select */
-    ReadyHandles= select(pSocket->m_Socket+1,
-                         0,
-                         PTR_FD_SET(WriteSet),
-                         PTR_FD_SET(ExcptSet),
-                         (pTimeout) ? &tv : 0);
-
-    if (ReadyHandles > 0)  /* connected */
-    {
-        if ( FD_ISSET(pSocket->m_Socket, &WriteSet ) )
-        {
-            int nErrorCode = 0;
-#ifdef SOLARIS
-/*  mfe: Solaris 'cc +w' means 5th argument should be a 'int*'!
-         it's really defined as 'int*' in /usr/include/sys/socket.h!
-         the man page says it expects a 'size_t*'
-*/
-            int nErrorSize = sizeof( nErrorCode );
-#else
-            size_t nErrorSize = sizeof( nErrorCode );
-#endif
-
-            int nSockOpt;
-
-            nSockOpt = getsockopt ( pSocket->m_Socket, SOL_SOCKET, SO_ERROR,
-#ifdef SOLARIS
-/*  mfe: Solaris 'cc +w' means 4th argument should be a 'char*'!
-         it's really defined as 'char*' in /usr/include/sys/socket.h!
-         the man page says it expects a 'void*'
-*/
-                                    (char*)
-#endif
-                                    &nErrorCode, (int*)&nErrorSize );
-            if ( (nSockOpt == 0) && (nErrorCode == 0))
-                Result = osl_Socket_Ok;
-            else
-                Result = osl_Socket_Error;
-        }
-        else
-        {
-            Result= osl_Socket_Error;
-        }
-    }
-    else if (ReadyHandles < 0)  /* error */
-    {
-        if (errno == EBADF) /* most probably interrupted by close() */
-        {
-            /* do not access pSockImpl because it is about to be or */
-            /* already destroyed */
-            return osl_Socket_Interrupted;
-        }
-        else
-        {
-            pSocket->m_nLastError=errno;
-            Result= osl_Socket_Error;
-        }
-    }
-    else    /* timeout */
-    {
-        pSocket->m_nLastError=errno;
-        Result= osl_Socket_TimedOut;
-    }
-
-    osl_enableNonBlockingMode(pSocket, sal_False);
-
-    return Result;
-}
-
-
-/*****************************************************************************/
-/* osl_acceptConnectionOnSocket  */
-/*****************************************************************************/
-oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
-                        oslSocketAddr* ppAddr)
-{
-    struct sockaddr Addr;
-    int Connection, Flags;
-    sal_uInt32 AddrLen = sizeof(struct sockaddr);
-    oslSocket pConnectionSockImpl;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return 0;
-    }
-
-    pSocket->m_nLastError=0;
-#if defined(LINUX)
-    pSocket->m_bIsAccepting = sal_True;
-#endif /* LINUX */
-
-    if( ppAddr && *ppAddr )
-    {
-        osl_destroySocketAddr( *ppAddr );
-        *ppAddr = 0;
-    }
-
-    /* prevent Linux EINTR behaviour */
-    do
-    {
-        Connection = accept(pSocket->m_Socket, &Addr, (int*)PTR_SIZE_T(AddrLen));
-    } while (Connection == -1 && errno == EINTR);
-
-
-    /* accept failed? */
-    if( Connection == OSL_SOCKET_ERROR )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("osl_acceptConnectionOnSocket : accept error '%s'\n",strerror(errno));
-
-#if defined(LINUX)
-        pSocket->m_bIsAccepting = sal_False;
-#endif /* LINUX */
-        return 0;
-    }
-
-    OSL_ASSERT(AddrLen == sizeof(struct sockaddr));
-
-
-#if defined(LINUX)
-    if ( pSocket->m_bIsInShutdown == sal_True )
-    {
-        close(Connection);
-        OSL_TRACE("osl_acceptConnectionOnSocket : close while accept\n");
-        return 0;
-    }
-#endif /* LINUX */
-
-
-    if(ppAddr)
-    {
-        *ppAddr= __osl_createSocketAddrFromSystem(&Addr);
-    }
-
-    /* alloc memory */
-    pConnectionSockImpl= __osl_createSocketImpl(OSL_INVALID_SOCKET);
-
-    /* set close-on-exec flag */
-    if ((Flags = fcntl(Connection, F_GETFD, 0)) != -1)
-    {
-        Flags |= FD_CLOEXEC;
-        if (fcntl(Connection, F_SETFD, Flags) == -1)
-        {
-            pSocket->m_nLastError=errno;
-            OSL_TRACE("osl_acceptConnectionOnSocket failed changing socket flags. Errno: %d (%s)\n",
-                      errno,
-                      strerror(errno));
-        }
-
-    }
-
-    pConnectionSockImpl->m_Socket           = Connection;
-    pConnectionSockImpl->m_nLastError       = 0;
-    pConnectionSockImpl->m_CloseCallback    = NULL;
-    pConnectionSockImpl->m_CallbackArg      = NULL;
-#if defined(LINUX)
-    pConnectionSockImpl->m_bIsAccepting     = sal_False;
-
-    pSocket->m_bIsAccepting = sal_False;
-#endif /* LINUX */
-    return pConnectionSockImpl;
-}
-
-/*****************************************************************************/
-/* osl_receiveSocket  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_receiveSocket(oslSocket pSocket,
-                          void* pBuffer,
-                          sal_uInt32 BytesToRead,
-                          oslSocketMsgFlag Flag)
-{
-    int nRead;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        OSL_TRACE("osl_receiveSocket : Invalid socket");
-        return -1;
-    }
-
-    pSocket->m_nLastError=0;
-
-    do
-    {
-        nRead =  recv(pSocket->m_Socket,
-                      (sal_Char*)pBuffer,
-                      BytesToRead,
-                      MSG_FLAG_TO_NATIVE(Flag));
-    } while ( nRead < 0 && errno == EINTR );
-
-    if ( nRead < 0 )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("osl_receiveSocket failed : %i '%s'",nRead,strerror(errno));
-    }
-    else if ( nRead == 0 )
-    {
-        OSL_TRACE("osl_receiveSocket failed : %i '%s'",nRead,"EOL");
-    }
-
-    return nRead;
-}
-
-
-/*****************************************************************************/
-/* osl_receiveFromSocket  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_receiveFromSocket(oslSocket pSocket,
-                              oslSocketAddr pSenderAddr,
-                              void* pBuffer,
-                              sal_uInt32 BufferSize,
-                              oslSocketMsgFlag Flag)
-{
-    int nRead;
-    struct sockaddr *pSystemSockAddr = 0;
-    int AddrLen = 0;
-    if( pSenderAddr )
-    {
-        AddrLen = sizeof( struct sockaddr );
-        pSystemSockAddr = &(pSenderAddr->m_sockaddr);
-    }
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        OSL_TRACE("osl_receiveFromSocket : Invalid socket");
-        return -1;
-    }
-
-    pSocket->m_nLastError=0;
-
-    nRead = recvfrom(pSocket->m_Socket,
-                     (sal_Char*)pBuffer,
-                     BufferSize,
-                     MSG_FLAG_TO_NATIVE(Flag),
-                     pSystemSockAddr,
-                     PTR_SIZE_T(AddrLen));
-
-    if ( nRead < 0 )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("osl_receiveFromSocket failed : %i '%s'",nRead,strerror(errno));
-    }
-    else if ( nRead == 0 )
-    {
-        OSL_TRACE("osl_receiveSocket failed : %i '%s'",nRead,"EOL");
-    }
-
-    return nRead;
-}
-
-
-/*****************************************************************************/
-/* osl_sendSocket  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_sendSocket(oslSocket pSocket,
-                       const void* pBuffer,
-                       sal_uInt32 BytesToSend,
-                       oslSocketMsgFlag Flag)
-{
-    int nWritten;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        OSL_TRACE("osl_sendSocket : Invalid socket");
-        return -1;
-    }
-
-    pSocket->m_nLastError=0;
-
-    do
-    {
-        nWritten = send(pSocket->m_Socket,
-                        (sal_Char*)pBuffer,
-                        BytesToSend,
-                        MSG_FLAG_TO_NATIVE(Flag));
-    } while ( nWritten < 0 && errno == EINTR );
-
-
-    if ( nWritten < 0 )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("osl_sendSocket failed : %i '%s'",nWritten,strerror(errno));
-    }
-    else if ( nWritten == 0 )
-    {
-        OSL_TRACE("osl_sendSocket failed : %i '%s'",nWritten,"EOL");
-    }
-
-    return nWritten;
-}
-
-/*****************************************************************************/
-/* osl_sendToSocket  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_sendToSocket(oslSocket pSocket,
-                         oslSocketAddr ReceiverAddr,
-                         const void* pBuffer,
-                         sal_uInt32 BytesToSend,
-                         oslSocketMsgFlag Flag)
-{
-    int nWritten;
-
-    struct sockaddr *pSystemSockAddr = 0;
-    int AddrLen = 0;
-    if( ReceiverAddr )
-    {
-        pSystemSockAddr = &(ReceiverAddr->m_sockaddr);
-        AddrLen = sizeof( struct sockaddr );
-    }
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        OSL_TRACE("osl_sendToSocket : Invalid socket");
-        return -1;
-    }
-
-    pSocket->m_nLastError=0;
-
-    /* ReceiverAddr might be 0 when used on a connected socket. */
-    /* Then sendto should behave like send. */
-
-    nWritten = sendto(pSocket->m_Socket,
-                      (sal_Char*)pBuffer,
-                      BytesToSend,
-                      MSG_FLAG_TO_NATIVE(Flag),
-                      pSystemSockAddr,
-                      AddrLen);
-
-    if ( nWritten < 0 )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("osl_sendToSocket failed : %i '%s'",nWritten,strerror(errno));
-    }
-    else if ( nWritten == 0 )
-    {
-        OSL_TRACE("osl_sendToSocket failed : %i '%s'",nWritten,"EOL");
-    }
-
-    return nWritten;
-}
-
-/*****************************************************************************/
-/* osl_readSocket  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_readSocket (
-    oslSocket pSocket, void *pBuffer, sal_Int32 n )
-{
-    sal_uInt8 * Ptr = (sal_uInt8 *)pBuffer;
-    sal_uInt32 BytesRead= 0;
-    sal_uInt32 BytesToRead= n;
-
-    OSL_ASSERT( pSocket);
-
-    /* loop until all desired bytes were read or an error occured */
-    while (BytesToRead > 0)
-    {
-        sal_Int32 RetVal;
-        RetVal= osl_receiveSocket(pSocket,
-                                   Ptr,
-                                   BytesToRead,
-                                   osl_Socket_MsgNormal);
-
-        /* error occured? */
-        if(RetVal <= 0)
-        {
-            break;
-        }
-
-        BytesToRead -= RetVal;
-        BytesRead += RetVal;
-        Ptr += RetVal;
-    }
-
-    return BytesRead;
-}
-
-/*****************************************************************************/
-/* osl_writeSocket  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_writeSocket(
-    oslSocket pSocket, const void *pBuffer, sal_Int32 n )
-{
-    /* loop until all desired bytes were send or an error occured */
-    sal_uInt32 BytesSend= 0;
-    sal_uInt32 BytesToSend= n;
-    sal_uInt8 *Ptr = ( sal_uInt8 * )pBuffer;
-
-    OSL_ASSERT( pSocket );
-
-    while (BytesToSend > 0)
-    {
-        sal_Int32 RetVal;
-
-        RetVal= osl_sendSocket( pSocket,Ptr,BytesToSend,osl_Socket_MsgNormal);
-
-        /* error occured? */
-        if(RetVal <= 0)
-        {
-            break;
-        }
-
-        BytesToSend -= RetVal;
-        BytesSend += RetVal;
-        Ptr += RetVal;
-
-    }
-    return BytesSend;
-}
-
-/*****************************************************************************/
-/* __osl_socket_poll */
-/*****************************************************************************/
-
-#ifdef HAVE_POLL_H /* poll() */
-
-sal_Bool __osl_socket_poll (
-    oslSocket        pSocket,
-    const TimeValue* pTimeout,
-    short            nEvent)
-{
-    struct pollfd fds;
-    int           timeout;
-    int           result;
-
-    OSL_ASSERT(pSocket);
-    pSocket->m_nLastError = 0;
-
-    fds.fd      = pSocket->m_Socket;
-    fds.events  = nEvent;
-    fds.revents = 0;
-
-    timeout = -1;
-    if (pTimeout)
-    {
-        /* Convert to [ms] */
-        timeout  = pTimeout->Seconds * 1000;
-        timeout += pTimeout->Nanosec / (1000 * 1000);
-    }
-
-    result = poll (&fds, 1, timeout);
-    if (result < 0)
-    {
-        pSocket->m_nLastError = errno;
-        OSL_TRACE("__osl_socket_poll(): poll error: %d (%s)",
-                  errno, strerror(errno));
-        return sal_False;
-    }
-    if (result == 0)
-    {
-        /* Timeout */
-        return sal_False;
-    }
-
-    return ((fds.revents & nEvent) == nEvent);
-}
-
-#else  /* select() */
-
-sal_Bool __osl_socket_poll (
-    oslSocket        pSocket,
-    const TimeValue* pTimeout,
-    short            nEvent)
-{
-    fd_set         fds;
-    struct timeval tv;
-    int            result;
-
-    OSL_ASSERT(pSocket);
-    pSocket->m_nLastError = 0;
-
-    FD_ZERO(&fds);
-    FD_SET(pSocket->m_Socket, &fds);
-
-    if (pTimeout)
-    {
-        /* Convert to 'timeval' */
-        tv.tv_sec  = pTimeout->Seconds;
-        tv.tv_usec = pTimeout->Nanosec / 1000;
-    }
-
-    result = select (
-        pSocket->m_Socket + 1,
-        (nEvent == POLLIN ) ? PTR_FD_SET(fds) : NULL,
-        (nEvent == POLLOUT) ? PTR_FD_SET(fds) : NULL,
-        (nEvent == POLLPRI) ? PTR_FD_SET(fds) : NULL,
-        (pTimeout)          ? &tv             : NULL);
-
-    if (result < 0)
-    {
-        pSocket->m_nLastError = errno;
-        OSL_TRACE("__osl_socket_poll(): select error: %d (%s)",
-                  errno, strerror(errno));
-        return sal_False;
-    }
-    if (result == 0)
-    {
-        /* Timeout */
-        return sal_False;
-    }
-
-    return (FD_ISSET(pSocket->m_Socket, &fds) ? sal_True : sal_False);
-}
-
-#endif /* HAVE_POLL_H */
-
-/*****************************************************************************/
-/* osl_isReceiveReady  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isReceiveReady (
-    oslSocket pSocket, const TimeValue* pTimeout)
-{
-    OSL_ASSERT(pSocket);
-    if (pSocket == NULL)
-    {
-        /* ENOTSOCK */
-        return sal_False;
-    }
-
-    return __osl_socket_poll (pSocket, pTimeout, POLLIN);
-}
-
-/*****************************************************************************/
-/* osl_isSendReady  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isSendReady (
-    oslSocket pSocket, const TimeValue* pTimeout)
-{
-    OSL_ASSERT(pSocket);
-    if (pSocket == NULL)
-    {
-        /* ENOTSOCK */
-        return sal_False;
-    }
-
-    return __osl_socket_poll (pSocket, pTimeout, POLLOUT);
-}
-
-/*****************************************************************************/
-/* osl_isExceptionPending  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isExceptionPending (
-    oslSocket pSocket, const TimeValue* pTimeout)
-{
-    OSL_ASSERT(pSocket);
-    if (pSocket == NULL)
-    {
-        /* ENOTSOCK */
-        return sal_False;
-    }
-
-    return __osl_socket_poll (pSocket, pTimeout, POLLPRI);
-}
-
-/*****************************************************************************/
-/* osl_shutdownSocket  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_shutdownSocket(oslSocket pSocket,
-                           oslSocketDirection Direction)
-{
-    int nRet;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return sal_False;
-    }
-
-    pSocket->m_nLastError=0;
-
-    nRet=shutdown(pSocket->m_Socket, DIRECTION_TO_NATIVE(Direction));
-    if (nRet != 0 )
-    {
-        pSocket->m_nLastError=errno;
-        OSL_TRACE("shutdown error '%s'\n",strerror(errno));
-    }
-    return (nRet==0);
-}
-
-
-/*****************************************************************************/
-/* osl_getSocketOption  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_getSocketOption(oslSocket pSocket,
-                            oslSocketOptionLevel    Level,
-                            oslSocketOption         Option,
-                            void*                   pBuffer,
-                            sal_uInt32                  BufferLen)
-{
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return -1;
-    }
-
-    pSocket->m_nLastError=0;
-
-    if(getsockopt(pSocket->m_Socket,
-                  OPTION_LEVEL_TO_NATIVE(Level),
-                  OPTION_TO_NATIVE(Option),
-                  (sal_Char*)pBuffer,
-                  (int*)PTR_SIZE_T(BufferLen)) == -1)
-    {
-        pSocket->m_nLastError=errno;
-        return -1;
-    }
-
-    return BufferLen;
-}
-
-/*****************************************************************************/
-/* osl_setSocketOption  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_setSocketOption(oslSocket pSocket,
-                            oslSocketOptionLevel    Level,
-                            oslSocketOption         Option,
-                            void*                   pBuffer,
-                            sal_uInt32                  BufferLen)
-{
-    int nRet;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return sal_False;
-    }
-
-    pSocket->m_nLastError=0;
-
-    nRet = setsockopt(pSocket->m_Socket,
-                      OPTION_LEVEL_TO_NATIVE(Level),
-                      OPTION_TO_NATIVE(Option),
-                      (sal_Char*)pBuffer,
-                      BufferLen);
-
-    if ( nRet < 0 )
-    {
-        pSocket->m_nLastError=errno;
-        return sal_False;
-    }
-
-    return sal_True;
-}
-
-/*****************************************************************************/
-/* osl_enableNonBlockingMode  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_enableNonBlockingMode(oslSocket pSocket,
-                                  sal_Bool On)
-{
-    int flags;
-    int nRet;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return sal_False;
-    }
-
-    pSocket->m_nLastError=0;
-
-    flags = fcntl(pSocket->m_Socket, F_GETFL, 0);
-
-    if (On)
-        flags |= O_NONBLOCK;
-    else
-        flags &= ~(O_NONBLOCK);
-
-    nRet = fcntl(pSocket->m_Socket, F_SETFL, flags);
-
-    if  ( nRet < 0 )
-    {
-        pSocket->m_nLastError=errno;
-        return sal_False;
-    }
-
-    return sal_True;
-}
-
-/*****************************************************************************/
-/* osl_isNonBlockingMode  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket pSocket)
-{
-    int flags;
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return sal_False;
-    }
-
-    pSocket->m_nLastError=0;
-
-    flags = fcntl(pSocket->m_Socket, F_GETFL, 0);
-
-    if (flags == -1 || !(flags & O_NONBLOCK))
-        return sal_False;
-    else
-        return sal_True;
-}
-
-/*****************************************************************************/
-/* osl_getSocketType  */
-/*****************************************************************************/
-oslSocketType SAL_CALL osl_getSocketType(oslSocket pSocket)
-{
-    int Type=0;
-    sal_uInt32 TypeSize= sizeof(Type);
-
-    OSL_ASSERT(pSocket);
-    if ( pSocket == 0 )
-    {
-        return osl_Socket_TypeInvalid;
-    }
-
-    pSocket->m_nLastError=0;
-
-    if(getsockopt(pSocket->m_Socket,
-                  OPTION_LEVEL_TO_NATIVE(osl_Socket_LevelSocket),
-                  OPTION_TO_NATIVE(osl_Socket_OptionType),
-                  (sal_Char*)&Type,
-                  (int*)PTR_SIZE_T(TypeSize)) == -1)
-    {
-        /* error */
-        pSocket->m_nLastError=errno;
-        return osl_Socket_TypeInvalid;
-    }
-
-    return TYPE_FROM_NATIVE(Type);
-
-}
-
-/*****************************************************************************/
-/* osl_getLastSocketErrorDescription  */
-/*****************************************************************************/
-void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString **ustrError)
-{
-    sal_Char pszError[1024];
-
-    pszError[0] = '\0';
-
-    osl_psz_getLastSocketErrorDescription(Socket,pszError,sizeof(pszError));
-
-    rtl_uString_newFromAscii(ustrError,pszError);
-
-    return;
-}
-
-
-void SAL_CALL osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* pBuffer, sal_uInt32 BufferSize)
-{
-    /* make shure pBuffer will be a zero-terminated string even when strncpy has to cut */
-    pBuffer[BufferSize-1]= '\0';
-
-    if ( pSocket == 0 )
-    {
-        strncpy(pBuffer, strerror(EINVAL), BufferSize-1);
-        return;
-    }
-
-    strncpy(pBuffer, strerror(pSocket->m_nLastError), BufferSize-1);
-    return;
-}
-
-/*****************************************************************************/
-/* osl_getLastSocketError  */
-/*****************************************************************************/
-oslSocketError SAL_CALL osl_getLastSocketError(oslSocket pSocket)
-{
-    if ( pSocket == 0 )
-    {
-        return ERROR_FROM_NATIVE(EINVAL);
-    }
-
-    return ERROR_FROM_NATIVE(pSocket->m_nLastError);
-}
-
-/*****************************************************************************/
-/* SocketSet                                                                 */
-/*****************************************************************************/
-typedef struct _TSocketSetImpl
-{
-    int     m_MaxHandle;    /* for select(), the largest descriptor in the set */
-    fd_set  m_Set;          /* the set of descriptors */
-
-} TSocketSetImpl;
-
-/*****************************************************************************/
-/* osl_createSocketSet  */
-/*****************************************************************************/
-oslSocketSet SAL_CALL osl_createSocketSet()
-{
-    TSocketSetImpl* pSet;
-
-    pSet= (TSocketSetImpl*)malloc(sizeof(TSocketSetImpl));
-
-    OSL_ASSERT(pSet);
-
-    if(pSet)
-    {
-        pSet->m_MaxHandle= 0;
-        FD_ZERO(&pSet->m_Set);
-    }
-
-    return (oslSocketSet)pSet;
-}
-
-/*****************************************************************************/
-/* osl_destroySocketSet  */
-/*****************************************************************************/
-void SAL_CALL osl_destroySocketSet(oslSocketSet Set)
-{
-    if(Set)
-        free(Set);
-}
-
-/*****************************************************************************/
-/* osl_clearSocketSet  */
-/*****************************************************************************/
-void SAL_CALL osl_clearSocketSet(oslSocketSet Set)
-{
-    TSocketSetImpl* pSet;
-    OSL_ASSERT(Set);
-    if ( Set == 0 )
-    {
-        return;
-    }
-
-    pSet= (TSocketSetImpl*)Set;
-    pSet->m_MaxHandle= 0;
-
-    FD_ZERO(&pSet->m_Set);
-}
-
-/*****************************************************************************/
-/* osl_addToSocketSet  */
-/*****************************************************************************/
-void SAL_CALL osl_addToSocketSet(oslSocketSet Set, oslSocket pSocket)
-{
-    TSocketSetImpl* pSet;
-
-    OSL_ASSERT(Set);
-    OSL_ASSERT(pSocket);
-
-    if ( Set == 0 || pSocket == 0)
-    {
-        return;
-    }
-
-    pSet= (TSocketSetImpl*)Set;
-
-    /* correct max handle */
-    if(pSocket->m_Socket > pSet->m_MaxHandle)
-        pSet->m_MaxHandle= pSocket->m_Socket;
-    FD_SET(pSocket->m_Socket, &pSet->m_Set);
-
-}
-
-/*****************************************************************************/
-/* osl_removeFromSocketSet  */
-/*****************************************************************************/
-void SAL_CALL osl_removeFromSocketSet(oslSocketSet Set, oslSocket pSocket)
-{
-    TSocketSetImpl* pSet;
-
-    OSL_ASSERT(Set);
-    OSL_ASSERT(pSocket);
-
-    if ( Set == 0 || pSocket == 0)
-    {
-        return;
-    }
-
-    pSet= (TSocketSetImpl*)Set;
-
-    /* correct max handle */
-    if(pSocket->m_Socket == pSet->m_MaxHandle)
-    {
-        /* not optimal, since the next used descriptor might be */
-        /* much smaller than m_Socket-1, but it will do */
-        pSet->m_MaxHandle--;
-        if(pSet->m_MaxHandle < 0)
-        {
-            pSet->m_MaxHandle= 0;   /* avoid underflow */
-        }
-    }
-
-    FD_CLR(pSocket->m_Socket, &pSet->m_Set);
-}
-
-/*****************************************************************************/
-/* osl_isInSocketSet  */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isInSocketSet(oslSocketSet Set, oslSocket pSocket)
-{
-    TSocketSetImpl* pSet;
-
-    OSL_ASSERT(Set);
-    OSL_ASSERT(pSocket);
-    if ( Set == 0 || pSocket == 0 )
-    {
-        return sal_False;
-    }
-
-    pSet= (TSocketSetImpl*)Set;
-
-    return (FD_ISSET(pSocket->m_Socket, &pSet->m_Set) != 0);
-}
-
-/*****************************************************************************/
-/* osl_demultiplexSocketEvents  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_demultiplexSocketEvents(oslSocketSet IncomingSet,
-                                    oslSocketSet OutgoingSet,
-                                    oslSocketSet OutOfBandSet,
-                                    const TimeValue* pTimeout)
-{
-    int MaxHandle= 0;
-    struct timeval  tv;
-    TSocketSetImpl* pInSet;
-    TSocketSetImpl* pOutSet;
-    TSocketSetImpl* pOOBSet;
-
-    if (pTimeout)
-    {
-        /* non-blocking call */
-        tv.tv_sec  = pTimeout->Seconds;
-        tv.tv_usec = pTimeout->Nanosec / 1000L;
-    }
-
-    /* map opaque data to impl-types */
-    pInSet=  (TSocketSetImpl*)IncomingSet;
-    pOutSet= (TSocketSetImpl*)OutgoingSet;
-    pOOBSet= (TSocketSetImpl*)OutOfBandSet;
-
-    /* get max handle from all sets */
-    if (pInSet)
-        MaxHandle= pInSet->m_MaxHandle;
-
-    if (pOutSet && (pOutSet->m_MaxHandle > MaxHandle))
-        MaxHandle= pOutSet->m_MaxHandle;
-
-    if (pOOBSet && (pOOBSet->m_MaxHandle > MaxHandle))
-        MaxHandle= pOOBSet->m_MaxHandle;
-
-    return select(MaxHandle+1,
-                  pInSet  ? PTR_FD_SET(pInSet->m_Set)  : 0,
-                  pOutSet ? PTR_FD_SET(pOutSet->m_Set) : 0,
-                  pOOBSet ? PTR_FD_SET(pOOBSet->m_Set) : 0,
-                  pTimeout ? &tv : 0);
-}
-
diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h
deleted file mode 100644
index 436ae0074a04..000000000000
--- a/sal/osl/os2/system.h
+++ /dev/null
@@ -1,513 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __OSL_SYSTEM_H__
-#define __OSL_SYSTEM_H__
-
-#define PTHREAD_NONE
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
-#include <errno.h>
-#include <stdarg.h>
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <signal.h>
-#include <utime.h>
-
-#include <pwd.h>
-
-#include <netdb.h>
-
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <sys/types.h>
-
-/* OS/2 API header */
-#define INCL_WINPROGRAMLIST
-#define INCL_WINSHELLDATA
-#define INCL_BASE
-#define INCL_DOSSIGNALS
-#define INCL_DOSSEMAPHORES
-#define INCL_DOSMODULEMGR
-#define INCL_DOSERRORS
-#define INCL_DOSSESMGR
-#define INCL_DOSPROCESS
-#define INCL_DOSNMPIPES
-#define INCL_DOSMISC
-#include <os2.h>
-
-typedef ULONG HANDLE;
-#define _MAX_ENV        2048
-#define _MAX_CMD        2048
-
-#ifdef __cplusplus
-extern "C"
-#endif
-int debug_printf(const char *f, ...);
-
-/* Make sockets of type AF_UNIX use underlying FS rights */
-#ifdef SOLARIS
-#   define _XOPEN_SOURCE 500
-#   include <sys/socket.h>
-#   undef _XOPEN_SOURCE
-#else
-#   include <sys/socket.h>
-#endif
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#define max(a, b)   ((a) < (b) ? (b) : (a))
-#define min(a, b)   ((a) > (b) ? (b) : (a))
-#ifndef abs
-#define abs(x)      ((x) >= 0 ? (x) : -(x))
-#endif
-
-#ifdef SYSV
-#   include <sys/utsname.h>
-#endif
-
-#ifdef LINUX
-#   ifndef __USE_GNU
-#   define __USE_GNU
-#   endif
-
-#if GLIBC >= 2
-#   include <shadow.h>
-#   if ! (defined(SPARC) || defined(X86_64))
-#       include <asm/sigcontext.h>
-#   endif
-#   include <pthread.h>
-#   include <sys/file.h>
-#   include <sys/ioctl.h>
-#   include <sys/uio.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <dlfcn.h>
-#   include <endian.h>
-#   include <sys/time.h>
-#   include <semaphore.h>
-#   if __BYTE_ORDER == __LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif __BYTE_ORDER == __BIG_ENDIAN
-#       define _BIG_ENDIAN
-#   elif __BYTE_ORDER == __PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#   define  PTR_SIZE_T(s)               ((size_t *)&(s))
-#   define  IORESOURCE_TRANSFER_BSD
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_PRIORITY
-#   define  PTHREAD_SIGACTION           pthread_sigaction
-#else
-#   include <shadow.h>
-#   include <asm/sigcontext.h>
-#   include <pthread.h>
-#   include <sys/file.h>
-#   include <sys/ioctl.h>
-#   include <linux/net.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <linux/elfcore.h>
-#   include <dlfcn.h>
-#   include <endian.h>
-#   if __BYTE_ORDER == __LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif __BYTE_ORDER == __BIG_ENDIAN
-#       define _BIG_ENDIAN
-#   elif __BYTE_ORDER == __PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#   define  IORESOURCE_TRANSFER_BSD
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_RTL
-#   define  NO_PTHREAD_PRIORITY
-#   define  PTHREAD_SIGACTION           pthread_sigaction
-#endif
-#endif
-
-#ifdef NETBSD
-#   define  ETIME ETIMEDOUT
-#   define _POSIX_THREAD_SYSCALL_SOFT 1
-#   include <pthread.h>
-#   include <netdb.h>
-#   include <sys/sem.h>
-#   include <sys/exec.h>
-#   include <sys/filio.h>
-#   include <sys/ioctl.h>
-#   include <sys/time.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <dlfcn.h>
-#   include <machine/endian.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN_OO
-#   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN_OO
-#   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN_OO
-#   endif
-#   define  PTR_SIZE_T(s)               ((size_t *)&(s))
-#   define  IORESOURCE_TRANSFER_BSD
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_PRIORITY
-#     define  NO_PTHREAD_SEMAPHORES
-#   define  NO_PTHREAD_RTL
-#   define  PTHREAD_SIGACTION           pthread_sigaction
-#endif
-
-#ifdef FREEBSD
-#   define  ETIME ETIMEDOUT
-#   include <pthread.h>
-#   include <sys/sem.h>
-#   include <semaphore.h>
-#   include <dlfcn.h>
-#   include <sys/filio.h>
-#   include <sys/ioctl.h>
-#   include <sys/param.h>
-#   include <sys/time.h>
-#   include <sys/uio.h>
-#   include <sys/exec.h>
-#   include <vm/vm.h>
-#   include <vm/vm_param.h>
-#   include <vm/pmap.h>
-#   include <vm/swap_pager.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   define  IORESOURCE_TRANSFER_BSD
-#   include <machine/endian.h>
-#if __FreeBSD_version < 500000
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#endif
-#   define  NO_PTHREAD_RTL
-#endif
-
-#ifdef SCO
-#   define AF_IPX -1
-#   include <strings.h>
-#   include <pthread.h>
-#   include <shadow.h>
-#   include <netdb.h>
-#   include <sys/un.h>
-#   include <sys/netinet/tcp.h>
-#   include <sys/types.h>
-#   include <sys/byteorder.h>
-#   include <dlfcn.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#   define  sched_yield()               pthread_yield()
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_RTL
-#   define  NO_PTHREAD_PRIORITY
-extern int pthread_cancel(pthread_t);
-extern unsigned int nanosleep(unsigned int);
-#   define  SLEEP_TIMESPEC(timespec)    (timespec .tv_sec > 0) ? sleep(timespec .tv_sec), nanosleep(timespec .tv_nsec) : nanosleep(timespec .tv_nsec)
-#   define  PATH_MAX                    _POSIX_PATH_MAX
-#   define  S_ISSOCK                    S_ISFIFO
-#   define  PTHREAD_SIGACTION           pthread_sigaction
-#   define  STAT_PARENT                 stat
-#endif
-
-#ifdef AIX
-#   define AF_IPX -1
-#   include <strings.h>
-#   include <pthread.h>
-#   include <sys/time.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <sys/machine.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#   define  sched_yield()               pthread_yield()
-#   define  SLEEP_TIMESPEC(timespec)    nsleep(&timespec, 0)
-#   define  LIBPATH "LIBPATH"
-#   define  PTR_SIZE_T(s)               ((size_t *)&(s))
-#   define  NO_PTHREAD_SEMAPHORES
-#   define  NO_DL_FUNCTIONS
-#endif
-
-#ifdef HPUX
-#   define  AF_IPX -1
-#   undef   howmany
-#   undef   MAXINT
-#   include <pthread.h>
-#   include <sys/un.h>
-#   include <sys/sched.h>
-#   include <sys/xti.h>
-#   include <sys/pstat.h>
-#   include <shadow.h>
-#   include <crypt.h>
-#   include <machine/param.h>
-#   define  LIBPATH "SHLIB_PATH"
-#   define  PTR_SIZE_T(s)               ((int *)&(s))
-#   define  PTR_FD_SET(s)               ((int *)&(s))
-#   define  PTHREAD_VALUE(t)            ((t).field2)
-#   define  PTHREAD_NONE_INIT           { 0, -1 }
-#   define  PTHREAD_ATTR_DEFAULT        pthread_attr_default
-#   define  PTHREAD_MUTEXATTR_DEFAULT   pthread_mutexattr_default
-#   define  PTHREAD_CONDATTR_DEFAULT    pthread_condattr_default
-#   define  pthread_detach(t)           pthread_detach(&(t))
-#   define  NO_PTHREAD_PRIORITY
-#   define  NO_PTHREAD_SEMAPHORES
-#   define  NO_DL_FUNCTIONS
-#   undef   sigaction
-#   define  PTHREAD_SIGACTION           cma_sigaction
-#endif
-
-#ifdef SOLARIS
-#   include <shadow.h>
-#   include <sys/procfs.h>
-#   include <sys/un.h>
-#   include <stropts.h>
-#   include <pthread.h>
-#   include <semaphore.h>
-#   include <netinet/tcp.h>
-#   include <sys/filio.h>
-#   include <dlfcn.h>
-#   include <sys/isa_defs.h>
-#   define  IORESOURCE_TRANSFER_SYSV
-#   define  IOCHANNEL_TRANSFER_BSD
-#   define  LIBPATH "LD_LIBRARY_PATH"
-#   define  PTR_SIZE_T(s)               ((int *)&(s))
-#endif
-
-#ifdef MACOSX
-#   define  ETIME ETIMEDOUT
-#   include <pthread.h>
-#   include <sys/file.h>
-#   include <sys/ioctl.h>
-#   include <sys/uio.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <machine/endian.h>
-#   include <sys/time.h>
-#   include <sys/semaphore.h>
-/* fixme are premac and postmac still needed here? */
-#   include <premac.h>
-#   include <mach-o/dyld.h>
-#   include <postmac.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  NO_PTHREAD_RTL
-/* for NSGetArgc/Argv/Environ */
-#       include <crt_externs.h>
-char *macxp_tempnam( const char *tmpdir, const char *prefix );
-#endif
-
-#ifdef OS2
-#   include <netinet/tcp.h>
-#endif
-
-#if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)  && \
-    !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO)  && \
-    !defined(AIX)     && !defined(HPUX)   && \
-    !defined(SOLARIS) && !defined(MACOSX)
-#   error "Target plattform not specified !"
-#endif
-
-#if defined(NETBSD)
-#if defined _LITTLE_ENDIAN_OO
-#   define _OSL_BIGENDIAN
-#elif defined _BIG_ENDIAN_OO
-#   define _OSL_LITENDIAN
-#else
-#   error undetermined endianess
-#endif
-#else
-#if defined _LITTLE_ENDIAN
-#   define _OSL_BIGENDIAN
-#elif defined _BIG_ENDIAN
-#   define _OSL_LITENDIAN
-#else
-#   error undetermined endianess
-#endif
-#endif
-
-#ifndef PTR_SIZE_T
-#   define PTR_SIZE_T(s)                (&(s))
-#endif
-
-#ifndef PTR_FD_SET
-#   define PTR_FD_SET(s)                (&(s))
-#endif
-
-#ifndef NORMALIZE_TIMESPEC
-#   define NORMALIZE_TIMESPEC(timespec) \
-          timespec . tv_sec  += timespec . tv_nsec / 1000000000; \
-          timespec . tv_nsec %= 1000000000;
-#endif
-
-#ifndef SET_TIMESPEC
-#   define SET_TIMESPEC(timespec, sec, nsec) \
-          timespec . tv_sec  = (sec);  \
-          timespec . tv_nsec = (nsec); \
-        NORMALIZE_TIMESPEC(timespec);
-#endif
-
-#ifndef SLEEP_TIMESPEC
-#   define SLEEP_TIMESPEC(timespec) nanosleep(&timespec, 0)
-#endif
-
-#ifndef INIT_GROUPS
-#   define  INIT_GROUPS(name, gid)  ((setgid((gid)) == 0) && (initgroups((name), (gid)) == 0))
-#endif
-
-#ifndef PTHREAD_VALUE
-#   define PTHREAD_VALUE(t)             (t)
-#endif
-#ifndef PTHREAD_NONE
-extern pthread_t _pthread_none_;
-#   define PTHREAD_NONE                 _pthread_none_
-#   ifndef PTHREAD_NONE_INIT
-#       define PTHREAD_NONE_INIT        ((pthread_t)-1)
-#   endif
-#endif
-
-#ifndef PTHREAD_ATTR_DEFAULT
-#   define PTHREAD_ATTR_DEFAULT         NULL
-#endif
-#ifndef PTHREAD_MUTEXATTR_DEFAULT
-#   define PTHREAD_MUTEXATTR_DEFAULT    NULL
-#endif
-#ifndef PTHREAD_CONDATTR_DEFAULT
-#   define PTHREAD_CONDATTR_DEFAULT     NULL
-#endif
-
-#ifndef PTHREAD_SIGACTION
-#   define PTHREAD_SIGACTION sigaction
-#endif
-
-#ifndef STAT_PARENT
-#   define STAT_PARENT                  lstat
-#endif
-
-/* socket options which might not be defined on all unx flavors */
-#ifndef SO_ACCEPTCONN
-#   define SO_ACCEPTCONN    0
-#endif
-#ifndef SO_SNDLOWAT
-#   define SO_SNDLOWAT      0
-#endif
-#ifndef SO_RCVLOWAT
-#   define SO_RCVLOWAT      0
-#endif
-#ifndef SO_SNDTIMEO
-#   define  SO_SNDTIMEO     0
-#endif
-#ifndef SO_RCVTIMEO
-#   define SO_RCVTIMEO      0
-#endif
-#ifndef SO_USELOOPBACK
-#   define SO_USELOOPBACK   0
-#endif
-#ifndef MSG_MAXIOVLEN
-#   define MSG_MAXIOVLEN    0
-#endif
-
-/* BEGIN HACK */
-/* dummy define and declarations for IPX should be replaced by */
-/* original ipx headers when these are available for this platform */
-
-#ifndef SA_FAMILY_DECL
-#   define SA_FAMILY_DECL short sa_family
-#endif
-
-typedef struct sockaddr_ipx {
-    SA_FAMILY_DECL;
-    char  sa_netnum[4];
-    char  sa_nodenum[6];
-    unsigned short sa_socket;
-} SOCKADDR_IPX;
-
-#define NSPROTO_IPX      1000
-#define NSPROTO_SPX      1256
-#define NSPROTO_SPXII    1257
-
-/* END HACK */
-
-#ifdef NO_PTHREAD_SEMAPHORES
-
-typedef struct
-{
-    pthread_mutex_t mutex;
-    pthread_cond_t  increased;
-    int             value;
-} sem_t;
-extern int sem_init(sem_t* sem, int pshared, unsigned int value);
-extern int sem_destroy(sem_t* sem);
-extern int sem_wait(sem_t* sem);
-extern int sem_trywait(sem_t* sem);
-extern int sem_post(sem_t* sem);
-
-#endif
-
-#ifdef NO_PTHREAD_RTL
-#if !defined FREEBSD || (__FreeBSD_version < 500112)
-struct passwd *getpwent_r(struct passwd *pwd, char *buffer,  int buflen);
-extern struct spwd *getspnam_r(const char *name, struct spwd *result,
-                               char *buffer, int buflen);
-
-struct tm *localtime_r(const time_t *timep, struct tm *buffer);
-struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
-#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-struct hostent *gethostbyname_r(const char *name, struct hostent *result,
-                                char *buffer, int buflen, int *h_errnop);
-#endif
-
-#endif /* __OSL_SYSTEM_H__ */
-
diff --git a/sal/osl/os2/tempfile.c b/sal/osl/os2/tempfile.c
deleted file mode 100644
index 672995563c88..000000000000
--- a/sal/osl/os2/tempfile.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*****************************************************************/
-/* Includes                                                      */
-/*****************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include "system.h"
-#include <osl/file.h>
-#include <osl/thread.h>
-#include <rtl/ustrbuf.h>
-#include <osl/diagnose.h>
-
-#ifndef _FILE_URL_H_
-#include "file_url.h"
-#endif
-
-/*****************************************************************/
-/* osl_getTempFirURL                                             */
-/*****************************************************************/
-
-oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )
-{
-    const char *pValue = getenv( "TEMP" );
-
-    if ( !pValue )
-    {
-        pValue = getenv( "TMP" );
-#if defined(SOLARIS) || defined (LINUX) || defined (FREEBSD) || defined (MACOSX)
-        if ( !pValue )
-            pValue = P_tmpdir;
-#endif
-    }
-
-    if ( pValue )
-    {
-        oslFileError error;
-        rtl_uString *ustrTempPath = NULL;
-
-        rtl_string2UString( &ustrTempPath, pValue, strlen( pValue ), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
-        OSL_ASSERT(ustrTempPath != NULL);
-        error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir );
-        rtl_uString_release( ustrTempPath );
-
-        return error;
-    }
-    else
-        return osl_File_E_NOENT;
-}
-
-/******************************************************************
- * Generates a random unique file name. We're using the scheme
- * from the standard c-lib function mkstemp to generate a more
- * or less random unique file name
- *
- * @param rand_name
- *        receives the random name
- ******************************************************************/
-
-static const char LETTERS[]        = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
-static const int  COUNT_OF_LETTERS = sizeof(LETTERS)/sizeof(LETTERS[0]) - 1;
-
-#define RAND_NAME_LENGTH 6
-
-static void osl_gen_random_name_impl_(rtl_uString** rand_name)
-{
-    static uint64_t value;
-
-    char     buffer[RAND_NAME_LENGTH];
-    struct   timeval tv;
-    uint64_t v;
-    int      i;
-
-    gettimeofday(&tv, NULL);
-
-    value += ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid();
-
-    v = value;
-
-    for (i = 0; i < RAND_NAME_LENGTH; i++)
-    {
-        buffer[i] = LETTERS[v % COUNT_OF_LETTERS];
-        v        /= COUNT_OF_LETTERS;
-    }
-
-    rtl_string2UString(
-            rand_name,
-            buffer,
-            RAND_NAME_LENGTH,
-            RTL_TEXTENCODING_ASCII_US,
-            OSTRING_TO_OUSTRING_CVTFLAGS);
-    OSL_ASSERT(*rand_name != NULL);
-}
-
-/*****************************************************************
- * Helper function
- * Either use the directory provided or the result of
- * osl_getTempDirUrl and return it as system path and file url
- ****************************************************************/
-
-static oslFileError osl_setup_base_directory_impl_(
-    rtl_uString*  pustrDirectoryURL,
-    rtl_uString** ppustr_base_dir)
-{
-    rtl_uString* dir_url = 0;
-    rtl_uString* dir     = 0;
-    oslFileError error   = osl_File_E_None;
-
-    if (pustrDirectoryURL)
-        rtl_uString_assign(&dir_url, pustrDirectoryURL);
-    else
-        error = osl_getTempDirURL(&dir_url);
-
-    if (osl_File_E_None == error)
-    {
-        error = osl_getSystemPathFromFileURL_Ex(dir_url, &dir, FURL_DENY_RELATIVE);
-        rtl_uString_release(dir_url);
-    }
-
-    if (osl_File_E_None == error)
-    {
-        rtl_uString_assign(ppustr_base_dir, dir);
-        rtl_uString_release(dir);
-    }
-
-    return error;
-}
-
-/*****************************************************************
- * osl_setup_createTempFile_impl
- * validate input parameter, setup variables
- ****************************************************************/
-
- static oslFileError osl_setup_createTempFile_impl_(
-     rtl_uString*   pustrDirectoryURL,
-    oslFileHandle* pHandle,
-    rtl_uString**  ppustrTempFileURL,
-    rtl_uString**  ppustr_base_dir,
-    sal_Bool*      b_delete_on_close)
- {
-     oslFileError osl_error;
-
-    OSL_PRECOND(((0 != pHandle) || (0 != ppustrTempFileURL)), "Invalid parameter!");
-
-    if ((0 == pHandle) && (0 == ppustrTempFileURL))
-    {
-        osl_error = osl_File_E_INVAL;
-    }
-    else
-    {
-        osl_error = osl_setup_base_directory_impl_(
-            pustrDirectoryURL, ppustr_base_dir);
-
-        *b_delete_on_close = (0 == ppustrTempFileURL);
-    }
-
-    return osl_error;
- }
-
-/*****************************************************************
- * Create a unique file in the specified directory and return
- * it's name
- ****************************************************************/
-
-static oslFileError osl_create_temp_file_impl_(
-    const rtl_uString* pustr_base_directory,
-    oslFileHandle* file_handle,
-    rtl_uString** ppustr_temp_file_name)
-{
-    rtl_uString*        rand_name        = 0;
-    sal_uInt32          len_base_dir     = 0;
-    rtl_uString*        tmp_file_path    = 0;
-    rtl_uString*        tmp_file_url     = 0;
-    sal_Int32           capacity         = 0;
-    oslFileError        osl_error        = osl_File_E_None;
-    sal_Int32           offset_file_name;
-    const sal_Unicode*  puchr;
-
-    OSL_PRECOND(pustr_base_directory, "Invalid Parameter");
-    OSL_PRECOND(file_handle, "Invalid Parameter");
-    OSL_PRECOND(ppustr_temp_file_name, "Invalid Parameter");
-
-    len_base_dir = rtl_uString_getLength(pustr_base_directory);
-
-    rtl_uStringbuffer_newFromStr_WithLength(
-        &tmp_file_path,
-        rtl_uString_getStr((rtl_uString*)pustr_base_directory),
-        len_base_dir);
-
-    rtl_uStringbuffer_ensureCapacity(
-        &tmp_file_path,
-        &capacity,
-        (len_base_dir + 1 + RAND_NAME_LENGTH));
-
-    offset_file_name = len_base_dir;
-
-    puchr = rtl_uString_getStr(tmp_file_path);
-
-    /* ensure that the last character is a '\' */
-
-    if ((sal_Unicode)'\\' != puchr[len_base_dir - 1])
-    {
-        rtl_uStringbuffer_insert_ascii(
-            &tmp_file_path,
-            &capacity,
-            len_base_dir,
-            "\\",
-            1);
-
-        offset_file_name++;
-    }
-
-    while(1) /* try until success */
-    {
-        osl_gen_random_name_impl_(&rand_name);
-
-        rtl_uStringbuffer_insert(
-            &tmp_file_path,
-            &capacity,
-            offset_file_name,
-            rtl_uString_getStr(rand_name),
-            rtl_uString_getLength(rand_name));
-
-        osl_error = osl_getFileURLFromSystemPath(
-            tmp_file_path, &tmp_file_url);
-
-        if (osl_File_E_None == osl_error)
-        {
-            /* RW permission for the user only! */
-            mode_t old_mode = umask(077);
-
-            osl_error = osl_openFile(
-                tmp_file_url,
-                file_handle,
-                osl_File_OpenFlag_Read |
-                osl_File_OpenFlag_Write |
-                osl_File_OpenFlag_Create);
-
-            umask(old_mode);
-        }
-
-        /* in case of error osl_File_E_EXIST we simply try again else we give up */
-
-        if ((osl_File_E_None == osl_error) || (osl_error != osl_File_E_EXIST))
-        {
-            if (rand_name)
-                rtl_uString_release(rand_name);
-
-            if (tmp_file_url)
-                rtl_uString_release(tmp_file_url);
-
-            break;
-        }
-    } /* while(1) */
-
-    if (osl_File_E_None == osl_error)
-        rtl_uString_assign(ppustr_temp_file_name, tmp_file_path);
-
-    if (tmp_file_path)
-        rtl_uString_release(tmp_file_path);
-
-    return osl_error;
-}
-
-/*****************************************************************
- * osl_createTempFile
- *****************************************************************/
-
-oslFileError SAL_CALL osl_createTempFile(
-    rtl_uString*   pustrDirectoryURL,
-    oslFileHandle* pHandle,
-    rtl_uString**  ppustrTempFileURL)
-{
-    rtl_uString*  base_directory     = 0;
-    rtl_uString*  temp_file_name     = 0;
-    oslFileHandle temp_file_handle;
-    sal_Bool      b_delete_on_close;
-    oslFileError  osl_error;
-
-    osl_error = osl_setup_createTempFile_impl_(
-        pustrDirectoryURL,
-        pHandle,
-        ppustrTempFileURL,
-        &base_directory,
-        &b_delete_on_close);
-
-    if (osl_File_E_None != osl_error)
-        return osl_error;
-
-    osl_error = osl_create_temp_file_impl_(
-        base_directory, &temp_file_handle, &temp_file_name);
-
-    if (osl_File_E_None == osl_error)
-    {
-        rtl_uString* temp_file_url = 0;
-
-        /* assuming this works */
-        osl_getFileURLFromSystemPath(temp_file_name, &temp_file_url);
-
-        if (b_delete_on_close)
-        {
-            osl_error = osl_removeFile(temp_file_url);
-
-            if (osl_File_E_None == osl_error)
-                *pHandle = temp_file_handle;
-            else
-                osl_closeFile(temp_file_handle);
-        }
-        else
-        {
-            if (pHandle)
-                *pHandle = temp_file_handle;
-            else
-                osl_closeFile(temp_file_handle);
-
-            rtl_uString_assign(ppustrTempFileURL, temp_file_url);
-        }
-
-        if (temp_file_url)
-            rtl_uString_release(temp_file_url);
-
-        if (temp_file_name)
-            rtl_uString_release(temp_file_name);
-    }
-
-    if (base_directory)
-        rtl_uString_release(base_directory);
-
-    return osl_error;
-}
diff --git a/sal/osl/os2/thread.c b/sal/osl/os2/thread.c
deleted file mode 100644
index 0f0c396a407c..000000000000
--- a/sal/osl/os2/thread.c
+++ /dev/null
@@ -1,776 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "system.h"
-
-#include <osl/diagnose.h>
-#include <osl/thread.h>
-#include <osl/time.h>
-#include <rtl/alloc.h>
-#include <rtl/tencinfo.h>
-
-/*
-    Thread-data structure hidden behind oslThread:
-*/
-typedef struct _osl_TThreadImpl
-{
-
-    TID                  m_ThreadId;        /* identifier for this thread */
-    sal_Int32            m_Flags;
-    HEV                  m_hEvent;
-    sal_uInt32           m_Timeout;
-    oslWorkerFunction    m_WorkerFunction;
-    void*                m_pData;
-    sal_Bool             m_StartSuspended;
-    HAB                  m_hab;
-    HMQ                  m_hmq;
-
-} osl_TThreadImpl;
-
-#define THREADIMPL_FLAGS_TERMINATE    0x0001
-#define THREADIMPL_FLAGS_SLEEP        0x0002
-
-
-// static mutex to control access to private members of oslMutexImpl
-static HMTX MutexLock = NULL;
-
-/*****************************************************************************/
-
-HAB osl_getPMinternal_HAB(oslThread hThread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)hThread;
-
-    if(pThreadImpl == NULL) /* valid ptr? */
-    {
-        return NULL;
-    }
-    else
-    {
-        return pThreadImpl->m_hab;
-    }
-}
-
-HMQ osl_getPMinternal_HMQ(oslThread hThread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)hThread;
-
-    if(pThreadImpl == NULL) /* valid ptr? */
-    {
-        return NULL;
-    }
-    else
-    {
-        return pThreadImpl->m_hmq;
-    }
-}
-
-
-/*****************************************************************************/
-/* oslWorkerWrapperFunction */
-/*****************************************************************************/
-static void oslWorkerWrapperFunction(void* pData)
-{
-    BOOL rc;
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)pData;
-
-#if OSL_DEBUG_LEVEL>0
-printf("oslWorkerWrapperFunction pThreadImpl %x, pThreadImpl->m_ThreadId %d\n", pThreadImpl, pThreadImpl->m_ThreadId);
-#endif
-    /* Inizialize PM for this thread */
-    pThreadImpl->m_hab = WinInitialize( 0 );
-#if OSL_DEBUG_LEVEL>0
-printf("pThreadImpl->m_ThreadId %d, pThreadImpl->m_hab %x\n", pThreadImpl->m_ThreadId,pThreadImpl->m_hab);
-#endif
-    pThreadImpl->m_hmq = WinCreateMsgQueue( pThreadImpl->m_hab, 0 );
-#if OSL_DEBUG_LEVEL>0
-printf("pThreadImpl->m_ThreadId %d, pThreadImpl->m_hmq %x\n", pThreadImpl->m_ThreadId,pThreadImpl->m_hmq);
-#endif
-
-    /* call worker-function with data */
-    pThreadImpl->m_WorkerFunction( pThreadImpl->m_pData );
-
-    /* Free all PM-resources for this thread */
-#if OSL_DEBUG_LEVEL>0
-printf("pThreadImpl->m_ThreadId %d, about to destroy queue\n", pThreadImpl->m_ThreadId);
-#endif
-    rc = WinDestroyMsgQueue( pThreadImpl->m_hmq );
-#if OSL_DEBUG_LEVEL>0
-printf("pThreadImpl->m_ThreadId %d, WinDestroyMsgQueue rc=%d (should be 1)\n", pThreadImpl->m_ThreadId, rc);
-printf("pThreadImpl->m_ThreadId %d, about to terminate hab\n", pThreadImpl->m_ThreadId);
-#endif
-    rc = WinTerminate( pThreadImpl->m_hab );
-#if OSL_DEBUG_LEVEL>0
-printf("pThreadImpl->m_ThreadId %d, WinTerminate rc=%d (should be 1)\n", pThreadImpl->m_ThreadId, rc);
-#endif
-}
-
-
-/*****************************************************************************/
-/* oslCreateThread */
-/*****************************************************************************/
-static oslThread oslCreateThread(oslWorkerFunction pWorker,
-                                 void* pThreadData,
-                                 sal_Bool nFlags)
-{
-    osl_TThreadImpl* pThreadImpl;
-
-    /* alloc mem. for our internal data structure */
-    pThreadImpl = (osl_TThreadImpl*)malloc(sizeof(osl_TThreadImpl));
-
-    OSL_ASSERT(pThreadImpl);
-
-    pThreadImpl->m_WorkerFunction= pWorker;
-    pThreadImpl->m_pData= pThreadData;
-
-    pThreadImpl->m_Flags   = 0;
-    pThreadImpl->m_hEvent  = 0;
-    pThreadImpl->m_Timeout = 0;
-    pThreadImpl->m_StartSuspended = nFlags;
-    pThreadImpl->m_hab = 0;
-    pThreadImpl->m_hmq = 0;
-
-    if ( nFlags == sal_True )
-    {
-        DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-    }
-
-    pThreadImpl->m_ThreadId = (TID) _beginthread( oslWorkerWrapperFunction,    /* worker-function */
-                                                  NULL,                        /* unused parameter */
-                                                  1024*1024,                   /* max. Stacksize */
-                                                  pThreadImpl );
-    if ( nFlags == sal_True )
-    {
-        if( pThreadImpl->m_ThreadId != -1 )
-            DosSuspendThread( pThreadImpl->m_ThreadId );
-        DosReleaseMutexSem( MutexLock);
-    }
-#if OSL_DEBUG_LEVEL>0
-printf("oslCreateThread pThreadImpl %x, pThreadImpl->m_ThreadId %d\n", pThreadImpl, pThreadImpl->m_ThreadId);
-#endif
-    if(pThreadImpl->m_ThreadId == -1)
-    {
-        /* create failed */
-        if (pThreadImpl->m_hEvent != 0)
-            DosCloseEventSem(pThreadImpl->m_hEvent);
-
-        free(pThreadImpl);
-        return 0;
-    }
-
-    pThreadImpl->m_hEvent= 0;
-
-    return pThreadImpl;
-
-}
-
-/*****************************************************************************/
-/* osl_createThread */
-/*****************************************************************************/
-oslThread SAL_CALL osl_createThread(oslWorkerFunction pWorker,
-                                 void* pThreadData)
-{
-    return oslCreateThread(pWorker,pThreadData,sal_False);
-}
-
-/*****************************************************************************/
-/* osl_createSuspendedThread */
-/*****************************************************************************/
-oslThread SAL_CALL osl_createSuspendedThread(oslWorkerFunction pWorker,
-                                          void* pThreadData)
-{
-    return oslCreateThread(pWorker,pThreadData,sal_True);
-}
-
-/*****************************************************************************/
-/* osl_getThreadIdentifier */
-/*****************************************************************************/
-oslThreadIdentifier SAL_CALL osl_getThreadIdentifier(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    if (pThreadImpl != NULL)
-        return ((oslThreadIdentifier)pThreadImpl->m_ThreadId);
-    else
-        {
-        PTIB pptib = NULL;
-        PPIB pppib = NULL;
-
-        DosGetInfoBlocks( &pptib, &pppib );
-        return ((oslThreadIdentifier) pptib->tib_ptib2->tib2_ultid );
-        }
-}
-
-/*****************************************************************************/
-/* osl_destroyThread */
-/*****************************************************************************/
-void SAL_CALL osl_destroyThread(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    if(Thread == 0) /* valid ptr? */
-    {
-        /* thread already destroyed or not created */
-        return;
-    }
-
-    if(pThreadImpl->m_ThreadId != -1)    /* valid handle ? */
-    {
-        /* cancel thread  */
-        DosKillThread( pThreadImpl->m_ThreadId );
-    }
-}
-
-/*****************************************************************************/
-/* osl_freeThreadHandle */
-/*****************************************************************************/
-void SAL_CALL osl_freeThreadHandle(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    if(Thread == 0)        /* valid ptr? */
-    {
-        /* thread already destroyed or not created */
-        return;
-    }
-
-    if (pThreadImpl->m_hEvent != 0)
-        DosCloseEventSem(pThreadImpl->m_hEvent);
-
-    /* free memory */
-    free(Thread);
-}
-
-/*****************************************************************************/
-/* osl_resumeThread */
-/*****************************************************************************/
-void SAL_CALL osl_resumeThread(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    OSL_ASSERT(pThreadImpl);        /* valid ptr? */
-
-    DosResumeThread( pThreadImpl->m_ThreadId );
-}
-
-/*****************************************************************************/
-/* osl_suspendThread */
-/*****************************************************************************/
-void SAL_CALL osl_suspendThread(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    OSL_ASSERT(pThreadImpl);        /* valid ptr? */
-
-    DosSuspendThread( pThreadImpl->m_ThreadId );
-}
-
-/*****************************************************************************/
-/* osl_setThreadPriority */
-/*****************************************************************************/
-void SAL_CALL osl_setThreadPriority(oslThread Thread,
-                           oslThreadPriority Priority)
-{
-    ULONG nOs2PriorityClass;
-    ULONG nOs2PriorityDelta;
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    OSL_ASSERT(pThreadImpl);        /* valid ptr? */
-
-    switch(Priority) {
-
-    case osl_Thread_PriorityHighest:
-
-        nOs2PriorityClass = PRTYC_REGULAR;
-        nOs2PriorityDelta = PRTYD_MAXIMUM;
-        break;
-
-    case osl_Thread_PriorityAboveNormal:
-
-        nOs2PriorityClass = PRTYC_REGULAR;
-        nOs2PriorityDelta = 16;
-        break;
-
-    case osl_Thread_PriorityNormal:
-
-        nOs2PriorityClass = PRTYC_REGULAR;
-        nOs2PriorityDelta = 0;
-        break;
-
-    case osl_Thread_PriorityBelowNormal:
-
-        nOs2PriorityClass = PRTYC_REGULAR;
-        nOs2PriorityDelta = -16;
-        break;
-
-    case osl_Thread_PriorityLowest:
-
-        nOs2PriorityClass = PRTYC_REGULAR;
-        nOs2PriorityDelta = PRTYD_MINIMUM;
-        break;
-
-    case osl_Thread_PriorityUnknown:
-        OSL_ASSERT(FALSE);        /* only fools try this...*/
-
-        /* let release-version behave friendly */
-        return;
-
-    default:
-        OSL_ASSERT(FALSE);        /* enum expanded, but forgotten here...*/
-
-        /* let release-version behave friendly */
-        return;
-    }
-
-    DosSetPriority( PRTYS_THREAD,
-                    nOs2PriorityClass, nOs2PriorityDelta,
-                    pThreadImpl->m_ThreadId );
-
-}
-
-/*****************************************************************************/
-/* osl_getThreadPriority  */
-/*****************************************************************************/
-
-#define BYTE1FROMULONG(ul) ((UCHAR) (ul))
-#define BYTE2FROMULONG(ul) ((UCHAR) ((ULONG) ul >> 8))
-
-oslThreadPriority  SAL_CALL osl_getThreadPriority(const oslThread Thread)
-{
-    ULONG nOs2PriorityClass;
-    ULONG nOs2PriorityDelta;
-
-    oslThreadPriority Priority;
-
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    /* invalid arguments ?*/
-    if(pThreadImpl==0 || pThreadImpl->m_ThreadId==-1)
-    {
-        return osl_Thread_PriorityUnknown;
-    }
-
-    /* get current priorities */
-    {
-    PTIB pptib = NULL;
-    PPIB pppib = NULL;
-
-    DosGetInfoBlocks( &pptib, &pppib );
-    nOs2PriorityClass = BYTE1FROMULONG( pptib->tib_ptib2->tib2_ulpri );
-    nOs2PriorityDelta = BYTE2FROMULONG( pptib->tib_ptib2->tib2_ulpri );
-    }
-
-    /* map OS2 priority to enum */
-    switch(nOs2PriorityClass)
-    {
-    case PRTYC_TIMECRITICAL:
-        Priority= osl_Thread_PriorityHighest;
-        break;
-
-    case PRTYC_REGULAR:
-
-        if( nOs2PriorityDelta == 0 )
-        {
-            Priority= osl_Thread_PriorityNormal;
-            break;
-        }
-
-        if( nOs2PriorityDelta < -16 )
-        {
-            Priority= osl_Thread_PriorityLowest;
-            break;
-        }
-
-        if( nOs2PriorityDelta < 0 )
-        {
-            Priority= osl_Thread_PriorityBelowNormal;
-            break;
-        }
-
-        if( nOs2PriorityDelta > 0 )
-        {
-            Priority= osl_Thread_PriorityAboveNormal;
-            break;
-        }
-
-        Priority= osl_Thread_PriorityHighest;
-        break;
-
-    case PRTYC_IDLETIME:
-        Priority= osl_Thread_PriorityLowest;
-        break;
-
-    default:
-        OSL_ASSERT(FALSE);        /* OS/2 API changed, incorporate new prio-level! */
-
-        /* release-version behaves friendly */
-        Priority= osl_Thread_PriorityUnknown;
-    }
-
-    return Priority;
-}
-
-/*****************************************************************************/
-/* osl_isThreadRunning */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_isThreadRunning(const oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-    APIRET rc;
-
-    /* invalid arguments ?*/
-    if(pThreadImpl==0 || pThreadImpl->m_ThreadId==-1)
-    {
-        return sal_False;
-    }
-
-    if( osl_getThreadIdentifier( 0 ) == osl_getThreadIdentifier( Thread ) )
-        return sal_True;
-
-    rc = DosWaitThread( &pThreadImpl->m_ThreadId, DCWW_NOWAIT );
-
-    return( rc != ERROR_INVALID_THREADID );
-}
-
-/*****************************************************************************/
-/* osl_joinWithThread */
-/*****************************************************************************/
-void SAL_CALL osl_joinWithThread(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    /* invalid arguments?*/
-    if(pThreadImpl==0 || pThreadImpl->m_ThreadId==-1)
-    {
-        /* assume thread is not running */
-        return;
-    }
-
-    DosWaitThread( &pThreadImpl->m_ThreadId, DCWW_WAIT );
-}
-
-/*****************************************************************************/
-/* osl_waitThread */
-/*****************************************************************************/
-void SAL_CALL osl_waitThread(const TimeValue* pDelay)
-{
-    int millisecs;
-
-    OSL_ASSERT(pDelay);
-
-    millisecs = pDelay->Seconds * 1000 + pDelay->Nanosec / 1000000;
-
-    DosSleep(millisecs);
-}
-
-/*****************************************************************************/
-/* osl_terminateThread */
-/*****************************************************************************/
-void SAL_CALL osl_terminateThread(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    /* invalid arguments?*/
-    if (pThreadImpl==0 || pThreadImpl->m_ThreadId==-1)
-    {
-        /* assume thread is not running */
-        return;
-    }
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-    pThreadImpl->m_Flags |= THREADIMPL_FLAGS_TERMINATE;
-    DosReleaseMutexSem( MutexLock);
-}
-
-
-/*****************************************************************************/
-/* osl_scheduleThread */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_scheduleThread(oslThread Thread)
-{
-    osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    osl_yieldThread();
-
-    /* invalid arguments?*/
-    if (pThreadImpl==0 || pThreadImpl->m_ThreadId==-1)
-    {
-        /* assume thread is not running */
-        return sal_False;
-    }
-
-    if (pThreadImpl->m_Flags & THREADIMPL_FLAGS_SLEEP)
-    {
-        OSL_ASSERT (pThreadImpl->m_hEvent != 0);
-
-        DosWaitEventSem(pThreadImpl->m_hEvent, pThreadImpl->m_Timeout);
-
-        DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-        pThreadImpl->m_Timeout = 0;
-
-        pThreadImpl->m_Flags &= ~THREADIMPL_FLAGS_SLEEP;
-
-        DosReleaseMutexSem( MutexLock);
-    }
-
-    return ((pThreadImpl->m_Flags & THREADIMPL_FLAGS_TERMINATE) == 0);
-}
-
-/*****************************************************************************/
-/* osl_yieldThread */
-/*****************************************************************************/
-void SAL_CALL osl_yieldThread()
-{
-    DosSleep(0);
-}
-
-void osl_setThreadName(char const * name) {
-    (void) name;
-}
-
-typedef struct _TLS
-{
-    PULONG                          pulPtr;
-    oslThreadKeyCallbackFunction    pfnCallback;
-    struct _TLS                     *pNext, *pPrev;
-} TLS, *PTLS;
-
-static  PTLS        g_pThreadKeyList = NULL;
-
-static void AddKeyToList( PTLS pTls )
-{
-    if ( pTls )
-    {
-        DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-
-        pTls->pNext = g_pThreadKeyList;
-        pTls->pPrev = 0;
-
-        if ( g_pThreadKeyList )
-            g_pThreadKeyList->pPrev = pTls;
-
-        g_pThreadKeyList = pTls;
-
-        DosReleaseMutexSem( MutexLock);
-    }
-}
-
-static void RemoveKeyFromList( PTLS pTls )
-{
-    if ( pTls )
-    {
-        DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-        if ( pTls->pPrev )
-            pTls->pPrev->pNext = pTls->pNext;
-        else
-        {
-            OSL_ASSERT( pTls == g_pThreadKeyList );
-            g_pThreadKeyList = pTls->pNext;
-        }
-
-        if ( pTls->pNext )
-            pTls->pNext->pPrev = pTls->pPrev;
-        DosReleaseMutexSem( MutexLock);
-    }
-}
-
-void SAL_CALL _osl_callThreadKeyCallbackOnThreadDetach(void)
-{
-    PTLS    pTls;
-
-    DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
-    pTls = g_pThreadKeyList;
-    while ( pTls )
-    {
-        if ( pTls->pfnCallback )
-        {
-            void    *pValue = (void*)*pTls->pulPtr;
-
-            if ( pValue )
-                pTls->pfnCallback( pValue );
-        }
-
-        pTls = pTls->pNext;
-    }
-    DosReleaseMutexSem( MutexLock);
-}
-
-/*****************************************************************************/
-/* osl_createThreadKey */
-/*****************************************************************************/
-oslThreadKey SAL_CALL osl_createThreadKey(oslThreadKeyCallbackFunction pCallback)
-{
-    PTLS    pTls = (PTLS)rtl_allocateMemory( sizeof(TLS) );
-
-    if ( pTls )
-    {
-        pTls->pfnCallback = pCallback;
-        if (DosAllocThreadLocalMemory(1, &pTls->pulPtr) != NO_ERROR)
-        {
-            rtl_freeMemory( pTls );
-            pTls = 0;
-        }
-        else
-        {
-            *pTls->pulPtr = 0;
-            AddKeyToList( pTls );
-        }
-    }
-
-    return ((oslThreadKey)pTls);
-}
-
-/*****************************************************************************/
-/* osl_destroyThreadKey */
-/*****************************************************************************/
-void SAL_CALL osl_destroyThreadKey(oslThreadKey Key)
-{
-    if (Key != 0)
-    {
-        PTLS    pTls = (PTLS)Key;
-
-        RemoveKeyFromList( pTls );
-        DosFreeThreadLocalMemory(pTls->pulPtr);
-        rtl_freeMemory( pTls );
-    }
-}
-
-/*****************************************************************************/
-/* osl_getThreadKeyData */
-/*****************************************************************************/
-void * SAL_CALL osl_getThreadKeyData(oslThreadKey Key)
-{
-    if (Key != 0)
-    {
-        PTLS    pTls = (PTLS)Key;
-
-        return ((void *) *pTls->pulPtr);
-    }
-
-    return (NULL);
-}
-
-/*****************************************************************************/
-/* osl_setThreadKeyData */
-/*****************************************************************************/
-sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData)
-{
-    if (Key != 0)
-    {
-        PTLS    pTls = (PTLS)Key;
-        void*   pOldData = NULL;
-        BOOL    fSuccess = TRUE; //YD cannot fail
-
-        if ( pTls->pfnCallback )
-            pOldData = (void*)*pTls->pulPtr;
-
-        *pTls->pulPtr = (ULONG)pData;
-
-        if ( fSuccess && pTls->pfnCallback && pOldData )
-            pTls->pfnCallback( pOldData );
-
-        return (sal_Bool)(fSuccess != FALSE);
-    }
-
-    return (sal_False);
-}
-
-
-
-/*****************************************************************************/
-/* osl_getThreadTextEncoding */
-/*****************************************************************************/
-
-ULONG   g_dwTLSTextEncodingIndex = (ULONG)-1;
-
-sal_uInt32 SAL_CALL _GetACP( void)
-{
-    APIRET  rc;
-    ULONG   aulCpList[8]  = {0};
-    ULONG   ulListSize;
-
-    rc = DosQueryCp( sizeof( aulCpList), aulCpList, &ulListSize);
-    if (rc)
-        return 437; // in case of error, return codepage EN_US
-    // current codepage is first of list, others are the prepared codepages.
-    return aulCpList[0];
-}
-
-rtl_TextEncoding SAL_CALL osl_getThreadTextEncoding(void)
-{
-    rtl_TextEncoding    _encoding;
-
-    if ( (ULONG)-1 == g_dwTLSTextEncodingIndex ) {
-        rtl_TextEncoding defaultEncoding;
-        const char *     pszEncoding;
-
-        /* create thread specific data key */
-        g_dwTLSTextEncodingIndex = osl_createThreadKey( NULL);
-
-        /* determine default text encoding */
-        pszEncoding = getenv ("SOLAR_USER_RTL_TEXTENCODING");
-        if (pszEncoding)
-            defaultEncoding = atoi(pszEncoding);
-        else
-            defaultEncoding = rtl_getTextEncodingFromWindowsCodePage( _GetACP());
-
-        //OSL_ASSERT(defaultEncoding != RTL_TEXTENCODING_DONTKNOW);
-        //g_thread.m_textencoding.m_default = defaultEncoding;
-        osl_setThreadKeyData( g_dwTLSTextEncodingIndex, (void*)defaultEncoding);
-    }
-
-    _encoding = (rtl_TextEncoding)osl_getThreadKeyData( g_dwTLSTextEncodingIndex );
-    if (0 == _encoding) {
-        const char *     pszEncoding;
-        /* determine default text encoding */
-        pszEncoding = getenv ("SOLAR_USER_RTL_TEXTENCODING");
-        if (pszEncoding)
-            _encoding = atoi(pszEncoding);
-        else
-            _encoding = rtl_getTextEncodingFromWindowsCodePage( _GetACP());
-        /* save for future reference */
-        osl_setThreadKeyData( g_dwTLSTextEncodingIndex, (void*)_encoding);
-    }
-
-    return _encoding;
-}
-
-/*****************************************************************************/
-/* osl_getThreadTextEncoding */
-/*****************************************************************************/
-rtl_TextEncoding SAL_CALL osl_setThreadTextEncoding( rtl_TextEncoding Encoding )
-{
-    rtl_TextEncoding oldEncoding = osl_getThreadTextEncoding();
-
-    osl_setThreadKeyData( g_dwTLSTextEncodingIndex, (void*)Encoding);
-
-    return oldEncoding;
-}
-
-
-
diff --git a/sal/osl/os2/time.c b/sal/osl/os2/time.c
deleted file mode 100644
index c1a98a6b87a9..000000000000
--- a/sal/osl/os2/time.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "system.h"
-
-#include <osl/diagnose.h>
-#include <osl/time.h>
-
-/* FIXME: detection should be done in configure script */
-#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || defined(LINUX)
-#define STRUCT_TM_HAS_GMTOFF 1
-
-#elif defined(SOLARIS)
-#define HAS_ALTZONE 1
-#endif
-
-/*--------------------------------------------------
- * osl_getSystemTime
- *-------------------------------------------------*/
-
-sal_Bool SAL_CALL osl_getSystemTime(TimeValue* TimeValue)
-{
-    struct timeval tp;
-
-    /* FIXME: use higher resolution */
-    gettimeofday(&tp, NULL);
-
-    TimeValue->Seconds = tp.tv_sec;
-    TimeValue->Nanosec = tp.tv_usec * 1000;
-
-    return (sal_True);
-}
-
-
-/*--------------------------------------------------
- * osl_getDateTimeFromTimeValue
- *-------------------------------------------------*/
-
-sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime* pDateTime )
-{
-    struct tm *pSystemTime;
-    struct tm tmBuf;
-    time_t atime;
-
-    atime = (time_t)pTimeVal->Seconds;
-
-    /* Convert time from type time_t to struct tm */
-    pSystemTime = gmtime_r( &atime, &tmBuf );
-
-
-    /* Convert struct tm to struct oslDateTime */
-    if ( pSystemTime != NULL )
-    {
-        pDateTime->NanoSeconds  =   pTimeVal->Nanosec;
-        pDateTime->Seconds      =   pSystemTime->tm_sec;
-        pDateTime->Minutes      =   pSystemTime->tm_min;
-        pDateTime->Hours        =   pSystemTime->tm_hour;
-        pDateTime->Day          =   pSystemTime->tm_mday;
-        pDateTime->DayOfWeek    =   pSystemTime->tm_wday;
-        pDateTime->Month        =   pSystemTime->tm_mon + 1;
-        pDateTime->Year         =   pSystemTime->tm_year  + 1900;
-
-        return sal_True;
-    }
-
-    return sal_False;
-}
-
-/*--------------------------------------------------
- * osl_getTimeValueFromDateTime
- *--------------------------------------------------*/
-
-sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValue* pTimeVal )
-{
-    struct tm   aTime;
-    time_t      nSeconds;
-
-    /* Convert struct oslDateTime to struct tm */
-    aTime.tm_sec  = pDateTime->Seconds;
-    aTime.tm_min  = pDateTime->Minutes;
-    aTime.tm_hour = pDateTime->Hours;
-    aTime.tm_mday = pDateTime->Day;
-    aTime.tm_wday = pDateTime->DayOfWeek;
-
-    if ( pDateTime->Month > 0 )
-        aTime.tm_mon = pDateTime->Month - 1;
-    else
-        return sal_False;
-
-    if ( pDateTime->Year >= 1900 )
-        aTime.tm_year = pDateTime->Year - 1900;
-    else
-        return sal_False;
-
-    aTime.tm_isdst = -1;
-    aTime.tm_wday  = 0;
-    aTime.tm_yday  = 0;
-
-    /* Convert time to calendar value */
-    nSeconds = mktime( &aTime );
-
-    /*
-     * mktime expects the struct tm to be in local timezone, so we have to adjust
-     * the returned value to be timezone neutral.
-     */
-
-    if ( nSeconds != (time_t) -1 )
-    {
-        time_t bias;
-
-        /* timezone corrections */
-        tzset();
-
-#if defined(STRUCT_TM_HAS_GMTOFF)
-        /* members of struct tm are corrected by mktime */
-        bias = 0 - aTime.tm_gmtoff;
-
-#elif defined(HAS_ALTZONE)
-        /* check if daylight saving time is in effect */
-        bias = aTime.tm_isdst > 0 ? altzone : timezone;
-#else
-        /* exspect daylight saving time to be one hour */
-        bias = aTime.tm_isdst > 0 ? timezone - 3600 : timezone;
-#endif
-
-        pTimeVal->Seconds = nSeconds;
-        pTimeVal->Nanosec = pDateTime->NanoSeconds;
-
-        if ( nSeconds > bias )
-            pTimeVal->Seconds -= bias;
-
-        return sal_True;
-    }
-
-    return sal_False;
-}
-
-
-/*--------------------------------------------------
- * osl_getLocalTimeFromSystemTime
- *--------------------------------------------------*/
-
-sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal )
-{
-    struct tm *pLocalTime;
-    struct tm tmBuf;
-    time_t bias;
-    time_t atime;
-
-    atime = (time_t) pSystemTimeVal->Seconds;
-    pLocalTime = localtime_r( &atime, &tmBuf );
-
-#if defined(STRUCT_TM_HAS_GMTOFF)
-    /* members of struct tm are corrected by mktime */
-    bias = 0 - pLocalTime->tm_gmtoff;
-
-#elif defined(HAS_ALTZONE)
-    /* check if daylight saving time is in effect */
-    bias = pLocalTime->tm_isdst > 0 ? altzone : timezone;
-#else
-    /* exspect daylight saving time to be one hour */
-    bias = pLocalTime->tm_isdst > 0 ? timezone - 3600 : timezone;
-#endif
-
-    if ( (sal_Int64) pSystemTimeVal->Seconds > bias )
-    {
-        pLocalTimeVal->Seconds = pSystemTimeVal->Seconds - bias;
-        pLocalTimeVal->Nanosec = pSystemTimeVal->Nanosec;
-
-        return sal_True;
-    }
-
-    return sal_False;
-}
-
-/*--------------------------------------------------
- * osl_getSystemTimeFromLocalTime
- *--------------------------------------------------*/
-
-sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( TimeValue* pLocalTimeVal, TimeValue* pSystemTimeVal )
-{
-    struct tm *pLocalTime;
-    struct tm tmBuf;
-    time_t bias;
-    time_t atime;
-
-    atime = (time_t) pLocalTimeVal->Seconds;
-
-    /* Convert atime, which is a local time, to it's GMT equivalent. Then, get
-     * the timezone offset for the local time for the GMT equivalent time. Note
-     * that we cannot directly use local time to determine the timezone offset
-     * because GMT is the only reliable time that we can determine timezone
-     * offset from.
-     */
-
-    atime = mktime( gmtime_r( &atime, &tmBuf ) );
-    pLocalTime = localtime_r( &atime, &tmBuf );
-
-#if defined(STRUCT_TM_HAS_GMTOFF)
-    /* members of struct tm are corrected by mktime */
-    bias = 0 - pLocalTime->tm_gmtoff;
-
-#elif defined(HAS_ALTZONE)
-    /* check if daylight saving time is in effect */
-    bias = pLocalTime->tm_isdst > 0 ? altzone : timezone;
-#else
-    /* exspect daylight saving time to be one hour */
-    bias = pLocalTime->tm_isdst > 0 ? timezone - 3600 : timezone;
-#endif
-
-    if ( (sal_Int64) pLocalTimeVal->Seconds + bias > 0 )
-    {
-        pSystemTimeVal->Seconds = pLocalTimeVal->Seconds + bias;
-        pSystemTimeVal->Nanosec = pLocalTimeVal->Nanosec;
-
-        return sal_True;
-    }
-
-    return sal_False;
-}
-
-
-
-static struct timeval startTime;
-static sal_Bool bGlobalTimer = sal_False;
-
-sal_uInt32 SAL_CALL osl_getGlobalTimer()
-{
-  struct timeval currentTime;
-  sal_uInt32 nSeconds;
-
-  // FIXME: not thread safe !!
-  if ( bGlobalTimer == sal_False )
-  {
-      gettimeofday( &startTime, NULL );
-      bGlobalTimer=sal_True;
-  }
-
-  gettimeofday( &currentTime, NULL );
-
-  nSeconds = (sal_uInt32)( currentTime.tv_sec - startTime.tv_sec );
-
-  return ( nSeconds * 1000 ) + (long) (( currentTime.tv_usec - startTime.tv_usec) / 1000 );
-}
diff --git a/sal/osl/os2/util.c b/sal/osl/os2/util.c
deleted file mode 100644
index cfe3eb76c622..000000000000
--- a/sal/osl/os2/util.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "osl/util.h"
-
-
-
-extern sal_Bool osl_getEthernetAddress( sal_uInt8 * pTargetAddress )
-{
-    return sal_False;
-}
-
-
diff --git a/sal/osl/os2/uunxapi.cxx b/sal/osl/os2/uunxapi.cxx
deleted file mode 100644
index e86ad31264e0..000000000000
--- a/sal/osl/os2/uunxapi.cxx
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
- #ifndef _LIMITS_H
- #include <limits.h>
- #endif
-
- #ifndef _RTL_USTRING_HXX_
- #include <rtl/ustring.hxx>
- #endif
-
- #ifndef _OSL_THREAD_H_
- #include <osl/thread.h>
- #endif
-
- #ifndef _OSL_UUNXAPI_HXX_
- #include "uunxapi.hxx"
- #endif
-
- //###########################
- //access_u
- int access_u(const rtl_uString* pustrPath, int mode)
- {
-    return access(OUStringToOString(pustrPath).getStr(), mode);
- }
-
- //#########################
- //realpath_u
- sal_Bool realpath_u(const rtl_uString* pustrFileName, rtl_uString** ppustrResolvedName)
- {
-     rtl::OString fn = rtl::OUStringToOString(
-        rtl::OUString(const_cast<rtl_uString*>(pustrFileName)),
-        osl_getThreadTextEncoding());
-
-    char  rp[PATH_MAX];
-    bool  bRet = realpath(fn.getStr(), rp);
-
-    if (bRet)
-    {
-        rtl::OUString resolved = rtl::OStringToOUString(
-            rtl::OString(static_cast<sal_Char*>(rp)),
-            osl_getThreadTextEncoding());
-
-        rtl_uString_assign(ppustrResolvedName, resolved.pData);
-    }
-    return bRet;
- }
-
- //#########################
- //lstat_u
-  int lstat_u(const rtl_uString* pustrPath, struct stat* buf)
- {
-    return lstat(OUStringToOString(pustrPath).getStr(), buf);
- }
-
- //#########################
- // @see mkdir
- int mkdir_u(const rtl_uString* path, mode_t mode)
- {
-    return mkdir(OUStringToOString(path).getStr(), mode);
- }
-
diff --git a/sal/osl/os2/uunxapi.h b/sal/osl/os2/uunxapi.h
deleted file mode 100644
index 9eddc5fe4753..000000000000
--- a/sal/osl/os2/uunxapi.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
- #ifndef _OSL_UUNXAPI_H_
- #define _OSL_UUNXAPI_H_
-
- #ifndef _UNISTD_H
- #include <unistd.h>
- #endif
-
- #ifndef _STDLIB_H
- #include <stdlib.h>
- #endif
-
- #ifndef _TYPES_H
- #include <sys/types.h>
- #endif
-
- #ifndef _STAT_H
- #include <sys/stat.h>
- #endif
-
- #ifndef _RTL_USTRING_H_
- #include <rtl/ustring.h>
- #endif
-
-
- #ifdef __cplusplus
- extern "C"
- {
- #endif
-
- /* @see access */
- int access_u(const rtl_uString* pustrPath, int mode);
-
- /***********************************
-  @descr
-  The return value differs from the
-  realpath function
-
-  @returns sal_True on success else
-  sal_False
-
-  @see realpath
-  **********************************/
- sal_Bool realpath_u(
-     const rtl_uString* pustrFileName,
-    rtl_uString** ppustrResolvedName);
-
- /* @see lstat */
- int lstat_u(const rtl_uString* pustrPath, struct stat* buf);
-
- /* @see mkdir */
- int mkdir_u(const rtl_uString* path, mode_t mode);
-
- #ifdef __cplusplus
- }
- #endif
-
-
- #endif /* _OSL_UUNXAPI_H_ */
-
diff --git a/sal/osl/os2/uunxapi.hxx b/sal/osl/os2/uunxapi.hxx
deleted file mode 100644
index ab7e5cce890d..000000000000
--- a/sal/osl/os2/uunxapi.hxx
+++ /dev/null
@@ -1,106 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
- #ifndef _OSL_UUNXAPI_HXX_
- #define _OSL_UUNXAPI_HXX_
-
- #ifndef _OSL_UUNXAPI_H_
- #include "uunxapi.h"
- #endif
-
- #ifndef _RTL_USTRING_HXX_
- #include <rtl/ustring.hxx>
- #endif
-
- //###########################
- inline rtl::OString OUStringToOString(const rtl_uString* s)
- {
-    return rtl::OUStringToOString(
-        rtl::OUString(const_cast<rtl_uString*>(s)),
-        osl_getThreadTextEncoding());
- }
-
- namespace osl
- {
-
-     /***********************************
-      osl::access
-
-      @see access
-      **********************************/
-
-     inline int access(const rtl::OUString& ustrPath, int mode)
-      {
-         return access_u(ustrPath.pData, mode);
-       }
-
-     /***********************************
-      osl::realpath
-
-      @descr
-      The return value differs from the
-      realpath function
-
-      @returns sal_True on success else
-      sal_False
-
-      @see realpath
-      **********************************/
-
-     inline sal_Bool realpath(
-         const rtl::OUString& ustrFileName,
-        rtl::OUString& ustrResolvedName)
-     {
-         return realpath_u(ustrFileName.pData, &ustrResolvedName.pData);
-      }
-
-
-     /***********************************
-      osl::lstat
-
-      @see lstat
-      **********************************/
-
-      inline int lstat(const rtl::OUString& ustrPath, struct stat& buf)
-      {
-           return lstat_u(ustrPath.pData, &buf);
-      }
-
-    /***********************************
-          osl::mkdir
-          @see mkdir
-          **********************************/
-    inline int mkdir(const rtl::OUString& aPath, mode_t aMode)
-    {
-        return mkdir_u(aPath.pData, aMode);
-    }
-
- } // end namespace osl
-
-
- #endif /* _OSL_UUNXAPI_HXX_ */
-
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 00156b80f1d6..d5e4e94afaa4 100755..100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -139,7 +140,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 #endif /* defined SOLARIS */
 
 
-#if defined FREEBSD || defined NETBSD
+#if defined FREEBSD || defined NETBSD || defined OPENBSD || defined(DRAGONFLY)
 #include <dlfcn.h>
 #include <pthread.h>
 #include <setjmp.h>
@@ -267,10 +268,11 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
         for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
         {
             Dl_info     dli;
-            ptrdiff_t   offset;
 
             if ( 0 != dladdr( *pFramePtr, &dli ) )
             {
+                ptrdiff_t offset;
+
                 if ( dli.dli_fname && dli.dli_fbase )
                 {
                     offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
@@ -333,10 +335,11 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
         for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
         {
             Dl_info     dli;
-            ptrdiff_t   offset;
 
             if ( 0 != dladdr( *pFramePtr, &dli ) )
             {
+                ptrdiff_t offset;
+
                 if ( dli.dli_fname && dli.dli_fbase )
                 {
                     offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
@@ -357,3 +360,16 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 }
 
 #endif /* defined MACOSX */
+
+#if defined(AIX)
+int backtrace( void **buffer, int max_frames )
+{
+    return 0;
+}
+
+void backtrace_symbols_fd( void **buffer, int size, int fd )
+{
+}
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
index 1ca2ae84c4a0..79fb58025e2e 100755..100644
--- a/sal/osl/unx/backtrace.h
+++ b/sal/osl/unx/backtrace.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,8 @@
  ************************************************************************/
 
 
-#if defined (SOLARIS) || (FREEBSD)
+#if defined (SOLARIS) || defined (FREEBSD) || defined (NETBSD) || \
+    defined (OPENBSD) || defined (DRAGONFLY)
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,7 +41,8 @@ int backtrace( void **buffer, int max_frames );
 void backtrace_symbols_fd( void **buffer, int size, int fd );
 
 /* no frame.h on FreeBSD */
-#if defined FREEBSD
+#if defined (FREEBSD) || defined (NETBSD) || defined (OPENBSD) || \
+    defined (DRAGONFLY)
 struct frame {
     long    arg0[8];
     long    arg1[6];
@@ -53,7 +56,7 @@ struct frame {
 } /* extern "C" */
 #endif
 
-#endif /* defined SOLARIS || FREEBSD */
+#endif /* defined SOLARIS || FREEBSD || NETBSD || OPENBSD */
 
 #if defined (LINUX) && defined (SPARC)
 #ifdef __cplusplus
@@ -97,3 +100,5 @@ void backtrace_symbols_fd( void **buffer, int size, int fd );
 #endif
 
 #endif /* defined MACOSX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/conditn.c b/sal/osl/unx/conditn.c
index ea701d221e55..ac6c92630d0f 100644
--- a/sal/osl/unx/conditn.c
+++ b/sal/osl/unx/conditn.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -348,3 +349,4 @@ sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c
index 5d9a4f31a40e..ae847b6d02e0 100644
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -254,8 +255,10 @@ sal_Bool SAL_CALL osl_assertFailedLine (
     /* output message buffer */
     OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage);
 
-    /* output backtrace */
-    osl_diagnose_backtrace_Impl(f);
+    /* should we output backtrace? */
+    char const * envBacktrace = getenv( "SAL_DIAGNOSE_BACKTRACE" );
+    if( envBacktrace != NULL && *envBacktrace != '\0' )
+        osl_diagnose_backtrace_Impl(f);
 
     /* release lock and leave */
     pthread_mutex_unlock(&g_mutex);
@@ -314,3 +317,5 @@ void osl_trace(char const * pszFormat, ...) {
     printTrace((unsigned long) getpid(), pszFormat, args);
     va_end(args);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 67f1d05660a8..d57820b5798e 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,13 +59,15 @@
 #endif /* MACOSX */
 
 #ifdef DEBUG_OSL_FILE
-#   define OSL_FILE_TRACE 0 ? (void)(0) : osl_trace
+#   define OSL_FILE_TRACE osl_trace
 #   define PERROR( a, b ) perror( a ); fprintf( stderr, b )
 #else
-#   define OSL_FILE_TRACE 1 ? (void)(0) : osl_trace
+#   define OSL_FILE_TRACE(fmt, ...)
 #   define PERROR( a, b )
 #endif
 
+
+
 /*******************************************************************
  *
  * FileHandle_Impl interface
@@ -272,7 +275,8 @@ void FileHandle_Impl::operator delete (void * p, size_t)
 
 size_t FileHandle_Impl::getpagesize()
 {
-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
+#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) || \
+    defined(OPENBSD) || defined(DRAGONFLY)
     return sal::static_int_cast< size_t >(::getpagesize());
 #else /* POSIX */
     return sal::static_int_cast< size_t >(::sysconf(_SC_PAGESIZE));
@@ -1396,3 +1400,5 @@ SAL_CALL osl_setFileSize( oslFileHandle Handle, sal_uInt64 uSize )
 
     return pImpl->setSize (uSize);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_error_transl.cxx b/sal/osl/unx/file_error_transl.cxx
index 3de829afc391..b3d35b3132bd 100644
--- a/sal/osl/unx/file_error_transl.cxx
+++ b/sal/osl/unx/file_error_transl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -206,27 +207,25 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
            osl_error = osl_File_E_NOSYS;
             break;
 
+#if !defined(AIX) || !(defined(_ALL_SOURCE) && !defined(_LINUX_SOURCE_COMPAT))
         case ENOTEMPTY:
             osl_error = osl_File_E_NOTEMPTY;
             break;
+#endif
 
         case ELOOP:
             osl_error = osl_File_E_LOOP;
             break;
 
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY))
         case EILSEQ:
             osl_error = osl_File_E_ILSEQ;
             break;
-#endif /* MACOSX */
 
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
         case ENOLINK:
             osl_error = osl_File_E_NOLINK;
             break;
-#endif /* MACOSX */
 
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
         case EMULTIHOP:
             osl_error = osl_File_E_MULTIHOP;
             break;
@@ -253,3 +252,5 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
     return osl_error;
 }
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_error_transl.h b/sal/osl/unx/file_error_transl.h
index 59d7b1d9faec..2de5057a04ac 100644
--- a/sal/osl/unx/file_error_transl.h
+++ b/sal/osl/unx/file_error_transl.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno);
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx
index 5dee69f29b2e..011c34c01ae4 100644
--- a/sal/osl/unx/file_impl.hxx
+++ b/sal/osl/unx/file_impl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,5 @@ struct DirectoryItem_Impl
 };
 
 #endif /* INCLUDED_FILE_IMPL_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 2ed57b01a2c4..e1da32a0aa25 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,6 +39,7 @@
 #include "file_path_helper.hxx"
 #include "file_url.h"
 #include "uunxapi.hxx"
+#include "readwrite_helper.h"
 
 #include <sys/types.h>
 #include <errno.h>
@@ -70,16 +72,6 @@ typedef struct
     DIR*         pDirStruct;
 } oslDirectoryImpl;
 
-#if 0
-/* FIXME: reintroducing this may save some extra bytes per Item */
-typedef struct
-{
-    rtl_uString* ustrFileName;       /* holds native file name */
-    rtl_uString* ustrDirPath;        /* holds native dir path */
-    sal_uInt32   RefCount;
-} oslDirectoryItemImpl;
-#endif
-
 DirectoryItem_Impl::DirectoryItem_Impl(
     rtl_uString * ustrFilePath, unsigned char DType)
     : m_RefCount     (1),
@@ -704,8 +696,7 @@ static oslFileError oslDoMoveFile( const sal_Char* pszPath, const sal_Char* pszD
 
     if ( tErr != osl_File_E_None )
     {
-        oslFileError tErrRemove;
-        tErrRemove=osl_psz_removeFile(pszDestPath);
+        osl_psz_removeFile(pszDestPath);
         return tErr;
     }
 
@@ -1020,31 +1011,27 @@ static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszD
         return nRet;
     }
 
-    size_t nWritten = 0;
     size_t nRemains = nSourceSize;
 
     if ( nRemains )
     {
         /* mmap has problems, try the direct streaming */
-        char pBuffer[0x8000];
-        size_t nRead = 0;
-
-        nRemains = nSourceSize;
+        char pBuffer[0x7FFF];
 
         do
         {
-            nRead = 0;
-            nWritten = 0;
+            size_t nToRead = std::min( sizeof(pBuffer), nRemains );
+            sal_Bool succeeded = safeRead( SourceFileFD, pBuffer, nToRead );
+            if ( !succeeded )
+                break;
 
-            size_t nToRead = std::min( (size_t)0x8000, nRemains );
-            nRead = read( SourceFileFD, pBuffer, nToRead );
-            if ( (size_t)-1 != nRead )
-                nWritten = write( DestFileFD, pBuffer, nRead );
+            succeeded = safeWrite( DestFileFD, pBuffer, nToRead );
+            if ( !succeeded )
+                break;
 
-            if ( (size_t)-1 != nWritten )
-                nRemains -= nWritten;
+            nRemains -= nToRead;
         }
-        while( nRemains && (size_t)-1 != nRead && nRead == nWritten );
+        while( nRemains );
     }
 
     if ( nRemains )
@@ -1062,3 +1049,4 @@ static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszD
     return nRet;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 9dd3b08493b0..c956edfa29bf 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,11 +62,11 @@
   const sal_Unicode FPH_CHAR_COLON          = (sal_Unicode)':';
 
   inline const rtl::OUString FPH_PATH_SEPARATOR()
-      { return rtl::OUString::createFromAscii("/"); }
+      { return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); }
   inline const rtl::OUString FPH_LOCAL_DIR_ENTRY()
-      { return rtl::OUString::createFromAscii("."); }
+      { return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); }
   inline const rtl::OUString FPH_PARENT_DIR_ENTRY()
-      { return rtl::OUString::createFromAscii(".."); }
+      { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")); }
 
  /*******************************************
   *  osl_systemPathRemoveSeparator
@@ -346,3 +347,5 @@ sal_Bool SAL_CALL osl_searchPath(
     }
     return bfound;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_path_helper.h b/sal/osl/unx/file_path_helper.h
index c1e3908fa9f2..ce0f0276d2ab 100644
--- a/sal/osl/unx/file_path_helper.h
+++ b/sal/osl/unx/file_path_helper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -245,3 +246,5 @@
 
  #endif /* #ifndef _OSL_PATH_HELPER_H_ */
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index 4b429b111799..62d508278027 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
 #define _OSL_FILE_PATH_HELPER_HXX_
 
 
-#ifndef _OSL_FILE_PATH_HELPER_H_
 #include "file_path_helper.h"
-#endif
 
 #include <rtl/ustring.hxx>
 
@@ -245,3 +244,5 @@ namespace osl
 
  #endif /* #ifndef _OSL_PATH_HELPER_HXX_ */
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index df32fa105a50..62f8fe56cf35 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -490,3 +491,5 @@ oslFileError SAL_CALL osl_setFileTime (
 
     return osl_psz_setFileTime( path, pCreationTime, pLastAccessTime, pLastWriteTime );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 26290957f802..1d69faa1e052 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,12 +39,12 @@
 #include <unistd.h>
 
 #include "osl/file.hxx"
-#include <osl/security.h>
+#include <osl/security.hxx>
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <osl/process.h>
 
-#include <rtl/uri.h>
+#include <rtl/uri.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.h>
 #include "rtl/textcvt.h"
@@ -137,7 +138,7 @@ static sal_Bool findWrongUsage( const sal_Unicode *path, sal_Int32 len )
 
 oslFileError SAL_CALL osl_getCanonicalName( rtl_uString* ustrFileURL, rtl_uString** pustrValidURL )
 {
-    OSL_ENSURE(0, "osl_getCanonicalName not implemented");
+    OSL_FAIL("osl_getCanonicalName not implemented");
 
     rtl_uString_newFromString(pustrValidURL, ustrFileURL);
     return osl_File_E_None;
@@ -147,153 +148,100 @@ oslFileError SAL_CALL osl_getCanonicalName( rtl_uString* ustrFileURL, rtl_uStrin
 /*  osl_getSystemPathFromFileURL */
 /****************************************************************************/
 
-oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath )
-{
-    sal_Int32 nIndex;
-    rtl_uString * pTmp = NULL;
+namespace {
 
-    sal_Unicode encodedSlash[3] = { '%', '2', 'F' };
-    sal_Unicode protocolDelimiter[3] = { ':', '/', '/' };
+oslFileError getSystemPathFromFileUrl(
+    rtl::OUString const & url, rtl::OUString * path, bool homeAbbreviation)
+{
+    OSL_ASSERT(path != 0 && path->getLength() == 0);
 
-    /* temporary hack: if already system path, return ustrFileURL */
-    /*
-    if( (sal_Unicode) '/' == ustrFileURL->buffer[0] )
-    {
-        OSL_ENSURE( 0, "osl_getSystemPathFromFileURL: input is already system path" );
-        rtl_uString_assign( pustrSystemPath, ustrFileURL );
-        return osl_File_E_None;
-    }
-    */
+    sal_Unicode const * p = url.getStr();
+    sal_Unicode const * end = p + url.getLength();
 
     /* a valid file url may not start with '/' */
-    if( ( 0 == ustrFileURL->length ) || ( (sal_Unicode) '/' == ustrFileURL->buffer[0] ) )
-    {
-        return osl_File_E_INVAL;
-    }
-
-    /* Check for non file:// protocols */
-
-    nIndex = rtl_ustr_indexOfStr_WithLength( ustrFileURL->buffer, ustrFileURL->length, protocolDelimiter, 3 );
-    if ( -1 != nIndex && (4 != nIndex || 0 != rtl_ustr_ascii_shortenedCompare_WithLength( ustrFileURL->buffer, ustrFileURL->length,"file", 4 ) ) )
-    {
+    if ((p == end) || (*p == UNICHAR_SLASH))
         return osl_File_E_INVAL;
-    }
-
-    /* search for encoded slashes (%2F) and decode every single token if we find one */
-
-    nIndex = 0;
-
-    if( -1 != rtl_ustr_indexOfStr_WithLength( ustrFileURL->buffer, ustrFileURL->length, encodedSlash, 3 ) )
-    {
-        rtl_uString * ustrPathToken = NULL;
-        sal_Int32 nOffset = 7;
 
-        do
+    for (sal_Unicode const * p1 = p; p1 != end; ++p1) {
+        if (*p1 == '?' || *p1 == '#' ||
+            (*p1 == '%' && end - p1 >= 3 && p1[1] == '2' &&
+             (p1[2] == 'F' || p1[2] == 'f')))
         {
-            nOffset += nIndex;
-
-            /* break url down in '/' devided tokens tokens */
-            nIndex = rtl_ustr_indexOfChar_WithLength( ustrFileURL->buffer + nOffset, ustrFileURL->length - nOffset, (sal_Unicode) '/' );
-
-            /* copy token to new string */
-            rtl_uString_newFromStr_WithLength( &ustrPathToken, ustrFileURL->buffer + nOffset,
-                -1 == nIndex ? ustrFileURL->length - nOffset : nIndex++ );
-
-            /* decode token */
-            rtl_uriDecode( ustrPathToken, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &pTmp );
-
-            /* the result should not contain any '/' */
-            if( -1 != rtl_ustr_indexOfChar_WithLength( pTmp->buffer, pTmp->length, (sal_Unicode) '/' ) )
-            {
-                rtl_uString_release( pTmp );
-                rtl_uString_release( ustrPathToken );
-
-                return osl_File_E_INVAL;
-            }
-
-        } while( -1 != nIndex );
-
-        /* release temporary string and restore index variable */
-        rtl_uString_release( ustrPathToken );
-        nIndex = 0;
+            return osl_File_E_INVAL;
+        }
     }
-
-    /* protocol and server should not be encoded, so decode the whole string */
-    rtl_uriDecode( ustrFileURL, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &pTmp );
-
-    /* check if file protocol specified */
-    /* FIXME: use rtl_ustr_ascii_shortenedCompareIgnoreCase_WithLength when available */
-    if( 7 <= pTmp->length )
-    {
-        rtl_uString * pProtocol = NULL;
-        rtl_uString_newFromStr_WithLength( &pProtocol, pTmp->buffer, 7 );
-
-        /* protocol is case insensitive */
-        rtl_ustr_toAsciiLowerCase_WithLength( pProtocol->buffer, pProtocol->length );
-
-        if( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pProtocol->buffer, pProtocol->length,"file://", 7 ) )
-            nIndex = 7;
-
-        rtl_uString_release( pProtocol );
+    sal_Unicode const * p1 = p;
+    while (p1 != end && *p1 != ':' && *p1 != '/') {
+        ++p1;
     }
-
-    /* skip "localhost" or "127.0.0.1" if "file://" is specified */
-    /* FIXME: use rtl_ustr_ascii_shortenedCompareIgnoreCase_WithLength when available */
-    if( nIndex && ( 10 <= pTmp->length - nIndex ) )
-    {
-        rtl_uString * pServer = NULL;
-        rtl_uString_newFromStr_WithLength( &pServer, pTmp->buffer + nIndex, 10 );
-
-        /* server is case insensitive */
-        rtl_ustr_toAsciiLowerCase_WithLength( pServer->buffer, pServer->length );
-
-        if( ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pServer->buffer, pServer->length,"localhost/", 10 ) ) ||
-            ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pServer->buffer, pServer->length,"127.0.0.1/", 10 ) ) )
+    if (p1 != end && *p1 == ':') {
+        if (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
+                p, p1 - p, RTL_CONSTASCII_STRINGPARAM("file")) !=
+            0)
         {
-            /* don't exclude the '/' */
-            nIndex += 9;
+            return osl_File_E_INVAL;
         }
-
-        rtl_uString_release( pServer );
+        p = p1 + 1;
     }
-
-    if( nIndex )
-        rtl_uString_newFromStr_WithLength( &pTmp, pTmp->buffer + nIndex, pTmp->length - nIndex );
-
-    /* check if system path starts with ~ or ~user and replace it with the appropriate home dir */
-    if( (sal_Unicode) '~' == pTmp->buffer[0] )
-    {
-        /* check if another user is specified */
-        if( ( 1 == pTmp->length ) || ( (sal_Unicode)'/' == pTmp->buffer[1] ) )
-        {
-            rtl_uString *pTmp2 = NULL;
-
-            /* osl_getHomeDir returns file URL */
-            osl_getHomeDir( osl_getCurrentSecurity(), &pTmp2 );
-
-            /* remove "file://" prefix */
-            rtl_uString_newFromStr_WithLength( &pTmp2, pTmp2->buffer + 7, pTmp2->length - 7 );
-
-            /* replace '~' in original string */
-            rtl_uString_newReplaceStrAt( &pTmp, pTmp, 0, 1, pTmp2 );
-            rtl_uString_release( pTmp2 );
-        }
-
-        else
+    if (end - p >= 2 && p[0] == '/' && p[1] == '/') {
+        p += 2;
+        sal_Int32 i = rtl_ustr_indexOfChar_WithLength(p, end - p, '/');
+        p1 = i < 0 ? end : p + i;
+        if (p1 != p &&
+            (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
+                 p, p1 - p, RTL_CONSTASCII_STRINGPARAM("localhost")) !=
+             0) &&
+            rtl_ustr_ascii_compare_WithLength(p, p1 - p, "127.0.0.1") != 0)
         {
-            /* FIXME: replace ~user with users home directory */
             return osl_File_E_INVAL;
         }
+        p = p1;
+        if (p == end) {
+            *path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+            return osl_File_E_None;
+        }
     }
-
-    /* temporary check for top 5 wrong usage strings (which are valid but unlikly filenames) */
-    /*
-    OSL_ASSERT( !findWrongUsage( pTmp->buffer, pTmp->length ) );
-    */
-
-    *pustrSystemPath = pTmp;
+    if (homeAbbreviation && end - p >= 2 && p[0] == '/' && p[1] == '~') {
+        p += 2;
+        sal_Int32 i = rtl_ustr_indexOfChar_WithLength(p, end - p, '/');
+        p1 = i < 0 ? end : p + i;
+        if (p1 == p) {
+            rtl::OUString home;
+            if (!osl::Security().getHomeDir(home)) {
+                return osl_File_E_INVAL;
+            }
+            oslFileError e = getSystemPathFromFileUrl(home, path, false);
+            if (e != osl_File_E_None) {
+                return e;
+            }
+        } else {
+            return osl_File_E_INVAL; //TODO
+        }
+        p = p1;
+    }
+    rtl::OUString d(
+        rtl::Uri::decode(
+            rtl::OUString(p, end - p), rtl_UriDecodeWithCharset,
+            RTL_TEXTENCODING_UTF8));
+    if (d.indexOf(0) >=0) {
+        return osl_File_E_INVAL;
+    }
+    *path += d;
     return osl_File_E_None;
 }
+}
+
+oslFileError osl_getSystemPathFromFileURL(
+    rtl_uString * pustrFileURL, rtl_uString ** ppustrSystemPath)
+{
+    rtl::OUString p;
+    oslFileError e = getSystemPathFromFileUrl(
+        rtl::OUString(pustrFileURL), &p, true);
+    if (e == osl_File_E_None) {
+        rtl_uString_assign(ppustrSystemPath, p.pData);
+    }
+    return e;
+}
 
 /****************************************************************************/
 /*  osl_getFileURLFromSystemPath */
@@ -316,14 +264,14 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath,
     /*
         if( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( ustrSystemPath->buffer, ustrSystemPath->length,"file://", 7 ) )
         {
-            OSL_ENSURE( 0, "osl_getFileURLFromSystemPath: input is already file URL" );
+            OSL_FAIL( "osl_getFileURLFromSystemPath: input is already file URL" );
             rtl_uString_assign( pustrFileURL, ustrSystemPath );
         }
         else
         {
             rtl_uString *pTmp2 = NULL;
 
-            OSL_ENSURE( 0, "osl_getFileURLFromSystemPath: input is wrong file URL" );
+            OSL_FAIL( "osl_getFileURLFromSystemPath: input is wrong file URL" );
             rtl_uString_newFromStr_WithLength( pustrFileURL, ustrSystemPath->buffer + 5, ustrSystemPath->length - 5 );
             rtl_uString_newFromAscii( &pTmp2, "file://" );
             rtl_uString_newConcat( pustrFileURL, *pustrFileURL, pTmp2 );
@@ -372,7 +320,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath,
         /* adapt index to pTmp */
         nIndex += pTmp->length - ustrSystemPath->length;
 
-        /* remove all occurances of '//' */
+        /* remove all occurrences of '//' */
         for( nSrcIndex = nIndex + 1; nSrcIndex < pTmp->length; nSrcIndex++ )
         {
             if( ((sal_Unicode) '/' == pTmp->buffer[nSrcIndex]) && ((sal_Unicode) '/' == pTmp->buffer[nIndex]) )
@@ -519,7 +467,6 @@ namespace /* private */
 
     oslFileError _osl_resolvepath(
         /*inout*/ sal_Unicode* path,
-        /*inout*/ sal_Unicode* current_pos,
         /*inout*/ bool* failed)
     {
         oslFileError ferr = osl_File_E_None;
@@ -536,7 +483,6 @@ namespace /* private */
                 if (!TextToUnicode(resolved_path, strlen(resolved_path), path, PATH_MAX))
                     return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
 
-                current_pos = ustrtoend(path) - 1;
             }
             else
             {
@@ -618,7 +564,6 @@ namespace /* private */
                     {
                         ferr = _osl_resolvepath(
                             path_resolved_so_far,
-                            presolvedsf,
                             &realpath_failed);
 
                         if (osl_File_E_None != ferr)
@@ -637,7 +582,6 @@ namespace /* private */
                 {
                     ferr = _osl_resolvepath(
                         path_resolved_so_far,
-                        presolvedsf,
                         &realpath_failed);
 
                     if (osl_File_E_None != ferr)
@@ -663,7 +607,6 @@ namespace /* private */
                 {
                     ferr = _osl_resolvepath(
                         path_resolved_so_far,
-                        presolvedsf,
                         &realpath_failed);
 
                     if (osl_File_E_None != ferr)
@@ -692,6 +635,7 @@ oslFileError osl_getAbsoluteFileURL(rtl_uString*  ustrBaseDirURL, rtl_uString* u
 {
     FileBase::RC  rc;
     rtl::OUString unresolved_path;
+    static char *allow_symlinks = getenv( "SAL_ALLOW_LINKOO_SYMLINKS" );
 
     rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrRelativeURL), unresolved_path);
 
@@ -713,7 +657,32 @@ oslFileError osl_getAbsoluteFileURL(rtl_uString*  ustrBaseDirURL, rtl_uString* u
     }
 
     rtl::OUString resolved_path;
-    rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
+
+    if (!allow_symlinks)
+    {
+        rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
+    }
+    else
+    {
+        // SAL_ALLOW_LINKOO_SYMLINKS environment variable:
+        // for linkoo to work, we need to let the symlinks to the libraries untouched
+        rtl::OUString base;
+        sal_Int32 last_slash = unresolved_path.lastIndexOf( UNICHAR_SLASH );
+
+        if (last_slash >= 0 && last_slash + 1 < unresolved_path.getLength())
+        {
+            base = unresolved_path.copy(last_slash+1);
+            unresolved_path = unresolved_path.copy(0, last_slash);
+        }
+
+        rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
+
+        if (base.getLength() > 0)
+        {
+            resolved_path += rtl::OUString( UNICHAR_SLASH );
+            resolved_path += base;
+        }
+    }
 
     if (FileBase::E_None == rc)
     {
@@ -738,7 +707,7 @@ namespace /* private */
     bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result)
     {
         bool          bfound = false;
-        rtl::OUString path   = rtl::OUString::createFromAscii("PATH");
+        rtl::OUString path(RTL_CONSTASCII_USTRINGPARAM("PATH"));
         rtl::OUString env_path;
 
         if (osl_Process_E_None == osl_getEnvironment(path.pData, &env_path.pData))
@@ -793,7 +762,7 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearc
 
     // try to interpret search path as file url else assume it's a system path list
     rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrFilePath), file_path);
-    if ((FileBase::E_None != rc) && (FileBase::E_INVAL == rc))
+    if (FileBase::E_INVAL == rc)
         file_path = ustrFilePath;
     else if (FileBase::E_None != rc)
         return oslFileError(rc);
@@ -960,3 +929,5 @@ int TextToUnicode(
     unic_text[nDestBytes] = '\0';
     return nDestBytes;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_url.h b/sal/osl/unx/file_url.h
index 0a0d07823bba..6dd1c324fd96 100644
--- a/sal/osl/unx/file_url.h
+++ b/sal/osl/unx/file_url.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode* unic_t
 #endif
 
 #endif /* #define INCLUDED_FILE_URL_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index cc7f61ec6a8b..ea6ad6e919df 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,6 +42,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/wait.h>
+#include <sal/macros.h>
 
 #ifdef HAVE_STATFS_H
 #undef HAVE_STATFS_H
@@ -57,7 +59,6 @@
 #include <sys/mnttab.h>
 #include <sys/statvfs.h>
 #define  HAVE_STATFS_H
-#include <sys/fs/ufs_quota.h>
 static const sal_Char* MOUNTTAB="/etc/mnttab";
 
 #elif defined(LINUX)
@@ -65,17 +66,13 @@ static const sal_Char* MOUNTTAB="/etc/mnttab";
 #include <mntent.h>
 #include <sys/vfs.h>
 #define  HAVE_STATFS_H
-#include <sys/quota.h>
-//#include <ctype.h>
 static const sal_Char* MOUNTTAB="/etc/mtab";
 
-#elif defined(NETBSD) || defined(FREEBSD)
+#elif defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY)
 
 #include <sys/param.h>
 #include <sys/ucred.h>
 #include <sys/mount.h>
-#include <ufs/ufs/quota.h>
-//#include <ctype.h>
 #define  HAVE_STATFS_H
 
 /* No mounting table on *BSD
@@ -84,8 +81,6 @@ static const sal_Char* MOUNTTAB="/etc/mtab";
 
 #elif defined(MACOSX)
 
-#include <ufs/ufs/quota.h>
-//#include <ctype.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #define HAVE_STATFS_H
@@ -181,19 +176,49 @@ oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeI
 
 #ifdef HAVE_STATFS_H
 
-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
+#if defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || defined(DRAGONFLY)
 #   define __OSL_STATFS_STRUCT                  struct statfs
 #   define __OSL_STATFS(dir, sfs)               statfs((dir), (sfs))
 #   define __OSL_STATFS_BLKSIZ(a)               ((sal_uInt64)((a).f_bsize))
 #   define __OSL_STATFS_TYPENAME(a)             ((a).f_fstypename)
+#if defined(OPENBSD)
+#   define __OSL_STATFS_ISREMOTE(a)             (rtl_str_compare((a).f_fstypename, "nfs") == 0)
+#else
 #   define __OSL_STATFS_ISREMOTE(a)             (((a).f_type & MNT_LOCAL) == 0)
+#endif
 
 /* always return true if queried for the properties of
    the file system. If you think this is wrong under any
    of the target platforms fix it!!!! */
 #   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
 #   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* FREEBSD || NETBSD || MACOSX */
+#endif /* FREEBSD || MACOSX || OPENBSD */
+
+#if defined(NETBSD)
+
+#include <sys/param.h>
+
+/* statvfs() replaced statfs() in 2.99.9 */
+# if __NetBSD_Version__ >= 299000900
+       /* 2.0D or later */
+#   define __OSL_STATFS_STRUCT              struct statvfs
+#   define __OSL_STATFS(dir, sfs)           statvfs((dir), (sfs))
+#   define __OSL_STATFS_ISREMOTE(a)         (((a).f_flag & ST_LOCAL) == 0)
+
+# else
+       /* version before 2.0D */
+#   define __OSL_STATFS_STRUCT              struct statfs
+#   define __OSL_STATFS(dir, sfs)           statfs((dir), (sfs))
+#   define __OSL_STATFS_ISREMOTE(a)         (((a).f_type & MNT_LOCAL) == 0)
+
+# endif /* >2.0D */
+
+#   define __OSL_STATFS_BLKSIZ(a)           ((sal_uInt64)((a).f_bsize))
+#   define __OSL_STATFS_TYPENAME(a)         ((a).f_fstypename)
+
+#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (strcmp((a).f_fstypename, "msdos") != 0 && strcmp((a).f_fstypename, "ntfs") != 0 && strcmp((a).f_fstypename, "smbfs") != 0)
+#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a)    (strcmp((a).f_fstypename, "msdos") != 0)
+#endif /* NETBSD */
 
 #if defined(LINUX)
 #   define __OSL_NFS_SUPER_MAGIC                 0x6969
@@ -229,7 +254,7 @@ oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeI
 #else /* no statfs available */
 
 #   define __OSL_STATFS_STRUCT                   struct dummy {int i;}
-#   define __OSL_STATFS_INIT(a)                  ((void)0)
+#   define __OSL_STATFS_INIT(a)                  ((void)a)
 #   define __OSL_STATFS(dir, sfs)                (1)
 #   define __OSL_STATFS_ISREMOTE(sfs)            (0)
 #   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
@@ -397,7 +422,7 @@ oslFileError osl_unmountVolumeDevice( oslVolumeDeviceHandle Handle )
 
             tErr = osl_unmountFloppy(Handle);
 
-            OSL_ENSURE( tErr, "osl_unmountvolumeDevice: CWD was set to volume mount point" );
+            OSL_ENSURE( tErr, "osl_unmountVolumeDevice: CWD was set to volume mount point" );
         }
     }
 
@@ -517,7 +542,7 @@ oslFileError osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
     return osl_File_E_None;
 }
 
-#ifndef MACOSX
+#if !defined(MACOSX) && !defined(AIX)
 
 /*****************************************
  * osl_newVolumeDeviceHandleImpl
@@ -572,7 +597,7 @@ osl_isAFloppyDevice (const char* pDeviceName)
     };
 
     int i;
-    for (i = 0; i < (sizeof(pFloppyDevice)/sizeof(pFloppyDevice[0])); i++)
+    for (i = 0; i < SAL_N_ELEMENTS(pFloppyDevice); i++)
     {
         if (strncmp(pDeviceName, pFloppyDevice[i], strlen(pFloppyDevice[i])) == 0)
             return sal_True;
@@ -1089,44 +1114,50 @@ osl_isFloppyMounted (oslVolumeDeviceHandleImpl* pDevice)
 
 /******************************************************************************
  *
- *                  MAC OS X FLOPPY FUNCTIONS
+ * Dummy floppy functions: no stinking floppies
  *
  *****************************************************************************/
 
-#if (defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+#if (defined(MACOSX) || defined(IOS) || defined(ANDROID) || defined(NETBSD) || defined(FREEBSD) || \
+    defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY))
 static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
 {
+    (void)pszPath;
     return NULL;
 }
-#endif /* MACOSX */
+#endif
 
-#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+#if ( defined(MACOSX) || defined(IOS) || defined(ANDROID) || defined(NETBSD) || defined(FREEBSD) || \
+    defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY))
 static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
 {
+    (void)hFloppy;
     return osl_File_E_BUSY;
 }
-#endif /* MACOSX */
+#endif
 
-#if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD))
+#if ( defined(MACOSX) || defined(IOS) || defined(ANDROID) || defined(NETBSD) || defined(FREEBSD) || \
+    defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY))
 static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
 {
+    (void)hFloppy;
     return osl_File_E_BUSY;
 }
-#endif /* MACOSX */
+#endif
 
-#if ( defined(NETBSD) || defined(FREEBSD) )
+#if ( defined(NETBSD) || defined(IOS) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) )
 static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
 {
     return sal_False;
 }
-#endif /* NETBSD || FREEBSD */
+#endif /* NETBSD || FREEBSD || OPENBSD */
 
-#if ( defined(NETBSD) || defined(FREEBSD) )
+#if ( defined(NETBSD) || defined(IOS) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) )
 static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice)
 {
     return sal_False;
 }
-#endif /* NETBSD || FREEBSD */
+#endif /* NETBSD || FREEBSD || OPENBSD */
 
 
 #ifdef DEBUG_OSL_FILE
@@ -1153,3 +1184,5 @@ static void osl_printFloppyHandle(oslVolumeDeviceHandleImpl* pItem)
     return;
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/interlck.c b/sal/osl/unx/interlck.c
index 0342cdd983b4..e5bb3ea1e431 100644
--- a/sal/osl/unx/interlck.c
+++ b/sal/osl/unx/interlck.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +29,7 @@
 
 #include "system.h"
 
+#include <osl/armarch.h>
 #include <osl/interlck.h>
 #include <osl/diagnose.h>
 
@@ -35,6 +37,51 @@
 #error please use asm/interlck_sparc.s
 #elif defined ( SOLARIS) && defined ( X86 )
 #error please use asm/interlck_x86.s
+#elif defined ( ARM ) && (( __GNUC__ < 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ < 6 ))) && ( __ARM_ARCH__ >= 6)
+// assembler implementation for gcc <4.6 on arm
+// originally contributed by Eric Bachard / OOo4Kids
+// replaced with the asm code generated by Linaro gcc 4.5
+// which includes memory barriers to make it SMP-safe
+// #i117017# and lp#726529
+oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
+{
+    register oslInterlockedCount nCount __asm__ ("r1");
+    int nResult;
+
+    __asm__ __volatile__ (
+"     dmb\n"
+"1:   ldrex %0, [%3]\n"
+"     add %0, %0, #1\n"
+"     strex %1, %0, [%3]\n"
+"     teq %1, #0\n"
+"     bne 1b\n"
+"     dmb\n"
+        : "=&r" (nCount), "=&r" (nResult), "=m" (*pCount)
+        : "r" (pCount)
+        : "memory");
+
+    return nCount;
+}
+
+oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
+{
+    register oslInterlockedCount nCount __asm__ ("r1");
+    int nResult;
+
+    __asm__ __volatile__ (
+"     dmb\n"
+"0:   ldrex %0, [%3]\n"
+"     sub %0, %0, #1\n"
+"     strex %1, %0, [%3]\n"
+"     teq %1, #0\n"
+"     bne 0b\n"
+"     dmb\n"
+        : "=&r" (nCount), "=&r" (nResult), "=m" (*pCount)
+        : "r" (pCount)
+        : "memory");
+
+    return nCount;
+}
 #elif defined ( GCC ) && ( defined ( X86 ) || defined ( X86_64 ) )
 /* That's possible on x86-64 too since oslInterlockedCount is a sal_Int32 */
 
@@ -45,8 +92,9 @@ extern int osl_isSingleCPU;
 /*****************************************************************************/
 oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
 {
+    // Fast case for old, slow, single CPU Intel machines for whom
+    // interlocking is a performance nightmare.
     register oslInterlockedCount nCount asm("%eax");
-
     nCount = 1;
 
     if ( osl_isSingleCPU ) {
@@ -55,7 +103,12 @@ oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount*
         :   "+r" (nCount), "+m" (*pCount)
         :   /* nothing */
         :   "memory");
+        return ++nCount;
     }
+#if ( __GNUC__ > 4 ) || (( __GNUC__ == 4)  && ( __GNUC_MINOR__ >= 4 ))
+    else
+        return __sync_add_and_fetch (pCount, 1);
+#else
     else {
         __asm__ __volatile__ (
             "lock\n\t"
@@ -64,14 +117,13 @@ oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount*
         :   /* nothing */
         :   "memory");
     }
-
     return ++nCount;
+#endif
 }
 
 oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
 {
     register oslInterlockedCount nCount asm("%eax");
-
     nCount = -1;
 
     if ( osl_isSingleCPU ) {
@@ -80,7 +132,12 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
         :   "+r" (nCount), "+m" (*pCount)
         :   /* nothing */
         :   "memory");
+        return --nCount;
     }
+#if ( __GNUC__ > 4 ) || (( __GNUC__ == 4)  && ( __GNUC_MINOR__ >= 4 ))
+    else
+        return __sync_sub_and_fetch (pCount, 1);
+#else
     else {
         __asm__ __volatile__ (
             "lock\n\t"
@@ -89,51 +146,29 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
         :   /* nothing */
         :   "memory");
     }
-
     return --nCount;
+#endif
 }
 
-#elif defined ( GCC ) && defined ( POWERPC )
-
-/*****************************************************************************/
-/* osl_incrementInterlockedCount */
-/*****************************************************************************/
+#elif ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 ))
 oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
 {
-    /* "addi" doesn't work with r0 as second parameter */
-    register oslInterlockedCount nCount __asm__ ("r4");
-
-    __asm__ __volatile__ (
-        "1: lwarx   %0,0,%2\n\t"
-        "   addi    %0,%0,1\n\t"
-        "   stwcx.  %0,0,%2\n\t"
-        "   bne-    1b\n\t"
-        "   isync"
-        : "=&r" (nCount), "=m" (*pCount)
-        : "r" (pCount)
-        : "memory");
-
-    return nCount;
+    return __sync_add_and_fetch(pCount, 1);
 }
 
 oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
 {
-    /* "subi" doesn't work with r0 as second parameter */
-    register oslInterlockedCount nCount __asm__ ("r4");
-
-    __asm__ __volatile__ (
-        "1: lwarx   %0,0,%2\n\t"
-        "   subi    %0,%0,1\n\t"
-        "   stwcx.  %0,0,%2\n\t"
-        "   bne-    1b\n\t"
-        "   isync"
-        : "=&r" (nCount), "=m" (*pCount)
-        : "r" (pCount)
-        : "memory");
-
-    return nCount;
+    return __sync_sub_and_fetch(pCount, 1);
+}
+#elif ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 ))
+oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
+{
+    return __sync_add_and_fetch(pCount, 1);
+}
+oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
+{
+    return __sync_sub_and_fetch(pCount, 1);
 }
-
 #else
 /* use only if nothing else works, expensive due to single mutex for all reference counts */
 
@@ -168,3 +203,5 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
 }
 
 #endif /* default */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk
index 1dd47fb4d19b..cb566aeb1d60 100644
--- a/sal/osl/unx/makefile.mk
+++ b/sal/osl/unx/makefile.mk
@@ -41,7 +41,7 @@ PROJECTPCHSOURCE=cont_pch
 
 TARGETTYPE=CUI
 
-
+ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
@@ -79,10 +79,9 @@ SLOFILES= \
             $(SLO)$/file_volume.obj \
             $(SLO)$/uunxapi.obj\
             $(SLO)$/process_impl.obj\
-            $(SLO)$/salinit.obj
-
+            $(SLO)$/salinit.obj \
+            $(SLO)$/readwrite_helper.obj
 
-#.IF "$(UPDATER)"=="YES"
 OBJFILES=   $(OBJ)$/conditn.obj  \
             $(OBJ)$/diagnose.obj \
             $(OBJ)$/semaphor.obj \
@@ -110,15 +109,17 @@ OBJFILES=   $(OBJ)$/conditn.obj  \
             $(OBJ)$/file_volume.obj \
             $(OBJ)$/uunxapi.obj\
             $(OBJ)$/process_impl.obj\
-            $(OBJ)$/salinit.obj
+            $(OBJ)$/salinit.obj \
+            $(OBJ)$/readwrite_helper.obj
             
-#.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 SLOFILES += $(SLO)$/osxlocale.obj
 .ENDIF
 
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)$(CPU)"=="LINUXS" || "$(OS)"=="MACOSX"
+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || \
+    "$(OS)$(CPU)"=="LINUXS" || "$(OS)"=="MACOSX" || "$(OS)"=="AIX" || \
+    "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY"
 SLOFILES += $(SLO)$/backtrace.obj
 OBJFILES += $(OBJ)$/backtrace.obj
 .ENDIF
@@ -129,25 +130,14 @@ OBJFILES += $(OBJ)$/backtrace.obj
 APP1STDLIBS+=-lC
 .ENDIF
 
-.IF "$(OS)" == "LINUX"
-.IF "$(PAM)" == "NO"
-CFLAGS+=-DNOPAM
-.IF "$(NEW_SHADOW_API)" == "YES"
-CFLAGS+=-DNEW_SHADOW_API
-.ENDIF
-.ENDIF
-.IF "$(PAM_LINK)" == "YES"
-CFLAGS+=-DPAM_LINK
-.ENDIF
-.IF "$(CRYPT_LINK)" == "YES"
-CFLAGS+=-DCRYPT_LINK
-.ENDIF
-.ENDIF
-
 .IF "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == ""
 CFLAGS+=-DSAL_ENABLE_CRASH_REPORT
 .ENDIF
 
+.IF "$(OS)" == "IOS"
+CFLAGS+=-DNO_DL_FUNCTIONS -DNO_CHILD_PROCESSES
+.ENDIF
+
 .INCLUDE :  target.mk
 
 .IF "$(OS)$(CPU)"=="SOLARISU" || "$(OS)$(CPU)"=="SOLARISS" || "$(OS)$(CPU)"=="NETBSDS" || "$(OS)$(CPU)"=="LINUXS"
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index 8f8f76a8656c..63634c7bd4a2 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,11 +39,13 @@
 #include <stdio.h>
 #endif
 
+#ifdef AIX
+#include <sys/ldr.h>
+#endif
+
 /* implemented in file.c */
 extern int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
 
-oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
-
 /*****************************************************************************/
 /* osl_loadModule */
 /*****************************************************************************/
@@ -63,7 +66,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMo
         char buffer[PATH_MAX];
 
         if (UnicodeToText(buffer, PATH_MAX, ustrTmp->buffer, ustrTmp->length))
-            pModule = osl_psz_loadModule(buffer, nRtldMode);
+            pModule = osl_loadModuleAscii(buffer, nRtldMode);
         rtl_uString_release(ustrTmp);
     }
 
@@ -71,21 +74,21 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMo
 }
 
 /*****************************************************************************/
-/* osl_psz_loadModule */
+/* osl_loadModuleAscii */
 /*****************************************************************************/
 
-oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode)
+oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nRtldMode)
 {
     OSL_ASSERT(
         (nRtldMode & SAL_LOADMODULE_LAZY) == 0 ||
         (nRtldMode & SAL_LOADMODULE_NOW) == 0); /* only either LAZY or NOW */
-    if (pszModuleName)
+    if (pModuleName)
     {
 #ifndef NO_DL_FUNCTIONS
         int rtld_mode =
             ((nRtldMode & SAL_LOADMODULE_NOW) ? RTLD_NOW : RTLD_LAZY) |
             ((nRtldMode & SAL_LOADMODULE_GLOBAL) ? RTLD_GLOBAL : RTLD_LOCAL);
-        void* pLib = dlopen(pszModuleName, rtld_mode);
+        void* pLib = dlopen(pModuleName, rtld_mode);
 
 #if OSL_DEBUG_LEVEL > 1
         if (pLib == 0)
@@ -109,7 +112,11 @@ sal_Bool SAL_CALL
 osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
 {
     (void) pModuleName; /* avoid warning about unused parameter */
+#ifndef NO_DL_FUNCTIONS
     *pResult = (oslModule) RTLD_DEFAULT;
+#else
+    *pResult = NULL;
+#endif
     return sal_True;
 }
 
@@ -201,6 +208,68 @@ osl_getFunctionSymbol(oslModule module, rtl_uString *puFunctionSymbolName)
 sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibraryUrl)
 {
     sal_Bool result = sal_False;
+#ifndef NO_DL_FUNCTIONS
+#if defined(AIX)
+    int i;
+    int size = 4 * 1024;
+    char *buf, *filename=NULL;
+    struct ld_info *lp;
+
+    if ((buf = malloc(size)) == NULL)
+        return result;
+
+    while((i = loadquery(L_GETINFO, buf, size)) == -1 && errno == ENOMEM)
+    {
+        size += 4 * 1024;
+        if ((buf = malloc(size)) == NULL)
+            break;
+    }
+
+    lp = (struct ld_info*) buf;
+    while (lp)
+    {
+        unsigned long start = (unsigned long)lp->ldinfo_dataorg;
+        unsigned long end = start + lp->ldinfo_datasize;
+        if (start <= (unsigned long)addr && end > (unsigned long)addr)
+        {
+            filename = lp->ldinfo_filename;
+            break;
+        }
+        if (!lp->ldinfo_next)
+            break;
+        lp = (struct ld_info*) ((char *) lp + lp->ldinfo_next);
+    }
+
+    if (filename)
+    {
+        rtl_uString * workDir = NULL;
+        osl_getProcessWorkingDir(&workDir);
+        if (workDir)
+        {
+#if OSL_DEBUG_LEVEL > 1
+            OSL_TRACE("module.c::osl_getModuleURLFromAddress - %s\n", filename);
+#endif
+            rtl_string2UString(ppLibraryUrl,
+                               filename,
+                               strlen(filename),
+                               osl_getThreadTextEncoding(),
+                               OSTRING_TO_OUSTRING_CVTFLAGS);
+
+            OSL_ASSERT(*ppLibraryUrl != NULL);
+            osl_getFileURLFromSystemPath(*ppLibraryUrl, ppLibraryUrl);
+            osl_getAbsoluteFileURL(workDir, *ppLibraryUrl, ppLibraryUrl);
+
+            rtl_uString_release(workDir);
+            result = sal_True;
+        }
+        else
+        {
+            result = sal_False;
+        }
+    }
+
+    free(buf);
+#else
     Dl_info dl_info;
 
     if ((result = dladdr(addr, &dl_info)) != 0)
@@ -230,6 +299,8 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr
             result = sal_False;
         }
     }
+#endif
+#endif
     return result;
 }
 
@@ -240,3 +311,5 @@ sal_Bool SAL_CALL osl_getModuleURLFromFunctionAddress(oslGenericFunction addr, r
 {
     return osl_getModuleURLFromAddress((void*)addr, ppLibraryUrl);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/mutex.c b/sal/osl/unx/mutex.c
index 2f47ba8791ad..f10244d7c5ed 100644
--- a/sal/osl/unx/mutex.c
+++ b/sal/osl/unx/mutex.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,11 +72,11 @@ oslMutex SAL_CALL osl_createMutex()
     pthread_mutexattr_init(&aMutexAttr);
 
     nRet = pthread_mutexattr_settype(&aMutexAttr, PTHREAD_MUTEX_RECURSIVE);
-
-    nRet = pthread_mutex_init(&(pMutex->mutex), &aMutexAttr);
+    if( nRet == 0 )
+        nRet = pthread_mutex_init(&(pMutex->mutex), &aMutexAttr);
     if ( nRet != 0 )
     {
-        OSL_TRACE("osl_createMutex : mutex init failed. Errno: %d; %s\n",
+        OSL_TRACE("osl_createMutex : mutex init/setattr failed. Errno: %d; %s\n",
                   nRet, strerror(nRet));
 
         free(pMutex);
@@ -219,3 +220,5 @@ oslMutex * SAL_CALL osl_getGlobalMutex()
 
     return &globalMutex;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index af7d420ee524..eb0068269620 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,9 @@
 #include <osl/process.h>
 #include <rtl/memory.h>
 
-#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)
+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \
+    defined(FREEBSD) || defined(MACOSX)  || defined(IOS) || defined(OPENBSD) || \
+    defined(DRAGONFLY)
 #include <pthread.h>
 #ifndef MACOSX
  #include <locale.h>
@@ -39,7 +42,7 @@
 #include <osl/module.h>
 #include <osl/thread.h>
 #endif  /* !MACOSX */
-#endif  /* LINUX || SOLARIS || NETBSD || MACOSX */
+#endif  /* LINUX || SOLARIS || NETBSD || MACOSX || IOS */
 
 #include <string.h>
 
@@ -231,7 +234,8 @@ static rtl_Locale * _parse_locale( const char * locale )
     return NULL;
 }
 
-#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD)
+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \
+    defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY)
 
 /*
  * This implementation of osl_getTextEncodingFromLocale maps
@@ -301,7 +305,7 @@ const _pair _nl_language_list[] = {
 /* XXX MS-874 is an extension to tis620, so this is not
  * really equivalent */
 
-#elif defined(LINUX) || defined(NETBSD)
+#elif defined(LINUX)
 
 const _pair _nl_language_list[] = {
     { "ANSI_X3.110-1983",           RTL_TEXTENCODING_DONTKNOW   },  /* ISO-IR-99 NAPLPS */
@@ -310,7 +314,7 @@ const _pair _nl_language_list[] = {
     { "BALTIC",                     RTL_TEXTENCODING_DONTKNOW },    /* ISO-IR-179 */
     { "BIG5",                       RTL_TEXTENCODING_BIG5 },        /* locale: zh_TW */
     { "BIG5-HKSCS",                 RTL_TEXTENCODING_BIG5_HKSCS },  /* locale: zh_CN.BIG5HK */
-    { "BIG5HKSCS",                  RTL_TEXTENCODING_BIG5_HKSCS },  /* depricated */
+    { "BIG5HKSCS",                  RTL_TEXTENCODING_BIG5_HKSCS },  /* deprecated */
     { "BS_4730",                    RTL_TEXTENCODING_DONTKNOW },    /* ISO-IR-4 ISO646-GB */
     { "BS_VIEWDATA",                RTL_TEXTENCODING_DONTKNOW },    /* ISO-IR-47 */
     { "CP1250",                     RTL_TEXTENCODING_MS_1250 },     /* MS-EE */
@@ -483,7 +487,7 @@ const _pair _nl_language_list[] = {
     { "WIN-SAMI-2",                 RTL_TEXTENCODING_DONTKNOW }     /* WS2 */
 };
 
-#elif defined(FREEBSD)
+#elif defined(FREEBSD) || defined(DRAGONFLY)
 
 const _pair _nl_language_list[] = {
     { "ASCII",         RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
@@ -512,15 +516,46 @@ const _pair _nl_language_list[] = {
 const _pair _nl_language_list[] = {
     { "ASCII",         RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
     { "BIG5",          RTL_TEXTENCODING_BIG5           }, /* China - Traditional Chinese */
+    { "Big5",          RTL_TEXTENCODING_BIG5           }, /* China - Traditional Chinese */
+    { "Big5-HKSCS",    RTL_TEXTENCODING_BIG5_HKSCS     }, /* locale: zh_CN.BIG5HK */
+    { "Big5HKSCS",     RTL_TEXTENCODING_BIG5_HKSCS     }, /* deprecated */
     { "CP1251",        RTL_TEXTENCODING_MS_1251        }, /* MS-CYRL */
     { "CP866",         RTL_TEXTENCODING_IBM_866        }, /* CP866 866 */
     { "CTEXT",         RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
+    { "eucCN",         RTL_TEXTENCODING_EUC_CN         }, /* China - Simplified Chinese */
+    { "eucJP",         RTL_TEXTENCODING_EUC_JP         }, /* Japan */
+    { "eucKR",         RTL_TEXTENCODING_EUC_KR         }, /* Korea */
+    { "eucTW",         RTL_TEXTENCODING_EUC_TW         }, /* China - Traditional Chinese */
+    { "GB18030",       RTL_TEXTENCODING_GB_18030       }, /* locale: zh_CN.gb18030 */
+    { "GB2312",        RTL_TEXTENCODING_GB_2312        }, /* locale: zh_CN */
+    { "ISO-2022-JP",   RTL_TEXTENCODING_DONTKNOW       }, /* */
+    { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW       }, /* */
+    { "ISO8859-1",     RTL_TEXTENCODING_ISO_8859_1     }, /* Western */
+    { "ISO8859-13",    RTL_TEXTENCODING_ISO_8859_13    }, /* ISO-IR-179 LATIN7 */
+    { "ISO8859-15",    RTL_TEXTENCODING_ISO_8859_15    }, /* Western Updated (w/Euro sign) */
+    { "ISO8859-2",     RTL_TEXTENCODING_ISO_8859_2     }, /* Central European */
+    { "ISO8859-4",     RTL_TEXTENCODING_ISO_8859_4     }, /* LATIN4 L4 */
+    { "ISO8859-5",     RTL_TEXTENCODING_ISO_8859_5     }, /* Cyrillic */
+    { "ISO8859-7",     RTL_TEXTENCODING_ISO_8859_7     }, /* Greek */
+    { "ISO8859-9",     RTL_TEXTENCODING_ISO_8859_9     }, /* Turkish */
+    { "KOI8-R",        RTL_TEXTENCODING_KOI8_R         }, /* KOI8-R */
+    { "KOI8-U",        RTL_TEXTENCODING_KOI8_U         }, /* KOI8-U */
+    { "PT154",         RTL_TEXTENCODING_PT154          }, /* */
+    { "SJIS",          RTL_TEXTENCODING_SHIFT_JIS      }, /* Japan */
+    { "US-ASCII",      RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
+    { "UTF-8",         RTL_TEXTENCODING_UTF8           }  /* ISO-10646/UTF-8 */
+};
+
+#elif defined(OPENBSD)
+
+const _pair _nl_language_list[] = {
+    { "ASCII",         RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
+    { "BIG5",          RTL_TEXTENCODING_BIG5           }, /* China - Traditional Chinese */
+    { "CP1251",        RTL_TEXTENCODING_MS_1251        }, /* MS-CYRL */
+    { "CP866",         RTL_TEXTENCODING_IBM_866        }, /* CP866 866 */
     { "EUCCN",         RTL_TEXTENCODING_EUC_CN         }, /* China - Simplified Chinese */
     { "EUCJP",         RTL_TEXTENCODING_EUC_JP         }, /* Japan */
     { "EUCKR",         RTL_TEXTENCODING_EUC_KR         }, /* Korea */
-    { "EUCTW",         RTL_TEXTENCODING_EUC_TW         }, /* China - Traditional Chinese */
-    { "ISO-2022-JP",   RTL_TEXTENCODING_DONTKNOW       }, /* */
-    { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW       }, /* */
     { "ISO8859-1",     RTL_TEXTENCODING_ISO_8859_1     }, /* Western */
     { "ISO8859-15",    RTL_TEXTENCODING_ISO_8859_15    }, /* Western Updated (w/Euro sign) */
     { "ISO8859-2",     RTL_TEXTENCODING_ISO_8859_2     }, /* Central European */
@@ -535,7 +570,7 @@ const _pair _nl_language_list[] = {
     { "UTF-8",         RTL_TEXTENCODING_UTF8           }  /* ISO-10646/UTF-8 */
 };
 
-#endif /* ifdef SOLARIS LINUX FREEBSD NETBSD */
+#endif /* ifdef SOLARIS LINUX FREEBSD NETBSD OPENBSD */
 
 static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
 
@@ -826,7 +861,6 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
 /* OS X locale discovery function */
 int (*pGetOSXLocale)( char *, sal_uInt32 );
 
-oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
 /*****************************************************************************
  return the current process locale
  *****************************************************************************/
@@ -908,6 +942,12 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
  set the current process locale
  *****************************************************************************/
 
+static int
+_setenv (const char* name, const char* value)
+{
+    return setenv (name, value, 1);
+}
+
 int _imp_setProcessLocale( rtl_Locale * pLocale )
 {
     char locale_buf[64];
@@ -916,34 +956,20 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
     if( NULL != _compose_locale( pLocale, locale_buf, 64 ) )
     {
         /* only change env vars that exist already */
-        if( getenv( "LC_ALL" ) ) {
-#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
-            setenv( "LC_ALL", locale_buf, 1);
-#else
-            setenv( "LC_ALL", locale_buf );
-#endif
-        }
+        if( getenv( "LC_ALL" ) )
+            _setenv( "LC_ALL", locale_buf );
 
-        if( getenv( "LC_CTYPE" ) ) {
-#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
-            setenv("LC_CTYPE", locale_buf, 1 );
-#else
-            setenv( "LC_CTYPE", locale_buf );
-#endif
-        }
+        if( getenv( "LC_CTYPE" ) )
+            _setenv("LC_CTYPE", locale_buf );
 
-        if( getenv( "LANG" ) ) {
-#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
-            setenv("LC_CTYPE", locale_buf, 1 );
-#else
-            setenv( "LANG", locale_buf );
-#endif
-        }
+        if( getenv( "LANG" ) )
+            _setenv( "LANG", locale_buf );
     }
 
     return 0;
 }
 
-#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
+#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD || AIX */
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx
index 9a20fd9ceb12..c8bcc6dae756 100644
--- a/sal/osl/unx/osxlocale.cxx
+++ b/sal/osl/unx/osxlocale.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -127,3 +128,4 @@ extern "C" int macxp_OSXConvertCFEncodingToIANACharSetName( char *buffer, unsign
     return( noErr );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index 069ea9990951..5fdbcb035f7e 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,12 +26,10 @@
  *
  ************************************************************************/
 
-
 #include "system.h"
 
 #include <osl/pipe.h>
 #include <osl/diagnose.h>
-/*#include <osl/signal.h>*/
 #include <osl/thread.h>
 #include <osl/interlck.h>
 
@@ -45,9 +44,6 @@
 sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax);
 oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, oslSecurity Security);
 
-/*#define DEBUG_OSL_PIPE*/
-/*#define TRACE_OSL_PIPE*/
-
 
 /*****************************************************************************/
 /* enum oslPipeError */
@@ -170,6 +166,8 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
     struct sockaddr_un addr;
 
     sal_Char     name[PATH_MAX + 1];
+    size_t nNameLength = 0;
+    int bNameTooLong = 0;
     oslPipe  pPipe;
 
     if (access(PIPEDEFAULTPATH, R_OK|W_OK) == 0)
@@ -180,26 +178,41 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
     {
         strncpy(name, PIPEALTERNATEPATH, sizeof(name));
     }
+    name[sizeof(name) - 1] = '\0';  // ensure the string is NULL-terminated
+    nNameLength = strlen(name);
+    bNameTooLong = nNameLength > sizeof(name) - 2;
 
+    if (!bNameTooLong)
+    {
+        size_t nRealLength = 0;
 
-    strncat(name, "/", sizeof(name));
+        strcat(name, "/");
+        ++nNameLength;
 
-    if (Security)
-    {
-        sal_Char Ident[256];
+        if (Security)
+        {
+            sal_Char Ident[256];
 
-        Ident[0] = '\0';
+            Ident[0] = '\0';
 
-        OSL_VERIFY(osl_psz_getUserIdent(Security, Ident, sizeof(Ident)));
+            OSL_VERIFY(osl_psz_getUserIdent(Security, Ident, sizeof(Ident)));
 
-        snprintf(&name[strlen(name)], sizeof(name), SECPIPENAMEMASK, Ident, pszPipeName);
+            nRealLength = snprintf(&name[nNameLength], sizeof(name) - nNameLength, SECPIPENAMEMASK, Ident, pszPipeName);
+        }
+        else
+        {
+            nRealLength = snprintf(&name[nNameLength], sizeof(name) - nNameLength, PIPENAMEMASK, pszPipeName);
+        }
+
+        bNameTooLong = nRealLength > sizeof(name) - nNameLength - 1;
     }
-    else
+
+    if (bNameTooLong)
     {
-        snprintf(&name[strlen(name)], sizeof(name), PIPENAMEMASK, pszPipeName);
+        OSL_TRACE("osl_createPipe: pipe name too long");
+        return NULL;
     }
 
-
     /* alloc memory */
     pPipe= __osl_createPipeImpl();
 
@@ -363,12 +376,10 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
         len = sizeof(addr);
 
         nRet = connect( fd, (struct sockaddr *)&addr, len);
-#if OSL_DEBUG_LEVEL > 1
         if ( nRet < 0 )
         {
-            perror("connect in osl_destroyPipe");
+            OSL_TRACE("connect in osl_destroyPipe failed with error: %s", strerror(errno));
         }
-#endif /* OSL_DEBUG_LEVEL */
         close(fd);
     }
 #endif /* LINUX */
@@ -539,7 +550,7 @@ oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe)
 
 sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 n )
 {
-    /* loop until all desired bytes were send or an error occured */
+    /* loop until all desired bytes were send or an error occurred */
     sal_Int32 BytesSend= 0;
     sal_Int32 BytesToSend= n;
 
@@ -550,7 +561,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32
 
         RetVal= osl_sendPipe(pPipe, pBuffer, BytesToSend);
 
-        /* error occured? */
+        /* error occurred? */
         if(RetVal <= 0)
         {
             break;
@@ -566,7 +577,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32
 
 sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
 {
-    /* loop until all desired bytes were read or an error occured */
+    /* loop until all desired bytes were read or an error occurred */
     sal_Int32 BytesRead= 0;
     sal_Int32 BytesToRead= n;
 
@@ -576,7 +587,7 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
         sal_Int32 RetVal;
         RetVal= osl_receivePipe(pPipe, pBuffer, BytesToRead);
 
-        /* error occured? */
+        /* error occurred? */
         if(RetVal <= 0)
         {
             break;
@@ -590,3 +601,4 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c
index 300a1446e81a..07cd315882f7 100644
--- a/sal/osl/unx/process.c
+++ b/sal/osl/unx/process.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,7 +42,7 @@
 #endif
 
 
-#ifdef FREEBSD
+#if defined(FREEBSD) || defined(NETBSD) || defined(DRAGONFLY)
 #include <machine/param.h>
 #endif
 
@@ -63,6 +64,7 @@
 #include <grp.h>
 
 #include "procimpl.h"
+#include "readwrite_helper.h"
 #include "sockimpl.h"
 #include "secimpl.h"
 
@@ -70,7 +72,7 @@
 #define MAX_ARGS        255
 #define MAX_ENVS        255
 
-#if defined(MACOSX) || defined(IORESOURCE_TRANSFER_BSD)
+#if defined(MACOSX) || defined(IOS) || defined(IORESOURCE_TRANSFER_BSD) || defined(AIX)
 #define CONTROLLEN (sizeof(struct cmsghdr) + sizeof(int))
 #endif
 
@@ -281,15 +283,15 @@ static sal_Bool sendFdPipe(int PipeFD, int SocketFD)
         OSL_TRACE("sendFdPipe : sending failed (%s)",strerror(errno));
     }
 
-    nSend=read(PipeFD,&RetCode,sizeof(RetCode));
+    bRet = safeRead(PipeFD, &RetCode, sizeof(RetCode));
 
-    if ( nSend > 0 && RetCode == 1 )
+    if ( bRet && RetCode == 1 )
     {
         OSL_TRACE("sendFdPipe : resource was received\n");
     }
     else
     {
-        OSL_TRACE("sendFdPipe : resource wasn't received\n");
+        OSL_TRACE("sendFdPipe : resource wasn't received (error %s)\n", strerror(errno));
     }
 
 #if defined(IOCHANNEL_TRANSFER_BSD_RENO)
@@ -373,7 +375,18 @@ static oslSocket receiveFdPipe(int PipeFD)
     }
 
     OSL_TRACE("receiveFdPipe : writing back %i",nRetCode);
-    nRead=write(PipeFD,&nRetCode,sizeof(nRetCode));
+    if ( !safeWrite(PipeFD, &nRetCode, sizeof(nRetCode)) )
+        OSL_TRACE("write failed (%s)", strerror(errno));
+
+    if ( nRead < 0 )
+    {
+        OSL_TRACE("write failed (%s)", strerror(errno));
+    }
+    else if ( nRead != sizeof(nRetCode) )
+    {
+        // TODO: Handle this case.
+        OSL_TRACE("partial write: wrote %d out of %d)", nRead, sizeof(nRetCode));
+    }
 
 #if defined(IOCHANNEL_TRANSFER_BSD_RENO)
     free(cmptr);
@@ -442,6 +455,9 @@ static void ChildStatusProc(void *pData)
        in our child process */
     memcpy(&data, pData, sizeof(data));
 
+#ifdef NO_CHILD_PROCESSES
+#define fork() (errno = EINVAL, -1)
+#endif
     if (socketpair(AF_UNIX, SOCK_STREAM, 0, channel) == -1)
         status = errno;
 
@@ -465,7 +481,6 @@ static void ChildStatusProc(void *pData)
     {
         /* Child */
         int chstatus = 0;
-        sal_Int32 nWrote;
 
         if (channel[0] != -1) close(channel[0]);
 
@@ -475,7 +490,7 @@ static void ChildStatusProc(void *pData)
 
             if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
                 OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno));
-#if defined(LINUX) || defined (FREEBSD)
+#if defined(LINUX) || defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
             unsetenv("HOME");
 #else
             putenv("HOME=");
@@ -533,8 +548,9 @@ static void ChildStatusProc(void *pData)
                 if (stdError[1] != -1) close( stdError[1] );
             }
 
-            pid=execv(data.m_pszArgs[0], (sal_Char **)data.m_pszArgs);
-
+            // No need to check the return value of execv. If we return from
+            // it, an error has occurred.
+            execv(data.m_pszArgs[0], (sal_Char **)data.m_pszArgs);
         }
 
         OSL_TRACE("Failed to exec, errno=%d (%s)\n", errno, strerror(errno));
@@ -542,11 +558,11 @@ static void ChildStatusProc(void *pData)
         OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]);
 
         /* if we reach here, something went wrong */
-        nWrote = write(channel[1], &errno, sizeof(errno));
-        if (nWrote != sizeof(errno))
+        if ( !safeWrite(channel[1], &errno, sizeof(errno)) )
             OSL_TRACE("sendFdPipe : sending failed (%s)",strerror(errno));
 
-        if (channel[1] != -1) close(channel[1]);
+        if ( channel[1] != -1 )
+            close(channel[1]);
 
         _exit(255);
     }
@@ -1166,7 +1182,7 @@ sal_Bool osl_getProcStat(pid_t pid, struct osl_procStat* procstat)
         char* tmp=0;
         char prstatbuf[512];
         memset(prstatbuf,0,512);
-        bRet = read(fd,prstatbuf,511) == 511;
+        bRet = safeRead(fd, prstatbuf, 511);
 
         close(fd);
         /*printf("%s\n\n",prstatbuf);*/
@@ -1220,7 +1236,7 @@ sal_Bool osl_getProcStatus(pid_t pid, struct osl_procStat* procstat)
         char* tmp=0;
         char prstatusbuf[512];
         memset(prstatusbuf,0,512);
-        bRet = read(fd,prstatusbuf,511) == 511;
+        bRet = safeRead(fd, prstatusbuf, 511);
 
         close(fd);
 
@@ -1350,32 +1366,6 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F
                 close(fd);
         }
 
-#elif defined(HPUX)
-
-        struct pst_status prstatus;
-
-        if (pstat_getproc(&prstatus, sizeof(prstatus), (size_t)0, pid) == 1)
-        {
-            if (Fields & osl_Process_CPUTIMES)
-            {
-                pInfo->UserTime.Seconds   = prstatus.pst_utime;
-                pInfo->UserTime.Nanosec   = 500000L;
-                pInfo->SystemTime.Seconds = prstatus.pst_stime;
-                pInfo->SystemTime.Nanosec = 500000L;
-
-                pInfo->Fields |= osl_Process_CPUTIMES;
-            }
-
-            if (Fields & osl_Process_HEAPUSAGE)
-            {
-                pInfo->HeapUsage = prstatus.pst_vdsize*PAGESIZE;
-
-                pInfo->Fields |= osl_Process_HEAPUSAGE;
-            }
-
-            return (pInfo->Fields == Fields) ? osl_Process_E_None : osl_Process_E_Unknown;
-        }
-
 #elif defined(LINUX)
 
         if ( (Fields & osl_Process_CPUTIMES) || (Fields & osl_Process_HEAPUSAGE) )
@@ -1534,3 +1524,5 @@ oslProcessError SAL_CALL osl_joinProcess(oslProcess Process)
 {
     return osl_joinProcessWithTimeout(Process, NULL);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 498778758ded..49d6603612ae 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,13 +57,9 @@
 #include "rtl/ustring.hxx"
 #include "rtl/strbuf.h"
 
-#ifndef _OSL_FILE_PATH_HELPER_H_
 #include "file_path_helper.h"
-#endif
 
-#ifndef _OSL_UUNXAPI_H_
 #include "uunxapi.h"
-#endif
 
 /***************************************
   osl_bootstrap_getExecutableFile_Impl().
@@ -518,3 +515,5 @@ oslProcessError SAL_CALL osl_setProcessLocale( rtl_Locale * pLocale )
 
     return (result);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/procimpl.h b/sal/osl/unx/procimpl.h
index 1a08d72ffe5a..dd1d965b7146 100644
--- a/sal/osl/unx/procimpl.h
+++ b/sal/osl/unx/procimpl.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,3 +49,4 @@ typedef struct _oslProcessImpl {
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index 05d816c92755..f4def519aad1 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,6 +28,7 @@
 
 
 #include "system.h"
+#include "readwrite_helper.h"
 
 #include <osl/diagnose.h>
 #include <osl/profile.h>
@@ -196,11 +198,8 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
 {
     osl_TFile*        pFile;
     osl_TProfileImpl* pProfile;
-    sal_Char          Filename[PATH_MAX];
     sal_Bool bRet = sal_False;
 
-    Filename[0] = '\0';
-
 #ifdef TRACE_OSL_PROFILE
     OSL_TRACE("In  osl_openProfile\n");
 #endif
@@ -245,6 +244,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
 
     if ( pProfile == 0 )
     {
+        closeFileImpl(pFile, Flags);
         return 0;
     }
 
@@ -275,7 +275,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
 sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
 {
     osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;
-    sal_Bool bRet = sal_False;
+    osl_TProfileImpl* pTmpProfile;
 
 #ifdef TRACE_OSL_PROFILE
     OSL_TRACE("In  osl_closeProfile\n");
@@ -305,21 +305,22 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
 
     if ( ! ( pProfile->m_Flags & osl_Profile_READLOCK ) && ( pProfile->m_Flags & FLG_MODIFIED ) )
     {
-        pProfile = acquireProfile(Profile,sal_True);
+        pTmpProfile = acquireProfile(Profile,sal_True);
 
-        if ( pProfile != 0 )
+        if ( pTmpProfile != 0 )
         {
-            bRet=storeProfile(pProfile, sal_True);
+            sal_Bool bRet = storeProfile(pTmpProfile, sal_True);
             OSL_ASSERT(bRet);
+            (void)bRet;
         }
     }
     else
     {
-        pProfile = acquireProfile(Profile,sal_False);
+        pTmpProfile = acquireProfile(Profile,sal_False);
     }
 
 
-    if ( pProfile == 0 )
+    if ( pTmpProfile == 0 )
     {
         pthread_mutex_unlock(&(pProfile->m_AccessLock));
 #ifdef TRACE_OSL_PROFILE
@@ -328,6 +329,8 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
         return sal_False;
     }
 
+    pProfile = pTmpProfile;
+
     if (pProfile->m_pFile != NULL)
         closeFileImpl(pProfile->m_pFile,pProfile->m_Flags);
 
@@ -438,7 +441,6 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
 
 static sal_Bool writeProfileImpl(osl_TFile* pFile)
 {
-    int BytesWritten=0;
 #if OSL_DEBUG_LEVEL > 1
     unsigned int nLen=0;
 #endif
@@ -460,19 +462,12 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
     OSL_ASSERT(nLen == (pFile->m_nWriteBufLen - pFile->m_nWriteBufFree));
 #endif
 
-    BytesWritten = write(pFile->m_Handle, pFile->m_pWriteBuf, pFile->m_nWriteBufLen - pFile->m_nWriteBufFree);
-
-    if ( BytesWritten <= 0 )
+    if ( !safeWrite(pFile->m_Handle, pFile->m_pWriteBuf, pFile->m_nWriteBufLen - pFile->m_nWriteBufFree) )
     {
         OSL_TRACE("write failed '%s'\n",strerror(errno));
         return (sal_False);
     }
 
-#if OSL_DEBUG_LEVEL > 1
-    OSL_ASSERT(
-        BytesWritten >= 0 && SAL_INT_CAST(unsigned int, BytesWritten) == nLen);
-#endif
-
     free(pFile->m_pWriteBuf);
     pFile->m_pWriteBuf=0;
     pFile->m_nWriteBufLen=0;
@@ -560,6 +555,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
 
     bRet=releaseProfile(pProfile);
     OSL_ASSERT(bRet);
+    (void)bRet;
 
     if ( pStr == 0 )
     {
@@ -1016,6 +1012,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
 
     bRet=releaseProfile(pProfile);
     OSL_ASSERT(bRet);
+    (void)bRet;
 
     pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
 
@@ -1107,6 +1104,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff
 
     bRet=releaseProfile(pProfile);
     OSL_ASSERT(bRet);
+    (void)bRet;
 
     pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
 
@@ -2103,7 +2101,6 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
 {
     osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;
     oslProfileOption PFlags=0;
-    sal_Bool bRet=sal_False;
 
     if ( bWriteable )
     {
@@ -2148,10 +2145,13 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
 
                 if (memcmp(&Stamp, &(pProfile->m_Stamp), sizeof(osl_TStamp)))
                 {
+                    sal_Bool bRet=sal_False;
+
                     pProfile->m_Stamp = Stamp;
 
                     bRet=loadProfile(pProfile->m_pFile, pProfile);
                     OSL_ASSERT(bRet);
+                    (void)bRet;
                 }
             }
             else
@@ -2173,8 +2173,6 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
 
 static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
 {
-    sal_Bool bRet=sal_False;
-
 #ifdef TRACE_OSL_PROFILE
     OSL_TRACE("In  releaseProfile\n");
 #endif
@@ -2203,11 +2201,11 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
         {
             if (pProfile->m_Flags & FLG_MODIFIED)
             {
-                bRet=storeProfile(pProfile, sal_False);
+                sal_Bool bRet=storeProfile(pProfile, sal_False);
                 OSL_ASSERT(bRet);
+                (void)bRet;
             }
 
-
             closeFileImpl(pProfile->m_pFile,pProfile->m_Flags);
             pProfile->m_pFile = NULL;
         }
@@ -2218,3 +2216,5 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
 #endif
     return (sal_True);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/readwrite_helper.c b/sal/osl/unx/readwrite_helper.c
new file mode 100644
index 000000000000..e2598953e8b5
--- /dev/null
+++ b/sal/osl/unx/readwrite_helper.c
@@ -0,0 +1,87 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Julien Chaffraix <julien.chaffraix@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Major Contributor(s):
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "readwrite_helper.h"
+
+#include <osl/diagnose.h>
+#include <system.h>
+
+sal_Bool safeWrite(int fd, void* data, sal_uInt32 dataSize)
+{
+    sal_Int32 nToWrite = dataSize;
+    unsigned char* dataToWrite = data;
+
+    // Check for overflow as we convert a signed to an unsigned.
+    OSL_ASSERT(dataSize == (sal_uInt32)nToWrite);
+    while ( nToWrite ) {
+        sal_Int32 nWritten = write(fd, dataToWrite, nToWrite);
+        if ( nWritten < 0 ) {
+            if ( errno == EINTR )
+                continue;
+
+            return sal_False;
+
+        }
+
+        OSL_ASSERT(nWritten > 0);
+        nToWrite -= nWritten;
+        dataToWrite += nWritten;
+    }
+
+    return sal_True;
+}
+
+sal_Bool safeRead( int fd, void* buffer, sal_uInt32 count )
+{
+    sal_Int32 nToRead = count;
+    unsigned char* bufferForReading = buffer;
+
+    // Check for overflow as we convert a signed to an unsigned.
+    OSL_ASSERT(count == (sal_uInt32)nToRead);
+    while ( nToRead ) {
+        sal_Int32 nRead = read(fd, bufferForReading, nToRead);
+        if ( nRead < 0 ) {
+            // We were interrupted before reading, retry.
+            if (errno == EINTR)
+                continue;
+
+            return sal_False;
+        }
+
+        // If we reach the EOF, we consider this a partial transfer and thus
+        // an error.
+        if ( nRead == 0 )
+            return sal_False;
+
+        nToRead -= nRead;
+        bufferForReading += nRead;
+    }
+
+    return sal_True;
+}
diff --git a/sal/osl/unx/readwrite_helper.h b/sal/osl/unx/readwrite_helper.h
new file mode 100644
index 000000000000..c96c4e3bf94b
--- /dev/null
+++ b/sal/osl/unx/readwrite_helper.h
@@ -0,0 +1,46 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Julien Chaffraix <julien.chaffraix@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Major Contributor(s):
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include <sal/types.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+sal_Bool safeWrite( int fd, void* data, sal_uInt32 dataSize );
+
+// This function *will* read |count| bytes from |fd|, busy looping
+// if needed. Don't use it when you don't know if you can request enough
+// data. It will return sal_False for any partial transfer or error.
+sal_Bool safeRead( int fd, void* buffer, sal_uInt32 count );
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index 7090a381235c..1ed1363500e9 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,3 +42,5 @@ void SAL_CALL sal_detail_initialize(int argc, char ** argv) {
 void SAL_CALL sal_detail_deinitialize() {}
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/secimpl.h b/sal/osl/unx/secimpl.h
index 1d8f2aaa9419..8ff03722c934 100644
--- a/sal/osl/unx/secimpl.h
+++ b/sal/osl/unx/secimpl.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,4 @@ typedef struct _oslSecurityImpl {
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/security.c b/sal/osl/unx/security.c
index d08326e65ebe..2d4586817e61 100644
--- a/sal/osl/unx/security.c
+++ b/sal/osl/unx/security.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,12 +48,11 @@
 
 #include "secimpl.h"
 
-#ifndef NOPAM
-#ifndef PAM_BINARY_MSG
-#define PAM_BINARY_MSG 6
-#endif
+#ifdef ANDROID
+#define getpwuid_r(uid, pwd, buf, buflen, result) (*(result) = getpwuid(uid), (*(result) ? (memcpy (buf, *(result), sizeof (struct passwd)), 0) : errno))
 #endif
 
+
 static oslSecurityError SAL_CALL
 osl_psz_loginUser(const sal_Char* pszUserName, const sal_Char* pszPasswd,
                   oslSecurity* pSecurity);
@@ -141,311 +141,6 @@ oslSecurity SAL_CALL osl_getCurrentSecurity()
     }
 }
 
-
-#if defined LINUX && !defined NOPAM
-
-/*
- *
- * osl Routines for Pluggable Authentication Modules (PAM)
- * tested with Linux-PAM 0.66 on Redhat-6.0 and
- * Linux-PAM 0.64 on RedHat-5.2,
- * XXX Will probably not run on PAM 0.59 or prior, since
- *     number of pam_response* responses has changed
- *
- */
-
-#include <security/pam_appl.h>
-
-typedef struct {
-    char* name;
-    char* password;
-} sal_PamData;
-
-typedef struct {
-    int (*pam_start)(const char *service_name, const char *user,
-                      const struct pam_conv *pam_conversation,
-                      pam_handle_t **pamh);
-    int (*pam_end)          (pam_handle_t *pamh, int pam_status);
-    int (*pam_authenticate) (pam_handle_t *pamh, int flags);
-    int (*pam_acct_mgmt)    (pam_handle_t *pamh, int flags);
-} sal_PamModule;
-
-/*
- * Implement a pam-conversation callback-routine,
- * it just supply name and password instead of prompting the user.
- * I guess that echo-off means 'ask for password' and echo-on means
- * 'ask for user-name'. In fact I've never been asked anything else
- * than the password
- * XXX Please notice that if a pam-module does ask anything else, we
- *     are completely lost, and a pam-module is free to do so
- * XXX
- */
-
-static int
-osl_PamConversation (int num_msg, const struct pam_message **msgm,
-                     struct pam_response **response, void *appdata_ptr)
-{
-    int         i;
-    sal_Bool    error;
-    sal_PamData         *pam_data;
-    struct pam_response *p_reply;
-
-    /* resource initialization */
-    pam_data = (sal_PamData*) appdata_ptr;
-    p_reply  = (struct pam_response *) calloc( num_msg,
-                                               sizeof(struct pam_response));
-    if ( p_reply == NULL || pam_data == NULL )
-    {
-        if ( p_reply != NULL )
-            free ( p_reply );
-        *response = NULL;
-        return PAM_CONV_ERR;
-    }
-
-    /* pseudo dialog */
-    error = sal_False;
-    for ( i = 0; i < num_msg ; i++ )
-    {
-        switch ( msgm[ i ]->msg_style )
-        {
-            case PAM_PROMPT_ECHO_OFF:
-                p_reply[ i ].resp_retcode = 0;
-                p_reply[ i ].resp         = strdup( pam_data->password );
-                 break;
-            case PAM_PROMPT_ECHO_ON:
-                p_reply[ i ].resp_retcode = 0;
-                p_reply[ i ].resp       = strdup( pam_data->name );
-                break;
-            case PAM_ERROR_MSG:
-            case PAM_TEXT_INFO:
-             case PAM_BINARY_PROMPT:
-            case PAM_BINARY_MSG:
-                p_reply[ i ].resp_retcode   = 0;
-                p_reply[ i ].resp           = NULL;
-                break;
-            default:
-                error = sal_True;
-                break;
-        }
-    }
-
-    /* free resources on error */
-    if ( error )
-    {
-        for ( i = 0; i < num_msg ; i++ )
-            if ( p_reply[ i ].resp )
-            {
-                memset ( p_reply[ i ].resp, 0,
-                         strlen( p_reply[ i ].resp ) );
-                free   ( p_reply[ i ].resp );
-            }
-        free ( p_reply );
-
-        *response = NULL;
-        return PAM_CONV_ERR;
-    }
-
-    /* well done */
-    *response = p_reply;
-    return PAM_SUCCESS;
-}
-
-#ifndef PAM_LINK
-/*
- * avoid linking against libpam.so, since it is not available on all systems,
- * instead load-on-call, returns structure which holds pointer to
- * pam-functions,
- * library is never closed in case of success
- */
-
-static sal_PamModule* osl_getPAM()
-{
-    static sal_PamModule *pam_module = NULL;
-    static sal_Bool load_once = sal_False;
-
-    if ( !load_once )
-    {
-        /* get library-handle. cannot use osl-module, since
-            RTLD_GLOBAL is required for PAM-0.64 RH 5.2
-           (but not for PAM-0.66 RH 6.0) */
-        void *pam_hdl;
-
-        pam_hdl = dlopen( "libpam.so.0", RTLD_GLOBAL | RTLD_LAZY );
-
-        if ( pam_hdl != NULL )
-            pam_module = (sal_PamModule*)calloc( 1, sizeof(sal_PamModule) );
-
-        /* load functions */
-        if ( pam_module  != NULL )
-        {
-            pam_module->pam_acct_mgmt = (int (*)(pam_handle_t *, int)) dlsym ( pam_hdl, "pam_acct_mgmt" );
-            pam_module->pam_authenticate
-                                      = (int (*)(pam_handle_t *, int)) dlsym ( pam_hdl, "pam_authenticate" );
-            pam_module->pam_end       = (int (*)(pam_handle_t *, int)) dlsym ( pam_hdl, "pam_end" );
-            pam_module->pam_start     = (int (*)(const char *, const char *, const struct pam_conv *, pam_handle_t **)) dlsym ( pam_hdl, "pam_start" );
-
-            /* free resources, if not completely successful */
-            if (   (pam_module->pam_start        == NULL)
-                || (pam_module->pam_end          == NULL)
-                || (pam_module->pam_authenticate == NULL)
-                || (pam_module->pam_acct_mgmt    == NULL) )
-            {
-                free( pam_module );
-                pam_module = NULL;
-                dlclose( pam_hdl );
-            }
-        }
-
-        /* never try again */
-        load_once = sal_True;
-    }
-
-    return pam_module;
-}
-#endif
-
-/*
- * User Identification using PAM
- */
-
-static sal_Bool
-osl_PamAuthentification( const sal_Char* name, const sal_Char* password )
-{
-    sal_Bool success = sal_False;
-
-#ifndef PAM_LINK
-    sal_PamModule* pam_module;
-
-    pam_module = osl_getPAM();
-    if ( pam_module != NULL )
-    {
-#endif
-        pam_handle_t   *pam_handle = NULL;
-        struct pam_conv pam_conversation;
-        sal_PamData     pam_data;
-
-        int             return_value;
-
-        pam_data.name     = (char*) name;
-        pam_data.password = (char*) password;
-
-        pam_conversation.conv        = osl_PamConversation;
-        pam_conversation.appdata_ptr = (void*)(&pam_data);
-
-#ifndef PAM_LINK
-          return_value = pam_module->pam_start( "su", name,
-            &pam_conversation, &pam_handle);
-#else
-          return_value = pam_start( "su", name,
-            &pam_conversation, &pam_handle);
-#endif
-        if (return_value == PAM_SUCCESS )
-#ifndef PAM_LINK
-            return_value = pam_module->pam_authenticate(pam_handle, 0);
-#else
-            return_value = pam_authenticate(pam_handle, 0);
-#endif
-          if (return_value == PAM_SUCCESS )
-#ifndef PAM_LINK
-            return_value = pam_module->pam_acct_mgmt(pam_handle, 0);
-        pam_module->pam_end( pam_handle, return_value );
-#else
-            return_value = pam_acct_mgmt(pam_handle, 0);
-        pam_end( pam_handle, return_value );
-#endif
-
-        success = (sal_Bool)(return_value == PAM_SUCCESS);
-#ifndef PAM_LINK
-    }
-#endif
-
-      return success;
-}
-
-
-#ifndef CRYPT_LINK
-/* dummy crypt, matches the interface of
-   crypt() but does not encrypt at all */
-static const sal_Char* SAL_CALL
-osl_noCrypt ( const sal_Char *key, const sal_Char *salt )
-{
-    (void) salt; /* unused */
-    return key;
-}
-
-/* load-on-call crypt library and crypt symbol */
-static void*  SAL_CALL
-osl_getCrypt()
-{
-    static char* (*crypt_sym)(const char*, const char*) = NULL;
-    static sal_Bool load_once  = sal_False;
-
-    if ( !load_once )
-    {
-        void * crypt_library;
-
-        crypt_library = dlopen( "libcrypt.so.1", RTLD_GLOBAL | RTLD_LAZY ); /* never closed */
-        if ( crypt_library != NULL )
-            crypt_sym = (char* (*)(const char *, const char *)) dlsym(crypt_library, "crypt" );
-        if ( crypt_sym == NULL ) /* no libcrypt or libcrypt without crypt */
-            crypt_sym = (char* (*)(const char *, const char *)) &osl_noCrypt;
-
-        load_once = sal_True;
-    }
-
-    return (void*)crypt_sym;
-}
-
-/* replacement for crypt function for password encryption, uses either
-   strong encryption of dlopen'ed libcrypt.so.1 or dummy implementation
-   with no encryption. Objective target is to avoid linking against
-   libcrypt (not available on caldera open linux 2.2 #63822#) */
-static sal_Char* SAL_CALL
-osl_dynamicCrypt ( const sal_Char *key, const sal_Char *salt )
-{
-    char* (*dynamic_crypt)(char *, char *);
-
-    dynamic_crypt = (char * (*)(char *, char *)) osl_getCrypt();
-
-    return dynamic_crypt( (sal_Char*)key, (sal_Char*)salt );
-}
-#endif
-
-/*
- * compare an encrypted and an unencrypted password for equality
- * returns true if passwords are equal, false otherwise
- * Note: uses crypt() and a mutex instead of crypt_r() since crypt_r needs
- * more than 128KByte of external buffer for struct crypt_data
- */
-
-static sal_Bool SAL_CALL
-osl_equalPasswords ( const sal_Char *pEncryptedPassword, const sal_Char *pPlainPassword )
-{
-    static pthread_mutex_t crypt_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-    sal_Bool  success;
-    sal_Char  salt[3];
-    sal_Char *encrypted_plain;
-
-    salt[0] = pEncryptedPassword[0];
-    salt[1] = pEncryptedPassword[1];
-    salt[2] = '\0';
-
-    pthread_mutex_lock(&crypt_mutex);
-
-#ifndef CRYPT_LINK
-    encrypted_plain = (sal_Char *)osl_dynamicCrypt( pPlainPassword, salt );
-#else
-    encrypted_plain = (sal_Char *)crypt( pPlainPassword, salt );
-#endif
-    success = (sal_Bool) (strcmp(pEncryptedPassword, encrypted_plain) == 0);
-
-    pthread_mutex_unlock(&crypt_mutex);
-
-    return success;
-}
-
-#endif /* defined LINUX && !defined NOPAM */
 oslSecurityError SAL_CALL osl_loginUser(
     rtl_uString *ustrUserName,
     rtl_uString *ustrPassword,
@@ -460,7 +155,6 @@ oslSecurityError SAL_CALL osl_loginUser(
 
     if ( ustrUserName != 0 )
     {
-
         rtl_uString2String( &strUserName,
                             rtl_uString_getStr(ustrUserName),
                             rtl_uString_getLength(ustrUserName),
@@ -502,136 +196,11 @@ static oslSecurityError SAL_CALL
 osl_psz_loginUser(const sal_Char* pszUserName, const sal_Char* pszPasswd,
                oslSecurity* pSecurity)
 {
-#if defined NETBSD || defined SCO || defined AIX || defined FREEBSD || \
-    defined MACOSX
+    (void)pszUserName;
+    (void)pszPasswd;
+    (void)pSecurity;
 
     return osl_Security_E_None;
-
-#else
-
-    oslSecurityError nError = osl_Security_E_Unknown;
-    oslSecurityImpl * p = NULL;
-    if (pszUserName != NULL && pszPasswd != NULL && pSecurity != NULL) {
-        /* get nis or normal password, should succeed for any known user, but
-           perhaps the password is wrong (i.e. 'x') if shadow passwords are in
-           use or authentication must be done by PAM */
-        size_t n = 0;
-        int err = 0;
-        struct passwd * found = NULL;
-        for (;;) {
-            p = growSecurityImpl(p, &n);
-            if (p == NULL) {
-                break;
-            }
-            err = getpwnam_r(
-                pszUserName, &p->m_pPasswd, p->m_buffer, n, &found);
-            if (err != ERANGE) {
-                break;
-            }
-        }
-        if (p != NULL && err == 0) {
-            if (found == NULL) {
-                nError = osl_Security_E_UserUnknown;
-            } else {
-#if defined LINUX && !defined NOPAM
-                /* only root is able to read the /etc/shadow passwd, a normal
-                   user even can't read his own encrypted passwd */
-                if (osl_equalPasswords(p->m_pPasswd.pw_passwd, pszPasswd) ||
-                    osl_PamAuthentification(pszUserName, pszPasswd))
-                {
-                    nError = osl_Security_E_None;
-                } else {
-                    char buffer[1024];
-                    struct spwd result_buf;
-                    struct spwd * pShadowPasswd;
-                    buffer[0] = '\0';
-                    if (getspnam_r(
-                            pszUserName, &result_buf, buffer, sizeof buffer,
-                            &pShadowPasswd) == 0 &&
-                        pShadowPasswd != NULL)
-                    {
-                        nError =
-                            osl_equalPasswords(
-                                pShadowPasswd->sp_pwdp, pszPasswd)
-                            ? osl_Security_E_None
-                            : osl_Security_E_WrongPassword;
-                    } else if (getuid() == 0) {
-                        /* mfe: Try to verify the root-password via nis */
-                        if (getspnam_r(
-                                "root", &result_buf, buffer, sizeof buffer,
-                                &pShadowPasswd) == 0 &&
-                            pShadowPasswd != NULL &&
-                            osl_equalPasswords(
-                                pShadowPasswd->sp_pwdp, pszPasswd))
-                        {
-                            nError = osl_Security_E_None;
-                        } else {
-                            /* mfe: we can't get via nis (glibc2.0.x has bug in
-                               getspnam_r) we try it with the normal getspnam */
-                            static pthread_mutex_t pwmutex =
-                                PTHREAD_MUTEX_INITIALIZER;
-                            pthread_mutex_lock(&pwmutex);
-                            pShadowPasswd = getspnam("root");
-                            pthread_mutex_unlock(&pwmutex);
-                            nError =
-                                ((pShadowPasswd != NULL &&
-                                  osl_equalPasswords(
-                                      pShadowPasswd->sp_pwdp, pszPasswd)) ||
-                                 osl_PamAuthentification("root", pszPasswd))
-                                ? osl_Security_E_None
-                                : osl_Security_E_WrongPassword;
-                        }
-                    }
-                }
-#else
-                char buffer[1024];
-                struct spwd spwdStruct;
-                buffer[0] = '\0';
-#ifndef NEW_SHADOW_API
-                if (getspnam_r(pszUserName, &spwdStruct, buffer, sizeof buffer) != NULL)
-#else
-                if (getspnam_r(pszUserName, &spwdStruct, buffer, sizeof buffer, NULL) == 0)
-#endif
-                {
-                    char salt[3];
-                    char * cryptPasswd;
-                    strncpy(salt, spwdStruct.sp_pwdp, 2);
-                    salt[2] = '\0';
-                    cryptPasswd = (char *) crypt(pszPasswd, salt);
-                    if (strcmp(spwdStruct.sp_pwdp, cryptPasswd) == 0) {
-                        nError = osl_Security_E_None;
-                    } else if (getuid() == 0 &&
-#ifndef NEW_SHADOW_API
-                               (getspnam_r("root", &spwdStruct, buffer, sizeof buffer) != NULL))
-#else
-                               (getspnam_r("root", &spwdStruct, buffer, sizeof buffer, NULL) == 0))
-#endif
-                    {
-                        /* if current process is running as root, allow to logon
-                           as any other user */
-                        strncpy(salt, spwdStruct.sp_pwdp, 2);
-                        salt[2] = '\0';
-                        cryptPasswd = (char *) crypt(pszPasswd, salt);
-                        if (strcmp(spwdStruct.sp_pwdp, cryptPasswd) == 0) {
-                            nError = osl_Security_E_None;
-                        }
-                    } else {
-                        nError = osl_Security_E_WrongPassword;
-                    }
-                }
-#endif
-            }
-        }
-    }
-    if (nError == osl_Security_E_None) {
-        *pSecurity = p;
-    } else {
-        deleteSecurityImpl(p);
-        *pSecurity = NULL;
-    }
-    return nError;
-
-#endif
 }
 
 oslSecurityError SAL_CALL osl_loginUserOnFileServer(
@@ -796,18 +365,37 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire
 
 #ifndef MACOSX
 
+#define DOT_CONFIG "/.config"
+
 static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
 {
     sal_Char *pStr = getenv("XDG_CONFIG_HOME");
 
     if ((pStr == NULL) || (strlen(pStr) == 0) ||
         (access(pStr, 0) != 0))
-        return (osl_psz_getHomeDir(Security, pszDirectory, nMax));
+    {
+        // a default equal to $HOME/.config should be used.
+        if (!osl_psz_getHomeDir(Security, pszDirectory, nMax))
+            return sal_False;
+        size_t n = strlen(pszDirectory);
+        if (n + sizeof(DOT_CONFIG) < nMax)
+        {
+            strncpy(pszDirectory+n, DOT_CONFIG, sizeof(DOT_CONFIG));
+            if (access(pszDirectory, 0) != 0)
+            {
+                // resort to HOME
+                pszDirectory[n] = '\0';
+            }
+        }
+    }
+    else
+        strncpy(pszDirectory, pStr, nMax);
 
-    strncpy(pszDirectory, pStr, nMax);
     return sal_True;
 }
 
+#undef DOT_CONFIG
+
 #else
 
 /*
@@ -860,3 +448,5 @@ void SAL_CALL osl_unloadUserProfile(oslSecurity Security)
 {
     (void) Security; /* unused */
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/semaphor.c b/sal/osl/unx/semaphor.c
index c514b2dacff6..b34395eb44ce 100644
--- a/sal/osl/unx/semaphor.c
+++ b/sal/osl/unx/semaphor.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -312,3 +313,4 @@ sal_Bool SAL_CALL osl_releaseSemaphore(oslSemaphore Semaphore)
 
 #endif /* OSL_USE_SYS_V_SEMAPHORE */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c
index 5563375d9567..abb4eaaef7a9 100644
--- a/sal/osl/unx/signal.c
+++ b/sal/osl/unx/signal.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,6 +69,7 @@
 #include <osl/signal.h>
 #include <osl/process.h>
 #include <osl/thread.h>
+#include <sal/macros.h>
 #include <rtl/bootstrap.h>
 #include <rtl/digest.h>
 
@@ -134,7 +136,7 @@ plan to have the new handler use this signal*/
     { SIGWINCH,  ACT_IGNORE, NULL },    /* window size change */
     { SIGURG,    ACT_EXIT,   NULL },    /* urgent socket condition */
 #ifdef SIGPOLL
-    { SIGPOLL,   ACT_EXIT,   NULL },    /* pollable event occured */
+    { SIGPOLL,   ACT_EXIT,   NULL },    /* pollable event occurred */
 #endif
     { SIGSTOP,   ACT_SYSTEM, NULL },    /* stop (cannot be caught or ignored) */
     { SIGTSTP,   ACT_SYSTEM, NULL },    /* user stop requested from tty */
@@ -572,7 +574,7 @@ static int ReportCrash( int Signal )
 
                 void *stackframes[MAX_STACK_FRAMES];
                 int  iFrame;
-                int  nFrames = backtrace( stackframes, sizeof(stackframes)/sizeof(stackframes[0]));
+                int  nFrames = backtrace( stackframes, SAL_N_ELEMENTS(stackframes) );
 
                 FILE *xmlout = NULL, *stackout = NULL, *checksumout = NULL;
                 int fdxml, fdstk, fdchksum;
@@ -755,7 +757,7 @@ static int ReportCrash( int Signal )
                     rtl_uString_release(crashrep_url);
                     rtl_uString_release(crashrep_path);
 #if defined INCLUDE_BACKTRACE && (defined LINUX || defined MACOSX)
-                    snprintf( szShellCmd, sizeof(szShellCmd)/sizeof(szShellCmd[0]),
+                    snprintf( szShellCmd, SAL_N_ELEMENTS(szShellCmd),
                         "%s -p %d -s %d -xml %s -chksum %s -stack %s -noui%s",
                         rtl_string_getStr(crashrep_path_system),
                         getpid(),
@@ -765,7 +767,7 @@ static int ReportCrash( int Signal )
                         pStackTempName,
                         bAutoCrashReport ? " -send" : "" );
 #elif defined INCLUDE_BACKTRACE && defined SOLARIS
-                    snprintf( szShellCmd, sizeof(szShellCmd)/sizeof(szShellCmd[0]),
+                    snprintf( szShellCmd, SAL_N_ELEMENTS(szShellCmd),
                         "%s -p %d -s %d -xml %s -chksum %s -noui%s",
                         rtl_string_getStr(crashrep_path_system),
                         getpid(),
@@ -774,7 +776,7 @@ static int ReportCrash( int Signal )
                         pChecksumTempName,
                         bAutoCrashReport ? " -send" : "" );
 #else
-                    snprintf( szShellCmd, sizeof(szShellCmd)/sizeof(szShellCmd[0]),
+                    snprintf( szShellCmd, SAL_N_ELEMENTS(szShellCmd),
                         "%s -p %d -s %d -noui%s",
                         rtl_string_getStr(crashrep_path_system),
                         getpid(), Signal, bAutoCrashReport ? " -send" : "" );
@@ -818,22 +820,24 @@ static int ReportCrash( int Signal )
 
 static void PrintStack( int sig )
 {
-#if ! defined(MACOSX) || defined(INCLUDE_BACKTRACE)
+#ifdef INCLUDE_BACKTRACE
     void *buffer[MAX_STACK_FRAMES];
-    int size = backtrace( buffer, sizeof(buffer) / sizeof(buffer[0]) );
+    int size = backtrace( buffer, SAL_N_ELEMENTS(buffer) );
 #endif
 
     fprintf( stderr, "\n\nFatal exception: Signal %d\n", sig );
 
-#if defined(MACOSX) && ! defined(INCLUDE_BACKTRACE)
+#if defined( MACOSX ) && !defined( INCLUDE_BACKTRACE )
     fprintf( stderr, "Please turn on Enable Crash Reporting and\nAutomatic Display of Crashlogs in the Console application\n" );
 #else
+#ifdef INCLUDE_BACKTRACE
     if ( size > 0 )
     {
         fputs( "Stack:\n", stderr );
         backtrace_symbols_fd( buffer, size, fileno(stderr) );
     }
 #endif
+#endif
 }
 
 static oslSignalAction CallSignalHandler(oslSignalInfo *pInfo)
@@ -1091,3 +1095,5 @@ sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable )
 
     return bOld;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index 2f7b62a4bfa4..2db630122716 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,7 +46,8 @@
 #undef HAVE_POLL_H
 #endif
 
-#if defined(LINUX) || defined(NETBSD) || defined ( FREEBSD ) || defined (MACOSX)
+#if defined(LINUX) || defined(NETBSD) || defined ( FREEBSD ) || \
+    defined (MACOSX) || defined (OPENBSD) || defined(DRAGONFLY)
 #include <sys/poll.h>
 #define HAVE_POLL_H
 #endif /* HAVE_POLL_H */
@@ -465,19 +467,6 @@ static sal_uInt32 g_nSocketImpl = 0;
 static sal_uInt32 g_nSocketAddr = 0;
 
 /* sorry, must be implemented otherwise */
-#if 0
-struct LeakWarning
-{
-    ~LeakWarning()
-    {
-        if( g_nSocketImpl )
-            OSL_TRACE( "sal_socket: %d socket instances leak\n" , g_nSocketImpl );
-        if( g_nSocketAddr )
-            OSL_TRACE( "sal_socket: %d socket address instances leak\n" , g_nSocketAddr );
-    }
-};
-LeakWarning socketWarning;
-#endif
 
 #endif /* OSL_DEBUG_LEVEL */
 
@@ -605,16 +594,22 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr (
     oslSocketAddr Addr1,
     oslSocketAddr Addr2)
 {
-    OSL_ASSERT((0 != Addr1) && (0 != Addr2));
-    if ((0 != Addr1) || (0 != Addr2))
+    OSL_ASSERT(Addr1);
+    OSL_ASSERT(Addr2);
+    struct sockaddr* pAddr1= &(Addr1->m_sockaddr);
+    struct sockaddr* pAddr2= &(Addr2->m_sockaddr);
+
+    OSL_ASSERT(pAddr1);
+    OSL_ASSERT(pAddr2);
+    if (pAddr1 == pAddr2)
     {
-      struct sockaddr* pAddr1= &(Addr1->m_sockaddr);
-      struct sockaddr* pAddr2= &(Addr2->m_sockaddr);
+        return (sal_True);
+    }
 
-      if (pAddr1->sa_family == pAddr2->sa_family)
-      {
-          switch (pAddr1->sa_family)
-          {
+    if (pAddr1->sa_family == pAddr2->sa_family)
+    {
+        switch (pAddr1->sa_family)
+        {
             case AF_INET:
             {
                 struct sockaddr_in* pInetAddr1= (struct sockaddr_in*)pAddr1;
@@ -623,16 +618,16 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr (
                 if ((pInetAddr1->sin_family == pInetAddr2->sin_family) &&
                     (pInetAddr1->sin_addr.s_addr == pInetAddr2->sin_addr.s_addr) &&
                     (pInetAddr1->sin_port == pInetAddr2->sin_port))
-                  return (sal_True);
+                    return (sal_True);
             }
 
             default:
             {
                 return (memcmp(pAddr1, pAddr2, sizeof(struct sockaddr)) == 0);
             }
-          }
-      }
+        }
     }
+
     return (sal_False);
 }
 
@@ -796,12 +791,16 @@ static struct hostent* _osl_gethostbyname_r (
     const char *name, struct hostent *result,
     char *buffer, int buflen, int *h_errnop)
 {
-#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
+#if defined(LINUX) || defined(ANDROID) || (defined(FREEBSD) && (__FreeBSD_version >= 601103)) || defined(DRAGONFLY)
     struct hostent *__result; /* will be the same as result */
     int __error;
     __error = gethostbyname_r (name, result, buffer, buflen,
                  &__result, h_errnop);
     return __error ? NULL : __result ;
+#elif defined(AIX)
+    *h_errnop = gethostbyname_r (name, result, (struct hostent_data *)buffer);
+    (void)buflen;
+    return *h_errnop ? NULL : result ;
 #else
     return gethostbyname_r( name, result, buffer, buflen, h_errnop);
 #endif
@@ -867,9 +866,6 @@ static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
     static sal_Char    *pDomainName = NULL;
 
     sal_Char  *pFullQualifiedName;
-#if 0  /* OBSOLETE */
-    FILE      *pPipeToDomainnameExe;
-#endif /* OBSOLETE */
 
     /* get a '\0' terminated domainname */
 
@@ -886,7 +882,6 @@ static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
         }
     }
 
-#if 1  /* NEW */
     if (nLengthOfDomainName == 0)
     {
         sal_Char pDomainNameBuffer[ DOMAINNAME_LENGTH ];
@@ -900,74 +895,6 @@ static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
         }
     }
 
-#endif /* NEW */
-#if 0  /* OBSOLETE */
-#ifdef SCO
-
-    /* call 'domainname > /usr/tmp/some-tmp-file', since
-       popen read pclose do block or core-dump,
-       (even the pipe-stuff that comes with pthreads) */
-    if (nLengthOfDomainName == 0)
-    {
-        sal_Char  tmp_name[ L_tmpnam ];
-        FILE     *tmp_file;
-        sal_Char  domain_call [ L_tmpnam + 16 ] = "domainname > ";
-
-        tmp_name[0] = '\0';
-
-        tmpnam ( tmp_name );
-        strcat ( domain_call, tmp_name );
-        if (   (system ( domain_call ) == 0)
-            && ((tmp_file = fopen( tmp_name, "r" )) != NULL ) )
-        {
-            sal_Char  pDomainNameBuffer[ DOMAINNAME_LENGTH ];
-
-            pDomainNameBuffer[0] = '\0';
-
-            if ( fgets ( pDomainNameBuffer, DOMAINNAME_LENGTH, tmp_file ) )
-            {
-                pDomainName = strdup( pDomainNameBuffer );
-                nLengthOfDomainName = strlen( pDomainName );
-                if (   ( nLengthOfDomainName > 0 )
-                    && ( pDomainName[ nLengthOfDomainName - 1] == '\n' ) )
-                    pDomainName[ --nLengthOfDomainName ] = '\0';
-            }
-            fclose ( tmp_file );
-        }
-        unlink( tmp_name );
-    }
-
-#else /* !SCO */
-
-    /* read the domainname from pipe to the program domainname */
-    if (   (nLengthOfDomainName == 0)
-        && (pPipeToDomainnameExe = popen( "domainname", "r")) )
-    {
-        sal_Char  c;
-        sal_Char  pDomainNameBuffer[ DOMAINNAME_LENGTH ];
-        sal_Char *pDomainNamePointer;
-
-        pDomainNameBuffer[0] = '\0';
-
-        pDomainNamePointer = pDomainNameBuffer;
-        while (    ((c = getc( pPipeToDomainnameExe )) != EOF)
-                && (nLengthOfDomainName < (DOMAINNAME_LENGTH - 1)) )
-        {
-            if (! isspace(c))
-            {
-                 nLengthOfDomainName++ ;
-                   *pDomainNamePointer++ = (sal_Char)c;
-            }
-        }
-        *pDomainNamePointer = '\0';
-        pDomainName = strdup( pDomainNameBuffer );
-
-        pclose( pPipeToDomainnameExe );
-    }
-
-#endif /* !SCO */
-#endif /* OBSOLETE */
-
     /* compose hostname and domainname */
     nLengthOfHostName = strlen( pHostName );
     pFullQualifiedName = (sal_Char*) malloc( (nLengthOfHostName + 1
@@ -1038,12 +965,16 @@ static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
          * full qualified name to the unqualified host name */
         if ( !bHostsAreEqual )
         {
+            sal_Char *pTmp;
+
             OSL_TRACE("_osl_getFullQualifiedDomainName: "
                       "suspect FQDN: %s\n", pFullQualifiedName);
 
             pFullQualifiedName[ nLengthOfHostName ] = '\0';
-            pFullQualifiedName = (sal_Char*)realloc ( pFullQualifiedName,
+            pTmp = (sal_Char*)realloc ( pFullQualifiedName,
                                 (nLengthOfHostName + 1) * sizeof( sal_Char ));
+            if (pTmp)
+                pFullQualifiedName = pTmp;
         }
     }
 
@@ -1404,43 +1335,7 @@ oslSocketResult SAL_CALL osl_psz_getLocalHostname (
 
             if ((pStr = osl_psz_getHostnameOfHostAddr(Addr)) != NULL)
             {
-#if 0  /* OBSOLETE */
-                sal_Char* pChr;
-#endif /* OBSOLETE */
                 strcpy(LocalHostname, pStr);
-
-#if 0  /* OBSOLETE */
-                /* already done by _osl_getFullQualifiedDomainName() with
-                   much better heuristics, so this may be contraproductive */
-
-                /* no FQDN, last try append domain name */
-                if ((pChr = strchr(LocalHostname, '.')) == NULL)
-                {
-                    FILE *fp;
-
-                    pChr = &LocalHostname[strlen(LocalHostname)];
-
-                    if ( (fp = popen("domainname", "r")) != 0 )
-                    {
-                        int c;
-
-                        *pChr++ = '.';
-
-                        while ((c = getc(fp)) != EOF)
-                        {
-                            if (! isspace(c))
-                                *pChr++ = (sal_Char)c;
-                        }
-
-                        *pChr = '\0';
-
-                        fclose(fp);
-                    }
-                    else
-                        LocalHostname[0] = '\0';
-                }
-#endif /* OBSOLETE */
-
             }
             osl_destroyHostAddr(Addr);
         }
@@ -1699,71 +1594,6 @@ oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAd
     return osl_Socket_Error;
 }
 
-#if 0  /* OBSOLETE */
-/*****************************************************************************/
-/* osl_getIpxNetNumber  */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_getIpxNetNumber(oslSocketAddr Addr,
-                                    oslSocketIpxNetNumber NetNumber)
-
-{
-    struct sockaddr_ipx* pAddr;
-
-    pAddr= (struct sockaddr_ipx*)Addr;
-
-    OSL_ASSERT(pAddr);
-
-    if (pAddr && (pAddr->sa_family == FAMILY_TO_NATIVE(osl_Socket_FamilyIpx)))
-     {
-         memcpy(NetNumber, pAddr->sa_netnum, sizeof(NetNumber));
-
-          return osl_Socket_Ok;
-      }
-      else
-          return osl_Socket_Error;
-}
-
-
-/*****************************************************************************/
-/* osl_getIpxNodeNumber  */
-/*****************************************************************************/
-oslSocketResult SAL_CALL osl_getIpxNodeNumber(oslSocketAddr Addr,
-                                     oslSocketIpxNodeNumber NodeNumber)
-
-{
-      struct sockaddr_ipx* pAddr;
-
-      pAddr= (struct sockaddr_ipx*)Addr;
-
-      OSL_ASSERT(pAddr);
-
-      if (pAddr && (pAddr->sa_family == FAMILY_TO_NATIVE(osl_Socket_FamilyIpx)))
-      {
-          memcpy(NodeNumber, pAddr->sa_nodenum, sizeof(NodeNumber));
-
-          return osl_Socket_Ok;
-      }
-      else
-          return osl_Socket_Error;
-}
-
-
-/*****************************************************************************/
-/* osl_getIpxSocketNumber  */
-/*****************************************************************************/
-sal_Int32 SAL_CALL osl_getIpxSocketNumber(oslSocketAddr Addr)
-{
-    struct sockaddr_ipx* pAddr= (struct sockaddr_ipx*)Addr;
-    OSL_ASSERT(pAddr);
-
-     if (pAddr && (pAddr->sa_family == FAMILY_TO_NATIVE(osl_Socket_FamilyIpx)))
-          return pAddr->sa_socket;
-      else
-          return OSL_INVALID_IPX_SOCKET_NO;
-}
-
-#endif /* OBSOLETE */
-
 /*****************************************************************************/
 /* osl_createSocket  */
 /*****************************************************************************/
@@ -1831,7 +1661,7 @@ void SAL_CALL osl_releaseSocket( oslSocket pSocket )
 #if defined(LINUX)
     if ( pSocket->m_bIsAccepting == sal_True )
     {
-        OSL_ENSURE(0, "osl_destroySocket : attempt to destroy socket while accepting\n");
+        OSL_FAIL("osl_destroySocket : attempt to destroy socket while accepting\n");
         return;
     }
 #endif /* LINUX */
@@ -1875,12 +1705,10 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
         socklen_t nSockLen = sizeof(s.aSockAddr);
 
         nRet = getsockname(nFD, &s.aSockAddr, &nSockLen);
-#if OSL_DEBUG_LEVEL > 1
         if ( nRet < 0 )
         {
-            perror("getsockname");
+            OSL_TRACE("getsockname call failed with error: %s", strerror(errno));
         }
-#endif /* OSL_DEBUG_LEVEL */
 
         if ( s.aSockAddr.sa_family == AF_INET )
         {
@@ -1890,20 +1718,16 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
             }
 
             nConnFD = socket(AF_INET, SOCK_STREAM, 0);
-#if OSL_DEBUG_LEVEL > 1
             if ( nConnFD < 0 )
             {
-                perror("socket");
+                OSL_TRACE("socket call failed with error: %s", strerror(errno));
             }
-#endif /* OSL_DEBUG_LEVEL */
 
             nRet = connect(nConnFD, &s.aSockAddr, sizeof(s.aSockAddr));
-#if OSL_DEBUG_LEVEL > 1
             if ( nRet < 0 )
             {
-                perror("connect");
+                OSL_TRACE("connect call failed with error: %s", strerror(errno));
             }
-#endif /* OSL_DEBUG_LEVEL */
             close(nConnFD);
         }
         pSocket->m_bIsAccepting = sal_False;
@@ -2458,7 +2282,7 @@ sal_Int32 SAL_CALL osl_readSocket (
 
     OSL_ASSERT( pSocket);
 
-    /* loop until all desired bytes were read or an error occured */
+    /* loop until all desired bytes were read or an error occurred */
     while (BytesToRead > 0)
     {
         sal_Int32 RetVal;
@@ -2467,7 +2291,7 @@ sal_Int32 SAL_CALL osl_readSocket (
                                    BytesToRead,
                                    osl_Socket_MsgNormal);
 
-        /* error occured? */
+        /* error occurred? */
         if(RetVal <= 0)
         {
             break;
@@ -2487,7 +2311,7 @@ sal_Int32 SAL_CALL osl_readSocket (
 sal_Int32 SAL_CALL osl_writeSocket(
     oslSocket pSocket, const void *pBuffer, sal_Int32 n )
 {
-    /* loop until all desired bytes were send or an error occured */
+    /* loop until all desired bytes were send or an error occurred */
     sal_uInt32 BytesSend= 0;
     sal_uInt32 BytesToSend= n;
     sal_uInt8 *Ptr = ( sal_uInt8 * )pBuffer;
@@ -2500,7 +2324,7 @@ sal_Int32 SAL_CALL osl_writeSocket(
 
         RetVal= osl_sendSocket( pSocket,Ptr,BytesToSend,osl_Socket_MsgNormal);
 
-        /* error occured? */
+        /* error occurred? */
         if(RetVal <= 0)
         {
             break;
@@ -3065,3 +2889,4 @@ sal_Int32 SAL_CALL osl_demultiplexSocketEvents(oslSocketSet IncomingSet,
                   pTimeout ? &tv : 0);
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/sockimpl.h b/sal/osl/unx/sockimpl.h
index 86122e850875..0ffd9bd951b1 100644
--- a/sal/osl/unx/sockimpl.h
+++ b/sal/osl/unx/sockimpl.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,4 @@ void __osl_destroySocketImpl(oslSocket pImpl);
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 0ea3b819438c..e077291f99d8 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,260 +33,6 @@
 static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /* struct passwd differs on some platforms */
-#if defined NETBSD
-struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
-{
-      struct passwd* res;
-
-      pthread_mutex_lock(&getrtl_mutex);
-
-      if ( (res = getpwnam(name)) )
-      {
-        int nname, npasswd, nclass, ngecos, ndir;
-
-        nname= strlen(res->pw_name)+1;
-        npasswd= strlen(res->pw_passwd)+1;
-        nclass= strlen(res->pw_class)+1;
-        ngecos= strlen(res->pw_gecos)+1;
-        ndir= strlen(res->pw_dir)+1;
-
-        if (nname+npasswd+nclass+ngecos
-                +ndir+strlen(res->pw_shell) < size)
-        {
-            memcpy(s, res, sizeof(struct passwd));
-
-            strcpy(buffer, res->pw_name);
-              s->pw_name = buffer;
-            buffer += nname;
-
-            strcpy(buffer, res->pw_passwd);
-              s->pw_passwd = buffer;
-            buffer += npasswd;
-
-            strcpy(buffer, res->pw_class);
-              s->pw_class = buffer;
-            buffer += nclass;
-
-            strcpy(buffer, res->pw_gecos);
-              s->pw_gecos = buffer;
-            buffer += ngecos;
-
-            strcpy(buffer, res->pw_dir);
-              s->pw_dir = buffer;
-            buffer += ndir;
-
-            strcpy(buffer, res->pw_shell);
-              s->pw_shell = buffer;
-
-               res = s;
-        }
-        else
-            res = 0;
-    }
-
-    pthread_mutex_unlock(&getrtl_mutex);
-
-        return(res);
-}
-
-int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-           size_t buflen, struct passwd **result)
-{
-  struct passwd* res;
-  int retval = 0;
-
-  pthread_mutex_lock(&getrtl_mutex);
-
-  if ( (res = getpwuid(uid)) )
-  {
-    size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell;
-
-    pw_name = strlen(res->pw_name)+1;
-    pw_passwd = strlen(res->pw_passwd)+1;
-    pw_class = strlen(res->pw_class)+1;
-    pw_gecos = strlen(res->pw_gecos)+1;
-    pw_dir = strlen(res->pw_dir)+1;
-    pw_shell = strlen(res->pw_shell)+1;
-
-    if (pw_name+pw_passwd+pw_class+pw_gecos
-                                 +pw_dir+pw_shell < buflen)
-    {
-      memcpy(pwd, res, sizeof(struct passwd));
-
-      strncpy(buffer, res->pw_name, pw_name);
-      pwd->pw_name = buffer;
-      buffer += pw_name;
-
-      strncpy(buffer, res->pw_passwd, pw_passwd);
-      pwd->pw_passwd = buffer;
-      buffer += pw_passwd;
-
-      strncpy(buffer, res->pw_class, pw_class);
-      pwd->pw_class = buffer;
-      buffer += pw_class;
-
-      strncpy(buffer, res->pw_gecos, pw_gecos);
-      pwd->pw_gecos = buffer;
-      buffer += pw_gecos;
-
-      strncpy(buffer, res->pw_dir, pw_dir);
-      pwd->pw_dir = buffer;
-      buffer += pw_dir;
-
-      strncpy(buffer, res->pw_shell, pw_shell);
-      pwd->pw_shell = buffer;
-      buffer += pw_shell;
-
-      *result = pwd ;
-      retval = 0 ;
-
-    }
-    else
-        retval =  ENOMEM;
-  }
-  else
-      retval = errno ;
-
-  pthread_mutex_unlock(&getrtl_mutex);
-
-  return retval;
-}
-
-struct tm *localtime_r(const time_t *timep, struct tm *buffer)
-{
-    struct tm* res;
-
-      pthread_mutex_lock(&getrtl_mutex);
-
-    if ( (res = localtime(timep)))
-    {
-        memcpy(buffer, res, sizeof(struct tm));
-        res = buffer;
-    }
-
-    pthread_mutex_unlock(&getrtl_mutex);
-
-    return res;
-}
-
-struct tm *gmtime_r(const time_t *timep, struct tm *buffer)
-{
-    struct tm* res;
-
-      pthread_mutex_lock(&getrtl_mutex);
-
-    if ( (res = gmtime(timep)) )
-    {
-        memcpy(buffer, res, sizeof(struct tm));
-        res = buffer;
-    }
-
-    pthread_mutex_unlock(&getrtl_mutex);
-
-    return res;
-}
-#endif  /* defined NETBSD */
-
-#ifdef SCO
-#include <pwd.h>
-#include <shadow.h>
-#include <sys/types.h>
-
-struct spwd *getspnam_r(const char *name, struct spwd* s, char* buffer, int size )
-{
-      struct spwd* res;
-
-      pthread_mutex_lock(&getrtl_mutex);
-
-      if ( res = getspnam(name) )
-      {
-        int nnamp;
-
-        nnamp = strlen(res->sp_namp)+1;
-
-        if (nnamp+strlen(res->sp_pwdp) < size) {
-            memcpy(s, res, sizeof(struct spwd));
-
-            strcpy(buffer, res->sp_namp);
-              s->sp_namp = buffer;
-            buffer += nnamp;
-
-            strcpy(buffer, res->sp_pwdp);
-              s->sp_pwdp = buffer;
-
-               res = s;
-        }
-        else
-            res = 0;
-    }
-
-      pthread_mutex_unlock(&getrtl_mutex);
-
-      return res;
-}
-
-struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
-{
-      struct passwd* res;
-
-      pthread_mutex_lock(&getrtl_mutex);
-
-      if ( res = getpwnam(name) )
-      {
-        int nname, npasswd, nage;
-        int ncomment, ngecos, ndir;
-
-        nname= strlen(res->pw_name)+1;
-        npasswd= strlen(res->pw_passwd)+1;
-        nage= strlen(res->pw_age)+1;
-        ncomment= strlen(res->pw_comment)+1;
-        ngecos= strlen(res->pw_gecos)+1;
-        ndir= strlen(res->pw_dir)+1;
-
-        if (nname+npasswd+nage+ncomment+ngecos+ndir
-                +strlen(res->pw_shell) < size)
-        {
-            memcpy(s, res, sizeof(struct passwd));
-
-            strcpy(buffer, res->pw_name);
-              s->pw_name = buffer;
-            buffer += nname;
-
-            strcpy(buffer, res->pw_passwd);
-              s->pw_passwd = buffer;
-            buffer += npasswd;
-
-            strcpy(buffer, res->pw_age);
-              s->pw_age = buffer;
-            buffer += nage;
-
-            strcpy(buffer, res->pw_comment);
-              s->pw_comment = buffer;
-            buffer += ncomment;
-
-            strcpy(buffer, res->pw_gecos);
-              s->pw_gecos = buffer;
-            buffer += ngecos;
-
-            strcpy(buffer, res->pw_dir);
-              s->pw_dir = buffer;
-            buffer += ndir;
-
-            strcpy(buffer, res->pw_shell);
-              s->pw_shell = buffer;
-
-               res = s;
-        }
-        else
-            res = 0;
-    }
-
-    pthread_mutex_unlock(&getrtl_mutex);
-
-      return res;
-}
-#endif /* defined SCO */
-
 #if !defined(FREEBSD) || (__FreeBSD_version < 601103)
 
 extern int h_errno;
@@ -485,6 +232,7 @@ pid_t getpid(void)
 #ifdef NO_PTHREAD_SEMAPHORES
 int sem_init(sem_t* sem, int pshared, unsigned int value)
 {
+    (void)pshared;
     pthread_mutex_init(&sem->mutex, PTHREAD_MUTEXATTR_DEFAULT);
     pthread_cond_init(&sem->increased, PTHREAD_CONDATTR_DEFAULT);
 
@@ -597,3 +345,5 @@ char *fcvt(double value, int ndigit, int *decpt, int *sign)
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 1cb0979490c0..a9aaeb60e740 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,9 +111,13 @@
 #   include <dlfcn.h>
 #   include <endian.h>
 #   if __BYTE_ORDER == __LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
+#       ifndef _LITTLE_ENDIAN
+#           define _LITTLE_ENDIAN
+#       endif
 #   elif __BYTE_ORDER == __BIG_ENDIAN
-#       define _BIG_ENDIAN
+#       ifndef _BIG_ENDIAN
+#           define _BIG_ENDIAN
+#       endif
 #   elif __BYTE_ORDER == __PDP_ENDIAN
 #       define _PDP_ENDIAN
 #   endif
@@ -130,8 +135,28 @@
 
 #endif
 
+#ifdef ANDROID
+#   include <pthread.h>
+#   include <sys/file.h>
+#   include <sys/ioctl.h>
+#   include <sys/uio.h>
+#   include <sys/un.h>
+#   include <netinet/tcp.h>
+#   include <dlfcn.h>
+#   include <endian.h>
+#   include <sys/time.h>
+#   include <semaphore.h>
+#   define  IORESOURCE_TRANSFER_BSD
+#   define  IOCHANNEL_TRANSFER_BSD_RENO
+#   define  pthread_testcancel()
+#   define  NO_PTHREAD_PRIORITY
+#endif
+
 #ifdef NETBSD
-#   define  ETIME ETIMEDOUT
+#   include <sys/param.h>
+#       ifndef ETIME
+#     define  ETIME ETIMEDOUT
+#       endif
 #   define _POSIX_THREAD_SYSCALL_SOFT 1
 #   include <pthread.h>
 #   include <netdb.h>
@@ -192,84 +217,74 @@
 #   define  NO_PTHREAD_RTL
 #endif
 
-#ifdef SCO
-#   define AF_IPX -1
-#   include <strings.h>
+#ifdef OPENBSD
+#   define  ETIME ETIMEDOUT
+#   define _POSIX_THREAD_SYSCALL_SOFT 1
 #   include <pthread.h>
-#   include <shadow.h>
-#   include <netdb.h>
-#   include <sys/un.h>
-#   include <sys/netinet/tcp.h>
-#   include <sys/types.h>
-#   include <sys/byteorder.h>
+#   include <sys/sem.h>
+#   include <semaphore.h>
 #   include <dlfcn.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#   define  sched_yield()               pthread_yield()
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_RTL
-#   define  NO_PTHREAD_PRIORITY
-extern int pthread_cancel(pthread_t);
-extern unsigned int nanosleep(unsigned int);
-#   define  SLEEP_TIMESPEC(timespec)    (timespec .tv_sec > 0) ? sleep(timespec .tv_sec), nanosleep(timespec .tv_nsec) : nanosleep(timespec .tv_nsec)
-#   define  PATH_MAX                    _POSIX_PATH_MAX
-#   define  S_ISSOCK                    S_ISFIFO
-#   define  PTHREAD_SIGACTION           pthread_sigaction
-#   define  STAT_PARENT                 stat
+#   include <sys/filio.h>
+#   include <sys/ioctl.h>
+#   include <sys/param.h>
+#   include <sys/time.h>
+#   include <sys/uio.h>
+#   include <sys/exec.h>
+#       include <sys/un.h>
+#   include <netinet/tcp.h>
+#       define  IORESOURCE_TRANSFER_BSD
+#   include <machine/endian.h>
+#      define  PTR_SIZE_T(s)   ((size_t *)&(s))
+#       define  IORESOURCE_TRANSFER_BSD
+#       define  IOCHANNEL_TRANSFER_BSD_RENO
+#       define  pthread_testcancel()
+#       define  NO_PTHREAD_PRIORITY
+#       define  NO_PTHREAD_RTL
+#       define  PTHREAD_SIGACTION                       pthread_sigaction
+#endif
+
+#ifdef DRAGONFLY
+#   define  ETIME ETIMEDOUT
+#   include <pthread.h>
+#   include <sys/sem.h>
+#   include <semaphore.h>
+#   include <dlfcn.h>
+#   include <sys/filio.h>
+#   include <sys/ioctl.h>
+#   include <sys/param.h>
+#   include <sys/time.h>
+#   include <sys/uio.h>
+#   include <sys/exec.h>
+#   include <sys/un.h>
+#   include <netinet/tcp.h>
+#   include <machine/endian.h>
+#   define  IORESOURCE_TRANSFER_BSD
+#   define  IOCHANNEL_TRANSFER_BSD_RENO
 #endif
 
 #ifdef AIX
 #   define AF_IPX -1
 #   include <strings.h>
 #   include <pthread.h>
+#   include <dlfcn.h>
 #   include <sys/time.h>
 #   include <sys/un.h>
 #   include <netinet/tcp.h>
 #   include <sys/machine.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
+#       ifndef _LITTLE_ENDIAN
+#           define _LITTLE_ENDIAN
+#       endif
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
+#       ifndef _BIG_ENDIAN
+#           define _BIG_ENDIAN
+#       endif
 #   elif BYTE_ORDER == PDP_ENDIAN
 #       define _PDP_ENDIAN
 #   endif
-#   define  sched_yield()               pthread_yield()
 #   define  SLEEP_TIMESPEC(timespec)    nsleep(&timespec, 0)
 #   define  LIBPATH "LIBPATH"
 #   define  NO_PTHREAD_SEMAPHORES
-#   define  NO_DL_FUNCTIONS
-#endif
-
-#ifdef HPUX
-#   define  AF_IPX -1
-#   undef   howmany
-#   undef   MAXINT
-#   include <pthread.h>
-#   include <sys/un.h>
-#   include <sys/sched.h>
-#   include <sys/xti.h>
-#   include <sys/pstat.h>
-#   include <shadow.h>
-#   include <crypt.h>
-#   include <machine/param.h>
-#   define  LIBPATH "SHLIB_PATH"
-#   define  PTR_FD_SET(s)               ((int *)&(s))
-#   define  PTHREAD_VALUE(t)            ((t).field2)
-#   define  PTHREAD_NONE_INIT           { 0, -1 }
-#   define  PTHREAD_ATTR_DEFAULT        pthread_attr_default
-#   define  PTHREAD_MUTEXATTR_DEFAULT   pthread_mutexattr_default
-#   define  PTHREAD_CONDATTR_DEFAULT    pthread_condattr_default
-#   define  pthread_detach(t)           pthread_detach(&(t))
-#   define  NO_PTHREAD_PRIORITY
-#   define  NO_PTHREAD_SEMAPHORES
-#   define  NO_DL_FUNCTIONS
-#   undef   sigaction
-#   define  PTHREAD_SIGACTION           cma_sigaction
 #endif
 
 #ifdef SOLARIS
@@ -335,10 +350,42 @@ int macxp_resolveAlias(char *path, int buflen);
 #endif
 #endif
 
-#if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)  && \
-    !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO)  && \
-    !defined(AIX)     && !defined(HPUX)   && \
-    !defined(SOLARIS) && !defined(MACOSX)
+#ifdef IOS
+#   ifndef ETIME
+#       define  ETIME ETIMEDOUT
+#   endif
+#   include <pthread.h>
+#   include <sys/file.h>
+#   include <sys/ioctl.h>
+#   include <sys/uio.h>
+#   include <sys/un.h>
+#   include <netinet/tcp.h>
+#   include <machine/endian.h>
+#   include <sys/time.h>
+#   include <sys/semaphore.h>
+#   if BYTE_ORDER == LITTLE_ENDIAN
+#       ifndef _LITTLE_ENDIAN
+#       define _LITTLE_ENDIAN
+#       endif
+#   elif BYTE_ORDER == BIG_ENDIAN
+#       ifndef _BIG_ENDIAN
+#       define _BIG_ENDIAN
+#       endif
+#   elif BYTE_ORDER == PDP_ENDIAN
+#       ifndef _PDP_ENDIAN
+#       define _PDP_ENDIAN
+#       endif
+#   endif
+#   define  IOCHANNEL_TRANSFER_BSD_RENO
+#   define  NO_PTHREAD_RTL
+#endif
+
+#if !defined(_WIN32)  && \
+    !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && \
+    !defined(AIX)     && \
+    !defined(SOLARIS) && !defined(MACOSX) && \
+    !defined(OPENBSD) && !defined(DRAGONFLY) && \
+    !defined(IOS) && !defined(ANDROID)
 #   error "Target platform not specified!"
 #endif
 
@@ -478,7 +525,9 @@ extern int sem_post(sem_t* sem);
 
 #ifdef NO_PTHREAD_RTL
 #if !defined FREEBSD || (__FreeBSD_version < 500112)
+#if !defined NETBSD
 struct passwd *getpwent_r(struct passwd *pwd, char *buffer,  int buflen);
+#endif
 extern struct spwd *getspnam_r(const char *name, struct spwd *result,
                                char *buffer, int buflen);
 
@@ -493,3 +542,4 @@ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
 
 #endif /* __OSL_SYSTEM_H__ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/tempfile.c b/sal/osl/unx/tempfile.c
index e10fffaa5ce2..4e5abae826a2 100644
--- a/sal/osl/unx/tempfile.c
+++ b/sal/osl/unx/tempfile.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,6 +31,9 @@
 /*****************************************************************/
 
 #include <stdio.h>
+#if defined(NETBSD)
+#include <paths.h>
+#endif
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -39,6 +43,7 @@
 #include <osl/thread.h>
 #include <rtl/ustrbuf.h>
 #include <osl/diagnose.h>
+#include <sal/macros.h>
 
 #ifndef _FILE_URL_H_
 #include "file_url.h"
@@ -63,13 +68,18 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )
     const char *pValue = getenv( "TEMP" );
 
     if ( !pValue )
-    {
         pValue = getenv( "TMP" );
-#if defined(SOLARIS) || defined (LINUX) || defined (FREEBSD)
-        if ( !pValue )
-            pValue = P_tmpdir;
+
+#if defined(NETBSD)
+    if ( !pValue )
+        pValue = _PATH_TMP;
+#else
+    if ( !pValue )
+        pValue = P_tmpdir;
 #endif
-    }
+
+    if ( !pValue )
+        pValue = "/tmp";
 #endif /* MACOSX */
 
     if ( pValue )
@@ -98,7 +108,7 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )
  ******************************************************************/
 
 static const char LETTERS[]        = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
-static const int  COUNT_OF_LETTERS = sizeof(LETTERS)/sizeof(LETTERS[0]) - 1;
+static const int  COUNT_OF_LETTERS = SAL_N_ELEMENTS(LETTERS) - 1;
 
 #define RAND_NAME_LENGTH 6
 
@@ -368,3 +378,5 @@ oslFileError SAL_CALL osl_createTempFile(
 
     return osl_error;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c
index 18c4b033daf7..0ea6057ec509 100644
--- a/sal/osl/unx/thread.c
+++ b/sal/osl/unx/thread.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,15 +28,20 @@
 
 #include "system.h"
 #include <string.h>
+#if defined(OPENBSD)
+#include <sched.h>
+#endif
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <osl/nlsupport.h>
-#ifndef _RTL_TEXTENC_H_
 #include <rtl/textenc.h>
-#endif
+#include <sal/macros.h>
 
 #if defined LINUX
 #include <sys/prctl.h>
+#ifndef PR_SET_NAME
+#define PR_SET_NAME 15
+#endif
 #endif
 
 /****************************************************************************
@@ -284,6 +290,9 @@ static oslThread osl_thread_create_Impl (
     short             nFlags)
 {
     Thread_Impl* pImpl;
+#if defined(OPENBSD)
+    pthread_attr_t attr;
+#endif
     int nRet=0;
 
     pImpl = osl_thread_construct_Impl();
@@ -296,9 +305,23 @@ static oslThread osl_thread_create_Impl (
 
     pthread_mutex_lock (&(pImpl->m_Lock));
 
+#if defined(OPENBSD)
+    if (pthread_attr_init(&attr) != 0)
+        return (0);
+
+    if (pthread_attr_setstacksize(&attr, 262144) != 0) {
+        pthread_attr_destroy(&attr);
+        return (0);
+    }
+#endif
+
     if ((nRet = pthread_create (
         &(pImpl->m_hThread),
+#if defined(OPENBSD)
+        &attr,
+#else
         PTHREAD_ATTR_DEFAULT,
+#endif
         osl_thread_start_Impl,
         (void*)(pImpl))) != 0)
     {
@@ -311,6 +334,10 @@ static oslThread osl_thread_create_Impl (
         return (0);
     }
 
+#if defined(OPENBSD)
+    pthread_attr_destroy(&attr);
+#endif
+
     /* wait for change from STARTUP to ACTIVE state */
     while (pImpl->m_Flags & THREADIMPL_FLAGS_STARTUP)
     {
@@ -596,7 +623,7 @@ typedef struct _HashEntry
 } HashEntry;
 
 static HashEntry* HashTable[31];
-static int HashSize = sizeof(HashTable) / sizeof(HashTable[0]);
+static int HashSize = SAL_N_ELEMENTS(HashTable);
 
 static pthread_mutex_t HashLock = PTHREAD_MUTEX_INITIALIZER;
 
@@ -1049,3 +1076,5 @@ rtl_TextEncoding osl_setThreadTextEncoding(rtl_TextEncoding Encoding)
 
     return oldThreadEncoding;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index c1a98a6b87a9..31530be2195f 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,8 @@
 #include <osl/time.h>
 
 /* FIXME: detection should be done in configure script */
-#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || defined(LINUX)
+#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || \
+    defined(LINUX) || defined(OPENBSD) || defined(DRAGONFLY)
 #define STRUCT_TM_HAS_GMTOFF 1
 
 #elif defined(SOLARIS)
@@ -267,3 +269,5 @@ sal_uInt32 SAL_CALL osl_getGlobalTimer()
 
   return ( nSeconds * 1000 ) + (long) (( currentTime.tv_usec - startTime.tv_usec) / 1000 );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c
index 4a3f748c85bf..923b14bea32c 100644
--- a/sal/osl/unx/util.c
+++ b/sal/osl/unx/util.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,7 @@
 #endif
 
 #include "osl/util.h"
-
+#include "osl/diagnose.h"
 
 
 /*****************************************************************************/
@@ -56,6 +57,10 @@ static int   osl_checkAddr(const char* addr);
 
 sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr )
 {
+#ifdef SOLARIS
+    /** algorithm doesn't work on solaris */
+    return sal_False;
+#else
     char buff[1024];
     char hard_addr[64];
     struct ifconf ifc;
@@ -63,11 +68,6 @@ sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr )
     int i;
     int so;
 
-#ifdef SOLARIS
-    /** algorithm doesn't work on solaris */
-    return sal_False;
-#else
-
     if ( pAddr == 0 )
     {
         return sal_False;
@@ -91,7 +91,7 @@ sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr )
     ifc.ifc_buf = buff;
     if ( ioctl(so, SIOCGIFCONF, &ifc) < 0 )
     {
-/*      fprintf(stderr, "SIOCGIFCONF: %s\n", strerror(errno));*/
+        OSL_TRACE( "SIOCGIFCONF: %s\n", strerror(errno) );
         close(so);
         return sal_False;
     }
@@ -140,7 +140,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
 
     if ( ret < 0 )
     {
-/*      fprintf(stderr, "SIOCGIFFLAGS: %s\n", strerror(errno)); */
+        OSL_TRACE( "SIOCGIFFLAGS: %s\n", strerror(errno) );
         close(so);
         return ret;
     }
@@ -152,7 +152,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
 
     if (ifr.ifr_flags & IFF_LOOPBACK)
     {
-/*      fprintf(stderr, "SIOCGIFFLAGS : is LOOPBACK : %s\n", strerror(errno));*/
+        OSL_TRACE( "SIOCGIFFLAGS : is LOOPBACK : %s\n", strerror(errno) );
         close(so);
         return 0;
     }
@@ -169,7 +169,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
 #endif
 
     if (ret < 0) {
-/*      fprintf(stderr, "SIOCGIFADDR: %s\n", strerror(errno));*/
+        OSL_TRACE( "SIOCGIFADDR: %s\n", strerror(errno) );
         memset(hard_addr, 0, 32);
         close(so);
         return ret;
@@ -192,13 +192,10 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
     ret=osl_checkAddr(hard_addr);
 
     if (ret < 0) {
-/*      fprintf(stderr, "SIOCGIFADDR got '00:00:00:00:00:00'\n"); */
+        OSL_TRACE( "SIOCGIFADDR got '00:00:00:00:00:00'\n" );
         return ret;
     }
 
-/*  fprintf(stderr,"interface : %s -- ",ifname);*/
-/*  fprintf(stderr,"HWaddr : %s\n", print_ether(hard_addr));*/
-
     return 1;
 }
 
@@ -348,3 +345,5 @@ void osl_interlockedCountCheckForSingleCPU(void)
 }
 #endif /* defined(_SC_NPROCESSORS_CONF) */
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 299ea4198fdc..a8fe90603c8f 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -128,3 +129,5 @@
     return mkdir(OUStringToOString(path).getStr(), mode);
  }
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/uunxapi.h b/sal/osl/unx/uunxapi.h
index 9eddc5fe4753..9ac7ddd7ebb5 100644
--- a/sal/osl/unx/uunxapi.h
+++ b/sal/osl/unx/uunxapi.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@
 
  #endif /* _OSL_UUNXAPI_H_ */
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/uunxapi.hxx b/sal/osl/unx/uunxapi.hxx
index 7f1a9072e8cc..44ad6a0df4b1 100644
--- a/sal/osl/unx/uunxapi.hxx
+++ b/sal/osl/unx/uunxapi.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,3 +97,5 @@
 
  #endif /* _OSL_UUNXAPI_HXX_ */
 
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/conditn.c b/sal/osl/w32/conditn.c
index 1a382af89fcf..745c3317fbb2 100644
--- a/sal/osl/w32/conditn.c
+++ b/sal/osl/w32/conditn.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -139,3 +140,4 @@ sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition)
     return (sal_Bool)(WaitForSingleObject((HANDLE)Condition, 0) == WAIT_OBJECT_0);
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/diagnose.c b/sal/osl/w32/diagnose.c
index 1feab6ded8da..30356ee9af8c 100755
--- a/sal/osl/w32/diagnose.c
+++ b/sal/osl/w32/diagnose.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,7 +89,6 @@ sal_Bool SAL_CALL osl_assertFailedLine(const sal_Char* pszFileName, sal_Int32 nL
 #else
     HWND hWndParent;
     UINT nFlags;
-    int  nCode;
 
     /* get app name or NULL if unknown (don't call assert) */
     LPCSTR lpszAppName = "Error";
@@ -111,6 +111,7 @@ sal_Bool SAL_CALL osl_assertFailedLine(const sal_Char* pszFileName, sal_Int32 nL
         if ( !getenv( "DISABLE_SAL_DBGBOX" ) )
         {
             TCHAR   szBoxMessage[1024];
+            int     nCode;
 
             /* active popup window for the current thread */
             hWndParent = GetActiveWindow();
@@ -156,8 +157,6 @@ sal_Int32 SAL_CALL osl_reportError(sal_uInt32 nType, const sal_Char* pszMessage)
     if (hWndParent != NULL)
         hWndParent = GetLastActivePopup(hWndParent);
 
-    nType = nType; /* avoid warnings */
-
     /* set message box flags */
     nFlags = MB_TASKMODAL | MB_ICONERROR | MB_YESNOCANCEL | MB_DEFBUTTON2 | MB_SETFOREGROUND;
     if (hWndParent == NULL)
@@ -165,7 +164,8 @@ sal_Int32 SAL_CALL osl_reportError(sal_uInt32 nType, const sal_Char* pszMessage)
 
     // display the assert
     nDisposition = MessageBox(hWndParent, pszMessage, "Exception!", nFlags);
-
+    (void)nType; //unused, but part of public API/ABI
     return nDisposition;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index b6a21d6c2724..4d894260446a 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,17 +90,9 @@ extern BOOL (WINAPI *_pRawDllMain)(HANDLE, DWORD, LPVOID) = _RawDllMain;
 #endif
 
 //------------------------------------------------------------------------------
-// globales
-//------------------------------------------------------------------------------
-
-DWORD         g_dwPlatformId = VER_PLATFORM_WIN32_WINDOWS; // remember plattform
-
-//------------------------------------------------------------------------------
 // DllMain
 //------------------------------------------------------------------------------
-#ifdef _M_IX86
 int osl_isSingleCPU = 0;
-#endif
 
 #ifdef __MINGW32__
 
@@ -176,9 +169,7 @@ static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvR
         case DLL_PROCESS_ATTACH:
             {
 #endif
-                OSVERSIONINFO aInfo;
 
-#ifdef _M_IX86
                 SYSTEM_INFO SystemInfo;
 
                 GetSystemInfo(&SystemInfo);
@@ -192,9 +183,11 @@ static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvR
                 if ( SystemInfo.dwNumberOfProcessors == 1 ) {
                     osl_isSingleCPU = 1;
                 }
-#endif
+
+#if OSL_DEBUG_LEVEL < 2
                 /* Suppress file error messages from system like "Floppy A: not inserted" */
                 SetErrorMode( SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS );
+#endif
 
                 /* initialize global mutex */
                 g_Mutex = osl_createMutex();
@@ -202,13 +195,6 @@ static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvR
                 /* initialize "current directory" mutex */
                 g_CurrentDirectoryMutex = osl_createMutex();
 
-
-                /* initialize Win9x unicode functions */
-                aInfo.dwOSVersionInfoSize = sizeof( OSVERSIONINFO );
-
-                if ( GetVersionEx(&aInfo) )
-                    g_dwPlatformId = aInfo.dwPlatformId;
-
                 g_dwTLSTextEncodingIndex = TlsAlloc();
                 InitializeCriticalSection( &g_ThreadKeyListCS );
 
@@ -368,3 +354,5 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
 
     return TRUE;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 7728189387cd..b4648a72d2ae 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -424,7 +425,7 @@ oslFileError FileHandle_Impl::readFileAt (
                 return osl_File_E_None;
             }
 
-            SIZE_T const bytes = std::min(m_buflen - bufpos, nBytesRequested);
+            SIZE_T const bytes = std::min(m_buflen - bufpos, (SIZE_T) nBytesRequested);
             memcpy (&(buffer[*pBytesRead]), &(m_buffer[bufpos]), bytes);
             nBytesRequested -= bytes, *pBytesRead += bytes, nOffset += bytes;
         }
@@ -494,7 +495,7 @@ oslFileError FileHandle_Impl::writeFileAt (
                 m_bufptr = bufptr, m_buflen = sal::static_int_cast< SIZE_T >(uDone);
             }
 
-            SIZE_T const bytes = std::min(m_bufsiz - bufpos, nBytesToWrite);
+            SIZE_T const bytes = std::min(m_bufsiz - bufpos, (SIZE_T) nBytesToWrite);
             memcpy (&(m_buffer[bufpos]), &(buffer[*pBytesWritten]), bytes);
             nBytesToWrite -= bytes, *pBytesWritten += bytes, nOffset += bytes;
 
@@ -826,13 +827,6 @@ SAL_CALL osl_mapFile(
         return osl_File_E_OVERFLOW;
     SIZE_T const nLength = sal::static_int_cast< SIZE_T >(uLength);
 
-    OSVERSIONINFO osinfo;
-    osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    (void)::GetVersionEx(&osinfo);
-
-    if (VER_PLATFORM_WIN32_NT != osinfo.dwPlatformId)
-        return osl_File_E_NOSYS; // Unsupported
-
     FileMapping aMap( ::CreateFileMapping (pImpl->m_hFile, NULL, SEC_COMMIT | PAGE_READONLY, 0, 0, NULL) );
     if (!IsValidHandle(aMap.m_handle))
         return oslTranslateFileError( GetLastError() );
@@ -1192,3 +1186,5 @@ oslFileError SAL_CALL osl_moveFile( rtl_uString* strPath, rtl_uString *strDestPa
 
     return error;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 549f42861f94..b6dc0028879e 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,12 +28,13 @@
 
 #define UNICODE
 #define _UNICODE
-#define _WIN32_WINNT_0x0500
+#define _WIN32_WINNT 0x0500
 #include "systools/win32/uwinapi.h"
 
 #include "osl/file.h"
 
 #include "file_url.h"
+#include <sal/macros.h>
 #include "file_error.h"
 
 #include "path_helper.hxx"
@@ -48,8 +50,6 @@
 #endif
 
 //#####################################################
-#define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0])))
-
 static const wchar_t UNC_PREFIX[] = L"\\\\";
 static const wchar_t BACKSLASH = '\\';
 static const wchar_t SLASH = '/';
@@ -145,7 +145,7 @@ namespace /* private */
 
     //#####################################################
     inline bool is_UNC_path(const sal_Unicode* path)
-    { return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast<LPCWSTR>(path), ELEMENTS_OF_ARRAY(UNC_PREFIX) - 1)); }
+    { return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast<LPCWSTR>(path), SAL_N_ELEMENTS(UNC_PREFIX) - 1)); }
 
     //#####################################################
     inline bool is_UNC_path(const rtl::OUString& path)
@@ -844,7 +844,7 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString *strDirectoryPath, oslDirect
 
 //#####################################################
 static oslFileError SAL_CALL osl_getNextNetResource(
-    oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint )
+    oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/ )
 {
     Directory_Impl      *pDirImpl = (Directory_Impl *)Directory;
     DirectoryItem_Impl  *pItemImpl = NULL;
@@ -852,8 +852,6 @@ static oslFileError SAL_CALL osl_getNextNetResource(
     LPNETRESOURCEW      lpNetResource = (LPNETRESOURCEW)buffer;
     DWORD               dwError, dwCount, dwBufSize;
 
-    uHint = uHint; /* to get no warning */
-
     if ( !pItem )
         return osl_File_E_INVAL;
     *pItem = NULL;
@@ -892,14 +890,12 @@ static oslFileError SAL_CALL osl_getNextNetResource(
 
 //#####################################################
 static oslFileError SAL_CALL osl_getNextDrive(
-    oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint )
+    oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/ )
 {
     Directory_Impl      *pDirImpl = (Directory_Impl *)Directory;
     DirectoryItem_Impl  *pItemImpl = NULL;
     BOOL                fSuccess;
 
-    uHint = uHint; /* avoid warnings */
-
     if ( !pItem )
         return osl_File_E_INVAL;
     *pItem = NULL;
@@ -936,14 +932,12 @@ static oslFileError SAL_CALL osl_getNextDrive(
 
 //#####################################################
 static oslFileError SAL_CALL osl_getNextFileItem(
-    oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint)
+    oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/)
 {
     Directory_Impl      *pDirImpl = (Directory_Impl *)Directory;
     DirectoryItem_Impl  *pItemImpl = NULL;
     BOOL                fFound;
 
-    uHint = uHint; /* avoid warnings */
-
     if ( !pItem )
         return osl_File_E_INVAL;
     *pItem = NULL;
@@ -1036,7 +1030,7 @@ oslFileError SAL_CALL osl_closeDirectory(oslDirectory Directory)
             }
             break;
         default:
-            OSL_ENSURE( 0, "Invalid directory type" );
+            OSL_FAIL( "Invalid directory type" );
             break;
         }
 
@@ -1249,16 +1243,16 @@ bool is_floppy_volume_mount_point(const rtl::OUString& path)
     osl::systemPathEnsureSeparator(p);
 
     TCHAR vn[51];
-    if (GetVolumeNameForVolumeMountPoint(reinterpret_cast<LPCTSTR>(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn)))
+    if (GetVolumeNameForVolumeMountPoint(reinterpret_cast<LPCTSTR>(p.getStr()), vn, SAL_N_ELEMENTS(vn)))
     {
         TCHAR vnfloppy[51];
         if (is_floppy_A_present() &&
-            GetVolumeNameForVolumeMountPoint(FLOPPY_A, vnfloppy, ELEMENTS_OF_ARRAY(vnfloppy)) &&
+            GetVolumeNameForVolumeMountPoint(FLOPPY_A, vnfloppy, SAL_N_ELEMENTS(vnfloppy)) &&
             (0 == wcscmp(vn, vnfloppy)))
             return true;
 
         if (is_floppy_B_present() &&
-            GetVolumeNameForVolumeMountPoint(FLOPPY_B, vnfloppy, ELEMENTS_OF_ARRAY(vnfloppy)) &&
+            GetVolumeNameForVolumeMountPoint(FLOPPY_B, vnfloppy, SAL_N_ELEMENTS(vnfloppy)) &&
             (0 == wcscmp(vn, vnfloppy)))
             return true;
     }
@@ -1321,7 +1315,7 @@ static UINT get_volume_mount_point_drive_type(const rtl::OUString& path)
     osl::systemPathEnsureSeparator(p);
 
     TCHAR vn[51];
-    if (GetVolumeNameForVolumeMountPoint(reinterpret_cast<LPCTSTR>(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn)))
+    if (GetVolumeNameForVolumeMountPoint(reinterpret_cast<LPCTSTR>(p.getStr()), vn, SAL_N_ELEMENTS(vn)))
         return GetDriveType(vn);
 
     return DRIVE_NO_ROOT_DIR;
@@ -1572,7 +1566,7 @@ static oslFileError SAL_CALL osl_getDriveInfo(
             case DRIVE_REMOTE:
             {
                 TCHAR szBuffer[1024];
-                DWORD const dwBufsizeConst = ELEMENTS_OF_ARRAY(szBuffer);
+                DWORD const dwBufsizeConst = SAL_N_ELEMENTS(szBuffer);
                 DWORD dwBufsize = dwBufsizeConst;
 
                 DWORD dwResult = WNetGetConnection( cDrive, szBuffer, &dwBufsize );
@@ -1591,7 +1585,7 @@ static oslFileError SAL_CALL osl_getDriveInfo(
             case DRIVE_FIXED:
             {
                 TCHAR szVolumeNameBuffer[1024];
-                DWORD const dwBufsizeConst = ELEMENTS_OF_ARRAY(szVolumeNameBuffer);
+                DWORD const dwBufsizeConst = SAL_N_ELEMENTS(szVolumeNameBuffer);
 
                 if ( GetVolumeInformation( cRoot, szVolumeNameBuffer, dwBufsizeConst, NULL, NULL, NULL, NULL, 0 ) )
                 {
@@ -1865,3 +1859,5 @@ oslFileError SAL_CALL osl_setFileTime(
     else
         return osl_File_E_None;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c
index 26e749cc5451..bc9048d72a36 100644
--- a/sal/osl/w32/file_error.c
+++ b/sal/osl/w32/file_error.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,13 +28,14 @@
 
 #define UNICODE
 #define _UNICODE
-#define _WIN32_WINNT_0x0500
+#define _WIN32_WINNT 0x0500
 #include "systools/win32/uwinapi.h"
 
 #include "file_error.h"
 
 #include "osl/diagnose.h"
 #include "osl/thread.h"
+#include <sal/macros.h>
 
 /* OS error to oslFileError values mapping table */
 struct osl_file_error_entry
@@ -108,7 +110,7 @@ static const struct osl_file_error_entry errtable[] = {
 
 oslFileError oslTranslateFileError (/*DWORD*/ unsigned long dwError)
 {
-    static const int n = sizeof(errtable)/sizeof(errtable[0]);
+    static const int n = SAL_N_ELEMENTS(errtable);
 
     int i;
     for (i = 0; i < n; ++i )
@@ -146,6 +148,8 @@ void _osl_warnFile( const char *message, rtl_uString *ustrFile )
 
         message = szBuffer;
     }
-    OSL_ENSURE( 0, message );
+    OSL_FAIL( message );
 }
 #endif /* OSL_DEBUG_LEVEL */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/file_error.h b/sal/osl/w32/file_error.h
index 3815a021bb5e..f4ac71763c26 100644
--- a/sal/osl/w32/file_error.h
+++ b/sal/osl/w32/file_error.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ void _osl_warnFile (const char * message, rtl_uString * ustrFile);
 #endif
 
 #endif /* INCLUDED_OSL_FILE_ERROR_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 90140cda97c6..82fd8d2fbc74 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,10 +28,11 @@
 
 #define UNICODE
 #define _UNICODE
-#define _WIN32_WINNT_0x0500
+#define _WIN32_WINNT 0x0500
 #include "systools/win32/uwinapi.h"
 
 #include "file_url.h"
+#include <sal/macros.h>
 #include "file_error.h"
 
 #include "rtl/alloc.h"
@@ -49,8 +51,6 @@
 #define OSL_ENSURE_FILE( cond, msg, file ) ((void)0)
 #endif
 
-#define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0])))
-
 #define WSTR_SYSTEM_ROOT_PATH               L"\\\\.\\"
 #define WSTR_LONG_PATH_PREFIX               L"\\\\?\\"
 #define WSTR_LONG_PATH_PREFIX_UNC           L"\\\\?\\UNC\\"
@@ -89,9 +89,10 @@ static BOOL IsValidFilePathComponent(
                 case '.':
                     if ( dwFlags & VALIDATEPATH_ALLOW_ELLIPSE )
                     {
-                        if ( 1 == lpCurrent - lpComponent )
+                        if ( (dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD) ||
+                             1 == lpCurrent - lpComponent )
                         {
-                            /* Current directory is O.K. */
+                            /* Either do allow periods anywhere, or current directory */
                             lpComponentEnd = lpCurrent;
                             break;
                         }
@@ -104,8 +105,13 @@ static BOOL IsValidFilePathComponent(
                     }
                 case 0:
                 case ' ':
-                    lpComponentEnd = lpCurrent - 1;
-                    fValid = FALSE;
+                    if ( dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD )
+                        lpComponentEnd = lpCurrent;
+                    else
+                    {
+                        lpComponentEnd = lpCurrent - 1;
+                        fValid = FALSE;
+                    }
                     break;
                 default:
                     lpComponentEnd = lpCurrent;
@@ -252,16 +258,16 @@ DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_u
 
         DWORD   dwCandidatPathType = PATHTYPE_ERROR;
 
-        if ( 0 == rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( path->buffer, nLength, reinterpret_cast<const sal_Unicode *>(WSTR_LONG_PATH_PREFIX_UNC), ELEMENTS_OF_ARRAY(WSTR_LONG_PATH_PREFIX_UNC) - 1, ELEMENTS_OF_ARRAY(WSTR_LONG_PATH_PREFIX_UNC) - 1 ) )
+        if ( 0 == rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( path->buffer, nLength, reinterpret_cast<const sal_Unicode *>(WSTR_LONG_PATH_PREFIX_UNC), SAL_N_ELEMENTS(WSTR_LONG_PATH_PREFIX_UNC) - 1, SAL_N_ELEMENTS(WSTR_LONG_PATH_PREFIX_UNC) - 1 ) )
         {
             /* This is long path in UNC notation */
-            lpComponent = lpszPath + ELEMENTS_OF_ARRAY(WSTR_LONG_PATH_PREFIX_UNC) - 1;
+            lpComponent = lpszPath + SAL_N_ELEMENTS(WSTR_LONG_PATH_PREFIX_UNC) - 1;
             dwCandidatPathType = PATHTYPE_ABSOLUTE_UNC | PATHTYPE_IS_LONGPATH;
         }
-        else if ( 0 == rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( path->buffer, nLength, reinterpret_cast<const sal_Unicode *>(WSTR_LONG_PATH_PREFIX), ELEMENTS_OF_ARRAY(WSTR_LONG_PATH_PREFIX) - 1, ELEMENTS_OF_ARRAY(WSTR_LONG_PATH_PREFIX) - 1 ) )
+        else if ( 0 == rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( path->buffer, nLength, reinterpret_cast<const sal_Unicode *>(WSTR_LONG_PATH_PREFIX), SAL_N_ELEMENTS(WSTR_LONG_PATH_PREFIX) - 1, SAL_N_ELEMENTS(WSTR_LONG_PATH_PREFIX) - 1 ) )
         {
             /* This is long path */
-            lpComponent = lpszPath + ELEMENTS_OF_ARRAY(WSTR_LONG_PATH_PREFIX) - 1;
+            lpComponent = lpszPath + SAL_N_ELEMENTS(WSTR_LONG_PATH_PREFIX) - 1;
 
             if ( _istalpha( lpComponent[0] ) && ':' == lpComponent[1] )
             {
@@ -297,14 +303,7 @@ DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_u
 
                 if ( !lpComponent )
                 {
-    #if 0
-                    /* We only have a Server specification what is invalid */
-
-                    lpComponent = lpszPath;
-                    fValid = FALSE;
-    #else
                     dwPathType |= PATHTYPE_IS_SERVER;
-    #endif
                 }
                 else
                 {
@@ -375,7 +374,7 @@ DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_u
                 lpComponent = lpszPath + i;
             }
 
-            fValid = IsValidFilePathComponent( lpComponent, &lpComponent, dwFlags );
+            fValid = IsValidFilePathComponent( lpComponent, &lpComponent, dwFlags | VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD);
 
             if ( fValid && lpComponent )
             {
@@ -555,14 +554,14 @@ DWORD GetCaseCorrectPathName(
     /* Special handling for "\\.\" as system root */
     if ( lpszShortPath && 0 == wcscmp( lpszShortPath, WSTR_SYSTEM_ROOT_PATH ) )
     {
-        if ( cchBuffer >= ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) )
+        if ( cchBuffer >= SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) )
         {
             wcscpy( lpszLongPath, WSTR_SYSTEM_ROOT_PATH );
-            return ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1;
+            return SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1;
         }
         else
         {
-            return ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1;
+            return SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1;
         }
     }
     else if ( lpszShortPath )
@@ -602,6 +601,11 @@ static sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedUR
     {
         switch ( *pSrc )
         {
+        case 0:
+        case '?':
+        case '#':
+            bValidEncoded = false;
+            break;
         case '%':
             {
                 sal_Char    aToken[3];
@@ -766,7 +770,7 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
 
             /* Indicates local root */
             if ( nDecodedLen == nSkip )
-                rtl_uString_newFromStr_WithLength( &strTempPath, reinterpret_cast<const sal_Unicode*>(WSTR_SYSTEM_ROOT_PATH), ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1 );
+                rtl_uString_newFromStr_WithLength( &strTempPath, reinterpret_cast<const sal_Unicode*>(WSTR_SYSTEM_ROOT_PATH), SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1 );
             else
             {
                 /* do not separate the directory and file case, so the maximal path lengs without prefix is MAX_PATH-12 */
@@ -783,8 +787,8 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
                                                                  sal_False );
 
                     if ( nNewLen <= MAX_PATH - 12
-                      || 0 == rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL + nSkip, nDecodedLen - nSkip, reinterpret_cast<const sal_Unicode*>(WSTR_SYSTEM_ROOT_PATH), ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1, ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1 )
-                      || 0 == rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL + nSkip, nDecodedLen - nSkip, reinterpret_cast<const sal_Unicode*>(WSTR_LONG_PATH_PREFIX), ELEMENTS_OF_ARRAY(WSTR_LONG_PATH_PREFIX) - 1, ELEMENTS_OF_ARRAY(WSTR_LONG_PATH_PREFIX) - 1 ) )
+                      || 0 == rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL + nSkip, nDecodedLen - nSkip, reinterpret_cast<const sal_Unicode*>(WSTR_SYSTEM_ROOT_PATH), SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1, SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1 )
+                      || 0 == rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL + nSkip, nDecodedLen - nSkip, reinterpret_cast<const sal_Unicode*>(WSTR_LONG_PATH_PREFIX), SAL_N_ELEMENTS(WSTR_LONG_PATH_PREFIX) - 1, SAL_N_ELEMENTS(WSTR_LONG_PATH_PREFIX) - 1 ) )
                     {
                         rtl_uString_newFromStr_WithLength( &strTempPath, aBuf, nNewLen );
                     }
@@ -793,7 +797,7 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
                         /* it should be an UNC path, use the according prefix */
                         rtl_uString *strSuffix = NULL;
                         rtl_uString *strPrefix = NULL;
-                        rtl_uString_newFromStr_WithLength( &strPrefix, reinterpret_cast<const sal_Unicode*>(WSTR_LONG_PATH_PREFIX_UNC), ELEMENTS_OF_ARRAY( WSTR_LONG_PATH_PREFIX_UNC ) - 1 );
+                        rtl_uString_newFromStr_WithLength( &strPrefix, reinterpret_cast<const sal_Unicode*>(WSTR_LONG_PATH_PREFIX_UNC), SAL_N_ELEMENTS( WSTR_LONG_PATH_PREFIX_UNC ) - 1 );
                         rtl_uString_newFromStr_WithLength( &strSuffix, aBuf + 2, nNewLen - 2 );
 
                         rtl_uString_newConcat( &strTempPath, strPrefix, strSuffix );
@@ -805,7 +809,7 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
                     {
                         rtl_uString *strSuffix = NULL;
                         rtl_uString *strPrefix = NULL;
-                        rtl_uString_newFromStr_WithLength( &strPrefix, reinterpret_cast<const sal_Unicode*>(WSTR_LONG_PATH_PREFIX), ELEMENTS_OF_ARRAY( WSTR_LONG_PATH_PREFIX ) - 1 );
+                        rtl_uString_newFromStr_WithLength( &strPrefix, reinterpret_cast<const sal_Unicode*>(WSTR_LONG_PATH_PREFIX), SAL_N_ELEMENTS( WSTR_LONG_PATH_PREFIX ) - 1 );
                         rtl_uString_newFromStr_WithLength( &strSuffix, aBuf, nNewLen );
 
                         rtl_uString_newConcat( &strTempPath, strPrefix, strSuffix );
@@ -874,7 +878,7 @@ oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString**
             switch ( dwPathType & PATHTYPE_MASK_TYPE )
             {
                 case PATHTYPE_ABSOLUTE_UNC:
-                    nIgnore = ELEMENTS_OF_ARRAY( WSTR_LONG_PATH_PREFIX_UNC ) - 1;
+                    nIgnore = SAL_N_ELEMENTS( WSTR_LONG_PATH_PREFIX_UNC ) - 1;
                     OSL_ENSURE( nIgnore == 8, "Unexpected long path UNC prefix!" );
 
                     /* generate the normal UNC path */
@@ -887,7 +891,7 @@ oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString**
                     break;
 
                 case PATHTYPE_ABSOLUTE_LOCAL:
-                    nIgnore = ELEMENTS_OF_ARRAY( WSTR_LONG_PATH_PREFIX ) - 1;
+                    nIgnore = SAL_N_ELEMENTS( WSTR_LONG_PATH_PREFIX ) - 1;
                     OSL_ENSURE( nIgnore == 4, "Unexpected long path prefix!" );
 
                     /* generate the normal path */
@@ -899,7 +903,7 @@ oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString**
                     break;
 
                 default:
-                    OSL_ASSERT( "Unexpected long path format!" );
+                    OSL_FAIL( "Unexpected long path format!" );
                     rtl_uString_newReplace( &strTempPath, strPath, '\\', '/' );
                     break;
             }
@@ -1141,3 +1145,5 @@ oslFileError SAL_CALL osl_getCanonicalName( rtl_uString *strRequested, rtl_uStri
     rtl_uString_newFromString(strValid, strRequested);
     return osl_File_E_None;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/file_url.h b/sal/osl/w32/file_url.h
index d9137c8c2fcc..3f12151442a9 100644
--- a/sal/osl/w32/file_url.h
+++ b/sal/osl/w32/file_url.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,6 +62,7 @@ extern "C" {
 #define VALIDATEPATH_ALLOW_ELLIPSE          0x0002
 #define VALIDATEPATH_ALLOW_RELATIVE         0x0004
 #define VALIDATEPATH_ALLOW_UNC              0x0008
+#define VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD 0x0010
 
 #define MAX_LONG_PATH 32767
 
@@ -94,3 +96,5 @@ oslFileError _osl_getFileURLFromSystemPath (
 #endif
 
 #endif /* INCLUDED_OSL_FILE_URL_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/interlck.c b/sal/osl/w32/interlck.c
index 14589e56184a..5c9e566a4a2d 100644
--- a/sal/osl/w32/interlck.c
+++ b/sal/osl/w32/interlck.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -140,3 +141,5 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
     return (InterlockedDecrement(pCount));
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/MAKEFILE.MK b/sal/osl/w32/makefile.mk
index 4749048847b5..08e8745a9dcd 100644
--- a/sal/osl/w32/MAKEFILE.MK
+++ b/sal/osl/w32/makefile.mk
@@ -29,6 +29,7 @@ PRJ=..$/..
 
 PRJNAME=sal
 TARGET=cpposl
+ENABLE_EXCEPTIONS=TRUE
 USE_LDUMP2=TRUE
 
 PROJECTPCH4DLL=TRUE
@@ -70,7 +71,6 @@ SLOFILES=   $(SLO)$/conditn.obj  \
             $(SLO)$/profile.obj  \
             $(SLO)$/time.obj     \
             $(SLO)$/signal.obj   \
-            $(SLO)$/pipeimpl.obj \
             $(SLO)$/pipe.obj     \
             $(SLO)$/util.obj     \
             $(SLO)$/file.obj\
@@ -84,7 +84,6 @@ SLOFILES=   $(SLO)$/conditn.obj  \
 
 OBJFILES=   $(OBJ)$/conditn.obj  \
             $(OBJ)$/diagnose.obj \
-            $(OBJ)$/libutil.obj  \
             $(OBJ)$/semaphor.obj \
             $(OBJ)$/socket.obj   \
             $(OBJ)$/interlck.obj \
@@ -97,7 +96,6 @@ OBJFILES=   $(OBJ)$/conditn.obj  \
             $(OBJ)$/profile.obj  \
             $(OBJ)$/time.obj     \
             $(OBJ)$/signal.obj   \
-            $(OBJ)$/pipeimpl.obj \
             $(OBJ)$/pipe.obj     \
             $(OBJ)$/util.obj     \
             $(OBJ)$/file.obj\
@@ -114,5 +112,3 @@ OBJFILES=   $(OBJ)$/conditn.obj  \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 65a17eb1352d..842d40159f0e 100755..100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,7 +26,13 @@
 *
 ************************************************************************/
 
+#ifdef __MINGW32__
+extern "C" {
+#endif
 #include "system.h"
+#ifdef __MINGW32__
+}
+#endif
 #include <tlhelp32.h>
 
 #include "file_url.h"
@@ -46,10 +53,12 @@
 /*****************************************************************************/
 /* osl_loadModule */
 /*****************************************************************************/
-oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMode )
+oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 /*nRtldMode*/ )
 {
     HINSTANCE hInstance;
+#if OSL_DEBUG_LEVEL < 2
     UINT errorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
+#endif
     rtl_uString* Module = NULL;
     oslModule ret = 0;
     oslFileError    nError;
@@ -58,8 +67,6 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMod
 
     OSL_ASSERT(strModuleName);
 
-    nRtldMode = nRtldMode; /* avoid warnings */
-
     nError = osl_getSystemPathFromFileURL(strModuleName, &Module);
 
     if ( osl_File_E_None != nError )
@@ -80,13 +87,13 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMod
     {
         std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec(Module->length + 1);
         DWORD len = GetShortPathNameW(reinterpret_cast<LPCWSTR>(Module->buffer),
-                                      &vec[0], Module->length + 1);
+                                      reinterpret_cast<LPWSTR>(&vec[0]), Module->length + 1);
         if (len )
         {
-            hInstance = LoadLibraryW(&vec[0]);
+            hInstance = LoadLibraryW(reinterpret_cast<LPWSTR>(&vec[0]));
 
             if (hInstance == NULL)
-                hInstance = LoadLibraryExW(&vec[0], NULL,
+                hInstance = LoadLibraryExW(reinterpret_cast<LPWSTR>(&vec[0]), NULL,
                                   LOAD_WITH_ALTERED_SEARCH_PATH);
         }
     }
@@ -97,7 +104,9 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMod
 
     ret = (oslModule) hInstance;
     rtl_uString_release(Module);
+#if OSL_DEBUG_LEVEL < 2
     SetErrorMode(errorMode);
+#endif
 
     RTL_LOGFILE_TRACE1( "} osl_loadModule end: %S", (LPTSTR)&strModuleName->buffer );
 
@@ -105,6 +114,37 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMod
 }
 
 /*****************************************************************************/
+/* osl_loadModuleAscii */
+/*****************************************************************************/
+oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nRtldMode )
+{
+    (void) nRtldMode; /* avoid warnings */
+
+    HINSTANCE hInstance;
+    UINT errorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
+    oslModule ret = 0;
+
+    RTL_LOGFILE_TRACE1( "{ osl_loadModule start: %s", pModuleName );
+
+    OSL_ASSERT(pModuleName);
+
+    hInstance = LoadLibrary(pModuleName);
+    if (hInstance == NULL)
+        hInstance = LoadLibraryEx(pModuleName, NULL,
+                                  LOAD_WITH_ALTERED_SEARCH_PATH);
+
+    if (hInstance <= (HINSTANCE)HINSTANCE_ERROR)
+        hInstance = 0;
+
+    ret = (oslModule) hInstance;
+    SetErrorMode(errorMode);
+
+    RTL_LOGFILE_TRACE1( "} osl_loadModule end: %s", pModuleName );
+
+    return ret;
+}
+
+/*****************************************************************************/
 /* osl_getModuleHandle */
 /*****************************************************************************/
 
@@ -207,73 +247,6 @@ osl_getAsciiFunctionSymbol( oslModule Module, const sal_Char *pSymbol )
 #undef LPMODULEENTRY32
 #endif
 
-typedef HANDLE (WINAPI *CreateToolhelp32Snapshot_PROC)( DWORD dwFlags, DWORD th32ProcessID );
-typedef BOOL (WINAPI *Module32First_PROC)( HANDLE   hSnapshot, LPMODULEENTRY32 lpme32 );
-typedef BOOL (WINAPI *Module32Next_PROC)( HANDLE    hSnapshot, LPMODULEENTRY32 lpme32 );
-
-static sal_Bool SAL_CALL _osl_addressGetModuleURL_Windows( void *pv, rtl_uString **pustrURL )
-{
-    sal_Bool    bSuccess        = sal_False;    /* Assume failure */
-    HMODULE     hModKernel32    = GetModuleHandleA( "KERNEL32.DLL" );
-
-    if ( hModKernel32 )
-    {
-        CreateToolhelp32Snapshot_PROC   lpfnCreateToolhelp32Snapshot = (CreateToolhelp32Snapshot_PROC)GetProcAddress( hModKernel32, "CreateToolhelp32Snapshot" );
-        Module32First_PROC              lpfnModule32First = (Module32First_PROC)GetProcAddress( hModKernel32, "Module32First" );
-        Module32Next_PROC               lpfnModule32Next = (Module32Next_PROC)GetProcAddress( hModKernel32, "Module32Next" );
-
-        if ( lpfnCreateToolhelp32Snapshot && lpfnModule32First && lpfnModule32Next )
-        {
-            HANDLE  hModuleSnap = NULL;
-            DWORD   dwProcessId = GetCurrentProcessId();
-
-            // Take a snapshot of all modules in the specified process.
-
-            hModuleSnap = lpfnCreateToolhelp32Snapshot(TH32CS_SNAPMODULE, dwProcessId );
-
-            if ( INVALID_HANDLE_VALUE != hModuleSnap )
-            {
-                MODULEENTRY32   me32    = {0};
-
-                // Fill the size of the structure before using it.
-
-                me32.dwSize = sizeof(MODULEENTRY32);
-
-                // Walk the module list of the process, and find the module of
-                // interest. Then copy the information to the buffer pointed
-                // to by lpMe32 so that it can be returned to the caller.
-
-                if ( lpfnModule32First(hModuleSnap, &me32) )
-                {
-                    do
-                    {
-                        if ( (BYTE *)pv >= (BYTE *)me32.hModule && (BYTE *)pv < (BYTE *)me32.hModule + me32.modBaseSize )
-                        {
-                            rtl_uString *ustrSysPath = NULL;
-
-                            rtl_string2UString( &ustrSysPath, me32.szExePath, strlen(me32.szExePath), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
-                            OSL_ASSERT(ustrSysPath != NULL);
-                            osl_getFileURLFromSystemPath( ustrSysPath, pustrURL );
-                            rtl_uString_release( ustrSysPath );
-
-                            bSuccess = sal_True;
-                        }
-
-                    } while ( !bSuccess && lpfnModule32Next( hModuleSnap, &me32 ) );
-                }
-
-
-                // Do not forget to clean up the snapshot object.
-
-                CloseHandle (hModuleSnap);
-            }
-
-        }
-    }
-
-    return  bSuccess;
-}
-
 /***************************************************************************************/
 /* Implementation for Windows NT, 2K and XP (2K and XP could use the above method too) */
 /***************************************************************************************/
@@ -411,8 +384,6 @@ typedef BOOL (WINAPI *GetModuleInformation_PROC)(
   DWORD cb                 // size of the structure
 );
 
-#define bufsizeof(buffer) (sizeof(buffer) / sizeof((buffer)[0]))
-
 /* This version can fail because PSAPI.DLL is not always part of NT 4 despite MSDN Libary 6.0a say so */
 
 static sal_Bool SAL_CALL _osl_addressGetModuleURL_NT( void *pv, rtl_uString **pustrURL )
@@ -475,10 +446,7 @@ static sal_Bool SAL_CALL _osl_addressGetModuleURL_NT( void *pv, rtl_uString **pu
 sal_Bool SAL_CALL osl_getModuleURLFromAddress( void *pv, rtl_uString **pustrURL )
 {
     /* Use ..._NT first because ..._NT4 is much slower */
-    if ( IS_NT )
-        return _osl_addressGetModuleURL_NT( pv, pustrURL ) || _osl_addressGetModuleURL_NT4( pv, pustrURL );
-    else
-        return _osl_addressGetModuleURL_Windows( pv, pustrURL );
+    return _osl_addressGetModuleURL_NT( pv, pustrURL ) || _osl_addressGetModuleURL_NT4( pv, pustrURL );
 }
 
 /*****************************************************************************/
@@ -501,3 +469,4 @@ sal_Bool SAL_CALL osl_getModuleURLFromFunctionAddress( oslGenericFunction addr,
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/mutex.c b/sal/osl/w32/mutex.c
index db16459d7fe7..dad32bb8a1f9 100644
--- a/sal/osl/w32/mutex.c
+++ b/sal/osl/w32/mutex.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,66 +37,18 @@
     CRITICAL_SECTION structure.
 */
 
-typedef struct _oslMutexImpl {
-    CRITICAL_SECTION    m_Mutex;
-    int                 m_Locks;
-    DWORD               m_Owner;
-    DWORD               m_Requests;
-} oslMutexImpl;
-
-static BOOL (WINAPI *lpfTryEnterCriticalSection)(LPCRITICAL_SECTION)
-    = (BOOL (WINAPI *)(LPCRITICAL_SECTION))0xFFFFFFFF;
-
-static CRITICAL_SECTION MutexLock;
-
 /*****************************************************************************/
 /* osl_createMutex */
 /*****************************************************************************/
 oslMutex SAL_CALL osl_createMutex(void)
 {
-    oslMutexImpl *pMutexImpl;
+    CRITICAL_SECTION *pMutexImpl;
 
-    /* Window 95 does not support "TryEnterCriticalSection" */
-
-    if (lpfTryEnterCriticalSection ==
-                (BOOL (WINAPI *)(LPCRITICAL_SECTION))0xFFFFFFFF)
-    {
-        OSVERSIONINFO VersionInformation =
-
-        {
-            sizeof(OSVERSIONINFO),
-            0,
-            0,
-            0,
-            0,
-            "",
-        };
-
-        /* ts: Window 98 does not support "TryEnterCriticalSection" but export the symbol !!!
-           calls to that symbol always returns FALSE */
-        if (
-            GetVersionEx(&VersionInformation) &&
-            (VersionInformation.dwPlatformId == VER_PLATFORM_WIN32_NT)
-           )
-        {
-            lpfTryEnterCriticalSection = (BOOL (WINAPI *)(LPCRITICAL_SECTION))
-                    GetProcAddress(GetModuleHandle("KERNEL32"),
-                                   "TryEnterCriticalSection");
-        }
-        else
-        {
-            lpfTryEnterCriticalSection = (BOOL (WINAPI *)(LPCRITICAL_SECTION))NULL;
-        }
-
-
-        InitializeCriticalSection(&MutexLock);
-    }
-
-    pMutexImpl= calloc(sizeof(oslMutexImpl), 1);
+    pMutexImpl = calloc(sizeof(CRITICAL_SECTION), 1);
 
     OSL_ASSERT(pMutexImpl); /* alloc successful? */
 
-    InitializeCriticalSection(&pMutexImpl->m_Mutex);
+    InitializeCriticalSection(pMutexImpl);
 
     return (oslMutex)pMutexImpl;
 }
@@ -105,11 +58,11 @@ oslMutex SAL_CALL osl_createMutex(void)
 /*****************************************************************************/
 void SAL_CALL osl_destroyMutex(oslMutex Mutex)
 {
-    oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
+    CRITICAL_SECTION *pMutexImpl = (CRITICAL_SECTION *)Mutex;
 
     if (pMutexImpl)
     {
-        DeleteCriticalSection(&pMutexImpl->m_Mutex);
+        DeleteCriticalSection(pMutexImpl);
         free(pMutexImpl);
     }
 }
@@ -119,26 +72,11 @@ void SAL_CALL osl_destroyMutex(oslMutex Mutex)
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_acquireMutex(oslMutex Mutex)
 {
-    oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
+    CRITICAL_SECTION *pMutexImpl = (CRITICAL_SECTION *)Mutex;
 
     OSL_ASSERT(Mutex);
 
-    if (lpfTryEnterCriticalSection == NULL)
-    {
-        EnterCriticalSection(&MutexLock);
-        pMutexImpl->m_Requests++;
-        LeaveCriticalSection(&MutexLock);
-
-        EnterCriticalSection(&pMutexImpl->m_Mutex);
-
-        EnterCriticalSection(&MutexLock);
-        pMutexImpl->m_Requests--;
-        if (pMutexImpl->m_Locks++ == 0)
-            pMutexImpl->m_Owner = GetCurrentThreadId();
-        LeaveCriticalSection(&MutexLock);
-    }
-    else
-        EnterCriticalSection(&pMutexImpl->m_Mutex);
+    EnterCriticalSection(pMutexImpl);
 
     return sal_True;
 }
@@ -148,25 +86,11 @@ sal_Bool SAL_CALL osl_acquireMutex(oslMutex Mutex)
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex Mutex)
 {
-    sal_Bool     ret = sal_False;
-    oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
+    CRITICAL_SECTION *pMutexImpl = (CRITICAL_SECTION *)Mutex;
 
     OSL_ASSERT(Mutex);
 
-    if (lpfTryEnterCriticalSection != NULL)
-        return (sal_Bool)(lpfTryEnterCriticalSection(&pMutexImpl->m_Mutex) != FALSE);
-    else
-    {
-        EnterCriticalSection(&MutexLock);
-
-        if ( ((pMutexImpl->m_Requests == 0) && (pMutexImpl->m_Locks == 0)) ||
-             (pMutexImpl->m_Owner == GetCurrentThreadId()) )
-            ret = osl_acquireMutex(Mutex);
-
-        LeaveCriticalSection(&MutexLock);
-    }
-
-    return ret;
+    return (sal_Bool)(TryEnterCriticalSection(pMutexImpl) != FALSE);
 }
 
 /*****************************************************************************/
@@ -174,21 +98,11 @@ sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex Mutex)
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_releaseMutex(oslMutex Mutex)
 {
-    oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
+    CRITICAL_SECTION *pMutexImpl = (CRITICAL_SECTION *)Mutex;
 
     OSL_ASSERT(Mutex);
 
-    if (lpfTryEnterCriticalSection == NULL)
-    {
-        EnterCriticalSection(&MutexLock);
-
-        if (--(pMutexImpl->m_Locks) == 0)
-            pMutexImpl->m_Owner = 0;
-
-        LeaveCriticalSection(&MutexLock);
-    }
-
-    LeaveCriticalSection(&pMutexImpl->m_Mutex);
+    LeaveCriticalSection(pMutexImpl);
 
     return sal_True;
 }
@@ -204,3 +118,5 @@ oslMutex * SAL_CALL osl_getGlobalMutex(void)
 {
     return &g_Mutex;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/nlsupport.c b/sal/osl/w32/nlsupport.c
index ad9de5f8492c..ea2b33e8e30d 100644
--- a/sal/osl/w32/nlsupport.c
+++ b/sal/osl/w32/nlsupport.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -229,3 +230,4 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx
index a43ff8bca1d8..aaf59f4ef586 100644
--- a/sal/osl/w32/path_helper.cxx
+++ b/sal/osl/w32/path_helper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,8 +44,8 @@
  Constants
  ******************************************************************/
 
-const rtl::OUString BACKSLASH = rtl::OUString::createFromAscii("\\");
-const rtl::OUString SLASH     = rtl::OUString::createFromAscii("/");
+const rtl::OUString BACKSLASH (RTL_CONSTASCII_USTRINGPARAM("\\"));
+const rtl::OUString SLASH     (RTL_CONSTASCII_USTRINGPARAM("/"));
 
 /*******************************************************************
  osl_systemPathEnsureSeparator
@@ -116,3 +117,4 @@ sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPat
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/path_helper.h b/sal/osl/w32/path_helper.h
index 79341f538667..cb39c49e36d6 100644
--- a/sal/osl/w32/path_helper.h
+++ b/sal/osl/w32/path_helper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPat
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index d157b42aa428..05fc117d25d8 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -116,3 +117,5 @@ public:
 } // end namespace osl
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/pipe.c b/sal/osl/w32/pipe.c
index bd5185a2ba2b..9efe5e91e8b2 100644
--- a/sal/osl/w32/pipe.c
+++ b/sal/osl/w32/pipe.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,8 +28,6 @@
 
 #include "system.h"
 
-#include "pipeimpl.h"
-
 #include <osl/pipe.h>
 #include <osl/diagnose.h>
 #include <osl/thread.h>
@@ -138,7 +137,7 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options
     rtl_uString_newFromAscii(&path, PIPESYSTEM);
     rtl_uString_newFromAscii(&name, PIPEPREFIX);
 
-    if ( /*IS_NT &&*/ Security)
+    if ( Security)
     {
         rtl_uString *Ident = NULL;
         rtl_uString *Delim = NULL;
@@ -188,20 +187,7 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options
     {
         SetLastError( ERROR_SUCCESS );
 
-        if ( IS_NT )
-            pPipe->m_NamedObject = CreateMutexW( NULL, FALSE, name->buffer );
-        else
-        {
-            LPSTR   pszTempBuffer = NULL;
-            int     nCharsNeeded;
-
-            nCharsNeeded = WideCharToMultiByte( CP_ACP, 0, name->buffer, name->length, NULL, 0, NULL, NULL );
-            pszTempBuffer = alloca( nCharsNeeded * sizeof(CHAR) );
-            nCharsNeeded = WideCharToMultiByte( CP_ACP, 0, name->buffer, name->length, pszTempBuffer, nCharsNeeded, NULL, NULL );
-            pszTempBuffer[nCharsNeeded-1] = 0;
-
-            pPipe->m_NamedObject = CreateMutexA( NULL, FALSE, pszTempBuffer );
-        }
+        pPipe->m_NamedObject = CreateMutexW( NULL, FALSE, name->buffer );
 
         if ( pPipe->m_NamedObject != INVALID_HANDLE_VALUE && pPipe->m_NamedObject != NULL )
         {
@@ -210,45 +196,22 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options
                 pPipe->m_Security = pSecAttr;
                 rtl_uString_assign(&pPipe->m_Name, name);
 
-                if (IS_NT)
-                {
-                    /* try to open system pipe */
-                    pPipe->m_File = CreateNamedPipeW(
-                        path->buffer,
-                        PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
-                        PIPE_WAIT | PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE,
-                        PIPE_UNLIMITED_INSTANCES,
-                        4096, 4096,
-                        NMPWAIT_WAIT_FOREVER,
-                        pPipe->m_Security);
-
-                    if (pPipe->m_File != INVALID_HANDLE_VALUE)
-                    {
-                        rtl_uString_release( name );
-                        rtl_uString_release( path );
-
-                        return pPipe;
-                    }
-                }
-                else /* Win 9x */
+                /* try to open system pipe */
+                pPipe->m_File = CreateNamedPipeW(
+                    path->buffer,
+                    PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
+                    PIPE_WAIT | PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE,
+                    PIPE_UNLIMITED_INSTANCES,
+                    4096, 4096,
+                    NMPWAIT_WAIT_FOREVER,
+                    pPipe->m_Security);
+
+                if (pPipe->m_File != INVALID_HANDLE_VALUE)
                 {
-                    LPSTR   pszTempBuffer = NULL;
-                    int     nCharsNeeded;
+                    rtl_uString_release( name );
+                    rtl_uString_release( path );
 
-                    nCharsNeeded = WideCharToMultiByte( CP_ACP, 0, path->buffer, path->length, NULL, 0, NULL, NULL );
-                    pszTempBuffer = alloca( nCharsNeeded * sizeof(CHAR) );
-                    nCharsNeeded = WideCharToMultiByte( CP_ACP, 0, path->buffer, path->length, pszTempBuffer, nCharsNeeded, NULL, NULL );
-                    pszTempBuffer[nCharsNeeded-1] = 0;
-
-                    pPipe->m_File = CreateSimplePipe( pszTempBuffer );
-
-                    if ( IsValidHandle(pPipe->m_File) )
-                    {
-                        rtl_uString_release( name );
-                        rtl_uString_release( path );
-
-                        return pPipe;
-                    }
+                    return pPipe;
                 }
             }
             else
@@ -260,63 +223,39 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options
     }
     else
     {
-        if (IS_NT)
+        BOOL    fPipeAvailable;
+
+        do
         {
-            BOOL    fPipeAvailable;
+            /* free instance should be available first */
+            fPipeAvailable = WaitNamedPipeW(path->buffer, NMPWAIT_WAIT_FOREVER);
 
-            do
+            /* first try to open system pipe */
+            if ( fPipeAvailable )
             {
-                /* free instance should be available first */
-                fPipeAvailable = WaitNamedPipeW(path->buffer, NMPWAIT_WAIT_FOREVER);
-
-                /* first try to open system pipe */
-                if ( fPipeAvailable )
+                pPipe->m_File = CreateFileW(
+                    path->buffer,
+                    GENERIC_READ|GENERIC_WRITE,
+                    FILE_SHARE_READ | FILE_SHARE_WRITE,
+                    NULL,
+                    OPEN_EXISTING,
+                    FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED,
+                    NULL);
+
+                if ( pPipe->m_File != INVALID_HANDLE_VALUE )
                 {
-                    pPipe->m_File = CreateFileW(
-                            path->buffer,
-                            GENERIC_READ|GENERIC_WRITE,
-                            FILE_SHARE_READ | FILE_SHARE_WRITE,
-                            NULL,
-                            OPEN_EXISTING,
-                            FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED,
-                            NULL);
-
-                    if ( pPipe->m_File != INVALID_HANDLE_VALUE )
-                    {
-                        // We got it !
-                        rtl_uString_release( name );
-                        rtl_uString_release( path );
+                    // We got it !
+                    rtl_uString_release( name );
+                    rtl_uString_release( path );
 
-                        return (pPipe);
-                    }
-                    else
-                    {
-                        // Pipe instance maybe catched by another client -> try again
-                    }
+                    return (pPipe);
+                }
+                else
+                {
+                    // Pipe instance maybe catched by another client -> try again
                 }
-            } while ( fPipeAvailable );
-        }
-        else /* Win 9x */
-        {
-            LPSTR   pszTempBuffer = NULL;
-            int     nCharsNeeded;
-
-            nCharsNeeded = WideCharToMultiByte( CP_ACP, 0, path->buffer, path->length, NULL, 0, NULL, NULL );
-            pszTempBuffer = alloca( nCharsNeeded * sizeof(CHAR) );
-            nCharsNeeded = WideCharToMultiByte( CP_ACP, 0, path->buffer, path->length, pszTempBuffer, nCharsNeeded, NULL, NULL );
-            pszTempBuffer[nCharsNeeded-1] = 0;
-
-            pPipe->m_File = OpenSimplePipe( pszTempBuffer );
-
-            if ( IsValidHandle(pPipe->m_File) )
-            {
-                // We got it !
-                rtl_uString_release( name );
-                rtl_uString_release( path );
-
-                return (pPipe);
             }
-        }
+        } while ( fPipeAvailable );
     }
 
     /* if we reach here something went wrong */
@@ -351,21 +290,13 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
     if( pPipe && ! pPipe->m_bClosed )
     {
         pPipe->m_bClosed = sal_True;
-        if (IS_NT)
+        /* if we have a system pipe close it */
+        if (pPipe->m_File != INVALID_HANDLE_VALUE)
         {
-            /* if we have a system pipe close it */
-            if (pPipe->m_File != INVALID_HANDLE_VALUE)
-            {
-                /*          FlushFileBuffers(pPipe->m_File); */
-                DisconnectNamedPipe(pPipe->m_File);
-                CloseHandle(pPipe->m_File);
-            }
-        }
-        else
-        {
-            CloseSimplePipe( pPipe->m_File );
+            /*          FlushFileBuffers(pPipe->m_File); */
+            DisconnectNamedPipe(pPipe->m_File);
+            CloseHandle(pPipe->m_File);
         }
-
     }
 }
 
@@ -379,25 +310,23 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
     HANDLE       Event;
     OVERLAPPED   os;
 
-    OSL_ASSERT(pPipe);
+    DWORD nBytesTransfered;
+    rtl_uString* path = NULL;
+    rtl_uString* temp = NULL;
 
-    if (IS_NT)
-    {
-        DWORD nBytesTransfered;
-        rtl_uString* path = NULL;
-        rtl_uString* temp = NULL;
+    OSL_ASSERT(pPipe);
 
-        OSL_ASSERT (pPipe->m_File != INVALID_HANDLE_VALUE);
+    OSL_ASSERT (pPipe->m_File != INVALID_HANDLE_VALUE);
 
-        Event = pPipe->m_AcceptEvent;
-        rtl_zeroMemory(&os, sizeof(OVERLAPPED));
-        os.hEvent = pPipe->m_AcceptEvent;
-        ResetEvent(pPipe->m_AcceptEvent);
+    Event = pPipe->m_AcceptEvent;
+    rtl_zeroMemory(&os, sizeof(OVERLAPPED));
+    os.hEvent = pPipe->m_AcceptEvent;
+    ResetEvent(pPipe->m_AcceptEvent);
 
-        if ( !ConnectNamedPipe(pPipe->m_File, &os))
+    if ( !ConnectNamedPipe(pPipe->m_File, &os))
+    {
+        switch ( GetLastError() )
         {
-            switch ( GetLastError() )
-            {
             case ERROR_PIPE_CONNECTED:  // Client already connected to pipe
             case ERROR_NO_DATA:         // Client was connected but has already closed pipe end
                                         // should only appear in nonblocking mode but in fact does
@@ -425,43 +354,30 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
                 break;
             default:                    // All other error say that somethings going wrong.
                 return 0;
-            }
         }
+    }
 
+    pAcceptedPipe = __osl_createPipeImpl();
+    OSL_ASSERT(pAcceptedPipe);
 
-        pAcceptedPipe = __osl_createPipeImpl();
-        OSL_ASSERT(pAcceptedPipe);
-
-        osl_incrementInterlockedCount(&(pAcceptedPipe->m_Reference));
-        rtl_uString_assign(&pAcceptedPipe->m_Name, pPipe->m_Name);
-        pAcceptedPipe->m_File = pPipe->m_File;
-
-        rtl_uString_newFromAscii(&temp, PIPESYSTEM);
-        rtl_uString_newConcat(&path, temp, pPipe->m_Name);
-        rtl_uString_release(temp);
-
-        // prepare for next accept
-        pPipe->m_File =
-            CreateNamedPipeW(path->buffer,
-                PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
-                PIPE_WAIT | PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE,
-                PIPE_UNLIMITED_INSTANCES,
-                4096, 4096,
-                NMPWAIT_WAIT_FOREVER,
-                pAcceptedPipe->m_Security);
-        rtl_uString_release( path );
-    }
-    else /* Win9x */
-    {
-        pAcceptedPipe = __osl_createPipeImpl();
-        OSL_ASSERT(pAcceptedPipe);
+    osl_incrementInterlockedCount(&(pAcceptedPipe->m_Reference));
+    rtl_uString_assign(&pAcceptedPipe->m_Name, pPipe->m_Name);
+    pAcceptedPipe->m_File = pPipe->m_File;
 
-        osl_incrementInterlockedCount(&(pAcceptedPipe->m_Reference));
-        rtl_uString_assign(&pAcceptedPipe->m_Name, pPipe->m_Name);
-        pAcceptedPipe->m_File = pPipe->m_File;
+    rtl_uString_newFromAscii(&temp, PIPESYSTEM);
+    rtl_uString_newConcat(&path, temp, pPipe->m_Name);
+    rtl_uString_release(temp);
 
-        pAcceptedPipe->m_File = AcceptSimplePipeConnection( pPipe->m_File );
-    }
+    // prepare for next accept
+    pPipe->m_File =
+        CreateNamedPipeW(path->buffer,
+            PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
+            PIPE_WAIT | PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE,
+            PIPE_UNLIMITED_INSTANCES,
+            4096, 4096,
+            NMPWAIT_WAIT_FOREVER,
+            pAcceptedPipe->m_Security);
+    rtl_uString_release( path );
 
     return pAcceptedPipe;
 }
@@ -474,47 +390,32 @@ sal_Int32 SAL_CALL osl_receivePipe(oslPipe pPipe,
                         sal_Int32 BytesToRead)
 {
     DWORD nBytes;
+    OVERLAPPED   os;
 
     OSL_ASSERT(pPipe);
 
-    /* if we have a system pipe use it */
-    if ( IS_NT /*pPipe->m_File != INVALID_HANDLE_VALUE*/)
-    {
-        OVERLAPPED   os;
-        rtl_zeroMemory(&os,sizeof(OVERLAPPED));
-        os.hEvent = pPipe->m_ReadEvent;
-
-        ResetEvent(pPipe->m_ReadEvent);
+    rtl_zeroMemory(&os,sizeof(OVERLAPPED));
+    os.hEvent = pPipe->m_ReadEvent;
 
-        if (! ReadFile(pPipe->m_File, pBuffer, BytesToRead, &nBytes, &os) &&
-            ((GetLastError() != ERROR_IO_PENDING) ||
-             ! GetOverlappedResult(pPipe->m_File, &os, &nBytes, TRUE)))
-        {
-            DWORD lastError = GetLastError();
-
-            if (lastError == ERROR_MORE_DATA)
-                nBytes = BytesToRead;
-              else
-              {
-                  if (lastError == ERROR_PIPE_NOT_CONNECTED)
-                    nBytes = 0;
-                else
-                    nBytes = (DWORD) -1;
+    ResetEvent(pPipe->m_ReadEvent);
 
-                 pPipe->m_Error = osl_Pipe_E_ConnectionAbort;
-            }
-        }
-    }
-    else
+    if (! ReadFile(pPipe->m_File, pBuffer, BytesToRead, &nBytes, &os) &&
+        ((GetLastError() != ERROR_IO_PENDING) ||
+         ! GetOverlappedResult(pPipe->m_File, &os, &nBytes, TRUE)))
     {
-        BOOL fSuccess = ReadSimplePipe( pPipe->m_File, pBuffer, BytesToRead, &nBytes, TRUE );
+        DWORD lastError = GetLastError();
+
+        if (lastError == ERROR_MORE_DATA)
+            nBytes = BytesToRead;
+          else
+          {
+              if (lastError == ERROR_PIPE_NOT_CONNECTED)
+                nBytes = 0;
+            else
+                nBytes = (DWORD) -1;
 
-        if ( !fSuccess )
-        {
-            nBytes = 0;
              pPipe->m_Error = osl_Pipe_E_ConnectionAbort;
         }
-
     }
 
     return (nBytes);
@@ -528,36 +429,24 @@ sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe,
                        sal_Int32 BytesToSend)
 {
     DWORD nBytes;
+    OVERLAPPED   os;
+
     OSL_ASSERT(pPipe);
 
-    if (IS_NT/*pPipe->m_File != INVALID_HANDLE_VALUE*/)
-    {
-        OVERLAPPED   os;
-        rtl_zeroMemory(&os, sizeof(OVERLAPPED));
-        os.hEvent = pPipe->m_WriteEvent;
-        ResetEvent(pPipe->m_WriteEvent);
-
-        if (! WriteFile(pPipe->m_File, pBuffer, BytesToSend, &nBytes, &os) &&
-            ((GetLastError() != ERROR_IO_PENDING) ||
-              ! GetOverlappedResult(pPipe->m_File, &os, &nBytes, TRUE)))
-        {
-              if (GetLastError() == ERROR_PIPE_NOT_CONNECTED)
-                nBytes = 0;
-            else
-                nBytes = (DWORD) -1;
+    rtl_zeroMemory(&os, sizeof(OVERLAPPED));
+    os.hEvent = pPipe->m_WriteEvent;
+    ResetEvent(pPipe->m_WriteEvent);
 
-             pPipe->m_Error = osl_Pipe_E_ConnectionAbort;
-        }
-    }
-    else
+    if (! WriteFile(pPipe->m_File, pBuffer, BytesToSend, &nBytes, &os) &&
+        ((GetLastError() != ERROR_IO_PENDING) ||
+          ! GetOverlappedResult(pPipe->m_File, &os, &nBytes, TRUE)))
     {
-        BOOL fSuccess = WriteSimplePipe( pPipe->m_File, pBuffer, BytesToSend, &nBytes, TRUE );
-
-        if ( !fSuccess )
-        {
+          if (GetLastError() == ERROR_PIPE_NOT_CONNECTED)
             nBytes = 0;
-             pPipe->m_Error = osl_Pipe_E_ConnectionAbort;
-        }
+        else
+            nBytes = (DWORD) -1;
+
+         pPipe->m_Error = osl_Pipe_E_ConnectionAbort;
     }
 
     return (nBytes);
@@ -565,7 +454,7 @@ sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe,
 
 sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 n )
 {
-    /* loop until all desired bytes were send or an error occured */
+    /* loop until all desired bytes were send or an error occurred */
     sal_Int32 BytesSend= 0;
     sal_Int32 BytesToSend= n;
 
@@ -576,7 +465,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32
 
         RetVal= osl_sendPipe(pPipe, pBuffer, BytesToSend);
 
-        /* error occured? */
+        /* error occurred? */
         if(RetVal <= 0)
         {
             break;
@@ -592,7 +481,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32
 
 sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
 {
-    /* loop until all desired bytes were read or an error occured */
+    /* loop until all desired bytes were read or an error occurred */
     sal_Int32 BytesRead= 0;
     sal_Int32 BytesToRead= n;
 
@@ -602,7 +491,7 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
         sal_Int32 RetVal;
         RetVal= osl_receivePipe(pPipe, pBuffer, BytesToRead);
 
-        /* error occured? */
+        /* error occurred? */
         if(RetVal <= 0)
         {
             break;
@@ -634,3 +523,4 @@ oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe)
     return (Error);
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/pipeimpl.cxx b/sal/osl/w32/pipeimpl.cxx
deleted file mode 100644
index 1d492115e8c5..000000000000
--- a/sal/osl/w32/pipeimpl.cxx
+++ /dev/null
@@ -1,785 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-#   include "pipeimpl.h"
-
-#ifndef _INC_MALLOC
-#   include <malloc.h>
-#endif
-
-#ifndef _INC_TCHAR
-#   ifdef UNICODE
-#       define _UNICODE
-#   endif
-#   include <tchar.h>
-#endif
-
-const TCHAR PIPE_NAME_PREFIX_MAPPING[] = TEXT("PIPE_FILE_MAPPING_");
-const TCHAR PIPE_NAME_PREFIX_SYNCHRONIZE[] = TEXT("PIPE_SYNCHRONIZE_MUTEX_");
-const TCHAR PIPE_NAME_PREFIX_CONNECTION[] = TEXT("PIPE_CONNECTION_SEMAPHORE_");
-
-const DWORD PIPE_BUFFER_SIZE = 4096;
-
-
-//============================================================================
-//  PipeData
-//============================================================================
-
-struct PipeData
-{
-    DWORD   dwProcessId;
-    HANDLE  hReadPipe;
-    HANDLE  hWritePipe;
-};
-
-//============================================================================
-//  Pipe
-//============================================================================
-
-#ifdef UNICODE
-#define Pipe        PipeW
-#define ClientPipe  ClientPipeW
-#define ServerPipe  ServerPipeW
-#else
-#define Pipe        PipeA
-#define ClientPipe  ClientPipeA
-#define ServerPipe  ServerPipeA
-#endif
-
-class Pipe
-{
-protected:
-    HANDLE  m_hReadPipe;    // Handle to use for reading
-    HANDLE  m_hWritePipe;   // Handle to use for writing
-
-    Pipe( HANDLE hReadPipe, HANDLE hWritePipe );
-
-    static HANDLE CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner );
-    static HANDLE CreatePipeDataMapping( LPCTSTR lpName );
-    static HANDLE OpenPipeDataMapping( LPCTSTR lpName );
-    static HANDLE CreatePipeConnectionSemaphore( LPCTSTR lpName, LONG lInitialCount, LONG lMaximumcount );
-
-public:
-    Pipe( const Pipe& );
-    const Pipe& operator = ( const Pipe& );
-    virtual ~Pipe();
-
-    virtual bool Close();
-    virtual bool Write( LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, bool bWait = true );
-    virtual bool Read( LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, bool bWait = true );
-
-    virtual Pipe *AcceptConnection()
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return NULL;
-    }
-
-    void * operator new( size_t nBytes )
-    {
-        return HeapAlloc( GetProcessHeap(), 0, nBytes );
-    }
-
-    void operator delete( void *ptr )
-    {
-        HeapFree( GetProcessHeap(), 0, ptr );
-    }
-
-    bool is() const
-    {
-        return (FALSE != HeapValidate( GetProcessHeap(), 0, this ));
-    }
-
-};
-
-//============================================================================
-//  ClientPipe
-//============================================================================
-
-class ClientPipe : public Pipe
-{
-protected:
-    ClientPipe( HANDLE hReadPipe, HANDLE hWritePipe );
-public:
-    static ClientPipe* Create( LPCTSTR lpName );
-};
-
-//============================================================================
-//  ServerPipe
-//============================================================================
-
-class ServerPipe : public Pipe
-{
-protected:
-    HANDLE  m_hMapping;
-    HANDLE  m_hSynchronize;
-    LPTSTR  m_lpName;
-
-    ServerPipe( LPCTSTR lpName, HANDLE hMapping, HANDLE hSynchronize, HANDLE hReadPipe, HANDLE hWritePipe );
-public:
-    virtual ~ServerPipe();
-
-    static ServerPipe *Create( LPCTSTR lpName );
-
-    virtual Pipe *AcceptConnection();
-};
-
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
-HANDLE  Pipe::CreatePipeDataMapping( LPCTSTR lpName )
-{
-    HANDLE  hMapping = NULL;
-    LPTSTR  lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
-
-    if ( lpMappingName )
-    {
-        _tcscpy( lpMappingName, PIPE_NAME_PREFIX_MAPPING );
-        _tcscat( lpMappingName, lpName );
-
-        LPTSTR  lpMappingFileName = (LPTSTR)alloca( MAX_PATH * sizeof(TCHAR) );
-
-        if ( lpMappingFileName )
-        {
-            DWORD   nChars = GetTempPath( MAX_PATH, lpMappingFileName );
-
-            if ( MAX_PATH + _tcslen(lpName) < nChars + 1 )
-            {
-                lpMappingFileName = (LPTSTR)alloca( (nChars + 1 + _tcslen(lpName)) * sizeof(TCHAR) );
-                if ( lpMappingFileName )
-                    nChars = GetTempPath( nChars, lpMappingFileName );
-                else
-                {
-                    nChars = 0;
-                    SetLastError( ERROR_NOT_ENOUGH_MEMORY );
-                }
-            }
-
-            if ( nChars )
-            {
-                _tcscat( lpMappingFileName, lpMappingName );
-
-                HANDLE hFile = CreateFile(
-                    lpMappingFileName,
-                    GENERIC_READ | GENERIC_WRITE,
-                    FILE_SHARE_READ | FILE_SHARE_WRITE,
-                    NULL,
-                    OPEN_ALWAYS,
-                    FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE,
-                    NULL );
-
-                if ( IsValidHandle(hFile) )
-                {
-                    hMapping = CreateFileMapping(
-                        (HANDLE)hFile,
-                        (LPSECURITY_ATTRIBUTES)NULL,
-                        PAGE_READWRITE,
-                        0,
-                        sizeof(PipeData),
-                        lpMappingName );
-
-                    CloseHandle( hFile );
-                }
-            }
-        }
-        else
-            SetLastError( ERROR_NOT_ENOUGH_MEMORY );
-    }
-
-    return hMapping;
-}
-
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
-HANDLE  Pipe::OpenPipeDataMapping( LPCTSTR lpName )
-{
-    HANDLE  hMapping = NULL;
-    LPTSTR  lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
-
-    if ( lpMappingName )
-    {
-        _tcscpy( lpMappingName, PIPE_NAME_PREFIX_MAPPING );
-        _tcscat( lpMappingName, lpName );
-
-        hMapping = OpenFileMapping( FILE_MAP_ALL_ACCESS, FALSE, lpMappingName );
-    }
-
-    return hMapping;
-}
-
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
-HANDLE  Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
-{
-    HANDLE  hMutex = NULL;
-    LPTSTR  lpMutexName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_SYNCHRONIZE) );
-
-    if ( lpMutexName )
-    {
-        _tcscpy( lpMutexName, PIPE_NAME_PREFIX_SYNCHRONIZE );
-        _tcscat( lpMutexName, lpName );
-
-        hMutex = CreateMutex( NULL, bInitialOwner, lpMutexName );
-    }
-
-    return hMutex;
-}
-
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
-HANDLE Pipe::CreatePipeConnectionSemaphore( LPCTSTR lpName, LONG lInitialCount, LONG lMaximumCount )
-{
-    HANDLE  hSemaphore = NULL;
-    LPTSTR  lpSemaphoreName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_CONNECTION) );
-
-    if ( lpSemaphoreName )
-    {
-        _tcscpy( lpSemaphoreName, PIPE_NAME_PREFIX_CONNECTION );
-        _tcscat( lpSemaphoreName, lpName );
-
-        hSemaphore = CreateSemaphore( NULL, lInitialCount, lMaximumCount, lpSemaphoreName );
-    }
-
-    return hSemaphore;
-}
-
-
-//----------------------------------------------------------------------------
-//  Pipe copy ctor
-//----------------------------------------------------------------------------
-
-Pipe::Pipe( const Pipe& rPipe ) :
-m_hReadPipe( INVALID_HANDLE_VALUE ),
-m_hWritePipe( INVALID_HANDLE_VALUE )
-{
-    DuplicateHandle(
-        GetCurrentProcess(),
-        rPipe.m_hReadPipe,
-        GetCurrentProcess(),
-        &m_hReadPipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    DuplicateHandle(
-        GetCurrentProcess(),
-        rPipe.m_hWritePipe,
-        GetCurrentProcess(),
-        &m_hWritePipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-}
-
-//----------------------------------------------------------------------------
-//  Pipe assignment operator
-//----------------------------------------------------------------------------
-
-const Pipe& Pipe::operator = ( const Pipe& rPipe )
-{
-    Close();
-
-    DuplicateHandle(
-        GetCurrentProcess(),
-        rPipe.m_hReadPipe,
-        GetCurrentProcess(),
-        &m_hReadPipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    DuplicateHandle(
-        GetCurrentProcess(),
-        rPipe.m_hWritePipe,
-        GetCurrentProcess(),
-        &m_hWritePipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-//  Pipe ctor
-//----------------------------------------------------------------------------
-
-Pipe::Pipe( HANDLE hReadPipe, HANDLE hWritePipe ) :
-m_hReadPipe( INVALID_HANDLE_VALUE ),
-m_hWritePipe( INVALID_HANDLE_VALUE )
-{
-    DuplicateHandle(
-        GetCurrentProcess(),
-        hReadPipe,
-        GetCurrentProcess(),
-        &m_hReadPipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    DuplicateHandle(
-        GetCurrentProcess(),
-        hWritePipe,
-        GetCurrentProcess(),
-        &m_hWritePipe,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-}
-
-//----------------------------------------------------------------------------
-//  Pipe dtor
-//----------------------------------------------------------------------------
-
-Pipe::~Pipe()
-{
-    Close();
-}
-
-//----------------------------------------------------------------------------
-//  Pipe Close
-//----------------------------------------------------------------------------
-
-bool Pipe::Close()
-{
-    bool    fSuccess = false;   // Assume failure
-
-    if ( IsValidHandle(m_hReadPipe) )
-    {
-        CloseHandle( m_hReadPipe );
-        m_hReadPipe = INVALID_HANDLE_VALUE;
-    }
-
-    if ( IsValidHandle(m_hWritePipe) )
-    {
-        CloseHandle( m_hWritePipe );
-        m_hWritePipe = INVALID_HANDLE_VALUE;
-    }
-
-    return fSuccess;
-}
-
-//----------------------------------------------------------------------------
-//  Pipe Write
-//----------------------------------------------------------------------------
-
-bool Pipe::Write( LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, bool bWait )
-{
-    DWORD   dwBytesAvailable = 0;
-    BOOL    fSuccess = TRUE;
-
-    if ( !bWait )
-        fSuccess = PeekNamedPipe( m_hReadPipe, NULL, 0, NULL, &dwBytesAvailable, NULL );
-
-    if ( fSuccess )
-    {
-        if ( !bWait && dwBytesToWrite > PIPE_BUFFER_SIZE - dwBytesAvailable )
-            dwBytesToWrite = PIPE_BUFFER_SIZE - dwBytesAvailable ;
-
-        return !!WriteFile( m_hWritePipe, lpBuffer, dwBytesToWrite, lpBytesWritten, NULL );
-    }
-
-    return false;
-}
-
-//----------------------------------------------------------------------------
-//  Pipe Read
-//----------------------------------------------------------------------------
-
-bool Pipe::Read( LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, bool bWait )
-{
-    DWORD   dwBytesAvailable = 0;
-    BOOL    fSuccess = TRUE;
-
-    if ( !bWait )
-        fSuccess = PeekNamedPipe( m_hReadPipe, NULL, 0, NULL, &dwBytesAvailable, NULL );
-
-    if ( fSuccess )
-    {
-        if ( bWait || dwBytesAvailable )
-            return !!ReadFile( m_hReadPipe, lpBuffer, dwBytesToRead, lpBytesRead, NULL );
-        else
-        {
-            *lpBytesRead = 0;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-
-//----------------------------------------------------------------------------
-//  Client pipe dtor
-//----------------------------------------------------------------------------
-
-ClientPipe::ClientPipe( HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe, hWritePipe )
-{
-}
-
-//----------------------------------------------------------------------------
-//  Client pipe creation
-//----------------------------------------------------------------------------
-
-ClientPipe *ClientPipe::Create( LPCTSTR lpName )
-{
-    ClientPipe  *pPipe = NULL;  // Assume failure
-
-    HANDLE  hMapping = OpenPipeDataMapping( lpName );
-
-    if ( IsValidHandle(hMapping) )
-    {
-        PipeData    *pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
-
-        if ( pData )
-        {
-            HANDLE  hSourceProcess = OpenProcess( PROCESS_DUP_HANDLE, FALSE, pData->dwProcessId );
-
-            if ( IsValidHandle(hSourceProcess) )
-            {
-                BOOL fSuccess;
-                HANDLE  hReadPipe = INVALID_HANDLE_VALUE, hWritePipe = INVALID_HANDLE_VALUE;
-
-                fSuccess = DuplicateHandle(
-                    hSourceProcess,
-                    pData->hReadPipe,
-                    GetCurrentProcess(),
-                    &hReadPipe,
-                    0,
-                    FALSE,
-                    DUPLICATE_SAME_ACCESS );
-
-                fSuccess = fSuccess && DuplicateHandle(
-                    hSourceProcess,
-                    pData->hWritePipe,
-                    GetCurrentProcess(),
-                    &hWritePipe,
-                    0,
-                    FALSE,
-                    DUPLICATE_SAME_ACCESS );
-
-                if ( fSuccess )
-                    pPipe = new ClientPipe( hReadPipe, hWritePipe );
-
-                if ( IsValidHandle(hWritePipe) )
-                    CloseHandle( hWritePipe );
-
-                if ( IsValidHandle(hReadPipe) )
-                    CloseHandle( hReadPipe );
-
-                HANDLE  hConnectionRequest = CreatePipeConnectionSemaphore( lpName, 0, 1 );
-
-                ReleaseSemaphore( hConnectionRequest, 1, NULL );
-
-                CloseHandle( hConnectionRequest );
-
-                CloseHandle( hSourceProcess );
-            }
-
-            UnmapViewOfFile( pData );
-        }
-
-        CloseHandle( hMapping );
-    }
-
-    return pPipe;
-}
-
-
-
-//----------------------------------------------------------------------------
-//  ServerPipe ctor
-//----------------------------------------------------------------------------
-
-ServerPipe::ServerPipe( LPCTSTR lpName, HANDLE hMapping, HANDLE hSynchronize, HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe, hWritePipe ),
-m_hMapping( NULL ),
-m_hSynchronize( NULL ),
-m_lpName( NULL )
-{
-    DuplicateHandle(
-        GetCurrentProcess(),
-        hMapping,
-        GetCurrentProcess(),
-        &m_hMapping,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS );
-
-    DuplicateHandle(
-        GetCurrentProcess(),
-        hSynchronize,
-        GetCurrentProcess(),
-        &m_hSynchronize,
-        0,
-        FALSE,
-        DUPLICATE_SAME_ACCESS
-        );
-    m_lpName = new TCHAR[_tcslen(lpName) + 1];
-    if ( m_lpName )
-        _tcscpy( m_lpName, lpName );
-}
-
-//----------------------------------------------------------------------------
-//  ServerPipe dtor
-//----------------------------------------------------------------------------
-
-ServerPipe::~ServerPipe()
-{
-    if ( IsValidHandle(m_hMapping) )
-        CloseHandle( m_hMapping );
-    if ( m_lpName )
-        delete[]m_lpName;
-}
-
-//----------------------------------------------------------------------------
-//  ServerPipe AcceptConnection
-//----------------------------------------------------------------------------
-
-Pipe *ServerPipe::AcceptConnection()
-{
-    Pipe    *pPipe = NULL;  // Assume failure;
-
-    HANDLE  hConnectionRequest = CreatePipeConnectionSemaphore( m_lpName, 0, 1 );
-
-    if ( WAIT_OBJECT_0 == WaitForSingleObject( hConnectionRequest, INFINITE ) )
-    {
-        pPipe = new Pipe( *this );
-        Close();
-
-        // Create new inbound Pipe
-
-        HANDLE  hClientWritePipe = NULL, hServerReadPipe = NULL;
-
-        BOOL    fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
-
-
-        if ( fSuccess )
-        {
-            // Create outbound pipe
-
-            HANDLE  hClientReadPipe = NULL, hServerWritePipe = NULL;
-
-            if ( CreatePipe( &hClientReadPipe, &hServerWritePipe, NULL, PIPE_BUFFER_SIZE ) )
-            {
-                m_hReadPipe = hServerReadPipe;
-                m_hWritePipe = hServerWritePipe;
-
-                PipeData    *pData = (PipeData *)MapViewOfFile( m_hMapping, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(PipeData) );
-
-                HANDLE  hSynchronize = CreatePipeDataMutex( m_lpName, TRUE );
-
-                CloseHandle( pData->hReadPipe );
-                CloseHandle( pData->hWritePipe );
-
-                pData->hReadPipe = hClientReadPipe;
-                pData->hWritePipe = hClientWritePipe;
-
-                ReleaseMutex( hSynchronize );
-
-                CloseHandle( hSynchronize );
-
-            }
-            else
-            {
-                CloseHandle( hClientWritePipe );
-                CloseHandle( hServerWritePipe );
-            }
-        }
-
-        ReleaseMutex( hConnectionRequest );
-    }
-
-    CloseHandle( hConnectionRequest );
-
-    return pPipe;
-}
-
-//----------------------------------------------------------------------------
-//  Pipe creation
-//----------------------------------------------------------------------------
-
-ServerPipe *ServerPipe::Create( LPCTSTR lpName )
-{
-    ServerPipe  *pPipe = NULL;
-
-    HANDLE  hMapping = CreatePipeDataMapping( lpName );
-
-    if ( IsValidHandle(hMapping) )
-    {
-        if ( ERROR_FILE_EXISTS != GetLastError() )
-        {
-            HANDLE  hSynchronize = CreatePipeDataMutex( lpName, FALSE);
-
-            WaitForSingleObject( hSynchronize, INFINITE );
-
-            PipeData    *pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
-
-            if ( pData )
-            {
-
-                // Initialize pipe data
-
-                pData->dwProcessId = 0;
-                pData->hReadPipe = NULL;
-                pData->hWritePipe = NULL;
-
-                // Create inbound pipe
-
-                HANDLE  hServerReadPipe = NULL, hClientWritePipe = NULL;
-
-                BOOL    fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
-
-                if ( fSuccess )
-                {
-                    // Create outbound pipe
-
-                    HANDLE  hServerWritePipe = NULL, hClientReadPipe = NULL;
-
-                    fSuccess = CreatePipe( &hClientReadPipe, &hServerWritePipe, NULL, PIPE_BUFFER_SIZE );
-
-                    if ( fSuccess )
-                    {
-                        pData->dwProcessId = GetCurrentProcessId();
-                        pData->hReadPipe = hClientReadPipe;
-                        pData->hWritePipe = hClientWritePipe;
-                        pPipe = new ServerPipe( lpName, hMapping, hSynchronize, hServerReadPipe, hServerWritePipe );
-
-                        CloseHandle( hServerWritePipe );
-                        CloseHandle( hServerReadPipe );
-                    }
-                    else
-                    {
-                        CloseHandle( hServerReadPipe );
-                        CloseHandle( hClientWritePipe );
-                    }
-                }
-
-                UnmapViewOfFile( pData );
-            }
-
-            ReleaseMutex( hSynchronize );
-            CloseHandle( hSynchronize );
-        }
-
-        CloseHandle( hMapping );
-    }
-
-    return pPipe;
-}
-
-
-//----------------------------------------------------------------------------
-//  C style API
-//----------------------------------------------------------------------------
-
-const TCHAR LOCAL_PIPE_PREFIX[] = TEXT("\\\\.\\PIPE\\" );
-
-extern "C" HANDLE WINAPI CreateSimplePipe( LPCTSTR lpName )
-{
-    int nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
-    if ( 0 == _tcsnicmp( lpName, LOCAL_PIPE_PREFIX, nPrefixLen ) )
-        lpName += nPrefixLen;
-    return (HANDLE)ServerPipe::Create( lpName );
-}
-
-extern "C" HANDLE WINAPI OpenSimplePipe( LPCTSTR lpName )
-{
-    int nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
-    if ( 0 == _tcsnicmp( lpName, LOCAL_PIPE_PREFIX, nPrefixLen ) )
-        lpName += nPrefixLen;
-    return (HANDLE)ClientPipe::Create( lpName );
-}
-
-extern "C" HANDLE WINAPI AcceptSimplePipeConnection( HANDLE hPipe )
-{
-    Pipe    *pPipe = (Pipe *)hPipe;
-
-    if ( pPipe->is() )
-        return (HANDLE)pPipe->AcceptConnection();
-    else
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return NULL;
-    }
-}
-
-extern "C" BOOL WINAPI WaitForSimplePipe( LPCTSTR /*lpName*/, DWORD /*dwTimeOut*/ )
-{
-    return FALSE;
-}
-
-extern "C" BOOL WINAPI WriteSimplePipe( HANDLE hPipe, LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, BOOL bWait )
-{
-    Pipe    *pPipe = (Pipe *)hPipe;
-
-    if ( pPipe->is() )
-        return pPipe->Write( lpBuffer, dwBytesToWrite, lpBytesWritten, bWait );
-    else
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return FALSE;
-    }
-}
-
-extern "C" BOOL WINAPI ReadSimplePipe( HANDLE hPipe, LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, BOOL bWait )
-{
-    Pipe    *pPipe = (Pipe *)hPipe;
-
-    if ( pPipe->is() )
-        return pPipe->Read( lpBuffer, dwBytesToRead, lpBytesRead, bWait );
-    else
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return FALSE;
-    }
-}
-
-extern "C" BOOL WINAPI CloseSimplePipe( HANDLE hPipe )
-{
-    Pipe    *pPipe = (Pipe *)hPipe;
-
-    if ( pPipe->is() )
-    {
-        delete pPipe;
-        return TRUE;
-    }
-    else
-    {
-        SetLastError( ERROR_INVALID_HANDLE );
-        return FALSE;
-    }
-}
diff --git a/sal/osl/w32/pipeimpl.h b/sal/osl/w32/pipeimpl.h
deleted file mode 100644
index 83f678f6c49d..000000000000
--- a/sal/osl/w32/pipeimpl.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef _PIPEIMPL_H_
-#define _PIPEIMPL_H_
-
-#ifndef _WINDOWS_
-# ifdef _MSC_VER
-#   pragma warning(push,1) /* disable warnings within system headers */
-# endif
-#   include <windows.h>
-# ifdef _MSC_VER
-#   pragma warning(pop)
-# endif
-#endif
-
-#ifndef _INC_MALLOC
-#   include <malloc.h>
-#endif
-
-#ifndef _INC_TCHAR
-#   ifdef UNICODE
-#       define _UNICODE
-#   endif
-#   include <tchar.h>
-#endif
-
-#define EXPORT_PIPE_API
-
-//============================================================================
-//  Helper functions
-//============================================================================
-
-// Because the value of an invalid HANDLE returned by API functions differs
-// between different functions and differs on different Windows platforms,
-// this function checks wether the handle has a meaningfull value.
-#ifndef __cplusplus
-
-#define IsValidHandle( handle ) ((DWORD)(handle) + 1 > 1)
-
-#else
-
-inline bool IsValidHandle( HANDLE handle )
-{
-    return INVALID_HANDLE_VALUE != handle && NULL != handle;
-}
-
-extern "C" {
-
-#endif  // __cplusplus
-
-
-EXPORT_PIPE_API HANDLE WINAPI CreateSimplePipeA( LPCSTR lpName );
-EXPORT_PIPE_API HANDLE WINAPI CreateSimplePipeW( LPCWSTR lpName );
-
-#ifdef UNICODE
-#define CreateSimplePipe    CreateSimplePipeW
-#else
-#define CreateSimplePipe    CreateSimplePipeA
-#endif
-
-EXPORT_PIPE_API HANDLE WINAPI OpenSimplePipeA( LPCSTR lpName );
-EXPORT_PIPE_API HANDLE WINAPI OpenSimplePipeW( LPCWSTR lpName );
-
-#ifdef UNICODE
-#define OpenSimplePipe  OpenSimplePipeW
-#else
-#define OpenSimplePipe  OpenSimplePipeA
-#endif
-
-EXPORT_PIPE_API HANDLE WINAPI AcceptSimplePipeConnection( HANDLE hPipe );
-
-EXPORT_PIPE_API BOOL WINAPI WaitForSimplePipeA( LPCSTR lpName, DWORD dwTimeOut );
-EXPORT_PIPE_API BOOL WINAPI WaitForSimplePipeW( LPCWSTR lpName, DWORD dwTimeOut );
-
-#ifdef UNICODE
-#define WaitForSimplePipe   WaitForSimplePipeW
-#else
-#define WaitForSimplePipe   WaitForSimplePipeA
-#endif
-
-
-EXPORT_PIPE_API BOOL WINAPI WriteSimplePipe( HANDLE hPipe, LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, BOOL bWait );
-EXPORT_PIPE_API BOOL WINAPI ReadSimplePipe( HANDLE hPipe, LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, BOOL bWait );
-EXPORT_PIPE_API BOOL WINAPI CloseSimplePipe( HANDLE hPipe );
-
-#ifdef __cplusplus
-}   // extern "C"
-#endif
-
-#endif  // _PIPEIMPL_H_
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 521ac6f76ad4..3fec90a8483a 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,6 +28,7 @@
 
 #define UNICODE
 #include "system.h"
+#include <string.h>
 #ifdef _MSC_VER
 #pragma warning(push,1) /* disable warnings within system headers */
 #endif
@@ -418,7 +420,15 @@ oslProcessError SAL_CALL osl_setEnvironment(rtl_uString *ustrVar, rtl_uString *u
     LPCWSTR lpName = reinterpret_cast<LPCWSTR>(ustrVar->buffer);
     LPCWSTR lpValue = reinterpret_cast<LPCWSTR>(ustrValue->buffer);
     if (SetEnvironmentVariableW(lpName, lpValue))
+    {
+        wchar_t *buffer = new wchar_t[wcslen(lpName) + 1 + wcslen(lpValue) + 1];
+        wcscpy(buffer, lpName);
+        wcscat(buffer, L"=");
+        wcscat(buffer, lpValue);
+        _wputenv(buffer);
+        delete[] buffer;
         return osl_Process_E_None;
+    }
     return osl_Process_E_Unknown;
 }
 
@@ -428,7 +438,14 @@ oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString *ustrVar)
     //process's environment.
     LPCWSTR lpName = reinterpret_cast<LPCWSTR>(ustrVar->buffer);
     if (SetEnvironmentVariableW(lpName, NULL))
+    {
+        wchar_t *buffer = new wchar_t[wcslen(lpName) + 1 + 1];
+        wcscpy(buffer, lpName);
+        wcscat(buffer, L"=");
+        _wputenv(buffer);
+        delete[] buffer;
         return osl_Process_E_None;
+    }
     return osl_Process_E_Unknown;
 }
 
@@ -637,3 +654,5 @@ oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe hPipe)
 
     return pSocket;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index a2f86422df2a..7ef6fb62ad8c 100755..100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,8 +62,8 @@ extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle( HANDLE hFile
 //#################################################
 const sal_Unicode NAME_VALUE_SEPARATOR = TEXT('=');
 const sal_Char* SPACE = " ";
-const rtl::OUString ENV_COMSPEC = rtl::OUString::createFromAscii("COMSPEC");
-const rtl::OUString QUOTE = rtl::OUString::createFromAscii("\"");
+const rtl::OUString ENV_COMSPEC (RTL_CONSTASCII_USTRINGPARAM("COMSPEC"));
+const rtl::OUString QUOTE(RTL_CONSTASCII_USTRINGPARAM("\""));
 
 namespace /* private */
 {
@@ -314,7 +315,7 @@ namespace /* private */
             std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec(path.getLength() + 1);
             //GetShortPathNameW only works if the file can be found!
             const DWORD len = GetShortPathNameW(
-                path.getStr(), &vec[0], path.getLength() + 1);
+                reinterpret_cast<LPCWSTR>(path.getStr()), reinterpret_cast<LPWSTR>(&vec[0]), path.getLength() + 1);
 
             if (!len && GetLastError() == ERROR_FILE_NOT_FOUND
                 && extension.getLength())
@@ -323,7 +324,7 @@ namespace /* private */
                 std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec2(
                     extPath.getLength() + 1);
                 const DWORD len2 = GetShortPathNameW(
-                    extPath.getStr(), &vec2[0], extPath.getLength() + 1);
+                    reinterpret_cast<LPCWSTR>(extPath.getStr()), reinterpret_cast<LPWSTR>(&vec2[0]), extPath.getLength() + 1);
                 ret = rtl::OUString(&vec2[0], len2);
             }
             else
@@ -626,7 +627,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
         }
     }
 
-    /* if an error occured we have to close the server side pipe ends too */
+    /* if an error occurred we have to close the server side pipe ends too */
 
     if (hInputWrite)
         CloseHandle(hInputWrite);
@@ -639,3 +640,5 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
 
     return osl_Process_E_Unknown;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/procimpl.h b/sal/osl/w32/procimpl.h
index b783f9b52ae2..c4092a6c71a1 100644
--- a/sal/osl/w32/procimpl.h
+++ b/sal/osl/w32/procimpl.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,4 @@ typedef struct _oslProcessImpl {
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 9f4ea5630e1f..54b92684c31a 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,6 +37,7 @@
 #include <osl/file.h>
 #include <osl/util.h>
 #include <rtl/alloc.h>
+#include <sal/macros.h>
 #include <algorithm>
 using std::min;
 static inline void copy_ustr_n( void *dest, const void *source, size_t length ) { rtl_copyMemory(dest, source, length*sizeof(sal_Unicode)); }
@@ -1274,11 +1276,6 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi
 
     if (! bWriteable)
     {
-#if 0
-//#ifdef DEBUG_OSL_PROFILE
-        OSL_TRACE("opening '%s' read only\n",pszFilename);
-#endif
-
         pFile->m_Handle = CreateFileW( reinterpret_cast<LPCWSTR>(rtl_uString_getStr( strFileName )), GENERIC_READ,
                                           FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                                           OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -1506,10 +1503,6 @@ static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine)
 {
     unsigned int Len = strlen(pszLine);
 
-#ifdef DEBUG_OSL_PROFILE
-    int strLen=0;
-#endif
-
     if ( pFile == 0 || pFile->m_Handle < 0 )
     {
         return (sal_False);
@@ -1542,19 +1535,13 @@ static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine)
 
 
     memcpy(pFile->m_pWriteBuf + ( pFile->m_nWriteBufLen - pFile->m_nWriteBufFree ),pszLine,Len+1);
-#ifdef DEBUG_OSL_PROFILE
-    strLen = strlen(pFile->m_pWriteBuf);
-#endif
+
     pFile->m_pWriteBuf[pFile->m_nWriteBufLen - pFile->m_nWriteBufFree + Len]='\r';
     pFile->m_pWriteBuf[pFile->m_nWriteBufLen - pFile->m_nWriteBufFree + Len + 1]='\n';
     pFile->m_pWriteBuf[pFile->m_nWriteBufLen - pFile->m_nWriteBufFree + Len + 2]='\0';
 
     pFile->m_nWriteBufFree-=Len+2;
 
-#ifdef DEBUG_OSL_PROFILE
-/*    OSL_TRACE("File Buffer in _putLine '%s' '%i'(%i)\n",pFile->m_pWriteBuf,strlen(pFile->m_pWriteBuf),pFile->m_nWriteBufLen - pFile->m_nWriteBufFree);*/
-#endif
-
     return (sal_True);
 }
 
@@ -2560,7 +2547,7 @@ static sal_Bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *str
                 int i = 0;
                 pStr = aTmpPath + nPos;
 
-                for (i = 0; i < (sizeof(SubDirs) / sizeof(SubDirs[0])); i++)
+                for (i = 0; i < SAL_N_ELEMENTS(SubDirs); i++)
                     if (strnicmp(pStr + 1, SubDirs[i], strlen(SubDirs[i])) == 0)
                     {
                         if ( *strPath == 0)
@@ -2705,3 +2692,4 @@ static sal_Bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *str
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx
index ab124620a07c..ffe2c7e70132 100644
--- a/sal/osl/w32/salinit.cxx
+++ b/sal/osl/w32/salinit.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,5 @@ void SAL_CALL sal_detail_deinitialize()
 #ifdef __cplusplus
 }   // extern "C"
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/secimpl.h b/sal/osl/w32/secimpl.h
index 97a9d9c44f9e..1a3f5a6c834a 100644
--- a/sal/osl/w32/secimpl.h
+++ b/sal/osl/w32/secimpl.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,4 @@ typedef struct _oslSecurityImpl {
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c
index 237ea67dc949..56ca5623a08a 100644
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,6 +34,7 @@
 #include <osl/thread.h>
 #include <osl/file.h>
 #include <systools/win32/uwinapi.h>
+#include <sal/macros.h>
 #include "secimpl.h"
 
 /*****************************************************************************/
@@ -83,7 +85,6 @@ typedef BOOL (STDMETHODCALLTYPE FAR * LPFNGETUSERPROFILEDIR) (
 /* Static Module Function Declarations */
 /*****************************************************************************/
 
-static sal_Bool isWNT(void);
 static sal_Bool GetSpecialFolder(rtl_uString **strPath,int nFolder);
 static BOOL Privilege(LPTSTR pszPrivilege, BOOL bEnable);
 static sal_Bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **strName, sal_Bool bIncludeDomain);
@@ -108,54 +109,46 @@ oslSecurityError SAL_CALL osl_loginUser( rtl_uString *strUserName, rtl_uString *
 {
     oslSecurityError ret;
 
-    if (!isWNT())
-    {
-        *pSecurity = osl_getCurrentSecurity();
-        ret = osl_Security_E_None;
-    }
-    else
-    {
-        sal_Unicode*    strUser;
-        sal_Unicode*    strDomain = _wcsdup(rtl_uString_getStr(strUserName));
-        HANDLE  hUserToken;
+    sal_Unicode*    strUser;
+    sal_Unicode*    strDomain = _wcsdup(rtl_uString_getStr(strUserName));
+    HANDLE  hUserToken;
 
-        #if OSL_DEBUG_LEVEL > 0
-            LUID luid;
-        #endif
-
-        if (NULL != (strUser = wcschr(strDomain, L'/')))
-            *strUser++ = L'\0';
-        else
-        {
-            strUser   = strDomain;
-            strDomain = NULL;
-        }
+    #if OSL_DEBUG_LEVEL > 0
+        LUID luid;
+    #endif
 
-        // this process must have the right: 'act as a part of operatingsystem'
-        OSL_ASSERT(LookupPrivilegeValue(NULL, SE_TCB_NAME, &luid));
+    if (NULL != (strUser = wcschr(strDomain, L'/')))
+        *strUser++ = L'\0';
+    else
+    {
+        strUser   = strDomain;
+        strDomain = NULL;
+    }
 
-        if (LogonUserW(strUser, strDomain ? strDomain : L"", rtl_uString_getStr(strPasswd),
-                      LOGON32_LOGON_INTERACTIVE, LOGON32_PROVIDER_DEFAULT,
-                       &hUserToken))
-        {
-            oslSecurityImpl* pSecImpl = malloc(sizeof(oslSecurityImpl));
+    // this process must have the right: 'act as a part of operatingsystem'
+    OSL_ASSERT(LookupPrivilegeValue(NULL, SE_TCB_NAME, &luid));
 
-            pSecImpl->m_pNetResource = NULL;
-            pSecImpl->m_hToken = hUserToken;
-            pSecImpl->m_hProfile = NULL;
-            wcscpy(pSecImpl->m_User, strUser);
+    if (LogonUserW(strUser, strDomain ? strDomain : L"", rtl_uString_getStr(strPasswd),
+                  LOGON32_LOGON_INTERACTIVE, LOGON32_PROVIDER_DEFAULT,
+                   &hUserToken))
+    {
+        oslSecurityImpl* pSecImpl = malloc(sizeof(oslSecurityImpl));
 
-            *pSecurity = (oslSecurity)pSecImpl;
-            ret = osl_Security_E_None;
-        }
-        else
-            ret = osl_Security_E_UserUnknown;
+        pSecImpl->m_pNetResource = NULL;
+        pSecImpl->m_hToken = hUserToken;
+        pSecImpl->m_hProfile = NULL;
+        wcscpy(pSecImpl->m_User, strUser);
 
-        if (strDomain)
-            free(strDomain);
-        else
-            free(strUser);
+        *pSecurity = (oslSecurity)pSecImpl;
+        ret = osl_Security_E_None;
     }
+    else
+        ret = osl_Security_E_UserUnknown;
+
+    if (strDomain)
+        free(strDomain);
+    else
+        free(strUser);
 
     return ret;
 }
@@ -250,56 +243,48 @@ sal_Bool SAL_CALL osl_isAdministrator(oslSecurity Security)
 {
     if (Security != NULL)
     {
-        /* ts: on Window 95 systems any user seems to be an adminstrator */
-        if (!isWNT())
-        {
-            return(sal_True);
-        }
-        else
-        {
-            HANDLE                      hImpersonationToken = NULL;
-            PSID                        psidAdministrators;
-            SID_IDENTIFIER_AUTHORITY    siaNtAuthority = SECURITY_NT_AUTHORITY;
-            sal_Bool                    bSuccess = sal_False;
-
+        HANDLE                      hImpersonationToken = NULL;
+        PSID                        psidAdministrators;
+        SID_IDENTIFIER_AUTHORITY    siaNtAuthority = SECURITY_NT_AUTHORITY;
+        sal_Bool                    bSuccess = sal_False;
 
-            /* If Security contains an access token we need to duplicate it to an impersonation
-               access token. NULL works with CheckTokenMembership() as the current effective
-               impersonation token
-             */
 
-            if ( ((oslSecurityImpl*)Security)->m_hToken )
-            {
-                if ( !DuplicateToken (((oslSecurityImpl*)Security)->m_hToken, SecurityImpersonation, &hImpersonationToken) )
-                    return sal_False;
-            }
+        /* If Security contains an access token we need to duplicate it to an impersonation
+           access token. NULL works with CheckTokenMembership() as the current effective
+           impersonation token
+         */
 
-            /* CheckTokenMembership() can be used on W2K and higher (NT4 no longer supported by OOo)
-               and also works on Vista to retrieve the effective user rights. Just checking for
-               membership of Administrators group is not enough on Vista this would require additional
-               complicated checks as described in KB arcticle Q118626: http://support.microsoft.com/kb/118626/en-us
-            */
+        if ( ((oslSecurityImpl*)Security)->m_hToken )
+        {
+            if ( !DuplicateToken (((oslSecurityImpl*)Security)->m_hToken, SecurityImpersonation, &hImpersonationToken) )
+                return sal_False;
+        }
 
-            if (AllocateAndInitializeSid(&siaNtAuthority,
-                                         2,
-                                          SECURITY_BUILTIN_DOMAIN_RID,
-                                          DOMAIN_ALIAS_RID_ADMINS,
-                                          0, 0, 0, 0, 0, 0,
-                                          &psidAdministrators))
-            {
-                BOOL    fSuccess = FALSE;
+        /* CheckTokenMembership() can be used on W2K and higher (NT4 no longer supported by OOo)
+           and also works on Vista to retrieve the effective user rights. Just checking for
+           membership of Administrators group is not enough on Vista this would require additional
+           complicated checks as described in KB arcticle Q118626: http://support.microsoft.com/kb/118626/en-us
+        */
+
+        if (AllocateAndInitializeSid(&siaNtAuthority,
+                                     2,
+                                      SECURITY_BUILTIN_DOMAIN_RID,
+                                      DOMAIN_ALIAS_RID_ADMINS,
+                                      0, 0, 0, 0, 0, 0,
+                                      &psidAdministrators))
+        {
+            BOOL    fSuccess = FALSE;
 
-                if ( CheckTokenMembership_Stub( hImpersonationToken, psidAdministrators, &fSuccess ) && fSuccess )
-                    bSuccess = sal_True;
+            if ( CheckTokenMembership_Stub( hImpersonationToken, psidAdministrators, &fSuccess ) && fSuccess )
+                bSuccess = sal_True;
 
-                FreeSid(psidAdministrators);
-            }
+            FreeSid(psidAdministrators);
+        }
 
-            if ( hImpersonationToken )
-                CloseHandle( hImpersonationToken );
+        if ( hImpersonationToken )
+            CloseHandle( hImpersonationToken );
 
-            return (bSuccess);
-        }
+        return (bSuccess);
     }
     else
         return (sal_False);
@@ -353,7 +338,17 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **strIdent)
                                            pInfoBuffer, nInfoBuffer, &nInfoBuffer))
             {
                 if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-                    pInfoBuffer = realloc(pInfoBuffer, nInfoBuffer);
+                {
+                    UCHAR* pTmp = realloc(pInfoBuffer, nInfoBuffer);
+                    if (pTmp)
+                        pInfoBuffer = pTmp;
+                    else
+                    {
+                        free(pInfoBuffer);
+                        pInfoBuffer = NULL;
+                        break;
+                    }
+                }
                 else
                 {
                     free(pInfoBuffer);
@@ -756,7 +751,7 @@ static sal_Bool GetSpecialFolder(rtl_uString **strPath, int nFolder)
                                    &hRegKey) == ERROR_SUCCESS)
                     {
                         LONG lRet;
-                        DWORD lSize = elementsof(PathA);
+                        DWORD lSize = SAL_N_ELEMENTS(PathA);
                         DWORD Type = REG_SZ;
 
                         switch (nFolder)
@@ -823,38 +818,6 @@ static sal_Bool GetSpecialFolder(rtl_uString **strPath, int nFolder)
 }
 
 
-static sal_Bool isWNT(void)
-{
-    static sal_Bool isInit = sal_False;
-    static sal_Bool isWNT = sal_False;
-
-    if (!isInit)
-    {
-        OSVERSIONINFO VersionInformation =
-
-        {
-            sizeof(OSVERSIONINFO),
-            0,
-            0,
-            0,
-            0,
-            "",
-        };
-
-        if (
-            GetVersionEx(&VersionInformation) &&
-            (VersionInformation.dwPlatformId == VER_PLATFORM_WIN32_NT)
-           )
-        {
-            isWNT = sal_True;
-        }
-
-        isInit = sal_True;
-    }
-
-    return(isWNT);
-}
-
 static BOOL Privilege(LPTSTR strPrivilege, BOOL bEnable)
 {
     HANDLE           hToken;
@@ -911,7 +874,17 @@ static sal_Bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **str
                                            pInfoBuffer, nInfoBuffer, &nInfoBuffer))
             {
                 if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-                    pInfoBuffer = realloc(pInfoBuffer, nInfoBuffer);
+                {
+                    UCHAR* pTmp = realloc(pInfoBuffer, nInfoBuffer);
+                    if (pTmp)
+                        pInfoBuffer = pTmp;
+                    else
+                    {
+                        free(pInfoBuffer);
+                        pInfoBuffer = NULL;
+                        break;
+                    }
+                }
                 else
                 {
                     free(pInfoBuffer);
@@ -989,3 +962,4 @@ static sal_Bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **str
     return sal_False;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/semaphor.c b/sal/osl/w32/semaphor.c
index e16a73d998fa..41df50f478fa 100644
--- a/sal/osl/w32/semaphor.c
+++ b/sal/osl/w32/semaphor.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,3 +110,4 @@ sal_Bool SAL_CALL osl_releaseSemaphore(oslSemaphore Semaphore)
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index a74baaefc057..659d66ee1c74 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,8 +39,9 @@
 #ifndef __MINGW32__
 #include <DbgHelp.h>
 #endif
-#include <ErrorRep.h>
+#include <errorrep.h>
 #include <systools/win32/uwinapi.h>
+#include <sal/macros.h>
 
 typedef struct _oslSignalHandlerImpl
 {
@@ -186,7 +188,7 @@ static BOOL ReportCrash( LPEXCEPTION_POINTERS lpEP )
         StartupInfo.cb = sizeof(StartupInfo.cb);
 
 
-        sntprintf( szBuffer, elementsof(szBuffer),
+        sntprintf( szBuffer, SAL_N_ELEMENTS(szBuffer),
             _T("%s -p %u -excp 0x%p -t %u%s"),
             static_cast<sal_Char*>( aPath ),
             GetCurrentProcessId(),
@@ -434,3 +436,5 @@ sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable )
 
     return bOld;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index 191c31fb986a..505507d61acf 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -289,25 +290,6 @@ static oslSocketError osl_SocketErrorFromNative(int nativeType)
 /*****************************************************************************/
 static oslSocketDialupImpl *pDialupImpl = NULL;
 
-#if 0  /* INTERNAL DEBUG ONLY */
-BOOL WINAPI __osl_autodial_Impl (DWORD dwFlags, DWORD dwReserved)
-{
-    return 0;
-}
-
-BOOL WINAPI __osl_autodialHangup_Impl (DWORD dwReserved)
-{
-    return 1;
-}
-
-BOOL WINAPI __osl_getConnectedState_Impl (LPDWORD lpdwFlags, DWORD dwReserved)
-{
-    if (lpdwFlags)
-        *lpdwFlags = 0;
-    return 0;
-}
-#endif /* INTERNAL DEBUG ONLY */
-
 /*
  * __osl_createSocketDialupImpl.
  */
@@ -350,7 +332,7 @@ static void __osl_initSocketDialupImpl (oslSocketDialupImpl *pImpl)
         LeaveCriticalSection (&pImpl->m_hMutex);
     }
 #else
-    pImpl = pImpl; /* avoid warnings */
+    (void)pImpl;
 #endif
 }
 
@@ -582,6 +564,8 @@ oslSocketAddr SAL_CALL osl_copySocketAddr(oslSocketAddr Addr)
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_isEqualSocketAddr(oslSocketAddr Addr1, oslSocketAddr Addr2)
 {
+    OSL_ASSERT(Addr1);
+    OSL_ASSERT(Addr2);
     struct sockaddr* pAddr1= &(Addr1->m_sockaddr);
     struct sockaddr* pAddr2= &(Addr2->m_sockaddr);
 
@@ -605,7 +589,7 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr(oslSocketAddr Addr1, oslSocketAddr Addr2
 
             default:
             {
-                return (memcmp(pAddr1, Addr2, sizeof(struct sockaddr)) == 0);
+                return (memcmp(pAddr1, pAddr2, sizeof(struct sockaddr)) == 0);
             }
         }
     }
@@ -1565,7 +1549,7 @@ sal_Int32 SAL_CALL osl_readSocket( oslSocket pSocket, void *pBuffer, sal_Int32 n
 
     OSL_ASSERT( pSocket);
 
-    /* loop until all desired bytes were read or an error occured */
+    /* loop until all desired bytes were read or an error occurred */
     sal_uInt32 BytesRead= 0;
     sal_uInt32 BytesToRead= n;
     while (BytesToRead > 0)
@@ -1576,7 +1560,7 @@ sal_Int32 SAL_CALL osl_readSocket( oslSocket pSocket, void *pBuffer, sal_Int32 n
                                    BytesToRead,
                                    osl_Socket_MsgNormal);
 
-        /* error occured? */
+        /* error occurred? */
         if(RetVal <= 0)
         {
             break;
@@ -1597,7 +1581,7 @@ sal_Int32 SAL_CALL osl_writeSocket( oslSocket pSocket, const void *pBuffer, sal_
 {
     OSL_ASSERT( pSocket );
 
-    /* loop until all desired bytes were send or an error occured */
+    /* loop until all desired bytes were send or an error occurred */
     sal_uInt32 BytesSend= 0;
     sal_uInt32 BytesToSend= n;
     sal_uInt8 *Ptr = ( sal_uInt8 * )pBuffer;
@@ -1607,7 +1591,7 @@ sal_Int32 SAL_CALL osl_writeSocket( oslSocket pSocket, const void *pBuffer, sal_
 
         RetVal= osl_sendSocket( pSocket,Ptr,BytesToSend,osl_Socket_MsgNormal);
 
-        /* error occured? */
+        /* error occurred? */
         if(RetVal <= 0)
         {
             break;
@@ -2188,3 +2172,5 @@ sal_Int32 SAL_CALL osl_demultiplexSocketEvents (
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/sockimpl.h b/sal/osl/w32/sockimpl.h
index d1278ee8e6ac..5887df981c4a 100644
--- a/sal/osl/w32/sockimpl.h
+++ b/sal/osl/w32/sockimpl.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -106,3 +107,4 @@ static sal_Bool __osl_attemptSocketDialupImpl (void);
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/system.h b/sal/osl/w32/system.h
index 1bd86994e6ce..163d8232a35a 100644
--- a/sal/osl/w32/system.h
+++ b/sal/osl/w32/system.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -104,23 +105,4 @@
     #   define NSPROTO_SPXII    1257
 #endif // #ifdef GCC
 
-#ifdef _DLL_
-
-#ifdef __cplusplus
-    extern "C" DWORD g_dwPlatformId;
-#else
-    extern DWORD g_dwPlatformId;
-#endif // #ifdef __cplusplus
-
-    #define IS_NT (g_dwPlatformId == VER_PLATFORM_WIN32_NT)
-#else
-
-#ifdef __cplusplus
-    extern "C" DWORD GetPlatformId(void);
-#else
-    extern DWORD GetPlatformId(void);
-#endif // #ifdef __cplusplus
-
-    #define IS_NT (GetPlatformId() == VER_PLATFORM_WIN32_NT)
-#endif // #ifdef _DLL_
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
index 6a3d2549004a..9922b699a932 100644
--- a/sal/osl/w32/tempfile.cxx
+++ b/sal/osl/w32/tempfile.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,7 +28,7 @@
 
 #define UNICODE
 #define _UNICODE
-#define _WIN32_WINNT_0x0500
+#define _WIN32_WINNT 0x0500
 #include "systools/win32/uwinapi.h"
 
 #include "osl/file.h"
@@ -42,8 +43,6 @@
 #include <tchar.h>
 
 //#####################################################
-#define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0])))
-
 // Allocate n number of t's on the stack return a pointer to it in p
 #ifdef __MINGW32__
 #define STACK_ALLOC(p, t, n) (p) = reinterpret_cast<t*>(_alloca((n)*sizeof(t)));
@@ -272,3 +271,4 @@ oslFileError SAL_CALL osl_getTempDirURL(rtl_uString** pustrTempDir)
     return error;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/thread.c b/sal/osl/w32/thread.c
index 8d85c8867b2d..02a67050083d 100755
--- a/sal/osl/w32/thread.c
+++ b/sal/osl/w32/thread.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -616,3 +617,4 @@ rtl_TextEncoding SAL_CALL osl_setThreadTextEncoding( rtl_TextEncoding Encoding )
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/time.c b/sal/osl/w32/time.c
index a4d0b6fffbad..a60028b18e92 100644
--- a/sal/osl/w32/time.c
+++ b/sal/osl/w32/time.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -214,3 +215,4 @@ sal_uInt32 SAL_CALL osl_getGlobalTimer(void)
   return ( nSeconds * 1000 ) + (long)( currentTime.millitm - startTime.millitm );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/util.c b/sal/osl/w32/util.c
index f4d8cbf52d20..08cda15ba0ef 100644
--- a/sal/osl/w32/util.c
+++ b/sal/osl/w32/util.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,10 @@
 
 
 
-extern sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 *pAddr )
+extern sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8* pAddr )
 {
-    pAddr = pAddr; /* avoid warnings */
+    (void)pAddr; //unused, but part of the API/ABI
     return sal_False;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index b7786f604eaf..4de757265f80 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -1,24 +1,32 @@
-sa	sal	:	xml2cmp stlport external BOOST:boost CPPUNIT:cppunit NULL 
+sa	sal	:	xml2cmp external BOOST:boost CPPUNIT:cppunit NULL
 sa	sal										usr1	-	all	sa_mkout NULL
 sa	sal\inc									nmake	-	all	sa_inc NULL
-sa	sal\typesconfig							nmake	-	u	sa_tc sa_inc NULL
+sa	sal\typesconfig							nmake	-	all	sa_tc sa_inc NULL
 sa	sal\cpprt								nmake	-	u	sa_cpprt sa_util sa_inc NULL
 sa	sal\rtl\source							nmake	-	all	sa_rtl sa_tc.u sa_inc NULL
 sa	sal\textenc								nmake	-	all	sa_textenc sa_tc.u sa_inc NULL
 sa	sal\systools\win32\uwinapi				nmake	-	n	sa_uwinapi sa_inc NULL
-sa	sal\systools\win32\kill					nmake	-	n	sa_kill sa_uwinapi.n sa_inc NULL
 sa	sal\systools\win32\onlineupdate			nmake	-	n	sa_onlineupdate sa_uwinapi.n sa_inc NULL
 sa	sal\osl\w32								nmake	-	n	sa_osln sa_inc NULL
 sa	sal\osl\os2								nmake	-	p	sa_oslp sa_inc NULL
 sa  sal\qa                                  nmake   -   all sa_qa sa_util NULL
 sa	sal\osl\unx								nmake	-	u	sa_oslu sa_tc.u sa_inc NULL
 sa	sal\osl\all								nmake	-	all	sa_oslall sa_tc.u sa_inc NULL
-sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_kill.n sa_onlineupdate.n sa_osln.n sa_oslp.p sa_oslu.u sa_rtl sa_textenc NULL
+sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_onlineupdate.n sa_osln.n sa_oslp.p sa_oslu.u sa_rtl sa_textenc NULL
 sa sal\cppunittester nmake - all sa_cppunittester sa_cpprt.u sa_util NULL
 sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util NULL
 sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_cppunittester sa_util NULL
-sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_cppunittester sa_util NULL
-sa sal\qa\osl\pipe nmake - all sa_qa_osl_pipe sa_cppunittester sa_util NULL
-sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_cppunittester sa_util NULL
-sa sal\qa\osl\setthreadname nmake - all sa_qa_osl_setthreadname sa_cppunittester sa_util NULL
-sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_cppunittester sa_util NULL
+sa sal\qa\osl\getsystempathfromfileurl nmake - all sa_qa_osl_getsystempathfromfileurl sa_cppunittester sa_util NULL
+sa sal\qa\osl\file nmake - u sa_qa_osl_file sa_cppunittester sa_util NULL
+sa sal\qa\osl\module nmake - u sa_qa_osl_module sa_cppunittester sa_util NULL
+sa sal\qa\osl\condition nmake - all sa_qa_osl_condition sa_cppunittester sa_util NULL
+sa sal\qa\osl\security nmake - all sa_qa_osl_security sa_cppunittester sa_util NULL
+sa sal\qa\osl\process nmake - all sa_qa_osl_process sa_cppunittester sa_util NULL
+sa sal\qa\rtl\strings nmake - all sa_qa_rt_strings sa_cppunittester sa_util NULL
+sa sal\qa\rtl\oustringbuffer nmake - all sa_qa_rt_oustringbuffer sa_cppunittester sa_util NULL
+sa sal\qa\rtl\alloc nmake - all sa_qa_rt_alloc sa_cppunittester sa_util NULL
+sa sal\qa\rtl\crc32 nmake - all sa_qa_rtl_crc32 sa_cppunittester sa_util NULL
+sa sal\qa\rtl\cipher nmake - all sa_qa_rtl_cipher sa_cppunittester sa_util NULL
+sa sal\qa\rtl\doublelock nmake - all sa_qa_rtl_doublelock sa_cppunittester sa_util NULL
+sa sal\qa\rtl\locale nmake - all sa_qa_rtl_locale sa_cppunittester sa_util NULL
+sa sal\qa\sal nmake - all sa_qa_sal sa_cppunittester sa_util NULL
diff --git a/sal/prj/d.lst b/sal/prj/d.lst
index 253d7ea7f718..981fc5ecbe0e 100644
--- a/sal/prj/d.lst
+++ b/sal/prj/d.lst
@@ -1,40 +1,42 @@
-mkdir: %_DEST%\inc%_EXT%\cppunittester
-mkdir: %_DEST%\inc%_EXT%\sal
-mkdir: %_DEST%\inc%_EXT%\osl
-mkdir: %_DEST%\inc%_EXT%\rtl
-mkdir: %_DEST%\inc%_EXT%\systools
-mkdir: %_DEST%\inc%_EXT%\systools\win32
+mkdir: %_DEST%\bin\cppunit
+mkdir: %_DEST%\inc\cppunittester
+mkdir: %_DEST%\inc\sal
+mkdir: %_DEST%\inc\osl
+mkdir: %_DEST%\inc\rtl
+mkdir: %_DEST%\inc\systools
+mkdir: %_DEST%\inc\systools\win32
 
-..\inc\cppunittester\protectorfactory.hxx %_DEST%\inc%_EXT%\protectorfactory.hxx
-..\%__SRC%\inc\rtlbootstrap.mk %_DEST%\inc%_EXT%\rtlbootstrap.mk
-..\inc\sal\*.h %_DEST%\inc%_EXT%\sal\*.h
-..\%__SRC%\inc\sal\typesizes.h %_DEST%\inc%_EXT%\sal\typesizes.h
-..\inc\osl\*.h %_DEST%\inc%_EXT%\osl\*.h
-..\inc\osl\*.hxx %_DEST%\inc%_EXT%\osl\*.hxx
-..\inc\rtl\*.h %_DEST%\inc%_EXT%\rtl\*.h
-..\inc\rtl\*.hxx %_DEST%\inc%_EXT%\rtl\*.hxx
-..\inc\systools\win32\*.h %_DEST%\inc%_EXT%\systools\win32\*.h
-..\inc\systools\win32\*.hxx %_DEST%\inc%_EXT%\systools\win32\*.hxx
+..\inc\cppunittester\protectorfactory.hxx %_DEST%\inc\protectorfactory.hxx
+..\%__SRC%\inc\rtlbootstrap.mk %_DEST%\inc\rtlbootstrap.mk
+..\inc\sal\*.h %_DEST%\inc\sal\*.h
+..\%__SRC%\inc\sal\typesizes.h %_DEST%\inc\sal\typesizes.h
+..\inc\osl\*.h %_DEST%\inc\osl\*.h
+..\inc\osl\*.hxx %_DEST%\inc\osl\*.hxx
+..\inc\rtl\*.h %_DEST%\inc\rtl\*.h
+..\inc\rtl\*.hxx %_DEST%\inc\rtl\*.hxx
+..\inc\systools\win32\*.h %_DEST%\inc\systools\win32\*.h
+..\inc\systools\win32\*.hxx %_DEST%\inc\systools\win32\*.hxx
 
-..\%__SRC%\lib\libsalalloc_malloc.so.3 %_DEST%\lib%_EXT%\libsalalloc_malloc.so.3
-symlink: %_DEST%\lib%_EXT%\libsalalloc_malloc.so.3 %_DEST%\lib%_EXT%\libsalalloc_malloc.so
-..\%__SRC%\lib\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so.3
-symlink: %_DEST%\lib%_EXT%\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so
-..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib.3
-symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\lib\libuno_sal.so.3 %_DEST%\lib\libuno_sal.so.3
+symlink: %_DEST%\lib\libuno_sal.so.3 %_DEST%\lib\libuno_sal.so
+..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib\libuno_sal.dylib.3
+symlink: %_DEST%\lib\libuno_sal.dylib.3 %_DEST%\lib\libuno_sal.dylib
+..\%__SRC%\lib\libsal_textenc.so.3 %_DEST%\lib\libsal_textenc.so.3
+symlink: %_DEST%\lib\libsal_textenc.so.3 %_DEST%\lib\libsal_textenc.so
+..\%__SRC%\lib\libsal_textenc.dylib.3 %_DEST%\lib\libsal_textenc.dylib.3
+symlink: %_DEST%\lib\libsal_textenc.dylib.3 %_DEST%\lib\libsal_textenc.dylib
+..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
 
-..\%__SRC%\slb\sal.lib %_DEST%\lib%_EXT%\xsal.lib
+..\%__SRC%\slb\sal.lib %_DEST%\lib\xsal.lib
 
-..\%__SRC%\bin\kill.exe %_DEST%\bin%_EXT%\kill.exe
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\misc\*.hid %_DEST%\bin%_EXT%\*.hid
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\bin\*.bin %_DEST%\bin\*.bin
+..\%__SRC%\misc\*.hid %_DEST%\bin\*.hid
+..\%__SRC%\bin\*.res %_DEST%\bin\*.res
 
-..\%__SRC%\inc\udkversion.h %_DEST%\inc%_EXT%\sal\udkversion.h
+..\%__SRC%\inc\udkversion.h %_DEST%\inc\sal\udkversion.h
 
-..\%__SRC%\bin\cppunittester %_DEST%\bin%_EXT%\cppunittester
-..\%__SRC%\bin\cppunittester.exe %_DEST%\bin%_EXT%\cppunittester.exe
+..\%__SRC%\bin\cppunittester.exe %_DEST%\bin\cppunit\cppunittester.exe
+..\%__SRC%\bin\cppunittester %_DEST%\bin\cppunit\cppunittester
diff --git a/sal/qa/ByteSequence/ByteSequence.cxx b/sal/qa/ByteSequence/ByteSequence.cxx
index 7c9ff2eaef94..f715c90134e2 100644
--- a/sal/qa/ByteSequence/ByteSequence.cxx
+++ b/sal/qa/ByteSequence/ByteSequence.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -192,3 +193,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk
index 9f7bfcfd25ce..60d87c83f18c 100644
--- a/sal/qa/ByteSequence/makefile.mk
+++ b/sal/qa/ByteSequence/makefile.mk
@@ -25,10 +25,6 @@
 #
 #***********************************************************************/
 
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
 PRJ = ../..
 PRJNAME = sal
 TARGET = qa_ByteSequence
@@ -39,6 +35,8 @@ ENABLE_EXCEPTIONS = TRUE
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1OBJS = $(SLO)/ByteSequence.obj
 SHL1RPATH = NONE
@@ -49,7 +47,7 @@ DEF1NAME = $(SHL1TARGET)
 
 SLOFILES = $(SHL1OBJS)
 
-.INCLUDE: target.mk
-.INCLUDE: _cppunit.mk
+.ENDIF
 
-.END
+.INCLUDE: target.mk
+.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk
index e0c1a81d66e3..e6419b72ba7f 100644
--- a/sal/qa/OStringBuffer/makefile.mk
+++ b/sal/qa/OStringBuffer/makefile.mk
@@ -25,10 +25,6 @@
 #
 #*************************************************************************
 
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
 PRJ=..$/..
 
 PRJNAME=sal
@@ -40,16 +36,13 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES= \
-#	  $(SLO)$/OStringBuffer.obj
-
 #----------------------------------- OStringBuffer -----------------------------------
 
 SHL1OBJS= \
@@ -70,9 +63,9 @@ SHL1RPATH = NONE
 # do this here, so we get right dependencies
 SLOFILES=$(SHL1OBJS)
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
-.END
+.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index e6a42793b15d..b01862f1bb86 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,37 +29,26 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-// -----------------------------------------------------------------------------
 #include <rtl/string.hxx>
 #include <rtl_String_Const.h>
 #include <rtl_String_Utils.hxx>
-
 #include <rtl/strbuf.hxx>
 
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
-
 #include <string.h>
 
-using namespace rtl;
-
-//------------------------------------------------------------------------
-// test classes
-//------------------------------------------------------------------------
-// const MAXBUFLENGTH = 255;
-//------------------------------------------------------------------------
-// helper functions
-//------------------------------------------------------------------------
+using ::rtl::OStringBuffer;
+using ::rtl::OString;
+// This file contains cppunit tests for the
+// OString and OStringBuffer classes
 
 //------------------------------------------------------------------------
 // testing constructors
 //------------------------------------------------------------------------
 
-// LLA: there exist some #if WITH_CORE #endif envelopes, which contain test code, which will core dump
-//      due to the fact, that we can't handle MAXINT32 right.
-
 namespace rtl_OStringBuffer
 {
     class  ctors : public CppUnit::TestFixture
@@ -103,29 +93,11 @@ namespace rtl_OStringBuffer
         void ctor_003()
         {
             ::rtl::OStringBuffer aStrBuf1(kTestStr2Len);
-#ifdef WITH_CORE
-            ::rtl::OStringBuffer aStrBuf2(kSInt32Max);     //will core dump
-            // LLA: will core, due to the fact, that ksint32max is too big, the max length can't
-            //      use, because there are some internal bytes, which we can't calculate.
-
-#else
             ::rtl::OStringBuffer aStrBuf2(0);
-#endif
 
             const sal_Char* pStr1 = aStrBuf1.getStr();
             const sal_Char* pStr2 = aStrBuf2.getStr();
 
-#ifdef WITH_CORE
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "New OStringBuffer containing no characters and contain assigned capacity",
-                aStrBuf1.getLength() == 0 &&
-                ! *(aStrBuf1.getStr()) && aStrBuf1.getCapacity() == kTestStr2Len &&
-                aStrBuf2.getLength() == 0 &&
-                ! *(aStrBuf2.getStr()) && aStrBuf2.getCapacity() == kSInt32Max
-
-            );
-#else
             CPPUNIT_ASSERT_MESSAGE
             (
                 "New OStringBuffer containing no characters and contain assigned capacity",
@@ -136,13 +108,13 @@ namespace rtl_OStringBuffer
                 *pStr2 == '\0' &&
                 aStrBuf2.getCapacity() == 0
             );
-#endif
 
         }
 
         void ctor_003_1()
         {
-            // LLA: StringBuffer with created negativ size are the same as empty StringBuffers
+            // StringBuffer with created negative size are the
+            // same as empty StringBuffers
             ::rtl::OStringBuffer aStrBuf3(kNonSInt32Max);
 
             const sal_Char* pStr = aStrBuf3.getStr();
@@ -188,8 +160,6 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST_SUITE_END();
     };
 
-
-
 // -----------------------------------------------------------------------------
 
     class  makeStringAndClear : public CppUnit::TestFixture
@@ -590,19 +560,7 @@ namespace rtl_OStringBuffer
                 aStrBuf.getCapacity() == expVal
             );
         }
-#ifdef WITH_CORE
-        void getCapacity_008()
-        {
-            ::rtl::OStringBuffer   aStrBuf ( kSInt32Max );
-            sal_Int32              expVal = kSInt32Max;
 
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity of empty string (with capacity 2147483647)(code will core dump)",
-                aStrBuf.getCapacity() == expVal
-            );
-        }
-#endif
         void getCapacity_009()
         {
             ::rtl::OStringBuffer   aStrBuf( kNonSInt32Max );
@@ -671,9 +629,6 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST( getCapacity_005 );
         CPPUNIT_TEST( getCapacity_006 );
         CPPUNIT_TEST( getCapacity_007 );
-#ifdef WITH_CORE
-        CPPUNIT_TEST( getCapacity_008 );
-#endif
         CPPUNIT_TEST( getCapacity_009 );
         CPPUNIT_TEST( getCapacity_010 );
         CPPUNIT_TEST( getCapacity_011 );
@@ -876,87 +831,7 @@ namespace rtl_OStringBuffer
             );
 
         }
-#ifdef WITH_CORE
-        void ensureCapacity_013()             //will core dump
-        {
-            sal_Int32          expVal = kSInt32Max;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            sal_Int32              input = 65535;
-
-            aStrBuf.ensureCapacity( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity equal to 2147483647, minimum is 65535",
-                aStrBuf.getCapacity() == expVal
-            );
-
-        }
-
-        void ensureCapacity_014()             //will core dump
-        {
-            sal_Int32          expVal = kSInt32Max;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            sal_Int32              input = kSInt32Max;
-
-            aStrBuf.ensureCapacity( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity equal to 2147483647, minimum is 2147483647",
-                aStrBuf.getCapacity() == expVal
-            );
-
-        }
-
-        void ensureCapacity_015()             //will core dump
-        {
-            sal_Int32          expVal = kSInt32Max;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            sal_Int32              input = -1;
-
-            aStrBuf.ensureCapacity( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity equal to 2147483647, minimum is -1",
-                aStrBuf.getCapacity() == expVal
-            );
-
-        }
-
-        void ensureCapacity_016()             //will core dump
-        {
-            sal_Int32          expVal = kSInt32Max;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            sal_Int32              input = 0;
-
-            aStrBuf.ensureCapacity( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity equal to 2147483647, minimum is 0",
-                aStrBuf.getCapacity() == expVal
-            );
-
-        }
-
-        void ensureCapacity_017()             //will core dump
-        {
-            sal_Int32          expVal = kSInt32Max;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            sal_Int32              input = kNonSInt32Max;
 
-            aStrBuf.ensureCapacity( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity equal to 2147483647, minimum is -2147483648",
-                aStrBuf.getCapacity() == expVal
-            );
-
-        }
-#endif
         void ensureCapacity_018()
         {
             sal_Int32          expVal = 65535;
@@ -972,23 +847,7 @@ namespace rtl_OStringBuffer
             );
 
         }
-#ifdef WITH_CORE
-        void ensureCapacity_019()               //will core dump
-        {
-            sal_Int32          expVal = 2147483647;
-            ::rtl::OStringBuffer   aStrBuf( kNonSInt32Max );
-            sal_Int32              input = 2147483647;
 
-            aStrBuf.ensureCapacity( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity equal to -2147483648, minimum is 2147483647",
-                aStrBuf.getCapacity() == expVal
-            );
-
-        }
-#endif
         void ensureCapacity_020()
         {
             sal_Int32          expVal = 2;
@@ -1050,17 +909,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST( ensureCapacity_010 );
         CPPUNIT_TEST( ensureCapacity_011 );
         CPPUNIT_TEST( ensureCapacity_012 );
-#ifdef WITH_CORE
-        CPPUNIT_TEST( ensureCapacity_013 );
-        CPPUNIT_TEST( ensureCapacity_014 );
-        CPPUNIT_TEST( ensureCapacity_015 );
-        CPPUNIT_TEST( ensureCapacity_016 );
-        CPPUNIT_TEST( ensureCapacity_017 );
-#endif
         CPPUNIT_TEST( ensureCapacity_018 );
-#ifdef WITH_CORE
-        CPPUNIT_TEST( ensureCapacity_019 );
-#endif
         CPPUNIT_TEST( ensureCapacity_020 );
         CPPUNIT_TEST( ensureCapacity_021 );
         CPPUNIT_TEST( ensureCapacity_022 );
@@ -1531,8 +1380,6 @@ namespace rtl_OStringBuffer
 
         }
 
-
-
         CPPUNIT_TEST_SUITE( setLength );
         CPPUNIT_TEST( setLength_001 );
         CPPUNIT_TEST( setLength_002 );
@@ -1702,7 +1549,6 @@ namespace rtl_OStringBuffer
     };
 // -----------------------------------------------------------------------------
 
-
     class  csuc : public CppUnit::TestFixture
     {
         void csuc_001()
@@ -1741,14 +1587,12 @@ namespace rtl_OStringBuffer
 
         }
 
-
         CPPUNIT_TEST_SUITE( csuc );
         CPPUNIT_TEST( csuc_001 );
         CPPUNIT_TEST( csuc_002 );
         CPPUNIT_TEST_SUITE_END();
     };
 
-
 // -----------------------------------------------------------------------------
 
     class  getStr : public CppUnit::TestFixture
@@ -1789,7 +1633,6 @@ namespace rtl_OStringBuffer
 
         }
 
-
         CPPUNIT_TEST_SUITE( getStr );
         CPPUNIT_TEST( getStr_001 );
         CPPUNIT_TEST( getStr_002 );
@@ -1863,7 +1706,6 @@ namespace rtl_OStringBuffer
 
         }
 
-
         void setCharAt_004()
         {
             OString                expVal( kTestStr33 );
@@ -1879,7 +1721,6 @@ namespace rtl_OStringBuffer
 
         }
 
-
         void setCharAt_005()
         {
             OString                expVal( kTestStr34 );
@@ -2862,24 +2703,6 @@ namespace rtl_OStringBuffer
 
         }
 
-        void append_003_005()
-        {
-            // LLA: this is an illegal test, the input2 value must non-negative
-            // LLA: OString                expVal( kTestStr41 );
-            // LLA: ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: const sal_Char*        input1 = kTestStr2;
-            // LLA: sal_Int32              input2 = -1;
-            // LLA:
-            // LLA: aStrBuf.append( input1, input2 );
-            // LLA:
-            // LLA: CPPUNIT_ASSERT_MESSAGE
-            // LLA: (
-            // LLA:     "Appends the string(length less than 0) to the string buffer arrOUS[0]",
-            // LLA:     ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() )
-            // LLA: );
-
-        }
-
         void append_003_006()
         {
             OString                expVal( kTestStr7 );
@@ -2948,23 +2771,6 @@ namespace rtl_OStringBuffer
 
         }
 
-        void append_003_010()
-        {
-            // LLA: this is an illegal test, the input2 value must non-negative
-            // LLA: OString                expVal;
-            // LLA: ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: const sal_Char*        input1 = kTestStr2;
-            // LLA: sal_Int32              input2 = -1;
-            // LLA:
-            // LLA: aStrBuf.append( input1, input2 );
-            // LLA:
-            // LLA: CPPUNIT_ASSERT_MESSAGE
-            // LLA: (
-            // LLA:     "Appends the string(length less than 0) to the string buffer arrOUS[1]",
-            // LLA:     ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() )
-            // LLA: );
-        }
-
         void append_003_011()
         {
             OString                expVal( kTestStr7 );
@@ -3033,24 +2839,6 @@ namespace rtl_OStringBuffer
 
         }
 
-        void append_003_015()
-        {
-            // LLA: this is an illegal test, the input2 value must non-negative
-            // LLA: OString                expVal;
-            // LLA: ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: const sal_Char*        input1 = kTestStr2;
-            // LLA: sal_Int32              input2 = -1;
-            // LLA:
-            // LLA: aStrBuf.append( input1, input2 );
-            // LLA:
-            // LLA: CPPUNIT_ASSERT_MESSAGE
-            // LLA: (
-            // LLA:     "Appends the string(length less than 0) to the string buffer arrOUS[2]",
-            // LLA:     ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() )
-            // LLA: );
-
-        }
-
         void append_003_016()
         {
             OString                expVal( kTestStr7 );
@@ -3119,24 +2907,6 @@ namespace rtl_OStringBuffer
 
         }
 
-        void append_003_020()
-        {
-            // LLA: this is an illegal test, the input2 value must non-negative
-            // LLA: OString                expVal;
-            // LLA: ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: const sal_Char*        input1 = kTestStr2;
-            // LLA: sal_Int32              input2 = -1;
-            // LLA:
-            // LLA: aStrBuf.append( input1, input2 );
-            // LLA:
-            // LLA: CPPUNIT_ASSERT_MESSAGE
-            // LLA: (
-            // LLA:     "Appends the string(length less than 0) to the string buffer arrOUS[3]",
-            // LLA:     ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() )
-            // LLA: );
-
-        }
-
         void append_003_021()
         {
             OString                expVal( kTestStr29 );
@@ -3205,75 +2975,30 @@ namespace rtl_OStringBuffer
 
         }
 
-        void append_003_025()
-        {
-            // LLA: this is an illegal test, the input2 value must non-negative
-            // LLA: OString                expVal( kTestStr42 );
-            // LLA: ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: const sal_Char*        input1 = kTestStr2;
-            // LLA: sal_Int32              input2 = -1;
-            // LLA:
-            // LLA: aStrBuf.append( input1, input2 );
-            // LLA:
-            // LLA: CPPUNIT_ASSERT_MESSAGE
-            // LLA: (
-            // LLA:     "Appends the string(length less than 0) to the string buffer arrOUS[4]",
-            // LLA:     ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() )
-            // LLA: );
-
-        }
-
-#ifdef WITH_CORE
-        void append_003_026()
-        {
-            OString                expVal;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            const sal_Char*        input1 = kTestStr25;
-            sal_Int32              input2 = 0;
-
-            aStrBuf.append( input1, input2 );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "Appends the string(length equal to 0) to the string buffer(with INT_MAX)",
-                ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() )
-            );
-
-        }
-#endif
-
         CPPUNIT_TEST_SUITE( append_003 );
         CPPUNIT_TEST( append_003_001 );
         CPPUNIT_TEST( append_003_002 );
         CPPUNIT_TEST( append_003_003 );
         CPPUNIT_TEST( append_003_004 );
-        CPPUNIT_TEST( append_003_005 );
         CPPUNIT_TEST( append_003_006 );
         CPPUNIT_TEST( append_003_007 );
         CPPUNIT_TEST( append_003_008 );
         CPPUNIT_TEST( append_003_009 );
-        CPPUNIT_TEST( append_003_010 );
         CPPUNIT_TEST( append_003_011 );
         CPPUNIT_TEST( append_003_012 );
         CPPUNIT_TEST( append_003_013 );
         CPPUNIT_TEST( append_003_014 );
-        CPPUNIT_TEST( append_003_015 );
         CPPUNIT_TEST( append_003_016 );
         CPPUNIT_TEST( append_003_017 );
         CPPUNIT_TEST( append_003_018 );
         CPPUNIT_TEST( append_003_019 );
-        CPPUNIT_TEST( append_003_020 );
         CPPUNIT_TEST( append_003_021 );
         CPPUNIT_TEST( append_003_022 );
         CPPUNIT_TEST( append_003_023 );
         CPPUNIT_TEST( append_003_024 );
-        CPPUNIT_TEST( append_003_025 );
-#ifdef WITH_CORE
-        CPPUNIT_TEST( append_003_026 );
-#endif
         CPPUNIT_TEST_SUITE_END();
     };
-// -----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 
     class  append_004 : public CppUnit::TestFixture
     {
@@ -3742,82 +3467,7 @@ namespace rtl_OStringBuffer
 #endif
         CPPUNIT_TEST_SUITE_END();
     };
-/**
- * Calls the method append(T, radix) and compares
- * returned OUString with OUString that passed in the array resArray.
- *
- * @param T, type of argument, passed to append
- * @param resArray, array of result ustrings to compare to
- * @param n the number of elements in the array resArray (testcases)
- * @param pTestResult the instance of the class TestResult
- * @param inArray [optional], array of value that is passed as first argument
- *                            to append
- *
- * @return true, if all returned OUString are equal to corresponding OUString in
- *               resArray else, false.
- */
-/*template <class T>
-sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
-                            const T *inArray, OStringBuffer &aStr1 )
-{
-    sal_Bool    bRes = sal_True;
-
-    //sal_Char    methName[MAXBUFLENGTH];
-    //sal_Char*   pMeth = methName;
-    sal_Int32   i;
-//    static sal_Unicode aUchar[80]={0x12};
-
-    for (i = 0; i < n; i++)
-    {
-
-    OSL_ENSURE( i < 80, "ERROR: leave aUchar bound");
-
-//        AStringToUStringCopy(aUchar,resArray[i]);
-
-        ::rtl::OString aStr2(aStr1.getStr());
-        ::rtl::OString aStr3( "-" );
-
-        if (inArray == 0)
-    {
-            aStr2 += OString(resArray[i]);
-            aStr1.append((T)i, radix);
-    }
-        else
-        {
- //           sal_Unicode   aStr4[100];
-            if ( inArray[i] < 0 )
-            {
-                aStr2 += aStr3;
-
-            }
-//          if(AStringToUStringCopy(aStr4,resArray[i]))
-//            {
-                aStr2 += OString(resArray[i]);
-//            }
-            aStr1.append((T)inArray[i], radix);
-        }
 
-        CPPUNIT_ASSERT_MESSAGE
-            (
-                "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[0]",
-                aStr1.getStr()== aStr2 &&
-                    aStr1.getLength() == aStr2.getLength()
-            );
-    }
-
-    return (bRes);
-}
-#define test_append_Int32      test_append<sal_Int32>
-#define test_append_Int64      test_append<sal_Int64>
-#define test_append_float      test_append<float>
-#define test_append_double     test_append<double>*/
-//------------------------------------------------------------------------
-// testing the method append( sal_Int32 i, sal_Int16 radix=2 )
-// testing the method append( sal_Int32 i, sal_Int16 radix=8 )
-// testing the method append( sal_Int32 i, sal_Int16 radix=10 )
-// testing the method append( sal_Int32 i, sal_Int16 radix=16 )
-// testing the method append( sal_Int32 i, sal_Int16 radix=36 )
-//------------------------------------------------------------------------
     class  append_006_Int32 : public CppUnit::TestFixture
     {
         OString* arrOUS[5];
@@ -3849,10 +3499,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
             expVal += OString( "0" );
             aStrBuf.append( input, radix );
 
-            /*test_append_Int32((const char**)kBinaryNumsStr,
-                                kBinaryNumsCount, kRadixBinary,
-                                0, aStrBuf );*/
-
             CPPUNIT_ASSERT_MESSAGE
             (
                 "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[0]",
@@ -15294,7 +14940,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_001()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr74 );
             float                  input = (float)atof("3.0");
 
             // LLA:
@@ -15315,7 +14960,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_002()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr75 );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15332,7 +14976,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_003()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr76 );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15349,7 +14992,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_004()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr77 );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15366,7 +15008,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_005()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr78 );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15383,7 +15024,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_006()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr79 );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15400,7 +15040,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_007()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr80 );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15417,7 +15056,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_008()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr81 );
             float                  input = (float)atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15434,7 +15072,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_009()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr82 );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15451,7 +15088,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_010()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr83 );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15468,7 +15104,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_011()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr84 );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15485,7 +15120,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_012()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr85 );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15502,7 +15136,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_013()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr86 );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15519,7 +15152,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_014()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr87 );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15536,7 +15168,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_015()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr81 );
             float                  input = (float)atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15553,7 +15184,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_016()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr82 );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15570,7 +15200,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_017()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr83 );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15587,7 +15216,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_018()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr84 );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15604,7 +15232,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_019()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr85 );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15621,7 +15248,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_020()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr86 );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15638,7 +15264,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_021()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr87 );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15655,7 +15280,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_022()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr81 );
             float                  input = (float)atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15672,7 +15296,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_023()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr82 );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15689,7 +15312,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_024()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr83 );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15706,7 +15328,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_025()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr84 );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15723,7 +15344,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_026()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr85 );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15740,7 +15360,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_027()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr86 );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15757,7 +15376,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_028()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr87 );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15774,7 +15392,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_029()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr88 );
             float                  input = (float)atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15791,7 +15408,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_030()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr89 );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15808,7 +15424,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_031()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr90 );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15825,7 +15440,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_032()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr91 );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15842,7 +15456,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_033()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr92 );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15859,7 +15472,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_034()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr93 );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15876,7 +15488,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_035()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr94 );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15893,7 +15504,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_036()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr81 );
             float                  input = (float)atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15910,7 +15520,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_037()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr82 );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15927,7 +15536,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_038()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr83 );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15944,7 +15552,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_039()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr84 );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15961,7 +15568,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_040()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr85 );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15978,7 +15584,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_041()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr86 );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15995,7 +15600,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_042()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr87 );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16072,7 +15676,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_001()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr95 );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16089,7 +15692,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_002()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr96 );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16106,7 +15708,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_003()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr97 );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16123,7 +15724,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_004()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr98 );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16140,7 +15740,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_005()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr99 );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16157,7 +15756,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_006()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr100 );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16174,7 +15772,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_007()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr101 );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16191,7 +15788,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_008()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr102 );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16208,7 +15804,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_009()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr103 );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16225,7 +15820,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_010()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr104 );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16242,7 +15836,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_011()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr105 );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16259,7 +15852,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_012()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr106 );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16276,7 +15868,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_013()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr107 );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16293,7 +15884,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_014()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr108 );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16310,7 +15900,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_015()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr102 );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16327,7 +15916,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_016()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr103 );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16344,7 +15932,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_017()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr104 );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16361,7 +15948,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_018()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr105 );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16378,7 +15964,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_019()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr106 );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16395,7 +15980,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_020()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr107 );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16412,7 +15996,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_021()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr108 );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16429,7 +16012,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_022()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr102 );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16446,7 +16028,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_023()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr103 );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16463,7 +16044,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_024()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr104 );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16480,7 +16060,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_025()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr105 );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16497,7 +16076,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_026()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr106 );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16514,7 +16092,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_027()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr107 );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16531,7 +16108,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_028()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr108 );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16548,7 +16124,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_029()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr109 );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16565,7 +16140,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_030()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr110 );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16582,7 +16156,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_031()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr111 );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16599,7 +16172,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_032()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr112 );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16616,7 +16188,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_033()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr113 );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16633,7 +16204,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_034()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr114 );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16650,7 +16220,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_035()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr115 );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16667,7 +16236,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_036()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr102 );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16684,7 +16252,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_037()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr103 );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16701,7 +16268,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_038()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr104 );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16718,7 +16284,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_039()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr105 );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16735,7 +16300,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_040()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr106 );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16752,7 +16316,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_041()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr107 );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16769,7 +16332,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_042()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr108 );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16865,7 +16427,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_001()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr74 );
             double                 input = atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16879,562 +16440,9 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
 
         }
 
-/*
-        void append_002()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr75 );
-            double                 input = atof("3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append 3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_003()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr76 );
-            double                 input = atof("3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append 3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_004()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr122 );
-            double                 input = atof("3.1415926535");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append 3.1415926535",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_005()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr123 );
-            double                 input = atof("3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append 3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_006()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr124 );
-            double                  input = atof("3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append 3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_007()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr125 );
-            double                 input = atof("3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append 3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_008()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr81 );
-            double                 input = atof("3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_009()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr82 );
-            double                 input = atof("3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_010()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr83 );
-            double                 input = atof("3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_011()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr126 );
-            double                 input = atof("3.1415926535");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.1415926535",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_012()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr127 );
-            double                 input = atof("3.141592653589793");
-
-            aStrBuf.append( input );
-            OString     *result = new OString( aStrBuf.getStr());
-            double      output = result->toDouble();
-            OString     *final = new OString();
-            *final = final->valueOf(output);
-t_print("the OStringvalus is:");
-for(int m=0;m<final->getLength();m++)
-{
-    t_print("%c",final->pData->buffer[m]);
-}
-t_print("\n");
-t_print("the OStringBuffer is %d\n", aStrBuf.getLength());
-t_print("the expVal is %d\n", expVal.getLength());
-t_print("the OStringbuffervalus is:");
-for(int j=0;j<aStrBuf.getLength();j++)
-{
-    t_print("%c",*(aStrBuf.getStr()+j));
-}
-t_print("\n");
-t_print("the expVlavalus is:");
-for(int k=0;k<expVal.getLength();k++)
-{
-    t_print("%c",expVal.pData->buffer[k]);
-}
-t_print("\n");
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_013()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr128 );
-            double                  input = atof("3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_014()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr129 );
-            double                 input = atof("3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_015()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr81 );
-            double                 input = atof("3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_016()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr82 );
-            double                 input = atof("3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_017()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr83 );
-            double                 input = atof("3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_018()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr126 );
-            double                 input = atof("3.1415926535");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.1415926535",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_019()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr127 );
-            double                 input = atof("3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_020()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr128 );
-            double                  input = atof("3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_021()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr129 );
-            double                 input = atof("3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_022()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr81 );
-            double                 input = atof("3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append 3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_023()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr82 );
-            double                 input = atof("3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append 3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_024()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr83 );
-            double                 input = atof("3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append 3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_025()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr126 );
-            double                 input = atof("3.1415926535");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append 3.1415926535",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_026()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr127 );
-            double                 input = atof("3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append 3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_027()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr128 );
-            double                  input = atof("3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_028()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr129 );
-            double                 input = atof("3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append 3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_029()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr88 );
-            double                 input = atof("3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append 3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_030()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr89 );
-            double                 input = atof("3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append 3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_031()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr90 );
-            double                 input = atof("3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append 3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_032()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr130 );
-            double                 input = atof("3.1415926535");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append 3.1415926535",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_033()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr131 );
-            double                 input = atof("3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append 3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_034()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr132 );
-            double                  input = atof("3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append 3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-*/
         void append_035()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr133 );
             double                 input = atof("3.141592653589793238462643");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -17447,159 +16455,13 @@ t_print("\n");
             );
 
         }
-/*
-#ifdef WITH_CORE
-        void append_036()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr81 );
-            double                 input = atof("3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_037()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr82 );
-            double                 input = atof("3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_038()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr83 );
-            double                 input = atof("3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_039()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr126 );
-            double                 input = atof("3.1415926535");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.1415926535",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_040()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr127 );
-            double                 input = atof("3.141592653589793";
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_041()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr128 );
-            double                 input = atof("3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_042()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr129 );
-            double                 input = atof("3.141592653589793238462643");
 
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-#endif
-*/
         CPPUNIT_TEST_SUITE( append_009_double );
         CPPUNIT_TEST( append_001 );
-/*
-        CPPUNIT_TEST( append_002 );
-        CPPUNIT_TEST( append_003 );
-        CPPUNIT_TEST( append_004 );
-        CPPUNIT_TEST( append_005 );
-        CPPUNIT_TEST( append_006 );
-        CPPUNIT_TEST( append_007 );
-        CPPUNIT_TEST( append_008 );
-        CPPUNIT_TEST( append_009 );
-        CPPUNIT_TEST( append_010 );
-        CPPUNIT_TEST( append_011 );
-        CPPUNIT_TEST( append_012 );
-        CPPUNIT_TEST( append_013 );
-        CPPUNIT_TEST( append_014 );
-        CPPUNIT_TEST( append_015 );
-        CPPUNIT_TEST( append_016 );
-        CPPUNIT_TEST( append_017 );
-        CPPUNIT_TEST( append_018 );
-        CPPUNIT_TEST( append_019 );
-        CPPUNIT_TEST( append_020 );
-        CPPUNIT_TEST( append_021 );
-        CPPUNIT_TEST( append_022 );
-        CPPUNIT_TEST( append_023 );
-        CPPUNIT_TEST( append_024 );
-        CPPUNIT_TEST( append_025 );
-#ifdef WITH_CORE
-        CPPUNIT_TEST( append_026 );
-        CPPUNIT_TEST( append_027 );
-        CPPUNIT_TEST( append_028 );
-        CPPUNIT_TEST( append_029 );
-        CPPUNIT_TEST( append_030 );
-#endif
-*/
         CPPUNIT_TEST( append_035 );
         CPPUNIT_TEST_SUITE_END();
     };
+
 //------------------------------------------------------------------------
 // testing the method append( double f ) for negative value
 //------------------------------------------------------------------------
@@ -17627,7 +16489,6 @@ t_print("\n");
         void append_001()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr95 );
             double                 input = atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -17640,586 +16501,10 @@ t_print("\n");
             );
 
         }
-/*
-        void append_002()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr96 );
-            double                 input = atof("-3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append -3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_003()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr97 );
-            double                 input = atof("-3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append -3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_004()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr98 );
-            double                 input = atof("-3.502525");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append -3.502525",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_005()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr134 );
-            double                 input = atof("-3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append -3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
 
-        void append_006()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr135 );
-            double                  input = atof("-3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append -3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_007()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr136 );
-            double                 input = atof("-3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append -3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_008()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr102 );
-            double                 input = atof("-3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_009()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr103 );
-            double                 input = atof("-3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_010()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr104 );
-            double                 input = atof("-3.0625");
-
-            aStrBuf.append( input );
-            OString     *result = new OString( aStrBuf.getStr());
-            double      output = result->toDouble();
-            OString     *final = new OString();
-            *final = final->valueOf(output);
-t_print("the OStringvalus is:");
-for(int m=0;m<final->getLength();m++)
-{
-    t_print("%c",final->pData->buffer[m]);
-}
-t_print("\n");
-t_print("the OStringBuffer is %d\n", aStrBuf.getLength());
-t_print("the expVal is %d\n", expVal.getLength());
-t_print("the OStringbuffervalus is:");
-for(int j=0;j<aStrBuf.getLength();j++)
-{
-    t_print("%c",*(aStrBuf.getStr()+j));
-}
-t_print("\n");
-t_print("the expVlavalus is:");
-for(int k=0;k<expVal.getLength();k++)
-{
-    t_print("%c",expVal.pData->buffer[k]);
-}
-t_print("\n");
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_011()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr105 );
-            double                 input = atof("-3.502525");
-
-            aStrBuf.append( input );
-
-            double      output = atof("-3.50252");
-            OString     *final = new OString();
-            *final = final->valueOf(output);
-t_print("the OStringvalus is:");
-for(int m=0;m<final->getLength();m++)
-{
-    t_print("%c",final->pData->buffer[m]);
-}
-t_print("\n");
-t_print("the OStringBuffer is %d\n", aStrBuf.getLength());
-t_print("the expVal is %d\n", expVal.getLength());
-t_print("the OStringbuffervalus is:");
-for(int j=0;j<aStrBuf.getLength();j++)
-{
-    t_print("%c",*(aStrBuf.getStr()+j));
-}
-t_print("\n");
-t_print("the expVlavalus is:");
-for(int k=0;k<expVal.getLength();k++)
-{
-    t_print("%c",expVal.pData->buffer[k]);
-}
-t_print("\n");
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.502525",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_012()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr137 );
-            double                 input = atof("-3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_013()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr138 );
-            double                  input = atof("-3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_014()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr139 );
-            double                 input = atof("-3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_015()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr102 );
-            double                 input = atof("-3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_016()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr103 );
-            double                 input = atof("-3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_017()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr104 );
-            double                 input = atof("-3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_018()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr105 );
-            double                 input = atof("-3.502525");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.502525",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_019()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr137 );
-            double                 input = atof("-3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_020()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr138 );
-            double                  input = atof("-3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_021()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr139 );
-            double                 input = atof("-3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_022()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr102 );
-            double                 input = atof("-3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append -3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_023()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr103 );
-            double                 input = atof("-3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append -3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_024()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr104 );
-            double                 input = atof("-3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append -3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_025()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr105 );
-            double                 input = atof("-3.502525");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append -3.502525",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_026()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr137 );
-            double                 input = atof("-3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append -3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_027()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr138 );
-            double                  input = atof("-3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_028()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr139 );
-            double                 input = atof("-3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append -3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_029()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr109 );
-            double                 input = atof("-3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append -3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_030()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr110 );
-            double                 input = atof("-3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append -3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_031()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr111 );
-            double                 input = atof("-3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append -3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_032()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr112 );
-            double                 input = atof("-3.502525");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append -3.502525",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_033()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr140 );
-            double                 input = atof("-3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append -3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_034()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr141 );
-            double                  input = atof("-3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append -3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-*/
         void append_035()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr142 );
             double                 input = atof("-3.141592653589793238462643");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -18232,162 +16517,14 @@ t_print("\n");
             );
 
         }
-/*
-#ifdef WITH_CORE
-        void append_036()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr102 );
-            double                 input = atof("-3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_037()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr103 );
-            double                 input = atof("-3.5");
 
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_038()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr104 );
-            double                 input = atof("-3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_039()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr105 );
-            double                 input = atof("-3.502525");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.502525",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_040()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr137 );
-            double                 input = atof("-3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_041()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr138 );
-            double                 input = atof("-3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_042()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr139 );
-            double                 input = atof("-3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-#endif
-*/
         CPPUNIT_TEST_SUITE( append_009_Double_Negative );
         CPPUNIT_TEST( append_001 );
-/*
-        CPPUNIT_TEST( append_002 );
-        CPPUNIT_TEST( append_003 );
-        CPPUNIT_TEST( append_004 );
-        CPPUNIT_TEST( append_005 );
-        CPPUNIT_TEST( append_006 );
-        CPPUNIT_TEST( append_007 );
-        CPPUNIT_TEST( append_008 );
-        CPPUNIT_TEST( append_009 );
-        CPPUNIT_TEST( append_010 );
-        CPPUNIT_TEST( append_011 );
-        CPPUNIT_TEST( append_012 );
-        CPPUNIT_TEST( append_013 );
-        CPPUNIT_TEST( append_014 );
-        CPPUNIT_TEST( append_015 );
-        CPPUNIT_TEST( append_016 );
-        CPPUNIT_TEST( append_017 );
-        CPPUNIT_TEST( append_018 );
-        CPPUNIT_TEST( append_019 );
-        CPPUNIT_TEST( append_020 );
-        CPPUNIT_TEST( append_021 );
-        CPPUNIT_TEST( append_022 );
-        CPPUNIT_TEST( append_023 );
-        CPPUNIT_TEST( append_024 );
-        CPPUNIT_TEST( append_025 );
-#ifdef WITH_CORE
-        CPPUNIT_TEST( append_026 );
-        CPPUNIT_TEST( append_027 );
-        CPPUNIT_TEST( append_028 );
-        CPPUNIT_TEST( append_029 );
-        CPPUNIT_TEST( append_030 );
-#endif
-*/
         CPPUNIT_TEST( append_035 );
         CPPUNIT_TEST_SUITE_END();
     };
 } // namespace rtl_OStringBuffer
 
-
 // -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::ctors);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::makeStringAndClear);
@@ -18420,3 +16557,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_009_double);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_009_Double_Negative);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h
index fbddc8f10d97..7841e4fd164c 100644
--- a/sal/qa/OStringBuffer/rtl_String_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Const.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,9 +26,6 @@
  *
  ************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _RTL_STRING_CONST_H_
 #define _RTL_STRING_CONST_H_
 
@@ -35,14 +33,8 @@
     #include <rtl_String_Utils.hxx>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #include <limits.h>
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _SAL_TYPES_H_
     #include <sal/types.h>
 #endif
@@ -55,28 +47,16 @@
     #include <rtl/ustring.h>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const rtl_TextEncoding kEncodingRTLTextUSASCII = RTL_TEXTENCODING_ASCII_US;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_uInt32 kConvertFlagsOUStringToOString = OUSTRING_TO_OSTRING_CVTFLAGS;
 static const sal_uInt32 kConvertFlagsOStringToOUString = OSTRING_TO_OUSTRING_CVTFLAGS;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Char *kTestStr1  = "Sun Microsystems";
 static const sal_Char *kTestStr2  = "Sun Microsystems Java Technology";
 static const sal_Char *kTestStr3  = "Sun microsystems";
@@ -138,9 +118,6 @@ static const sal_Char *kTestStr143  = "Sun \377";
 static const sal_Char *kTestStr144  = "\377";
 static const sal_Char *kTestStr145 = "\50\3\5\7\11\13\15\17sun\377";
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Int32 kTestStr1Len  = 16;
 static const sal_Int32 kTestStr2Len  = 32;
 static const sal_Int32 kTestStr3Len  = 16;
@@ -314,8 +291,6 @@ static const sal_Int32 kTestStr170Len = 27;
 static const sal_Int32 kTestStr171Len = 27;
 static const sal_Int32 kTestStr1PlusStr6Len = kTestStr1Len + kTestStr6Len;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 static const sal_Int32 uTestStr1Len  = 16;
 static const sal_Int32 uTestStr2Len  = 32;
 static const sal_Int32 uTestStr3Len  = 16;
@@ -324,33 +299,18 @@ static const sal_Int32 uTestStr5Len  = 16;
 static const sal_Int32 uTestStr9Len  = 32;
 static const sal_Int32 uTestStr22Len = 32;
 
-
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 const sal_Unicode uTestStr31[]= {0x400,0x410,0x4DF};
 const sal_Unicode uTestStr32[]= {0x9F9F,0xA000,0x8F80,0x9AD9};
 
-
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Int32 uTestStr31Len  = 3;
 static const sal_Int32 uTestStr32Len  = 4;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Int16 kRadixBinary     = 2;
 static const sal_Int16 kRadixOctol      = 8;
 static const sal_Int16 kRadixDecimal    = 10;
 static const sal_Int16 kRadixHexdecimal = 16;
 static const sal_Int16 kRadixBase36     = 36;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Int8  kSInt8Max  = SCHAR_MAX;
 static const sal_Int16 kUInt8Max  = UCHAR_MAX;
 static const sal_Int16 kSInt16Max = SHRT_MAX;
@@ -380,9 +340,6 @@ static const sal_Int64 kInt64MaxNums[kInt64MaxNumsCount] =
                             kSInt64Max
                         };
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Int32 kBinaryNumsCount = 16;
 
 static const sal_Int32 kBinaryMaxNumsCount = 7;
@@ -411,8 +368,6 @@ static const sal_Int32 kBase36NumsCount = 36;
 
 static const sal_Int32 kBase36MaxNumsCount = 7;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 static const sal_Int32 nDoubleCount=24;
 static const double   expValDouble[nDoubleCount]=
     {
@@ -545,8 +500,6 @@ static const sal_Int32 kNonSInt16Max = SHRT_MIN;
 }
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #endif /* _RTL_STRING_CONST_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
index 74b3e80e47c1..68d3534ccef1 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 #
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,15 +29,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #include <math.h>
 #include <stdlib.h>
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _SAL_TYPES_H_
     #include <sal/types.h>
 #endif
@@ -49,18 +44,11 @@
     #include <rtl/string.hxx>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _RTL_STRING_UTILS_CONST_H_
     #include <rtl_String_Utils_Const.h>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-using namespace rtl;
-
+using ::rtl::OString;
 sal_uInt32 AStringLen( const sal_Char *pAStr )
 {
     sal_uInt32  nStrLen = 0;
@@ -88,8 +76,9 @@ sal_Char* cpystr( sal_Char* dst, const sal_Char* src )
     const sal_Char* psrc = src;
     sal_Char* pdst = dst;
 
-    while( (*pdst++ = *psrc++) );
-    return ( dst );
+    while( (*pdst++ = *psrc++) ) {}
+
+    return dst;
 }
 
 sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt )
@@ -276,11 +265,6 @@ sal_Bool AStringToDoubleCompare ( const sal_Char  *pStr,
     return cmp;
 } // AStringToDoubleCompare
 
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
 sal_uInt32 UStringLen( const sal_Unicode *pUStr )
 {
     sal_uInt32 nUStrLen = 0;
@@ -610,6 +594,4 @@ sal_Bool AStringToUStringNCopy( sal_Unicode       *pDest,
     return  bCopied;
 } // AStringToUStringNCopy
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx
index b3ba990eb87e..87c97174b71b 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 #
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,23 +26,14 @@
  *
 #*************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _RTL_STRING_UTILS_HXX_
 #define _RTL_STRING_UTILS_HXX_
 
 #ifdef __cplusplus
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #include <math.h>
 #include <stdlib.h>
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _SAL_TYPES_H_
     #include <sal/types.h>
 #endif
@@ -54,8 +46,6 @@
     #include <rtl/string.hxx>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 sal_Char* cpystr( sal_Char* dst, const sal_Char* src );
 sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt );
 
@@ -123,9 +113,6 @@ sal_Bool AStringToUStringNCopy( sal_Unicode       *pDest,
                                 const sal_uInt32   nSrcLen
                               );
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #endif /* __cplusplus */
 
 #endif /* _RTL_STRING_UTILS_HXX */
@@ -136,3 +123,4 @@ sal_Bool AStringToUStringNCopy( sal_Unicode       *pDest,
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
index 29d6eb69c1fc..8af53eeab65d 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,30 +26,18 @@
  *
  ************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _RTL_STRING_UTILS_CONST_H_
 #define _RTL_STRING_UTILS_CONST_H_
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _SAL_TYPES_H_
     #include <sal/types.h>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Int32 kErrCompareAStringToUString     = -2;
 static const sal_Int32 kErrCompareNAStringToUString    = -3;
 static const sal_Int32 kErrCompareAStringToRTLUString  = -4;
@@ -58,17 +47,12 @@ static const sal_Int32 kErrAStringToByteStringNCompare = -7;
 static const sal_Int32 kErrCompareAStringToString      = -8;
 static const sal_Int32 kErrCompareNAStringToString     = -9;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifdef __cplusplus
 }
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #endif /* _RTL_STRING_UTILS_CONST_H_ */
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/buildall.pl b/sal/qa/buildall.pl
index 03eadb1b7fc0..02fc352bba89 100644
--- a/sal/qa/buildall.pl
+++ b/sal/qa/buildall.pl
@@ -150,11 +150,6 @@ sub initEnvironment()
           $g_sTempDir         = $ENV{TMP}  ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}";
           last SWITCH;
       }
-      if ( $gui eq "OS2" ) {
-          $FS             = "\\";
-          $g_sTempDir         = $ENV{TMP}  ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}";
-          last SWITCH;
-      }
       if ( $gui eq "UNX" ) {
           $FS             = "/";
           $g_sTempDir         = $ENV{TMP}  ? "$ENV{TMP}${FS}" : "${FS}tmp${FS}";
@@ -181,7 +176,7 @@ sub getLibName($)
     {
         return "lib" . $sFile . ".so";
     }
-    if ($OSNAME eq "MSWin32" || $OSNAME eq "OS2")
+    if ($OSNAME eq "MSWin32")
     {
         return $sFile . ".dll";
     }
@@ -272,7 +267,7 @@ sub giveOutFailures($$)
     if ($nFailures > 0)
     {
         # extra return for a better output
-        print "\nFailures occured: $nFailures\n";
+        print "\nFailures occurred: $nFailures\n";
         print "The whole output can be found in $sFailureFile\n";
         print "\n";
 
@@ -320,7 +315,7 @@ sub runASingleTest($$)
 #     }
 #     else
 #     {
-#         if ($OSNAME eq "MSWin32" || $OSNAME eq "OS2")
+#         if ($OSNAME eq "MSWin32")
 #         {
 #             # test
 #             $redirect = ">>$sLogFile 2>>$sLogFile";
@@ -488,7 +483,7 @@ $/)
 
     if ($nGlobalFailures > 0)
     {
-        print "\nFailures over all occured: $nGlobalFailures\n";
+        print "\nFailures over all occurred: $nGlobalFailures\n";
         print "\nPASSED FAILED.\n";
     }
     else
diff --git a/sal/qa/cppunit_local.mk b/sal/qa/cppunit_local.mk
new file mode 100644
index 000000000000..4b452b73c94c
--- /dev/null
+++ b/sal/qa/cppunit_local.mk
@@ -0,0 +1,30 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Red Hat, Inc.
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): David Tardon <dtardon@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# cppunittester is built in this module; cannot use delivered version
+# this should be kept in sync with the definition in solenv/inc/settings.mk
+CPPUNITTESTER = $(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(BIN)/cppunittester
+
+.INCLUDE : _cppunit.mk
diff --git a/sal/qa/inc/stringhelper.hxx b/sal/qa/inc/stringhelper.hxx
index b284d1c0c06c..93da3ef9b9da 100644
--- a/sal/qa/inc/stringhelper.hxx
+++ b/sal/qa/inc/stringhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef STRINGHELPER_HXX
 #define STRINGHELPER_HXX
 
@@ -14,3 +15,5 @@ inline void operator <<= (rtl::OUString& _rUnicodeString, rtl::OString const & _
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/inc/valueequal.hxx b/sal/qa/inc/valueequal.hxx
index df989c1e90a8..23fb4012ee9b 100644
--- a/sal/qa/inc/valueequal.hxx
+++ b/sal/qa/inc/valueequal.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include <math.h>
 
 #define PREC_float 1
@@ -42,8 +43,8 @@ bool is_equal(T x, T y, sal_Int16 _nPrec)
 
     if (_nPrec != PREC_long_double)
     {
-        t_print(T_VERBOSE, "double equal: %.20f\n", x);
-        t_print(T_VERBOSE, "              %.20f\n", y);
+        printf("double equal: %.20f\n", x);
+        printf("              %.20f\n", y);
     }
     //here nPrecOfN is the number after dot
     sal_Int32 nBeforeDot = sal_Int32( log10(x) );
@@ -51,34 +52,34 @@ bool is_equal(T x, T y, sal_Int16 _nPrec)
     {
          nBeforeDot = 0;
     }
-    //t_print(T_VERBOSE, "nPRECISION is  %d\n", nPRECISION);
+    //printf("nPRECISION is  %d\n", nPRECISION);
     sal_Int32 nPrecOfN = -nPRECISION + nBeforeDot;
 
     if (_nPrec != PREC_long_double)
-        t_print(T_VERBOSE, "nPrecOfN is  %d\n", nPrecOfN);
+        printf("nPrecOfN is  %d\n", nPrecOfN);
 
     long double nPrec = pow(0.1, -nPrecOfN);
 
     if (_nPrec != PREC_long_double)
-        t_print(T_VERBOSE, "        prec: %.20f\n", nPrec);
+        printf("        prec: %.20f\n", nPrec);
 
     long double nDelta = fabs( x - y ) ;
 
     if (_nPrec != PREC_long_double)
     {
-        t_print(T_VERBOSE, "       delta: %.20f\n", nDelta);
-        t_print(T_VERBOSE, "       nPrec: %.20f\n", nPrec);
-        t_print(T_VERBOSE, "delta must be less or equal to prec!\n\n");
+        printf("       delta: %.20f\n", nDelta);
+        printf("       nPrec: %.20f\n", nPrec);
+        printf("delta must be less or equal to prec!\n\n");
     }
 
     if (nDelta > nPrec)
     {
-        // t_print(T_VERBOSE, "values are not equal! ndelta:%.20f\n", nDelta);
+        // printf("values are not equal! ndelta:%.20f\n", nDelta);
         return false;
     }
     // else
     // {
-    // t_print(T_VERBOSE, "values are equal.     ndelta:%.20f\n", nDelta);
+    // printf("values are equal.     ndelta:%.20f\n", nDelta);
     return true;
     // }
 }
@@ -100,25 +101,25 @@ bool is_equal(T x, T y, sal_Int16 _nPrec)
 // LLA:         y = -y;
 // LLA:     }
 // LLA:
-// LLA:     t_print(T_VERBOSE, "double equal: %.20f\n#               %.20f\n", x, y);
+// LLA:     printf("double equal: %.20f\n#               %.20f\n", x, y);
 // LLA:     sal_Int32 nPrecOfN = -nPRECISION + sal_Int32( log10(x) );
 // LLA:
-// LLA:     t_print(T_VERBOSE, "prec: %d\n", nPrecOfN);
+// LLA:     printf("prec: %d\n", nPrecOfN);
 // LLA:     double nPrec = pow(10, nPrecOfN) * 1;
 // LLA:
-// LLA:     t_print(T_VERBOSE, "        prec: %.20f\n", nPrec);
+// LLA:     printf("        prec: %.20f\n", nPrec);
 // LLA:
 // LLA:     double nDelta = fabs( x - y );
-// LLA:     t_print(T_VERBOSE, "       delta: %.20f\n\n", nDelta);
+// LLA:     printf("       delta: %.20f\n\n", nDelta);
 // LLA:
 // LLA:     if (nDelta > nPrec)
 // LLA:     {
-// LLA:         // t_print(T_VERBOSE, "values are not equal! ndelta:%.20f\n", nDelta);
+// LLA:         // printf("values are not equal! ndelta:%.20f\n", nDelta);
 // LLA:         return false;
 // LLA:     }
 // LLA:     // else
 // LLA:     // {
-// LLA:     // t_print(T_VERBOSE, "values are equal.     ndelta:%.20f\n", nDelta);
+// LLA:     // printf("values are equal.     ndelta:%.20f\n", nDelta);
 // LLA:     return true;
 // LLA:     // }
 // LLA: }
@@ -131,3 +132,5 @@ bool is_double_equal(double x, double y)
 {
     return is_equal<double>(x, y, PREC_double);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/libs2test.txt b/sal/qa/libs2test.txt
index 36a9f7f70c98..7aa97ef3e9ff 100644
--- a/sal/qa/libs2test.txt
+++ b/sal/qa/libs2test.txt
@@ -1,7 +1,5 @@
 # This file contain a list of todos for testshl2 automated tests.
 # 
-# $Id: libs2test.txt,v 1.13 2007-11-20 19:25:30 ihi Exp $
-#
 # Legend:
 # there exist 2 formats
 # 1. file
diff --git a/sal/qa/makefile.mk b/sal/qa/makefile.mk
index 391ac66b8ade..e9eec4d98f5b 100644
--- a/sal/qa/makefile.mk
+++ b/sal/qa/makefile.mk
@@ -47,6 +47,8 @@ TARGET=whole_sal_qa
 ALLTAR : test_all
 .ENDIF
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 # OTHER STUFF ------------------------------------------------------
 # test : test_all
 
@@ -60,3 +62,5 @@ test_all:
         @echo - start sal unit tests
         @echo ----------------------------------------------------------
         $(PERL) buildall.pl $(TESTOPT)
+
+.ENDIF
diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk
index b822ba575bb8..89a4fb363460 100644
--- a/sal/qa/osl/condition/makefile.mk
+++ b/sal/qa/osl/condition/makefile.mk
@@ -36,6 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
@@ -45,7 +47,7 @@ SHL1OBJS=  \
     $(SLO)$/osl_Condition.obj
 
 SHL1TARGET= osl_Condition
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
@@ -54,7 +56,10 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 # auto generated Target:Condition
 # END ------------------------------------------------------------------
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
+
diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx
index 59cfcce9d77a..415f17f6a881 100644
--- a/sal/qa/osl/condition/osl_Condition.cxx
+++ b/sal/qa/osl/condition/osl_Condition.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,6 +33,7 @@
 // include files
 //------------------------------------------------------------------------
 #include <osl_Condition_Const.h>
+#include <stdlib.h>
 
 using namespace osl;
 using namespace rtl;
@@ -45,8 +47,8 @@ using namespace rtl;
 */
 inline void printBool( sal_Bool bOk )
 {
-    t_print("#printBool# " );
-    ( sal_True == bOk ) ? t_print("TRUE!\n" ): t_print("FALSE!\n" );
+    printf("#printBool# " );
+    ( sal_True == bOk ) ? printf("TRUE!\n" ): printf("FALSE!\n" );
 }
 
 /** print a UNI_CODE String.
@@ -55,26 +57,9 @@ inline void printUString( const ::rtl::OUString & str )
 {
     rtl::OString aString;
 
-    t_print("#printUString_u# " );
+    printf("#printUString_u# " );
     aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    t_print("%s\n", aString.getStr( ) );
-}
-
-/** wait _nSec seconds.
-*/
-void thread_sleep( sal_Int32 _nSec )
-{
-    /// print statement in thread process must use fflush() to force display.
-    t_print("# wait %d seconds. ", _nSec );
-    fflush( stdout );
-
-#ifdef WNT                               //Windows
-    Sleep( _nSec * 1000 );
-#endif
-#if ( defined UNX ) || ( defined OS2 )   //Unix
-    sleep( _nSec );
-#endif
-    t_print("# done\n" );
+    printf("%s\n", aString.getStr( ) );
 }
 
 enum ConditionType
@@ -187,11 +172,10 @@ namespace osl_Condition
 
             ConditionThread myThread2( aCond, thread_type_set );
             myThread2.create();
-            thread_sleep(1);
-            bRes1 = myThread1.isRunning( );
-            bRes2 = aCond.check( );
 
             myThread1.join( );
+            bRes1 = myThread1.isRunning( );
+            bRes2 = aCond.check( );
             myThread2.join( );
 
             CPPUNIT_ASSERT_MESSAGE( "#test comment#: use one thread to set the condition in order to release another thread.",
@@ -262,14 +246,15 @@ namespace osl_Condition
 
         void setUp( )
         {
-            tv1 = (TimeValue*)malloc(sizeof(TimeValue));
+            tv1 = new TimeValue;
             tv1->Seconds = 1;
+            tv1->Nanosec = 0;
 
         }
 
         void tearDown( )
         {
-            free( tv1 );
+            delete tv1;
         }
 
 
@@ -282,15 +267,14 @@ namespace osl_Condition
             cond1.set();
             cond2.set();
 
-osl::Condition::Result r1=cond1.wait(tv1);
-osl::Condition::Result r2=cond2.wait();
-osl::Condition::Result r3=cond3.wait(tv1);
-fprintf(stderr,"%d %d %d\n",r1,r2,r3);
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test three types of wait.",
-                                    (cond1.wait(tv1) == ::osl::Condition::result_ok) &&
-                                    (cond2.wait() == ::osl::Condition::result_ok) &&
-                                    (cond3.wait(tv1) == ::osl::Condition::result_timeout) );
+            osl::Condition::Result r1=cond1.wait(tv1);
+            osl::Condition::Result r2=cond2.wait();
+            osl::Condition::Result r3=cond3.wait(tv1);
 
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test three types of wait.",
+                                    (r1 == ::osl::Condition::result_ok) &&
+                                    (r2 == ::osl::Condition::result_ok) &&
+                                    (r3 == ::osl::Condition::result_timeout) );
         }
 
         void wait_002( )
@@ -367,11 +351,11 @@ fprintf(stderr,"%d %d %d\n",r1,r2,r3);
 
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Condition::ctors, "osl_Condition");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Condition::set, "osl_Condition");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Condition::reset, "osl_Condition");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Condition::wait, "osl_Condition");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Condition::check, "osl_Condition");
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::ctors);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::set);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::reset);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::wait);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::check);
 // -----------------------------------------------------------------------------
 
 } // namespace osl_Condition
@@ -379,6 +363,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Condition::check, "osl_Condition");
 
 // -----------------------------------------------------------------------------
 
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h
index 1a5fb1e3f4ce..e000e7c415a0 100644
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ b/sal/qa/osl/condition/osl_Condition_Const.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,15 +26,9 @@
  *
  ************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _OSL_CONDITION_CONST_H_
 #define _OSL_CONDITION_CONST_H_
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
@@ -56,7 +51,9 @@
 #include <unistd.h>
 #endif
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
 #define OSLTEST_DECLARE_USTRING( str_name, str_value ) \
     ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( str_value )
@@ -70,3 +67,5 @@ const char pTestString[17] = "Sun Microsystems";
 
 
 #endif /* _OSL_CONDITION_CONST_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk
index e13de9f5d5af..4cb2ffebce16 100644
--- a/sal/qa/osl/file/makefile.mk
+++ b/sal/qa/osl/file/makefile.mk
@@ -36,6 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
@@ -43,7 +45,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
 SHL1OBJS=  \
     $(SLO)$/osl_File.obj
 SHL1TARGET= osl_File
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
@@ -54,7 +56,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
 SHL2OBJS=$(SLO)$/test_cpy_wrt_file.obj
 SHL2TARGET=tcwf
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
 SHL2IMPLIB=i$(SHL2TARGET)
 SHL2DEF=$(MISC)$/$(SHL2TARGET).def
 SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
@@ -67,7 +69,7 @@ DEF2NAME    =$(SHL2TARGET)
 SHL3OBJS=  \
     $(SLO)$/osl_old_test_file.obj
 SHL3TARGET= osl_old_test_file
-SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL3IMPLIB= i$(SHL3TARGET)
 
@@ -79,7 +81,9 @@ SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
 # do this here, so we get right dependencies
 SLOFILES=$(SHL1OBJS)
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 1450d49874bd..5787a746bdc6 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,18 +42,16 @@
 #include <osl/file.hxx>
 #include <osl_File_Const.h>
 
-#include <testshl/simpleheader.hxx>
-
-// #ifdef WNT
-// #   define UNICODE
-// #    define WIN32_LEAN_AND_MEAN
-// #    include <windows.h>
-// #   include <tchar.h>
-// #endif
-
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
 
 //------------------------------------------------------------------------
 // helper functions
@@ -101,44 +100,44 @@ inline ::rtl::OString errorToString( const ::osl::FileBase::RC _nError )
     return sResult;
 }
 
-rtl::OUString errorToStr( ::osl::FileBase::RC const& nError)
+rtl::OString errorToStr( ::osl::FileBase::RC const& nError)
 {
-    rtl::OUStringBuffer suBuf;
-    suBuf.append( rtl::OUString::createFromAscii("The returned error is: ") );
-    suBuf.append( rtl::OStringToOUString(errorToString(nError), RTL_TEXTENCODING_ASCII_US) );
-    suBuf.append( rtl::OUString::createFromAscii("!\n") );
-    return suBuf.makeStringAndClear();
+    rtl::OString suBuf;
+    suBuf += "The returned error is: " ;
+    suBuf += errorToString(nError);
+    suBuf += "!\n";
+    return suBuf;
 }
 
 /** print a file type name.
 */
 inline void printFileType( const ::osl::FileStatus::Type nType )
 {
-    t_print( "#printFileType# " );
+    printf( "#printFileType# " );
     switch ( nType ) {
         case ::osl::FileStatus::Directory:
-            t_print( "This file is a: Directory.\n" );
+            printf( "This file is a: Directory.\n" );
             break;
         case ::osl::FileStatus::Volume:
-            t_print( "This file is a: volume device.\n" );
+            printf( "This file is a: volume device.\n" );
             break;
         case ::osl::FileStatus::Regular:
-            t_print( "This file is a: regular file.\n" );
+            printf( "This file is a: regular file.\n" );
             break;
         case ::osl::FileStatus::Fifo:
-            t_print( "This file is a: fifo.\n" );
+            printf( "This file is a: fifo.\n" );
             break;
         case ::osl::FileStatus::Socket:
-            t_print( "This file is a: socket.\n" );
+            printf( "This file is a: socket.\n" );
             break;
         case ::osl::FileStatus::Link:
-            t_print( "This file is a: link file.\n" );
+            printf( "This file is a: link file.\n" );
             break;
         case ::osl::FileStatus::Special:
-            t_print( "This file is a: special.\n" );
+            printf( "This file is a: special.\n" );
             break;
         case ::osl::FileStatus::Unknown:
-            t_print( "The file type is unknown %d \n", nType );
+            printf( "The file type is unknown %d \n", nType );
             break;
     }
 }
@@ -147,83 +146,64 @@ inline void printFileType( const ::osl::FileStatus::Type nType )
 */
 inline void printFileAttributes( const sal_Int64 nAttributes )
 {
-    t_print( "#printFileAttributes# This file is a: (" );
-    if ( ( nAttributes | Attribute_ReadOnly ) == nAttributes )
-            t_print( " ReadOnly " );
-    if ( ( nAttributes | Attribute_Hidden ) == nAttributes )
-            t_print( " Hidden " );
-    if ( ( nAttributes | Attribute_Executable ) == nAttributes )
-            t_print( " Executable " );
-    if ( ( nAttributes | Attribute_GrpWrite ) == nAttributes )
-            t_print( " GrpWrite " );
-    if ( ( nAttributes | Attribute_GrpRead ) == nAttributes )
-            t_print( " GrpRead " );
-    if ( ( nAttributes | Attribute_GrpExe ) == nAttributes )
-            t_print( " GrpExe " );
-    if ( ( nAttributes | Attribute_OwnWrite ) == nAttributes )
-            t_print( " OwnWrite " );
-    if ( ( nAttributes | Attribute_OwnRead ) == nAttributes )
-            t_print( " OwnRead " );
-    if ( ( nAttributes | Attribute_OwnExe ) == nAttributes )
-            t_print( " OwnExe " );
-    if ( ( nAttributes | Attribute_OthWrite ) == nAttributes )
-            t_print( " OthWrite " );
-    if ( ( nAttributes | Attribute_OthRead ) == nAttributes )
-            t_print( " OthRead " );
-    if ( ( nAttributes | Attribute_OthExe ) == nAttributes )
-            t_print( " OthExe " );
-    t_print( ") file!\n" );
-}
-
-/** print a UNI_CODE file name.
-*/
-inline void printFileName( const ::rtl::OUString & str )
-{
-    rtl::OString aString;
-
-    t_print( "#printFileName_u# " );
-    aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    t_print( "%s\n", aString.getStr( ) );
-}
-
-/** print a ASCII_CODE file name.
-*/
-inline void printFileName( const sal_Char * str )
-{
-    t_print( "#printFileName_a# " );
-    t_print( "%s\n", str );
+    printf( "#printFileAttributes# This file is a: (" );
+    if ( ( nAttributes | osl_File_Attribute_ReadOnly ) == nAttributes )
+            printf( " ReadOnly " );
+    if ( ( nAttributes | osl_File_Attribute_Hidden ) == nAttributes )
+            printf( " Hidden " );
+    if ( ( nAttributes | osl_File_Attribute_Executable ) == nAttributes )
+            printf( " Executable " );
+    if ( ( nAttributes | osl_File_Attribute_GrpWrite ) == nAttributes )
+            printf( " GrpWrite " );
+    if ( ( nAttributes | osl_File_Attribute_GrpRead ) == nAttributes )
+            printf( " GrpRead " );
+    if ( ( nAttributes | osl_File_Attribute_GrpExe ) == nAttributes )
+            printf( " GrpExe " );
+    if ( ( nAttributes | osl_File_Attribute_OwnWrite ) == nAttributes )
+            printf( " OwnWrite " );
+    if ( ( nAttributes | osl_File_Attribute_OwnRead ) == nAttributes )
+            printf( " OwnRead " );
+    if ( ( nAttributes | osl_File_Attribute_OwnExe ) == nAttributes )
+            printf( " OwnExe " );
+    if ( ( nAttributes | osl_File_Attribute_OthWrite ) == nAttributes )
+            printf( " OthWrite " );
+    if ( ( nAttributes | osl_File_Attribute_OthRead ) == nAttributes )
+            printf( " OthRead " );
+    if ( ( nAttributes | osl_File_Attribute_OthExe ) == nAttributes )
+            printf( " OthExe " );
+    printf( ") file!\n" );
 }
 
 /** print an output wrong message.
 */
 inline void printError( const ::osl::FileBase::RC nError )
 {
-    t_print( "#printError# " );
-    printFileName( errorToStr(nError) );
+    printf( "#printError# " );
+    printf( "%s\n", errorToStr(nError).getStr() );
 }
 
 /** print an signed Integer Number.
 */
 inline void printInt( sal_Int64 i )
 {
-    t_print( "#printInt_i64# " );
-    t_print( "The Integer64 is %lld\n", i);
+    printf( "#printInt_i64# " );
+    printf( "The Integer64 is %"SAL_PRIdINT64"\n", i);
 }
 
 /** print an unsigned Integer Number.
 */
 inline void printInt( sal_uInt64 i )
 {
-    t_print( "#printInt_u64# " );
-    t_print( "The unsigned Integer64 is %llu\n", i);
+    printf( "#printInt_u64# " );
+    printf( "The unsigned Integer64 is %"SAL_PRIuUINT64"\n", i);
 }
 
 /** print Boolean value.
 */
 inline void printBool( sal_Bool bOk )
 {
-    t_print( "#printBool# " );
-    ( sal_True == bOk ) ? t_print( "YES!\n" ): t_print( "NO!\n" );
+    printf( "#printBool# " );
+    ( sal_True == bOk ) ? printf( "YES!\n" ): printf( "NO!\n" );
 }
 
 /** print struct TimeValue in local time format.
@@ -238,19 +218,19 @@ inline void printTime( TimeValue *tv )
     CPPUNIT_ASSERT_MESSAGE( "Error in printTime() function,osl_getLocalTimeFromSystemTime ",sal_True == osl_getLocalTimeFromSystemTime( tv, pLocalTV ) );
     CPPUNIT_ASSERT_MESSAGE( "Error in printTime() function,osl_gepDateTimeFromTimeValue ",sal_True == osl_getDateTimeFromTimeValue( pLocalTV, pDateTime ) );
 
-    t_print( "#printTime# " );
-     t_print( " Time is: %d/%d/%d ", pDateTime->Month, pDateTime->Day, pDateTime->Year);
+    printf( "#printTime# " );
+     printf( " Time is: %d/%d/%d ", pDateTime->Month, pDateTime->Day, pDateTime->Year);
     switch ( pDateTime->DayOfWeek )
     {
-        case 0: t_print("Sun. "); break;
-        case 1: t_print("Mon. "); break;
-        case 2: t_print("Tue. "); break;
-        case 3: t_print("Thr. "); break;
-        case 4: t_print("Wen. "); break;
-        case 5: t_print("Fri. "); break;
-        case 6: t_print("Sat. "); break;
+        case 0: printf("Sun. "); break;
+        case 1: printf("Mon. "); break;
+        case 2: printf("Tue. "); break;
+        case 3: printf("Thr. "); break;
+        case 4: printf("Wen. "); break;
+        case 5: printf("Fri. "); break;
+        case 6: printf("Sat. "); break;
     }
-    t_print( " %d:%d:%d %d nsecs\n", pDateTime->Hours, pDateTime->Minutes, pDateTime->Seconds, pDateTime->NanoSeconds);
+    printf( " %d:%d:%d %d nsecs\n", pDateTime->Hours, pDateTime->Minutes, pDateTime->Seconds, (int) pDateTime->NanoSeconds);
 
     free( pDateTime );
     free( pLocalTV );
@@ -258,8 +238,9 @@ inline void printTime( TimeValue *tv )
 
 /** compare two TimeValue, unit is "ms", since Windows time precision is better than UNX.
 */
+/* FIXME: the above assertion is bogus */
 
-#if ( defined UNX ) || ( defined OS2 )                 //precision of time in Windows is better than UNX
+#if ( defined UNX )                      //precision of time in Windows is better than UNX
 #   define delta 2000                    //time precision, 2000ms
 #else
 #   define delta 1800                    //time precision, 1.8s
@@ -269,7 +250,7 @@ inline sal_Int64 t_abs64(sal_Int64 _nValue)
 {
     // std::abs() seems to have some ambiguity problems (so-texas)
     // return abs(_nValue);
-    t_print("t_abs64(%ld)\n", _nValue);
+    printf("t_abs64(%ld)\n", (long) _nValue);
     // CPPUNIT_ASSERT(_nValue < 2147483647);
 
     if (_nValue < 0)
@@ -330,7 +311,7 @@ inline sal_Bool compareFileName( const ::rtl::OUString & ustr, const sal_Char *a
 {
     (void)ustr;
     ::rtl::OUString ustr1 = rtl::OUString::createFromAscii( astr );
-    sal_Bool bOk = ustr1.equalsIgnoreAsciiCase( ustr1 );
+    sal_Bool bOk = ustr1.equalsIgnoreAsciiCase( ustr1 ); // TODO: does it really compare with the same var?
 
     return bOk;
 }
@@ -381,14 +362,12 @@ inline void createTestFile( const ::rtl::OUString filename )
     if ( !isURL( filename ) )
         ::osl::FileBase::getFileURLFromSystemPath( filename, aPathURL ); //convert if not full qualified URL
 
-    //::std::auto_ptr<File> pFile( new File( aPathURL ) );
     File aFile(aPathURL);
-    //nError = pFile->open( OpenFlag_Read | OpenFlag_Write | OpenFlag_Create );
-    nError = aFile.open( OpenFlag_Read | OpenFlag_Write | OpenFlag_Create );
+    nError = aFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
     //CPPUNIT_ASSERT_MESSAGE( "In createTestFile Function: creation ", ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_EXIST ) );
     if ( ( ::osl::FileBase::E_None != nError ) && ( nError != ::osl::FileBase::E_EXIST ))
     {
-        t_print("createTestFile failed!\n");
+        printf("createTestFile failed!\n");
     }
     aFile.close();
 
@@ -408,14 +387,14 @@ inline void createTestFile( const ::rtl::OUString basename, const ::rtl::OUStrin
 */
 inline void deleteTestFile( const ::rtl::OUString filename )
 {
-    // LLA: t_print("deleteTestFile\n");
+    // LLA: printf("deleteTestFile\n");
     ::rtl::OUString     aPathURL   = filename.copy( 0 );
     ::osl::FileBase::RC nError;
 
     if ( !isURL( filename ) )
         ::osl::FileBase::getFileURLFromSystemPath( filename, aPathURL ); //convert if not full qualified URL
 
-    nError = ::osl::File::setAttributes( aPathURL, Attribute_GrpWrite| Attribute_OwnWrite| Attribute_OthWrite ); // if readonly, make writtenable.
+    nError = ::osl::File::setAttributes( aPathURL, osl_File_Attribute_GrpWrite| osl_File_Attribute_OwnWrite| osl_File_Attribute_OthWrite ); // if readonly, make writtenable.
     CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: set writtenable ", ( ::osl::FileBase::E_None == nError ) || ( ::osl::FileBase::E_NOENT == nError ) );
 
     nError = ::osl::File::remove( aPathURL );
@@ -444,7 +423,7 @@ inline void createTestDirectory( const ::rtl::OUString dirname )
     nError = ::osl::Directory::create( aPathURL );
     //CPPUNIT_ASSERT_MESSAGE( "In createTestDirectory Function: creation: ", ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_EXIST ) );
     if ( ( ::osl::FileBase::E_None != nError ) && ( nError != ::osl::FileBase::E_EXIST ))
-      t_print("createTestDirectory failed!\n");
+      printf("createTestDirectory failed!\n");
 }
 
 /** create a temp test directory using OUString name of full qualified URL or system path in a base directory.
@@ -462,41 +441,20 @@ inline void createTestDirectory( const ::rtl::OUString basename, const ::rtl::OU
 */
 inline void deleteTestDirectory( const ::rtl::OUString dirname )
 {
-    // LLA: t_print("deleteTestDirectory\n");
     ::rtl::OUString     aPathURL   = dirname.copy( 0 );
     ::osl::FileBase::RC nError;
-    // LLA: printFileName(aPathURL);
     if ( !isURL( dirname ) )
         ::osl::FileBase::getFileURLFromSystemPath( dirname, aPathURL ); //convert if not full qualified URL
 
     ::osl::Directory testDir( aPathURL );
     if ( testDir.isOpen( ) == sal_True )
-    {
-        // LLA: t_print("#close Dir\n");
         testDir.close( );  //close if still open.
-        }
 
     nError = ::osl::Directory::remove( aPathURL );
-    // LLA: printError(nError);
-    // LLA: if (( ::osl::FileBase::E_None == nError ))
-    // LLA: {
-    // LLA:     t_print("nError == E_None\n");
-    // LLA: }
-    // LLA: else if ( ( nError == ::osl::FileBase::E_NOENT ))
-    // LLA: {
-    // LLA:     t_print("nError == E_NOENT\n");
-    // LLA: }
-    // LLA: else
-    // LLA: {
-    // LLA:     // t_print("nError == %d\n", nError);
-    // LLA: }
-        rtl::OUString strError = rtl::OUString::createFromAscii( "In deleteTestDirectory function: remove Directory ");
-        strError += aPathURL;
-    CPPUNIT_ASSERT_MESSAGE( strError, ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ) );
-    // LLA: if (! ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ))
-    // LLA: {
-    // LLA:     t_print("In deleteTestDirectory function: remove\n");
-    // LLA: }
+
+    rtl::OString strError (RTL_CONSTASCII_STRINGPARAM("In deleteTestDirectory function: remove Directory "));
+    strError += ::rtl::OUStringToOString( aPathURL, RTL_TEXTENCODING_ASCII_US );
+    CPPUNIT_ASSERT_MESSAGE( strError.getStr(), ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ) );
 }
 
 /** delete a temp test directory using OUString name of full qualified URL or system path in a base directory.
@@ -524,10 +482,10 @@ inline sal_Bool checkFile( const ::rtl::OUString & str, oslCheckMode nCheckMode
 {
     ::osl::FileBase::RC   nError1, nError2;
     ::osl::File       testFile( str );
-    sal_Bool        bCheckResult;
+    sal_Bool          bCheckResult;
 
     bCheckResult = sal_False;
-    nError1 = testFile.open ( OpenFlag_Read );
+    nError1 = testFile.open ( osl_File_OpenFlag_Read );
     if ( ( ::osl::FileBase::E_NOENT != nError1 ) && ( ::osl::FileBase::E_ACCES != nError1 ) ){
 
         switch ( nCheckMode ) {
@@ -542,10 +500,8 @@ inline sal_Bool checkFile( const ::rtl::OUString & str, oslCheckMode nCheckMode
                     bCheckResult = sal_True;
                 break;
             case osl_Check_Mode_WriteAccess:
-                /// check the file name and whether it can be write.
+                /// check the file name and whether it can be written.
                 /// write chars into the file.
-                //testFile.close( );
-                //testFile.open( OpenFlag_Write );
                 sal_uInt64 nCount_write;
                 nError2 = testFile.write( pBuffer_Char, 10, nCount_write );
                 if ( ::osl::FileBase::E_None == nError2 )
@@ -567,10 +523,10 @@ inline sal_Bool checkFile( const ::rtl::OUString & str, oslCheckMode nCheckMode
 //check if the file exist
 inline sal_Bool ifFileExist( const ::rtl::OUString & str )
 {
-    sal_Bool        bCheckResult = sal_False;
+    sal_Bool  bCheckResult = sal_False;
 
 /*#ifdef WNT
-    ::rtl::OUString     aUStr  = str.copy( 0 );
+    ::rtl::OUString  aUStr  = str.copy( 0 );
     if ( isURL( str ) )
         ::osl::FileBase::getSystemPathFromFileURL( str, aUStr );
 
@@ -582,11 +538,11 @@ inline sal_Bool ifFileExist( const ::rtl::OUString & str )
     ::rtl::OString aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
     // const char *path = aString.getStr( );
     ::osl::File testFile( str );
-    bCheckResult = ( osl::FileBase::E_None == testFile.open( OpenFlag_Read ) );
+    bCheckResult = ( osl::FileBase::E_None == testFile.open( osl_File_OpenFlag_Read ) );
     //if (bCheckResult)
-    //t_print("%s exist!\n", path);
+    //printf("%s exist!\n", path);
     //else
-    //t_print("%s not exist!\n", path);
+    //printf("%s not exist!\n", path);
 //#endif
     return bCheckResult;
 
@@ -595,10 +551,10 @@ inline sal_Bool ifFileExist( const ::rtl::OUString & str )
 //check if the file can be writen
 inline sal_Bool ifFileCanWrite( const ::rtl::OUString & str )
 {
-    sal_Bool        bCheckResult = sal_False;
+    sal_Bool  bCheckResult = sal_False;
     //on Windows, the file has no write right, but can be written
 #ifdef WNT
-    ::rtl::OUString     aUStr  = str.copy( 0 );
+    ::rtl::OUString  aUStr  = str.copy( 0 );
     if ( isURL( str ) )
         ::osl::FileBase::getSystemPathFromFileURL( str, aUStr );
 
@@ -606,10 +562,10 @@ inline sal_Bool ifFileCanWrite( const ::rtl::OUString & str )
     const char *path = aString.getStr( );
     if (( _access( path, 2 ) ) != -1 )
          bCheckResult = sal_True;
-     //on UNX, just test if open success with OpenFlag_Write
+     //on UNX, just test if open success with osl_File_OpenFlag_Write
 #else
     ::osl::File testFile( str );
-    bCheckResult = (osl::FileBase::E_None == testFile.open( OpenFlag_Write ));
+    bCheckResult = (osl::FileBase::E_None == testFile.open( osl_File_OpenFlag_Write ));
 #endif
     return bCheckResult;
 }
@@ -672,23 +628,23 @@ inline sal_Bool checkDirectory( const ::rtl::OUString & str, oslCheckMode nCheck
 
 /** construct error message
 */
-inline ::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::rtl::OUString & rightVal, const sal_Char * msg = "")
+inline ::rtl::OString outputError( const ::rtl::OString & returnVal, const ::rtl::OString & rightVal, const sal_Char * msg = "")
 {
-    ::rtl::OUString aUString;
+    ::rtl::OString aString;
     if ( returnVal.equals( rightVal ) )
-        return aUString;
-    aUString += ::rtl::OUString::createFromAscii(msg);
-    aUString += ::rtl::OUString::createFromAscii(": the returned value is '");
-    aUString += returnVal;
-    aUString += ::rtl::OUString::createFromAscii("', but the value should be '");
-    aUString += rightVal;
-    aUString += ::rtl::OUString::createFromAscii("'.");
-    return aUString;
+        return aString;
+    aString += msg;
+    aString += ": the returned value is '";
+    aString += returnVal;
+    aString += "', but the value should be '";
+    aString += rightVal;
+    aString += "'.";
+    return aString;
 }
 
 /** Change file mode, two version in UNIX and Windows;.
 */
-#if ( defined UNX ) || ( defined OS2 )         //chmod() method is differ in Windows
+#if ( defined UNX )         //chmod() method is differ in Windows
 inline void changeFileMode( ::rtl::OUString & filepath, sal_Int32 mode )
 {
     rtl::OString    aString;
@@ -704,7 +660,7 @@ inline void changeFileMode( ::rtl::OUString & filepath, sal_Int32 mode )
 {
     (void)filepath;
     (void)mode;
-    t_print("this method is not implemented yet");
+    printf("this method is not implemented yet");
 }
 #endif
 
@@ -718,72 +674,19 @@ inline ::rtl::OUString getCurrentPID( void );
 namespace osl_FileBase
 {
 
-#if 0  //~ this function has been deprecated
-    //---------------------------------------------------------------------
-    // testing the method
-    // static inline RC getCanonicalName( const ::rtl::OUString& ustrRequestedURL, ::rtl::OUString& ustrValidURL )
-    //
-    // The illegal characters are ;+=[]',\"*\\<>/?:|.
-    // because getCanonicalName method is not implemented yet and will be deprecated in the future, this test is not necessary.
-    //---------------------------------------------------------------------
-
-    class getCanonicalName:public CppUnit::TestFixture
-    {
-
-        public:
-        ::osl::FileBase::RC nError;
-
-        void getCanonicalName_001( )
-        {
-            ::rtl::OUString aUStr_ValidURL;
-            nError = ::osl::FileBase::getCanonicalName( aCanURL1, aUStr_ValidURL );
-
-            CPPUNIT_ASSERT_MESSAGE("test for getCanonicalName function: check valid and unused file name",
-                                     ( osl::FileBase::E_None == nError ) && aUStr_ValidURL.equalsIgnoreAsciiCase( aCanURL1 ) );
-        }
-
-        void getCanonicalName_002( )
-        {
-            ::rtl::OUString     aUStr_ValidURL;
-
-            createTestFile( aCanURL1 );
-            nError = ::osl::FileBase::getCanonicalName( aCanURL1, aUStr_ValidURL );
-            deleteTestFile( aCanURL1 );
-
-            CPPUNIT_ASSERT_MESSAGE( " test for getCanonicalName function: an existed file name, should different from the request, it did not passed(W32)(UNX)",
-                                    ( osl::FileBase::E_None == nError ) && aUStr_ValidURL.equalsIgnoreAsciiCase( aCanURL1 ) );
-        }
-
-        void getCanonicalName_003( )
-        {
-            ::rtl::OUString aUStr_ValidURL;
-            nError = ::osl::FileBase::getCanonicalName ( aCanURL2,  aUStr_ValidURL );
-
-            CPPUNIT_ASSERT_MESSAGE( " test for getCanonicalName function: invalid file name, should different from the request,  it did not passed(W32)(UNX)",
-                ( osl::FileBase::E_None == nError ) && aUStr_ValidURL.equalsIgnoreAsciiCase( aCanURL2 ) );
-        }
-
-        CPPUNIT_TEST_SUITE( getCanonicalName );
-        CPPUNIT_TEST( getCanonicalName_001 );
-        CPPUNIT_TEST( getCanonicalName_002 );
-        CPPUNIT_TEST( getCanonicalName_003 );
-        CPPUNIT_TEST_SUITE_END( );
-    };// class getCanonicalName
-#endif
-
     //---------------------------------------------------------------------
     // testing the method
     // static inline RC getAbsoluteFileURL( const ::rtl::OUString& ustrBaseDirectoryURL,
     //                                      const ::rtl::OUString& ustrRelativeFileURL,
-    //                                            ::rtl::OUString& ustrAbsoluteFileURL )
+    //                                      ::rtl::OUString& ustrAbsoluteFileURL )
     //---------------------------------------------------------------------
 
     class getAbsoluteFileURL:public CppUnit::TestFixture
     {
-        //::osl::FileBase       aFileBase;
-            ::rtl::OUString     aResultURL1, aResultURL2, aResultURL3, aResultURL4, aResultURL5, aResultURL6;
-            // ::osl::FileBase::RC  nError;
-        sal_Bool        bOk;
+        //::osl::FileBase  aFileBase;
+        ::rtl::OUString  aResultURL1, aResultURL2, aResultURL3, aResultURL4, aResultURL5, aResultURL6;
+            // ::osl::FileBase::RC nError;
+        sal_Bool  bOk;
 
         public:
 
@@ -817,161 +720,6 @@ namespace osl_FileBase
 
         }; //class getAbsoluteFileURL
 
-/* use coding format as same as getSystemPathFromFileURL
-        // initialization
-        void setUp( )
-        {
-            sal_Char pResultURL1[]  = "/relative/file1";
-            sal_Char pResultURL2[]  = "/relative/file2";
-            sal_Char pResultURL3[]  = "/file3";
-            sal_Char pResultURL4[]  = "/file4";
-            sal_Char pResultURL5[]  = "/canonical.name";
-            sal_Char pResultURL6[]  = "/relative/";
-            aResultURL1 = aUserDirectoryURL.concat( rtl::OUString::createFromAscii( pResultURL1 ) );
-            aResultURL2 = aUserDirectoryURL.concat( rtl::OUString::createFromAscii( pResultURL2 ) );
-            aResultURL3 = aUserDirectoryURL.concat( rtl::OUString::createFromAscii( pResultURL3 ) );
-            aResultURL4 = aUserDirectoryURL.concat( rtl::OUString::createFromAscii( pResultURL4 ) );
-            aResultURL5 = aUserDirectoryURL.concat( rtl::OUString::createFromAscii( pResultURL5 ) );
-            aResultURL6 = aUserDirectoryURL.concat( rtl::OUString::createFromAscii( pResultURL6 ) );
-        }
-
-        void tearDown( )
-        {
-        }
-
-        // test code
-        void getAbsoluteFileURL_001( )
-        {
-            ::rtl::OUString aUStr_AbsURL;
-
-            ::osl::FileBase::RC nError11 = aFileBase.getAbsoluteFileURL( aUserDirectoryURL,  aRelURL1, aUStr_AbsURL );
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for getAbsoluteFileURL(' ");
-            suError += aUserDirectoryURL;
-            suError += ::rtl::OUString::createFromAscii("', '");
-            suError += aRelURL1;
-            suError += ::rtl::OUString::createFromAscii("', '");
-            suError += aUStr_AbsURL;
-            suError += outputError( aUStr_AbsURL, aResultURL1, "' ),");
-
-            sal_Bool nError12 = aUStr_AbsURL.equals( aResultURL1 );
-            ::osl::FileBase::RC nError21 = aFileBase.getAbsoluteFileURL( aUserDirectoryURL,  aRelURL2, aUStr_AbsURL );
-            sal_Bool nError22 = aUStr_AbsURL.equals( aResultURL2 );
-            ::osl::FileBase::RC nError31 = aFileBase.getAbsoluteFileURL( aUserDirectoryURL,  aRelURL3, aUStr_AbsURL );
-            sal_Bool nError32 = aUStr_AbsURL.equals( aResultURL3 );
-            ::osl::FileBase::RC nError41 = aFileBase.getAbsoluteFileURL( aUserDirectoryURL,  aRelURL4, aUStr_AbsURL );
-            sal_Bool nError42 = aUStr_AbsURL.equals( aResultURL4 );
-            ::osl::FileBase::RC nError61 = aFileBase.getAbsoluteFileURL( aUserDirectoryURL,  aRelURL6, aUStr_AbsURL );
-            sal_Bool nError62 = aUStr_AbsURL.equals( aResultURL6 );
-            printFileName( aUStr_AbsURL );
-            printFileName( aResultURL6 );
-
-            CPPUNIT_ASSERT_MESSAGE("test for getAbsoluteFileURL function: valid file name with valid directory",
-                                     ( ::osl::FileBase::E_None == nError11 ) && ( sal_True == nError12 ) &&
-                                     ( ::osl::FileBase::E_None == nError21 ) && ( sal_True == nError22 ) &&
-                                     ( ::osl::FileBase::E_None == nError31 ) && ( sal_True == nError32 ) &&
-                                     ( ::osl::FileBase::E_None == nError41 ) && ( sal_True == nError42 ) &&
-                                     ( ::osl::FileBase::E_None == nError61 ) && ( sal_True == nError62 ) );
-        }
-
-
-#if ( defined UNX ) || ( defined OS2 )  //Link is not defined in Windows
-        void getAbsoluteFileURL_002( )
-        {
-            ::rtl::OUString aUStr_AbsURL, aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
-            ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/link.file");
-            ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/canonical.name");
-
-                rtl::OString strLinkFileName, strSrcFileName;
-                strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
-                strSrcFileName =  OUStringToOString( aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US );
-
-            createTestFile( aCanURL1 );
-                sal_Int32 fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() );
-            CPPUNIT_ASSERT( fd == 0 );
-
-            nError = aFileBase.getAbsoluteFileURL( aUserDirectoryURL, aLnkURL1, aUStr_AbsURL );
-            bOk = aUStr_AbsURL.equals( aResultURL5 );
-
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for getAbsoluteFileURL(' ");
-            suError += aUserDirectoryURL;
-            suError += ::rtl::OUString::createFromAscii("', '");
-            suError += aLnkURL1;
-            suError += ::rtl::OUString::createFromAscii("', '");
-            suError += aUStr_AbsURL;
-            suError += outputError( aUStr_AbsURL, aResultURL5, "' ),");
-            //printFileName(suError);
-
-            deleteTestFile( aCanURL1 );
-                fd = remove( strLinkFileName.getStr() );
-            CPPUNIT_ASSERT( fd == 0 );
-
-            CPPUNIT_ASSERT_MESSAGE("test for getAbsoluteFileURL function: URL contain link( Solaris version )",
-                                     ( ::osl::FileBase::E_None == nError ) && ( sal_True == bOk ) );
-        }
-#else       //Windows version
-        void getAbsoluteFileURL_002( )
-        {
-            CPPUNIT_ASSERT_MESSAGE("test for getAbsoluteFileURL function: URL contain link( Windows version )",
-                    1 );
-        }
-#endif
-
-        void getAbsoluteFileURL_003( )
-        {
-// LLA: may be a wrong test, aTmpName1 not a real URL
-#if 0
-            ::rtl::OUString aUStr_AbsURL;
-
-            nError = aFileBase.getAbsoluteFileURL( aTmpName1,  aRelURL1, aUStr_AbsURL );    //base dir invalid error
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for getAbsoluteFileURL('");
-            suError += aTmpName1;
-            suError += ::rtl::OUString::createFromAscii("', '");
-            suError += aRelURL1;
-            suError += ::rtl::OUString::createFromAscii("', '");
-            suError += aUStr_AbsURL;
-            suError += ::rtl::OUString::createFromAscii("' ),Parameter is invalid. it ignore the invalid base in Windows, did not pass in (W32), the reason maybe caused by the similar bug with getSystemPathFromFileURL() ");
-
-            CPPUNIT_ASSERT_MESSAGE( suError, ( ::osl::FileBase::E_INVAL == nError ) );
-#endif
-        }
-
-        //use ".." in relartive path, the BasePath must exist on the file system
-        void getAbsoluteFileURL_004( )
-        {
-            //create two level directories under $Temp/PID/
-            ::rtl::OUString aUStrUpBase = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/test1");
-            createTestDirectory( aUStrUpBase );
-            ::rtl::OUString aUStrBase = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/test1/dir1");
-            createTestDirectory( aUStrBase );
-
-            ::rtl::OUString aUStrRelar = ::rtl::OUString::createFromAscii("../../mytestfile");
-            ::rtl::OUString aUStr_AbsURL;
-            ::rtl::OUString aResultURL6 = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/mytestfile");
-
-            nError = aFileBase.getAbsoluteFileURL( aUStrBase,  aUStrRelar, aUStr_AbsURL );
-            bOk = aUStr_AbsURL.equals( aResultURL6 );
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for getAbsoluteFileURL('");
-            suError += aUStrBase;
-            suError += ::rtl::OUString::createFromAscii("', '");
-            suError += aUStrRelar;
-            suError += ::rtl::OUString::createFromAscii("', '");
-            suError += aUStr_AbsURL;
-            suError += outputError( aUStr_AbsURL, aResultURL6, "' ), did not pass on Win32 ");
-
-            deleteTestDirectory( aUStrBase );
-            deleteTestDirectory( aUStrUpBase );
-
-            CPPUNIT_ASSERT_MESSAGE( suError, ( ::osl::FileBase::E_None == nError ) && ( sal_True == bOk ) );
-        }
-
-        CPPUNIT_TEST_SUITE( getAbsoluteFileURL );
-        CPPUNIT_TEST( getAbsoluteFileURL_001 );
-        CPPUNIT_TEST( getAbsoluteFileURL_002 );
-        CPPUNIT_TEST( getAbsoluteFileURL_003 );
-        CPPUNIT_TEST( getAbsoluteFileURL_004 );
-        CPPUNIT_TEST_SUITE_END( );
-    };// class getAbsoluteFileURL*/
-
     void getAbsoluteFileURL::check_getAbsoluteFileURL( rtl::OUString const& _suBaseURL,  rtl::OString const& _sRelativeURL, ::osl::FileBase::RC _nAssumeError, rtl::OUString const& _suAssumeResultStr )
     {
         rtl::OUString suRelativeURL = rtl::OStringToOUString(_sRelativeURL, RTL_TEXTENCODING_UTF8);
@@ -980,7 +728,7 @@ namespace osl_FileBase
         osl::FileBase::RC nError = FileBase::getAbsoluteFileURL( _suBaseURL,  suRelativeURL, suResultURL );
         rtl::OString sResultURL = rtl::OUStringToOString( suResultURL, RTL_TEXTENCODING_UTF8);
         rtl::OString sError = errorToString(nError);
-        t_print("getAbsoluteFileURL('%s','%s') deliver absolute URL: '%s', error '%s'\n", sBaseURL.getStr(), _sRelativeURL.getStr(),sResultURL.getStr(), sError.getStr() );
+        printf("getAbsoluteFileURL('%s','%s') deliver absolute URL: '%s', error '%s'\n", sBaseURL.getStr(), _sRelativeURL.getStr(),sResultURL.getStr(), sError.getStr() );
         CPPUNIT_ASSERT_MESSAGE( "Assumption is wrong: error number is wrong", nError == _nAssumeError );
         if ( nError == ::osl::FileBase::E_None )
         {
@@ -991,53 +739,53 @@ namespace osl_FileBase
 
   void getAbsoluteFileURL::getAbsoluteFileURL_001_1()
   {
-    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/relative/file1") );
+    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/relative/file1")) );
     check_getAbsoluteFileURL( aUserDirectoryURL, "relative/file1",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_2()
   {
-    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/relative/file2") );
+    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/relative/file2")) );
     check_getAbsoluteFileURL( aUserDirectoryURL, "relative/./file2",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_3()
   {
-    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/file3") );
+    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/file3")) );
     check_getAbsoluteFileURL( aUserDirectoryURL, "relative/../file3",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_4()
   {
-    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/file4") );
+    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/file4")) );
     check_getAbsoluteFileURL( aUserDirectoryURL, "././relative/../file4",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_5()
   {
     rtl::OUString suAssume;
 #if ( defined UNX )
-    suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/relative/") );
+    suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/relative/")) );
 #else
-    suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/relative") );
+    suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/relative")) );
 #endif
     check_getAbsoluteFileURL( aUserDirectoryURL, "././relative/.",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_6()
   {
-    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/.relative") );
+    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/.relative")) );
     check_getAbsoluteFileURL( aUserDirectoryURL, "./.relative",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_7()
   {
     rtl::OUString suAssume;
 #if (defined UNX )
-    suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/.a/") );
+    suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/.a/")) );
 #else //windows
-    suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/.a") );
+    suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/.a")) );
 #endif
     check_getAbsoluteFileURL( aUserDirectoryURL, "./.a/mydir/..",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_8()
   {
-    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/tmp/ok") );
-#if ( defined UNX ) || ( defined OS2 )
+    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmp/ok")) );
+#if ( defined UNX )
     check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",::osl::FileBase::E_None, suAssume );
 #else
     check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",::osl::FileBase::E_INVAL, suAssume );
@@ -1045,10 +793,10 @@ namespace osl_FileBase
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_002()
   {
-#if ( defined UNX ) || ( defined OS2 )      //Link is not defined in Windows
+#if ( defined UNX )     //Link is not defined in Windows
         ::rtl::OUString aUStr_AbsURL, aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
-        ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/link.file");
-        ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/canonical.name");
+        ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/link.file"));
+        ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/canonical.name"));
 
                 rtl::OString strLinkFileName, strSrcFileName;
                 strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
@@ -1058,7 +806,7 @@ namespace osl_FileBase
                 sal_Int32 fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() );
         CPPUNIT_ASSERT( fd == 0 );
         rtl::OString sLnkURL = OUStringToOString( aLnkURL1, RTL_TEXTENCODING_ASCII_US );
-            rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/canonical.name") );
+            rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/canonical.name")) );
         check_getAbsoluteFileURL( aUserDirectoryURL, sLnkURL, ::osl::FileBase::E_None, suAssume );
         deleteTestFile( aCanURL1 );
                 fd = remove( strLinkFileName.getStr() );
@@ -1072,12 +820,12 @@ namespace osl_FileBase
     void getAbsoluteFileURL::getAbsoluteFileURL_004()
     {
         //create two level directories under $Temp/PID/
-        ::rtl::OUString aUStrUpBase = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/test1");
+        ::rtl::OUString aUStrUpBase = aUserDirectoryURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/test1"));
         createTestDirectory( aUStrUpBase );
-        ::rtl::OUString aUStrBase = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/test1/dir1");
+        ::rtl::OUString aUStrBase = aUserDirectoryURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/test1/dir1"));
         createTestDirectory( aUStrBase );
 
-        ::rtl::OUString suAssume = aUserDirectoryURL.concat( ::rtl::OUString::createFromAscii("/mytestfile") );
+        ::rtl::OUString suAssume = aUserDirectoryURL.concat( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/mytestfile")) );
         check_getAbsoluteFileURL( aUStrBase, "../../mytestfile" , ::osl::FileBase::E_None, suAssume );
         deleteTestDirectory( aUStrBase );
         deleteTestDirectory( aUStrUpBase );
@@ -1168,38 +916,6 @@ namespace osl_FileBase
     };// class SystemPath_FileURL
 
 
-    // test code.
-
-  /*    void getSystemPathFromFileURL::check_getSystemPathFromFileURL(rtl::OString const& _sURL, ::osl::FileBase::RC _nAssumeError, rtl::OString const& _sAssumeResultStr)
-    {
-        // PRE: URL as String
-        rtl::OUString suURL;
-        rtl::OUString suStr;
-        suURL = rtl::OStringToOUString(_sURL, RTL_TEXTENCODING_UTF8);
-        ::osl::FileBase::RC nError =  osl::FileBase::getSystemPathFromFileURL( suURL, suStr ); // start with /
-
-        // if the given string is gt length 0,
-        // we check also this string
-        rtl::OString sStr = rtl::OUStringToOString(suStr, RTL_TEXTENCODING_UTF8);
-        rtl::OString sError = errorToString(nError);
-        t_print("getSystemPathFromFileURL('%s') deliver system path: '%s', error '%s'\n", _sURL.getStr(), sStr.getStr(), sError.getStr() );
-
-        // rtl::OUString suStrEncode = rtl::Uri::encode(suStr, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
-        // sStr = rtl::OUStringToOString(suStr, RTL_TEXTENCODING_UTF8);
-        // t_print("UTF8: %s\n", sStr.getStr() );
-
-        if (_sAssumeResultStr.getLength() > 0)
-        {
-            sal_Bool bStrAreEqual = _sAssumeResultStr.equals(sStr);
-            CPPUNIT_ASSERT_MESSAGE( "Assumption is wrong",
-                                    nError == _nAssumeError && bStrAreEqual == sal_True );
-        }
-        else
-        {
-            CPPUNIT_ASSERT_MESSAGE( "Assumption is wrong", nError == _nAssumeError );
-        }
-    }*/
-
     // if bDirection==sal_True, check getSystemPathFromFileURL
     // if bDirection==sal_False, check getFileURLFromSystemPath
     void SystemPath_FileURL::check_SystemPath_FileURL(rtl::OString const& _sSource, ::osl::FileBase::RC _nAssumeError, rtl::OString const& _sAssumeResultStr, sal_Bool bDirection)
@@ -1219,13 +935,13 @@ namespace osl_FileBase
         rtl::OString sStr = rtl::OUStringToOString(suStr, RTL_TEXTENCODING_UTF8);
         rtl::OString sError = errorToString(nError);
     if ( bDirection == sal_True )
-      t_print("getSystemPathFromFileURL('%s') deliver system path: '%s', error '%s'\n", _sSource.getStr(), sStr.getStr(), sError.getStr() );
+      printf("getSystemPathFromFileURL('%s') deliver system path: '%s', error '%s'\n", _sSource.getStr(), sStr.getStr(), sError.getStr() );
     else
-      t_print("getFileURLFromSystemPath('%s') deliver File URL: '%s', error '%s'\n", _sSource.getStr(), sStr.getStr(), sError.getStr() );
+      printf("getFileURLFromSystemPath('%s') deliver File URL: '%s', error '%s'\n", _sSource.getStr(), sStr.getStr(), sError.getStr() );
 
         // rtl::OUString suStrEncode = rtl::Uri::encode(suStr, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
         // sStr = rtl::OUStringToOString(suStr, RTL_TEXTENCODING_UTF8);
-        // t_print("UTF8: %s\n", sStr.getStr() );
+        // printf("UTF8: %s\n", sStr.getStr() );
 
         if (_sAssumeResultStr.getLength() > 0)
         {
@@ -1426,42 +1142,23 @@ namespace osl_FileBase
         checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
     }
 
-#if 0
-    void SystemPath_FileURL::getSystemPathFromFileURL_003( )
-        {
-// LLA: ???
-//!! seams to be, that the directories do not pass together
-            ::rtl::OUString aUStr;
-            ::rtl::OUString aRelativeURL = ::rtl::OUString::createFromAscii("../../relartive/file3");
-            ::rtl::OUString aResultURL ( aSysPath4 );
-            ::osl::FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL( aRelativeURL, aUStr );
-
-            sal_Bool bOk = compareFileName( aUStr, aResultURL );
-
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for getSystemPathFromFileURL(");
-            suError += aRelativeURL;
-            suError += ::rtl::OUString::createFromAscii(") function:use a relative file URL, did not pass in(W32), it did not specified in method declaration of relative path issue, ");
-            suError += outputError(aUStr, aResultURL);
-            CPPUNIT_ASSERT_MESSAGE( suError, ( osl::FileBase::E_None == nError ) && ( sal_True == bOk ) );
-        }
-#endif
-
         //normal legal case
     void SystemPath_FileURL::getSystemPathFromFileURL_004( )
         {
         ::rtl::OUString aUStr;
-        ::rtl::OUString aNormalURL( aTmpName6 );
-        ::rtl::OUString aResultURL ( aSysPath4 );
-        ::osl::FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL( aNormalURL, aUStr );
+        ::rtl::OUString aUNormalURL( aTmpName6 );
+        ::rtl::OUString aUResultURL ( aSysPath4 );
+        ::osl::FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL( aUNormalURL, aUStr );
 
-            sal_Bool bOk = compareFileName( aUStr, aResultURL );
+            sal_Bool bOk = compareFileName( aUStr, aUResultURL );
 
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for getSystemPathFromFileURL(' ");
-            suError += aNormalURL;
-            suError += ::rtl::OUString::createFromAscii(" ') function:use an absolute file URL, ");
-            suError += outputError(aUStr, aResultURL);
+            ::rtl::OString sError("test for getSystemPathFromFileURL(' ");
+            sError += ::rtl::OUStringToOString( aUNormalURL, RTL_TEXTENCODING_ASCII_US );
+            sError += " ') function:use an absolute file URL, ";
+            sError += outputError(::rtl::OUStringToOString( aUStr, RTL_TEXTENCODING_ASCII_US ),
+                                ::rtl::OUStringToOString( aUResultURL, RTL_TEXTENCODING_ASCII_US ));
 
-            CPPUNIT_ASSERT_MESSAGE( suError, ( osl::FileBase::E_None == nError ) && ( sal_True == bOk ) );
+            CPPUNIT_ASSERT_MESSAGE(sError.getStr(), ( osl::FileBase::E_None == nError ) && ( sal_True == bOk ) );
 
         }
 
@@ -1470,28 +1167,30 @@ namespace osl_FileBase
         {
             ::rtl::OUString aUStr;
             createTestDirectory( aTmpName10 );
-            ::rtl::OUString aNormalURL( aTmpName10 );
-            ::rtl::OUString aResultURL ( aSysPath5 );
+            ::rtl::OUString aUNormalURL( aTmpName10 );
+            ::rtl::OUString aUResultURL ( aSysPath5 );
 
-            ::osl::FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL( aNormalURL, aUStr );
+            ::osl::FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL( aUNormalURL, aUStr );
 
-            sal_Bool bOk = compareFileName( aUStr, aResultURL );
+            sal_Bool bOk = compareFileName( aUStr, aUResultURL );
 
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for getSystemPathFromFileURL(' ");
-            suError += aNormalURL;
-            suError += ::rtl::OUString::createFromAscii(" ') function:use a CJK coded absolute URL, ");
-            suError += outputError(aUStr, aResultURL);
+            ::rtl::OString sError("test for getSystemPathFromFileURL(' ");
+            sError += ::rtl::OUStringToOString( aUNormalURL, RTL_TEXTENCODING_ASCII_US );
+            sError += " ') function:use a CJK coded absolute URL, ";
+            sError += outputError(::rtl::OUStringToOString( aUStr, RTL_TEXTENCODING_ASCII_US ),
+                                ::rtl::OUStringToOString( aUResultURL, RTL_TEXTENCODING_ASCII_US ));
             deleteTestDirectory( aTmpName10 );
 
-            CPPUNIT_ASSERT_MESSAGE( suError, ( osl::FileBase::E_None == nError ) && ( sal_True == bOk ) );
+            CPPUNIT_ASSERT_MESSAGE( sError.getStr(), ( osl::FileBase::E_None == nError ) && ( sal_True == bOk ) );
         }
+
      void SystemPath_FileURL::getFileURLFromSystemPath_001()
      {
         rtl::OString sSysPath("~/tmp");
-    char* home_path;
-    home_path = getenv("HOME");
-    rtl::OString expResult(home_path);
-    expResult = "file://"+ expResult + "/tmp";
+        char* home_path;
+        home_path = getenv("HOME");
+        rtl::OString expResult(home_path);
+        expResult = "file://"+ expResult + "/tmp";
         checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, expResult );
         checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "~/tmp");
      }
@@ -1706,8 +1405,7 @@ namespace osl_FileBase
         {
             nError1 = FileBase::createTempFile( pUStr_DirURL, pHandle, pUStr_FileURL );
             ::osl::File testFile( *pUStr_FileURL );
-            //printFileName(*pUStr_FileURL);
-            nError2 = testFile.open( OpenFlag_Create );
+            nError2 = testFile.open( osl_File_OpenFlag_Create );
             if ( osl::FileBase::E_EXIST == nError2 )  {
                 osl_closeFile( *pHandle );
                 deleteTestFile( *pUStr_FileURL );
@@ -1722,7 +1420,7 @@ namespace osl_FileBase
             bOK = sal_False;
             nError1 = FileBase::createTempFile( pUStr_DirURL, pHandle, pUStr_FileURL );
             ::osl::File testFile( *pUStr_FileURL );
-            nError2 = testFile.open( OpenFlag_Create );
+            nError2 = testFile.open( osl_File_OpenFlag_Create );
 
             CPPUNIT_ASSERT_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
                 ( osl::FileBase::E_None == nError1 ) && ( pHandle != NULL ) &&
@@ -1755,7 +1453,7 @@ namespace osl_FileBase
             nError1 = FileBase::createTempFile( pUStr_DirURL, 0, pUStr_FileURL );
             bOK = ( pUStr_FileURL != 0);
             ::osl::File testFile( *pUStr_FileURL );
-            nError2 = testFile.open( OpenFlag_Create );
+            nError2 = testFile.open( osl_File_OpenFlag_Create );
             deleteTestFile( *pUStr_FileURL );
             CPPUNIT_ASSERT_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
                 ( osl::FileBase::E_None == nError1 ) && ( osl::FileBase::E_EXIST == nError2 ) &&( sal_True == bOK ) );
@@ -1771,9 +1469,6 @@ namespace osl_FileBase
     };// class createTempFile
 
     // -----------------------------------------------------------------------------
-#if 0     //~ this function has been deprecated.
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getCanonicalName, "osl_FileBase" );
-#endif
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getAbsoluteFileURL, "osl_FileBase" );
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::SystemPath_FileURL, "osl_FileBase" );
   //        CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getFileURLFromSystemPath, "osl_FileBase" );
@@ -1784,135 +1479,6 @@ namespace osl_FileBase
 
 
 //------------------------------------------------------------------------
-// Beginning of the test cases for VolumeDevice class
-//------------------------------------------------------------------------
-
-#if 0  //~ this Class has been deprecated
-namespace osl_VolumeDevice
-{
-
-    //---------------------------------------------------------------------
-    //  testing the method
-    //  VolumeDevice() : _aHandle( NULL )
-    //---------------------------------------------------------------------
-    class  ctors : public CppUnit::TestFixture
-    {
-        ::osl::VolumeDevice aVolumeDevice;
-        ::rtl::OUString aUStr;
-        ::osl::FileBase::RC nError1, nError2;
-
-        public:
-        // initialization
-        void setUp( )
-        {
-        }
-
-        void tearDown( )
-        {
-        }
-
-        // test code.
-        void ctors_001( )
-        {
-            ::osl::VolumeDevice aVolumeDevice1;
-
-            CPPUNIT_ASSERT_MESSAGE( "test for ctors function: Constructor for VolumeDevice with no args.",
-                                     ( osl::FileBase::E_None !=  aVolumeDevice1.automount( ) ) &&
-                                    ( osl::FileBase::E_None !=  aVolumeDevice1.unmount( ) )   &&
-                                    ( aNullURL.equals( aVolumeDevice1.getMountPath( ) ) ) );
-        }
-
-         void ctors_002( )
-        {
-            ::osl::VolumeInfo   aVolumeInfo( VolumeInfoMask_Attributes );
-            nError1 = ::osl::Directory::getVolumeInfo( aRootURL, aVolumeInfo );
-            CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
-
-            ::osl::VolumeDevice aVolumeDevice1( aVolumeInfo.getDeviceHandle( ) );
-            sal_Bool bOk = compareFileName( aNullURL, aVolumeDevice1.getMountPath( ) );
-            CPPUNIT_ASSERT_MESSAGE( "test for ctors function: Copy constructor for VolumeDevice, the copied VolumeDevice should have a mount path file:///, but it returned an empty OUString, it also may be the error from getDeviceHandle(), it did not pass in (UNX), (W32).",
-                                    sal_False == bOk );
-        }
-
-         void ctors_003( )
-        {
-            ::osl::VolumeInfo   aVolumeInfo( VolumeInfoMask_Attributes );
-            nError1 = ::osl::Directory::getVolumeInfo( aRootURL, aVolumeInfo );
-            CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
-
-            ::osl::VolumeDevice aVolumeDevice1 = aVolumeInfo.getDeviceHandle( );
-            sal_Bool bOk = compareFileName( aNullURL, aVolumeDevice1.getMountPath( ) );
-            CPPUNIT_ASSERT_MESSAGE( "test for ctors function: Assigned operator for VolumeDevice, the assigned VolumeDevice should have a mount path file:///, but it returned an empty OUString, it also may be the error from getDeviceHandle(),it did not pass in (UNX), (W32).",
-                                    sal_False == bOk );
-        }
-
-        CPPUNIT_TEST_SUITE( ctors );
-        CPPUNIT_TEST( ctors_001 );
-        CPPUNIT_TEST( ctors_002 );
-        CPPUNIT_TEST( ctors_003 );
-        CPPUNIT_TEST_SUITE_END( );
-    };// class ctors
-
-
-    //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC automount()
-    //---------------------------------------------------------------------
-    class  automount : public CppUnit::TestFixture
-    {
-        ::osl::VolumeDevice aVolumeDevice;
-        ::rtl::OUString aUStr;
-        ::osl::FileBase::RC nError1, nError2;
-
-        public:
-        // initialization
-        void setUp( )
-        {
-        }
-
-        void tearDown( )
-        {
-
-        }
-
-        // test code.
-        void automount_001( )
-        {
-            ::osl::VolumeDevice aVolumeDevice1;
-            nError1 = aVolumeDevice1.automount( );
-
-            CPPUNIT_ASSERT_MESSAGE( "test for automount function: invalid parameter.",
-                                     ( osl::FileBase::E_INVAL == nError1 ) );
-        }
-
-          void automount_002( )
-        {
-            ::osl::VolumeInfo   aVolumeInfo( VolumeInfoMask_Attributes );
-            nError1 = ::osl::Directory::getVolumeInfo( aVolURL2, aVolumeInfo );
-            CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
-
-            ::osl::VolumeDevice aVolumeDevice1( aVolumeInfo.getDeviceHandle( ) );
-              nError1 = aVolumeDevice1.unmount( );
-              nError1 = aVolumeDevice1.automount( );
-            CPPUNIT_ASSERT_MESSAGE( "test for automount function: this test is not implemented yet, it did not pass in (UNX), (W32).",
-                                    ( osl::FileBase::E_None == nError1 ) );
-        }
-
-        CPPUNIT_TEST_SUITE( automount );
-        CPPUNIT_TEST( automount_001 );
-        CPPUNIT_TEST( automount_002 );
-        CPPUNIT_TEST_SUITE_END( );
-    };// class automount
-
-
-    // -----------------------------------------------------------------------------
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeDevice::ctors, "osl_VolumeDevice" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeDevice::automount, "osl_VolumeDevice" );
-}// namespace osl_VolumeDevice
-#endif
-
-
-//------------------------------------------------------------------------
 // Beginning of the test cases for VolumeInfo class
 //------------------------------------------------------------------------
 namespace osl_VolumeInfo
@@ -1955,12 +1521,12 @@ namespace osl_VolumeInfo
                                     sal_True == compareFileName( aUStr, aNullURL ) );
         }
 
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
         void ctors_002( )
         {
-            ::osl::VolumeInfo   aVolumeInfo( VolumeInfoMask_TotalSpace |
-                                             VolumeInfoMask_UsedSpace |
-                                             VolumeInfoMask_FileSystemName );
+            ::osl::VolumeInfo   aVolumeInfo( osl_VolumeInfo_Mask_TotalSpace |
+                                             osl_VolumeInfo_Mask_UsedSpace |
+                                             osl_VolumeInfo_Mask_FileSystemName );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL4, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
             //CPPUNIT_ASSERT( aVolumeInfo.isValid( mask ) );
@@ -1984,7 +1550,7 @@ namespace osl_VolumeInfo
         void ctors_003( )
         {
 
-             sal_Int32 mask1 = VolumeInfoMask_FreeSpace;
+             sal_Int32 mask1 = osl_VolumeInfo_Mask_FreeSpace;
             ::osl::VolumeInfo aVolumeInfo1( mask1 );
             nError1 = ::osl::Directory::getVolumeInfo( aRootURL, aVolumeInfo1 );
             CPPUNIT_ASSERT( sal_True == aVolumeInfo1.isValid( mask1 ) );
@@ -1993,7 +1559,7 @@ namespace osl_VolumeInfo
             sal_uInt64 uiTotalSpace1 = aVolumeInfo1.getTotalSpace( );
             aUStr = aVolumeInfo1.getFileSystemName( );
 
-             sal_Int32 mask2 = VolumeInfoMask_TotalSpace;
+             sal_Int32 mask2 = osl_VolumeInfo_Mask_TotalSpace;
             ::osl::VolumeInfo aVolumeInfo2( mask2 );
             nError2 = ::osl::Directory::getVolumeInfo( aRootURL, aVolumeInfo2 );
             CPPUNIT_ASSERT( sal_True == aVolumeInfo2.isValid( mask2 ) );
@@ -2047,10 +1613,10 @@ namespace osl_VolumeInfo
                                       sal_True == aVolumeInfo.isValid( mask ) );
         }
 
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
           void isValid_002( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes | VolumeInfoMask_TotalSpace | osl_VolumeInfo_Mask_UsedSpace |
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes | osl_VolumeInfo_Mask_TotalSpace | osl_VolumeInfo_Mask_UsedSpace |
                              osl_VolumeInfo_Mask_FreeSpace | osl_VolumeInfo_Mask_MaxNameLength |
                              osl_VolumeInfo_Mask_MaxPathLength | osl_VolumeInfo_Mask_FileSystemName;
             ::osl::VolumeInfo aVolumeInfo( mask );
@@ -2071,7 +1637,7 @@ namespace osl_VolumeInfo
          void isValid_003( )
         {
              ::osl::VolumeDevice aVolumeDevice1;
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo   aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2081,7 +1647,7 @@ namespace osl_VolumeInfo
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
             sal_Bool bOk2 = aVolumeInfo.isValid( mask );
 
-            CPPUNIT_ASSERT_MESSAGE( "test for isValid function: VolumeInfoMask_Attributes, it should be valid for some volume such as /, floppy, cdrom, etc. but it did not pass",
+            CPPUNIT_ASSERT_MESSAGE( "test for isValid function: osl_VolumeInfo_Mask_Attributes, it should be valid for some volume such as /, floppy, cdrom, etc. but it did not pass",
                                      ( sal_True == bOk1 ) && ( sal_True == bOk2 ) );
         }
 
@@ -2106,7 +1672,7 @@ namespace osl_VolumeInfo
         // test code.
         void getRemoteFlag_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2116,10 +1682,10 @@ namespace osl_VolumeInfo
                                      ( sal_False == bOk ) );
         }
 
- #if ( defined UNX ) || ( defined OS2 ) //remote Volume is different in Solaris and Windows
+ #if ( defined UNX )        //remote Volume is different in Solaris and Windows
         void getRemoteFlag_002( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL4, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2154,7 +1720,7 @@ namespace osl_VolumeInfo
         // test code.
         void getRemoveableFlag_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2166,7 +1732,7 @@ namespace osl_VolumeInfo
 
         void getRemoveableFlag_002( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL2, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2194,7 +1760,7 @@ namespace osl_VolumeInfo
         // test code.
         void getCompactDiscFlag_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2206,7 +1772,7 @@ namespace osl_VolumeInfo
 
         void getCompactDiscFlag_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_Attributes;
+             sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL6, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2234,7 +1800,7 @@ namespace osl_VolumeInfo
         // test code.
         void getFloppyDiskFlag_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2246,7 +1812,7 @@ namespace osl_VolumeInfo
 
         void getFloppyDiskFlag_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_Attributes;
+             sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL2, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2274,7 +1840,7 @@ namespace osl_VolumeInfo
         // test code.
         void getFixedDiskFlag_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL2, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2286,7 +1852,7 @@ namespace osl_VolumeInfo
 
         void getFixedDiskFlag_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_Attributes;
+             sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2313,7 +1879,7 @@ namespace osl_VolumeInfo
         // test code.
         void getRAMDiskFlag_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2325,7 +1891,7 @@ namespace osl_VolumeInfo
 
         void getRAMDiskFlag_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_Attributes;
+             sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2353,7 +1919,7 @@ namespace osl_VolumeInfo
         // test code.
         void getTotalSpace_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_TotalSpace;
+            sal_Int32 mask = osl_VolumeInfo_Mask_TotalSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2367,7 +1933,7 @@ namespace osl_VolumeInfo
  #if defined( UNX )
         void getTotalSpace_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_TotalSpace;
+             sal_Int32 mask = osl_VolumeInfo_Mask_TotalSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL3, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2397,7 +1963,7 @@ namespace osl_VolumeInfo
             statvfs( name, &aStatFS);
             sal_uInt64 TotalSpace = aStatFS.f_frsize * aStatFS.f_blocks ;
 
-             sal_Int32 mask = VolumeInfoMask_TotalSpace;
+             sal_Int32 mask = osl_VolumeInfo_Mask_TotalSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2434,7 +2000,7 @@ namespace osl_VolumeInfo
         // test code.
         void getFreeSpace_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_FreeSpace;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FreeSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2448,7 +2014,7 @@ namespace osl_VolumeInfo
 #if defined( UNX )
           void getFreeSpace_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_FreeSpace;
+             sal_Int32 mask = osl_VolumeInfo_Mask_FreeSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL3, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2477,7 +2043,7 @@ namespace osl_VolumeInfo
             statvfs( name, &aStatFS);
             sal_uInt64 FreeSpace = aStatFS.f_bfree * aStatFS.f_frsize  ;
 
-             sal_Int32 mask = VolumeInfoMask_FreeSpace;
+             sal_Int32 mask = osl_VolumeInfo_Mask_FreeSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2515,7 +2081,7 @@ namespace osl_VolumeInfo
         // test code.
         void getUsedSpace_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_UsedSpace;
+            sal_Int32 mask = osl_VolumeInfo_Mask_UsedSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2529,7 +2095,7 @@ namespace osl_VolumeInfo
 #if defined( UNX )
            void getUsedSpace_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_UsedSpace;
+             sal_Int32 mask = osl_VolumeInfo_Mask_UsedSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL3, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2559,7 +2125,7 @@ namespace osl_VolumeInfo
             sal_uInt64 UsedSpace = ( aStatFS.f_blocks - aStatFS.f_bavail ) * aStatFS.f_frsize;
 
 
-             sal_Int32 mask = VolumeInfoMask_UsedSpace;
+             sal_Int32 mask = osl_VolumeInfo_Mask_UsedSpace;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2598,7 +2164,7 @@ namespace osl_VolumeInfo
         // test code.
         void getMaxNameLength_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_MaxNameLength;
+            sal_Int32 mask = osl_VolumeInfo_Mask_MaxNameLength;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2610,7 +2176,7 @@ namespace osl_VolumeInfo
         }
 
 
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
          void getMaxNameLength_002( )
         {
              struct statvfs aStatFS;
@@ -2620,7 +2186,7 @@ namespace osl_VolumeInfo
             statvfs( name, &aStatFS);
             sal_uInt64 MaxNameLength = aStatFS.f_namemax;
 
-             sal_Int32 mask = VolumeInfoMask_MaxNameLength;
+             sal_Int32 mask = osl_VolumeInfo_Mask_MaxNameLength;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2657,7 +2223,7 @@ namespace osl_VolumeInfo
         // test code.
         void getMaxPathLength_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_MaxPathLength;
+            sal_Int32 mask = osl_VolumeInfo_Mask_MaxPathLength;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2669,10 +2235,10 @@ namespace osl_VolumeInfo
         }
 
 
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
          void getMaxPathLength_002( )
         {
-             sal_Int32 mask = VolumeInfoMask_MaxPathLength;
+             sal_Int32 mask = osl_VolumeInfo_Mask_MaxPathLength;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2711,7 +2277,7 @@ namespace osl_VolumeInfo
         // test code.
         void getFileSystemName_001( )
         {
-            sal_Int32 mask = VolumeInfoMask_FileSystemName;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2733,7 +2299,7 @@ namespace osl_VolumeInfo
             statvfs( name, &aStatFS);
             sal_Char * astrFileSystemName = aStatFS.f_basetype;
 
-             sal_Int32 mask = VolumeInfoMask_FileSystemName;
+             sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
             ::osl::VolumeInfo aVolumeInfo( mask );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
@@ -2771,7 +2337,7 @@ namespace osl_VolumeInfo
         // test code.
         void getDeviceHandle_001( )
         {
-            ::osl::VolumeInfo   aVolumeInfo( VolumeInfoMask_Attributes );
+            ::osl::VolumeInfo   aVolumeInfo( osl_VolumeInfo_Mask_Attributes );
             nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo );
             CPPUNIT_ASSERT( osl::FileBase::E_None == nError1 );
 
@@ -2858,7 +2424,7 @@ namespace osl_FileStatus
         // test code.
         void ctors_001( )
         {
-             ::osl::FileStatus   rFileStatus( FileStatusMask_All );
+             ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_All );
             nError1 = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             aUStr = rFileStatus.getFileName( );
@@ -2915,7 +2481,7 @@ namespace osl_FileStatus
         {
                     ::osl::FileBase::RC nError1 = pDir->close( );
                     delete pDir;
-            CPPUNIT_ASSERT_MESSAGE( errorToStr(nError1), ::osl::FileBase::E_None == nError1 );
+            CPPUNIT_ASSERT_MESSAGE( errorToStr(nError1).getStr(), ::osl::FileBase::E_None == nError1 );
 
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -2938,64 +2504,64 @@ namespace osl_FileStatus
         void check_FileStatus(::osl::FileStatus const& _aStatus)
             {
                 rtl::OString sStat;
-                if (_aStatus.isValid(FileStatusMask_Type))
+                if (_aStatus.isValid(osl_FileStatus_Mask_Type))
                 {
                     sStat += "type ";
                 }
-                if (_aStatus.isValid(FileStatusMask_Attributes))
+                if (_aStatus.isValid(osl_FileStatus_Mask_Attributes))
                 {
                     sStat += "attributes ";
                 }
-                if (_aStatus.isValid(FileStatusMask_CreationTime))
+                if (_aStatus.isValid(osl_FileStatus_Mask_CreationTime))
                 {
                     sStat += "ctime ";
                 }
-                if (_aStatus.isValid(FileStatusMask_AccessTime))
+                if (_aStatus.isValid(osl_FileStatus_Mask_AccessTime))
                 {
                     sStat += "atime ";
                 }
-                if (_aStatus.isValid(FileStatusMask_ModifyTime))
+                if (_aStatus.isValid(osl_FileStatus_Mask_ModifyTime))
                 {
                     sStat += "mtime ";
                 }
-                if (_aStatus.isValid(FileStatusMask_FileSize))
+                if (_aStatus.isValid(osl_FileStatus_Mask_FileSize))
                 {
                     sStat += "filesize ";
                 }
-                if (_aStatus.isValid(FileStatusMask_FileName))
+                if (_aStatus.isValid(osl_FileStatus_Mask_FileName))
                 {
                     sStat += "filename ";
                 }
-                if (_aStatus.isValid(FileStatusMask_FileURL))
+                if (_aStatus.isValid(osl_FileStatus_Mask_FileURL))
                 {
                     sStat += "fileurl ";
                 }
-                t_print("mask: %s\n", sStat.getStr());
+                printf("mask: %s\n", sStat.getStr());
             }
 
         void isValid_002( )
         {
             createTestFile( aTmpName6 );
-            sal_uInt32 mask_file = ( FileStatusMask_Type | FileStatusMask_Attributes |
-                                   FileStatusMask_CreationTime | FileStatusMask_AccessTime |
-                                   FileStatusMask_ModifyTime   | FileStatusMask_FileSize   |
-                                   FileStatusMask_FileName     | FileStatusMask_FileURL) ;
+            sal_uInt32 mask_file = ( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_Attributes |
+                                   osl_FileStatus_Mask_CreationTime | osl_FileStatus_Mask_AccessTime |
+                                   osl_FileStatus_Mask_ModifyTime   | osl_FileStatus_Mask_FileSize   |
+                                   osl_FileStatus_Mask_FileName     | osl_FileStatus_Mask_FileURL) ;
              ::osl::FileStatus   rFileStatus( mask_file );
                 ::osl::FileBase::RC nError1 = ::osl::DirectoryItem::get( aTmpName6, rItem_file );
             nError1 = rItem_file.getFileStatus( rFileStatus );
 
-            CPPUNIT_ASSERT_MESSAGE( errorToStr(nError1), ::osl::FileBase::E_None == nError1 );
+            CPPUNIT_ASSERT_MESSAGE( errorToStr(nError1).getStr(), ::osl::FileBase::E_None == nError1 );
 
 // LLA: this is wrong, we never should try to check on all masks
 //      only on one.
 //      Second, it's not a bug, if a value is not valid, it's an unhandled feature.
 
-//          sal_Bool bOk = rFileStatus.isValid( mask_file );
+//      sal_Bool bOk = rFileStatus.isValid( mask_file );
 
                 check_FileStatus(rFileStatus);
             deleteTestFile( aTmpName6 );
 
-                // CPPUNIT_ASSERT_MESSAGE( "test for isValid function: regular file mask fields test, #FileStatusMask_CreationTime# should be valid field for regular file, but feedback is invalid",
+                // CPPUNIT_ASSERT_MESSAGE( "test for isValid function: regular file mask fields test, #osl_FileStatus_Mask_CreationTime# should be valid field for regular file, but feedback is invalid",
                 //                      ( sal_True == bOk ) );
         }
 
@@ -3011,8 +2577,8 @@ namespace osl_FileStatus
             sal_Int32 fd;
 
             ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
-            ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpdir/link.file");
-            ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpdir/tmpname");
+            ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpdir/link.file"));
+            ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpdir/tmpname"));
 
                 rtl::OString strLinkFileName;
                 rtl::OString strSrcFileName;
@@ -3026,19 +2592,18 @@ namespace osl_FileStatus
             // testDirectory is "/tmp/PID/tmpdir/"
             ::osl::Directory testDirectory( aTmpName3 );
                 ::osl::FileBase::RC nError1 = testDirectory.open( );
-            ::rtl::OUString aFileName = ::rtl::OUString::createFromAscii("link.file");
+            ::rtl::OUString aFileName (RTL_CONSTASCII_USTRINGPARAM("link.file"));
             sal_Bool bOk = sal_False;
             while (1) {
                 nError1 = testDirectory.getNextItem( rItem_link, 4 );
                 if (::osl::FileBase::E_None == nError1) {
-                    sal_uInt32 mask_link = FileStatusMask_FileName | FileStatusMask_LinkTargetURL;
+                    sal_uInt32 mask_link = osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_LinkTargetURL;
                     ::osl::FileStatus   rFileStatus( mask_link );
                     rItem_link.getFileStatus( rFileStatus );
-                    //printFileName( rFileStatus.getFileName( ) );
                     if ( compareFileName( rFileStatus.getFileName( ), aFileName) == sal_True )
                     {
-                        //t_print("find the link file");
-                        if ( sal_True == rFileStatus.isValid( FileStatusMask_LinkTargetURL ) )
+                        //printf("find the link file");
+                        if ( sal_True == rFileStatus.isValid( osl_FileStatus_Mask_LinkTargetURL ) )
                         {
                             bOk = sal_True;
                             break;
@@ -3049,7 +2614,7 @@ namespace osl_FileStatus
                     break;
             };
 
-            fd = remove( strLinkFileName );
+            fd = remove( strLinkFileName.getStr() );
             CPPUNIT_ASSERT( fd == 0 );
 
             CPPUNIT_ASSERT_MESSAGE("test for isValid function: link file, check for LinkTargetURL",
@@ -3059,7 +2624,7 @@ namespace osl_FileStatus
 
         void isValid_004( )
         {
-            sal_uInt32 mask_file_all = FileStatusMask_All;
+            sal_uInt32 mask_file_all = osl_FileStatus_Mask_All;
              ::osl::FileStatus   rFileStatus_all( mask_file_all );
                 ::osl::FileBase::RC nError1 = rItem_file.getFileStatus( rFileStatus_all );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -3068,7 +2633,7 @@ namespace osl_FileStatus
 // LLA: this is wrong
 //          sal_Bool bOk1 = rFileStatus_all.isValid( mask_file_all );
 
-            sal_uInt32 mask_file_val = FileStatusMask_Validate;
+            sal_uInt32 mask_file_val = osl_FileStatus_Mask_Validate;
              ::osl::FileStatus   rFileStatus_val( mask_file_val );
             nError1 = rItem_file.getFileStatus( rFileStatus_val );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -3110,7 +2675,6 @@ namespace osl_FileStatus
             //        use $ROOT/staroffice as volume ---> use dev/fd as volume.
             // and get their directory item.
             createTestDirectory( aTmpName3 );
-            //printFileName( aTmpName2);
             createTestFile( aTmpName3, aTmpName2 );
             createTestDirectory( aTmpName3, aTmpName1 );
 
@@ -3141,7 +2705,7 @@ namespace osl_FileStatus
         // test code.
         void getFileType_001( )
         {
-             ::osl::FileStatus   rFileStatus( FileStatusMask_Type | FileStatusMask_FileName );
+             ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName );
             nError1 = m_aItem_1.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT_MESSAGE("getFileStatus failed", ::osl::FileBase::E_None == nError1 );
 
@@ -3151,11 +2715,11 @@ namespace osl_FileStatus
         void check_FileType(osl::FileStatus const& _rFileStatus )
         {
             sal_Bool bOK = sal_False;
-                if ( _rFileStatus.isValid(FileStatusMask_FileName))
+                if ( _rFileStatus.isValid(osl_FileStatus_Mask_FileName))
                 {
                     rtl::OUString suFilename = _rFileStatus.getFileName();
 
-                    if ( _rFileStatus.isValid(FileStatusMask_Type))
+                    if ( _rFileStatus.isValid(osl_FileStatus_Mask_Type))
                     {
                         osl::FileStatus::Type eType = _rFileStatus.getFileType( );
 
@@ -3179,7 +2743,7 @@ namespace osl_FileStatus
 
         void getFileType_002( )
         {
-             ::osl::FileStatus   rFileStatus( FileStatusMask_Type | FileStatusMask_FileName );
+             ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName );
                 nError1 = m_aItem_2.getFileStatus( rFileStatus );
 
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -3188,56 +2752,6 @@ namespace osl_FileStatus
 
         void getFileType_003( )
         {
-#if 0
-// LLA: this have to be discussed.
-             ::osl::FileStatus   rFileStatus( FileStatusMask_Type );
-                nError1 = m_aVolumeItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-
-                if (rFileStatus.isValid(FileStatusMask_Type))
-                {
-                    osl::FileStatus::Type eType = rFileStatus.getFileType( );
-
-            CPPUNIT_ASSERT_MESSAGE( "test for getFileType function: Volume, it seems the volume part of the field is not implemented, it did not pass in (W32)(UNX).",
-                                            ( eType == ::osl::FileStatus::Volume ) );
-                }
-#endif
-        }
-
-
-        void getFileType_004( )
-        {
-#if ( defined UNX ) || ( defined OS2 )  //Fifo creation is differ in Windows
-
-            //create a fifo in $ROOT/tmp/tmpdir, get its DirectoryItem.
-          rtl::OString strFifoSys;
-          strFifoSys = OUStringToOString( aFifoSys, RTL_TEXTENCODING_ASCII_US );
-          ::rtl::OUString aFifoURL;
-
-                  int fd = mkfifo( strFifoSys.getStr(), O_RDWR | O_CREAT );
-          CPPUNIT_ASSERT_MESSAGE("mkfifo failed!", fd == 0 );
-            ::osl::FileBase::getFileURLFromSystemPath( aFifoSys, aFifoURL );
-
-                nError1 = ::osl::DirectoryItem::get( aFifoURL, m_aFifoItem );
-            CPPUNIT_ASSERT_MESSAGE("get item failed!", ::osl::FileBase::E_None == nError1 );
-
-            //check for File type
-             ::osl::FileStatus   rFileStatus( FileStatusMask_Type );
-                nError1 = m_aFifoItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_MESSAGE("get Status failed!", ::osl::FileBase::E_None == nError1 );
-
-            //delete fifo
-            nError1 = ::osl::File::remove( aFifoURL );
-            CPPUNIT_ASSERT_MESSAGE("remove file failed!", ::osl::FileBase::E_None == nError1 );
-
-                if (rFileStatus.isValid(FileStatusMask_Type))
-                {
-                    osl::FileStatus::Type eType = rFileStatus.getFileType( );
-
-            CPPUNIT_ASSERT_MESSAGE( "test for getFileType function: Fifo, Solaris version ",
-                                            ( eType == ::osl::FileStatus::Fifo ) );
-        }
-#endif
         }
 
 /*
@@ -3248,17 +2762,17 @@ namespace osl_FileStatus
 // LLA:         {
 // LLA: #if defined ( SOLARIS ) //Socket file may differ in Windows
 // LLA:             // nError1 = ::osl::DirectoryItem::get( aTypeURL1, m_aSocketItem );
-// LLA:             nError1 = ::osl::DirectoryItem::get( rtl::OUString::createFromAscii("/dev/null"), m_aSocketItem );
+// LLA:             nError1 = ::osl::DirectoryItem::get( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/dev/null")), m_aSocketItem );
 // LLA:             printError(nError1);
 // LLA:             CPPUNIT_ASSERT_MESSAGE("get Socket type file failed", ::osl::FileBase::E_None == nError1 );
 // LLA:
 // LLA:             //check for File type
-// LLA:             ::osl::FileStatus   rFileStatus( FileStatusMask_Type );
+// LLA:             ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Type );
 // LLA:
 // LLA:             nError1 = m_aSocketItem.getFileStatus( rFileStatus );
 // LLA:             CPPUNIT_ASSERT_MESSAGE("getFileStatus failed", ::osl::FileBase::E_None == nError1 );
 // LLA:
-// LLA:             if (rFileStatus.isValid( FileStatusMask_Type ))
+// LLA:             if (rFileStatus.isValid( osl_FileStatus_Mask_Type ))
 // LLA:             {
 // LLA:                 osl::FileStatus::Type eType = rFileStatus.getFileType( );
 // LLA:                 printFileType(eType);
@@ -3277,7 +2791,7 @@ namespace osl_FileStatus
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //check for File type
-             ::osl::FileStatus   rFileStatus( FileStatusMask_Type );
+             ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Type );
   nError1 = m_aLinkItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
@@ -3293,11 +2807,11 @@ namespace osl_FileStatus
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //check for File type
-             ::osl::FileStatus   rFileStatus( FileStatusMask_Type );
+             ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Type );
             nError1 = m_aSpecialItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-            if (rFileStatus.isValid(FileStatusMask_Type))
+            if (rFileStatus.isValid(osl_FileStatus_Mask_Type))
             {
                 osl::FileStatus::Type eType = rFileStatus.getFileType( );
 
@@ -3312,7 +2826,6 @@ namespace osl_FileStatus
         CPPUNIT_TEST( getFileType_001 );
         CPPUNIT_TEST( getFileType_002 );
         CPPUNIT_TEST( getFileType_003 );
-        CPPUNIT_TEST( getFileType_004 );
         // LLA: CPPUNIT_TEST( getFileType_005 );
         //CPPUNIT_TEST( getFileType_006 );
         CPPUNIT_TEST( getFileType_007 );
@@ -3353,18 +2866,18 @@ namespace osl_FileStatus
         }
 
         // test code.
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
 //windows only 3 file attributes: normal, readonly, hidden
         void getAttributes_001( )
         {
             changeFileMode( aTypeURL, S_IRUSR | S_IRGRP | S_IROTH );
 
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getAttributes function: ReadOnly, GrpRead, OwnRead, OthRead( UNX version ) ",
-                                    ( Attribute_ReadOnly | Attribute_GrpRead | Attribute_OwnRead | Attribute_OthRead ) ==
+                                    ( osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead ) ==
                                     rFileStatus.getAttributes( ) );
         }
 #else                                    //Windows version
@@ -3378,31 +2891,31 @@ namespace osl_FileStatus
 
         void getAttributes_002( )
         {
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
             changeFileMode( aTypeURL, S_IXUSR | S_IXGRP | S_IXOTH );
 
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getAttributes function: Executable, GrpExe, OwnExe, OthExe, the result is Readonly, Executable, GrpExe, OwnExe, OthExe, it partly not pass( Solaris version )",
-                                    ( Attribute_ReadOnly | Attribute_Executable | Attribute_GrpExe | Attribute_OwnExe | Attribute_OthExe ) ==
+                                    ( osl_File_Attribute_ReadOnly | osl_File_Attribute_Executable | osl_File_Attribute_GrpExe | osl_File_Attribute_OwnExe | osl_File_Attribute_OthExe ) ==
                                     rFileStatus.getAttributes( ) );
 #endif
         }
 
 
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
         void getAttributes_003( )
         {
             changeFileMode( aTypeURL, S_IWUSR | S_IWGRP | S_IWOTH );
 
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getAttributes function: GrpWrite, OwnWrite, OthWrite( Solaris version )",
-                                    ( Attribute_GrpWrite | Attribute_OwnWrite | Attribute_OthWrite ) ==
+                                    ( osl_File_Attribute_GrpWrite | osl_File_Attribute_OwnWrite | osl_File_Attribute_OthWrite ) ==
                                     rFileStatus.getAttributes( ) );
         }
 #else                                    //Windows version
@@ -3413,31 +2926,30 @@ namespace osl_FileStatus
         }
 #endif
 
-#if ( defined UNX ) || ( defined OS2 )  //hidden file definition may different in Windows
+#if ( defined UNX )                     //hidden file definition may different in Windows
         void getAttributes_004( )
         {
-            sal_Int32 test_Attributes = Attribute_Hidden;
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+            sal_Int32 test_Attributes = osl_File_Attribute_Hidden;
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError = rItem_hidden.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
             test_Attributes &= rFileStatus.getAttributes( );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getAttributes function: Hidden files( Solaris version )",
-                                    test_Attributes == Attribute_Hidden );
+                                    test_Attributes == osl_File_Attribute_Hidden );
         }
 #else                                    //Windows version
         void getAttributes_004( )
         {
-            ::rtl::OUString aUserHiddenFileURL = ::rtl::OUString::createFromAscii("file:///c:/AUTOEXEC.BAT");
+            ::rtl::OUString aUserHiddenFileURL (RTL_CONSTASCII_USTRINGPARAM("file:///c:/AUTOEXEC.BAT"));
             nError = ::osl::DirectoryItem::get( aUserHiddenFileURL, rItem_hidden );
-            //printFileName( aUserHiddenFileURL );
             CPPUNIT_ASSERT_MESSAGE("get item fail", nError == FileBase::E_None );
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError = rItem_hidden.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
             CPPUNIT_ASSERT_MESSAGE( "Hidden files(Windows version), please check if hidden file c:/AUTOEXEC.BAT exists ",
-                                    (rFileStatus.getAttributes( ) & Attribute_Hidden)!= 0 );
+                                    (rFileStatus.getAttributes( ) & osl_File_Attribute_Hidden)!= 0 );
         }
 #endif
 
@@ -3484,7 +2996,7 @@ namespace osl_FileStatus
             TimeValue *pTV_access = NULL;
             CPPUNIT_ASSERT( ( pTV_access = ( TimeValue* )malloc( sizeof( TimeValue ) ) ) != NULL );
 
-              ::osl::FileStatus   rFileStatus( FileStatusMask_AccessTime );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_AccessTime );
             nError = rItem.getFileStatus( rFileStatus );
             sal_Bool bOk = osl_getSystemTime( pTV_current );
             CPPUNIT_ASSERT( sal_True == bOk && nError == FileBase::E_None );
@@ -3534,7 +3046,7 @@ namespace osl_FileStatus
             //get instance item and filestatus
             nError = ::osl::DirectoryItem::get( aTypeURL, rItem );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
-            ::osl::FileStatus   rFileStatus( FileStatusMask_ModifyTime );
+            ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_ModifyTime );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
@@ -3587,7 +3099,7 @@ namespace osl_FileStatus
         // test code.
         void getFileSize_001( )
         {
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileSize );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileSize );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
@@ -3600,14 +3112,14 @@ namespace osl_FileStatus
         void getFileSize_002( )
         {
             ::osl::File testfile( aTypeURL );
-            nError = testfile.open( OpenFlag_Write | OpenFlag_Read );
+            nError = testfile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Read );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError );
             nError = testfile.setSize( TEST_FILE_SIZE );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError );
 
             nError = ::osl::DirectoryItem::get( aTypeURL, rItem );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileSize );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileSize );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
             sal_uInt64 uFileSize = rFileStatus.getFileSize( );
@@ -3650,7 +3162,7 @@ namespace osl_FileStatus
         // test code.
         void getFileName_001( )
         {
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
@@ -3692,7 +3204,7 @@ namespace osl_FileStatus
         // test code.
         void getFileURL_001( )
         {
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileURL );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileURL );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
 
@@ -3732,13 +3244,13 @@ namespace osl_FileStatus
             deleteTestFile( aTypeURL );
         }
 
-#if ( defined UNX ) || ( defined OS2 )         //Link file is not define in Windows
+#if ( defined UNX )            //Link file is not define in Windows
         void getLinkTargetURL_001( )
         {
             //create a link file;
             ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
-            ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/link.file");
-            ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpname");
+            ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/link.file"));
+            ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpname"));
 
                 rtl::OString strLinkFileName, strSrcFileName;
                 strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
@@ -3752,7 +3264,7 @@ namespace osl_FileStatus
             nError = ::osl::DirectoryItem::get( aLnkURL1, rItem );
             CPPUNIT_ASSERT_MESSAGE( "in getting link file item", nError == FileBase::E_None );
 
-              ::osl::FileStatus   rFileStatus( FileStatusMask_LinkTargetURL );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_LinkTargetURL );
             nError = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT_MESSAGE( "in getting link file status", nError == FileBase::E_None );
             ::rtl::OUString aFileURL = rFileStatus.getLinkTargetURL( );
@@ -3826,7 +3338,7 @@ namespace osl_File
         {
             ::osl::File testFile( aTmpName4 );
 
-            ::osl::FileBase::RC nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            ::osl::FileBase::RC nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             ::osl::FileBase::RC nError2 = testFile.close( );
             CPPUNIT_ASSERT_MESSAGE( "test for ctors function: initialize a File and test its open and close",
                                      ( ::osl::FileBase::E_None == nError1 ) && ( ::osl::FileBase::E_None == nError2 ) );
@@ -3838,7 +3350,7 @@ namespace osl_File
             sal_Char buffer[30] = "Test for File constructor";
             sal_uInt64 nCount;
 
-                ::osl::FileBase::RC nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+                ::osl::FileBase::RC nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
                 ::osl::FileBase::RC nError2 = testFile.write( buffer, 30, nCount );
             testFile.close( );
 
@@ -3881,7 +3393,7 @@ namespace osl_File
         {
             ::osl::File testFile( aTmpName4 );
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             nError2 = testFile.close( );
             CPPUNIT_ASSERT_MESSAGE("close error", ::osl::FileBase::E_None == nError2 );
 
@@ -3893,7 +3405,7 @@ namespace osl_File
         {
             ::osl::File testFile( aTmpName3 );
 
-            nError1 = testFile.open( OpenFlag_Read );
+            nError1 = testFile.open( osl_File_OpenFlag_Read );
 
             CPPUNIT_ASSERT_MESSAGE( "test for open function: open a directory",
                                      ( File::E_INVAL == nError1 ) || ( File::E_ACCES == nError1 ) );
@@ -3903,7 +3415,7 @@ namespace osl_File
         {
             ::osl::File testFile( aCanURL1 );
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
 
             CPPUNIT_ASSERT_MESSAGE( "test for open function: open a non-exist file",
                                      File::E_NOENT == nError1 );
@@ -3915,7 +3427,7 @@ namespace osl_File
             concatURL( aTestFile, aTmpName2 );
             ::osl::File testFile( aTestFile );
 
-            nError1 = testFile.open( OpenFlag_Create );
+            nError1 = testFile.open( osl_File_OpenFlag_Create );
             sal_Bool bOK = ( File::E_ACCES == nError1 );
 #if defined (WNT )
             bOK = sal_True;  /// in Windows, you can create file in c:/ any way.
@@ -3931,7 +3443,7 @@ namespace osl_File
         {
             ::osl::File testFile( aTmpName4 );
 
-            nError1 = testFile.open( OpenFlag_Create );
+            nError1 = testFile.open( osl_File_OpenFlag_Create );
 
             CPPUNIT_ASSERT_MESSAGE( "test for open function: create an exist file",
                                      File::E_EXIST == nError1 );
@@ -3944,9 +3456,9 @@ namespace osl_File
             sal_Char buffer_read[30];
             sal_uInt64 nCount_write, nCount_read;
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write | OpenFlag_Create );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
             nError2 = testFile.write( buffer_write, 30, nCount_write );
-             ::osl::FileBase::RC nError4 = testFile.setPos( Pos_Absolut, 0 );
+             ::osl::FileBase::RC nError4 = testFile.setPos( osl_Pos_Absolut, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError4 );
             nError3 = testFile.read( buffer_read, 10, nCount_read );
 
@@ -3955,7 +3467,7 @@ namespace osl_File
             ::osl::FileBase::RC nError6 = testFile.remove( aCanURL1 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError6 );
 
-            CPPUNIT_ASSERT_MESSAGE( "test for open function: test for OpenFlag_Read,OpenFlag_Write and OpenFlag_Create",
+            CPPUNIT_ASSERT_MESSAGE( "test for open function: test for osl_File_OpenFlag_Read, osl_File_OpenFlag_Write and osl_File_OpenFlag_Create",
                                     ( ::osl::FileBase::E_None == nError1 ) &&
                                     ( ::osl::FileBase::E_None == nError2 ) &&
                                     ( ::osl::FileBase::E_None == nError3 ) &&
@@ -4002,7 +3514,7 @@ namespace osl_File
         {
             ::osl::File testFile( aTmpName4 );
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             nError2 = testFile.close( );
@@ -4015,12 +3527,12 @@ namespace osl_File
         {
             ::osl::File testFile( aTmpName4 );
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             nError2 = testFile.close( );
 
-             nError3 = testFile.setPos( Pos_Absolut, 0 );
+             nError3 = testFile.setPos( osl_Pos_Absolut, 0 );
 
             CPPUNIT_ASSERT_MESSAGE( "test for close function: manipulate a file after it has been closed",
                                      ( ::osl::FileBase::E_None == nError2 ) &&
@@ -4054,7 +3566,7 @@ namespace osl_File
             //write chars into the file.
             ::osl::File testFile( aTmpName4 );
 
-            nError1 = testFile.open( OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4075,16 +3587,16 @@ namespace osl_File
             ::osl::File testFile( aTmpName4 );
             sal_Char buffer_read[2];
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-             nError1 = testFile.setPos( Pos_Absolut, 26 );
+             nError1 = testFile.setPos( osl_Pos_Absolut, 26 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.read( buffer_read, 1, nCount_read );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.close( );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-            CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for Pos_Absolut, set the position to 26, test if the 26th char in file is correct",
+            CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for osl_Pos_Absolut, set the position to 26, test if the 26th char in file is correct",
                                      buffer_read[0] == pBuffer_Char[26] );
         }
 
@@ -4093,18 +3605,18 @@ namespace osl_File
             ::osl::File testFile( aTmpName4 );
             sal_Char buffer_read[2];
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-             nError1 = testFile.setPos( Pos_Absolut, sizeof( pBuffer_Char ) - 2 );
+             nError1 = testFile.setPos( osl_Pos_Absolut, sizeof( pBuffer_Char ) - 2 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-             nError1 = testFile.setPos( Pos_Current, 0);
+             nError1 = testFile.setPos( osl_Pos_Current, 0);
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.read( buffer_read, 1, nCount_read );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.close( );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-            CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for Pos_Current, set the position to end, test if the ( end -1 ) char in file is correct",
+            CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for osl_Pos_Current, set the position to end, test if the ( end -1 ) char in file is correct",
                                      buffer_read[0] == pBuffer_Char[sizeof( pBuffer_Char ) - 2] );
         }
 
@@ -4113,20 +3625,20 @@ namespace osl_File
             ::osl::File testFile( aTmpName4 );
             sal_Char buffer_read[2];
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             //the file size is smaller than 100
-            nError1 = testFile.setPos( Pos_End,  -100 );
+            nError1 = testFile.setPos( osl_Pos_End,  -100 );
             CPPUNIT_ASSERT_MESSAGE( "should return error", ::osl::FileBase::E_INVAL == nError1 );
 
-             nError1 = testFile.setPos( Pos_End, -53 );
+             nError1 = testFile.setPos( osl_Pos_End, -53 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.read( buffer_read, 1, nCount_read );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.close( );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-            CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for Pos_End, set the position to end, test if the first char in file is correct",
+            CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for osl_Pos_End, set the position to end, test if the first char in file is correct",
                                      buffer_read[0] == pBuffer_Char[0] );
         }
 
@@ -4157,7 +3669,7 @@ namespace osl_File
             //write chars into the file.
             ::osl::File testFile( aTmpName4 );
 
-            nError1 = testFile.open( OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4181,10 +3693,10 @@ namespace osl_File
             nError1 = testFile.getPos( nFilePointer );
             CPPUNIT_ASSERT( ::osl::FileBase::E_INVAL == nError1 );
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-             nError1 = testFile.setPos( Pos_Absolut, 26 );
+             nError1 = testFile.setPos( osl_Pos_Absolut, 26 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
              nError1 = testFile.getPos( nFilePointer );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4222,7 +3734,7 @@ namespace osl_File
             //write chars into the file.
             ::osl::File testFile( aTmpName4 );
 
-            nError1 = testFile.open( OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4245,10 +3757,10 @@ namespace osl_File
             sal_Bool      *pEOF = &bEOF;
 
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-             nError1 = testFile.setPos( Pos_End, 0 );
+             nError1 = testFile.setPos( osl_Pos_End, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.isEndOfFile( pEOF );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4267,17 +3779,17 @@ namespace osl_File
             sal_Bool      *pEOF = &bEOF;
             sal_uInt64    nFilePointer = 0;
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-             nError1 = testFile.setPos( Pos_Absolut, 0 );
+             nError1 = testFile.setPos( osl_Pos_Absolut, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             *pEOF = sal_False;
              while ( !( *pEOF ) )
             {
                 nError1 = testFile.isEndOfFile( pEOF );
                 CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-                nError1 = testFile.setPos( Pos_Current, 1 );
+                nError1 = testFile.setPos( osl_Pos_Current, 1 );
                 CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             }
              nError1 = testFile.getPos( nFilePointer );
@@ -4316,7 +3828,7 @@ namespace osl_File
             //write chars into the file.
             ::osl::File testFile( aTmpName4 );
 
-            nError1 = testFile.open( OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4340,7 +3852,7 @@ namespace osl_File
             sal_uInt64     nFilePointer;
 
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //enlarge the file to size of 100;
@@ -4348,7 +3860,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //get the file size;
-             nError1 = testFile.setPos( Pos_End, 0 );
+             nError1 = testFile.setPos( osl_Pos_End, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
              nError1 = testFile.getPos( nFilePointer );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4368,34 +3880,7 @@ namespace osl_File
             sal_uInt64     nFilePointer;
 
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
-            CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-
-            //enlarge the file to size of 100;
-             nError1 = testFile.setSize( 10 );
-            CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-
-            //get the file size;
-             nError1 = testFile.setPos( Pos_End, 0 );
-            CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-             nError1 = testFile.getPos( nFilePointer );
-            CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-
-            nError1 = testFile.close( );
-            CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-
-            CPPUNIT_ASSERT_MESSAGE( "test for setSize function: truncate the file ",
-                                     10 == nFilePointer );
-        }
-      /*            void setSize_003( )
-        {
-            ::osl::File   testFile( aTmpName4 );
-            // sal_Bool      bEOF  = sal_False;
-            // sal_Bool      *pEOF = &bEOF;
-            sal_uInt64     nFilePointer;
-
-
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //enlarge the file to size of 100;
@@ -4403,7 +3888,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //get the file size;
-             nError1 = testFile.setPos( Pos_End, 0 );
+             nError1 = testFile.setPos( osl_Pos_End, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
              nError1 = testFile.getPos( nFilePointer );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4414,7 +3899,6 @@ namespace osl_File
             CPPUNIT_ASSERT_MESSAGE( "test for setSize function: truncate the file ",
                                      10 == nFilePointer );
         }
-      */
 
         CPPUNIT_TEST_SUITE( setSize );
         CPPUNIT_TEST( setSize_001 );
@@ -4443,7 +3927,7 @@ namespace osl_File
             //write chars into the file.
             ::osl::File testFile( aTmpName4 );
 
-            nError1 = testFile.open( OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4466,7 +3950,7 @@ namespace osl_File
             sal_Char       buffer_read[10];
 
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             nError1 = testFile.read( buffer_read, 10, nCount_read );
@@ -4488,10 +3972,10 @@ namespace osl_File
             sal_Char       buffer_read[26];
 
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-             nError1 = testFile.setPos( Pos_Absolut, 26 );
+             nError1 = testFile.setPos( osl_Pos_Absolut, 26 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.read( buffer_read, 26, nCount_read );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4541,7 +4025,7 @@ namespace osl_File
             sal_uInt64     nFilePointer;
             sal_Char       buffer_read[10];
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //write chars into the file.
@@ -4551,7 +4035,7 @@ namespace osl_File
              nError1 = testFile.getPos( nFilePointer );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             //reset pointer to the begining;
-             nError1 = testFile.setPos( Pos_Absolut, 0 );
+             nError1 = testFile.setPos( osl_Pos_Absolut, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.read( buffer_read, 10, nCount_read );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4594,7 +4078,7 @@ namespace osl_File
                                         "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                                       };
 
-            nError1 = testFile.open( OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             for ( int nCount = 0; nCount < 3; nCount++ )
@@ -4618,7 +4102,7 @@ namespace osl_File
         {
              ::osl::File    testFile( aTmpName6 );
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.readLine( aSequence );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4634,7 +4118,7 @@ namespace osl_File
             sal_Bool bEOF  = sal_False;
             sal_Bool *pEOF = &bEOF;
 
-            nError1 = testFile.open( OpenFlag_Read | OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             for ( int nCount = 0; nCount < 3; nCount++ )
             {
@@ -4674,7 +4158,7 @@ namespace osl_File
             //write chars into the file.
             ::osl::File testFile( aTmpName4 );
 
-            nError1 = testFile.open( OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4698,7 +4182,7 @@ namespace osl_File
             nError1 = ::osl::File::copy( aTmpName4, aTmpName6 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             //check
-            nError1 = testFile.open( OpenFlag_Create );
+            nError1 = testFile.open( osl_File_OpenFlag_Create );
             deleteTestFile( aTmpName6 );
 
             CPPUNIT_ASSERT_MESSAGE( "test for copy function: copy file to upper directory",
@@ -4747,7 +4231,7 @@ namespace osl_File
       {
         createTestFile( aTmpName6 );
         File tmpFile( aTmpName6 );
-        FileBase::RC err = tmpFile.open( OpenFlag_Write | OpenFlag_Read );
+        FileBase::RC err = tmpFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Read );
         (void)err;
         tmpFile.setSize( 200 );
         tmpFile.close();
@@ -4757,8 +4241,8 @@ namespace osl_File
 
         //check if is the new file
         File newFile( aTmpName4 );
-        newFile.open( OpenFlag_Write | OpenFlag_Read );
-        newFile.setPos( Pos_End, 0 );
+        newFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Read );
+        newFile.setPos( osl_Pos_End, 0 );
         //      CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         sal_uInt64     nFilePointer;
         nError1 = newFile.getPos( nFilePointer );
@@ -4784,7 +4268,7 @@ namespace osl_File
         CPPUNIT_TEST( copy_003 );
         CPPUNIT_TEST( copy_004 );
         CPPUNIT_TEST( copy_005 );
-      CPPUNIT_TEST( copy_006 );
+        CPPUNIT_TEST( copy_006 );
         CPPUNIT_TEST_SUITE_END( );
     };// class copy
 
@@ -4808,7 +4292,7 @@ namespace osl_File
             //write chars into the file.
             ::osl::File testFile( aTmpName4 );
 
-            nError1 = testFile.open( OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4831,7 +4315,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             //check
              ::osl::File    testFile( aCanURL1 );
-            nError2 = testFile.open( OpenFlag_Create );
+            nError2 = testFile.open( osl_File_OpenFlag_Create );
             deleteTestFile( aCanURL1 );
 
             CPPUNIT_ASSERT_MESSAGE( "test for move function: rename file to another directory",
@@ -4925,10 +4409,9 @@ namespace osl_File
         //create directory $TEMP/tmpname/tmpdir
         createTestDirectory( aTmpName8 );
         //move directory $TEMP/tmpname to $TEMP/tmpname/tmpdir/tmpname
-        rtl::OUString newName = aTmpName8 + OUString::createFromAscii("/tmpname");
-        //printFileName( newName );
+        rtl::OUString newName = aTmpName8 + OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpname"));
         nError1 = ::osl::File::move( aTmpName3, newName );
-        //deleteTestDirectory( newName + OUString::createFromAscii("/tmpname") );
+        //deleteTestDirectory( newName + OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpname")) );
         //deleteTestDirectory( newName );
         deleteTestDirectory( aTmpName8 );
         deleteTestDirectory( aTmpName6 );
@@ -4970,7 +4453,7 @@ namespace osl_File
             //write chars into the file.
             ::osl::File testFile( aTmpName4 );
 
-            nError1 = testFile.open( OpenFlag_Write );
+            nError1 = testFile.open( osl_File_OpenFlag_Write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
             nError1 = testFile.write( pBuffer_Char, sizeof( pBuffer_Char ), nCount_write );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4992,7 +4475,7 @@ namespace osl_File
             nError1 = ::osl::File::remove( aTmpName4 );
             //check
              ::osl::File    testFile( aTmpName4 );
-            nError2 = testFile.open( OpenFlag_Create );
+            nError2 = testFile.open( osl_File_OpenFlag_Create );
 
             CPPUNIT_ASSERT_MESSAGE( "test for remove function: remove a file",
                                     ( ::osl::FileBase::E_None == nError1 ) &&
@@ -5061,29 +4544,29 @@ namespace osl_File
         // test code.
         void setAttributes_001( )
         {
-        //on windows, only can set 2 attributes: Attribute_ReadOnly,  Attribute_HIDDEN
+        //on windows, only can set 2 attributes: osl_File_Attribute_ReadOnly,  osl_File_Attribute_Hidden
 #ifdef UNX
             //set the file to readonly
-            nError2 = ::osl::File::setAttributes( aTmpName6, Attribute_ReadOnly | Attribute_GrpRead | Attribute_OwnRead | Attribute_OthRead );
+            nError2 = ::osl::File::setAttributes( aTmpName6, osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead );
             CPPUNIT_ASSERT( nError2 == FileBase::E_None);
             nError1 = ::osl::DirectoryItem::get( aTmpName6, rItem );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None);
             //get the file attributes
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError1 = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None );
 
             CPPUNIT_ASSERT_MESSAGE( "test for setAttributes function: set file attributes and get it to verify.",
-                                    ( Attribute_ReadOnly | Attribute_GrpRead | Attribute_OwnRead | Attribute_OthRead ) ==
+                                    ( osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead ) ==
                                     rFileStatus.getAttributes( ) );
 #else
             //please see GetFileAttributes
-            nError2 = ::osl::File::setAttributes( aTmpName6, Attribute_ReadOnly );
+            nError2 = ::osl::File::setAttributes( aTmpName6, osl_File_Attribute_ReadOnly );
             CPPUNIT_ASSERT( nError2 == FileBase::E_None);
             nError1 = ::osl::DirectoryItem::get( aTmpName6, rItem );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None);
             //get the file attributes
-              ::osl::FileStatus   rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_Attributes );
             nError1 = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None );
             //here the file has 2 Attributes: FILE_ATTRIBUTE_READONLY and FILE_ATTRIBUTE_NORMAL,
@@ -5091,12 +4574,12 @@ namespace osl_File
             /*::rtl::OString aString = ::rtl::OUStringToOString( aTmpName6, RTL_TEXTENCODING_ASCII_US );
             DWORD dwFileAttributes = GetFileAttributes( aString.getStr( ) );
             if (dwFileAttributes & FILE_ATTRIBUTE_NORMAL)
-                t_print("has normal attribute");
+                printf("has normal attribute");
             if (dwFileAttributes & FILE_ATTRIBUTE_READONLY)
-                t_print("has readonly attribute");
+                printf("has readonly attribute");
             */
             CPPUNIT_ASSERT_MESSAGE( "test for setAttributes function: set file attributes READONLY and get it to verify.",
-                                    (Attribute_ReadOnly & rFileStatus.getAttributes( )) != 0  );
+                                    (osl_File_Attribute_ReadOnly & rFileStatus.getAttributes( )) != 0  );
 #endif
     }
         void setAttributes_002( )
@@ -5104,18 +4587,18 @@ namespace osl_File
         //on UNX, can not set hidden attribute to file, rename file can set the attribute
 #ifdef WNT
             //set the file to hidden
-            nError2 = ::osl::File::setAttributes( aTmpName6, Attribute_Hidden);
+            nError2 = ::osl::File::setAttributes( aTmpName6, osl_File_Attribute_Hidden);
 
             CPPUNIT_ASSERT( nError2 == FileBase::E_None);
             nError1 = ::osl::DirectoryItem::get( aTmpName6, rItem );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None);
             //get the file attributes
-              ::osl::FileStatus rFileStatus( FileStatusMask_Attributes );
+              ::osl::FileStatus rFileStatus( osl_FileStatus_Mask_Attributes );
             nError1 = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None );
 
             CPPUNIT_ASSERT_MESSAGE( "test for setAttributes function: set file attributes and get it to verify.",
-                                    (Attribute_Hidden & rFileStatus.getAttributes( )) != 0 );
+                                    (osl_File_Attribute_Hidden & rFileStatus.getAttributes( )) != 0 );
 #endif
         }
 
@@ -5171,25 +4654,25 @@ namespace osl_File
 
             //set the file time
             nError2 = ::osl::File::setTime( aTmpName6, *pTV_current, *pTV_current, *pTV_current );
-            CPPUNIT_ASSERT_MESSAGE( errorToStr( nError2 ), nError2 == FileBase::E_None);
+            CPPUNIT_ASSERT_MESSAGE( errorToStr( nError2 ).getStr(), nError2 == FileBase::E_None);
 
              //get the file access time, creation time, modify time
             nError1 = ::osl::DirectoryItem::get( aTmpName6, rItem );
-            CPPUNIT_ASSERT_MESSAGE( errorToStr( nError1 ), nError1 == FileBase::E_None);
+            CPPUNIT_ASSERT_MESSAGE( errorToStr( nError1 ).getStr(), nError1 == FileBase::E_None);
 
-              ::osl::FileStatus   rFileStatus( FileStatusMask_AccessTime );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_AccessTime );
             nError1 = rItem.getFileStatus( rFileStatus );
-            CPPUNIT_ASSERT_MESSAGE( errorToStr( nError1 ),nError1 == FileBase::E_None );
+            CPPUNIT_ASSERT_MESSAGE( errorToStr( nError1 ).getStr(),nError1 == FileBase::E_None );
             *pTV_access = rFileStatus.getAccessTime( );
 
-              ::osl::FileStatus   rFileStatus1( FileStatusMask_CreationTime );
+              ::osl::FileStatus   rFileStatus1( osl_FileStatus_Mask_CreationTime );
             nError1 = rItem.getFileStatus( rFileStatus1 );
-            CPPUNIT_ASSERT_MESSAGE( errorToStr( nError1 ), nError1 == FileBase::E_None );
+            CPPUNIT_ASSERT_MESSAGE( errorToStr( nError1 ).getStr(), nError1 == FileBase::E_None );
             *pTV_creation = rFileStatus1.getCreationTime( );
 
-              ::osl::FileStatus   rFileStatus2( FileStatusMask_ModifyTime );
+              ::osl::FileStatus   rFileStatus2( osl_FileStatus_Mask_ModifyTime );
             nError1 = rItem.getFileStatus( rFileStatus2 );
-            CPPUNIT_ASSERT_MESSAGE( errorToStr( nError1 ), nError1 == FileBase::E_None );
+            CPPUNIT_ASSERT_MESSAGE( errorToStr( nError1 ).getStr(), nError1 == FileBase::E_None );
             *pTV_modify = rFileStatus2.getModifyTime( );
 
             CPPUNIT_ASSERT_MESSAGE( "test for setTime function: set access time then get it. time precision is still a problem for it cut off the nanosec.",
@@ -5255,7 +4738,7 @@ namespace osl_File
             CPPUNIT_ASSERT_MESSAGE("write failed!", nError1 == FileBase::E_None);
 
             //set the file to readonly
-            nError2 = ::osl::File::setAttributes( aTmpName6, Attribute_ReadOnly | Attribute_GrpRead | Attribute_OwnRead | Attribute_OthRead );
+            nError2 = ::osl::File::setAttributes( aTmpName6, osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead );
             CPPUNIT_ASSERT( nError2 == FileBase::E_None);
 
             nError2 = tmp_file.sync();
@@ -5372,7 +4855,7 @@ namespace osl_DirectoryItem
             CPPUNIT_ASSERT( FileBase::E_None == nError1 );
 
             ::osl::DirectoryItem    copyItem( rItem ); //copy constructor
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError1 = copyItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None );
 
@@ -5389,7 +4872,7 @@ namespace osl_DirectoryItem
 
             ::osl::DirectoryItem    copyItem;
             copyItem = rItem;               //assinment operator
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError1 = copyItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None );
 
@@ -5481,7 +4964,7 @@ namespace osl_DirectoryItem
             nError2 = ::osl::DirectoryItem::get( aTmpName6, rItem );
 
             //check the file name
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError1 = rItem.getFileStatus( rFileStatus );
             CPPUNIT_ASSERT( nError1 == FileBase::E_None );
 
@@ -5550,7 +5033,7 @@ namespace osl_DirectoryItem
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //check the file name
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError2 = rItem.getFileStatus( rFileStatus );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getFileStatus function: get file status and check filename",
@@ -5565,7 +5048,7 @@ namespace osl_DirectoryItem
             nError1 = ::osl::DirectoryItem::get( aTmpName6, rItem );
 
             //check the file name
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError2 = rItem.getFileStatus( rFileStatus );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getFileStatus function: file not existed",
@@ -5580,7 +5063,7 @@ namespace osl_DirectoryItem
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //check the file name
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError2 = rItem.getFileStatus( rFileStatus );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getFileStatus function: get directory information",
@@ -5605,6 +5088,10 @@ namespace osl_DirectoryItem
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::getFileStatus, "osl_DirectoryItem" );
 }// namespace osl_DirectoryItem
 
+//Use to deliberately silence warnings for a deliberate error
+extern "C" void SAL_CALL suppressOslDebugMessage( const sal_Char *, sal_Int32, const sal_Char * )
+{
+}
 
 //------------------------------------------------------------------------
 // Beginning of the test cases for Directory class
@@ -5928,30 +5415,35 @@ namespace osl_Directory
             //get first Item
             nError1 = testDirectory.getNextItem( rItem, 1 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
+            //check the file name of first Item
+              ::osl::FileStatus   rFileStatusFirst( osl_FileStatus_Mask_FileName );
+            nError1 = rItem.getFileStatus( rFileStatusFirst );
+
             //get second Item
             //mindy: nError1 = testDirectory.getNextItem( rItem, 0 );
             //mindy: CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
             //reset enumeration
             nError2 = testDirectory.reset( );
+            CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError2 );
             //get reseted Item, if reset does not work, getNextItem() should return the second Item (aTmpName1)
             nError1 = testDirectory.getNextItem( rItem, 0 );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-            //check the file name
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+            //check the file name again
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             nError1 = rItem.getFileStatus( rFileStatus );
             //close a directory
             nError1 = testDirectory.close( );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
-            sal_Bool bOK1,bOK2;
+            sal_Bool bOK1,bOK2,bOK3;
             bOK1 = compareFileName( rFileStatus.getFileName( ), aTmpName2 );
             bOK2 = compareFileName( rFileStatus.getFileName( ), aHidURL1 );
-
+            bOK3 = compareFileName( rFileStatus.getFileName( ), rFileStatusFirst.getFileName( ) );
             CPPUNIT_ASSERT_MESSAGE( "test for reset function: get two directory item, reset it, then get again, check the filename",
                                     ( ::osl::FileBase::E_None == nError2 ) &&
-                                    ( sal_True == bOK1 || bOK2 ) );
+                                    ( sal_True == bOK1 || bOK2 || bOK3 ) );
         }
 
         void reset_002( )
@@ -6042,7 +5534,7 @@ namespace osl_Directory
             sal_Bool            bOk1 = sal_False;
             sal_Bool bOk2 = sal_False;
             sal_Bool bOk3 = sal_False;
-              ::osl::FileStatus   rFileStatus( FileStatusMask_FileName );
+              ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName );
             for ( int nCount = 0; nCount < 3; nCount++ )
             {
                 //get three Items
@@ -6050,15 +5542,24 @@ namespace osl_Directory
                 CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
                 nError1 = rItem.getFileStatus( rFileStatus );
                 CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
-                switch ( nCount )
+
+                // a special order is not guaranteed. So any file may occur on any time.
+                // But every file name should occur only once.
+                if ( bOk1 == sal_False && compareFileName( rFileStatus.getFileName( ), aTmpName1 ) )
                 {
-                    case 0: bOk1 = compareFileName( rFileStatus.getFileName( ), aTmpName2 ) || compareFileName( rFileStatus.getFileName( ), aHidURL1);
-                        break;
-                    case 1: bOk2 = compareFileName( rFileStatus.getFileName( ), aTmpName1 );
-                        break;
-                    case 2: bOk3 = compareFileName( rFileStatus.getFileName( ), aHidURL1) || compareFileName( rFileStatus.getFileName( ), aTmpName2 );
+                    bOk1 = sal_True;
                 }
-            }
+
+                if ( bOk2 == sal_False && compareFileName( rFileStatus.getFileName( ), aTmpName2 ) )
+                {
+                    bOk2 = sal_True;
+                }
+
+                if ( bOk3 == sal_False && compareFileName( rFileStatus.getFileName( ), aHidURL1 ) )
+                {
+                    bOk3 = sal_True;
+                }
+           }
 
             //close a directory
             nError1 = testDirectory.close( );
@@ -6071,7 +5572,10 @@ namespace osl_Directory
         void getNextItem_002( )
         {
              ::osl::Directory testDirectory( aTmpName3 ); //constructor
+            //deliberate error, suppress run-time warning
+            pfunc_osl_printDetailedDebugMessage pOldDebugMessageFunc = osl_setDetailedDebugMessageFunc( &suppressOslDebugMessage );
             nError1 = testDirectory.getNextItem( rItem );
+            osl_setDetailedDebugMessageFunc( pOldDebugMessageFunc );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getNextItem function: retrive an item in a directory which is not opened, also test for nHint's default value.",
                                     ( ::osl::FileBase::E_INVAL == nError1 ) );
@@ -6102,33 +5606,38 @@ namespace osl_Directory
         {
         //create a link file(can not on Windows), then check if getNextItem can get it.
 #ifdef UNX
-            sal_Bool bOK = sal_False;
+            sal_Bool bLnkOK = sal_False;
+            sal_Bool bFoundOK = sal_False;
+
             ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
-            ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpdir/link.file");
-            ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpdir/tmpname");
-                rtl::OString strLinkFileName, strSrcFileName;
-                strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
-                strSrcFileName  = OUStringToOString( aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US );
+            ( aUStr_LnkFileSys += aSlashURL ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpdir/link.file"));
+            ( aUStr_SrcFileSys += aSlashURL ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpdir/tmpname"));
 
-            //create a link file and link it to file "/tmp/PID/tmpdir/tmpname"
-                sal_Int32 fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() );
+            ::rtl::OString strLinkFileName, strSrcFileName;
+            strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
+            strSrcFileName  = OUStringToOString( aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US );
+
+            // create a link file and link it to file "/tmp/PID/tmpdir/tmpname"
+            sal_Int32 fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() );
             CPPUNIT_ASSERT( fd == 0 );
             ::osl::Directory testDirectory( aTmpName3 );
 
             //open a directory
             nError1 = testDirectory.open( );
-            ::rtl::OUString aFileName = ::rtl::OUString::createFromAscii("link.file");
+            CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
+            ::rtl::OUString aFileName (RTL_CONSTASCII_USTRINGPARAM("link.file"));
 
             while (1) {
                 nError1 = testDirectory.getNextItem( rItem, 4 );
                 if (::osl::FileBase::E_None == nError1) {
-                    ::osl::FileStatus   rFileStatus( FileStatusMask_FileName | FileStatusMask_Type );
+                    ::osl::FileStatus   rFileStatus( osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Type );
                     rItem.getFileStatus( rFileStatus );
                     if ( compareFileName( rFileStatus.getFileName( ), aFileName) == sal_True )
                     {
+                        bFoundOK = sal_True;
                         if ( FileStatus::Link == rFileStatus.getFileType( ))
                         {
-                            bOK = sal_True;
+                            bLnkOK = sal_True;
                             break;
                         }
                     }
@@ -6139,7 +5648,9 @@ namespace osl_Directory
                 fd = std::remove( strLinkFileName.getStr() );
             CPPUNIT_ASSERT_MESSAGE( "remove link file failed", fd == 0 );
             CPPUNIT_ASSERT_MESSAGE( "test for getNextItem function: check if can retrieve the link file name",
-                                    ( bOK == sal_True ) );
+                                    ( bFoundOK == sal_True ) );
+            CPPUNIT_ASSERT_MESSAGE( "test for getNextItem function: check if link file has file type link",
+                                    ( bLnkOK == sal_True ) );
 #endif
         }
 
@@ -6164,7 +5675,7 @@ namespace osl_Directory
         // test code.
         void checkValidMask(osl::VolumeInfo const& _aVolumeInfo, sal_Int32 _nMask)
             {
-                if (_nMask == VolumeInfoMask_FileSystemName)
+                if (_nMask == osl_VolumeInfo_Mask_FileSystemName)
         {
             //get file system name
             ::rtl::OUString aFileSysName( aNullURL );
@@ -6175,7 +5686,7 @@ namespace osl_Directory
                                     ( osl::FileBase::E_None == nError1 ) &&
                                             ( sal_False == bRes2 ) );
                 }
-                if (_nMask == VolumeInfoMask_Attributes)
+                if (_nMask == osl_VolumeInfo_Mask_Attributes)
                 {
                     sal_Bool b1 = _aVolumeInfo.getRemoteFlag();
                     sal_Bool b2 = _aVolumeInfo.getRemoveableFlag();
@@ -6192,38 +5703,38 @@ namespace osl_Directory
                     if (b5) sAttr += " FixedDisk";
                     if (b6) sAttr += " RAMDisk";
 
-                    t_print("Attributes: %s\n", sAttr.getStr() );
+                    printf("Attributes: %s\n", sAttr.getStr() );
                 }
-                if (_nMask == VolumeInfoMask_TotalSpace)
+                if (_nMask == osl_VolumeInfo_Mask_TotalSpace)
                 {
                     // within Linux, df / * 1024 bytes is the result
                     sal_uInt64 nSize = _aVolumeInfo.getTotalSpace();
-                    t_print("Total space: %lld\n", nSize);
+                    printf("Total space: %"SAL_PRIuUINT64"\n", nSize);
                 }
-                if (_nMask == VolumeInfoMask_UsedSpace)
+                if (_nMask == osl_VolumeInfo_Mask_UsedSpace)
                 {
                     sal_uInt64 nSize = _aVolumeInfo.getUsedSpace();
-                    t_print(" Used space: %lld\n", nSize);
+                    printf(" Used space: %"SAL_PRIuUINT64"\n", nSize);
                 }
-                if (_nMask == VolumeInfoMask_FreeSpace)
+                if (_nMask == osl_VolumeInfo_Mask_FreeSpace)
                 {
                     sal_uInt64 nSize = _aVolumeInfo.getFreeSpace();
-                    t_print(" Free space: %lld\n", nSize);
+                    printf(" Free space: %"SAL_PRIuUINT64"\n", nSize);
                 }
-                if (_nMask == VolumeInfoMask_MaxNameLength)
+                if (_nMask == osl_VolumeInfo_Mask_MaxNameLength)
                 {
                     sal_uInt32 nLength = _aVolumeInfo.getMaxNameLength();
-                    t_print("max name length: %ld\n", nLength);
+                    printf("max name length: %"SAL_PRIuUINT32"\n", nLength);
                 }
-                if (_nMask == VolumeInfoMask_MaxPathLength)
+                if (_nMask == osl_VolumeInfo_Mask_MaxPathLength)
                 {
                     sal_uInt32 nLength = _aVolumeInfo.getMaxPathLength();
-                    t_print("max path length: %ld\n", nLength);
+                    printf("max path length: %"SAL_PRIuUINT32"\n", nLength);
                 }
-                if (_nMask == VolumeInfoMask_FileSystemCaseHandling)
+                if (_nMask == osl_VolumeInfo_Mask_FileSystemCaseHandling)
                 {
                     bool bIsCase = _aVolumeInfo.isCaseSensitiveFileSystem();
-                    t_print("filesystem case sensitive: %s\n", bIsCase ? "yes" : "no");
+                    printf("filesystem case sensitive: %s\n", bIsCase ? "yes" : "no");
                 }
             }
 
@@ -6243,48 +5754,48 @@ namespace osl_Directory
 
         void getVolumeInfo_001_1( )
         {
-            sal_Int32 mask = VolumeInfoMask_FileSystemName;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_2( )
         {
-            sal_Int32 mask = VolumeInfoMask_Attributes;
+            sal_Int32 mask = osl_VolumeInfo_Mask_Attributes;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_3( )
         {
-            sal_Int32 mask = VolumeInfoMask_TotalSpace;
+            sal_Int32 mask = osl_VolumeInfo_Mask_TotalSpace;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_4( )
         {
-            sal_Int32 mask = VolumeInfoMask_UsedSpace;
+            sal_Int32 mask = osl_VolumeInfo_Mask_UsedSpace;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_5( )
         {
-            sal_Int32 mask = VolumeInfoMask_FreeSpace;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FreeSpace;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_6( )
         {
-            sal_Int32 mask = VolumeInfoMask_MaxNameLength;
+            sal_Int32 mask = osl_VolumeInfo_Mask_MaxNameLength;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_7( )
         {
-            sal_Int32 mask = VolumeInfoMask_MaxPathLength;
+            sal_Int32 mask = osl_VolumeInfo_Mask_MaxPathLength;
             checkVolumeInfo(mask);
         }
         void getVolumeInfo_001_8( )
         {
-            sal_Int32 mask = VolumeInfoMask_FileSystemCaseHandling;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemCaseHandling;
             checkVolumeInfo(mask);
         }
 
         void getVolumeInfo_002( )
         {
-            sal_Int32 mask = VolumeInfoMask_FileSystemName;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
             ::osl::VolumeInfo aVolumeInfo( mask );
             //call getVolumeInfo here
 
@@ -6302,7 +5813,7 @@ namespace osl_Directory
 
         void getVolumeInfo_003( )
         {
-            sal_Int32 mask = VolumeInfoMask_FileSystemName;
+            sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName;
             ::osl::VolumeInfo aVolumeInfo( mask );
             //call getVolumeInfo here
             nError1 = ::osl::Directory::getVolumeInfo( aTmpName3, aVolumeInfo );
@@ -6356,15 +5867,39 @@ namespace osl_Directory
 
         void create_002( )
         {
-            //create directory in /tmpname
-            nError1 = ::osl::Directory::create( aTmpName7 );
-#if defined (WNT )
-            nError1 = osl::FileBase::E_ACCES;  /// in Windows, you can create directory in c:/ any way.
-            deleteTestDirectory( aTmpName7 );
+#if !defined (WNT) && !defined (MACOSX) && defined (SAL_UNX)
+            if (geteuid() == 0) //don't test if building as root
+                return;
+
+            rtl::OUString aTmpDir;
+            nError1 = FileBase::createTempFile(NULL, NULL, &aTmpDir);
+            CPPUNIT_ASSERT_MESSAGE("temp File creation failed", osl::FileBase::E_None == nError1);
+
+            nError1 = ::osl::File::remove(aTmpDir);
+            CPPUNIT_ASSERT_MESSAGE("temp File removal failed", osl::FileBase::E_None == nError1);
+
+            nError1 = ::osl::Directory::create(aTmpDir);
+            ::rtl::OString sError("test for create function: create a directory '");
+            sError += ::rtl::OUStringToOString(aTmpDir, RTL_TEXTENCODING_ASCII_US);
+            sError += "' and check its existence.";
+            CPPUNIT_ASSERT_MESSAGE(sError.getStr(), osl::FileBase::E_None == nError1);
+            osl_setFileAttributes(aTmpDir.pData, 0); //no access allowed now
+
+            //Shouldn't be possible now to create a dir underneath it
+            rtl::OUString aTmpSubLevel = aTmpDir + OUString(RTL_CONSTASCII_USTRINGPARAM("/notallowedhere"));
+            nError1 = ::osl::Directory::create(aTmpSubLevel);
+
+            //allow removal
+            osl_setFileAttributes(aTmpDir.pData,
+                osl_File_Attribute_OwnRead |
+                osl_File_Attribute_OwnWrite |
+                osl_File_Attribute_OwnExe);
+            deleteTestDirectory(aTmpDir);
+            sError = ::rtl::OString("test for create function: create a directory under '");
+            sError += ::rtl::OUStringToOString(aTmpDir, RTL_TEXTENCODING_ASCII_US);
+            sError += "' for access test.";
+            CPPUNIT_ASSERT_MESSAGE(sError.getStr(), osl::FileBase::E_ACCES == nError1);
 #endif
-
-            CPPUNIT_ASSERT_MESSAGE( "test for create function: create a directory in root for access test.",
-                                    ( osl::FileBase::E_ACCES == nError1 ) );
         }
 
         void create_003( )
@@ -6455,14 +5990,15 @@ namespace osl_Directory
             nError1 = ::osl::Directory::remove( aTmpName3 );
             deleteTestFile( aTmpName4 );
             deleteTestDirectory( aTmpName3 );
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for remove function: try to remove a directory that is not empty.") + errorToStr( nError1 );
+            ::rtl::OString sError = "test for remove function: try to remove a directory that is not empty.";
+            sError += errorToStr( nError1 ).getStr();
 #if defined ( SOLARIS )
             //on UNX, the implementation uses rmdir(), which EEXIST is thrown on Solaris when the directory is not empty, refer to: 'man -s 2 rmdir', while on linux, ENOTEMPTY is thrown.
             //EEXIST The directory contains entries other than those for "." and "..".
-            t_print("#Solaris test\n");
-            CPPUNIT_ASSERT_MESSAGE( suError, ( osl::FileBase::E_EXIST == nError1 ) );
+            printf("#Solaris test\n");
+            CPPUNIT_ASSERT_MESSAGE( sError.getStr(), ( osl::FileBase::E_EXIST == nError1 ) );
 #else
-            CPPUNIT_ASSERT_MESSAGE( suError, ( osl::FileBase::E_NOTEMPTY == nError1 ) );
+            CPPUNIT_ASSERT_MESSAGE( sError.getStr(), ( osl::FileBase::E_NOTEMPTY == nError1 ) );
 #endif
         }
 
@@ -6490,22 +6026,55 @@ namespace osl_Directory
     //########################################
     OUString get_test_path()
     {
-        OUString tmp;
-        FileBase::RC rc = FileBase::getTempDirURL(tmp);
+        static OUString test_path;
+        if (test_path.isEmpty())
+        {
+            OUString tmp;
+            FileBase::RC rc = FileBase::getTempDirURL(tmp);
+
+            CPPUNIT_ASSERT_MESSAGE
+            (
+             "Getting the location of TMP dir failed",
+             rc == FileBase::E_None
+            );
+
+            OUString system_path;
+            rc = FileBase::getSystemPathFromFileURL(tmp, system_path);
 
-        CPPUNIT_ASSERT_MESSAGE
-        (
-        "Test path creation failed",
-        rc == FileBase::E_None
-        );
+            CPPUNIT_ASSERT_MESSAGE
+            (
+             "Cannot convert the TMP dir to system path",
+             rc == FileBase::E_None
+            );
 
-        OUStringBuffer b(tmp);
-        if (tmp.lastIndexOf('/') != (tmp.getLength() - 1))
-            b.appendAscii("/");
+            OString tmp_x(rtl::OUStringToOString(system_path, RTL_TEXTENCODING_UTF8 ));
+            if (tmp_x.lastIndexOf('/') != (tmp_x.getLength() - 1))
+                tmp_x += rtl::OString('/');
 
-        b.appendAscii(TEST_PATH_POSTFIX);
+#ifndef WNT
+            // FIXME would be nice to create unique dir even on Windows
+            tmp_x += rtl::OString("XXXXXX");
+            char *out = mkdtemp(const_cast<char*>(tmp_x.getStr()));
 
-        return b.makeStringAndClear();
+            CPPUNIT_ASSERT_MESSAGE
+            (
+             "mkdtemp call failed",
+             out != NULL
+            );
+
+            tmp_x += rtl::OString('/');
+#endif
+            tmp_x += rtl::OString(TEST_PATH_POSTFIX);
+
+            rc = FileBase::getFileURLFromSystemPath(rtl::OStringToOUString(tmp_x, RTL_TEXTENCODING_UTF8), test_path);
+
+            CPPUNIT_ASSERT_MESSAGE
+            (
+             "Cannot convert the system path back to an URL",
+             rc == FileBase::E_None
+            );
+        }
+        return test_path;
     }
 
     //########################################
@@ -6560,7 +6129,7 @@ namespace osl_Directory
         void with_relative_path()
         {
             FileBase::RC rc = Directory::createPath(
-                OUString::createFromAscii(TEST_PATH_POSTFIX));
+                OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_POSTFIX)));
 
             CPPUNIT_ASSERT_MESSAGE
             (
@@ -6652,7 +6221,7 @@ namespace osl_Directory
         void with_UNC_path()
         {
 
-            OUString tp_unc = OUString::createFromAscii("\\\\Tra-1\\TRA_D\\hello\\world\\");
+            OUString tp_unc (RTL_CONSTASCII_USTRINGPARAM("\\\\Tra-1\\TRA_D\\hello\\world\\"));
             OUString tp_url;
             FileBase::getFileURLFromSystemPath(tp_unc, tp_url);
 
@@ -6683,25 +6252,21 @@ namespace osl_Directory
     }; // class createPath
 
     // -----------------------------------------------------------------------------
-     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_Directory::ctors, "osl_Directory" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_Directory::open, "osl_Directory" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_Directory::isOpen, "osl_Directory" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_Directory::close, "osl_Directory" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_Directory::reset, "osl_Directory" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_Directory::getNextItem, "osl_Directory" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_Directory::getVolumeInfo, "osl_Directory" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_Directory::create, "osl_Directory" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_Directory::remove, "osl_Directory" );
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_Directory::createPath, "osl_Directory" );
+    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::ctors );
+    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::open );
+    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::isOpen );
+    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::close );
+    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::reset );
+    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::getNextItem );
+    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::getVolumeInfo );
+    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::create );
+    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::remove );
+    CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::createPath );
 }// namespace osl_Directory
 
 
-// -----------------------------------------------------------------------------
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-// -----------------------------------------------------------------------------
 
-/// NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 
 
@@ -6720,83 +6285,6 @@ inline ::rtl::OUString getCurrentPID(  )
 }
 
 
-/** Insert Current PID to the URL to avoid access violation between multiuser execution.
-*/
-inline void insertPID( ::rtl::OUString & pathname )
-{
-    //~ check if the path contain the temp directory, do nothing changes if not;
-    if ( pathname.indexOf( aTempDirectoryURL ) && pathname.indexOf( aTempDirectorySys ) )
-        return;
-
-    //~ format pathname to TEMP/USERPID/URL style;
-    if ( !pathname.indexOf( aTempDirectoryURL ) )
-    {
-        ::rtl::OUString strPID( getCurrentPID( ) );
-        ::rtl::OUString pathLeft = aTempDirectoryURL.copy( 0 );
-        ::rtl::OUString pathRight = pathname.copy( aTempDirectoryURL.getLength( ) );
-        pathname = pathLeft.copy( 0 );
-        ( ( pathname += aSlashURL ) += strPID ) += pathRight;
-    }
-    else
-    {
-        ::rtl::OUString strPID( getCurrentPID( ) );
-        ::rtl::OUString pathLeft = aTempDirectorySys.copy( 0 );
-        ::rtl::OUString pathRight = pathname.copy( aTempDirectorySys.getLength( ) );
-        pathname = pathLeft.copy( 0 );
-        ( ( pathname += aSlashURL ) += strPID ) += pathRight;
-    }
-
-
-}
-
-/** to do some initialized work, we replace the NOADDITIONAL macro with the initialize work which
-      will check the file and directory existence. and set some variables for test use.
-      to simplify the initialize work, we seperate it into UNIX section and Windows section, the main task
-      of initialization is adapt all URL defined in osl_File_Const.h to TEMP/USERPID/URL style format,
-      since there may be an instance that multiuser execute test at the same time, and the temp file
-      may not be clean up in this case due to access right problem.
-*/
-void RegisterAdditionalFunctions( FktRegFuncPtr _pFunc )
-{
-    (void)_pFunc;
-    t_print( "Initializing..." );
-
-    //~ make sure the c:\temp exist, if not, create it.
-#if ( defined WNT )
-    if ( checkDirectory( aTempDirectoryURL, osl_Check_Mode_Exist )  != sal_True ) {
-        t_print( "\n#C:\\temp is not exist, now creating\n" );
-        createTestDirectory( aTempDirectoryURL );
-    };
-#endif
-
-    //~ make sure the c:\temp\PID or /tmp/PID exist, if not, create it. initialize the user directory.
-    ( aUserDirectoryURL += aSlashURL ) += getCurrentPID( );
-    ( aUserDirectorySys += aSlashURL ) += getCurrentPID( );
-
-    if ( checkDirectory( aUserDirectoryURL, osl_Check_Mode_Exist )  != sal_True ) {
-        createTestDirectory( aUserDirectoryURL );
-    }
-
-    //~ adapt all URL to the TEMP/USERPID/URL format;
-    insertPID( aCanURL1 );
-    insertPID( aTmpName3 );
-    insertPID( aTmpName4 );
-    insertPID( aTmpName5 );
-    insertPID( aTmpName6 );
-    insertPID( aTmpName8 );
-    insertPID( aTmpName9 );
-    insertPID( aLnkURL1 );
-    insertPID( aFifoSys );
-    insertPID( aSysPath1 );
-    insertPID( aSysPath2 );
-    insertPID( aSysPath3 );
-    insertPID( aSysPath4 );
-
-    t_print( "Done.\n" );
-
-}
-
-
 //~ do some clean up work after all test completed.
 class GlobalObject
 {
@@ -6805,15 +6293,8 @@ class GlobalObject
     {
         try
         {
-            //~ make sure the c:\temp\PID or /tmp/PID exist, if yes, delete it.
-            t_print( "\n#Do some clean-ups ...\n" );
-            if ( checkDirectory( aUserDirectoryURL, osl_Check_Mode_Exist )  == sal_True ) {
-                deleteTestDirectory( aUserDirectoryURL );
-            }
-
-            // LLA: t_print("after deleteTestDirectory\n");
             //~ special clean up task in Windows and Unix seperately;
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
             //~ some clean up task  for UNIX OS
             ;
 #else
@@ -6842,15 +6323,17 @@ class GlobalObject
 #endif
 
         }
-        catch (CppUnit::Exception &e)
+        catch (const CppUnit::Exception &e)
         {
-            t_print("Exception caught in GlobalObject dtor(). Exception message: '%s'. Source line: %d\n", e.what(), e.sourceLine().lineNumber());
+            printf("Exception caught in GlobalObject dtor(). Exception message: '%s'. Source line: %d\n", e.what(), e.sourceLine().lineNumber());
         }
         catch (...)
         {
-            t_print("Exception caught (...) in GlobalObject dtor()\n");
+            printf("Exception caught (...) in GlobalObject dtor()\n");
         }
     }
 };
 
 GlobalObject theGlobalObject;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 7072b6ea6b11..f49d63d76743 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,14 +26,9 @@
  *
  ************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _OSL_FILE_CONST_H_
 #define _OSL_FILE_CONST_H_
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -42,12 +38,6 @@
 #include <rtl/ustring.hxx>
 #include <rtl/uri.hxx>
 
-
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-
 #ifdef __cplusplus
 extern "C"
 {
@@ -92,14 +82,19 @@ const sal_Char pBuffer_Blank[]  = "";
 //------------------------------------------------------------------------
 // OS dependent declaration and includes
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )  //Unix
 #   include <unistd.h>
 #   include <limits.h>
 #   include <math.h>
 #   include <errno.h>
 #   include <fcntl.h>
 #   include <sys/stat.h>
-#   include <sys/statfs.h>
+#   if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined (DRAGONFLY)
+#       include <sys/statfs.h>
+#   else
+#       include <sys/param.h>
+#       include <sys/mount.h>
+#   endif
 #   include <sys/statvfs.h>
 #   include <sys/types.h>
 #   define TEST_PLATFORM        ""
@@ -108,14 +103,12 @@ const sal_Char pBuffer_Blank[]  = "";
 #   define PATH_LIST_DELIMITER  ":"
 #   define PATH_SEPERATOR       "/"
 #endif
+
 #if (defined WNT )                      // Windows
-#include <tools/prewin.h>
-// #    include <windows.h>
-#   include <tchar.h>
-#   include <io.h>
-#   include <stdio.h>
-#   include <stdlib.h>
-#include <tools/postwin.h>
+#       include <tchar.h>
+#       include <io.h>
+#       include <stdio.h>
+#       include <stdlib.h>
 #   define PATH_MAX             MAX_PATH
 #   define TEST_PLATFORM        "c:/"
 #   define TEST_PLATFORM_ROOT   "c:/"
@@ -164,7 +157,7 @@ OSLTEST_DECLARE( TmpName3, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpdir
 OSLTEST_DECLARE( TmpName4, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpdir/tmpname" );
 OSLTEST_DECLARE( TmpName5, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpdir/../tmpdir/./tmpname" );
 OSLTEST_DECLARE( TmpName6, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpname" );
-OSLTEST_DECLARE( TmpName7, FILE_PREFIX TEST_PLATFORM "tmpname" );
+OSLTEST_DECLARE( TmpName7, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/noaccess" );
 OSLTEST_DECLARE( TmpName8, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpname/tmpdir" );
 OSLTEST_DECLARE( TmpName9, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpdir/../tmpdir/./" );
 OSLTEST_DECLARE_UTF8( TmpName10, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/%E6%9C%AA%E5%91%BD%E5%90%8Dzhgb18030" );
@@ -186,6 +179,7 @@ OSLTEST_DECLARE( SysPath2, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/system/path"
 OSLTEST_DECLARE( SysPath3, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpdir" );
 OSLTEST_DECLARE( SysPath4, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpname" );
 OSLTEST_DECLARE_UTF8( SysPath5, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/%E6%9C%AA%E5%91%BD%E5%90%8Dzhgb18030" );
+OSLTEST_DECLARE( SysPathLnk, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/link.file" );
 OSLTEST_DECLARE( FifoSys,  TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpdir/fifo" );
 
 //------------------------------------------------------------------------
@@ -193,7 +187,7 @@ OSLTEST_DECLARE( FifoSys,  TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpdir/fifo"
 // socket, link, etc.
 // Note that this may be changed in the different platform, so be careful to use.
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )                                 //          Unix
+#if ( defined UNX )                                                    //          Unix
 OSLTEST_DECLARE( TypeURL1,  FILE_PREFIX "dev/ccv");                    //socket    Solaris/Linux
 OSLTEST_DECLARE( TypeURL2,  FILE_PREFIX "devices/pseudo/tcp@0:tcp");   //special   Solaris/Linux
 OSLTEST_DECLARE( TypeURL3,  FILE_PREFIX "lib" );                       //link      Solaris
@@ -207,7 +201,7 @@ OSLTEST_DECLARE( TypeURL3,  FILE_PREFIX "" );
 // Volume device URL, we pick some canonical volume device for test:
 // UNIX file system, Floppy Disk, Proc file system, Temp file system, Compact Disk.
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )                  //          Unix
+#if ( defined UNX )                                     //          Unix
 OSLTEST_DECLARE( VolURL1,  FILE_PREFIX  "");            //ufs       Solaris/Linux
 #ifdef SOLARIS
 OSLTEST_DECLARE( VolURL2,  FILE_PREFIX  "dev/fd" );     //fd        Solaris
@@ -227,16 +221,10 @@ OSLTEST_DECLARE( VolURL5,  FILE_PREFIX  "c:/temp" );
 OSLTEST_DECLARE( VolURL6,  FILE_PREFIX  "e:/" );
 #endif
 
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifdef __cplusplus
 }
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-
 #endif /* _OSL_FILE_CONST_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx
index 674e685449be..f280905be361 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,7 +49,9 @@
 #define TEST_VOLUME "c:/"
 #endif
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
 namespace osl_test_file
 {
@@ -58,6 +61,13 @@ namespace osl_test_file
 class oldtestfile : public CppUnit::TestFixture
 {
 public:
+    oldtestfile()
+    {
+        //SAL_ALLOW_LINKOO_SYMLINKS for the make dev-install hack breaks this test
+        rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("SAL_ALLOW_LINKOO_SYMLINKS"));
+        osl_clearEnvironment(envVar.pData);
+    }
+
     void test_file_001();
     void test_file_002();
     void test_file_003();
@@ -66,29 +76,31 @@ public:
     CPPUNIT_TEST_SUITE( oldtestfile );
     CPPUNIT_TEST( test_file_001 );
     CPPUNIT_TEST( test_file_002 );
-    CPPUNIT_TEST( test_file_003 );
+    // so buggy!! CPPUNIT_TEST( test_file_003 );
     CPPUNIT_TEST( test_file_004 );
     CPPUNIT_TEST_SUITE_END( );
 };
 
-char *aSource1[] =
+const char * const aSource1[] =
 {
     "a"    , "file:///" TEST_VOLUME "bla/a",
-    "a/"   , "file:///" TEST_VOLUME "bla/a",
+    ///TODO: check if last slash must be omitted in resolved path.
+//    "a/"   , "file:///" TEST_VOLUME "bla/a",
     "../a" , "file:///" TEST_VOLUME "a" ,
-    "a/.." , "file:///" TEST_VOLUME "bla",
+    "a/.." , "file:///" TEST_VOLUME "bla/",
     "a/../b" , "file:///" TEST_VOLUME "bla/b",
     ".."   , "file:///" TEST_VOLUME "",
-    "a/b/c/d/"   , "file:///" TEST_VOLUME "bla/a/b/c/d",
+    "a/b/c/d"   , "file:///" TEST_VOLUME "bla/a/b/c/d",
     "a/./c"   , "file:///" TEST_VOLUME "bla/a/c",
-    "file:///bla/blub", "file:///" TEST_VOLUME "bla/blub",
+    "file:///bla/blub", "file:///"  "bla/blub",
     0 , 0
 };
 
-char *aSource2[ ] =
+const char * const aSource2[ ] =
 {
     "a" , "file:///" TEST_VOLUME "bla/blubs/schnubbel/a",
-    "a/", "file:///" TEST_VOLUME "bla/blubs/schnubbel/a",
+    ///TODO: check if last slash must be omitted in resolved path.
+//    "a/", "file:///" TEST_VOLUME "bla/blubs/schnubbel/a",
     "../a", "file:///" TEST_VOLUME "bla/blubs/a",
     "../../a", "file:///" TEST_VOLUME "bla/a",
     "../../../a", "file:///" TEST_VOLUME "a",
@@ -96,7 +108,7 @@ char *aSource2[ ] =
     0,0
 };
 
-char *aSource3[ ] =
+const char * const aSource3[ ] =
 {
     ".." , "/a",
     "../a" , "/a/a",
@@ -105,8 +117,9 @@ char *aSource3[ ] =
     0,0
 };
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 void oldtestfile::test_file_001()
 {
 #ifdef WIN32
@@ -120,6 +133,7 @@ void oldtestfile::test_file_001()
         OUString target;
         OUString rel = OUString::createFromAscii( aSource1[i] );
         oslFileError e = osl_getAbsoluteFileURL( base1.pData, rel.pData , &target.pData );
+        //fprintf(stderr, "%d : %s -- %s -- %s\n", i, aSource1[i], aSource1[i+1], OUStringToOString(target , RTL_TEXTENCODING_ASCII_US ).getStr() );
         CPPUNIT_ASSERT_MESSAGE("failure #1",  osl_File_E_None == e );
         if( osl_File_E_None == e )
         {
@@ -127,12 +141,12 @@ void oldtestfile::test_file_001()
         }
         OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US );
         OString obase = OUStringToOString( base1 , RTL_TEXTENCODING_ASCII_US );
-        fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), aSource1[i], o.pData->buffer );
+        // fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), aSource1[i], o.pData->buffer );
     }
 
     OUString err1( RTL_CONSTASCII_USTRINGPARAM( "../.." ) );
     OUString target;
-    CPPUNIT_ASSERT_MESSAGE("failure #11",  osl_File_E_None != osl_getAbsoluteFileURL( base1.pData , err1.pData , &target.pData ) );
+    // CPPUNIT_ASSERT_MESSAGE("failure #11",  osl_File_E_None != osl_getAbsoluteFileURL( base1.pData , err1.pData , &target.pData ) );
 
 }
 
@@ -149,6 +163,7 @@ void oldtestfile::test_file_002()
         OUString target;
         OUString rel = OUString::createFromAscii( aSource2[i] );
         oslFileError e = osl_getAbsoluteFileURL( base2.pData, rel.pData , &target.pData );
+        //fprintf(stderr, "%d : %s -- %s -- %s\n", i, aSource2[i], aSource2[i+1], OUStringToOString(target , RTL_TEXTENCODING_ASCII_US ).getStr() );
         CPPUNIT_ASSERT_MESSAGE("failure #2",  osl_File_E_None == e );
         if( osl_File_E_None == e )
         {
@@ -170,10 +185,10 @@ void oldtestfile::test_file_003()
 #ifdef UNX
     int i;
     char buf[PATH_MAX];
-    if( getcwd( buf, PATH_MAX ) )
+    if( getcwd( buf, PATH_MAX -1 ) )
     {
         char buf2[PATH_MAX];
-        strcpy( buf2 , buf );
+        strcpy( buf2 , "/tmp" );
         strcat( buf2, "/a" );
 
         if( 0 == mkdir( buf2 , S_IRWXG | S_IRWXO | S_IRWXU ) )
@@ -181,7 +196,7 @@ void oldtestfile::test_file_003()
             strcat( buf2, "/b" );
             if( 0 == mkdir( buf2, S_IRWXU | S_IRWXO | S_IRWXU ) )
             {
-                if( 0 == symlink( buf2 , "c" ) )
+                if( 0 == symlink( buf2 , "/tmp/c" ) )
                 {
                     OUString dir;
                     osl_getProcessWorkingDir( &(dir.pData) );
@@ -199,30 +214,32 @@ void oldtestfile::test_file_003()
                             CPPUNIT_ASSERT_MESSAGE("failure #4",  target.getLength() >= dir.getLength() );
                             if( target.getLength() >= dir.getLength() )
                             {
-                                                            int j;
-                                                            for( j = dir.getLength() ;
-                                     j < target.getLength() &&
-                                         aSource3[i+1][j-dir.getLength()] == target[j]   ; j++ );
+                                int j = dir.getLength();
+                                while (j < target.getLength() &&
+                                         aSource3[i+1][j-dir.getLength()] == target[j])
+                                {
+                                     ++j;
+                                }
                                 CPPUNIT_ASSERT_MESSAGE("failure #5",  j == target.getLength() );
                             }
                         }
                         OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US );
                         OString obase = OUStringToOString( base3 , RTL_TEXTENCODING_ASCII_US );
-                        fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), aSource3[i], o.pData->buffer );
+                        //fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), aSource3[i], o.pData->buffer );
                     }
-                    unlink( "c" );
+                    unlink( "/tmp/c" );
                 }
                 else
                 {
                     CPPUNIT_ASSERT_MESSAGE("failure #6",  0 );
                 }
-                rmdir( "a/b" );
+                rmdir( "/tmp/a/b" );
             }
             else
             {
                 CPPUNIT_ASSERT_MESSAGE("failure #7",  0 );
             }
-            rmdir( "a" );
+            rmdir( "/tmp/a" );
         }
         else
         {
@@ -256,18 +273,19 @@ void oldtestfile::test_file_004()
         }
         OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US );
         OString obase = OUStringToOString( base4 , RTL_TEXTENCODING_ASCII_US );
-        fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), aSource1[i], o.pData->buffer );
+        //fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), aSource1[i], o.pData->buffer );
     }
 
 
-//  fprintf( stderr, "test_file done\n" );
+// fprintf( stderr, "test_file done\n" );
 }
 
 } // namespace osl_test_file
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_test_file::oldtestfile, "osl_File" );
+CPPUNIT_TEST_SUITE_REGISTRATION( osl_test_file::oldtestfile);
 
 // -----------------------------------------------------------------------------
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index 3bd5ac4cd6d1..891163120489 100755..100644
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,73 +29,65 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <osl/file.hxx>
 #include <osl/thread.h>
 #include <rtl/ustring.hxx>
 
 using namespace osl;
-using namespace rtl;
-
-//########################################
-#ifdef UNX
-#   define COPY_SOURCE_PATH "/home/tr109510/ucbhelper.cxx"
-#   define COPY_DEST_PATH "/mnt/mercury08/ucbhelper.cxx"
-#else /* if WNT */
-#   define COPY_SOURCE_PATH "d:\\msvcr70.dll"
-#   define COPY_DEST_PATH "x:\\tra\\msvcr70.dll"
-#endif
-
-class test_osl_copyFile : public CppUnit::TestFixture
-{
-public:
-    void cp_file()
-    {
-        rtl::OUString src_url;
-        FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(COPY_SOURCE_PATH), src_url);
 
-        rtl::OUString dest_url;
-        FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(COPY_DEST_PATH), dest_url);
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 
-        FileBase::RC err = File::copy(src_url, dest_url);
-        CPPUNIT_ASSERT_MESSAGE("Copy didn't recognized disk full", err != FileBase::E_None);
-    }
-
-    CPPUNIT_TEST_SUITE(test_osl_copyFile);
-    CPPUNIT_TEST(cp_file);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-//########################################
-#ifdef UNX
-#   define WRITE_DEST_PATH "/mnt/mercury08/muell.tmp"
-#else /* if WNT */
-#   define WRITE_DEST_PATH "d:\\tmp_data.tmp"
-#endif
+//Use to silence OSL_ warnings for a deliberate error
+extern "C" void SAL_CALL suppressOslDebugMessage( const sal_Char *, sal_Int32, const sal_Char * )
+{
+}
 
 class test_osl_writeFile : public CppUnit::TestFixture
 {
 public:
     void wrt_file()
     {
-        rtl::OUString dest_url;
-        FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(WRITE_DEST_PATH), dest_url);
+        FileBase::RC err;
+
+        //create a tempfile
+        rtl::OUString aTmpFile;
+        err = FileBase::createTempFile(NULL, NULL, &aTmpFile);
+        CPPUNIT_ASSERT_MESSAGE("temp File creation failed", err == osl::FileBase::E_None);
+
+        //now attempt to open with Create flag an existing file, should get E_EXIST
+        File tmp_file(aTmpFile);
+        err = tmp_file.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
 
-        File tmp_file(dest_url);
-        rtl::OUString suErrorMsg = rtl::OUString::createFromAscii("File creation failed: ")+ dest_url;
-        FileBase::RC err = tmp_file.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
+        rtl::OString sErrorMsg = "Expected that '";
+        sErrorMsg += rtl::OUStringToOString(aTmpFile, RTL_TEXTENCODING_ASCII_US);
+        sErrorMsg += "' would exist!";
+        CPPUNIT_ASSERT_MESSAGE(sErrorMsg.getStr(), err == FileBase::E_EXIST);
 
-        CPPUNIT_ASSERT_MESSAGE( suErrorMsg, err == FileBase::E_None || err == FileBase::E_EXIST );
+        //deliberate errors, suppress run-time warning for operations on
+        //un-opened File
+        pfunc_osl_printDetailedDebugMessage pOldDebugMessageFunc =
+            osl_setDetailedDebugMessageFunc( &suppressOslDebugMessage );
 
-        char buffer[50000];
+        char buffer[1];
         sal_uInt64 written = 0;
         err = tmp_file.write((void*)buffer, sizeof(buffer), written);
+        CPPUNIT_ASSERT_MESSAGE("write on unconnected file should fail",
+            err != osl::FileBase::E_None && written == 0);
 
         err = tmp_file.sync();
+        CPPUNIT_ASSERT_MESSAGE("sync on unconnected file should fail", err != FileBase::E_None);
+        err = tmp_file.close();
+        CPPUNIT_ASSERT_MESSAGE("close on unconnected file should fail", err != FileBase::E_None);
 
-        CPPUNIT_ASSERT_MESSAGE("Write didn't recognized disk full", err != FileBase::E_None);
+        osl_setDetailedDebugMessageFunc( pOldDebugMessageFunc );
 
-        tmp_file.close();
+        err = ::osl::File::remove(aTmpFile);
+        CPPUNIT_ASSERT_MESSAGE("temp file should have existed", err == FileBase::E_None);
     }
 
     CPPUNIT_TEST_SUITE(test_osl_writeFile);
@@ -104,8 +97,8 @@ public:
 
 //#####################################
 // register test suites
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_osl_writeFile, "test_osl_writeFile");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_osl_copyFile,  "test_osl_copyFile");
+CPPUNIT_TEST_SUITE_REGISTRATION(test_osl_writeFile);
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/setthreadname/makefile.mk b/sal/qa/osl/getsystempathfromfileurl/makefile.mk
index f2d9da15c468..769313aad004 100644
--- a/sal/qa/osl/setthreadname/makefile.mk
+++ b/sal/qa/osl/getsystempathfromfileurl/makefile.mk
@@ -29,28 +29,32 @@
 nothing .PHONY:
 .ELSE
 
-PRJ = ..$/..$/..
+PRJ = ../../..
 PRJNAME = sal
-TARGET = qa_osl_setthreadname
+TARGET = qa_osl_getsystempathfromfileurl
 
 ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 DLLPRE =
 
 SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLO)/test-setthreadname.obj
+SHL1OBJS = $(SLO)/test-getsystempathfromfileurl.obj
 SHL1RPATH = NONE
 SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
-SHL1TARGET = test-setthreadname
+SHL1TARGET = test-getsystempathfromfileurl
 SHL1VERSIONMAP = version.map
 DEF1NAME = $(SHL1TARGET)
 
 SLOFILES = $(SHL1OBJS)
 
+.ENDIF
+
 .INCLUDE: target.mk
 .INCLUDE: _cppunit.mk
 
diff --git a/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx b/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx
new file mode 100644
index 000000000000..4d9e65586bff
--- /dev/null
+++ b/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx
@@ -0,0 +1,281 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2011 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#include "precompiled_sal.hxx"
+#include "sal/config.h"
+
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
+#include "osl/file.hxx"
+
+#if defined WNT
+#define MY_PATH_IN "/c:/foo/bar"
+#define MY_PATH_OUT "c:\\foo\\bar"
+#define MY_PATH_OUT_CONT MY_PATH_OUT "\\"
+#define MY_PATH_OUT_REL "foo\\bar"
+#else
+#define MY_PATH_IN "/foo/bar"
+#define MY_PATH_OUT MY_PATH_IN
+#define MY_PATH_OUT_CONT MY_PATH_OUT "/"
+#define MY_PATH_OUT_REL "foo/bar"
+#endif
+
+namespace {
+
+class Test: public CppUnit::TestFixture {
+private:
+    CPPUNIT_TEST_SUITE(Test);
+    CPPUNIT_TEST(testBadScheme);
+    CPPUNIT_TEST(testNoScheme);
+    CPPUNIT_TEST(testBadAuthority);
+    CPPUNIT_TEST(testLocalhost1Authority);
+    CPPUNIT_TEST(testLocalhost2Authority);
+    CPPUNIT_TEST(testLocalhost3Authority);
+    CPPUNIT_TEST(testNoAuthority);
+    CPPUNIT_TEST(testEmptyPath);
+    CPPUNIT_TEST(testHomeAbbreviation);
+    CPPUNIT_TEST(testOtherHomeAbbreviation);
+    CPPUNIT_TEST(testRelative);
+    CPPUNIT_TEST(testEscape);
+    CPPUNIT_TEST(testBadEscape2f);
+    CPPUNIT_TEST(testBadEscape2F);
+    CPPUNIT_TEST(testBad0);
+    CPPUNIT_TEST(testBadEscape0);
+    CPPUNIT_TEST(testBadQuery);
+    CPPUNIT_TEST(testBadFragment);
+    CPPUNIT_TEST_SUITE_END();
+
+    void testBadScheme();
+    void testNoScheme();
+    void testBadAuthority();
+    void testLocalhost1Authority();
+    void testLocalhost2Authority();
+    void testLocalhost3Authority();
+    void testNoAuthority();
+    void testEmptyPath();
+    void testHomeAbbreviation();
+    void testOtherHomeAbbreviation();
+    void testRelative();
+    void testEscape();
+    void testBadEscape2f();
+    void testBadEscape2F();
+    void testBad0();
+    void testBadEscape0();
+    void testBadQuery();
+    void testBadFragment();
+};
+
+void Test::testBadScheme() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foo:bar")), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+void Test::testNoScheme() {
+#if !defined WNT //TODO
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("//" MY_PATH_IN)), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_OUT)), p);
+#endif
+}
+
+void Test::testBadAuthority() {
+#if defined UNX
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://baz" MY_PATH_IN)), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+#endif
+}
+
+void Test::testLocalhost1Authority() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://localhost" MY_PATH_IN)),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_OUT)), p);
+}
+
+void Test::testLocalhost2Authority() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://LOCALHOST" MY_PATH_IN)),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_OUT)), p);
+}
+
+void Test::testLocalhost3Authority() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://127.0.0.1" MY_PATH_IN)),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_OUT)), p);
+}
+
+void Test::testNoAuthority() {
+#if !defined WNT //TODO
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_IN)), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_OUT)), p);
+#endif
+}
+
+void Test::testEmptyPath() {
+#if defined UNX
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://")), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")), p);
+#endif
+}
+
+void Test::testHomeAbbreviation() {
+#if defined UNX
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///~" MY_PATH_IN)), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+        // could theoretically fail due to osl::Security::getHomeDir problem
+    CPPUNIT_ASSERT(p.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM(MY_PATH_OUT)));
+#endif
+}
+
+void Test::testOtherHomeAbbreviation() {
+#if defined UNX
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///~baz" MY_PATH_IN)),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e); // not supported for now
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+#endif
+}
+
+void Test::testRelative() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foo/bar")), p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT(
+        p.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM(MY_PATH_OUT_REL)));
+}
+
+void Test::testEscape() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "/b%61z")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_PATH_OUT_CONT "baz")), p);
+}
+
+void Test::testBadEscape2f() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "/b%2fz")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+void Test::testBadEscape2F() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "/b%2Fz")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+void Test::testBad0() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "/b\x00z")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+void Test::testBadEscape0() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "/b%00z")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+void Test::testBadQuery() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "?baz")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+void Test::testBadFragment() {
+    rtl::OUString p;
+    osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://" MY_PATH_IN "#baz")),
+        p);
+    CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, e);
+    CPPUNIT_ASSERT_EQUAL(rtl::OUString(), p);
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sal/qa/sal/version.map b/sal/qa/osl/getsystempathfromfileurl/version.map
index 7321bbca16ad..ef2ab497cb5e 100644
--- a/sal/qa/sal/version.map
+++ b/sal/qa/osl/getsystempathfromfileurl/version.map
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -23,11 +23,11 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************
+#***********************************************************************/
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/sal/qa/osl/module/export_dll.map b/sal/qa/osl/module/export_dll.map
index 87c701f21d91..879f246ebae1 100644
--- a/sal/qa/osl/module/export_dll.map
+++ b/sal/qa/osl/module/export_dll.map
@@ -28,6 +28,7 @@
 UDK_3_0_0 {
     global:
         firstfunc;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk
index 409a28ea02ac..22a4811eaa3c 100644
--- a/sal/qa/osl/module/makefile.mk
+++ b/sal/qa/osl/module/makefile.mk
@@ -36,6 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
@@ -44,7 +46,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
 # --- test dll ------------------------------------------------------
 SHL1TARGET     = Module_DLL
 SHL1OBJS       = $(SLO)$/osl_Module_DLL.obj
-SHL1STDLIBS    = $(SALLIB)
+SHL1STDLIBS    = $(SALLIB) $(CPPUNITLIB)
 SHL1IMPLIB     = i$(SHL1TARGET)
 SHL1DEF        = $(MISC)$/$(SHL1TARGET).def
 DEF1NAME       = $(SHL1TARGET)
@@ -55,7 +57,7 @@ SHL1VERSIONMAP = export_dll.map
 SHL2OBJS=  $(SLO)$/osl_Module.obj
 
 SHL2TARGET= osl_Module
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 .IF "$(GUI)" == "WNT"
 SHL2STDLIBS+=i$(SHL2TARGET).lib
@@ -72,8 +74,9 @@ DEF2NAME    =$(SHL2TARGET)
 SHL2VERSIONMAP= $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index d7ddb866d57d..a7339b337876 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,10 @@
 #include <osl_Module_Const.h>
 
 using namespace osl;
-using namespace rtl;
-
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 //------------------------------------------------------------------------
 // helper functions and classes
 //------------------------------------------------------------------------
@@ -45,8 +47,9 @@ using namespace rtl;
 */
 inline void printBool( sal_Bool bOk )
 {
-    t_print("#printBool# " );
-    ( sal_True == bOk ) ? t_print("TRUE!\n" ): t_print("FALSE!\n" );
+    printf("#printBool# " );
+    ( sal_True == bOk ) ? printf( "TRUE!\n" )
+                        : printf( "FALSE!\n" );
 }
 
 /** print a UNI_CODE String.
@@ -55,9 +58,9 @@ inline void printUString( const ::rtl::OUString & str )
 {
     rtl::OString aString;
 
-    t_print("#printUString_u# " );
+    printf("#printUString_u# " );
     aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    t_print("%s\n", aString.getStr( ) );
+    printf("%s\n", aString.getStr( ) );
 }
 
 /** get dll file URL.
@@ -65,9 +68,9 @@ inline void printUString( const ::rtl::OUString & str )
 inline ::rtl::OUString getDllURL( void )
 {
 #if ( defined WNT )        // lib in Unix and lib in Windows are not same in file name.
-    ::rtl::OUString libPath( rtl::OUString::createFromAscii( "Module_DLL.dll" ) );
+    ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("Module_DLL.dll") );
 #else
-    ::rtl::OUString libPath( rtl::OUString::createFromAscii( "libModule_DLL.so" ) );
+    ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("libModule_DLL.so") );
 #endif
 
     ::rtl::OUString dirPath, dllPath;
@@ -78,20 +81,9 @@ inline ::rtl::OUString getDllURL( void )
     return dllPath;
 }
 
-/** print a UNI_CODE file name.
-*/
-inline void printFileName( const ::rtl::OUString & str )
-{
-    rtl::OString aString;
-
-    t_print("#printFileName_u# " );
-    aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    t_print("%s\n", aString.getStr( ) );
-}
-
 inline sal_Bool isURL( const ::rtl::OUString pathname )
 {
-    ::rtl::OUString aPreURL( rtl::OUString::createFromAscii( "file:///" ) );
+    ::rtl::OUString aPreURL( RTL_CONSTASCII_USTRINGPARAM("file:///") );
     return ( ( pathname.indexOf( aPreURL ) == 0 ) ? sal_True : sal_False );
 }
 
@@ -137,7 +129,7 @@ inline sal_Bool ifFileExist( const ::rtl::OUString & str )
         return sal_False;
 
     ::osl::File strFile( aUStr );
-    ::osl::FileBase::RC nError = strFile.open( OpenFlag_Read );
+    ::osl::FileBase::RC nError = strFile.open( osl_File_OpenFlag_Read );
     if ( ::File::E_NOENT == nError )
         return sal_False;
     else{
@@ -156,7 +148,7 @@ inline void deleteTestFile( const ::rtl::OUString filename )
     if ( !isURL( filename ) )
         ::osl::FileBase::getFileURLFromSystemPath( filename, aPathURL ); //convert if not full qualified URL
 
-    nError = ::osl::File::setAttributes( aPathURL, Attribute_GrpWrite| Attribute_OwnWrite| Attribute_OthWrite ); // if readonly, make writtenable.
+    nError = ::osl::File::setAttributes( aPathURL, osl_File_Attribute_GrpWrite| osl_File_Attribute_OwnWrite| osl_File_Attribute_OthWrite ); // if readonly, make writtenable.
     CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: set writtenable ", ( ::osl::FileBase::E_None == nError ) || ( ::osl::FileBase::E_NOENT == nError ) );
 
     nError = ::osl::File::remove( aPathURL );
@@ -179,7 +171,7 @@ namespace osl_Module
     public:
         static void myFunc()
         {
-            t_print("#Sun Microsystem\n");
+            printf("#Sun Microsystem\n");
         };
     };
 
@@ -250,8 +242,10 @@ namespace osl_Module
 
         void getUrlFromAddress_002( )
         {
+#if !defined( MACOSX )
+            // TODO: Find out why this fails on Mac OS X
             ::osl::Module aMod( getDllURL( ) );
-            FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString::createFromAscii( "firstfunc" ) );
+            FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) );
 
             OUString aFileURL;
             bRes = osl::Module::getUrlFromAddress( ( void* )pFunc, aFileURL );
@@ -263,6 +257,7 @@ namespace osl_Module
 
             CPPUNIT_ASSERT_MESSAGE( "#test comment#: load an external library, get its function address and get its URL.",
                                     sal_True == bRes && 0 < aFileURL.lastIndexOf('/') && aFileURL.equalsIgnoreAsciiCase( getDllURL( ) ) );
+#endif
         }
 
         /* tester comments: another case is getFunctionSymbol_001*/
@@ -299,14 +294,15 @@ namespace osl_Module
         // load lib which is under a CJK directory
         void load_002( )
         {
-#ifdef UNX
+#if defined( UNX ) && !defined( MACOSX )
+            // TODO: Find out why this fails on Mac OS X
             //Can not get a CJK directory already exist, so here create one. Perhaps reason is encoding problem.
-            ::rtl::OUString aPidDirURL = rtl::OUString::createFromAscii( "file:///tmp/" ) + ::rtl::OUString::valueOf( ( long )getpid( ) );
+            ::rtl::OUString aPidDirURL = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///tmp/")) + ::rtl::OUString::valueOf( ( long )getpid( ) );
             ::rtl::OUString aMyDirURL = aPidDirURL + aKname;
             createTestDirectory( aPidDirURL );
             createTestDirectory( aMyDirURL );
 
-            ::rtl::OUString aDLLURL = aMyDirURL + rtl::OUString::createFromAscii( "/libModule_DLL.so" );
+            ::rtl::OUString aDLLURL = aMyDirURL + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/libModule_DLL.so"));
             //check if the lib exist.
             //FIXME: if assert condition is false, the case will return, so the directory will not be clean-up
             CPPUNIT_ASSERT_MESSAGE( "#Source file is not exist. please manually clean-up directory and file under /tmp", ifFileExist( getDllURL( ) ) == sal_True );
@@ -316,9 +312,9 @@ namespace osl_Module
             CPPUNIT_ASSERT_MESSAGE( "#This file is not exist, copy failed. please manually clean-up directory and file under /tmp", ifFileExist( aDLLURL ) == sal_True );
 
             //test if can create a normal file
-            ::rtl::OUString aFileURL = aMyDirURL + rtl::OUString::createFromAscii( "/test_file" );
+            ::rtl::OUString aFileURL = aMyDirURL + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/test_file"));
             ::osl::File testFile( aFileURL );
-            nError = testFile.open( OpenFlag_Create );
+            nError = testFile.open( osl_File_OpenFlag_Create );
             CPPUNIT_ASSERT_MESSAGE( "#create failed. please manually clean-up directory and file under /tmp", nError == ::osl::FileBase::E_None );
             CPPUNIT_ASSERT_MESSAGE( "#This file is not exist, create failed. please manually clean-up directory and file under /tmp", ifFileExist( aFileURL ) == sal_True );
 
@@ -414,8 +410,10 @@ namespace osl_Module
 
         void getSymbol_001( )
         {
+#if !defined( MACOSX )
+            // TODO: Find out why this fails on Mac OS X
             ::osl::Module aMod( getDllURL( ) );
-            FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString::createFromAscii( "firstfunc" ) );
+            FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) );
             bRes = sal_False;
             if ( pFunc )
                 bRes = pFunc( bRes );
@@ -423,6 +421,7 @@ namespace osl_Module
 
             CPPUNIT_ASSERT_MESSAGE( "#test comment#: load a dll and call one function in it.",
                                      sal_True == bRes );
+#endif
         }
 
         CPPUNIT_TEST_SUITE( getSymbol );
@@ -441,6 +440,8 @@ namespace osl_Module
 
         void optr_oslModule_001( )
         {
+#if !defined( MACOSX )
+            // TODO: Find out why this fails on Mac OS X
             ::osl::Module aMod;
             bRes = ( (oslModule)aMod == NULL );
 
@@ -451,12 +452,15 @@ namespace osl_Module
 
             CPPUNIT_ASSERT_MESSAGE( "#test comment#: the m_Module of a Module instance will be NULL when is not loaded, it will not be NULL after loaded.",
                                      sal_True == bRes && sal_True == bRes1);
+#endif
         }
 
         void optr_oslModule_002( )
         {
+#if !defined( MACOSX )
+            // TODO: Find out why this fails on Mac OS X
             ::osl::Module aMod( getDllURL( ) );
-            ::rtl::OUString funcName(::rtl::OUString::createFromAscii( "firstfunc" ) );
+            ::rtl::OUString funcName( RTL_CONSTASCII_USTRINGPARAM("firstfunc") );
 
             FuncPtr pFunc = ( FuncPtr ) osl_getSymbol( (oslModule)aMod, funcName.pData );
             bRes = sal_False;
@@ -467,6 +471,7 @@ namespace osl_Module
 
             CPPUNIT_ASSERT_MESSAGE( "#test comment#: use m_Module to call osl_getSymbol() function.",
                                      sal_True == bRes  );
+#endif
         }
 
         CPPUNIT_TEST_SUITE( optr_oslModule );
@@ -485,32 +490,32 @@ namespace osl_Module
 
         void getFunctionSymbol_001( )
         {
+#if !defined( MACOSX )
+            // TODO: Find out why this fails on Mac OS X
             ::osl::Module aMod( getDllURL( ) );
-            oslGenericFunction oslFunc = aMod.getFunctionSymbol( rtl::OUString::createFromAscii( "firstfunc" ) );
+            oslGenericFunction oslFunc = aMod.getFunctionSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) );
             ::rtl::OUString aLibraryURL;
             bRes = ::osl::Module::getUrlFromAddress( oslFunc, aLibraryURL);
             aMod.unload();
-            printFileName( aLibraryURL );
-
             CPPUNIT_ASSERT_MESSAGE( "#test comment#: load a dll and get its function addr and get its URL.",
                  sal_True == bRes && aLibraryURL.equalsIgnoreAsciiCase( getDllURL() ) );
+#endif
         }
 
         CPPUNIT_TEST_SUITE( getFunctionSymbol );
         CPPUNIT_TEST( getFunctionSymbol_001 );
-        //CPPUNIT_TEST( getFunctionSymbol_002 );
         CPPUNIT_TEST_SUITE_END( );
     }; // class getFunctionSymbol
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::ctors, "osl_Module");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::getUrlFromAddress, "osl_Module");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::load, "osl_Module");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::unload, "osl_Module");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::is, "osl_Module");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::getSymbol, "osl_Module");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::optr_oslModule, "osl_Module");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::getFunctionSymbol, "osl_Module");
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::ctors);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getUrlFromAddress);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::load);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::unload);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::is);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getSymbol);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::optr_oslModule);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getFunctionSymbol);
 // -----------------------------------------------------------------------------
 
 } // namespace osl_Module
@@ -519,4 +524,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::getFunctionSymbol, "osl_Module
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h
index 21b1b743c6ee..9074a281ff9a 100644
--- a/sal/qa/osl/module/osl_Module_Const.h
+++ b/sal/qa/osl/module/osl_Module_Const.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,16 +35,15 @@
 #include <osl/module.hxx>
 #include <osl/file.hxx>
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )                      //Unix
 #   include <unistd.h>
 #endif
 #if ( defined WNT )                     // Windows
-#include <tools/prewin.h>
-// #    include <windows.h>
 #   include <io.h>
-#include <tools/postwin.h>
 #endif
 
 #   define FILE_PREFIX          "file:///"
@@ -64,3 +64,5 @@ typedef sal_Bool (* FuncPtr )( sal_Bool );
 
 
 #endif /* _OSL_MODULE_CONST_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/module/osl_Module_DLL.cxx b/sal/qa/osl/module/osl_Module_DLL.cxx
index 38ab7d29abd4..04c46143f809 100644
--- a/sal/qa/osl/module/osl_Module_DLL.cxx
+++ b/sal/qa/osl/module/osl_Module_DLL.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
+#include <osl_Module_Const.h>
+
 #include <stdio.h>
 #include <sal/types.h>
-#include <testshl/simpleheader.hxx>
+
+// This module contains no tests. It is loaded as a dynamic library by
+// osl_Module.
+// But we instatiate a test plugin to fake the build process.
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 extern "C" sal_Bool SAL_CALL firstfunc( sal_Bool bRes )
 {
@@ -41,3 +48,4 @@ extern "C" void SAL_CALL secondfunc()
    printf("second func called.\n");
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/mutex/makefile.mk b/sal/qa/osl/mutex/makefile.mk
deleted file mode 100755
index de4121e3a0b9..000000000000
--- a/sal/qa/osl/mutex/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ=..$/..$/..
-
-PRJNAME=sal
-TARGET=qa_osl_mutex
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl
-SHL1OBJS=  \
-    $(SLO)$/osl_Mutex.obj
-
-SHL1TARGET= osl_Mutex
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
-.IF "$(GUI)" == "WNT"
-SHL1STDLIBS += $(WS2_32LIB)
-.ENDIF
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-SHL1RPATH = NONE
-
-# auto generated Target:Socket
-# END ------------------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
-.END
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 4b1b078785d3..b4b2ecc8f4bd 100755..100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,16 +26,11 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-
 //------------------------------------------------------------------------
 // include files
 //------------------------------------------------------------------------
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include <sal/cppunit.h>
+
 #include <osl_Mutex_Const.h>
 
 using namespace osl;
@@ -76,7 +72,7 @@ namespace ThreadHelper
 #ifdef WNT                               //Windows
         Sleep( _nSec * 1000 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )   //Unix
+#if ( defined UNX )                     //Unix
         sleep( _nSec );
 #endif
         // printf("# done\n" );
@@ -86,7 +82,7 @@ namespace ThreadHelper
 #ifdef WNT      //Windows
             Sleep(_nTenthSec * 100 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )                     //Unix
             TimeValue nTV;
             nTV.Seconds = static_cast<sal_uInt32>( _nTenthSec/10 );
             nTV.Nanosec = ( (_nTenthSec%10 ) * 100000000 );
@@ -512,15 +508,6 @@ namespace osl_Mutex
         // how about release twice?
         void release_002()
         {
-// LLA: is this a real test?
-#if 0
-            Mutex aMutex;
-            sal_Bool bRes1 = aMutex.release( );
-            sal_Bool bRes2 = aMutex.release( );
-
-            CPPUNIT_ASSERT_MESSAGE( "release Mutex: mutex should not be released without aquire, should not release twice. although the behaviour is still under discussion, this test is passed on (LINUX), not passed on (SOLARIS)&(WINDOWS)",
-                bRes1 == sal_False && bRes2 == sal_False );
-#endif
         }
 
         CPPUNIT_TEST_SUITE( release );
@@ -947,3 +934,5 @@ CPPUNIT_PLUGIN_IMPLEMENT();
 // Local Variables:
 // tab-width:4
 // End:
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h
index 30d321775f01..59c83c40eb87 100755..100644
--- a/sal/qa/osl/mutex/osl_Mutex_Const.h
+++ b/sal/qa/osl/mutex/osl_Mutex_Const.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,15 +26,9 @@
  *
  ************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _OSL_MUTEX_CONST_H_
 #define _OSL_MUTEX_CONST_H_
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
@@ -54,3 +49,5 @@
 
 
 #endif /* _OSL_MUTEX_CONST_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/pipe/makefile.mk b/sal/qa/osl/pipe/makefile.mk
deleted file mode 100644
index 85452eac8655..000000000000
--- a/sal/qa/osl/pipe/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ=..$/..$/..
-
-PRJNAME=sal
-TARGET=qa_osl_pipe
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:Pipe by codegen.pl
-SHL1OBJS=  \
-    $(SLO)$/osl_Pipe.obj
-
-SHL1TARGET= osl_Pipe
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-SHL1RPATH = NONE
-# auto generated Target:Pipe
-# END ------------------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
-.END
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index ffb9f314a5bf..ba5f8dadbc74 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,32 +26,20 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-
 //------------------------------------------------------------------------
 // include files
 //------------------------------------------------------------------------
 
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include <sal/cppunit.h>
 #include "test/uniquepipename.hxx"
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
-#ifndef _OSL_THREAD_HXX
 #include <osl/thread.hxx>
-#endif
 
-#ifndef _OSL_MUTEX_HXX
 #include <osl/mutex.hxx>
-#endif
 
-#ifndef _OSL_MUTEX_HXX
 #include <osl/pipe.hxx>
-#endif
 #include <osl/time.h>
 
 #ifdef UNX
@@ -59,7 +48,10 @@
 #include <string.h>
 
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 
 //------------------------------------------------------------------------
 // helper functions
@@ -135,9 +127,9 @@ inline void printPipeError( ::osl::Pipe aPipe )
 //------------------------------------------------------------------------
 // pipe name and transfer contents
 //------------------------------------------------------------------------
-const rtl::OUString aTestPipeName = rtl::OUString::createFromAscii( "testpipe2" );
-const rtl::OUString aTestPipe1 = rtl::OUString::createFromAscii( "testpipe1" );
-const rtl::OUString aTestString = rtl::OUString::createFromAscii( "Sun Microsystems" );
+const rtl::OUString aTestPipeName(RTL_CONSTASCII_USTRINGPARAM("testpipe2"));
+const rtl::OUString aTestPipe1(RTL_CONSTASCII_USTRINGPARAM("testpipe1"));
+const rtl::OUString aTestString(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems"));
 
 const OString m_pTestString1("Sun Microsystems");
 const OString m_pTestString2("test pipe PASS/OK");
@@ -892,7 +884,7 @@ namespace osl_StreamPipe
 #ifdef WNT                               //Windows
         Sleep( _nSec * 1000 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )   //Unix
+#if ( defined UNX )                     //Unix
         sleep( _nSec );
 #endif
         // printf("done\n" );
@@ -1058,3 +1050,5 @@ namespace osl_StreamPipe
 } // namespace osl_StreamPipe
 
 CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/process/batch.sh b/sal/qa/osl/process/batch.sh
new file mode 100755
index 000000000000..fd3828c6ae42
--- /dev/null
+++ b/sal/qa/osl/process/batch.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "Hello world"
\ No newline at end of file
diff --git a/sal/qa/osl/process/export.exp b/sal/qa/osl/process/export.exp
deleted file mode 100644
index a13529da5876..000000000000
--- a/sal/qa/osl/process/export.exp
+++ /dev/null
@@ -1 +0,0 @@
-registerAllTestFunction
diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk
index e113ac86edee..17bac5faf871 100644
--- a/sal/qa/osl/process/makefile.mk
+++ b/sal/qa/osl/process/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
@@ -45,59 +47,36 @@ CXXFLAGS+= $(LFS_CFLAGS)
     CFLAGS+=/Ob1
 .ENDIF
 
-SHL1OBJS=  \
-    $(SLO)$/osl_Thread.obj
-
-SHL1TARGET= osl_Thread
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME    =$(SHL1TARGET)
-
-# DEF1EXPORTFILE= export.exp
+SHL1OBJS=$(SLO)$/osl_Thread.obj
+SHL1TARGET=osl_Thread
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
+SHL1IMPLIB=i$(SHL1TARGET)
+DEF1NAME=$(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
 # END ------------------------------------------------------------------
 
-#.IF "$(GUI)" == "WNT"
-
 SHL2OBJS=$(SLO)$/osl_process.obj
 SHL2TARGET=osl_process
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
 SHL2IMPLIB=i$(SHL2TARGET)
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=$(SHL2TARGET)
-DEF2EXPORTFILE=export.exp
+SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
 
 # END ------------------------------------------------------------------
 
 OBJ3FILES=$(OBJ)$/osl_process_child.obj
 APP3TARGET=osl_process_child
 APP3OBJS=$(OBJ3FILES)
-
-# .IF "$(GUI)" == "UNX"
-# APP3STDLIBS=$(LB)$/libsal.so
-# .ENDIF
-# .IF "$(GUI)" == "WNT"
-# APP3STDLIBS=$(KERNEL32LIB) $(LB)$/isal.lib
-# .ENDIF
 APP3STDLIBS=$(SALLIB)
 
-#.ENDIF # "$(GUI)" == "WNT"
+SHL2DEPN=$(APP3TARGETN) \
+         $(BIN)/batch.sh \
+         $(BIN)/batch.bat
 
 #------------------------------- All object files -------------------------------
 # do this here, so we get right dependencies
 
-.IF "$(GUI)" == "OS2"
-
-SLOFILES=$(SHL2OBJS)
-
-.ELSE
-
 SLOFILES=$(SHL1OBJS) $(SHL2OBJS)
 
 .ENDIF
@@ -105,4 +84,11 @@ SLOFILES=$(SHL1OBJS) $(SHL2OBJS)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+
+$(BIN)/batch.sh: batch.sh
+    $(COPY) $< $@
+
+$(BIN)/batch.bat: batch.bat
+    $(COPY) $< $@
+
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 794fcc82f9c9..3b021a497db6 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,37 +28,41 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
+
+#ifdef WNT
+#define NOMINMAX
+#include <windows.h>
+#else
+#include <unistd.h>
+#include <time.h>
+#endif
+
 //------------------------------------------------------------------------
 // include files
 //------------------------------------------------------------------------
 #include <sal/types.h>
 
-#ifndef _RTL_USTRING_HXX_
 #include <rtl/string.hxx>
-#endif
 
-#ifndef _RTL_USTRING_HXX_
 #include <rtl/strbuf.hxx>
-#endif
 
-#ifndef _OSL_THREAD_HXX
 #include <osl/thread.hxx>
-#endif
 
-#ifndef _OSL_MUTEX_HXX
 #include <osl/mutex.hxx>
-#endif
 #include <osl/time.h>
 
-#include <testshl/simpleheader.hxx>
+#include <string.h>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#define t_print printf
 
 using namespace osl;
-using namespace rtl;
 
-#ifdef UNX
-#include <unistd.h>
-#include <time.h>
-#endif
+using ::rtl::OString;
+
 // -----------------------------------------------------------------------------
 // Kleine Stopuhr
 class StopWatch {
@@ -96,7 +101,7 @@ void StopWatch::start()
     m_bIsValid = false;
     m_bIsRunning = true;
     osl_getSystemTime( &t1 );
-    t_print("# %d %d nsecs\n", t1.Seconds, t1.Nanosec);
+    t_print("# %u %u nsecs\n", (unsigned)t1.Seconds, (unsigned)t1.Nanosec);
     // gettimeofday(&t1, 0);
 }
 
@@ -107,18 +112,10 @@ void StopWatch::stop()
 
     // gettimeofday(&t2, 0);                         // Timer ausfragen
     osl_getSystemTime( &t2 );
-    t_print("# %d %d nsecs\n", t2.Seconds, t2.Nanosec);
+    t_print("# %u %u nsecs\n", (unsigned) t2.Seconds, (unsigned) t2.Nanosec);
 
     if (m_bIsRunning)
     {                                // check ob gestartet.
-// LLA: old         m_nNanoSec = static_cast<sal_Int32>(t2.Nanosec) - static_cast<sal_Int32>(t1.Nanosec);
-// LLA: old         m_nSeconds = static_cast<sal_Int32>(t2.Seconds) - static_cast<sal_Int32>(t1.Seconds);
-// LLA: old         if (m_nNanoSec < 0)
-// LLA: old         {
-// LLA: old             m_nNanoSec += 1000000000;
-// LLA: old             m_nSeconds -= 1;
-// LLA: old         }
-        //m_nNanoSec = t2.Nanosec - t1.Nanosec;
         m_nSeconds = static_cast<sal_Int32>(t2.Seconds) - static_cast<sal_Int32>(t1.Seconds);
         if ( t2.Nanosec > t1.Nanosec )
                m_nNanoSec = static_cast<sal_Int32>(t2.Nanosec) - static_cast<sal_Int32>(t1.Nanosec);
@@ -127,7 +124,7 @@ void StopWatch::stop()
         m_nNanoSec = 1000000000 + static_cast<sal_Int32>(t2.Nanosec) - static_cast<sal_Int32>(t1.Nanosec);
                 m_nSeconds -= 1;
     }
-    t_print("# %d %d nsecs\n", m_nSeconds, m_nNanoSec );
+    t_print("# %u %u nsecs\n", (unsigned) m_nSeconds, (unsigned) m_nNanoSec );
         //if (m_nNanoSec < 0)
         //{
             //m_nNanoSec += 1000000000;
@@ -188,31 +185,16 @@ public:
 // -----------------------------------------------------------------------------
 namespace ThreadHelper
 {
-    // typedef enum {
-    //     QUIET=1,
-    //     VERBOSE
-    // } eSleepVerboseMode;
-
-    void thread_sleep_tenth_sec(sal_Int32 _nTenthSec/*, eSleepVerboseMode nVerbose = VERBOSE*/)
+    void thread_sleep_tenth_sec(sal_Int32 _nTenthSec)
     {
-        // if (nVerbose == VERBOSE)
-        // {
-        //     t_print("wait %d tenth seconds. ", _nTenthSec );
-        //     fflush(stdout);
-        // }
-#ifdef WNT      //Windows
+#ifdef WNT
         Sleep(_nTenthSec * 100 );
-#endif
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#else
         TimeValue nTV;
         nTV.Seconds = static_cast<sal_uInt32>( _nTenthSec/10 );
         nTV.Nanosec = ( (_nTenthSec%10 ) * 100000000 );
         osl_waitThread(&nTV);
 #endif
-        // if (nVerbose == VERBOSE)
-        // {
-        //     t_print("done\n");
-        // }
     }
 
     void outputPriority(oslThreadPriority const& _aPriority)
@@ -297,7 +279,7 @@ public:
     OCountThread()
         {
             m_nWaitSec = 0;
-            t_print("new OCountThread thread %d!\n", getIdentifier());
+            t_print("new OCountThread thread %u!\n", (unsigned) getIdentifier());
         }
     sal_Int32 getValue() { return m_aFlag.getValue(); }
 
@@ -325,14 +307,9 @@ protected:
             {
                 m_aFlag.addValue(1);
                 ThreadHelper::thread_sleep_tenth_sec(1);
-                // TimeValue nTV;
-                // nTV.Seconds = 1;
-                // nTV.Nanosec = 0;
-                // wait(nTV);
 
                 if (m_nWaitSec != 0)
                 {
-                    //ThreadHelper::thread_sleep_tenth_sec(m_nWaitSec * 10);
                     TimeValue nTV;
                     nTV.Seconds = m_nWaitSec / 10 ;
                     nTV.Nanosec = ( m_nWaitSec%10 ) * 100000000 ;
@@ -343,7 +320,7 @@ protected:
         }
     void SAL_CALL onTerminated()
         {
-            t_print("normally terminate this thread %d!\n", getIdentifier());
+            t_print("normally terminate this thread %u!\n", (unsigned) getIdentifier());
         }
 public:
 
@@ -385,11 +362,6 @@ protected:
                 m_aFlag.addValue(1);
 
                 ThreadHelper::thread_sleep_tenth_sec(1);
-                // m_bWait =    sal_False;
-                // TimeValue nTV;
-                // nTV.Seconds = 1;
-                // nTV.Nanosec = 0;
-                // wait(nTV);
                 if (m_bSuspend == sal_True)
                 {
                     suspend();
@@ -430,20 +402,16 @@ protected:
             {
                 m_aFlag.addValue(1);
                 ThreadHelper::thread_sleep_tenth_sec(1);
-                // TimeValue nTV;
-                // nTV.Seconds = 1;
-                // nTV.Nanosec = 0;
-                // wait(nTV);
             }
         }
     void SAL_CALL onTerminated()
         {
-            t_print("normally terminate this thread %d!\n", getIdentifier());
+            t_print("normally terminate this thread %u!\n", (unsigned) getIdentifier());
         }
 public:
     ONoScheduleThread()
         {
-                t_print("new thread id %d!\n", getIdentifier());
+                t_print("new thread id %u!\n", (unsigned) getIdentifier());
         }
     ~ONoScheduleThread()
         {
@@ -514,9 +482,6 @@ namespace osl_Thread
 #else
         _pThread->resume();
 #endif
-        // ThreadHelper::thread_sleep_tenth_sec(1);
-        // _pThread->suspend();
-        // ThreadHelper::thread_sleep_tenth_sec(1);
     }
 
     // kill a running thread and join it, if it has terminated, do nothing
@@ -568,8 +533,8 @@ namespace osl_Thread
                 termAndJoinThread(newthread);
                 delete newthread;
 
-                t_print("   nValue = %d\n", nValue);
-                t_print("isRunning = %d\n", isRunning);
+                t_print("   nValue = %d\n", (int) nValue);
+                t_print("isRunning = %s\n", isRunning == sal_True ? "true" : "false");
 
                 CPPUNIT_ASSERT_MESSAGE(
                     "Creates a new thread",
@@ -585,7 +550,7 @@ namespace osl_Thread
                 myThread* newthread = new myThread();
                 sal_Bool res1 = newthread->create();
                 sal_Bool res2 = newthread->create();
-                t_print("In non pro, an assertion should occured. This behaviour is right.\n");
+                t_print("In non pro, an assertion should occurred. This behaviour is right.\n");
                 termAndJoinThread(newthread);
                 delete newthread;
 
@@ -745,7 +710,7 @@ namespace osl_Thread
                 //{
                 ThreadHelper::thread_sleep_tenth_sec(3);
                 nValue = aThread->getValue();    // (1)
-                t_print(" getValue is %d !", nValue );
+                t_print(" getValue is %d !", (int) nValue );
                 if (nValue >= 2)
                 {
                         aThread->setSuspend();
@@ -821,9 +786,9 @@ namespace osl_Thread
                 termAndJoinThread(pCountThread);
                 delete pCountThread;
 
-                t_print("SuspendValue: %d\n", nSuspendValue);
-                t_print("ResumeValue:  %d\n", nResumeValue);
-                t_print("LaterValue:   %d\n", nLaterValue);
+                t_print("SuspendValue: %d\n", (int) nSuspendValue);
+                t_print("ResumeValue:  %d\n", (int) nResumeValue);
+                t_print("LaterValue:   %d\n", (int) nLaterValue);
 
                 /* LLA: this assumption is no longer relevant: nResumeValue ==  nSuspendValue && */
                 CPPUNIT_ASSERT_MESSAGE(
@@ -850,7 +815,7 @@ namespace osl_Thread
                 termAndJoinThread(newthread);
                 delete newthread;
 
-                t_print("   nValue = %d\n", nValue);
+                t_print("   nValue = %d\n", (int) nValue);
 
                 CPPUNIT_ASSERT_MESSAGE(
                     "Creates a suspended thread, then resume",
@@ -900,8 +865,8 @@ namespace osl_Thread
                 aCountThread->join();
                 delete aCountThread;
 
-                t_print("     nValue = %d\n", nValue);
-                t_print("nLaterValue = %d\n", nLaterValue);
+                t_print("     nValue = %d\n", (int) nValue);
+                t_print("nLaterValue = %d\n", (int) nLaterValue);
 
                 CPPUNIT_ASSERT_MESSAGE(
                     "Terminate the thread",
@@ -929,8 +894,8 @@ namespace osl_Thread
                 sal_Int32 nLaterValue = aCountThread->getValue();
                 delete aCountThread;
 
-                t_print("     nValue = %d\n", nValue);
-                t_print("nLaterValue = %d\n", nLaterValue);
+                t_print("     nValue = %d\n", (int) nValue);
+                t_print("nLaterValue = %d\n", (int) nLaterValue);
 
                 CPPUNIT_ASSERT_MESSAGE(
                     "Suspend then resume the thread",
@@ -1185,8 +1150,8 @@ namespace osl_Thread
                 rtl::OString sPrio = getPrioName(_aPriority);
                 t_print("After 10 tenth seconds\n");
 
-                t_print("nValue in %s Prio Thread is  %d\n",sPrio.getStr(), nValueNormal);
-                t_print("nValue in %s Prio Thread is %d\n", sPrio.getStr(), nValueNormal2);
+                t_print("nValue in %s Prio Thread is  %d\n",sPrio.getStr(), (int) nValueNormal);
+                t_print("nValue in %s Prio Thread is %d\n", sPrio.getStr(), (int) nValueNormal2);
 
                 // ThreadHelper::thread_sleep_tenth_sec(1);
                 pThread->join();
@@ -1203,7 +1168,7 @@ namespace osl_Thread
                     );
                 double nDeltaPercent = nDelta / nQuotient * 100;
 
-                t_print("Delta value %d, percent %f\n",nDelta, nDeltaPercent);
+                t_print("Delta value %d, percent %f\n", (int) nDelta, nDeltaPercent);
 
                 // LLA: it's not a bug if the current OS is not able to handle thread scheduling right and good.
                 // like Windows XP
@@ -1284,24 +1249,11 @@ namespace osl_Thread
                 sal_Int32 nValueNormal = 0;
                 nValueNormal = aNormalThread.getValue();
 
-                // sal_Int32 nValueBelowNormal = 0;
-                //nValueBelowNormal = aBelowNormalThread->getValue();
-                // sal_Int32 nValueLowest = 0;
-                //nValueLowest = aLowestThread->getValue();
                 t_print("After 10 tenth seconds\n");
-                t_print("nValue in Highest Prio Thread is %d\n",nValueHighest);
-                t_print("nValue in AboveNormal Prio Thread is %d\n",nValueAboveNormal);
-                t_print("nValue in Normal Prio Thread is %d\n",nValueNormal);
-
-                // LLA: this is not a save test, so we only check if all values not zero
-                // LLA: CPPUNIT_ASSERT_MESSAGE(
-                // LLA:     "SetPriority",
-                // LLA:     nValueHighest >= nValueAboveNormal &&
-                // LLA:     nValueAboveNormal >= nValueNormal &&
-                // LLA:     nValueNormal > 0
-                // LLA:     );
+                t_print("nValue in Highest Prio Thread is %d\n", (int) nValueHighest);
+                t_print("nValue in AboveNormal Prio Thread is %d\n", (int) nValueAboveNormal);
+                t_print("nValue in Normal Prio Thread is %d\n", (int) nValueNormal);
 
-// LLA: windows let starve threads with lower priority
 #ifndef WNT
                 CPPUNIT_ASSERT_MESSAGE(
                     "SetPriority",
@@ -1373,11 +1325,11 @@ namespace osl_Thread
                 nValueLowest = pLowestThread->getValue();
 
                 t_print("After 10 tenth seconds\n");
-                t_print("nValue in Highest Prio Thread is     %d\n",nValueHighest);
-                t_print("nValue in AboveNormal Prio Thread is %d\n",nValueAboveNormal);
-                t_print("nValue in Normal Prio Thread is      %d\n",nValueNormal);
-                t_print("nValue in BelowNormal Prio Thread is %d\n",nValueBelowNormal);
-                t_print("nValue in Lowest Prio Thread is      %d\n",nValueLowest);
+                t_print("nValue in Highest Prio Thread is     %d\n", (int) nValueHighest);
+                t_print("nValue in AboveNormal Prio Thread is %d\n", (int) nValueAboveNormal);
+                t_print("nValue in Normal Prio Thread is      %d\n", (int) nValueNormal);
+                t_print("nValue in BelowNormal Prio Thread is %d\n", (int) nValueBelowNormal);
+                t_print("nValue in Lowest Prio Thread is      %d\n", (int) nValueLowest);
 
                 delete pHighestThread;
                 delete pAboveNormalThread;
@@ -1385,17 +1337,6 @@ namespace osl_Thread
                 delete pBelowNormalThread;
                 delete pLowestThread;
 
-                // LLA: this is not a save test, so we only check if all values not zero
-                // LLA: CPPUNIT_ASSERT_MESSAGE(
-                // LLA:     "SetPriority",
-                // LLA:     nValueHighest > nValueAboveNormal &&
-                // LLA:     nValueAboveNormal > nValueNormal &&
-                // LLA:     nValueNormal > nValueBelowNormal &&
-                // LLA:     nValueBelowNormal > nValueLowest &&
-                // LLA:     nValueLowest > 0
-                // LLA:     );
-
-// LLA: windows let starve threads with lower priority
 #ifndef WNT
                 CPPUNIT_ASSERT_MESSAGE(
                     "SetPriority",
@@ -1469,11 +1410,10 @@ namespace osl_Thread
                 nValueLowest = pLowestThread->getValue();
 
                 t_print("After 5 tenth seconds\n");
-                // t_print("nValue in Highest Prio Thread  is     %d\n",nValueHighest);
-                t_print("nValue in AboveNormal Prio Thread is %d\n",nValueAboveNormal);
-                t_print("nValue in Normal Prio Thread is      %d\n",nValueNormal);
-                t_print("nValue in BelowNormal Prio Thread is %d\n",nValueBelowNormal);
-                t_print("nValue in Lowest Prio Thread is      %d\n",nValueLowest);
+                t_print("nValue in AboveNormal Prio Thread is %d\n", (int) nValueAboveNormal);
+                t_print("nValue in Normal Prio Thread is      %d\n", (int) nValueNormal);
+                t_print("nValue in BelowNormal Prio Thread is %d\n", (int) nValueBelowNormal);
+                t_print("nValue in Lowest Prio Thread is      %d\n", (int) nValueLowest);
 
                 // delete pHighestThread;
                 delete pAboveNormalThread;
@@ -1481,17 +1421,6 @@ namespace osl_Thread
                 delete pBelowNormalThread;
                 delete pLowestThread;
 
-                // LLA: this is not a save test, so we only check if all values not zero
-                // LLA: CPPUNIT_ASSERT_MESSAGE(
-                // LLA:     "SetPriority",
-                // LLA:     nValueHighest > nValueAboveNormal &&
-                // LLA:     nValueAboveNormal > nValueNormal &&
-                // LLA:     nValueNormal > nValueBelowNormal &&
-                // LLA:     nValueBelowNormal > nValueLowest &&
-                // LLA:     nValueLowest > 0
-                // LLA:     );
-
-// LLA: windows let starve threads with lower priority
 #ifndef WNT
                 CPPUNIT_ASSERT_MESSAGE(
                     "SetPriority",
@@ -1564,29 +1493,14 @@ namespace osl_Thread
                 nValueLowest = pLowestThread->getValue();
 
                 t_print("After 5 tenth seconds\n");
-                // t_print("nValue in Highest Prio Thread  is     %d\n",nValueHighest);
-                // t_print("nValue in AboveNormal  Prio Thread is %d\n",nValueAboveNormal);
-                t_print("nValue in Normal Prio Thread is      %d\n",nValueNormal);
-                t_print("nValue in BelowNormal Prio Thread is %d\n",nValueBelowNormal);
-                t_print("nValue in Lowest Prio Thread is      %d\n",nValueLowest);
+                t_print("nValue in Normal Prio Thread is      %d\n", (int) nValueNormal);
+                t_print("nValue in BelowNormal Prio Thread is %d\n", (int) nValueBelowNormal);
+                t_print("nValue in Lowest Prio Thread is      %d\n", (int) nValueLowest);
 
-                // delete pHighestThread;
-                // delete pAboveNormalThread;
                 delete pNormalThread;
                 delete pBelowNormalThread;
                 delete pLowestThread;
 
-                // LLA: this is not a save test, so we only check if all values not zero
-                // LLA: CPPUNIT_ASSERT_MESSAGE(
-                // LLA:     "SetPriority",
-                // LLA:     nValueHighest > nValueAboveNormal &&
-                // LLA:     nValueAboveNormal > nValueNormal &&
-                // LLA:     nValueNormal > nValueBelowNormal &&
-                // LLA:     nValueBelowNormal > nValueLowest &&
-                // LLA:     nValueLowest > 0
-                // LLA:     );
-
-// LLA: windows let starve threads with lower priority
 #ifndef WNT
                 CPPUNIT_ASSERT_MESSAGE(
                     "SetPriority",
@@ -1720,17 +1634,12 @@ namespace osl_Thread
             {
                 oslThreadIdentifier oId;
                 OCountThread* pCountThread = new OCountThread;
-                //OCountThread* pCountThread2 = new OCountThread;
                 pCountThread->create();
-                //pCountThread2->create();
                 pCountThread->setWait(3);
                 oId = Thread::getCurrentIdentifier();
                 oslThreadIdentifier oIdChild = pCountThread->getIdentifier();
-                //t_print("CurrentId is %ld, Child1 id is %ld, Child2 id is %ld\n",oId, oIdChild,pCountThread2->m_id );
                 termAndJoinThread(pCountThread);
                 delete pCountThread;
-                //termAndJoinThread(pCountThread2);
-                //delete pCountThread2;
 
                 CPPUNIT_ASSERT_MESSAGE(
                     "Get the identifier for the current active thread.",
@@ -1801,7 +1710,7 @@ namespace osl_Thread
                 delete aCountThread;
                 t_print("nTenthSec = %f \n", nTenthSec);
                 t_print("nSec = %f \n", nSec);
-                t_print("nValue = %d \n", nValue);
+                t_print("nValue = %d \n",  (int) nValue);
 
                 CPPUNIT_ASSERT_MESSAGE(
                     "Wait: Blocks the calling thread for the given number of time.",
@@ -1809,48 +1718,9 @@ namespace osl_Thread
                     );
 
             }
-// LLA: wait_001 does the same.
-// LLA:         /** wait then terminate the thread
-// LLA:
-// LLA:         ALGORITHM:
-// LLA:         wait nWaitSec seconds, and terminate when the wait does not finish
-// LLA:         Windows & UNX: thread terminates immediatlly
-// LLA:     */
-// LLA:     void wait_002()
-// LLA:     {
-// LLA:         OCountThread aThread;
-// LLA:
-// LLA:         sal_Int32 nWaitSec = 3;
-// LLA:         aThread.setWait(nWaitSec);
-// LLA:
-// LLA:         sal_Bool bRes = aThread.create();
-// LLA:         CPPUNIT_ASSERT_MESSAGE ( "Can't start thread!", bRes == sal_True );
-// LLA:
-// LLA:         StopWatch aStopWatch;
-// LLA:         // TimeValue aTimeVal_befor;
-// LLA:         // osl_getSystemTime( &aTimeVal_befor );
-// LLA:         aStopWatch.start();
-// LLA:
-// LLA:         termAndJoinThread(&aThread);
-// LLA:         sal_Int32 nValue = aThread.getValue();
-// LLA:
-// LLA:         // TimeValue aTimeVal_after;
-// LLA:         // osl_getSystemTime( &aTimeVal_after );
-// LLA:         aStopWatch.stop();
-// LLA:         // sal_Int32 nSec = aTimeVal_after.Seconds  - aTimeVal_befor.Seconds;
-// LLA:         double nSec = aStopWatch.getSeconds();
-// LLA:         t_print("sec=%f\n", nSec);
-// LLA:         t_print("nValue = %d\n", nValue);
-// LLA:
-// LLA:         CPPUNIT_ASSERT_MESSAGE(
-// LLA:             "Wait: Blocks the calling thread for the given number of time.",
-// LLA:             nSec < 1 && nValue == 0
-// LLA:         );
-// LLA:     }
 
         CPPUNIT_TEST_SUITE(wait);
         CPPUNIT_TEST(wait_001);
-        // LLA: CPPUNIT_TEST(wait_002);
         CPPUNIT_TEST_SUITE_END();
     }; // class wait
 
@@ -1913,8 +1783,8 @@ namespace osl_Thread
                 ThreadHelper::thread_sleep_tenth_sec(3);
                 sal_Int32 nLaterValue = aThread->getValue();
                 // resumeAndWaitThread(aThread);
-                t_print("      value = %d\n", nValue);
-                t_print("later value = %d\n", nLaterValue);
+                t_print("      value = %d\n", (int) nValue);
+                t_print("later value = %d\n", (int) nLaterValue);
                 // if value and latervalue not equal, than the thread would not suspended
 
                 CPPUNIT_ASSERT_MESSAGE(
@@ -1931,8 +1801,8 @@ namespace osl_Thread
                 aThread->join();
                 sal_Int32 nValue_join = aThread->getValue();
 
-                t_print("value after term = %d\n", nValue_term);
-                t_print("value after join = %d\n", nValue_join);
+                t_print("value after term = %d\n", (int) nValue_term);
+                t_print("value after join = %d\n", (int) nValue_join);
 
                 // nValue_term and nValue_join should be the same
                 // but should be differ from nValue
@@ -1964,8 +1834,8 @@ namespace osl_Thread
 
                 resumeAndWaitThread(&aThread);
 
-                t_print("      value = %d\n", nValue);
-                t_print("later value = %d\n", nLaterValue);
+                t_print("      value = %d\n", (int) nValue);
+                t_print("later value = %d\n", (int) nLaterValue);
 
                 //On windows, suspend works, so the values are same
 #ifdef WNT
@@ -1988,7 +1858,7 @@ namespace osl_Thread
                 termAndJoinThread(&aThread);
                 sal_Int32 nValue_term = aThread.getValue();
 
-                t_print(" value term = %d\n", nValue_term);
+                t_print(" value term = %d\n", (int) nValue_term);
 
                 CPPUNIT_ASSERT_MESSAGE(
                     "Schedule: don't schedule in thread run method, terminate failed.",
@@ -2024,7 +1894,6 @@ namespace osl_Thread
 // destroy function when the binding thread terminate
 void SAL_CALL destroyCallback(void * data)
 {
-    t_print("destroying local data %s\n", (char *) data);
     delete[] (char *) data;
 }
 
@@ -2198,7 +2067,6 @@ namespace osl_ThreadData
                 // at first, set the data a value
                 char* pc = new char[2];
                 char m_nData = 'm';
-//          strcpy(pc, &m_nData);
                 memcpy(pc, &m_nData, 1);
                 pc[1] = '\0';
                 myThreadData.setData(pc);
@@ -2211,7 +2079,6 @@ namespace osl_ThreadData
                 // setData the second time
                 char* pc2 = new char[2];
                 m_nData = 'o';
-//          strcpy(pc2, &m_nData);
                 memcpy(pc2, &m_nData, 1);
                 pc2[1] = '\0';
 
@@ -2231,6 +2098,8 @@ namespace osl_ThreadData
                     cData1 == 'a' && cData2 == 'b' && aChar == 'o'
                     );
 
+                delete [] pc2;
+                delete [] pc;
             }
 
         CPPUNIT_TEST_SUITE(setData);
@@ -2240,8 +2109,6 @@ namespace osl_ThreadData
         CPPUNIT_TEST_SUITE_END();
     }; // class setData
 
-    //sal_Bool buildTwoThreads(char)
-
     class getData : public CppUnit::TestFixture
     {
     public:
@@ -2260,7 +2127,6 @@ namespace osl_ThreadData
                 char* pc = new char[2];
                 char m_nData[] = "i";
                 strcpy(pc, m_nData);
-                t_print("pc %s\n", pc);
                 myThreadData.setData(pc);
 
                 myKeyThread aThread1('c');
@@ -2282,6 +2148,7 @@ namespace osl_ThreadData
                     cData1 == 'c' && cData2 == 'd' && aChar == 'i'
                     );
 
+                delete [] pc;
             }
 
         // setData then change the value in the address data pointer points,
@@ -2290,12 +2157,9 @@ namespace osl_ThreadData
             {
                 char* pc = new char[2];
                 char m_nData = 'i';
-//          strcpy(pc, &m_nData);
                 memcpy(pc, &m_nData, 1);
                 pc[1] = '\0';
-//          strncpy(pc, &m_nData, sizeof(char);
 
-                t_print("pc %s\n", pc);
                 myThreadData.setData(pc);
 
                 myKeyThread aThread1('a');
@@ -2305,11 +2169,9 @@ namespace osl_ThreadData
 
                 // change the value which pc points
                 char m_nData2 = 'j';
-                // strcpy(pc, &m_nData2);
                 memcpy(pc, &m_nData2, 1);
                 pc[1] = '\0';
 
-                //t_print("pc %s\n", pc);
                 void* pChar = myThreadData.getData();
                 char aChar = *(char*)pChar;
 
@@ -2333,12 +2195,13 @@ namespace osl_ThreadData
     }; // class getData
 
 // -----------------------------------------------------------------------------
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ThreadData::ctors, "osl_ThreadData");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ThreadData::setData, "osl_ThreadData");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ThreadData::getData, "osl_ThreadData");
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::ctors);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::setData);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::getData);
 } // namespace osl_ThreadData
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 776aa42c0707..db22198ca4a1 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#define t_print printf
+
 #include <osl/process.h>
 #include <osl/file.hxx>
 #include <osl/thread.h>
@@ -39,13 +45,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <osl/module.hxx>
+#include <sal/macros.h>
 
 #if ( defined WNT )                     // Windows
-#include <tools/prewin.h>
-#   define WIN32_LEAN_AND_MEAN
-// #    include <windows.h>
+#   include <windows.h>
 #   include <tchar.h>
-#include <tools/postwin.h>
 #endif
 
 #include "rtl/allocator.hxx"
@@ -57,10 +61,19 @@
 #include <iterator>
 #include <string>
 
-#if defined(WNT) || defined(OS2)
-    const rtl::OUString EXECUTABLE_NAME = rtl::OUString::createFromAscii("osl_process_child.exe");
+#ifdef UNX
+#if defined( MACOSX )
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
+# else
+    extern char** environ;
+# endif
+#endif
+
+#if defined(WNT)
+    const rtl::OUString EXECUTABLE_NAME (RTL_CONSTASCII_USTRINGPARAM("osl_process_child.exe"));
 #else
-    const rtl::OUString EXECUTABLE_NAME = rtl::OUString::createFromAscii("osl_process_child");
+    const rtl::OUString EXECUTABLE_NAME (RTL_CONSTASCII_USTRINGPARAM("osl_process_child"));
 #endif
 
 
@@ -73,7 +86,10 @@ std::string OUString_to_std_string(const rtl::OUString& oustr)
 
 //########################################
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 
 /** print a UNI_CODE String.
 */
@@ -94,7 +110,7 @@ inline ::rtl::OUString getExecutablePath( void )
     osl::Module::getUrlFromAddress( ( void* ) &getExecutablePath, dirPath );
     dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') );
     dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') + 1);
-    dirPath += rtl::OUString::createFromAscii("bin");
+    dirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin"));
     return dirPath;
 }
 
@@ -114,15 +130,15 @@ class Test_osl_joinProcess : public CppUnit::TestFixture
 public:
 
     Test_osl_joinProcess() :
-        join_param_(OUString::createFromAscii("-join")),
-        wait_time_(OUString::createFromAscii("1")),
+        join_param_(OUString(RTL_CONSTASCII_USTRINGPARAM("-join"))),
+        wait_time_(OUString(RTL_CONSTASCII_USTRINGPARAM("1"))),
         parameters_count_(2)
     {
         parameters_[0] = join_param_.pData;
         parameters_[1] = wait_time_.pData;
         suCWD = getExecutablePath();
         suExecutableFileURL = suCWD;
-        suExecutableFileURL += rtl::OUString::createFromAscii("/");
+        suExecutableFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         suExecutableFileURL += EXECUTABLE_NAME;
     }
 
@@ -346,6 +362,32 @@ private:
     string_container_t exclude_list_;
 };
 
+namespace
+{
+    class starts_with
+        : public std::unary_function<const std::string&, bool>
+    {
+    private:
+        const std::string m_rString;
+    public:
+        starts_with(const char *pString) : m_rString(pString) {}
+        bool operator()(const std::string &rEntry) const
+        {
+            return rEntry.find(m_rString) == 0;
+        }
+    };
+
+    void tidy_container(string_container_t &env_container)
+    {
+        //sort them because there are no guarantees to ordering
+        std::sort(env_container.begin(), env_container.end());
+        //remove LD_PRELOAD because valgrind injects that into the
+        //parent process
+        env_container.erase(std::remove_if(env_container.begin(), env_container.end(),
+            starts_with("LD_PRELOAD=")), env_container.end());
+    }
+}
+
 #ifdef WNT
     void read_parent_environment(string_container_t* env_container)
     {
@@ -358,13 +400,14 @@ private:
             p += l + 1;
         }
         FreeEnvironmentStrings(env);
+        tidy_container(*env_container);
     }
 #else
-    extern char** environ;
     void read_parent_environment(string_container_t* env_container)
     {
         for (int i = 0; NULL != environ[i]; i++)
             env_container->push_back(std::string(environ[i]));
+        tidy_container(*env_container);
     }
 #endif
 
@@ -373,6 +416,7 @@ class Test_osl_executeProcess : public CppUnit::TestFixture
 {
     const OUString env_param_;
 
+    OUString     temp_file_url_;
     OUString     temp_file_path_;
     rtl_uString* parameters_[2];
     int          parameters_count_;
@@ -384,27 +428,31 @@ public:
     //------------------------------------------------
     // ctor
     Test_osl_executeProcess() :
-        env_param_(OUString::createFromAscii("-env")),
+        env_param_(OUString(RTL_CONSTASCII_USTRINGPARAM("-env"))),
         parameters_count_(2)
     {
         parameters_[0] = env_param_.pData;
         suCWD = getExecutablePath();
         suExecutableFileURL = suCWD;
-        suExecutableFileURL += rtl::OUString::createFromAscii("/");
+        suExecutableFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         suExecutableFileURL += EXECUTABLE_NAME;
     }
 
     //------------------------------------------------
     virtual void setUp()
     {
-        temp_file_path_ = create_temp_file();
+        temp_file_path_ = create_temp_file(temp_file_url_);
         parameters_[1]  = temp_file_path_.pData;
     }
 
+    virtual void tearDown()
+    {
+        osl::File::remove(temp_file_url_);
+    }
+
     //------------------------------------------------
-    OUString create_temp_file()
+    OUString create_temp_file(OUString &temp_file_url)
     {
-        OUString temp_file_url;
         FileBase::RC rc = FileBase::createTempFile(0, 0, &temp_file_url);
         CPPUNIT_ASSERT_MESSAGE("createTempFile failed", FileBase::E_None == rc);
 
@@ -429,17 +477,9 @@ public:
         );
 
         std::string line;
-        while (std::getline(file, line))
+        while (std::getline(file, line, '\0'))
             env_container->push_back(line);
-    }
-
-    //------------------------------------------------
-    void dump_env(const string_container_t& env, OUString file_name)
-    {
-        OString fname = OUStringToOString(file_name, osl_getThreadTextEncoding());
-        std::ofstream file(fname.getStr());
-        std::ostream_iterator<std::string> oi(file, "\n");
-        std::copy(env.begin(), env.end(), oi);
+        tidy_container(*env_container);
     }
 
     //------------------------------------------------
@@ -466,17 +506,31 @@ public:
         string_container_t parent_env;
         read_parent_environment(&parent_env);
 
+#if OSL_DEBUG_LEVEL > 1
+        for (string_container_t::const_iterator iter = parent_env.begin(), end = parent_env.end(); iter != end; ++iter)
+            std::cerr << "initially parent env: " << *iter << std::endl;
+#endif
+
         //remove the environment variables that we have changed
         //in the child environment from the read parent environment
         parent_env.erase(
             std::remove_if(parent_env.begin(), parent_env.end(), exclude(different_env_vars)),
             parent_env.end());
 
+#if OSL_DEBUG_LEVEL > 1
+        for (string_container_t::const_iterator iter = parent_env.begin(), end = parent_env.end(); iter != end; ++iter)
+            std::cerr << "stripped parent env: " << *iter << std::endl;
+#endif
+
         //read the child environment and exclude the variables that
         //are different
         string_container_t child_env;
         read_child_environment(&child_env);
 
+#if OSL_DEBUG_LEVEL > 1
+        for (string_container_t::const_iterator iter = child_env.begin(), end = child_env.end(); iter != end; ++iter)
+            std::cerr << "initial child env: " << *iter << std::endl;
+#endif
         //partition the child environment into the variables that
         //are different to the parent environment (they come first)
         //and the variables that should be equal between parent
@@ -487,9 +541,25 @@ public:
         string_container_t different_child_env_vars(child_env.begin(), iter_logical_end);
         child_env.erase(child_env.begin(), iter_logical_end);
 
+#if OSL_DEBUG_LEVEL > 1
+        for (string_container_t::const_iterator iter = child_env.begin(), end = child_env.end(); iter != end; ++iter)
+            std::cerr << "stripped child env: " << *iter << std::endl;
+#endif
+
         bool common_env_size_equals    = (parent_env.size() == child_env.size());
         bool common_env_content_equals = std::equal(child_env.begin(), child_env.end(), parent_env.begin());
 
+#if OSL_DEBUG_LEVEL > 1
+        for (string_container_t::const_iterator iter = different_env_vars.begin(), end = different_env_vars.end(); iter != end; ++iter)
+            std::cerr << "different should be: " << *iter << std::endl;
+#endif
+
+
+#if OSL_DEBUG_LEVEL > 1
+        for (string_container_t::const_iterator iter = different_child_env_vars.begin(), end = different_child_env_vars.end(); iter != end; ++iter)
+            std::cerr << "different are: " << *iter << std::endl;
+#endif
+
         bool different_env_size_equals    = (different_child_env_vars.size() == different_env_vars.size());
         bool different_env_content_equals =
             std::equal(different_env_vars.begin(), different_env_vars.end(), different_child_env_vars.begin());
@@ -535,7 +605,7 @@ public:
 
         CPPUNIT_ASSERT_MESSAGE
         (
-            "Parent an child environment not equal",
+            "Parent and child environment not equal",
             compare_environments()
         );
     }
@@ -549,10 +619,10 @@ public:
     void osl_execProc_merged_child_environment()
     {
         rtl_uString* child_env[4];
-        OUString env1 = OUString::createFromAscii(ENV1);
-        OUString env2 = OUString::createFromAscii(ENV2);
-        OUString env3 = OUString::createFromAscii(ENV3);
-        OUString env4 = OUString::createFromAscii(ENV4);
+        OUString env1(RTL_CONSTASCII_USTRINGPARAM(ENV1));
+        OUString env2(RTL_CONSTASCII_USTRINGPARAM(ENV2));
+        OUString env3(RTL_CONSTASCII_USTRINGPARAM(ENV3));
+        OUString env4(RTL_CONSTASCII_USTRINGPARAM(ENV4));
 
         child_env[0] = env1.pData;
         child_env[1] = env2.pData;
@@ -568,7 +638,7 @@ public:
             NULL,
             suCWD.pData,
             child_env,
-            sizeof(child_env)/sizeof(child_env[0]),
+            SAL_N_ELEMENTS(child_env),
             &process);
 
         CPPUNIT_ASSERT_MESSAGE
@@ -602,7 +672,11 @@ public:
     void osl_execProc_test_batch()
     {
         oslProcess process;
-        rtl::OUString suBatch = suCWD + rtl::OUString::createFromAscii("/") + rtl::OUString::createFromAscii("batch.bat");
+#if defined(WNT)
+        rtl::OUString suBatch = suCWD + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("batch.bat"));
+#else
+        rtl::OUString suBatch = suCWD + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("batch.sh"));
+#endif
         oslProcessError osl_error = osl_executeProcess(
             suBatch.pData,
             NULL,
@@ -668,17 +742,23 @@ public:
     }
 
     CPPUNIT_TEST_SUITE(Test_osl_executeProcess);
+    //TODO: Repair these under windows.
+#ifndef WNT
     CPPUNIT_TEST(osl_execProc_parent_equals_child_environment);
     CPPUNIT_TEST(osl_execProc_merged_child_environment);
-    CPPUNIT_TEST(osl_execProc_test_batch);
-    CPPUNIT_TEST(osl_execProc_exe_name_in_argument_list);
+#endif
+    ///TODO: Repair makefile to get the batch.sh, batch.bat copied to $(BIN) for test execution
+    // CPPUNIT_TEST(osl_execProc_test_batch);
+    ///TODO: Repair test (or tested function ;-) - test fails.
+    // CPPUNIT_TEST(osl_execProc_exe_name_in_argument_list);
     CPPUNIT_TEST_SUITE_END();
 };
 
 //#####################################
 // register test suites
 //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_osl_joinProcess,    "Test_osl_joinProcess");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_osl_executeProcess, "Test_osl_executeProcess");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test_osl_executeProcess);
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/process/osl_process_child.cxx b/sal/qa/osl/process/osl_process_child.cxx
index 8d488ad7c403..91addf9c1659 100644
--- a/sal/qa/osl/process/osl_process_child.cxx
+++ b/sal/qa/osl/process/osl_process_child.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,13 +33,11 @@
 // includes
 
 #if ( defined WNT )                     // Windows
-#include <tools/prewin.h>
 #   define UNICODE
 #   define _UNICODE
 #   define WIN32_LEAN_AND_MEAN
-// #    include <windows.h>
+#   include <windows.h>
 #   include <tchar.h>
-#include <tools/postwin.h>
 #else
 #   include <unistd.h>
 #endif
@@ -47,9 +46,19 @@
 #include <stdlib.h>
 #include <iostream>
 #include <fstream>
+#include <string.h>
 
 #include <rtl/ustring.hxx>
 
+#ifdef UNX
+#if defined( MACOSX )
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
+# else
+    extern char** environ;
+# endif
+#endif
+
 //########################################
 // defines
 
@@ -87,45 +96,32 @@ void w_to_a(LPCTSTR _strW, LPSTR strA, DWORD size)
         while (size_t l = _tcslen(reinterpret_cast<wchar_t*>(p)))
         {
             w_to_a(p, buffer, sizeof(buffer));
-            file << buffer << std::endl;
+            file << buffer << '\0';
             p += l + 1;
         }
         FreeEnvironmentStrings(env);
     }
 #else
-    extern char** environ;
-
     void dump_env(char* file_path)
     {
         std::ofstream file(file_path);
-        for (int i = 0; NULL != environ[i]; i++)
-            file << environ[i] << std::endl;
+        for (int i = 0; NULL != environ[i]; ++i)
+            file << environ[i] << '\0';
     }
 #endif
 
 //########################################
 int main(int argc, char* argv[])
 {
-    rtl::OUString s;
-
-    //t_print("Parameter: ");
-    printf("child process Parameter: ");
-    for (int i = 1; i < argc; i++)
-        printf("%s ", argv[i]);
-    printf("\n");
-
     if (argc > 2)
     {
         if (0 == strcmp("-join", argv[1]))
-        {
             wait_for_seconds(argv[2]);
-        }
         else if (0 == strcmp("-env", argv[1]))
-        {
             dump_env(argv[2]);
-        }
     }
 
-    return (0);
+    return 0;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/profile/makefile.mk b/sal/qa/osl/profile/makefile.mk
deleted file mode 100644
index 67ad60057c07..000000000000
--- a/sal/qa/osl/profile/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ=..$/..$/..
-
-PRJNAME=sal
-TARGET=qa_osl_profile
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# BEGIN ----------------------------------------------------------------
-SHL1OBJS=  \
-    $(SLO)$/osl_old_testprofile.obj
-
-SHL1TARGET= osl_old_testprofile
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-SHL1RPATH = NONE
-# END ------------------------------------------------------------------
-
-
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-SLOFILES=\
-    $(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
-.END
diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx
index 966a453dc79f..f2695a3084c1 100644
--- a/sal/qa/osl/profile/osl_old_testprofile.cxx
+++ b/sal/qa/osl/profile/osl_old_testprofile.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,9 +26,6 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-
 // LLA:
 // this file is converted to use with testshl2
 // original was placed in sal/test/textenc.cxx
@@ -36,11 +34,8 @@
 // -----------------------------------------------------------------------------
 #include <stdio.h>
 #include <osl/profile.h>
+#include <sal/cppunit.h>
 
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
 
 //==================================================================================================
 // -----------------------------------------------------------------------------
@@ -97,3 +92,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION( osl_Profile::oldtests );
 
 // -----------------------------------------------------------------------------
 CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/security/makefile.mk b/sal/qa/osl/security/makefile.mk
index c371bbf4610d..e6fbed4ab7a6 100755
--- a/sal/qa/osl/security/makefile.mk
+++ b/sal/qa/osl/security/makefile.mk
@@ -36,6 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
@@ -45,7 +47,7 @@ SHL1OBJS=  \
     $(SLO)$/osl_Security.obj
 
 SHL1TARGET= osl_Security
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 .IF "$(GUI)" == "WNT"
 SHL1STDLIBS+= $(ADVAPI32LIB)
 .ENDIF
@@ -58,7 +60,9 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # auto generated Target:Security
 # END ------------------------------------------------------------------
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index cc125eefada2..063ddf2b2591 100755..100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,6 +32,9 @@
 //------------------------------------------------------------------------
 // header file
 //------------------------------------------------------------------------
+#ifdef WNT
+#include <windows.h>
+#endif
 #include <osl_Security_Const.h>
 
 using namespace osl;
@@ -193,30 +197,6 @@ namespace osl_Security
     }; // class getUserName
 
 
-
-    /** testing the method:
-        inline sal_Bool SAL_CALL getHomeDir( ::rtl::OUString& strDirectory) const;
-    */
-    class getHomeDir : public CppUnit::TestFixture
-    {
-    public:
-        sal_Bool bRes, bRes1;
-
-        void getHomeDir_001( )
-        {
-            ::osl::Security aSec;
-            ::rtl::OUString strHome;
-            bRes = aSec.getHomeDir( strHome );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: getHomeDir and compare it with the info we get at the beginning.",
-                                     ( sal_True == strHomeDirectory.equals( strHome ) ) && ( sal_True == bRes ) );
-        }
-
-        CPPUNIT_TEST_SUITE( getHomeDir );
-        CPPUNIT_TEST( getHomeDir_001 );
-        CPPUNIT_TEST_SUITE_END( );
-    }; // class getHomeDir
-
     /** testing the method:
         inline sal_Bool Security::getConfigDir( rtl::OUString& strDirectory ) const
     */
@@ -231,8 +211,8 @@ namespace osl_Security
             ::rtl::OUString strConfig;
             bRes = aSec.getConfigDir( strConfig );
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: getHomeDir and compare it with the info we get at the beginning.",
-                                     ( sal_True == strConfigDirectory.equals( strConfig ) ) && ( sal_True == bRes ) );
+            CPPUNIT_ASSERT_MESSAGE( "failed to find a ConfigDir!",
+                                     ( sal_True == bRes ));
         }
 
         CPPUNIT_TEST_SUITE( getConfigDir );
@@ -333,33 +313,37 @@ namespace osl_Security
     }; // class loginUserOnFileServer
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::ctors, "osl_Security");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::logonUser, "osl_Security");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::getUserIdent, "osl_Security");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::getUserName, "osl_Security");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::getHomeDir, "osl_Security");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::getConfigDir, "osl_Security");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::isAdministrator, "osl_Security");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::getHandle, "osl_Security");
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::UserProfile, "osl_Security");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::loginUserOnFileServer, "osl_Security");
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::ctors);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::logonUser);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserIdent);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserName);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getConfigDir);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::isAdministrator);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHandle);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::UserProfile);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::loginUserOnFileServer);
 
 // -----------------------------------------------------------------------------
 
 } // namespace osl_Security
 
 
-// -----------------------------------------------------------------------------
+/* This defines an own TestPlugIn implementation with an own initialize()
+    method that will be called after loading the PlugIn
+    */
+#include <cppunit/plugin/TestPlugInDefaultImpl.h>
 
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
+class MyTestPlugInImpl: public CPPUNIT_NS::TestPlugInDefaultImpl
+{
+    public:
+    MyTestPlugInImpl() {};
+    void initialize( CPPUNIT_NS::TestFactoryRegistry *registry,
+                   const CPPUNIT_NS::PlugInParameters &parameters );
+};
 
-/** to do some initialized work, we replace the NOADDITIONAL macro with the initialize work which
-      get current user name, .
-*/
 
-void RegisterAdditionalFunctions(FktRegFuncPtr)
+void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
+                   const CPPUNIT_NS::PlugInParameters & parameters)
 {
     /// start message
     t_print("#Initializing ...\n" );
@@ -370,7 +354,7 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
     t_print("#if no text forwarded, this function will be skipped.\n" );
 
     /// get system information
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
     /// some initialization work for UNIX OS
 
 
@@ -384,8 +368,11 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
     strUserName = ::rtl::OUString::createFromAscii( pw->pw_name );
 
     /// get home directory;
+    char *pw_dir = pw->pw_dir;
+    if( getenv( "FAKEROOTKEY" ) )
+        pw_dir = getenv("HOME");
     CPPUNIT_ASSERT_MESSAGE( "#Convert from system path to URL failed.",
-                            ::osl::File::E_None == ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( pw->pw_dir ), strHomeDirectory ) );
+                            ::osl::File::E_None == ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( pw_dir ), strHomeDirectory ) );
 
     /// get config directory;
     strConfigDirectory = strHomeDirectory.copy(0);
@@ -454,7 +441,7 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
     LPCWSTR wszAccName = ( LPWSTR ) strUserName.getStr( );
 
     // Create buffers for the SID and the domain name.
-    PSID pSid = (PSID) new WIN_BYTE[dwSidBufferSize];
+    PSID pSid = (PSID) new BYTE[dwSidBufferSize];
     CPPUNIT_ASSERT_MESSAGE("# creating SID buffer failed.\n", pSid!= NULL );
     memset( pSid, 0, dwSidBufferSize);
 
@@ -492,7 +479,7 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
                 // Reallocate memory for the SID buffer.
                 wprintf(L"# The SID buffer was too small. It will be reallocated.\n");
                 FreeSid( pSid);
-                pSid = (PSID) new WIN_BYTE[cbSid];
+                pSid = (PSID) new BYTE[cbSid];
                 CPPUNIT_ASSERT_MESSAGE("# re-creating SID buffer failed.\n",  pSid!= NULL );
                 memset( pSid, 0, cbSid);
                 dwSidBufferSize = cbSid;
@@ -540,21 +527,21 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
     {
         dwSidSize+=wsprintf(Ident + strlen(Ident),
                     TEXT("0x%02hx%02hx%02hx%02hx%02hx%02hx"),
-                    (USHORT)psia->Value[0],
-                    (USHORT)psia->Value[1],
-                    (USHORT)psia->Value[2],
-                    (USHORT)psia->Value[3],
-                    (USHORT)psia->Value[4],
-                    (USHORT)psia->Value[5]);
+                    (sal_uInt16)psia->Value[0],
+                    (sal_uInt16)psia->Value[1],
+                    (sal_uInt16)psia->Value[2],
+                    (sal_uInt16)psia->Value[3],
+                    (sal_uInt16)psia->Value[4],
+                    (sal_uInt16)psia->Value[5]);
     }
     else
     {
         dwSidSize+=wsprintf(Ident + strlen(Ident),
                     TEXT("%lu"),
-                    (ULONG)(psia->Value[5]      )   +
-                    (ULONG)(psia->Value[4] <<  8)   +
-                    (ULONG)(psia->Value[3] << 16)   +
-                    (ULONG)(psia->Value[2] << 24)   );
+                    (sal_uInt32)(psia->Value[5]      )   +
+                    (sal_uInt32)(psia->Value[4] <<  8)   +
+                    (sal_uInt32)(psia->Value[3] << 16)   +
+                    (sal_uInt32)(psia->Value[2] << 24)   );
     }
 
     /* loop through SidSubAuthorities */
@@ -573,7 +560,7 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
 
     /// check if logged in user is administrator:
 
-    WIN_BOOL b;
+    BOOL b;
     SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY;
     PSID AdministratorsGroup;
     b = AllocateAndInitializeSid(
@@ -601,43 +588,42 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
 
     t_print("Computer Name:              ");
     if ( strComputerName == aNullURL )
-        t_print(" Not retrived\n" );
+        t_print("Not retrived\n" );
     else
         printUString( strComputerName );
 
     t_print("Current User Name:          ");
     if ( strUserName == aNullURL )
-        t_print(" Not retrived\n" );
+        t_print("Not retrived\n" );
     else
         printUString( strUserName );
 
     t_print("Current User Home Directory:");
     if ( strHomeDirectory == aNullURL )
-        t_print(" Not retrived\n" );
+        t_print("Not retrived\n" );
     else
         printUString( strHomeDirectory );
 
     t_print("Current Config Directory:   ");
     if ( strConfigDirectory == aNullURL )
-        t_print(" Not retrived\n" );
+        t_print("Not retrived\n" );
     else
         printUString( strConfigDirectory );
 
     t_print("Current UserID:             ");
     if ( strUserID == aNullURL )
-        t_print(" Not retrived\n" );
+        t_print("Not retrived\n" );
     else
         printUString( strUserID );
 
-    t_print("Current User is");
+    t_print("Current User is:            ");
     if ( isAdmin == sal_False )
-        t_print(" NOT Administrator.\n" );
+        t_print("NOT Administrator.\n" );
     else
-        t_print(" Administrator.\n" );
-
+        t_print("Administrator.\n" );
 
     /// get and display forwarded text if available.
-    aStringForward = ::rtl::OUString::createFromAscii( getForwardString() );
+    aStringForward = ::rtl::OUString::createFromAscii( parameters.getCommandLine().c_str() );
     if ( !aStringForward.equals( aNullURL ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 )
     {
         sal_Int32 nFirstSpacePoint = aStringForward.indexOf( (sal_Unicode)' ' );;
@@ -651,7 +637,8 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
 
             aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1, aStringForward.getLength( ) - 1 );
             t_print("#Forwarded password: ");
-            for ( int i = nFirstSpacePoint +1; i <= aStringForward.getLength( ) - 1; i++, t_print("*") );
+            for (int i = nFirstSpacePoint+1; i <= aStringForward.getLength()-1; ++i)
+                t_print("*");
             t_print("\n" );
         }
         else
@@ -663,7 +650,8 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
 
             aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1, nLastSpacePoint );
             t_print("#Forwarded password: ");
-            for ( int i = nFirstSpacePoint +1; i <= nLastSpacePoint; i++, t_print("*") );
+            for (int i = nFirstSpacePoint+1; i <= nLastSpacePoint; ++i)
+                t_print("*");
             t_print("\n" );
 
             aFileServer = aStringForward.copy( nLastSpacePoint +1, aStringForward.getLength( ) - 1 );
@@ -676,3 +664,14 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
     t_print("#\n#Initialization Done.\n" );
 
 }
+
+/* Instantiate and register the own TestPlugIn and instantiate the default
+    main() function.
+    (This is done by CPPUNIT_PLUGIN_IMPLEMENT() for TestPlugInDefaultImpl)
+    */
+
+CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( MyTestPlugInImpl );
+CPPUNIT_PLUGIN_IMPLEMENT_MAIN();
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index 0687a69345de..74e068e2595d 100755..100644
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,22 +26,13 @@
  *
  ************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _OSL_SECURITY_CONST_H_
 #define _OSL_SECURITY_CONST_H_
 
 #if ( defined WNT )                     // Windows
-//#define UNICODE
-#include <tools/prewin.h>
-// #include <windows.h>
 #include <io.h>
-#include <tools/postwin.h>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <osl/file.hxx>
@@ -49,14 +41,17 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX )
 #include <unistd.h>
 #include <pwd.h>
 #endif
 
-#include <testshl/simpleheader.hxx>
-// LLA: #include <testshl2/cmdlinebits.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/plugin/TestPlugInDefaultImpl.h>
 
+#define t_print printf
 
 #define BUFSIZE 1024
 const char pTestString[17] = "Sun Microsystems";
@@ -78,3 +73,5 @@ OSLTEST_DECLARE_USTRING( NullURL,  "" );
 sal_Bool isAdmin = sal_False;
 
 #endif /* _OSL_SECURITY_CONST_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/setthreadname/test-setthreadname.cxx b/sal/qa/osl/setthreadname/test-setthreadname.cxx
index 0f0f618395a8..b969ad511913 100755..100644
--- a/sal/qa/osl/setthreadname/test-setthreadname.cxx
+++ b/sal/qa/osl/setthreadname/test-setthreadname.cxx
@@ -25,18 +25,14 @@
 *
 ************************************************************************/
 
-#include "precompiled_sal.hxx"
 #include "sal/config.h"
+#include <sal/cppunit.h>
 
 #include <cstdlib>
 #include <iostream>
 #include <limits>
 
 #include "boost/noncopyable.hpp"
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
 #include "osl/thread.hxx"
 
 namespace {
diff --git a/sal/qa/osl/socket/makefile.mk b/sal/qa/osl/socket/makefile.mk
index bd92b5f40f3a..cdc268a2402a 100755
--- a/sal/qa/osl/socket/makefile.mk
+++ b/sal/qa/osl/socket/makefile.mk
@@ -45,7 +45,7 @@ SHL1OBJS=  \
     $(SLO)$/osl_Socket.obj
 
 SHL1TARGET=osl_SocketOld
-SHL1STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 .IF "$(GUI)" == "WNT"
 SHL1STDLIBS+= $(WS2_32LIB)
@@ -67,7 +67,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 SHL2OBJS=  \
     $(SLO)$/osl_Socket_tests.obj
 SHL2TARGET= osl_Socket_tests
-SHL2STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME=    $(SHL2TARGET)
@@ -82,7 +82,7 @@ SHL3OBJS=  \
     $(SLO)$/osl_StreamSocket.obj
 
 SHL3TARGET= osl_StreamSocket
-SHL3STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
+SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 .IF "$(GUI)" == "WNT"
 SHL3STDLIBS += $(WS2_32LIB)
@@ -105,7 +105,7 @@ SHL4OBJS=  \
     $(SLO)$/osl_DatagramSocket.obj
 
 SHL4TARGET= osl_DatagramSocket
-SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 .IF "$(GUI)" == "WNT"
 SHL4STDLIBS += $(WS2_32LIB)
@@ -128,7 +128,7 @@ SHL5OBJS=  \
     $(SLO)$/osl_SocketAddr.obj
 
 SHL5TARGET= osl_SocketAddr
-SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 .IF "$(GUI)" == "WNT"
 SHL5STDLIBS += $(WS2_32LIB)
@@ -151,7 +151,7 @@ SHL6OBJS=  \
     $(SLO)$/osl_Socket2.obj
 
 SHL6TARGET= osl_Socket2
-SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 .IF "$(GUI)" == "WNT"
 SHL6STDLIBS += $(WS2_32LIB)
@@ -174,7 +174,7 @@ SHL7OBJS=  \
     $(SLO)$/osl_ConnectorSocket.obj
 
 SHL7TARGET= osl_ConnectorSocket
-SHL7STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL7STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 .IF "$(GUI)" == "WNT"
 SHL7STDLIBS += $(WS2_32LIB)
@@ -197,7 +197,7 @@ SHL8OBJS=  \
     $(SLO)$/osl_AcceptorSocket.obj
 
 SHL8TARGET= osl_AcceptorSocket
-SHL8STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL8STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 .IF "$(GUI)" == "WNT"
 SHL8STDLIBS += $(WS2_32LIB)
@@ -220,4 +220,4 @@ SHL8VERSIONMAP = $(PRJ)$/qa$/export.map
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
index e98af5f9d3b0..a648e475a725 100644
--- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx
+++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,13 +59,15 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
 #include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
 
 using namespace osl;
-using namespace rtl;
+using ::rtl::OUString;
 
 #define IP_PORT_FTP     21
 #define IP_PORT_MYPORT9 8897
@@ -157,47 +160,6 @@ namespace osl_AcceptorSocket
 
     }; // class ctors
 
-#if 0  /* OBSOLETE */
-    class operator_assign : public CppUnit::TestFixture
-    {
-    public:
-
-        void assign_001()
-        {
-#if defined(LINUX)
-            ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-            ::osl::AcceptorSocket asSocketAssign( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-            asSocket.setOption( osl_Socket_OptionReuseAddr, 1);
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT4 );
-            asSocket.bind( saSocketAddr );
-
-            AcceptorThread myAcceptorThread( asSocketAssign, rtl::OUString::createFromAscii("127.0.0.1") );
-            myAcceptorThread.create();
-
-            thread_sleep( 1 );
-            //when accepting, assign another socket to the socket, the thread will not be closed, so is blocking
-            asSocketAssign = asSocket;
-
-            t_print("#asSocketAssign port number is %d\n", asSocketAssign.getLocalPort() );
-
-            asSocketAssign.shutdown();
-            myAcceptorThread.join();
-
-            CPPUNIT_ASSERT_MESSAGE( "test for close when is accepting: the socket will quit accepting status.",
-                                myAcceptorThread.isOK() == sal_True );
-
-
-#endif /* LINUX */
-        }
-
-
-        CPPUNIT_TEST_SUITE( operator_assign  );
-        CPPUNIT_TEST( assign_001 );
-        CPPUNIT_TEST_SUITE_END();
-
-    }; // class operator_assign
-#endif /* OBSOLETE */
-
     /** testing the method:
         inline sal_Bool SAL_CALL listen(sal_Int32 MaxPendingConnections= -1);
         inline oslSocketResult SAL_CALL acceptConnection( StreamSocket& Connection);
@@ -233,8 +195,8 @@ namespace osl_AcceptorSocket
 
         void listen_accept_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
             ::osl::StreamSocket ssConnection;
 
             /// launch server socket
@@ -255,9 +217,9 @@ namespace osl_AcceptorSocket
 
         void listen_accept_002()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT4 );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT4 );
-            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT4 );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT4 );
+            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
             ::osl::StreamSocket ssConnection;
 
             /// launch server socket
@@ -289,9 +251,9 @@ namespace osl_AcceptorSocket
 
 // -----------------------------------------------------------------------------
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::ctors, "osl_AcceptorSocket");
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_AcceptorSocket::ctors);
 //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::operator_assign, "osl_AcceptorSocket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::listen_accept, "osl_AcceptorSocket");
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_AcceptorSocket::listen_accept);
 
 } // namespace osl_AcceptorSocket
 
@@ -299,4 +261,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::listen_accept, "osl_Ac
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
index 4a5273e5a0e8..bf47ea327928 100644
--- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx
+++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,13 +59,15 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
 #include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
 
 using namespace osl;
-using namespace rtl;
+using ::rtl::OUString;
 
 #define IP_PORT_MYPORT2 8883
 #define IP_PORT_FTP     21
@@ -157,9 +160,9 @@ namespace osl_ConnectorSocket
 
         void connect_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT2 );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT2 );
-            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT2 );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT2 );
+            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
             ::osl::StreamSocket ssConnection;
 
             /// launch server socket
@@ -186,9 +189,9 @@ namespace osl_ConnectorSocket
         //non-blocking mode connect?
         void connect_002()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 );
-            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
 
             asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
             asAcceptorSocket.enableNonBlockingMode( sal_True );
@@ -212,8 +215,8 @@ namespace osl_ConnectorSocket
         // how to design senarios that will return osl_Socket_Interrupted, osl_Socket_TimedOut
         void connect_003()
         {
-            ::osl::SocketAddr saTargetSocketAddr1( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 );
-            ::osl::SocketAddr saTargetSocketAddr2( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saTargetSocketAddr1( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saTargetSocketAddr2( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT3 );
 
             csConnectorSocket.enableNonBlockingMode( sal_False );
 
@@ -230,7 +233,7 @@ namespace osl_ConnectorSocket
         // really an error in non-blocking mode
         void connect_004()
         {
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT3 );
 
             csConnectorSocket.enableNonBlockingMode( sal_True );
 
@@ -252,8 +255,8 @@ namespace osl_ConnectorSocket
 
 // -----------------------------------------------------------------------------
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::ctors, "osl_ConnectorSocket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::connect, "osl_ConnectorSocket");
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_ConnectorSocket::ctors);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_ConnectorSocket::connect);
 
 } // namespace osl_ConnectorSocket
 
@@ -261,4 +264,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::connect, "osl_Connect
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx
index 9a60bb8249b3..111c690439fe 100644
--- a/sal/qa/osl/socket/osl_DatagramSocket.cxx
+++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,17 +55,15 @@
     inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const;
  */
 
-//------------------------------------------------------------------------
-// include files
-//------------------------------------------------------------------------
-
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
-//#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
 
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 #define IP_PORT_MYPORT9  8897
 #define IP_PORT_MYPORT10 8898
@@ -153,7 +152,7 @@ protected:
 
 public:
     TalkerThread( ):
-        saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 )
+        saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 )
     {
     }
 
@@ -174,7 +173,7 @@ protected:
 
     void SAL_CALL run( )
     {
-        ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 );
+        ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
         dsSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
         if ( dsSocket.bind( saLocalSocketAddr ) == sal_False )
         {
@@ -182,8 +181,11 @@ protected:
             return;
         }
         //blocking mode: default
-        sal_Int32 nRecv = dsSocket.recvFrom( pRecvBuffer, 30, &saTargetSocketAddr); //strlen( pTestString2 ) + 1
-        t_print("After recvFrom, nRecv is %d\n", nRecv);
+#if !SILENT_TEST
+        sal_Int32 nRecv =
+#endif
+            dsSocket.recvFrom( pRecvBuffer, 30, &saTargetSocketAddr); //strlen( pTestString2 ) + 1
+        t_print("After recvFrom, nRecv is %d\n", (int) nRecv);
     }
 
     void SAL_CALL onTerminated( )
@@ -193,7 +195,7 @@ protected:
 public:
     sal_Char pRecvBuffer[30];
     ListenerThread( ):
-        saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 )
+        saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 )
     {
         pRecvBuffer[0] = '\0';
     }
@@ -219,7 +221,7 @@ public:
 
         void sr_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 );
             ::osl::DatagramSocket dsSocket;
             dsSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
             dsSocket.bind( saLocalSocketAddr );
@@ -239,7 +241,7 @@ public:
 
         void sr_002()
         {
-            ::osl::SocketAddr saListenSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 );
+            ::osl::SocketAddr saListenSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
             ::osl::DatagramSocket dsSocket;
 
             //listener thread construct a DatagramSocket, recvFrom waiting for data, then main thread sendto data
@@ -264,7 +266,7 @@ public:
         //sendTo error, return -1; recvFrom error, return -1
         void sr_003()
         {
-            ::osl::SocketAddr saListenSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT10 );
+            ::osl::SocketAddr saListenSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT10 );
             ::osl::DatagramSocket dsSocket;
             // Transport endpoint is not connected
             sal_Int32 nSend = dsSocket.sendTo( saListenSocketAddr, pTestString2, strlen( pTestString2 ) + 1 );
@@ -274,8 +276,8 @@ public:
 
         void sr_004()
         {
-            ::osl::SocketAddr saListenSocketAddr1( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT10 );
-            ::osl::SocketAddr saListenSocketAddr2( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_MYPORT10 );
+            ::osl::SocketAddr saListenSocketAddr1( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT10 );
+            ::osl::SocketAddr saListenSocketAddr2( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_MYPORT10 );
             ::osl::DatagramSocket dsSocket;
 
             dsSocket.enableNonBlockingMode( sal_True );
@@ -304,8 +306,8 @@ public:
 
 // -----------------------------------------------------------------------------
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DatagramSocket::ctors, "osl_DatagramSocket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom, "osl_DatagramSocket");
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::ctors);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom);
 
 } // namespace osl_DatagramSocket
 
@@ -313,4 +315,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom, "osl_
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index 4a981bc7faa9..f16dc16782ef 100755..100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,14 +60,35 @@
 // include files
 //------------------------------------------------------------------------
 
-#ifndef _OSL_SOCKET_CONST_H_
 #include <osl_Socket_Const_orig.h>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+/** test output if SILENT_TEST is 0
+*/
+#if OSL_DEBUG_LEVEL > 0
+#   define SILENT_TEST 0
+#else
+#   define SILENT_TEST 1
 #endif
 
-#include <testshl/simpleheader.hxx>
+#if SILENT_TEST
+#   define t_print(...) { }
+#else
+#   define t_print printf
+#endif
+
+/** convert UString and OUString to std::string
+*/
+#define STD_STRING(s) (std::string((const char *)s.getStr()))
 
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 
 //------------------------------------------------------------------------
 // helper functions
@@ -109,8 +131,13 @@ inline char * oustring2char( const ::rtl::OUString & str )
 */
 inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = "" )
 {
+#if SILENT_TEST
+    (void)str;
+    (void)msg;
+#else
     t_print("#%s #printUString_u# ", msg );
     t_print("%s\n", oustring2char( str ) );
+#endif
 }
 
 /** get the local host name.
@@ -185,7 +212,7 @@ inline ::rtl::OUString getLocalIP( )
     char hostname[255];
     gethostname(hostname, 255);
 
-        return getIPbyName( hostname );
+    return getIPbyName( hostname );
 }
 
 /** construct error message
@@ -196,11 +223,11 @@ inline ::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::r
     if ( returnVal.equals( rightVal ) )
         return aUString;
     aUString += ::rtl::OUString::createFromAscii(msg);
-    aUString += ::rtl::OUString::createFromAscii(": the returned value is '");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": the returned value is '"));
     aUString += returnVal;
-    aUString += ::rtl::OUString::createFromAscii("', but the value should be '");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '"));
     aUString += rightVal;
-    aUString += ::rtl::OUString::createFromAscii("'.");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
     return aUString;
 }
 
@@ -209,13 +236,13 @@ inline ::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::r
 void thread_sleep( sal_Int32 _nSec )
 {
     /// print statement in thread process must use fflush() to force display.
-    t_print("# wait %d seconds. ", _nSec );
+    t_print("# wait %d seconds. ", (int) _nSec );
     fflush(stdout);
 
 #ifdef WNT                               //Windows
     Sleep( _nSec * 100 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )   //Unix
+#if ( defined UNX )             //Unix
     usleep(_nSec * 100000);
 #endif
     t_print("# done\n" );
@@ -225,15 +252,23 @@ void thread_sleep( sal_Int32 _nSec )
 */
 inline void printBool( sal_Bool bOk )
 {
+#if SILENT_TEST
+    (void)bOk;
+#else
     t_print("#printBool# " );
-    ( sal_True == bOk ) ? t_print("YES!\n" ): t_print("NO!\n" );
+    t_print ("%s", (sal_True == bOk) ? "YES!\n" : "NO!\n");
+#endif
 }
 
 /** print content of a ByteSequence.
 */
 inline void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int32 nLen )
 {
-     t_print("#ByteSequence is: " );
+#if SILENT_TEST
+    (void)bsByteSeq;
+    (void)nLen;
+#else
+    t_print("#ByteSequence is: " );
     for ( int i = 0; i < nLen; i++ ){
         if ( bsByteSeq[i] < 0 )
             t_print("%d ",  256 + bsByteSeq[i] );
@@ -241,6 +276,7 @@ inline void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int
             t_print("%d ",  bsByteSeq[i] );
     }
     t_print(" .\n" );
+#endif
 }
 
 /** convert an IP which is stored as a UString format to a ByteSequence array for later use.
@@ -745,13 +781,13 @@ namespace osl_SocketAddr
 
             sal_Bool bOk = compareUString(suHost, suHost2);
 
-            rtl::OUString suError = rtl::OUString::createFromAscii("Host names should be the same. From SocketAddr.getLocalHostname() it is'");
+            rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("Host names should be the same. From SocketAddr.getLocalHostname() it is'"));
             suError += suHost;
-            suError += rtl::OUString::createFromAscii("', from getThisHostname() it is '");
+            suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', from getThisHostname() it is '"));
             suError += suHost2;
-            suError += rtl::OUString::createFromAscii("'.");
+            suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
 
-            CPPUNIT_ASSERT_MESSAGE(suError, sal_True == bOk);
+            CPPUNIT_ASSERT_MESSAGE(STD_STRING(suError), sal_True == bOk);
         }
 
         void ctors_copy()
@@ -768,16 +804,7 @@ namespace osl_SocketAddr
 
         void ctors_copy_no_001()
         {
-#if 0
-            ::osl::SocketAddr saSocketAddr( aHostName1, IP_PORT_HTTP1 );
-            oslSocketAddr psaOSLSocketAddr = saSocketAddr.getHandle( );
 
-            ::osl::SocketAddr saSocketAddrCopy( psaOSLSocketAddr, SAL_NO_COPY );
-            saSocketAddrCopy.setPort( IP_PORT_HTTP2 );
-
-            CPPUNIT_ASSERT_MESSAGE("test for SocketAddr no copy constructor function: do a no copy constructor on a given SocketAddr instance, modify the new instance's port, check the original one.",
-                                    saSocketAddr.getPort( ) == IP_PORT_HTTP2 );
-#endif
             ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( aHostName1, IP_PORT_HTTP1 );
             CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
 
@@ -939,14 +966,14 @@ namespace osl_SocketAddr
                 if ( compareUString( getIPbyName( oustring2char( suResult ) ), aHostIp4 ) == sal_True )
                     bOK = sal_True;
             }
-            CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK);
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK);
         }
 
 // LLA: now we have to control, if this behaviour is right.
 // LLA: this function does not work in company (Linux, Windows) but at home
         void getHostname_002()
         {
-            rtl::OUString suHostname = rtl::OUString::createFromAscii("cn-1.germany.sun.com");
+            rtl::OUString suHostname (RTL_CONSTASCII_USTRINGPARAM("cn-1.germany.sun.com"));
             rtl::OUString aHostIP    = getIPbyName( oustring2char( suHostname ) );
 
             ::osl::SocketAddr saSocketAddr( aHostName1, IP_PORT_FTP );
@@ -967,7 +994,7 @@ namespace osl_SocketAddr
                 }
             }
 
-            CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK );
         }
 
 
@@ -1355,7 +1382,7 @@ namespace osl_SocketAddr
             // LLA: IMHO localhost, or hostname by itself should be ok.
             rtl::OUString suThisHost = getThisHostname( );
             bool bOk = false;
-            if (suThisHost.equals(rtl::OUString::createFromAscii("localhost")))
+            if (suThisHost.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost"))))
             {
                 bOk = true;
             }
@@ -1370,7 +1397,7 @@ namespace osl_SocketAddr
             ::rtl::OUString suError;
             suError = outputError(suResult, getThisHostname( ), "test for getLocalHostname() function");
 
-            CPPUNIT_ASSERT_MESSAGE( suError, bOk == true );
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), bOk == true );
         }
 
         CPPUNIT_TEST_SUITE( getLocalHostname );
@@ -1412,7 +1439,7 @@ namespace osl_SocketAddr
     /** testing the method:
         static inline sal_Int32 SAL_CALL getServicePort(
             const ::rtl::OUString& strServiceName,
-            const ::rtl::OUString & strProtocolName= ::rtl::OUString::createFromAscii( "tcp" ) );
+            const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) );
     */
 
     class gettheServicePort : public CppUnit::TestFixture
@@ -1440,7 +1467,7 @@ namespace osl_SocketAddr
         void gettheServicePort_004()
         {
             CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get a service port which is not exist.",
-                                      OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString::createFromAscii( "notexist" ), aProtocolUDP ) );
+                                      OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notexist")), aProtocolUDP ) );
         }
 
         CPPUNIT_TEST_SUITE( gettheServicePort );
@@ -1515,7 +1542,7 @@ namespace osl_Socket
             /// Socket constructor.
             // ::osl::Socket sSocket;
 
-            CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occured",
+            CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occurred",
                                     1 == 1 );
         }
 
@@ -1782,8 +1809,8 @@ namespace osl_Socket
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
-            CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
 
             sSocket.getLocalAddr( saLocalSocketAddr );
 
@@ -1830,8 +1857,8 @@ namespace osl_Socket
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
-            CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
             sal_Bool bOK = ( IP_PORT_MYPORT7 == sSocket.getLocalPort( )  );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getLocalPort function: first create a new socket, then a socket address, bind them, and check the port.",
@@ -1861,9 +1888,9 @@ namespace osl_Socket
             (void)bOK;
 #else
             //on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii( "on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case");
+            ::rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case"));
 #endif
-            CPPUNIT_ASSERT_MESSAGE( suError, sal_False );
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_False );
 
         }
 
@@ -1875,14 +1902,14 @@ namespace osl_Socket
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
-            CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
             ::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )),
-                ::rtl::OUString::createFromAscii("34463"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("34463")),
                 "test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned");
             sal_Bool bOK = ( sSocket.getLocalPort( ) >= 1 &&  sSocket.getLocalPort( ) <= 65535);
 
-            CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK );
         }
 
         CPPUNIT_TEST_SUITE( getLocalPort );
@@ -1927,8 +1954,8 @@ namespace osl_Socket
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
-            CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
             sal_Bool bOK;
             ::rtl::OUString suError;
 #ifdef WNT
@@ -1943,7 +1970,7 @@ namespace osl_Socket
             bOK = bRes1 || bRes2;
             suError = outputError(sSocket.getLocalHost( ), aUString, "test for getLocalHost function: create localhost socket and check name");
 #endif
-            CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK );
         }
 
         void getLocalHost_002()
@@ -1958,7 +1985,7 @@ namespace osl_Socket
             sal_Bool bOK = compareUString( sSocket.getLocalHost( ), aNullURL ) ;
             ::rtl::OUString suError = outputError(sSocket.getLocalHost( ), aNullURL, "test for getLocalHost function: getLocalHost with invalid SocketAddr");
 
-            CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK );
         }
 
         CPPUNIT_TEST_SUITE( getLocalHost );
@@ -2443,7 +2470,7 @@ namespace osl_Socket
             // on Linux, the value of option is 1, on Solaris, it's 16, but it's not important the exact value,
             // just judge it is zero or not!
             sal_Bool bOK = ( 0  !=  *pGetBuffer );
-            t_print("#setOption_001: getOption is %d \n", *pGetBuffer);
+            t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer);
 
             // toggle check, set to 0
             *pbDontRouteSet = 0;
@@ -2455,7 +2482,7 @@ namespace osl_Socket
 
             sal_Bool bOK2 = ( 0  ==  *pGetBuffer );
 
-            t_print("#setOption_001: getOption is %d \n", *pGetBuffer);
+            t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer);
 
 // LLA:             sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) );
 // LLA:             *pbDontTouteSet = sal_True;
@@ -2523,7 +2550,7 @@ namespace osl_Socket
             asAcceptorSocket.setOption( osl_Socket_OptionDontRoute, 1 ); //sal_True );
             sal_Bool bOK = ( 0  !=  asAcceptorSocket.getOption( osl_Socket_OptionDontRoute ) );
 
-            t_print("setOption_simple_001(): getoption is %d \n", asAcceptorSocket.getOption( osl_Socket_OptionDontRoute ) );
+            t_print("setOption_simple_001(): getoption is %d \n", (int) asAcceptorSocket.getOption( osl_Socket_OptionDontRoute ) );
             CPPUNIT_ASSERT_MESSAGE( "test for setOption function: set option of a socket and then check.",
                                       ( sal_True == bOK ) );
         }
@@ -2951,7 +2978,7 @@ namespace osl_StreamSocket
             sal_Int32 nLength = myClientThread.getCount();
             bool       bIsOk   = myClientThread.isOk(); // check if the values are right.
 
-            t_print("Length:=%d\n", nLength);
+            t_print("Length:=%d\n", (int) nLength);
             t_print(" bIsOk:=%d\n", bIsOk);
 
             CPPUNIT_ASSERT_MESSAGE(" test for write/read values with two threads: send data from server, check readed data in client.",
@@ -2999,12 +3026,18 @@ protected:
 
           if ( osl_Socket_Ok == csConnectorSocket.connect( saTargetSocketAddr, pTimeout ))
           {
-              sal_Int32 nWrite1 = csConnectorSocket.write( pTestString1, 11 ); // "test socket"
+#if !SILENT_TEST
+              sal_Int32 nWrite1 =
+#endif
+                csConnectorSocket.write( pTestString1, 11 ); // "test socket"
 
-              sal_Int32 nWrite2 = csConnectorSocket.write( pTestString2, strlen( pTestString2 ) + 1 );
+#if !SILENT_TEST
+              sal_Int32 nWrite2 =
+#endif
+                csConnectorSocket.write( pTestString2, strlen( pTestString2 ) + 1 );
             thread_sleep( 2 );
               csConnectorSocket.write( pTestString2, strlen( pTestString2 ) + 1 );
-              t_print("nWrite1 is %d, nWrite2 is %d\n", nWrite1, nWrite2 );
+              t_print("nWrite1 is %d, nWrite2 is %d\n", (int)nWrite1, (int)nWrite2 );
               //thread_sleep( 1 );
           }
           else
@@ -3080,7 +3113,7 @@ protected:
 
             sal_Int32 nRead2 = ssConnectionSocket.read( pReadBuffer + nRead1, 12 );
             sal_Int32 nRead3 = ssConnectionSocket.read( pReadBuffer + nRead1 + nRead2, 12 );
-            t_print("after read 2, nRead1 is %d, nRead2 is %d, nRead3 is %d \n", nRead1, nRead2, nRead3 );
+            t_print("after read 2, nRead1 is %d, nRead2 is %d, nRead3 is %d \n", (int) nRead1, (int) nRead2, (int) nRead3 );
             mySendThread.join();
 
             ssConnectionSocket.close();
@@ -3126,7 +3159,7 @@ protected:
             sal_Int32 nWrite = ssConnectionSocket.write( pReadBuffer, 11 );
             // still can read
             sal_Int32 nRead3 = ssConnectionSocket.read( pReadBuffer + nRead1 , 12 );
-            t_print("after read 2, nRead1 is %d, nWrite is %d, nRead3 is %d\n", nRead1, nWrite, nRead3 );
+            t_print("after read 2, nRead1 is %d, nWrite is %d, nRead3 is %d\n", (int) nRead1, (int) nWrite, (int) nRead3 );
             mySendThread.join();
             ssConnectionSocket.close();
             asSocket.close();
@@ -3367,47 +3400,6 @@ namespace osl_AcceptorSocket
 
     }; // class ctors
 
-#if 0
-    class operator_assign : public CppUnit::TestFixture
-    {
-    public:
-
-        void assign_001()
-        {
-#if defined(LINUX)
-            ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-            ::osl::AcceptorSocket asSocketAssign( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-            asSocket.setOption( osl_Socket_OptionReuseAddr, 1);
-            ::osl::SocketAddr saSocketAddr( aHostIp1, IP_PORT_MYPORT4 );
-            asSocket.bind( saSocketAddr );
-
-            AcceptorThread myAcceptorThread( asSocketAssign, aHostIp1 );
-            myAcceptorThread.create();
-
-            thread_sleep( 1 );
-            //when accepting, assign another socket to the socket, the thread will not be closed, so is blocking
-            asSocketAssign = asSocket;
-
-            t_print("#asSocketAssign port number is %d\n", asSocketAssign.getLocalPort() );
-
-            asSocketAssign.shutdown();
-            myAcceptorThread.join();
-
-            CPPUNIT_ASSERT_MESSAGE( "test for close when is accepting: the socket will quit accepting status.",
-                                myAcceptorThread.isOK() == sal_True );
-
-
-#endif /* LINUX */
-        }
-
-
-        CPPUNIT_TEST_SUITE( operator_assign  );
-        CPPUNIT_TEST( assign_001 );
-        CPPUNIT_TEST_SUITE_END();
-
-    }; // class operator_assign
-#endif
-
     /** testing the method:
         inline sal_Bool SAL_CALL listen(sal_Int32 MaxPendingConnections= -1);
         inline oslSocketResult SAL_CALL acceptConnection( StreamSocket& Connection);
@@ -3588,8 +3580,11 @@ protected:
             return;
         }
         //blocking mode: default
-        sal_Int32 nRecv = dsSocket.recvFrom( pRecvBuffer, 30, &saTargetSocketAddr); //strlen( pTestString2 ) + 1
-        t_print("After recvFrom, nRecv is %d\n", nRecv);
+#if !SILENT_TEST
+        sal_Int32 nRecv =
+#endif
+            dsSocket.recvFrom( pRecvBuffer, 30, &saTargetSocketAddr);
+        t_print("After recvFrom, nRecv is %d\n", (int) nRecv);
     }
 
     void SAL_CALL onTerminated( )
@@ -3710,8 +3705,8 @@ public:
 
 // -----------------------------------------------------------------------------
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DatagramSocket::ctors, "osl_DatagramSocket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom, "osl_DatagramSocket");
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::ctors);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom);
 
 } // namespace osl_DatagramSocket
 
@@ -3720,4 +3715,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom, "osl_
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx
index 83ec82b5a77a..bee02b978f4c 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,17 +55,14 @@
     inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const;
  */
 
-//------------------------------------------------------------------------
-// include files
-//------------------------------------------------------------------------
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
-#include <testshl/simpleheader.hxx>
-
-//#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
 
 using namespace osl;
-using namespace rtl;
+using ::rtl::OUString;
 
 #define IP_PORT_FTP     21
 #define IP_PORT_TELNET  23
@@ -180,7 +178,7 @@ namespace osl_Socket
             /// Socket constructor.
             // ::osl::Socket sSocket();
 
-            CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occured",
+            CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occurred",
                                     1 == 1 );
         }
 
@@ -243,7 +241,8 @@ namespace osl_Socket
         CPPUNIT_TEST( ctors_no_acquire );
         CPPUNIT_TEST( ctors_copy_ctor );
         CPPUNIT_TEST( ctors_TypeRaw );
-        CPPUNIT_TEST( ctors_family_Ipx );
+        //TODO: Check if family_Ipx is still in use?
+        // CPPUNIT_TEST( ctors_family_Ipx );
         CPPUNIT_TEST_SUITE_END();
 
     }; // class ctors
@@ -380,7 +379,7 @@ namespace osl_Socket
         {
 //#if defined(LINUX)
             ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-            AcceptorThread myAcceptorThread( asSocket, rtl::OUString::createFromAscii("127.0.0.1") );
+            AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) );
             myAcceptorThread.create();
 
             thread_sleep( 1 );
@@ -399,7 +398,7 @@ namespace osl_Socket
         void close_003()
         {
             ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-            AcceptorThread myAcceptorThread( asSocket, rtl::OUString::createFromAscii("0.0.0.0") );
+            AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0.0.0.0")) );
             myAcceptorThread.create();
 
             thread_sleep( 1 );
@@ -441,14 +440,14 @@ namespace osl_Socket
         void getLocalAddr_001()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT8 );
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT8 );
             ::osl::SocketAddr saLocalSocketAddr;
 
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
-            CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
 
             sSocket.getLocalAddr( saLocalSocketAddr );
 
@@ -489,14 +488,14 @@ namespace osl_Socket
         void getLocalPort_001()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT7 );  // aHostIp1 localhost
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT7 );  // aHostIp1 localhost
             ::osl::SocketAddr saLocalSocketAddr;
 
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
-            CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
             sal_Bool bOK = ( IP_PORT_MYPORT7 == sSocket.getLocalPort( )  );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getLocalPort function: first create a new socket, then a socket address, bind them, and check the port.",
@@ -513,7 +512,7 @@ namespace osl_Socket
     */
         void getLocalPort_002()
         {
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_TELNET);
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_TELNET);
 #ifdef WNT
             ::osl::Socket sSocket(sHandle);
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); // sal_True);
@@ -526,9 +525,9 @@ namespace osl_Socket
             (void)bOK;
 #else
             //on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii( "on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case");
+            ::rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case"));
 #endif
-            CPPUNIT_ASSERT_MESSAGE( suError, sal_False );
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_False );
 
         }
 
@@ -540,14 +539,14 @@ namespace osl_Socket
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
-            CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
             ::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )),
-                ::rtl::OUString::createFromAscii("34463"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("34463")),
                 "test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned");
             sal_Bool bOK = ( sSocket.getLocalPort( ) >= 1 &&  sSocket.getLocalPort( ) <= 65535);
 
-            CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK );
         }
 
         CPPUNIT_TEST_SUITE( getLocalPort );
@@ -587,13 +586,13 @@ namespace osl_Socket
         {
             ::osl::Socket sSocket(sHandle);
             //port number from IP_PORT_HTTP1 to IP_PORT_MYPORT6, mindyliu
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT6 );
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT6 );
 
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
-            CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
             sal_Bool bOK;
             ::rtl::OUString suError;
 #ifdef WNT
@@ -608,22 +607,22 @@ namespace osl_Socket
             bOK = bRes1 || bRes2;
             suError = outputError(sSocket.getLocalHost( ), aUString, "test for getLocalHost function: create localhost socket and check name");
 #endif
-            CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK );
         }
 
         void getLocalHost_002()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_POP3);
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_POP3);
             ::osl::SocketAddr saLocalSocketAddr;
 
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
             sSocket.bind( saBindSocketAddr );
             //Invalid IP, so bind should fail
-            sal_Bool bOK = compareUString( sSocket.getLocalHost( ), rtl::OUString::createFromAscii("") ) ;
-            ::rtl::OUString suError = outputError(sSocket.getLocalHost( ), rtl::OUString::createFromAscii(""), "test for getLocalHost function: getLocalHost with invalid SocketAddr");
+            sal_Bool bOK = compareUString( sSocket.getLocalHost( ), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ) ;
+            ::rtl::OUString suError = outputError(sSocket.getLocalHost( ), rtl::OUString(), "test for getLocalHost function: getLocalHost with invalid SocketAddr");
 
-            CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK );
         }
 
         CPPUNIT_TEST_SUITE( getLocalHost );
@@ -668,9 +667,9 @@ namespace osl_Socket
 
         void getPeer_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT );
-            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
+            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
             ::osl::StreamSocket ssConnection;
             asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
             /// launch server socket
@@ -744,7 +743,7 @@ namespace osl_Socket
         void bind_002()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_NETBIOS );
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_NETBIOS );
             ::osl::SocketAddr saLocalSocketAddr;
 
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1); // sal_True);
@@ -796,9 +795,9 @@ namespace osl_Socket
 
         void isRecvReady_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT1 );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT1 );
-            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT1 );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT1 );
+            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
             ::osl::StreamSocket ssConnection;
             /// launch server socket
             asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); // sal_True);
@@ -859,9 +858,9 @@ namespace osl_Socket
 
         void isSendReady_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT );
-            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
+            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
             ::osl::StreamSocket ssConnection;
 
             /// launch server socket
@@ -1108,7 +1107,7 @@ namespace osl_Socket
             // on Linux, the value of option is 1, on Solaris, it's 16, but it's not important the exact value,
             // just judge it is zero or not!
             sal_Bool bOK = ( 0  !=  *pGetBuffer );
-            t_print("#setOption_001: getOption is %d \n", *pGetBuffer);
+            t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer);
 
             // toggle check, set to 0
             *pbDontRouteSet = 0;
@@ -1120,7 +1119,7 @@ namespace osl_Socket
 
             sal_Bool bOK2 = ( 0  ==  *pGetBuffer );
 
-            t_print("#setOption_001: getOption is %d \n", *pGetBuffer);
+            t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer);
 
 // LLA:             sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) );
 // LLA:             *pbDontTouteSet = sal_True;
@@ -1188,7 +1187,7 @@ namespace osl_Socket
             asAcceptorSocket.setOption( osl_Socket_OptionDontRoute, 1 ); //sal_True );
             sal_Bool bOK = ( 0  !=  asAcceptorSocket.getOption( osl_Socket_OptionDontRoute ) );
 
-            t_print("setOption_simple_001(): getoption is %d \n", asAcceptorSocket.getOption( osl_Socket_OptionDontRoute ) );
+            t_print("setOption_simple_001(): getoption is %d \n", (int) asAcceptorSocket.getOption( osl_Socket_OptionDontRoute ) );
             CPPUNIT_ASSERT_MESSAGE( "test for setOption function: set option of a socket and then check.",
                                       ( sal_True == bOK ) );
         }
@@ -1205,10 +1204,11 @@ namespace osl_Socket
         }
 
         CPPUNIT_TEST_SUITE( setOption );
-        CPPUNIT_TEST( setOption_001 );
+//        CPPUNIT_TEST( setOption_001 );
         CPPUNIT_TEST( setOption_002 );
         CPPUNIT_TEST( setOption_003 );
-        CPPUNIT_TEST( setOption_simple_001 );
+        //TODO: Check this test
+//         CPPUNIT_TEST( setOption_simple_001 );
 // LLA:     CPPUNIT_TEST( setOption_simple_002 );
         CPPUNIT_TEST_SUITE_END();
 
@@ -1226,7 +1226,7 @@ namespace osl_Socket
 
         void enableNonBlockingMode_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
             ::osl::StreamSocket ssConnection;
 
             /// launch server socket
@@ -1264,7 +1264,7 @@ namespace osl_Socket
 
         void isNonBlockingMode_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
             ::osl::StreamSocket ssConnection;
 
             /// launch server socket
@@ -1315,7 +1315,7 @@ namespace osl_Socket
         void clearError_001()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_HTTP2 );
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_HTTP2 );
             ::osl::SocketAddr saLocalSocketAddr;
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
             sSocket.bind( saBindSocketAddr );//build an error "osl_Socket_E_AddrNotAvail"
@@ -1357,7 +1357,7 @@ namespace osl_Socket
         void getError_001()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP );
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
             ::osl::SocketAddr saLocalSocketAddr;
 
             CPPUNIT_ASSERT_MESSAGE( "test for getError function: should get no error.",
@@ -1367,7 +1367,7 @@ namespace osl_Socket
         void getError_002()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_FTP );
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_FTP );
             ::osl::SocketAddr saLocalSocketAddr;
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
             sSocket.bind( saBindSocketAddr );//build an error "osl_Socket_E_AddrNotAvail"
@@ -1440,24 +1440,24 @@ namespace osl_Socket
 // -----------------------------------------------------------------------------
 
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::ctors, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::operators, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::close, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getLocalAddr, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getLocalPort, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getLocalHost, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getPeer, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::bind, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::isRecvReady, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::isSendReady, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getType, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getOption, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::setOption, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::enableNonBlockingMode, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::isNonBlockingMode, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::clearError, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getError, "osl_Socket");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getHandle, "osl_Socket");
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::ctors);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::operators);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::close);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getLocalAddr);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getLocalPort);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getLocalHost);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getPeer);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::bind);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::isRecvReady);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::isSendReady);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getType);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getOption);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::setOption);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::enableNonBlockingMode);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::isNonBlockingMode);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::clearError);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getError);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getHandle);
 
 } // namespace osl_Socket
 
@@ -1465,4 +1465,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getHandle, "osl_Socket");
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx
index 6c68287ae748..476fadea3d49 100644
--- a/sal/qa/osl/socket/osl_SocketAddr.cxx
+++ b/sal/qa/osl/socket/osl_SocketAddr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,17 +55,18 @@
     inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const;
  */
 
-//------------------------------------------------------------------------
-// include files
-//------------------------------------------------------------------------
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
-#include <testshl/simpleheader.hxx>
 
-//#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
 
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 
 #define IP_PORT_ZERO   0
 #define IP_PORT_FTP    21
@@ -120,19 +122,19 @@ namespace osl_SocketAddr
 
             sal_Bool bOk = compareUString(suHost, suHost2);
 
-            rtl::OUString suError = rtl::OUString::createFromAscii("Host names should be the same. From SocketAddr.getLocalHostname() it is'");
+            rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("Host names should be the same. From SocketAddr.getLocalHostname() it is'"));
             suError += suHost;
-            suError += rtl::OUString::createFromAscii("', from getThisHostname() it is '");
+            suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', from getThisHostname() it is '"));
             suError += suHost2;
-            suError += rtl::OUString::createFromAscii("'.");
+            suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
 
-            CPPUNIT_ASSERT_MESSAGE(suError, sal_True == bOk);
+            CPPUNIT_ASSERT_MESSAGE(STD_STRING(suError), sal_True == bOk);
         }
 
         void ctors_copy()
         {
             /// SocketAddr copy constructor.
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
             ::osl::SocketAddr saCopySocketAddr( saSocketAddr );
 
             sal_Int32 nPort = saCopySocketAddr.getPort( );
@@ -143,17 +145,7 @@ namespace osl_SocketAddr
 
         void ctors_copy_no_001()
         {
-#if 0
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
-            oslSocketAddr psaOSLSocketAddr = saSocketAddr.getHandle( );
-
-            ::osl::SocketAddr saSocketAddrCopy( psaOSLSocketAddr, SAL_NO_COPY );
-            saSocketAddrCopy.setPort( IP_PORT_HTTP2 );
-
-            CPPUNIT_ASSERT_MESSAGE("test for SocketAddr no copy constructor function: do a no copy constructor on a given SocketAddr instance, modify the new instance's port, check the original one.",
-                                    saSocketAddr.getPort( ) == IP_PORT_HTTP2 );
-#endif
-            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
             CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
 
             oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( );
@@ -170,7 +162,7 @@ namespace osl_SocketAddr
 
         void ctors_copy_no_002()
         {
-            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
                    CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
                    oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( );
                    ::osl::SocketAddr* pSocketAddrCopy = new ::osl::SocketAddr( psaOSLSocketAddr, SAL_NO_COPY );
@@ -183,7 +175,7 @@ namespace osl_SocketAddr
 
         void ctors_copy_handle_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
             ::osl::SocketAddr saSocketAddrCopy( saSocketAddr.getHandle( ) );
 
             CPPUNIT_ASSERT_MESSAGE("test for SocketAddr copy handle constructor function: copy another Socket's handle, get its port to check copy effect.",
@@ -192,7 +184,7 @@ namespace osl_SocketAddr
 
         void ctors_copy_handle_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
             ::osl::SocketAddr saSocketAddrCopy( saSocketAddr.getHandle( ) );
             saSocketAddrCopy.setPort( IP_PORT_HTTP2 );
 
@@ -203,20 +195,20 @@ namespace osl_SocketAddr
         void ctors_hostname_port_001()
         {
             /// tcpip-specif constructor.
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
             printUString( saSocketAddr.getHostname( ), "ctors_hostname_port_001:getHostname");
 
             CPPUNIT_ASSERT_MESSAGE("test for SocketAddr tcpip specif constructor function: do a constructor using tcpip spec, check the result.",
                                     saSocketAddr.is( ) == sal_True &&
-                                    ( saSocketAddr.getPort( ) == IP_PORT_FTP )/*&&
-                                    ( sal_True == compareUString( saSocketAddr.getHostname( ), aHostName1 ) ) */);
+                                    ( saSocketAddr.getPort( ) == IP_PORT_FTP )
+                                  );
         }
 
         //same as is_002
         void ctors_hostname_port_002()
         {
             /// tcpip-specif constructor.
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT2 );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT2 );
 
             CPPUNIT_ASSERT_MESSAGE("test for SocketAddr tcpip specif constructor function: using an invalid IP address, the socketaddr ctors should fail", sal_False == saSocketAddr.is( ));
         }
@@ -252,7 +244,7 @@ namespace osl_SocketAddr
         // refer to setPort_003()
         void is_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_INVAL );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_INVAL );
 
             CPPUNIT_ASSERT_MESSAGE("test for is() function: create a tcp-ip socket using invalid port number",
                                     sal_True == saSocketAddr.is( ) );
@@ -260,7 +252,7 @@ namespace osl_SocketAddr
 
         void is_003()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT );
 
             CPPUNIT_ASSERT_MESSAGE("test for is() function: create a tcp-ip socket using invalid Ip number",
                                     sal_True != saSocketAddr.is( ) );
@@ -292,7 +284,7 @@ namespace osl_SocketAddr
 
         void getHostname_000()
             {
-                ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.107"), IP_PORT_FTP );
+                ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")), IP_PORT_FTP );
                 rtl::OUString suResult = saSocketAddr.getHostname( 0 );
 
             }
@@ -304,30 +296,30 @@ namespace osl_SocketAddr
         */
         void getHostname_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.107"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")), IP_PORT_FTP );
             rtl::OUString suResult = saSocketAddr.getHostname( 0 );
-            rtl::OUString suError = outputError(suResult, rtl::OUString::createFromAscii("sceri.PRC.Sun.COM"), "test for getHostname(0)");
-            sal_Bool bOK = compareUString( suResult, rtl::OUString::createFromAscii("sceri.PRC.Sun.COM") );
+            rtl::OUString suError = outputError(suResult, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sceri.PRC.Sun.COM")), "test for getHostname(0)");
+            sal_Bool bOK = compareUString( suResult, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sceri.PRC.Sun.COM")) );
             // search the returned hostname in /etc/hosts, if find, and the IP in the row is same as IP
             // in the Addr, it's right also.
             if ( bOK == sal_False)
             {
                 rtl::OString aString = ::rtl::OUStringToOString( suResult, RTL_TEXTENCODING_ASCII_US );
-                if ( compareUString( getIPbyName( aString ), rtl::OUString::createFromAscii("129.158.217.107") ) == sal_True )
+                if ( compareUString( getIPbyName( aString ), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")) ) == sal_True )
                     bOK = sal_True;
             }
-            CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK);
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK);
         }
 
 // LLA: now we have to control, if this behaviour is right.
 // LLA: this function does not work in company (Linux, Windows) but at home
         void getHostname_002()
         {
-            rtl::OUString suHostname = rtl::OUString::createFromAscii("cn-1.germany.sun.com");
+            rtl::OUString suHostname (RTL_CONSTASCII_USTRINGPARAM("cn-1.germany.sun.com"));
             rtl::OString aString = ::rtl::OUStringToOString( suHostname, RTL_TEXTENCODING_ASCII_US );
             rtl::OUString aHostIP    = getIPbyName( aString );
 
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_FTP );
             sal_Bool bOK = saSocketAddr.setHostname( suHostname );
             CPPUNIT_ASSERT_MESSAGE("#SocketAddr.setHostname failed", sal_True == bOK );
             oslSocketResult aResult;
@@ -346,7 +338,7 @@ namespace osl_SocketAddr
                 }
             }
 
-            CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK );
         }
 
 
@@ -367,7 +359,7 @@ namespace osl_SocketAddr
     public:
         void getPort_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getPort() function: get a normal port number.",
                                     IP_PORT_FTP == saSocketAddr.getPort( ) );
@@ -375,7 +367,7 @@ namespace osl_SocketAddr
 
         void getPort_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_INVAL );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_INVAL );
 
             //t_print("#getPort_002: Port number is %d \n", saSocketAddr.getPort( ));
 
@@ -386,7 +378,7 @@ namespace osl_SocketAddr
         //2. SocketAddr family is not osl_Socket_FamilyInet, but case 2 could not be constructed
         void getPort_003()
         {
-            rtl::OUString suInvalidIP = rtl::OUString::createFromAscii("123.345.67.89");
+            rtl::OUString suInvalidIP (RTL_CONSTASCII_USTRINGPARAM("123.345.67.89"));
             ::osl::SocketAddr saSocketAddr( suInvalidIP, IP_PORT_MYPORT );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getPort( ) function: give an invalid IP to a SocketAddr, get the port to see returned value. ",
@@ -413,7 +405,7 @@ namespace osl_SocketAddr
     public:
         void setPort_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
             sal_Bool bOK = saSocketAddr.setPort( IP_PORT_TELNET );
 
             CPPUNIT_ASSERT_MESSAGE( "test for setPort() function: modify a port number setting, and check it.",
@@ -431,7 +423,7 @@ namespace osl_SocketAddr
         */
         void setPort_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
             sal_Bool bOK = saSocketAddr.setPort( IP_PORT_ZERO );
 
             oslSocket sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
@@ -450,7 +442,7 @@ namespace osl_SocketAddr
 
         void setPort_003()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP);
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP);
             sal_Bool bOK = saSocketAddr.setPort( IP_PORT_INVAL );
             //on Linux, getPort return 34463
             //t_print("#Port number is %d \n", saSocketAddr.getPort( ));
@@ -463,7 +455,7 @@ namespace osl_SocketAddr
         /* this is not a inet-addr => can't set port */
         void setPort_004()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_FTP);
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_FTP);
             sal_Bool bOK = saSocketAddr.setPort( IP_PORT_MYPORT );
 
             CPPUNIT_ASSERT_MESSAGE( "test for setPort( ) function: set an invalid address with valid port. it should return error.",
@@ -500,8 +492,8 @@ namespace osl_SocketAddr
     public:
         void setAddr_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
-            saSocketAddr.setAddr( UStringIPToByteSequence( rtl::OUString::createFromAscii("127.0.0.1") ) );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+            saSocketAddr.setAddr( UStringIPToByteSequence( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) ) );
             ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( 0 );
             sal_Bool bOK = sal_False;
 
@@ -531,7 +523,7 @@ namespace osl_SocketAddr
         void getAddr_001()
         {
             oslSocketResult SocketResult;
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
             ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( &SocketResult );
 
             sal_Bool bOK = sal_False;
@@ -564,8 +556,8 @@ namespace osl_SocketAddr
     public:
         void operator_equal_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET);
-            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET);
+            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
 
             saSocketAddrEqual = saSocketAddr;
             sal_Bool bOK = sal_False;
@@ -582,8 +574,8 @@ namespace osl_SocketAddr
 
         void operator_equal_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.199"), IP_PORT_TELNET);
-            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.199")), IP_PORT_TELNET);
+            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
 
             saSocketAddrEqual = saSocketAddr;
             CPPUNIT_ASSERT_MESSAGE( "after assign, the assigned SocketAddr is not same as the original Addr",
@@ -597,8 +589,8 @@ namespace osl_SocketAddr
 
         void operator_equal_const_001()
         {
-            const ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET);
-            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            const ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET);
+            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
 
             saSocketAddrEqual = saSocketAddr;
             sal_Bool bOK = sal_False;
@@ -614,8 +606,8 @@ namespace osl_SocketAddr
 
         void operator_equal_const_002()
         {
-            const ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET);
-            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            const ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET);
+            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
 
             saSocketAddrEqual = saSocketAddr;
             saSocketAddrEqual.setPort( IP_PORT_HTTP1 );
@@ -626,9 +618,9 @@ namespace osl_SocketAddr
 
         void operator_equal_assign_001()
         {
-            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET );
+            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET );
                    CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
-                   ::osl::SocketAddr* pSocketAddrAssign = new ::osl::SocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+                   ::osl::SocketAddr* pSocketAddrAssign = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
                    oslSocketAddr poslSocketAddr = pSocketAddr->getHandle( );
                    //if( m_handle ) osl_destroySocketAddr( m_handle ); so pSocketAddrAssign had been destroyed and then point to pSocketAddr
                    pSocketAddrAssign->assign(poslSocketAddr, SAL_NO_COPY);
@@ -641,8 +633,8 @@ namespace osl_SocketAddr
 
         void operator_is_equal_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET);
-            ::osl::SocketAddr saSocketAddrequal( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET);
+            ::osl::SocketAddr saSocketAddrequal( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET );
 
             CPPUNIT_ASSERT_MESSAGE( "test for operator_equal_equal() function: check two identical Address.",
                                       sal_True == ( saSocketAddrequal == saSocketAddr.getHandle( ) ) );
@@ -650,8 +642,8 @@ namespace osl_SocketAddr
 
         void operator_is_equal_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP);
-            ::osl::SocketAddr saSocketAddrequal( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP);
+            ::osl::SocketAddr saSocketAddrequal( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET );
 
             CPPUNIT_ASSERT_MESSAGE( "test for operator_equal_equal() function: check two different Address.",
                                       sal_False == ( saSocketAddrequal == saSocketAddr.getHandle( ) ) );
@@ -681,7 +673,7 @@ namespace osl_SocketAddr
 
         void getSocketAddrHandle_001()
         {
-            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
                    CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
                    oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( );
                    ::osl::SocketAddr* pSocketAddrCopy = new ::osl::SocketAddr( psaOSLSocketAddr, SAL_NO_COPY );
@@ -694,7 +686,7 @@ namespace osl_SocketAddr
 
         void getSocketAddrHandle_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("deuce.PRC.Sun.COM"), IP_PORT_MYPORT4 );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("deuce.PRC.Sun.COM")), IP_PORT_MYPORT4 );
             oslSocketAddr poslSocketAddr = saSocketAddr.getHandle( );
 
             sal_Bool bOK = ( saSocketAddr == poslSocketAddr );
@@ -739,7 +731,7 @@ namespace osl_SocketAddr
             // LLA: IMHO localhost, or hostname by itself should be ok.
             rtl::OUString suThisHost = getThisHostname( );
             bool bOk = false;
-            if (suThisHost.equals(rtl::OUString::createFromAscii("localhost")))
+            if (suThisHost.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost"))))
             {
                 bOk = true;
             }
@@ -754,7 +746,7 @@ namespace osl_SocketAddr
             ::rtl::OUString suError;
             suError = outputError(suResult, getThisHostname( ), "test for getLocalHostname() function");
 
-            CPPUNIT_ASSERT_MESSAGE( suError, bOk == true );
+            CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), bOk == true );
         }
 
         CPPUNIT_TEST_SUITE( getLocalHostname );
@@ -775,7 +767,7 @@ namespace osl_SocketAddr
         void resolveHostname_001()
         {
             ::osl::SocketAddr saSocketAddr;
-            ::osl::SocketAddr::resolveHostname( rtl::OUString::createFromAscii("127.0.0.1"), saSocketAddr );
+            ::osl::SocketAddr::resolveHostname( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), saSocketAddr );
             ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( 0 );
             sal_Bool bOK = sal_False;
 
@@ -796,7 +788,7 @@ namespace osl_SocketAddr
     /** testing the method:
         static inline sal_Int32 SAL_CALL getServicePort(
             const ::rtl::OUString& strServiceName,
-            const ::rtl::OUString & strProtocolName= ::rtl::OUString::createFromAscii( "tcp" ) );
+            const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) );
     */
 
     class gettheServicePort : public CppUnit::TestFixture
@@ -804,8 +796,8 @@ namespace osl_SocketAddr
     public:
         void gettheServicePort_001()
         {
-            rtl::OUString suServiceFTP  = rtl::OUString::createFromAscii( "ftp" );
-            rtl::OUString suProtocolTCP = rtl::OUString::createFromAscii( "tcp" );
+            rtl::OUString suServiceFTP  (RTL_CONSTASCII_USTRINGPARAM("ftp"));
+            rtl::OUString suProtocolTCP (RTL_CONSTASCII_USTRINGPARAM("tcp"));
 
             CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get ftp service port on TCP protocol.",
                                       IP_PORT_FTP== ::osl::SocketAddr::getServicePort( suServiceFTP, suProtocolTCP ) );
@@ -813,8 +805,8 @@ namespace osl_SocketAddr
 
         void gettheServicePort_002()
         {
-            rtl::OUString suServiceTELNET  = rtl::OUString::createFromAscii( "telnet" );
-            rtl::OUString suProtocolTCP    = rtl::OUString::createFromAscii( "tcp" );
+            rtl::OUString suServiceTELNET  (RTL_CONSTASCII_USTRINGPARAM("telnet"));
+            rtl::OUString suProtocolTCP    (RTL_CONSTASCII_USTRINGPARAM("tcp"));
             CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get telnet service port on TCP protocol.",
                                       IP_PORT_TELNET== ::osl::SocketAddr::getServicePort( suServiceTELNET, suProtocolTCP ) );
         }
@@ -822,17 +814,17 @@ namespace osl_SocketAddr
         void gettheServicePort_003()
         {
         //Solaris has no service called "https", please see /etc/services
-            rtl::OUString suServiceNETBIOS = rtl::OUString::createFromAscii( "netbios-dgm" );
-            rtl::OUString suProtocolUDP    = rtl::OUString::createFromAscii( "udp" );
+            rtl::OUString suServiceNETBIOS (RTL_CONSTASCII_USTRINGPARAM("netbios-dgm"));
+            rtl::OUString suProtocolUDP    (RTL_CONSTASCII_USTRINGPARAM("udp"));
             CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get netbios-ssn service port on UDP protocol.",
                                       IP_PORT_NETBIOS_DGM == ::osl::SocketAddr::getServicePort( suServiceNETBIOS, suProtocolUDP ) );
         }
 
         void gettheServicePort_004()
         {
-            rtl::OUString suProtocolUDP    = rtl::OUString::createFromAscii( "udp" );
+            rtl::OUString suProtocolUDP(RTL_CONSTASCII_USTRINGPARAM( "udp" ));
             CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get a service port which is not exist.",
-                                      OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString::createFromAscii( "notexist" ), suProtocolUDP ) );
+                                      OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notexist")), suProtocolUDP ) );
         }
 
         CPPUNIT_TEST_SUITE( gettheServicePort );
@@ -853,7 +845,7 @@ namespace osl_SocketAddr
     public:
         void getFamilyOfSocketAddr_001()
         {
-                   ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+                   ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
                    oslSocketAddr psaOSLSocketAddr = saSocketAddr.getHandle( );
                    CPPUNIT_ASSERT_EQUAL(
                     osl_Socket_FamilyInet,
@@ -872,19 +864,20 @@ namespace osl_SocketAddr
 // -----------------------------------------------------------------------------
 
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::ctors, "osl_SocketAddr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::is, "osl_SocketAddr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getHostname, "osl_SocketAddr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getPort, "osl_SocketAddr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::setPort, "osl_SocketAddr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::setAddr, "osl_SocketAddr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getAddr, "osl_SocketAddr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::operator_equal, "osl_SocketAddr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getSocketAddrHandle, "osl_SocketAddr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getLocalHostname, "osl_SocketAddr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::resolveHostname, "osl_SocketAddr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::gettheServicePort, "osl_SocketAddr");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getFamilyOfSocketAddr, "osl_SocketAddr");
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::ctors);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::is);
+//TODO: enable Test with valid host names
+//CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getHostname);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getPort);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::setPort);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::setAddr);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getAddr);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::operator_equal);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getSocketAddrHandle);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getLocalHostname);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::resolveHostname);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::gettheServicePort);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getFamilyOfSocketAddr);
 
 } // namespace osl_SocketAddr
 
@@ -892,4 +885,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getFamilyOfSocketAddr, "os
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h
index 554b188fa1ad..03fcf85c9cae 100755..100644
--- a/sal/qa/osl/socket/osl_Socket_Const.h
+++ b/sal/qa/osl/socket/osl_Socket_Const.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,14 +26,9 @@
  *
  ************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _OSL_SOCKET_CONST_H_
 #define _OSL_SOCKET_CONST_H_
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 #include <sal/types.h>
 #include <rtl/textenc.h>
 #include <rtl/ustring.hxx>
@@ -58,9 +54,6 @@
 
 const char * pTestString1 = "test socket";
 const char * pTestString2 = " Passed#OK";
-//define read count
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 
 #ifdef __cplusplus
 extern "C"
@@ -71,7 +64,7 @@ extern "C"
 //------------------------------------------------------------------------
 // OS dependent declaration and includes
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )     //Unix
 #   include <unistd.h>
 #   include <limits.h>
 #   include <string.h>
@@ -88,11 +81,8 @@ extern "C"
 #       include <arpa/inet.h>
 #endif
 #if ( defined WNT )                     // Windows
-#include <tools/prewin.h>
-// #    include <windows.h>
 #   include <winsock.h>
 #   include <string.h>
-#include <tools/postwin.h>
 #endif
 
 
@@ -182,15 +172,10 @@ OSLTEST_DECLARE( HostIpZero,  "0.0.0.0" );
 //------------------------------------------------------------------------
 OSLTEST_DECLARE( NullURL,  "" );
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifdef __cplusplus
 }
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-
 #endif /* _OSL_SOCKET_CONST_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h
index 36272a5694d4..d40ad9174598 100644
--- a/sal/qa/osl/socket/osl_Socket_Const_orig.h
+++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,14 +26,9 @@
  *
  ************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _OSL_SOCKET_CONST_H_
 #define _OSL_SOCKET_CONST_H_
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 #include <sal/types.h>
 #include <rtl/textenc.h>
 #include <rtl/ustring.hxx>
@@ -58,9 +54,6 @@
 
 const char * pTestString1 = "test socket";
 const char * pTestString2 = " Passed#OK";
-//define read count
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 
 #ifdef __cplusplus
 extern "C"
@@ -71,7 +64,7 @@ extern "C"
 //------------------------------------------------------------------------
 // OS dependent declaration and includes
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )     //Unix
 #   include <unistd.h>
 #   include <limits.h>
 #   include <string.h>
@@ -88,11 +81,8 @@ extern "C"
 #       include <arpa/inet.h>
 #endif
 #if ( defined WNT )                     // Windows
-#include <tools/prewin.h>
-// #    include <windows.h>
 #   include <winsock.h>
 #   include <string.h>
-#include <tools/postwin.h>
 #endif
 
 
@@ -186,15 +176,10 @@ OSLTEST_DECLARE( HostIpZero,  "0.0.0.0" );
 //------------------------------------------------------------------------
 OSLTEST_DECLARE( NullURL,  "" );
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifdef __cplusplus
 }
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-
 #endif /* _OSL_SOCKET_CONST_H_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/osl_Socket_tests.cxx b/sal/qa/osl/socket/osl_Socket_tests.cxx
index 3434d48203a0..120d9fa24a91 100644
--- a/sal/qa/osl/socket/osl_Socket_tests.cxx
+++ b/sal/qa/osl/socket/osl_Socket_tests.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,9 @@
 //------------------------------------------------------------------------
 #include <osl_Socket_Const.h>
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include <osl/socket.hxx>
 //------------------------------------------------------------------------
 // helper functions
@@ -63,7 +66,7 @@ namespace osl_Socket
         CPPUNIT_TEST_SUITE_END();
     };
 
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::tests, "osl_SocketTest");
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::tests);
 }
 
 
@@ -83,6 +86,8 @@ void RegisterAdditionalFunctions( FktRegFuncPtr _pFunc )
 
 #else*/
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 //#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index 9883511cb43e..c2683d6ead46 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,18 +55,17 @@
      inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const;
 */
 
-//------------------------------------------------------------------------
-// include files
-//------------------------------------------------------------------------
-
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
-//#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
 #include <osl/conditn.hxx>
 
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OString;
 
 #define IP_PORT_MYPORT9  8897
 #define IP_PORT_MYPORT10 18900
@@ -142,7 +142,7 @@ protected:
     void SAL_CALL run( )
         {
             ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 );
             ::osl::StreamSocket ssStreamConnection;
 
             //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket
@@ -252,7 +252,7 @@ protected:
 public:
     ClientSocketThread( osl::Condition &_aCond  ):
             m_aCondition(_aCond),
-            m_saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ),
+            m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ),
             m_csConnectorSocket( )
         {
             m_id = getIdentifier( );
@@ -335,7 +335,7 @@ protected:
 
     void SAL_CALL run( )
         {
-            ::osl::SocketAddr      m_aTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 );
+            ::osl::SocketAddr      m_aTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
             ::osl::ConnectorSocket m_aConnectorSocket;
 
             if (! m_aTargetSocketAddr.is())
@@ -416,7 +416,7 @@ protected:
         {
             t_print("start WriteSocketThread\n");
             ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
             if (! saLocalSocketAddr.is())
             {
                 t_print("LocalSocketAddr was NOT created successfully!\n");
@@ -460,31 +460,6 @@ protected:
                     else
                     {
 
-// LLA: removed, due to the fact, this is to error prone
-// LLA:             char * pSrcRoot = getenv("SOURCE_ROOT");
-// LLA:             // LLA: This is absolute wrong!
-// LLA:             // strcat( pSrcRoot, "/sal/inc/osl/file.hxx");
-// LLA:             rtl::OString sSrcRoot(pSrcRoot);
-// LLA:             sSrcRoot += "/sal/inc/osl/file.hxx";
-// LLA:
-// LLA:             ::rtl::OUString sFilePath = ::rtl::OUString::createFromAscii( sSrcRoot.getStr() );
-// LLA: #ifdef WNT
-// LLA:             while (sFilePath.lastIndexOf('/') != -1)
-// LLA:                 sFilePath = sFilePath.replace('/',(sal_Unicode)'\\');
-// LLA: #endif
-// LLA:             FILE *stream;
-// LLA:             sal_uInt64     nCount_read;
-// LLA:             sal_Char       buffer_read[FILE_READ];
-// LLA:
-// LLA:             if( (stream = fopen( oustring2char( sFilePath ), "r+t" )) != NULL )
-// LLA:             {
-// LLA:                 /* Attempt to read in 25 characters */
-// LLA:                 nCount_read = fread( buffer_read, sizeof( char ), FILE_READ, stream );
-// LLA:                 fclose( stream );
-// LLA:             }
-// LLA:             else
-// LLA:                 t_print("# File $SRC_ROOT/sal/inc/osl/file.hxx could not be opened\n" );
-
                         t_print("write()\n");
 
                         ssStreamConnection.write( m_aValues.getBuffer(), m_aValues.getBufferSize() );
@@ -640,7 +615,7 @@ namespace osl_StreamSocket
         void send_recv2()
             {
                 ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-                ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 );
+                ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 );
                 ::osl::StreamSocket ssStreamConnection;
                 sal_Char pReadBuffer[30] = "";
 
@@ -687,7 +662,7 @@ namespace osl_StreamSocket
                 sal_Int32 nLength = myClientThread.getCount();
                 bool       bIsOk   = myClientThread.isOk(); // check if the values are right.
 
-                t_print("Length:=%d\n", nLength);
+                t_print("Length:=%d\n", (int) nLength);
                 t_print(" bIsOk:=%d\n", bIsOk);
 
                 CPPUNIT_ASSERT_MESSAGE(" test for write/read values with two threads: send data from server, check readed data in client.",
@@ -744,12 +719,17 @@ namespace osl_StreamSocket
 
                 if ( osl_Socket_Ok == m_csConnectorSocket.connect( m_saTargetSocketAddr, pTimeout ))
                 {
-                    sal_Int32 nWrite1 = m_csConnectorSocket.write( pTestString1, 11 ); // "test socket"
-
-                    sal_Int32 nWrite2 = m_csConnectorSocket.write( pTestString2, strlen( pTestString2 ) + 1 );
+#if !SILENT_TEST
+                    sal_Int32 nWrite1 =
+#endif
+                        m_csConnectorSocket.write( pTestString1, 11 ); // "test socket"
+#if !SILENT_TEST
+                    sal_Int32 nWrite2 =
+#endif
+                        m_csConnectorSocket.write( pTestString2, strlen( pTestString2 ) + 1 );
                     thread_sleep( 2 );
                     m_csConnectorSocket.write( pTestString2, strlen( pTestString2 ) + 1 );
-                    t_print("nWrite1 is %d, nWrite2 is %d\n", nWrite1, nWrite2 );
+                    t_print("nWrite1 is %d, nWrite2 is %d\n", (int) nWrite1, (int) nWrite2 );
                     //thread_sleep( 1 );
                 }
                 else
@@ -760,7 +740,7 @@ namespace osl_StreamSocket
             }
     public:
         SendClientThread(  ):
-                m_saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ),
+                m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ),
                 m_csConnectorSocket( )
             {
                 //t_print("# successfully creat this SendClientThread %d!\n",  m_id );
@@ -792,7 +772,7 @@ namespace osl_StreamSocket
             {
 #if defined(LINUX)
                 ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-                AcceptorThread myAcceptorThread( asSocket, rtl::OUString::createFromAscii("127.0.0.1") );
+                AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) );
                 myAcceptorThread.create();
 
                 thread_sleep( 1 );
@@ -809,7 +789,7 @@ namespace osl_StreamSocket
         void shutdown_002()
             {
                 ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-                ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9);
+                ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9);
                 asSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
                 CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True);
                 CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True );
@@ -839,7 +819,7 @@ namespace osl_StreamSocket
 
                 sal_Int32 nRead2 = ssConnectionSocket.read( pReadBuffer + nRead1, 12 );
                 sal_Int32 nRead3 = ssConnectionSocket.read( pReadBuffer + nRead1 + nRead2, 12 );
-                t_print("after read 2, nRead1 is %d, nRead2 is %d, nRead3 is %d \n", nRead1, nRead2, nRead3 );
+                t_print("after read 2, nRead1 is %d, nRead2 is %d, nRead3 is %d \n", (int) nRead1, (int) nRead2, (int) nRead3 );
                 mySendThread.join();
 
                 ssConnectionSocket.close();
@@ -862,7 +842,7 @@ namespace osl_StreamSocket
         void shutdown_003()
             {
                 ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-                ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9);
+                ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9);
                 asSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
                 CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True);
                 CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True );
@@ -886,7 +866,7 @@ namespace osl_StreamSocket
                 sal_Int32 nWrite = ssConnectionSocket.write( pReadBuffer, 11 );
                 // still can read
                 sal_Int32 nRead3 = ssConnectionSocket.read( pReadBuffer + nRead1 , 12 );
-                t_print("after read 2, nRead1 is %d, nWrite is %d, nRead3 is %d\n", nRead1, nWrite, nRead3 );
+                t_print("after read 2, nRead1 is %d, nWrite is %d, nRead3 is %d\n", (int) nRead1, (int) nWrite, (int) nRead3 );
                 mySendThread.join();
                 ssConnectionSocket.close();
                 asSocket.close();
@@ -929,59 +909,6 @@ namespace osl_StreamSocket
     }; // class isExceptionPending
 
 // -----------------------------------------------------------------------------
-/** Server Socket Thread, write a file which is large
- */
-// LLA: class WriteSocketThread : public Thread
-// LLA: {
-// LLA:     ValueCheckProvider m_aValues;
-// LLA:
-// LLA: protected:
-// LLA:     oslThreadIdentifier m_id;
-// LLA:
-// LLA:     void SAL_CALL run( )
-// LLA:     {
-// LLA:         ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-// LLA:         ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("10.16.66.252"), 8888 );
-// LLA:         ::osl::StreamSocket ssStreamConnection;
-// LLA:
-// LLA:         //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket
-// LLA:         asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 );    //sal_True);
-// LLA:
-// LLA:         /// if the thread should terminate, schedule return false
-// LLA:         while ( schedule( ) == sal_True )
-// LLA:         {
-// LLA:             sal_Bool bOK1 = asAcceptorSocket.bind( saLocalSocketAddr );
-// LLA:             if  ( sal_True != bOK1 )
-// LLA:             {
-// LLA:                 t_print("# WriteSocketThread: AcceptorSocket bind address failed. \n" ) ;
-// LLA:                 break;
-// LLA:             }
-// LLA:             sal_Bool bOK2 = asAcceptorSocket.listen( 1 );
-// LLA:             if  ( sal_True != bOK2 )
-// LLA:             {
-// LLA:                 t_print("# WriteSocketThread: AcceptorSocket listen address failed. \n" ) ;
-// LLA:                 break;
-// LLA:             }
-// LLA:             // blocking mode, if read/recv failed, block until success
-// LLA:             asAcceptorSocket.enableNonBlockingMode( sal_False);
-// LLA:
-// LLA:             oslSocketResult eResult = asAcceptorSocket.acceptConnection( ssStreamConnection );
-// LLA:             if (eResult != osl_Socket_Ok )
-// LLA:             {
-// LLA:                 t_print("WriteSocketThread: acceptConnection failed! \n");
-// LLA:                 break;
-// LLA:             }
-// LLA:
-// LLA:
-// LLA:             sal_Int32 nReadNumber1 = ssStreamConnection.write( m_aValues.getBuffer(), m_aValues.getBufferSize() );
-// LLA:             break;
-// LLA:         }
-// LLA:         ssStreamConnection.close();
-// LLA:         asAcceptorSocket.close();
-// LLA:     }
-// LLA: }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
 /** Client Socket Thread, served as a temp little client to communicate with server.
  */
 
@@ -1041,7 +968,7 @@ namespace osl_StreamSocket
                     {
                         t_print("read()\n");
                         m_nReadCount = aSocket.read( m_pBuffer, m_nBufferSize );
-                        t_print("%d bytes recived.\n", m_nReadCount);
+                        t_print("%d bytes recived.\n", (int) m_nReadCount);
                     }
                 }
                 else
@@ -1203,10 +1130,6 @@ namespace osl_StreamSocket
 
                     t_print("received: %s\n", pBuffer2);
 
-                    // char * pBuffer3 = "quit\n";
-                    // nBufferSize = strlen(pBuffer3);
-                    // nWriteNumber = ssStreamConnection.write( pBuffer3, nBufferSize );
-
                     rtl::OUString suError = ssStreamConnection.getErrorAsString();
                     free(pBuffer2);
                     // ssStreamConnection.close();
@@ -1221,9 +1144,9 @@ namespace osl_StreamSocket
     public:
 // LLA: orig        void send_recv()
 // LLA: orig             {
-// LLA: orig                if ( ifAvailable(rtl::OUString::createFromAscii("margritte.germany")) == sal_True )
+// LLA: orig                if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("margritte.germany"))) == sal_True )
 // LLA: orig                    t_print("margritte is alive ! \n");
-// LLA: orig                if ( ifAvailable(rtl::OUString::createFromAscii("10.16.66.252")) == sal_False )
+// LLA: orig                if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.66.252"))) == sal_False )
 // LLA: orig                {
 // LLA: orig            t_print("ip 10.16.66.252 is not alive! \n");
 // LLA: orig            return;
@@ -1272,14 +1195,11 @@ namespace osl_StreamSocket
 
                     char const * pBuffer = "Test String\n";
                     sal_Int32 nBufferSize = strlen(pBuffer);
-                    sal_Int32 nWriteNumber = ssStreamConnection.write( pBuffer, nBufferSize );
-
-                    // char * pBuffer2 = "                                                                                                 ";
-                    // sal_Int32 nReadNumber = ssStreamConnection.read( pBuffer2, strlen(pBuffer2) );
+                    ssStreamConnection.write( pBuffer, nBufferSize );
 
                     char const * pBuffer3 = "quit\n";
                     nBufferSize = strlen(pBuffer3);
-                    nWriteNumber = ssStreamConnection.write( pBuffer3, nBufferSize );
+                    ssStreamConnection.write( pBuffer3, nBufferSize );
 
                     ssStreamConnection.close();
                 }
@@ -1302,7 +1222,7 @@ namespace osl_StreamSocket
         void send_recv()
             {
                 rtl::OString sAddr;
-                // if ( ifAvailable(rtl::OUString::createFromAscii("margritte.germany")) == sal_True )
+                // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("margritte.germany"))) == sal_True )
                 // {
                 //     t_print("margritte is alive ! \n");
                 //     sAddr = "margritte.germany";
@@ -1315,21 +1235,21 @@ namespace osl_StreamSocket
                 }
 //                 else
 //                 {
-//                     if ( ifAvailable(rtl::OUString::createFromAscii("192.168.7.2")) == sal_True )
+//                     if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("192.168.7.2"))) == sal_True )
 //                     {
 //                         sAddr = "192.168.7.2";
 //                         t_print("moon found ! \n");
 //                     }
 //                     else
 //                     {
-//                         if ( ifAvailable(rtl::OUString::createFromAscii("moon.linux.bogus")) == sal_True )
+//                         if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon.linux.bogus"))) == sal_True )
 //                         {
 //                             sAddr = "moon.linux.bogus";
 //                             t_print("moon found ! \n");
 //                         }
 //                         else
 //                         {
-//                             if ( ifAvailable(rtl::OUString::createFromAscii("moon")) == sal_True )
+//                             if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon"))) == sal_True )
 //                             {
 //                                 sAddr = "moon";
 //                                 t_print("moon found ! \n");
@@ -1338,7 +1258,7 @@ namespace osl_StreamSocket
 //                     }
 //                 }
 
-                // if ( ifAvailable(rtl::OUString::createFromAscii("10.16.64.196")) == sal_False )
+                // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.64.196"))) == sal_False )
                 // {
                 //     t_print("ip 10.16.64.196 is not alive! \n");
                 //     return;
@@ -1363,10 +1283,17 @@ namespace osl_StreamSocket
                     // termAndJoinThread(&myReadThread);
 
                     // statistics
-                    sal_uInt32 nLength = myReadThread.getCount();
-                    bool       bIsOk   = myReadThread.isOk(); // check if the values are right.
+#if !SILENT_TEST
+                    sal_uInt32 nLength =
+#endif
+                        myReadThread.getCount();
+
+#if !SILENT_TEST
+                    bool       bIsOk   =
+#endif
+                        myReadThread.isOk(); // check if the values are right.
 
-                    t_print("Length:=%d\n", nLength);
+                    t_print("Length:=%d\n", (int) nLength);
                     t_print(" bIsOk:=%d\n", bIsOk);
                 }
                 else
@@ -1478,10 +1405,6 @@ namespace osl_StreamSocket
                     }
                     free(pBufferPeek);
 
-                    // char * pBuffer3 = "quit\n";
-                    // nBufferSize = strlen(pBuffer3);
-                    // nWriteNumber = ssStreamConnection.write( pBuffer3, nBufferSize );
-
                     rtl::OUString suError = ssStreamConnection.getErrorAsString();
                 }
                 aSocket.shutdown(osl_Socket_DirReadWrite);
@@ -1490,12 +1413,12 @@ namespace osl_StreamSocket
 
 // -----------------------------------------------------------------------------
 
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::ctors, "osl_StreamSocket");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::send_recv, "osl_StreamSocket");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::shutdown, "osl_StreamSocket");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::isExceptionPending, "osl_StreamSocket");
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::ctors);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::send_recv);
+//    CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::shutdown);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::isExceptionPending);
 
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::justtest, "osl_StreamSocket");
+//    CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::justtest);
 
 } // namespace osl_StreamSocket
 
@@ -1503,4 +1426,6 @@ namespace osl_StreamSocket
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx
index 4568f042dc15..1aaab989e4a8 100644
--- a/sal/qa/osl/socket/sockethelper.cxx
+++ b/sal/qa/osl/socket/sockethelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 #include "sockethelper.hxx"
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#if OSL_DEBUG_LEVEL > 0
+#   define SILENT_TEST 0
+#else
+#   define SILENT_TEST 1
+#endif
+
+#if SILENT_TEST
+#   define t_print(...) { }
+#else
+#   define t_print printf
+#endif
 
 //------------------------------------------------------------------------
 // Ip version definition
@@ -66,24 +81,19 @@ sal_Bool compareSocketAddr( const ::osl::SocketAddr & addr1 , const ::osl::Socke
     return ( ( sal_True == compareUString( addr1.getHostname( 0 ), addr2.getHostname( 0 ) ) ) && ( addr2.getPort( ) == addr2.getPort( ) ) );
 }
 
-/*char * oustring2char( const ::rtl::OUString & str )
-{
-    rtl::OString aString;
-    aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    t_print("oustring2char %s\n", aString.getStr( ) );
-    sal_Char * sStr = aString.getStr( );
-    return (char *)sStr;
-}*/
-
 /** print a UNI_CODE String. And also print some comments of the string.
 */
 void printUString( const ::rtl::OUString & str, const char* msg)
 {
+#if SILENT_TEST
+    (void)str;
+    (void)msg;
+#else
     t_print("#%s #printUString_u# ", msg );
     rtl::OString aString;
     aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    //char * sStr = aString.getStr( );
     t_print("%s\n", aString.getStr( ) );
+#endif
 }
 
 /** get the local host name.
@@ -115,7 +125,7 @@ void printUString( const ::rtl::OUString & str, const char* msg)
 #else
     char hostname[255];
     if (gethostname(hostname, 255) != 0) {
-        OSL_ENSURE( false, "#Error: gethostname failed."  );
+        OSL_FAIL( "#Error: gethostname failed."  );
     }
 
     struct hostent *hptr;
@@ -174,11 +184,11 @@ void printUString( const ::rtl::OUString & str, const char* msg)
     if ( returnVal.equals( rightVal ) )
         return aUString;
     aUString += ::rtl::OUString::createFromAscii(msg);
-    aUString += ::rtl::OUString::createFromAscii(": the returned value is '");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":  the returned value is '"));
     aUString += returnVal;
-    aUString += ::rtl::OUString::createFromAscii("', but the value should be '");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '"));
     aUString += rightVal;
-    aUString += ::rtl::OUString::createFromAscii("'.");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
     return aUString;
 }
 
@@ -193,7 +203,7 @@ void thread_sleep( sal_Int32 _nSec )
 #ifdef WNT               //Windows
     Sleep( _nSec * 100 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )   //Unix
+#if ( defined UNX )  //Unix
     usleep(_nSec * 100000);
 #endif
     // t_print("# done\n" );
@@ -203,16 +213,23 @@ void thread_sleep( sal_Int32 _nSec )
 */
 void printBool( sal_Bool bOk )
 {
-    t_print("printBool " );
-    ( sal_True == bOk ) ? t_print("YES!" ): t_print("NO!");
-    t_print("\n");
+#if SILENT_TEST
+    (void)bOk;
+#else
+    t_print("#printBool# " );
+    t_print ("%s", (sal_True == bOk) ? "YES!\n" : "NO!\n");
+#endif
 }
 
 /** print content of a ByteSequence.
 */
 void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int32 nLen )
 {
-    t_print("ByteSequence is: " );
+#if SILENT_TEST
+    (void)bsByteSeq;
+    (void)nLen;
+#else
+    t_print("#ByteSequence is: " );
     for ( int i = 0; i < nLen; i++ ){
         if ( bsByteSeq[i] < 0 )
             t_print("%d ",  256 + bsByteSeq[i] );
@@ -220,6 +237,7 @@ void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int32 nLen
             t_print("%d ",  bsByteSeq[i] );
     }
     t_print(" .\n" );
+#endif
 }
 
 /** convert an IP which is stored as a UString format to a ByteSequence array for later use.
@@ -287,87 +305,6 @@ sal_Bool ifIpv4is( const ::rtl::ByteSequence Ipaddr, sal_Int8 seq1, sal_Int8 seq
     return sal_False;
 }
 
-/** if the IP or hostname is availble( alive )
-*/
-/*sal_Bool ifAvailable( const char *  stringAddrOrHostName )
-{
-    sal_Bool result;
-    int  p[2];
-    sal_Char buffer[2000];
-    char stringhost[20];
-    strcpy(stringhost, stringAddrOrHostName );
-
-    result = sal_False;
-    if (pipe (p) == 0)
-    {
-    pid_t pid;
-    int nStatus;
-    pid = fork();
-    if (pid == 0)
-    {
-#if ( defined LINUX )
-        char *argv[] =
-        {
-            "/bin/ping",
-            "-c", "3",
-            "-W", "3",
-            stringhost,
-            NULL
-        };
-#endif
-#if ( defined SOLARIS )
-        char *argv[] =
-            {
-                "/usr/sbin/ping",
-                stringhost,
-                "3",
-                NULL
-            };
-#endif
-        close (p[0]);
-        dup2  (p[1], 1);
-        close (p[1]);
-#if ( defined LINUX )
-        execv ("/bin/ping", argv);
-#endif
-#if ( defined SOLARIS )
-        execv ("/usr/sbin/ping", argv);
-#endif
-        // arriving here means exec failed
-        _exit(-1);
-    }
-    else if (pid > 0)
-    {
-        sal_Int32 k = 0, n = 2000;
-        close (p[1]);
-        if ((k = read (p[0], buffer, n - 1)) > 0)
-        {
-            buffer[k] = 0;
-            if (buffer[k - 1] == '\n')
-            buffer[k - 1] = 0;
-#if ( defined LINUX )
-            char strOK[] = "bytes from";
-#endif
-#if ( defined SOLARIS )
-            char strOK[] = "is alive";
-#endif
-            if (strstr( buffer, strOK ) != NULL )
-                result = sal_True;
-            t_print("buffer is %s\n", buffer );
-        }
-        close (p[0]);
-        waitpid (pid, &nStatus, 0);
-    }
-    else
-    {
-        close (p[0]);
-        close (p[1]);
-    }
-
-    }
-    return result;
-}*/
-
 sal_Bool ifAvailable( rtl::OUString const&  strAddrOrHostName )
 {
     ::osl::ConnectorSocket aSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
@@ -399,3 +336,5 @@ sal_Bool ifAvailable( rtl::OUString const&  strAddrOrHostName )
     }
     return sal_True;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx
index 414447cca003..fb01ed47cb50 100644
--- a/sal/qa/osl/socket/sockethelper.hxx
+++ b/sal/qa/osl/socket/sockethelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,35 +25,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 
 #ifndef _SOCKETHELPER_HXX_
 #define _SOCKETHELPER_HXX_
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 #include <sal/types.h>
 #include <rtl/textenc.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustring.h>
 
-#ifndef _OSL_SOCLET_HXX_
 #include <osl/socket.hxx>
-#endif
 #include <osl/socket.h>
 
-#ifndef _OSL_THREAD_HXX
 #include <osl/thread.hxx>
-#endif
 
-#ifndef _OSL_FILE_HXX
 #include <osl/file.hxx>
-#endif
 
-#ifndef _OSL_MUTEX_HXX
 #include <osl/mutex.hxx>
-#endif
 #include <osl/time.h>
 
 #ifdef __cplusplus
@@ -63,7 +52,7 @@ extern "C"
 //------------------------------------------------------------------------
 // OS dependent declaration and includes
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )  //Unix
 
 #include <unistd.h>
 #include <limits.h>
@@ -85,22 +74,34 @@ extern "C"
 #ifndef _OSL_SOCKET_CONST_H_
 
 #if ( defined WNT )                     // Windows
-#include <tools/prewin.h>
-// #include <windows.h>
 #include <winsock.h>
 #include <string.h>
-#include <tools/postwin.h>
 #endif
 
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifdef __cplusplus
 }
 #endif
 
+/** test output if SILENT_TEST is 0
+*/
+#if OSL_DEBUG_LEVEL > 0
+#   define SILENT_TEST 0
+#else
+#   define SILENT_TEST 1
+#endif
+
+#if SILENT_TEST
+#   define t_print(...) { }
+#else
+#   define t_print printf
+#endif
+
+/** convert UString and OUString to std::string
+*/
+#define STD_STRING(s) (std::string((const char *)s.getStr()))
+
 /** compare two OUString.
 */
 sal_Bool compareUString( const ::rtl::OUString & ustr1, const ::rtl::OUString & ustr2 );
@@ -163,3 +164,5 @@ class CloseSocketThread : public Thread
 */
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/thread/makefile.mk b/sal/qa/osl/thread/makefile.mk
index 033e8f829b55..949fe0b0e0e7 100644
--- a/sal/qa/osl/thread/makefile.mk
+++ b/sal/qa/osl/thread/makefile.mk
@@ -37,8 +37,8 @@ DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_thread.obj
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-SHL1VERSIONMAP = version.map
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
+SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
 
@@ -46,7 +46,4 @@ SLOFILES = $(SHL1OBJS)
 
 .INCLUDE: target.mk
 
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-    testshl2 $(SHL1TARGETN)
+.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/osl/thread/test_thread.cxx b/sal/qa/osl/thread/test_thread.cxx
index 8a0c25e8df5b..9dbc307907b1 100644
--- a/sal/qa/osl/thread/test_thread.cxx
+++ b/sal/qa/osl/thread/test_thread.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,9 @@
 
 #include "sal/config.h"
 
-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 #include "osl/conditn.hxx"
 #include "osl/thread.hxx"
 #include "osl/time.h"
@@ -82,8 +85,10 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/alloc/jobfile.txt b/sal/qa/rtl/alloc/jobfile.txt
deleted file mode 100755
index 012ae24b4439..000000000000
--- a/sal/qa/rtl/alloc/jobfile.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# JobFile for rtl_alloc
-# header source sal/inc/rtl/alloc.h
-
-rtl_alloc.test.rtl_allocateMemory_001
-rtl_alloc.test.rtl_reallocateMemory_001
-rtl_alloc.test.rtl_freeMemory_001
-rtl_alloc.test.rtl_allocateZeroMemory_001
-
diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk
index db4f01eb439b..d829b14643c8 100755
--- a/sal/qa/rtl/alloc/makefile.mk
+++ b/sal/qa/rtl/alloc/makefile.mk
@@ -35,34 +35,30 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:jobfile by codegen.pl
-SHL1OBJS=  \
-    $(SLO)$/rtl_alloc.obj
+SHL1OBJS= $(SLO)$/rtl_alloc.obj
 
 SHL1TARGET= rtl_Alloc
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:jobfile
-# END ------------------------------------------------------------------
 
 #------------------------------- All object files -------------------------------
 # do this here, so we get right dependencies
 # SLOFILES=$(SHL1OBJS)
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE :  _cppunit.mk
-
+.INCLUDE :  $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index b6ed4d53eb91..3a3852a3b7e5 100755..100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,11 @@
 // autogenerated file with codegen.pl
 
 #include <rtl/alloc.h>
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#include <memory.h>
 
 namespace rtl_alloc
 {
@@ -60,31 +65,25 @@ class Memory : public CppUnit::TestFixture
 
 public:
     Memory()
-            :m_pMemory(NULL),
-             m_nSizeOfMemory(50 * 1024 * 1024)
-        {
-        }
+        : m_pMemory(NULL)
+        , m_nSizeOfMemory(1024)
+    {
+    }
 
     // initialise your test code values here.
     void setUp()
     {
-            t_print("allocate memory\n");
-            m_pMemory = (char*) rtl_allocateMemory( m_nSizeOfMemory );
+        m_pMemory = (char*) rtl_allocateMemory( m_nSizeOfMemory );
     }
 
     void tearDown()
     {
-            t_print("free memory\n");
-            rtl_freeMemory(m_pMemory);
-            m_pMemory = NULL;
+        rtl_freeMemory(m_pMemory);
+        m_pMemory = NULL;
     }
 
-    // insert your test code here.
     void rtl_allocateMemory_001()
     {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
         CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", m_pMemory != NULL);
         memset(m_pMemory, 1, m_nSizeOfMemory);
         CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pMemory, m_nSizeOfMemory, 1) == true);
@@ -92,8 +91,7 @@ public:
 
     void rtl_reallocateMemory_001()
     {
-        t_print("reallocate memory\n");
-        sal_uInt32 nSize = 10 * 1024 * 1024;
+        sal_uInt32 nSize = 2 * 1024;
         m_pMemory = (char*)rtl_reallocateMemory(m_pMemory, nSize);
 
         CPPUNIT_ASSERT_MESSAGE( "Can reallocate memory.", m_pMemory != NULL);
@@ -101,19 +99,9 @@ public:
         CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pMemory, nSize, 2) == true);
     }
 
-    // void rtl_freeMemory_001()
-    //     {
-    //         // CPPUNIT_ASSERT_STUB();
-    //     }
-
-    // Change the following lines only, if you add, remove or rename
-    // member functions of the current class,
-    // because these macros are need by auto register mechanism.
-
     CPPUNIT_TEST_SUITE(Memory);
     CPPUNIT_TEST(rtl_allocateMemory_001);
     CPPUNIT_TEST(rtl_reallocateMemory_001);
-    // CPPUNIT_TEST(rtl_freeMemory_001);
     CPPUNIT_TEST_SUITE_END();
 }; // class test
 
@@ -125,55 +113,46 @@ class ZeroMemory : public CppUnit::TestFixture
 
 public:
     ZeroMemory()
-            :m_pZeroMemory(NULL),
-             m_nSizeOfZeroMemory( 50 * 1024 * 1024 )
-        {
-        }
+        : m_pZeroMemory(NULL)
+        , m_nSizeOfZeroMemory( 50 * 1024 * 1024 )
+    {
+    }
 
     // initialise your test code values here.
     void setUp()
-        {
-            t_print("allocate zero memory\n");
-            m_pZeroMemory = (char*) rtl_allocateZeroMemory( m_nSizeOfZeroMemory );
-        }
+    {
+        m_pZeroMemory = (char*) rtl_allocateZeroMemory( m_nSizeOfZeroMemory );
+    }
 
     void tearDown()
     {
-            t_print("free zero memory\n");
-            rtl_freeZeroMemory(m_pZeroMemory, m_nSizeOfZeroMemory);
-            // LLA: no check possible, may GPF if there is something wrong.
-            // CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", pZeroMemory != NULL);
+        rtl_freeZeroMemory(m_pZeroMemory, m_nSizeOfZeroMemory);
+        // LLA: no check possible, may GPF if there is something wrong.
+        // CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", pZeroMemory != NULL);
     }
 
     // insert your test code here.
 
     void rtl_allocateZeroMemory_001()
     {
-            CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", m_pZeroMemory != NULL);
-            CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 0) == true);
+        CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", m_pZeroMemory != NULL);
+        CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 0) == true);
 
-            memset(m_pZeroMemory, 3, m_nSizeOfZeroMemory);
-            CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 3) == true);
+        memset(m_pZeroMemory, 3, m_nSizeOfZeroMemory);
+        CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 3) == true);
     }
 
-    // Change the following lines only, if you add, remove or rename
-    // member functions of the current class,
-    // because these macros are need by auto register mechanism.
-
     CPPUNIT_TEST_SUITE(ZeroMemory);
     CPPUNIT_TEST(rtl_allocateZeroMemory_001);
     CPPUNIT_TEST_SUITE_END();
-}; // class test
+};
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_alloc::Memory, "rtl_alloc");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_alloc::ZeroMemory, "rtl_alloc");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::Memory);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::ZeroMemory);
 } // namespace rtl_alloc
 
 
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/bootstrap/bootstrap_process.cxx b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
index 85dbfa90b4a3..702201666707 100644
--- a/sal/qa/rtl/bootstrap/bootstrap_process.cxx
+++ b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,7 +45,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     //custom .ini/rc file
     Bootstrap aBs_custom( OUString::createFromAscii(argv[3]) );
     OUString suValue;
-    OUString suDefault( OUString::createFromAscii("mydefault") );
+    OUString suDefault( RTL_CONSTASCII_USTRINGPARAM("mydefault") );
     int flag = atoi( argv[1] );
 
     switch( flag ) {
@@ -53,7 +54,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         aBootstrap.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("UNO_SERVICES")),
             suValue );
-        if (suValue.equalsAscii("service.rdb") )
+        if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("service.rdb")) )
         {
             return 10;
         }
@@ -64,7 +65,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         aBootstrap.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")),
             suValue );
-        if (suValue.equalsAscii("true") )
+        if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) )
         {
             return 20;
         }
@@ -75,7 +76,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         aBootstrap.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("QADEV_BOOTSTRAP")),
             suValue );
-        if (suValue.equalsAscii("sun&ms") )
+        if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sun&ms")) )
         {
             return 30;
         }
@@ -86,7 +87,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         aBs_custom.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("RTLVALUE")),
             suValue );
-        if (suValue.equalsAscii("qadev17") )
+        if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("qadev17")) )
         {
             return 40;
         }
@@ -97,7 +98,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         aBs_custom.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")),
             suValue );
-        if (suValue.equalsAscii("true") )
+        if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) )
         {
             return 50;
         }
@@ -108,7 +109,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         aBs_custom.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("ABCDE")),
             suValue, suDefault );
-        if (suValue.equalsAscii("mydefault") )
+        if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("mydefault")) )
         {
             return 60;
         }
@@ -116,3 +117,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             return 61;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/bootstrap/makefile.mk b/sal/qa/rtl/bootstrap/makefile.mk
index d32f9db35383..c1b9c2f3e658 100644
--- a/sal/qa/rtl/bootstrap/makefile.mk
+++ b/sal/qa/rtl/bootstrap/makefile.mk
@@ -38,11 +38,9 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 .IF "$(GUI)"=="WNT"
-#BOOTSTRAPSCRIPT=bootstrap.bat
 BOOTSTRAPINI=testshl2.ini
 MY_SCRIPTCAT=cat
 .ELSE
-#BOOTSTRAPSCRIPT=bootstrap
 BOOTSTRAPINI=testshl2rc
 MY_SCRIPTCAT=tr -d "\015" <
 .ENDIF
@@ -58,33 +56,20 @@ SHL1OBJS=  \
     $(SLO)$/rtl_Bootstrap.obj
 
 SHL1TARGET= rtl_Bootstrap
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 OBJ2FILES=$(OBJ)$/bootstrap_process.obj
 APP2TARGET=bootstrap_process
 APP2OBJS=$(OBJ2FILES)
-
-# .IF "$(GUI)" == "UNX"
-# APP2STDLIBS=$(LB)$/libsal.so
-# .ENDIF
-# .IF "$(GUI)" == "WNT"
-# APP2STDLIBS=$(KERNEL32LIB) $(LB)$/isal.lib
-# .ENDIF
 APP2STDLIBS=$(SALLIB)
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index efaa7dc531bc..e0499a4e7025 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,8 +40,6 @@
 #include "testshl/stringhelper.hxx"
 
 #include <testshl/simpleheader.hxx>
-//#include "stringhelper.hxx"
-//#include "valueequal.hxx"
 #include <rtl/bootstrap.hxx>
 
 #include <rtl/ustrbuf.hxx>
@@ -52,9 +51,10 @@
 
 #include <osl/thread.hxx>
 
-// using namespace osl;
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 #define TESTSHL2_INI "testshl2"
 #define PSEUDO_INI   "pseudo"
 
@@ -63,7 +63,7 @@ using namespace rtl;
 inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = "" )
 {
 
-    if (strlen(msg) > 0)
+    if (msg && msg[0] != 0)
     {
         t_print("%s: ", msg );
     }
@@ -78,7 +78,7 @@ bool t_fileExist(rtl::OUString const& _sFilename)
 {
     ::osl::FileBase::RC   nError1;
     ::osl::File aTestFile( _sFilename );
-    nError1 = aTestFile.open ( OpenFlag_Read );
+    nError1 = aTestFile.open ( osl_File_OpenFlag_Read );
     if ( ( ::osl::FileBase::E_NOENT != nError1 ) && ( ::osl::FileBase::E_ACCES != nError1 ) )
     {
         aTestFile.close( );
@@ -96,7 +96,7 @@ inline ::rtl::OUString getModulePath( void )
 
     suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') );
     suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') + 1);
-    suDirPath += rtl::OUString::createFromAscii("bin");
+    suDirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin"));
     return suDirPath;
 }
 
@@ -123,32 +123,14 @@ inline rtl::OUString t_getSourcePath(rtl::OString const& _sFilename)
 {
 
      rtl::OUString aDirURL(getExecutableDirectory());
-     aDirURL += OUString::createFromAscii( "/");
+     aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
      aDirURL += OUString::createFromAscii( _sFilename.getStr() );
-#if defined(WNT) || defined(OS2)
-    aDirURL += rtl::OUString::createFromAscii(".ini");
+#if defined(WNT)
+    aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ini"));
 #else
-    aDirURL += rtl::OUString::createFromAscii("rc");
+    aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rc"));
 #endif
     return aDirURL;
-
-// LLA: does not right work on my personal laptop, SRC_ROOT does not show where the source is :-(.
-/*
-  sal_Char *  pStr = getenv("SRC_ROOT");
-  rtl::OUString suPath;
-  if (filename != "")
-  {
-  suPath = rtl::OUString::createFromAscii(pStr) + rtl::OUString::createFromAscii( "/sal/qa/rtl/bootstrap/" )
-  + rtl::OUString::createFromAscii( filename );
-  }
-  else
-  {
-  suPath = rtl::OUString::createFromAscii(pStr) + rtl::OUString::createFromAscii( "/sal/qa/rtl/bootstrap" );
-  }
-  rtl::OUString suURL;
-  ::osl::FileBase::getFileURLFromSystemPath( suPath, suURL );
-  return suURL;
-*/
 }
 
 void thread_sleep_tenth_sec(sal_Int32 _nTenthSec)
@@ -156,7 +138,7 @@ void thread_sleep_tenth_sec(sal_Int32 _nTenthSec)
 #ifdef WNT      //Windows
     Sleep(_nTenthSec * 100 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )
     TimeValue nTV;
     nTV.Seconds = static_cast<sal_uInt32>( _nTenthSec/10 );
     nTV.Nanosec = ( (_nTenthSec%10 ) * 100000000 );
@@ -186,7 +168,7 @@ namespace rtl_Bootstrap
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 printUString( suIniname );
                 Bootstrap aBootstrap( suIniname );
-                rtl::OUString suGetname; // = rtl::OUString::createFromAscii("");
+                rtl::OUString suGetname; // = rtl::OUString();
                 aBootstrap.getIniName( suGetname );
                 printUString( suGetname );
 
@@ -231,7 +213,7 @@ namespace rtl_Bootstrap
             {
                 Bootstrap aBootstrap;
                 rtl::OUString suValue;
-                rtl::OUString suValuename = rtl::OUString::createFromAscii( "SOLAR_JAVA" );
+                rtl::OUString suValuename (RTL_CONSTASCII_USTRINGPARAM("SOLAR_JAVA"));
                 //aBootstrap.getFrom( suValuename, suValue );
                 aBootstrap.getFrom( suValuename, suValue );
                 sal_Char *  pStr = getenv("SOLAR_JAVA");
@@ -243,7 +225,7 @@ namespace rtl_Bootstrap
            {
            Bootstrap aBootstrap;
            rtl::OUString suValue;
-           rtl::OUString suValuename = rtl::OUString::createFromAscii( "SRC_ROOT" );
+           rtl::OUString suValuename (RTL_CONSTASCII_USTRINGPARAM("SRC_ROOT"));
            //aBootstrap.getFrom( suValuename, suValue );
            aBootstrap.getFrom( suValuename, suValue );
            sal_Char *  pStr = getenv("SRC_ROOT");
@@ -264,7 +246,7 @@ namespace rtl_Bootstrap
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap aBootstrap( suIniname );
                 rtl::OUString suGetname;
-                rtl::OUString suValuename = rtl::OUString::createFromAscii( "INHERITED_VALUE" );
+                rtl::OUString suValuename (RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
                 aBootstrap.getFrom( suValuename, suGetname );
                 printUString( suGetname );
                 CPPUNIT_ASSERT_MESSAGE("get the value of a variable in ini file.", suGetname.getLength() != 0 );
@@ -276,10 +258,9 @@ namespace rtl_Bootstrap
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap aBootstrap( suIniname );
                 rtl::OUString suGetname;
-                rtl::OUString suValuename = rtl::OUString::createFromAscii( "MY_VALUE" );
-                rtl::OUString myDefault = rtl::OUString::createFromAscii( "2" );
+                rtl::OUString suValuename(RTL_CONSTASCII_USTRINGPARAM("MY_VALUE"));
+                rtl::OUString myDefault(RTL_CONSTASCII_USTRINGPARAM("2"));
                 aBootstrap.getFrom( suValuename, suGetname, myDefault );
-                //printUString( suGetname );
                 CPPUNIT_ASSERT_MESSAGE("getFrom use default.", suGetname.compareTo( myDefault ) == 0 );
             }
 
@@ -295,29 +276,26 @@ namespace rtl_Bootstrap
                 aBootstrap.getIniName( suGetIniName );
 
                 printUString(suGetIniName, "Current bootstrap file");
-                sal_Int32 nIndex = suGetIniName.indexOf(rtl::OUString::createFromAscii( "pseudo" ));
+                sal_Int32 nIndex = suGetIniName.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pseudo")));
                 CPPUNIT_ASSERT_MESSAGE("ini name must have 'pseudo' in name.", nIndex > 0);
 
-                // rtlBootstrapHandle bsHandle = aBootstrap.getHandle();
-                // CPPUNIT_ASSERT_MESSAGE("getHandle return NULL!", bsHandle != 0);
-
                 rtl::OUString suValue;
-                rtl::OUString suKeyName = rtl::OUString::createFromAscii( "FILE" );
+                rtl::OUString suKeyName(RTL_CONSTASCII_USTRINGPARAM("FILE"));
                 aBootstrap.getFrom( suKeyName, suValue );
                 printUString( suValue );
-                sal_Int32 nCompare = suValue.compareTo( rtl::OUString::createFromAscii("pseudo file") );
+                sal_Int32 nCompare = suValue.compareTo( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pseudo file")) );
 
                 CPPUNIT_ASSERT_MESSAGE("<Bootstrap('pseudo')>.getFrom('FILE', ...) result is unexpected.",  nCompare == 0);
             }
         void getFrom_004_1()
             {
                 // get the same key out of the default context
-                rtl::OUString suKeyName = rtl::OUString::createFromAscii( "FILE" );
+                rtl::OUString suKeyName(RTL_CONSTASCII_USTRINGPARAM("FILE"));
                 rtl::OUString suGetValue;
                 Bootstrap::get( suKeyName, suGetValue );
                 printUString( suGetValue );
 
-                CPPUNIT_ASSERT_MESSAGE("Bootstrap::get('FILE', ...)", suGetValue.compareTo( rtl::OUString::createFromAscii("testshl2 file") ) == 0 );
+                CPPUNIT_ASSERT_MESSAGE("Bootstrap::get('FILE', ...)", suGetValue.compareTo( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testshl2 file")) ) == 0 );
             }
 
     /** helper function: return the child process's ret value( typedef sal_uInt32 oslProcessExitCode;)
@@ -328,17 +306,16 @@ namespace rtl_Bootstrap
          rtl::OUString suCWD = getModulePath();
             oslProcess hProcess = NULL;
            rtl::OUString suFileURL = suCWD;
-            suFileURL += rtl::OUString::createFromAscii("/") +  rtl::OUString::createFromAscii(process_name) ;
-#if defined(WNT) || defined(OS2)
-        suFileURL += rtl::OUString::createFromAscii(".exe");
+            suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +  rtl::OUString::createFromAscii(process_name) ;
+#if defined(WNT)
+        suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe"));
 #endif
             const int nParameterCount = 3;
             rtl_uString* pParameters[ nParameterCount ];
             OUString suFlag( OUString::createFromAscii(flag) );
-        OUString suEnv1( OUString::createFromAscii("-env:UNO_SERVICES=service.rdb"));
+        OUString suEnv1( RTL_CONSTASCII_USTRINGPARAM("-env:UNO_SERVICES=service.rdb") );
         OUString suIniname = t_getSourcePath("rtl");
         printUString( suIniname, "rtl path:");
-        //OUString suEnv2( OUString::createFromAscii("-env:MYENV=bootstrap_process"));
 
             pParameters[0] = suFlag.pData;
             pParameters[1] = suEnv1.pData;
@@ -453,7 +430,6 @@ namespace rtl_Bootstrap
                 rtl::OUString suGetIniname;
                 aBootstrap.getIniName( suGetIniname );
                 //which should be .....testshl2rc
-                //printUString( suGetIniname );
 
                 rtl::OUString suIniname = t_getSourcePath(PSEUDO_INI);
                 Bootstrap::setIniFilename( suIniname );
@@ -469,13 +445,10 @@ namespace rtl_Bootstrap
         void setIniFilename_002()
             {
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
-                // CPPUNIT_ASSERT_MESSAGE("test failed, Bootstrap ini does not exist.", t_fileExist(suIniname ) == true);
 
                 Bootstrap::setIniFilename( suIniname );
-                //rtl_bootstrap_args_open( suIniname.pData );
                 rtl::OUString suGetname;
-                rtl::OUString suValuename = rtl::OUString::createFromAscii( "INHERITED_VALUE" );
-                //aBootstrap.getFrom( suValuename, suGetname  );
+                rtl::OUString suValuename(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
                 Bootstrap::get( suValuename, suGetname  );
                 printUString( suGetname );
                 CPPUNIT_ASSERT_MESSAGE("setIniFilename and get value of the argument.", suGetname.getLength() != 0 );
@@ -514,18 +487,12 @@ namespace rtl_Bootstrap
                 rtlBootstrapHandle bsHandle = aBootstrap.getHandle();
                 CPPUNIT_ASSERT_MESSAGE("getHandle return NULL!", bsHandle != 0);
 
-                //rtl::OUString iniName;
-                //rtl_bootstrap_get_iniName_from_handle( bsHandle, &iniName.pData );
-
                 rtl::OUString suValue;
-                rtl::OUString suKeyName = rtl::OUString::createFromAscii( "PSEUDOFILE" );
+                rtl::OUString suKeyName(RTL_CONSTASCII_USTRINGPARAM("PSEUDOFILE"));
                 rtl_bootstrap_get_from_handle(bsHandle, suKeyName.pData, &suValue.pData, NULL);
                 printUString( suValue);
 
-                CPPUNIT_ASSERT_MESSAGE("Can not use the handle which is returned by getHandle!", suValue.equals( rtl::OUString::createFromAscii("be pseudo") ) == sal_True );
-
-                // CPPUNIT_ASSERT_MESSAGE("Can not use the handle which is returned by getHandle!",
-                //      suGetname.equalsIgnoreAsciiCase( iniName ) == sal_True );
+                CPPUNIT_ASSERT_MESSAGE("Can not use the handle which is returned by getHandle!", suValue.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("be pseudo")) ) == sal_True );
             }
 
         CPPUNIT_TEST_SUITE(getHandle);
@@ -551,8 +518,8 @@ namespace rtl_Bootstrap
                 //in ini fle, INHERITED_VALUE=inherited_value
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap aBootstrap( suIniname);
-                rtl::OUString suName = rtl::OUString::createFromAscii( "INHERITED_VALUE" );
-                rtl::OUString suValue = rtl::OUString::createFromAscii( "ok" );
+                rtl::OUString suName(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
+                rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM("ok"));
                 // set to another value
                 Bootstrap::set( suName, suValue );
                 rtl::OUString suGetValue;
@@ -563,13 +530,13 @@ namespace rtl_Bootstrap
             {
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap myBootstrap( suIniname);
-                rtl::OUString suName = rtl::OUString::createFromAscii( "INHERITED_VALUE" );
+                rtl::OUString suName(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
                 rtl::OUString suGetOrientValue;
                 Bootstrap::get( suName, suGetOrientValue);
                 // ??  INHERITED_VALUE = ok now, which is set in set_001
                 printUString( suGetOrientValue );
 
-                rtl::OUString suValue = rtl::OUString::createFromAscii( TESTSHL2_INI );
+                rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM( TESTSHL2_INI ));
                 // set to another value
                 Bootstrap::set( suName, suValue );
                 rtl::OUString suGetValue;
@@ -597,12 +564,10 @@ namespace rtl_Bootstrap
             {
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap aBootstrap( suIniname);
-                rtl::OUString suMacro = rtl::OUString::createFromAscii( "$MYVAR/expand1" );
-                //printUString( suMacro );
+                rtl::OUString suMacro(RTL_CONSTASCII_USTRINGPARAM("$MYVAR/expand1"));
                 //expandMacro now
                 aBootstrap.expandMacrosFrom( suMacro );
-                rtl::OUString suExpectedMacro = rtl::OUString::createFromAscii( "src680_test/expand1" );
-                //printUString( suMacro );
+                rtl::OUString suExpectedMacro(RTL_CONSTASCII_USTRINGPARAM("src680_test/expand1"));
                 CPPUNIT_ASSERT_MESSAGE("expandMacrosFrom failed.", suMacro.compareTo(suExpectedMacro) == 0 );
             }
 
@@ -620,27 +585,26 @@ namespace rtl_Bootstrap
                 t_print("inifile is:");
                 printUString( suIniname );
                 Bootstrap aBootstrap( suIniname) ;
-                  rtl::OUString suMacro = rtl::OUString::createFromAscii( "${" );         //rtlrc:Bootstrap:RTLVALUE}");
+                  rtl::OUString suMacro(RTL_CONSTASCII_USTRINGPARAM("${"));         //rtlrc:Bootstrap:RTLVALUE}");
 
-     rtl::OUString aDirURL = OUString::createFromAscii( "$ORIGIN");
-     aDirURL += OUString::createFromAscii( "/");
-     aDirURL += OUString::createFromAscii( "rtl" );
-#if defined(WNT) || defined(OS2)
-    aDirURL += rtl::OUString::createFromAscii(".ini");
+     rtl::OUString aDirURL(RTL_CONSTASCII_USTRINGPARAM("$ORIGIN"));
+     aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+     aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("rtl"));
+#if defined(WNT)
+    aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ini"));
 #else
-    aDirURL += rtl::OUString::createFromAscii("rc");
+    aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rc"));
 #endif
 
                 suMacro += aDirURL;//t_getSourcePath("rtl");
-                suMacro += rtl::OUString::createFromAscii( "::RTLVALUE}");
+                suMacro += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("::RTLVALUE}"));
 
                 t_print("created macro is: ");
                 printUString( suMacro );
-                //expandMacro now
                 aBootstrap.expandMacrosFrom( suMacro );
                 t_print("expanded macro is:");
                 printUString( suMacro );
-                rtl::OUString suExpectedMacro = rtl::OUString::createFromAscii( "qadev17" );
+                rtl::OUString suExpectedMacro(RTL_CONSTASCII_USTRINGPARAM("qadev17"));
                 CPPUNIT_ASSERT_MESSAGE("failed, can't expand '${file:///.../" SAL_CONFIGFILE("rtl") "::RTLVALUE}' to 'qadev17'", suMacro.compareTo(suExpectedMacro) == 0 );
             }
         void expandMacrosFrom_002_1()
@@ -652,22 +616,19 @@ namespace rtl_Bootstrap
 
                 rtl::OUString suMacro;
                 // just a simple test, if this really work.
-                aBootstrap.getFrom(rtl::OUString::createFromAscii( "SOFROMVALUE2" ), suMacro );
+                aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE2")), suMacro );
                 t_print("SOFROMVALUE2:");
                 printUString( suMacro );
                 CPPUNIT_ASSERT_MESSAGE("'SOFROMVALUE2' seems to do not exist.", suMacro.getLength() > 0 );
 
-                aBootstrap.getFrom(rtl::OUString::createFromAscii( "SOFROMVALUE" ), suMacro );
+                aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE")), suMacro );
 
                 t_print("SOFROMVALUE:");
                 printUString( suMacro );
 
                 //expandMacro now
                 // seems to be, that getFrom() already expand the string
-                // t_print("expanded macro is:");
-                // aBootstrap.expandMacrosFrom( suMacro );
-                // printUString( suMacro );
-                rtl::OUString suExpectedMacro = rtl::OUString::createFromAscii( "src680_qadev" );
+                rtl::OUString suExpectedMacro(RTL_CONSTASCII_USTRINGPARAM("src680_qadev"));
                 CPPUNIT_ASSERT_MESSAGE("failed, can't expand '${" SAL_CONFIGFILE("rtl") "::SOVALUE}' to 'src680_qadev'", suMacro.compareTo(suExpectedMacro) == 0 );
             }
         void expandMacrosFrom_002_2()
@@ -681,67 +642,35 @@ namespace rtl_Bootstrap
                 Bootstrap aBootstrap( suIniname);
 
                 rtl::OUString suMacro;
-                aBootstrap.getFrom(rtl::OUString::createFromAscii( "SOFROMVALUE3" ), suMacro );
+                aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE3")), suMacro );
 
                 t_print("SOFROMVALUE3:");
                 printUString( suMacro );
 
-                if (suMacro.equals(rtl::OUString::createFromAscii("testshl2_file") ) == sal_True)
+                if (suMacro.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testshl2_file")) ) == sal_True)
                 {
                     CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE3' is read from the wrong ini file.", 0 );
                 }
                 else
                 {
-                    CPPUNIT_ASSERT_MESSAGE("SOFROMVALUE3 should contain 'rtlfile'.", suMacro.equals(rtl::OUString::createFromAscii("rtlfile") ) == sal_True );
+                    CPPUNIT_ASSERT_MESSAGE("SOFROMVALUE3 should contain 'rtlfile'.", suMacro.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rtlfile")) ) == sal_True );
                 }
             }
-//? I don't know if this is a right test.
-//         void expandMacrosFrom_002_3()
-//             {
-//                 // test, to read and expand SOFROMVALUE4
-//                 // SOFROMVALUE4 is 'rtl(.ini|rc):Other_Section:TESTSHL_SOVALUE' which should expand to '' if all is ok.
-//
-//                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
-//                 t_print("inifile is:");
-//              printUString( suIniname );
-//                 Bootstrap aBootstrap( suIniname);
-//
-//                 rtl::OUString suMacro;
-//                 aBootstrap.getFrom(rtl::OUString::createFromAscii( "SOFROMVALUE4" ), suMacro );
-//
-//                 t_print("SOFROMVALUE4:");
-//                 printUString( suMacro );
-//
-//                 if (suMacro.equals(rtl::OUString::createFromAscii("testshl2_file") ) == sal_True)
-//                 {
-//                     CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE4' is read from the wrong section out of the wrong ini file.", 0 );
-//                 }
-//                 else if (suMacro.equals(rtl::OUString::createFromAscii("testshl2_file_other") ) == sal_True)
-//                 {
-//                     CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE4' is read from the wrong ini file.", 0 );
-//                 }
-//                 else
-//                 {
-//                     CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE4' should contain 'rtlfile_other'.", suMacro.equals(rtl::OUString::createFromAscii("rtlfile_other") ) == sal_True );
-//                 }
-//             }
         void expandMacrosFrom_003()
             {
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap aBootstrap( suIniname);
                 rtl::OUString suMacro[4];
-                suMacro[0] = rtl::OUString::createFromAscii( "$SYSUSERCONFIG" );
-                suMacro[1] = rtl::OUString::createFromAscii( "$SYSUSERHOME" );
-                suMacro[2] = rtl::OUString::createFromAscii( "$SYSBINDIR" );
-                suMacro[3] = rtl::OUString::createFromAscii( "$ORIGIN" );
+                suMacro[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERCONFIG"));
+                suMacro[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERHOME"));
+                suMacro[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSBINDIR"));
+                suMacro[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$ORIGIN"));
 
                 for ( int i = 0; i < 4; i++ )
                 {
                     aBootstrap.expandMacrosFrom( suMacro[i] );
                     printUString(suMacro[i]);
                 }
-                // printUString( t_getSourcePath("") );
-                // CPPUNIT_ASSERT_MESSAGE("some integral variables.", suMacro[3].equalsIgnoreAsciiCase(t_getSourcePath("")) == sal_True );
                 CPPUNIT_ASSERT_MESSAGE("some integral variables.", suMacro[0].getLength() > 0 &&
                                        suMacro[1].getLength() > 0 &&
                                        suMacro[2].getLength() > 0 &&
@@ -819,7 +748,6 @@ namespace rtl_Bootstrap
         CPPUNIT_TEST(expandMacrosFrom_002);
         CPPUNIT_TEST(expandMacrosFrom_002_1);
         CPPUNIT_TEST(expandMacrosFrom_002_2);
-//?        CPPUNIT_TEST(expandMacrosFrom_002_3);
         CPPUNIT_TEST(expandMacrosFrom_003);
         CPPUNIT_TEST(testRecursion);
         CPPUNIT_TEST(testLink);
@@ -845,13 +773,13 @@ namespace rtl_Bootstrap
             {
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap aBootstrap( suIniname) ;
-                rtl::OUString suMacro = rtl::OUString::createFromAscii( "$INHERITED_VALUE/well" );
+                rtl::OUString suMacro(RTL_CONSTASCII_USTRINGPARAM("$INHERITED_VALUE/well"));
                 Bootstrap::expandMacros( suMacro );
 
-        rtl::OUString suName = rtl::OUString::createFromAscii( "INHERITED_VALUE" );
+        rtl::OUString suName(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
                 OUString suGetValue;
                 Bootstrap::get( suName, suGetValue );
-                suGetValue += OUString::createFromAscii( "/well" );
+                suGetValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/well"));
                 CPPUNIT_ASSERT_MESSAGE("expandMacros failed.", suGetValue.compareTo(suMacro) == 0 );
             }
 
@@ -873,38 +801,17 @@ namespace rtl_Bootstrap
 
 // -----------------------------------------------------------------------------
 
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-// NOADDITIONAL;
-
-
-// Here are some helpers, which create a new file 'rtlrc' at the executable path position
-// and fill the file with some information.
-// static rtl::OUString getExecutableDirectory()
-// {
-//     rtl::OUString fileName;
-//     osl_getExecutableFile(&fileName.pData);
-//
-//     sal_Int32 nDirEnd = fileName.lastIndexOf('/');
-//
-//     OSL_ENSURE(nDirEnd >= 0, "Cannot locate executable directory");
-//
-//     rtl::OUString aDirURL = fileName.copy(0, nDirEnd);
-//     return aDirURL;
-// }
-
 static void removeAndCreateFile(rtl::OUString const& _suFileURL, rtl::OString const& _sContent)
 {
     osl::File::remove(_suFileURL);
 
     ::std::auto_ptr<osl::File> pFile( new osl::File( _suFileURL ) );
-    ::osl::FileBase::RC nError = pFile->open( OpenFlag_Write | OpenFlag_Create );
+    ::osl::FileBase::RC nError = pFile->open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
     if ( ::osl::FileBase::E_None == nError || ::osl::FileBase::E_EXIST == nError )
     {
         t_print(T_VERBOSE, "%s\n" , OString(_suFileURL, _suFileURL.getLength(), RTL_TEXTENCODING_ASCII_US).getStr());
         sal_uInt64 nWritenBytes;
         pFile->write(_sContent.getStr(), _sContent.getLength(), nWritenBytes);
-        // t_print("nBytes: %ld\n", nBytes);
 
         rtl::OString sError = "can't write enough bytes to file";
         sError += OString(_suFileURL, _suFileURL.getLength(), RTL_TEXTENCODING_ASCII_US);
@@ -929,10 +836,10 @@ static void removeAndCreateFile(rtl::OUString const& _suFileURL, rtl::OString co
 static void create_rtlrc()
 {
     rtl::OUString aFileURL(getExecutableDirectory());
-#if defined(WNT) || defined(OS2)
-    aFileURL += rtl::OUString::createFromAscii("/rtl.ini");
+#if defined(WNT)
+    aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/rtl.ini"));
 #else
-    aFileURL += rtl::OUString::createFromAscii("/rtlrc");
+    aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/rtlrc"));
 #endif
 
     rtl::OString sLines;
@@ -952,10 +859,10 @@ static void create_rtlrc()
 static void create_testshl2rc()
 {
     rtl::OUString aFileURL(getExecutableDirectory());
-#if defined(WNT) || defined(OS2)
-    aFileURL += rtl::OUString::createFromAscii("/testshl2.ini");
+#if defined(WNT)
+    aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2.ini"));
 #else
-    aFileURL += rtl::OUString::createFromAscii("/testshl2rc");
+    aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2rc"));
 #endif
     rtl::OString sLines;
     sLines += "[Bootstrap]\n";
@@ -968,7 +875,6 @@ static void create_testshl2rc()
     sLines += "SOFROMVALUE2=test\n";
     sLines += "SOFROMVALUE3=${$ORIGIN/" SAL_CONFIGFILE("rtl") "::TESTSHL_SOVALUE}\n";
     sLines += "TESTSHL_SOVALUE=testshl2_file\n";
-    //? sLines += "SOFROMVALUE4=${" SAL_CONFIGFILE("rtl") ":Other_Section:TESTSHL_SOVALUE}\n";
     sLines += "ILLEGAL VALUE=test\n";
     sLines += "ILLEGAL.DOT=test\n";
     sLines += "ILLEGAL;SEMICOLON=test\n";
@@ -979,7 +885,6 @@ static void create_testshl2rc()
     sLines += "[Other_Section]\n";
     sLines += "FILE=testshl2 file other\n";
     sLines += "EXPAND=$FILE\n";
-    //? sLines += "TESTSHL_SOVALUE=testshl2_file_other\n";
 
     removeAndCreateFile(aFileURL, sLines);
 
@@ -994,10 +899,10 @@ static void create_testshl2rc()
 static void create_pseudorc()
 {
     rtl::OUString aFileURL(getExecutableDirectory());
-#if defined(WNT) || defined(OS2)
-    aFileURL += rtl::OUString::createFromAscii("/pseudo.ini");
+#if defined(WNT)
+    aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/pseudo.ini"));
 #else
-    aFileURL += rtl::OUString::createFromAscii("/pseudorc");
+    aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/pseudorc"));
 #endif
     rtl::OString sLines;
     sLines += "[Bootstrap]\n";
@@ -1011,10 +916,10 @@ static void create_pseudorc()
 void create_bootstrap_processrc()
 {
     rtl::OUString aDirURL(getModulePath());
-#if defined(WNT) || defined(OS2)
-    aDirURL += rtl::OUString::createFromAscii("/bootstrap_process.ini");
+#if defined(WNT)
+    aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/bootstrap_process.ini"));
 #else
-    aDirURL += rtl::OUString::createFromAscii("/bootstrap_processrc");
+    aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/bootstrap_processrc"));
 #endif
     rtl::OString sLines;
     sLines += "[Bootstrap]\n";
@@ -1038,3 +943,4 @@ void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc)
     t_print(T_VERBOSE, "Initialization Done.\n" );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk
index b89e392d71d6..30fc67825a0c 100644
--- a/sal/qa/rtl/cipher/makefile.mk
+++ b/sal/qa/rtl/cipher/makefile.mk
@@ -37,6 +37,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
@@ -48,7 +50,7 @@ SHL1OBJS=  \
     $(SLO)$/rtl_cipher.obj
 
 SHL1TARGET= rtl_cipher
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -63,8 +65,9 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # do this here, so we get right dependencies
 # SLOFILES=$(SHL1OBJS)
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index 127ceef5a27e..383f56da4b88 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include <testshl/simpleheader.hxx>
+#include <cstring>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/cipher.h>
 
@@ -46,7 +52,8 @@ rtl::OString createHex(sal_uInt8 *_pKeyBuffer, sal_uInt32 _nKeyLen)
         sal_Int32 nValue = (sal_Int32)_pKeyBuffer[i];
         if (nValue < 16)                         // maximul hex value for 1 byte
         {
-            aBuffer.append( sal_Int32(0), 16 /* radix */ );
+            sal_Int32 nil = sal_Int32(0);
+            aBuffer.append( nil, 16 /* radix */ );
         }
         aBuffer.append( nValue, 16 /* radix */ );
     }
@@ -204,9 +211,6 @@ public:
             memset(pArgBuffer, 0, nArgLen);
             pArgBuffer[0] = _nArgValue;
 
-            t_print(T_VERBOSE, "  init Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "  init Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-
             rtlCipherError aError = rtl_cipher_init(aCipher, rtl_Cipher_DirectionEncode, pKeyBuffer, nKeyLen, pArgBuffer, nArgLen);
             CPPUNIT_ASSERT_MESSAGE("wrong init", aError == rtl_Cipher_E_None);
 
@@ -222,11 +226,6 @@ public:
             /* rtlCipherError */ aError = rtl_cipher_encode(aCipher, pPlainTextBuffer, nPlainTextLen, pCipherBuffer, nCipherLen);
             CPPUNIT_ASSERT_MESSAGE("wrong encode", aError == rtl_Cipher_E_None);
 
-            t_print(T_VERBOSE, "       Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "       Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-            t_print(T_VERBOSE, "     Plain: %s\n", createHex(pPlainTextBuffer, nPlainTextLen).getStr());
-            t_print(           "Cipher Buf: %s\n", createHex(pCipherBuffer, nCipherLen).getStr());
-
             sal_uInt32     nPlainText2Len = 16;
             sal_uInt8     *pPlainText2Buffer = new sal_uInt8[ nPlainText2Len ];
             memset(pPlainText2Buffer, 0, nPlainText2Len);
@@ -234,25 +233,15 @@ public:
             /* rtlCipherError */ aError = rtl_cipher_decode(aCipher, pCipherBuffer, nCipherLen, pPlainText2Buffer, nPlainText2Len);
             CPPUNIT_ASSERT_MESSAGE("decode should not work", aError != rtl_Cipher_E_None);
 
-            // rtl::OString sPlainText2Str((char*)pPlainText2Buffer, nPlainText2Len);
-            // t_print(T_VERBOSE, " Plain: %s\n", createHex(pPlainText2Buffer, nPlainText2Len).getStr());
-            // t_print(T_VERBOSE, " ascii: %s\n", sPlainText2Str.getStr());
-            //
-            // // t_print("   Buf: %s\n", createHex(pCipherBuffer, nCipherLen).getStr());
-            //
-            // sal_Int32 nCompare = memcmp(pPlainTextBuffer, pPlainText2Buffer, 16);
-            //
-            // CPPUNIT_ASSERT_MESSAGE("compare between plain and decoded plain failed", nCompare == 0);
-            //
-            // delete [] pPlainText2Buffer;
-            //
-            // delete [] pCipherBuffer;
-            // delete [] pPlainTextBuffer;
-            //
-            // delete [] pArgBuffer;
-            // delete [] pKeyBuffer;
-            //
-            // rtl_cipher_destroy(aCipher);
+            delete [] pPlainText2Buffer;
+
+            delete [] pCipherBuffer;
+            delete [] pPlainTextBuffer;
+
+            delete [] pArgBuffer;
+            delete [] pKeyBuffer;
+
+            rtl_cipher_destroy(aCipher);
         }
 
     void test_encode_and_decode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, rtl::OString const& _sPlainTextStr)
@@ -270,9 +259,6 @@ public:
             memset(pArgBuffer, 0, nArgLen);
             pArgBuffer[0] = _nArgValue;
 
-            t_print(T_VERBOSE, "  init Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "  init Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-
             rtlCipherError aError = rtl_cipher_init(aCipher, rtl_Cipher_DirectionBoth, pKeyBuffer, nKeyLen, pArgBuffer, nArgLen);
             CPPUNIT_ASSERT_MESSAGE("wrong init", aError == rtl_Cipher_E_None);
 
@@ -288,11 +274,6 @@ public:
             /* rtlCipherError */ aError = rtl_cipher_encode(aCipher, pPlainTextBuffer, nPlainTextLen, pCipherBuffer, nCipherLen);
             CPPUNIT_ASSERT_MESSAGE("wrong encode", aError == rtl_Cipher_E_None);
 
-            t_print(T_VERBOSE, "       Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "       Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-            t_print(T_VERBOSE, "     Plain: %s\n", createHex(pPlainTextBuffer, nPlainTextLen).getStr());
-            t_print(           "Cipher Buf: %s\n", createHex(pCipherBuffer, nCipherLen).getStr());
-
             sal_uInt32     nPlainText2Len = 16;
             sal_uInt8     *pPlainText2Buffer = new sal_uInt8[ nPlainText2Len ];
             memset(pPlainText2Buffer, 0, nPlainText2Len);
@@ -301,10 +282,6 @@ public:
             CPPUNIT_ASSERT_MESSAGE("wrong decode", aError == rtl_Cipher_E_None);
 
             rtl::OString sPlainText2Str((char*)pPlainText2Buffer, nPlainText2Len);
-            t_print(T_VERBOSE, "     Plain: %s\n", createHex(pPlainText2Buffer, nPlainText2Len).getStr());
-            t_print(T_VERBOSE, "  as ascii: %s\n", sPlainText2Str.getStr());
-
-            // t_print("   Buf: %s\n", createHex(pCipherBuffer, nCipherLen).getStr());
 
             sal_Int32 nCompare = memcmp(pPlainTextBuffer, pPlainText2Buffer, 16);
 
@@ -453,9 +430,6 @@ public:
             memset(pArgBuffer, 0, nArgLen);
             pArgBuffer[0] = _nArgValue;
 
-            t_print(T_VERBOSE, "init Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "init Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-
             rtlCipherError aError = rtl_cipher_init(aCipher, rtl_Cipher_DirectionEncode, pKeyBuffer, nKeyLen, pArgBuffer, nArgLen);
             CPPUNIT_ASSERT_MESSAGE("wrong init", aError == rtl_Cipher_E_None);
 
@@ -471,11 +445,6 @@ public:
             /* rtlCipherError */ aError = rtl_cipher_encode(aCipher, pDataBuffer, nDataLen, pBuffer, nLen);
             CPPUNIT_ASSERT_MESSAGE("wrong encode", aError == rtl_Cipher_E_None);
 
-            t_print(T_VERBOSE, " Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, " Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-            t_print(T_VERBOSE, "Data: %s\n", createHex(pDataBuffer, nDataLen).getStr());
-            t_print(T_VERBOSE, " Buf: %s\n", createHex(pBuffer, nLen).getStr());
-
             delete [] pBuffer;
             delete [] pDataBuffer;
 
@@ -556,15 +525,9 @@ public:
             sal_uInt8     *pArgBuffer = new sal_uInt8[ nArgLen ];
             memset(pArgBuffer, 0, nArgLen);
 
-            t_print(T_VERBOSE, "Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-
             rtlCipherError aError = rtl_cipher_init(aCipher, rtl_Cipher_DirectionEncode, pKeyBuffer, nKeyLen, pArgBuffer, nArgLen);
             CPPUNIT_ASSERT_MESSAGE("wrong init", aError == rtl_Cipher_E_None);
 
-            t_print(T_VERBOSE, "Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-
             delete [] pArgBuffer;
             delete [] pKeyBuffer;
 
@@ -585,15 +548,9 @@ public:
             sal_uInt8     *pArgBuffer = new sal_uInt8[ nArgLen ];
             memset(pArgBuffer, 0, nArgLen);
 
-            t_print(T_VERBOSE, "Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-
             rtlCipherError aError = rtl_cipher_init(aCipher, rtl_Cipher_DirectionEncode, pKeyBuffer, nKeyLen, pArgBuffer, nArgLen);
             CPPUNIT_ASSERT_MESSAGE("wrong init", aError == rtl_Cipher_E_None);
 
-            t_print(T_VERBOSE, "Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-
             delete [] pArgBuffer;
             delete [] pKeyBuffer;
 
@@ -613,15 +570,9 @@ public:
             memset(pArgBuffer, 0, nArgLen);
             pArgBuffer[0] = 1;
 
-            t_print(T_VERBOSE, "Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-
             rtlCipherError aError = rtl_cipher_init(aCipher, rtl_Cipher_DirectionEncode, pKeyBuffer, nKeyLen, pArgBuffer, nArgLen);
             CPPUNIT_ASSERT_MESSAGE("wrong init", aError == rtl_Cipher_E_None);
 
-            t_print(T_VERBOSE, "Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-
             delete [] pArgBuffer;
             delete [] pKeyBuffer;
 
@@ -642,15 +593,9 @@ public:
             memset(pArgBuffer, 0, nArgLen);
             pArgBuffer[0] = 1;
 
-            t_print(T_VERBOSE, "Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-
             rtlCipherError aError = rtl_cipher_init(aCipher, rtl_Cipher_DirectionEncode, pKeyBuffer, nKeyLen, pArgBuffer, nArgLen);
             CPPUNIT_ASSERT_MESSAGE("wrong init", aError == rtl_Cipher_E_None);
 
-            t_print(T_VERBOSE, "Key: %s\n", createHex(pKeyBuffer, nKeyLen).getStr());
-            t_print(T_VERBOSE, "Arg: %s\n", createHex(pArgBuffer, nArgLen).getStr());
-
             delete [] pArgBuffer;
             delete [] pKeyBuffer;
 
@@ -696,16 +641,16 @@ public:
 
 // -----------------------------------------------------------------------------
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_cipher::create, "rtl_cipher");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_cipher::createBF, "rtl_cipher");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_cipher::decode, "rtl_cipher");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_cipher::decodeBF, "rtl_cipher");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_cipher::destroy, "rtl_cipher");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_cipher::destroyBF, "rtl_cipher");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_cipher::encode, "rtl_cipher");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_cipher::encodeBF, "rtl_cipher");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_cipher::init, "rtl_cipher");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_cipher::initBF, "rtl_cipher");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::create);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::createBF);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::decode);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::decodeBF);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::destroy);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::destroyBF);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::encode);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::encodeBF);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::init);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::initBF);
 
 } // namespace rtl_cipher
 
@@ -714,4 +659,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_cipher::initBF, "rtl_cipher");
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/crc32/jobfile.txt b/sal/qa/rtl/crc32/jobfile.txt
deleted file mode 100755
index ddf886ba24aa..000000000000
--- a/sal/qa/rtl/crc32/jobfile.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# JobFile for rtl_crc32
-# header source sal/inc/rtl/crc.h
-
-rtl_crc32.test.rtl_crc32_001
-rtl_crc32.test.rtl_crc32_002
diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk
index 704c149d45cd..23e7fd2aa724 100755
--- a/sal/qa/rtl/crc32/makefile.mk
+++ b/sal/qa/rtl/crc32/makefile.mk
@@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
@@ -46,7 +48,7 @@ SHL1OBJS=  \
     $(SLO)$/rtl_crc32.obj
 
 SHL1TARGET= rtl_crc32
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -61,8 +63,9 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # do this here, so we get right dependencies
 # SLOFILES=$(SHL1OBJS)
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx
index 64033b7b8ca9..1e054a948882 100755..100644
--- a/sal/qa/rtl/crc32/rtl_crc32.cxx
+++ b/sal/qa/rtl/crc32/rtl_crc32.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,10 @@
 #include "precompiled_sal.hxx"
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
 #include <rtl/crc.h>
 
 namespace rtl_CRC32
@@ -169,7 +173,7 @@ public:
 }; // class test
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_CRC32::test, "rtl_crc32");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_CRC32::test);
 } // namespace rtl_CRC32
 
 
@@ -177,5 +181,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_CRC32::test, "rtl_crc32");
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/digest/makefile.mk b/sal/qa/rtl/digest/makefile.mk
index 7798004ed854..d6c557f7dd0f 100644
--- a/sal/qa/rtl/digest/makefile.mk
+++ b/sal/qa/rtl/digest/makefile.mk
@@ -36,10 +36,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
+DLLPRE = # no leading "lib" on .so files
 
 #----------------------------------- OStringBuffer -----------------------------------
 
@@ -47,18 +45,17 @@ SHL1OBJS= \
     $(SLO)$/rtl_digest.obj
 
 SHL1TARGET= rtl_digest
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME=    $(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES= \
+    $(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index 1a99ff285762..ffd0af4126d2 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,13 +29,19 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <testshl/simpleheader.hxx>
+
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
 #include <rtl/digest.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
 
+#include <string.h>
+
 // sample, how to use digest
 
 rtl::OUString CreateMD5FromString( const rtl::OUString& aMsg )
@@ -57,7 +64,7 @@ rtl::OUString CreateMD5FromString( const rtl::OUString& aMsg )
 
         // Create hex-value string from the MD5 value to keep the string size minimal
         rtl::OUStringBuffer aBuffer( nMD5KeyLen * 2 + 1 );
-        for ( sal_uInt32 i = 0; i < nMD5KeyLen; i++ )
+        for ( sal_uInt32 i = 0; i < nMD5KeyLen; ++i )
             aBuffer.append( (sal_Int32)pMD5KeyBuffer[i], 16 );
 
         delete [] pMD5KeyBuffer;
@@ -133,7 +140,7 @@ public:
     void create_007()
         {
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmInvalid );
-            t_print("Handle is %x\n", handle);
+            printf("Handle is %p\n", handle);
             CPPUNIT_ASSERT_MESSAGE("create with NULL", handle == 0);
             rtl_digest_destroy( handle );
         }
@@ -436,7 +443,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query Length", RTL_DIGEST_LENGTH_MD5 == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -446,7 +453,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD2 );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query length", RTL_DIGEST_LENGTH_MD2 == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -456,7 +463,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmSHA );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query length", RTL_DIGEST_LENGTH_SHA == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -466,7 +473,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query length", RTL_DIGEST_LENGTH_SHA1 == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -476,7 +483,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmHMAC_MD5 );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query length", RTL_DIGEST_LENGTH_HMAC_MD5 == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -486,7 +493,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmHMAC_SHA1 );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query length", RTL_DIGEST_LENGTH_HMAC_SHA1 == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -497,7 +504,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmInvalid );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query length", 0 == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -524,13 +531,11 @@ rtl::OString createHex(sal_uInt8 *_pMD5KeyBuffer, sal_uInt32 _nMD5KeyLen)
 {
     // Create hex-value string from the MD5 value to keep the string size minimal
     rtl::OStringBuffer aBuffer( _nMD5KeyLen * 2 + 1 );
-    for ( sal_uInt32 i = 0; i < _nMD5KeyLen; i++ )
+    for ( sal_uInt32 i = 0; i < _nMD5KeyLen; ++i )
     {
         sal_Int32 nValue = (sal_Int32)_pMD5KeyBuffer[i];
         if (nValue < 16)                         // maximul hex value for 1 byte
-        {
-            aBuffer.append( sal_Int32(0), 16 /* radix */ );
-        }
+            aBuffer.append( static_cast<sal_Int32>(0), static_cast<sal_Int16>(16) /* radix */ );
         aBuffer.append( nValue, 16 /* radix */ );
     }
 
@@ -593,7 +598,7 @@ public:
             rtl::OString aSum = createHex(pKeyBuffer, nKeyLen);
             delete [] pKeyBuffer;
 
-            t_print("MD2 Sum: %s\n", aSum.getStr());
+            printf("MD2 Sum: %s\n", aSum.getStr());
             // LLA: how to check right values
             // samples?
 
@@ -621,7 +626,7 @@ public:
             rtl::OString aSum = createHex(pKeyBuffer, nKeyLen);
             delete [] pKeyBuffer;
 
-            t_print("MD5 Sum: %s\n", aSum.getStr());
+            printf("MD5 Sum: %s\n", aSum.getStr());
             // LLA: how to check right values
             // samples?
 
@@ -649,7 +654,7 @@ public:
             rtl::OString aSum = createHex(pKeyBuffer, nKeyLen);
             delete [] pKeyBuffer;
 
-            t_print("SHA Sum: %s\n", aSum.getStr());
+            printf("SHA Sum: %s\n", aSum.getStr());
             // LLA: how to check right values
             // samples?
 
@@ -676,7 +681,7 @@ public:
             rtl::OString aSum = createHex(pKeyBuffer, nKeyLen);
             delete [] pKeyBuffer;
 
-            t_print("SHA1 Sum: %s\n", aSum.getStr());
+            printf("SHA1 Sum: %s\n", aSum.getStr());
             // LLA: how to check right values
             // samples?
 
@@ -707,7 +712,7 @@ public:
             rtl::OString aSum = createHex(pKeyBuffer, nKeyLen);
             delete [] pKeyBuffer;
 
-            t_print("HMAC_MD5 Sum: %s\n", aSum.getStr());
+            printf("HMAC_MD5 Sum: %s\n", aSum.getStr());
             // LLA: how to check right values
             // samples?
 
@@ -738,7 +743,7 @@ public:
             rtl::OString aSum = createHex(pKeyBuffer, nKeyLen);
             delete [] pKeyBuffer;
 
-            t_print("HMAC_SHA1 Sum: %s\n", aSum.getStr());
+            printf("HMAC_SHA1 Sum: %s\n", aSum.getStr());
             // LLA: how to check right values
             // samples?
 
@@ -865,7 +870,7 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aStr = createHex(pBuffer, RTL_DIGEST_LENGTH_MD2);
-            t_print("Decrypt MD2: %s\n", aStr.getStr());
+            printf("Decrypt MD2: %s\n", aStr.getStr());
             CPPUNIT_ASSERT_MESSAGE("checksum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_MD2) );
 
             delete [] pBuffer;
@@ -908,7 +913,7 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aStr = createHex(pBuffer, RTL_DIGEST_LENGTH_MD5);
-            t_print("Decrypt MD5: %s\n", aStr.getStr());
+            printf("Decrypt MD5: %s\n", aStr.getStr());
             CPPUNIT_ASSERT_MESSAGE("checksum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_MD5) );
 
             delete [] pBuffer;
@@ -953,7 +958,7 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aStr = createHex(pBuffer, RTL_DIGEST_LENGTH_SHA);
-            t_print("Decrypt SHA: %s\n", aStr.getStr());
+            printf("Decrypt SHA: %s\n", aStr.getStr());
             CPPUNIT_ASSERT_MESSAGE("checksum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_SHA) );
 
             delete [] pBuffer;
@@ -998,7 +1003,7 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aStr = createHex(pBuffer, RTL_DIGEST_LENGTH_SHA1);
-            t_print("Decrypt SHA1: %s\n", aStr.getStr());
+            printf("Decrypt SHA1: %s\n", aStr.getStr());
             CPPUNIT_ASSERT_MESSAGE("checksum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_SHA1) );
 
             delete [] pBuffer;
@@ -1045,7 +1050,7 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aStr = createHex(pBuffer, RTL_DIGEST_LENGTH_HMAC_MD5);
-            t_print("Decrypt HMAC_MD5: %s\n", aStr.getStr());
+            printf("Decrypt HMAC_MD5: %s\n", aStr.getStr());
             CPPUNIT_ASSERT_MESSAGE("md5sum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_HMAC_MD5) );
 
             delete [] pBuffer;
@@ -1092,7 +1097,7 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aStr = createHex(pBuffer, RTL_DIGEST_LENGTH_HMAC_SHA1);
-            t_print("Decrypt HMAC_SHA1: %s\n", aStr.getStr());
+            printf("Decrypt HMAC_SHA1: %s\n", aStr.getStr());
             CPPUNIT_ASSERT_MESSAGE("md5sum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_HMAC_SHA1) );
 
             delete [] pBuffer;
@@ -1146,10 +1151,10 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aKey = createHex(pKeyBuffer, nKeyLen);
-            t_print("Key: %s\n", aKey.getStr());
+            printf("Key: %s\n", aKey.getStr());
 
             // rtl::OString sSalt = createHex(pSaltData, nSaltDataLen);
-            // t_print("Salt: %s\n", sSalt.getStr());
+            // printf("Salt: %s\n", sSalt.getStr());
 
             // CPPUNIT_ASSERT_MESSAGE("md5sum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_PBKDF2) );
 
@@ -1415,37 +1420,34 @@ public:
 }; // class create
 // -----------------------------------------------------------------------------
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::create, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::createMD2, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::createMD5, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::createSHA, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::createSHA1, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::createHMAC_MD5, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::createHMAC_SHA1, "rtl_digest");
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::destroy, "rtl_digest");
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::queryAlgorithm, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::queryLength, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::init, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::equalTests, "rtl_digest");
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_MD2, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_MD5, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_SHA, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_SHA1, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_HMAC_MD5, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_HMAC_SHA1, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_PBKDF2, "rtl_digest");
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::update, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::get, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::destroy, "rtl_digest");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::create);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createMD2);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createMD5);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createSHA);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createSHA1);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createHMAC_MD5);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createHMAC_SHA1);
+
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::destroy);
+
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::queryAlgorithm);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::queryLength);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::init);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::equalTests);
+
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_MD2);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_MD5);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_SHA);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_SHA1);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_HMAC_MD5);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_HMAC_SHA1);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_PBKDF2);
+
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::update);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::get);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::destroy);
 } // namespace rtl_digest
 
+CPPUNIT_PLUGIN_IMPLEMENT();
 
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk
index 45259fd3cba0..87ef35bcbc88 100644
--- a/sal/qa/rtl/doublelock/makefile.mk
+++ b/sal/qa/rtl/doublelock/makefile.mk
@@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
@@ -51,7 +53,7 @@ SHL1OBJS=  \
     $(SLO)$/rtl_doublelocking.obj
 
 SHL1TARGET= rtl_doublelocking
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
@@ -64,7 +66,9 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
 SLOFILES=$(SHL1OBJS)
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index 716a37df0281..b44e5432cb4d 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,39 +33,34 @@
 //------------------------------------------------------------------------
 #include <sal/types.h>
 
-#ifndef _RTL_USTRING_HXX_
-#include <rtl/string.hxx>
-#endif
-
-#ifndef _OSL_THREAD_HXX
 #include <osl/thread.hxx>
-#endif
 #include <osl/time.h>
 
 #include <rtl/instance.hxx>
+#include <rtl/ustring.hxx>
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#ifdef WNT
+#include <windows.h>
+#else
+#include <unistd.h>
+#include <time.h>
+#endif
 
 // -----------------------------------------------------------------------------
 #define CONST_TEST_STRING "gregorian"
 
 namespace {
-struct Gregorian : public rtl::StaticWithInit<const ::rtl::OUString, Gregorian> {
-    const ::rtl::OUString operator () () {
-        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CONST_TEST_STRING ));
+struct Gregorian : public rtl::StaticWithInit<rtl::OUString, Gregorian> {
+    const rtl::OUString operator () () {
+        return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CONST_TEST_STRING ));
     }
 };
 }
 
-inline void printOUString( ::rtl::OUString const & _suStr )
-{
-    rtl::OString aString;
-
-    t_print( "OUString: " );
-    aString = ::rtl::OUStringToOString( _suStr, RTL_TEXTENCODING_ASCII_US );
-    t_print( "'%s'\n", aString.getStr( ) );
-}
-
 // -----------------------------------------------------------------------------
 namespace ThreadHelper
 {
@@ -77,13 +73,13 @@ namespace ThreadHelper
     {
         // if (nVerbose == VERBOSE)
         // {
-        //     t_print("wait %d tenth seconds. ", _nTenthSec );
+        //     printf("wait %d tenth seconds. ", _nTenthSec );
         //     fflush(stdout);
         // }
 #ifdef WNT      //Windows
         Sleep(_nTenthSec * 100 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )
         TimeValue nTV;
         nTV.Seconds = static_cast<sal_uInt32>( _nTenthSec/10 );
         nTV.Nanosec = ( (_nTenthSec%10 ) * 100000000 );
@@ -91,7 +87,7 @@ namespace ThreadHelper
 #endif
         // if (nVerbose == VERBOSE)
         // {
-        //     t_print("done\n");
+        //     printf("done\n");
         // }
     }
 }
@@ -129,8 +125,6 @@ protected:
             while(schedule())
             {
                 rtl::OUString aStr = Gregorian::get();
-                // printOUString(aStr);
-                // printOUString(m_sConstStr);
                 if (aStr.equals(m_sConstStr))
                 {
                     m_nOK++;
@@ -154,7 +148,7 @@ public:
         {
             if (isRunning())
             {
-                t_print("error: not terminated.\n");
+                printf("error: not terminated.\n");
             }
         }
 };
@@ -183,7 +177,6 @@ namespace rtl_DoubleLocking
         void getValue_001()
             {
                 rtl::OUString aStr = Gregorian::get();
-                printOUString(aStr);
 
                 CPPUNIT_ASSERT_MESSAGE(
                     "Gregorian::get() failed, wrong value expected.",
@@ -210,19 +203,26 @@ namespace rtl_DoubleLocking
                 pThread->create();
                 p2Thread->create();
 
-                ThreadHelper::thread_sleep_tenth_sec(50);
+                ThreadHelper::thread_sleep_tenth_sec(5);
 
                 pThread->terminate();
                 p2Thread->terminate();
 
+                pThread->join();
+                p2Thread->join();
+
                 sal_Int32 nValueOK = 0;
                 nValueOK = pThread->getOK();
 
                 sal_Int32 nValueOK2 = 0;
                 nValueOK2 = p2Thread->getOK();
 
-                t_print("Value in Thread #1 is %d\n", nValueOK);
-                t_print("Value in Thread #2 is %d\n", nValueOK2);
+#if OSL_DEBUG_LEVEL > 2
+                printf("Value in Thread #1 is %d\n", nValueOK);
+                printf("Value in Thread #2 is %d\n", nValueOK2);
+#else
+                (void)nValueOK2;
+#endif
 
                 sal_Int32 nValueFails = 0;
                 nValueFails = pThread->getFails();
@@ -230,12 +230,10 @@ namespace rtl_DoubleLocking
                 sal_Int32 nValueFails2 = 0;
                 nValueFails2 = p2Thread->getFails();
 
-                t_print("Fails in Thread #1 is %d\n", nValueFails);
-                t_print("Fails in Thread #2 is %d\n", nValueFails2);
-
-                // ThreadHelper::thread_sleep_tenth_sec(1);
-                pThread->join();
-                p2Thread->join();
+#if OSL_DEBUG_LEVEL > 2
+                printf("Fails in Thread #1 is %d\n", nValueFails);
+                printf("Fails in Thread #2 is %d\n", nValueFails2);
+#endif
 
                 delete pThread;
                 delete p2Thread;
@@ -252,9 +250,11 @@ namespace rtl_DoubleLocking
         CPPUNIT_TEST_SUITE_END();
     }; // class create
 // -----------------------------------------------------------------------------
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_DoubleLocking::getValue, "rtl_DoubleLocking");
+    CPPUNIT_TEST_SUITE_REGISTRATION(rtl_DoubleLocking::getValue);
 } // namespace rtl_DoubleLocking
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk
index d6c9c6b674a3..fd97147937a6 100644
--- a/sal/qa/rtl/locale/makefile.mk
+++ b/sal/qa/rtl/locale/makefile.mk
@@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
@@ -46,7 +48,7 @@ SHL1OBJS=  \
     $(SLO)$/rtl_locale.obj
 
 SHL1TARGET= rtl_locale
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -62,8 +64,9 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # do this here, so we get right dependencies
 # SLOFILES=$(SHL1OBJS)
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index 3879ad8a2048..1cf34c08603e 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,16 +31,19 @@
 #include "precompiled_sal.hxx"
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
-#include <rtl/locale.hxx>
 #include <osl/thread.h>
+#include <rtl/locale.hxx>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
 namespace rtl_locale
 {
     // default locale for test purpose
     void setDefaultLocale()
     {
-        rtl::OLocale::setDefault(rtl::OUString::createFromAscii("de"), rtl::OUString::createFromAscii("DE"), /* rtl::OUString() */ rtl::OUString::createFromAscii("hochdeutsch") );
+        rtl::OLocale::setDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")), /* rtl::OUString() */ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hochdeutsch")) );
     }
 
 class getDefault : public CppUnit::TestFixture
@@ -48,6 +52,8 @@ public:
     // initialise your test code values here.
     void setUp()
     {
+        // start message
+        rtl_locale::setDefaultLocale();
     }
 
     void tearDown()
@@ -68,7 +74,7 @@ public:
 
     void getDefault_001()
     {
-        // rtl::OLocale::setDefault(rtl::OUString::createFromAscii("de"), rtl::OUString::createFromAscii("DE"), rtl::OUString());
+        // rtl::OLocale::setDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")), rtl::OUString());
        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         CPPUNIT_ASSERT_MESSAGE("locale must not null", aLocale.getData() != NULL);
     }
@@ -90,6 +96,8 @@ public:
     // initialise your test code values here.
     void setUp()
     {
+        // start message
+        rtl_locale::setDefaultLocale();
     }
 
     void tearDown()
@@ -100,7 +108,7 @@ public:
     // insert your test code here.
     void setDefault_001()
     {
-        rtl::OLocale::setDefault(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"), rtl::OUString());
+        rtl::OLocale::setDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), rtl::OUString());
        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         CPPUNIT_ASSERT_MESSAGE("locale must not null", aLocale.getData() != NULL);
 
@@ -123,6 +131,8 @@ public:
     // initialise your test code values here.
     void setUp()
     {
+        // start message
+        rtl_locale::setDefaultLocale();
     }
 
     void tearDown()
@@ -132,17 +142,15 @@ public:
     // insert your test code here.
     void getLanguage_001()
     {
-       rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
+        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         rtl::OUString suLanguage = aLocale.getLanguage();
-        t_print("Language: %s\n", rtl::OUStringToOString(suLanguage, osl_getThreadTextEncoding()).getStr());
-        CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString::createFromAscii("de")));
+        CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de"))));
     }
     void getLanguage_002()
     {
-       rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
-        rtl::OUString suLanguage = rtl_locale_getLanguage(aLocale.getData());
-        t_print("Language: %s\n", rtl::OUStringToOString(suLanguage, osl_getThreadTextEncoding()).getStr());
-        CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString::createFromAscii("de")));
+        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
+        rtl::OUString suLanguage(rtl_locale_getLanguage(aLocale.getData()), SAL_NO_ACQUIRE);
+        CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de"))));
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -162,6 +170,8 @@ public:
     // initialise your test code values here.
     void setUp()
     {
+        // start message
+        rtl_locale::setDefaultLocale();
     }
 
     void tearDown()
@@ -171,17 +181,15 @@ public:
     // insert your test code here.
     void getCountry_001()
     {
-       rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
+        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         rtl::OUString suCountry = aLocale.getCountry();
-        t_print("Country: %s\n", rtl::OUStringToOString(suCountry, osl_getThreadTextEncoding()).getStr());
-        CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString::createFromAscii("DE")));
+        CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE"))));
     }
     void getCountry_002()
     {
-       rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
-        rtl::OUString suCountry = rtl_locale_getCountry(aLocale.getData());
-        t_print("Country: %s\n", rtl::OUStringToOString(suCountry, osl_getThreadTextEncoding()).getStr());
-        CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString::createFromAscii("DE")));
+        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
+        rtl::OUString suCountry(rtl_locale_getCountry(aLocale.getData()), SAL_NO_ACQUIRE);
+        CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE"))));
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -201,6 +209,8 @@ public:
     // initialise your test code values here.
     void setUp()
     {
+        // start message
+        rtl_locale::setDefaultLocale();
     }
 
     void tearDown()
@@ -210,17 +220,15 @@ public:
     // insert your test code here.
     void getVariant_001()
     {
-       rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
+        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         rtl::OUString suVariant = aLocale.getVariant();
-        t_print("Variant: %s\n", rtl::OUStringToOString(suVariant, osl_getThreadTextEncoding()).getStr());
-        CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString::createFromAscii("hochdeutsch")));
+        CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hochdeutsch"))));
     }
     void getVariant_002()
     {
-       rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
-        rtl::OUString suVariant = rtl_locale_getVariant(aLocale.getData());
-        t_print("Variant: %s\n", rtl::OUStringToOString(suVariant, osl_getThreadTextEncoding()).getStr());
-        CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString::createFromAscii("hochdeutsch")));
+        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
+        rtl::OUString suVariant(rtl_locale_getVariant(aLocale.getData()), SAL_NO_ACQUIRE);
+        CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hochdeutsch"))));
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -240,6 +248,8 @@ public:
     // initialise your test code values here.
     void setUp()
     {
+        // start message
+        rtl_locale::setDefaultLocale();
     }
 
     void tearDown()
@@ -249,16 +259,14 @@ public:
     // insert your test code here.
     void hashCode_001()
     {
-       rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
+        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         sal_Int32 nHashCode = aLocale.hashCode();
-        t_print("Hashcode: %d\n", nHashCode);
         CPPUNIT_ASSERT_MESSAGE("locale hashcode must be 3831", nHashCode != 0);
     }
     void hashCode_002()
     {
-       rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
+        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         sal_Int32 nHashCode = rtl_locale_hashCode(aLocale.getData());
-        t_print("Hashcode: %d\n", nHashCode);
         CPPUNIT_ASSERT_MESSAGE("locale hashcode must be 3831", nHashCode != 0);
     }
 
@@ -279,6 +287,8 @@ public:
     // initialise your test code values here.
     void setUp()
     {
+        // start message
+        rtl_locale::setDefaultLocale();
     }
 
     void tearDown()
@@ -288,8 +298,8 @@ public:
     // insert your test code here.
     void equals_001()
     {
-        rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"), rtl::OUString());
-        rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"));
+        rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), rtl::OUString());
+        rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")));
 
         sal_Bool bLocaleAreEqual = sal_False;
         bLocaleAreEqual = (aLocale1 == aLocale2);
@@ -299,11 +309,10 @@ public:
 
     void equals_002()
     {
-        rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"), rtl::OUString());
-        rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"));
+        rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), rtl::OUString());
+        rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")));
 
         sal_Int32 nEqual = rtl_locale_equals(aLocale1.getData(), aLocale2.getData());
-        t_print("rtl_locale_equals() result: %d\n", nEqual);
         CPPUNIT_ASSERT(nEqual != 0);
     }
 
@@ -318,13 +327,13 @@ public:
 }; // class equals
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_locale::getDefault, "rtl_locale");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_locale::setDefault, "rtl_locale");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_locale::getLanguage, "rtl_locale");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_locale::getCountry, "rtl_locale");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_locale::getVariant, "rtl_locale");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_locale::hashCode, "rtl_locale");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_locale::equals, "rtl_locale");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::getDefault);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::setDefault);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::getLanguage);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::getCountry);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::getVariant);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::hashCode);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::equals);
 } // namespace rtl_locale
 
 
@@ -332,12 +341,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_locale::equals, "rtl_locale");
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-// NOADDITIONAL;
 
-void RegisterAdditionalFunctions(FktRegFuncPtr)
-{
-    // start message
-    t_print("Initializing ...\n" );
-    rtl_locale::setDefaultLocale();
-    t_print("Initialization Done.\n" );
-}
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/logfile/makefile.mk b/sal/qa/rtl/logfile/makefile.mk
index 9b52e0a45b37..6660011f3213 100644
--- a/sal/qa/rtl/logfile/makefile.mk
+++ b/sal/qa/rtl/logfile/makefile.mk
@@ -45,7 +45,7 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
 SHL1OBJS=  \
     $(SLO)$/rtl_logfile.obj
 SHL1TARGET= rtl_logfile
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
@@ -60,4 +60,4 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx
index bae6e5c4d3e8..2b669478d010 100644
--- a/sal/qa/rtl/logfile/rtl_logfile.cxx
+++ b/sal/qa/rtl/logfile/rtl_logfile.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,32 +33,25 @@
 // this file is converted to use with testshl2
 // original was placed in sal/test/textenc.cxx
 
-
-// -----------------------------------------------------------------------------
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(UNX) || defined(OS2)
+#if defined(UNX)
 #       include <unistd.h>
 #endif
 
 #include <rtl/logfile.hxx>
-#include <testshl/simpleheader.hxx>
 
-// #ifndef      _OSL_MODULE_HXX_
-// #include <osl/module.hxx>
-// #endif
 #include <osl/file.hxx>
 #if ( defined WNT )                     // Windows
-#include <tools/prewin.h>
-// #define UNICODE
-// #define WIN32_LEAN_AND_MEAN
-// #include <windows.h>
 #include <tchar.h>
-#include <tools/postwin.h>
 #endif
 
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
 using namespace ::osl;
 
 inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = "" )
@@ -65,11 +59,11 @@ inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = ""
 
     if (strlen(msg) > 0)
     {
-        t_print("%s: ", msg );
+        printf("%s: ", msg );
     }
     rtl::OString aString;
     aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    t_print("%s\n", (char *)aString.getStr( ) );
+    printf("%s\n", (char *)aString.getStr( ) );
 }
 
 /** get the absolute source file URL "file:///.../sal/qa/rtl/logfile/"
@@ -78,9 +72,9 @@ inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = ""
 inline ::rtl::OUString getTempPath( void )
 {
 #ifdef UNX
-    rtl::OUString suDirURL(rtl::OUString::createFromAscii("file:///tmp/"));
+    rtl::OUString suDirURL( RTL_CONSTASCII_USTRINGPARAM("file:///tmp/") );
 #else /* Windows */
-    rtl::OUString suDirURL(rtl::OUString::createFromAscii("file:///c:/temp/"));
+    rtl::OUString suDirURL( RTL_CONSTASCII_USTRINGPARAM("file:///c:/temp/") );
 #endif
     return suDirURL;
 }
@@ -91,7 +85,7 @@ bool t_fileExist(rtl::OUString const& _sFilename)
 {
     ::osl::FileBase::RC   nError1;
     ::osl::File aTestFile( _sFilename );
-    nError1 = aTestFile.open ( OpenFlag_Read );
+    nError1 = aTestFile.open ( osl_File_OpenFlag_Read );
     if ( ( ::osl::FileBase::E_NOENT != nError1 ) && ( ::osl::FileBase::E_ACCES != nError1 ) )
     {
         aTestFile.close( );
@@ -144,20 +138,20 @@ namespace rtl_logfile
                 rtl_logfile_trace("trace %d %d %d\n" , 1 , 2 ,3 );
 
                 rtl::OUString suFilePath = getTempPath();
-                suFilePath +=  rtl::OUString::createFromAscii("logfile1_") + getCurrentPID( );
-                suFilePath +=  rtl::OUString::createFromAscii(".log");
+                suFilePath +=  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("logfile1_")) + getCurrentPID( );
+                suFilePath +=  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".log"));
 
                 ::osl::FileBase::RC   nError1;
                 ::osl::File aTestFile( suFilePath );
                 printUString( suFilePath );
-                nError1 = aTestFile.open ( OpenFlag_Read );
+                nError1 = aTestFile.open ( osl_File_OpenFlag_Read );
                 CPPUNIT_ASSERT_MESSAGE("create the log file: but the logfile does not exist",
                                        ( ::osl::FileBase::E_NOENT != nError1 ) &&
                                        ( ::osl::FileBase::E_ACCES != nError1 ) );
                 sal_Char       buffer_read[400];
                 sal_uInt64      nCount_read;
                 nError1 = aTestFile.read( buffer_read, 400, nCount_read );
-                //t_print("buffer is %s\n", buffer_read );
+                //printf("buffer is %s\n", buffer_read );
                 CPPUNIT_ASSERT_MESSAGE("write right logs", strstr( buffer_read, "trace 1 2 3") != NULL );
                 aTestFile.sync();
                 aTestFile.close();
@@ -218,10 +212,10 @@ namespace rtl_logfile
 } // namespace rtl_logfile
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_logfile::logfile, "rtl_logfile" );
+CPPUNIT_TEST_SUITE_REGISTRATION( rtl_logfile::logfile);
 
 // -----------------------------------------------------------------------------
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 //~ do some clean up work after all test completed.
 class GlobalObject
@@ -231,25 +225,25 @@ public:
         {
             try
             {
-                t_print( "\n#Do some clean-ups ... only delete logfile1_*.log here!\n" );
+                printf( "\n#Do some clean-ups ... only delete logfile1_*.log here!\n" );
                 rtl::OUString suFilePath = getTempPath();
-                suFilePath +=  rtl::OUString::createFromAscii("logfile1_") + getCurrentPID( );
-                suFilePath +=  rtl::OUString::createFromAscii(".log");
+                suFilePath +=  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("logfile1_")) + getCurrentPID( );
+                suFilePath +=  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".log"));
 
                 //if ( ifFileExist( suFilePath )  == sal_True )
                 ::osl::FileBase::RC nError1;
                 nError1 = osl::File::remove( suFilePath );
 #ifdef WNT
-                t_print("Please remove logfile* manully! Error is Permision denied!");
+                printf("Please remove logfile* manully! Error is Permision denied!");
 #endif
             }
-            catch (CppUnit::Exception &e)
+            catch (const CppUnit::Exception &e)
             {
-                t_print("Exception caught in GlobalObject dtor(). Exception message: '%s'. Source line: %d\n", e.what(), e.sourceLine().lineNumber());
+                printf("Exception caught in GlobalObject dtor(). Exception message: '%s'. Source line: %d\n", e.what(), e.sourceLine().lineNumber());
             }
             catch (...)
             {
-                t_print("Exception caught (...) in GlobalObject dtor()\n");
+                printf("Exception caught (...) in GlobalObject dtor()\n");
             }
         }
 };
@@ -258,3 +252,4 @@ GlobalObject theGlobalObject;
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/math/makefile.mk b/sal/qa/rtl/math/makefile.mk
deleted file mode 100644
index 59f2ecc495bb..000000000000
--- a/sal/qa/rtl/math/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sal
-TARGET = qa_rtl_profile
-
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLO)/test-rtl-math.obj
-SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
-SHL1TARGET = test-rtl-math
-SHL1VERSIONMAP = $(PRJ)/qa/export.map
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-.INCLUDE: _cppunit.mk
-
-.END
diff --git a/sal/qa/rtl/math/rtl_math.cxx b/sal/qa/rtl/math/rtl_math.cxx
new file mode 100644
index 000000000000..9fe5c82ae116
--- /dev/null
+++ b/sal/qa/rtl/math/rtl_math.cxx
@@ -0,0 +1,631 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sal.hxx"
+#ifdef WIN32
+// LLA: take a look into Microsofts math.h implementation, why this define is need
+#define _USE_MATH_DEFINES
+#endif
+
+#include <math.h>
+#include <rtl/math.h>
+#include <rtl/string.hxx>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#include "valueequal.hxx"
+
+namespace rtl_math
+{
+
+class test : public CppUnit::TestFixture
+{
+public:
+    // initialise your test code values here.
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+
+    void equalCheck(double _nResult, double _nExpect) /* throws Exception */
+        {
+            bool bEqualResult = is_double_equal(_nResult, _nExpect);
+
+            rtl::OString sError = "rtl_math_round expected result is wrong should:(";
+            sError += rtl::OString::valueOf(_nExpect);
+            sError += ") but is:(";
+            sError += rtl::OString::valueOf(_nResult);
+            sError += ")";
+
+            CPPUNIT_ASSERT_MESSAGE(sError.getStr(), bEqualResult == true);
+        }
+
+    // insert your test code here.
+    void round_000()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nValue = M_PI;
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(nValue, 0, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(3.0));
+
+        nResult = rtl_math_round(nValue, 2, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(3.14));
+
+        nResult = rtl_math_round(nValue, 3, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(3.142));
+
+        nResult = rtl_math_round(nValue, 10, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(3.1415926536));
+    }
+
+    // insert your test code here.
+    void round_001_positiv()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(0.2));
+    }
+
+    void round_001_negativ()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Corrected);
+        equalCheck(nResult, double(-0.2));
+    }
+// -----------------------------------------------------------------------------
+    void round_002_positiv()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(0.1));
+    }
+
+    void round_002_negativ()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Down);
+        equalCheck(nResult, double(-0.1));
+    }
+// -----------------------------------------------------------------------------
+    void round_003_positiv()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(0.2));
+    }
+
+    void round_003_negativ()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Up);
+        equalCheck(nResult, double(-0.2));
+    }
+// -----------------------------------------------------------------------------
+    void round_004_positiv()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(0.1));
+    }
+
+    void round_004_negativ()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Floor);
+        equalCheck(nResult, double(-0.2));
+    }
+// -----------------------------------------------------------------------------
+    void round_005_positiv()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(0.2));
+    }
+
+    void round_005_negativ()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Ceiling);
+        equalCheck(nResult, double(-0.1));
+    }
+// -----------------------------------------------------------------------------
+    void round_006_positiv()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(0.2));
+    }
+
+    void round_006_negativ()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_HalfDown);
+        equalCheck(nResult, double(-0.2));
+    }
+// -----------------------------------------------------------------------------
+    void round_007_positiv()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(0.1));
+
+        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(0.2));
+
+        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(0.2));
+    }
+
+    void round_007_negativ()
+    {
+        // this is demonstration code
+        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+        double nResult = 0.0;
+
+        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(-0.1));
+
+        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(-0.2));
+
+        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_HalfUp);
+        equalCheck(nResult, double(-0.2));
+    }
+
+    // Change the following lines only, if you add, remove or rename
+    // member functions of the current class,
+    // because these macros are need by auto register mechanism.
+
+    CPPUNIT_TEST_SUITE(test);
+    CPPUNIT_TEST(round_000);
+
+    CPPUNIT_TEST(round_001_positiv);
+    CPPUNIT_TEST(round_001_negativ);
+
+    CPPUNIT_TEST(round_002_positiv);
+    CPPUNIT_TEST(round_002_negativ);
+
+    CPPUNIT_TEST(round_003_positiv);
+    CPPUNIT_TEST(round_003_negativ);
+
+    CPPUNIT_TEST(round_004_positiv);
+    CPPUNIT_TEST(round_004_negativ);
+
+    CPPUNIT_TEST(round_005_positiv);
+    CPPUNIT_TEST(round_005_negativ);
+
+    CPPUNIT_TEST(round_006_positiv);
+    CPPUNIT_TEST(round_006_negativ);
+
+    CPPUNIT_TEST(round_007_positiv);
+    CPPUNIT_TEST(round_007_negativ);
+
+    CPPUNIT_TEST_SUITE_END();
+}; // class test
+
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_math::test);
+} // namespace rtl_math
+
+
+// -----------------------------------------------------------------------------
+
+// this macro creates an empty function, which will called by the RegisterAllFunctions()
+// to let the user the possibility to also register some functions by hand.
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx
index 8e9875444280..41b4ea21138d 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -25,13 +25,9 @@
 *
 ************************************************************************/
 
-#include "precompiled_sal.hxx"
 #include "sal/config.h"
 
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include <sal/cppunit.h>
 #include "rtl/math.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
diff --git a/sal/qa/rtl/math/test_rtl_math.cxx b/sal/qa/rtl/math/test_rtl_math.cxx
new file mode 100644
index 000000000000..a5061ac80549
--- /dev/null
+++ b/sal/qa/rtl/math/test_rtl_math.cxx
@@ -0,0 +1,657 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "rtl/math.h"
+#include "rtl/math.hxx"
+#include "rtl/strbuf.hxx"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/textenc.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include <sal/macros.h>
+
+#include <stdlib.h>
+
+#include <sal/cppunit.h>
+
+namespace {
+
+struct FloatTraits
+{
+    typedef float Number;
+
+    static inline char const * getPrefix() { return "float"; }
+};
+
+struct DoubleTraits
+{
+    typedef double Number;
+
+    static inline char const * getPrefix() { return "double"; }
+};
+
+struct StringTraits
+{
+    typedef rtl::OString String;
+
+    static inline char const * getPrefix() { return "OString"; }
+
+    static inline rtl::OString createFromAscii(char const * pString)
+    { return rtl::OString(pString); }
+
+    static inline void appendBuffer(rtl::OStringBuffer & rBuffer,
+                                    rtl::OString const & rString)
+    { rBuffer.append(rString); }
+
+    static inline rtl::OString doubleToString(double fValue,
+                                              rtl_math_StringFormat eFormat,
+                                              sal_Int32 nDecPlaces,
+                                              sal_Char cDecSeparator,
+                                              bool bEraseTrailingDecZeros)
+    {
+        return rtl::math::doubleToString(fValue, eFormat, nDecPlaces,
+                                         cDecSeparator, bEraseTrailingDecZeros);
+    }
+};
+
+struct UStringTraits
+{
+    typedef rtl::OUString String;
+
+    static inline char const * getPrefix() { return "OUString"; }
+
+    static inline rtl::OUString createFromAscii(char const * pString)
+    { return rtl::OUString::createFromAscii(pString); }
+
+    static inline void appendBuffer(rtl::OStringBuffer & rBuffer,
+                                    rtl::OUString const & rString)
+    { rBuffer.append(rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8)); }
+
+    static inline rtl::OUString doubleToString(double fValue,
+                                               rtl_math_StringFormat eFormat,
+                                               sal_Int32 nDecPlaces,
+                                               sal_Unicode cDecSeparator,
+                                               bool bEraseTrailingDecZeros)
+        {
+        return rtl::math::doubleToUString(fValue, eFormat, nDecPlaces,
+                                          cDecSeparator,
+                                          bEraseTrailingDecZeros);
+    }
+};
+
+struct TestNumberToString
+{
+    double fValue;
+    rtl_math_StringFormat eFormat;
+    sal_Int32 nDecPlaces;
+    char cDecSeparator;
+    bool bEraseTrailingDecZeros;
+    char const * pResult;
+};
+
+template< typename StringT, typename NumberT >
+void testNumberToString(TestNumberToString const & rTest)
+{
+    typename NumberT::Number fValue = static_cast< typename NumberT::Number >(rTest.fValue);
+    if (fValue != rTest.fValue)
+        return;
+
+    // LLA: t_print("size: %d ", sizeof(fValue));
+    typename StringT::String aResult1;
+
+    aResult1 = StringT::doubleToString(fValue, rTest.eFormat, rTest.nDecPlaces,
+                                       rTest.cDecSeparator,
+                                       rTest.bEraseTrailingDecZeros);
+
+    typename StringT::String aResult2(StringT::createFromAscii(rTest.pResult));
+
+    rtl::OStringBuffer aBuffer;
+    aBuffer.append(StringT::getPrefix());
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM("/"));
+    aBuffer.append(NumberT::getPrefix());
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(" doubleToString("));
+    aBuffer.append(fValue);
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+    aBuffer.append(static_cast< sal_Int32 >(rTest.eFormat));
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+    aBuffer.append(rTest.nDecPlaces);
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+    aBuffer.append(rTest.cDecSeparator);
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+    aBuffer.append(static_cast< sal_Int32 >(rTest.bEraseTrailingDecZeros));
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM("): "));
+    StringT::appendBuffer(aBuffer, aResult1);
+    if (aResult1 != aResult2)
+    {
+        aBuffer.append(RTL_CONSTASCII_STRINGPARAM(" != "));
+        StringT::appendBuffer(aBuffer, aResult2);
+    }
+    CPPUNIT_ASSERT_MESSAGE(aBuffer.getStr(), aResult1 == aResult2);
+}
+
+template< typename StringT, typename NumberT >
+void testNumberToString(TestNumberToString const * pTests, size_t nCount)
+{
+    for (size_t i = 0; i < nCount; ++i)
+        testNumberToString< StringT, NumberT >(pTests[i]);
+}
+
+struct TestStringToNumberToString
+{
+    char const * pValue;
+    rtl_math_StringFormat eFormat;
+    sal_Int32 nDecPlaces;
+    char cDecSeparator;
+    bool bEraseTrailingDecZeros;
+    char const * pResult;
+};
+
+template< typename StringT >
+void testStringToNumberToString(TestStringToNumberToString const & rTest)
+{
+    double d = rtl::math::stringToDouble(StringT::createFromAscii(rTest.pValue),
+                                         rTest.cDecSeparator, 0, 0, 0);
+    typename StringT::String aResult1(
+        StringT::doubleToString(d, rTest.eFormat, rTest.nDecPlaces,
+                                rTest.cDecSeparator,
+                                rTest.bEraseTrailingDecZeros));
+    typename StringT::String aResult2(StringT::createFromAscii(rTest.pResult));
+    rtl::OStringBuffer aBuffer;
+    aBuffer.append(StringT::getPrefix());
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(
+                       " doubleToString(stringToDouble("));
+    aBuffer.append(rTest.pValue);
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+    aBuffer.append(rTest.cDecSeparator);
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM("), "));
+    aBuffer.append(static_cast< sal_Int32 >(rTest.eFormat));
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+    aBuffer.append(rTest.nDecPlaces);
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+    aBuffer.append(rTest.cDecSeparator);
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+    aBuffer.append(static_cast< sal_Int32 >(rTest.bEraseTrailingDecZeros));
+    aBuffer.append(RTL_CONSTASCII_STRINGPARAM("): "));
+    StringT::appendBuffer(aBuffer, aResult1);
+    if (aResult1 != aResult2)
+    {
+        aBuffer.append(RTL_CONSTASCII_STRINGPARAM(" != "));
+        StringT::appendBuffer(aBuffer, aResult2);
+    }
+    CPPUNIT_ASSERT_MESSAGE(aBuffer.getStr(), aResult1 == aResult2);
+}
+
+template< typename StringT >
+void testStringToNumberToString(TestStringToNumberToString const * pTests,
+                                size_t nCount)
+{
+    for (size_t i = 0; i < nCount; ++i)
+        testStringToNumberToString< StringT >(pTests[i]);
+}
+
+}
+
+class Math : public CppUnit::TestFixture
+{
+public:
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    void rtl_math_001()
+    {
+        static TestNumberToString const aTest[]
+            = { // 1, 1+2^-1, ..., 1+2^-52
+                // Too few decimal digits are printed, so that various different
+                // double values lead to the same output:
+                { 1, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1" },
+                { 1.5, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.5" },
+                { 1.25, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.25" },
+                { 1.125, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.125" },
+                { 1.0625, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.0625" },
+                { 1.03125, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.03125" },
+                { 1.015625, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.015625" },
+                { 1.0078125, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.0078125" },
+                { 1.00390625, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.00390625" },
+                { 1.001953125, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.001953125" },
+                { 1.0009765625, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.0009765625" },
+                { 1.00048828125, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.00048828125" },
+                { 1.000244140625, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.000244140625" },
+                { 1.0001220703125, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.0001220703125" },
+                { 1.00006103515625, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.00006103515625" },
+                { 1.000030517578125, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.00003051757813" },
+                { 1.0000152587890625, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.00001525878906" },
+                { 1.00000762939453125, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.00000762939453" },
+                { 1.000003814697265625, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.00000381469727" },
+                { 1.0000019073486328125, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.00000190734863" },
+                { 1.00000095367431640625, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.00000095367432" },
+                { 1.000000476837158203125, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.00000047683716" },
+                { 1.0000002384185791015625, rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1.00000023841858" },
+                { 1.00000011920928955078125, rtl_math_StringFormat_Automatic,
+                  rtl_math_DecimalPlaces_Max, '.', true, "1.00000011920929" },
+                { 1.000000059604644775390625, rtl_math_StringFormat_Automatic,
+                  rtl_math_DecimalPlaces_Max, '.', true, "1.00000005960464" },
+                { 1.0000000298023223876953125, rtl_math_StringFormat_Automatic,
+                  rtl_math_DecimalPlaces_Max, '.', true, "1.00000002980232" },
+                { 1.00000001490116119384765625, rtl_math_StringFormat_Automatic,
+                  rtl_math_DecimalPlaces_Max, '.', true, "1.00000001490116" },
+                { 1.000000007450580596923828125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000745058" },
+                { 1.0000000037252902984619140625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000372529" },
+                { 1.00000000186264514923095703125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000186265" },
+                { 1.000000000931322574615478515625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000093132" },
+                { 1.0000000004656612873077392578125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000046566" },
+                { 1.00000000023283064365386962890625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000023283" },
+                { 1.000000000116415321826934814453125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000011642" },
+                { 1.0000000000582076609134674072265625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000005821" },
+                { 1.00000000002910383045673370361328125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.0000000000291" },
+                { 1.000000000014551915228366851806640625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000001455" },
+                { 1.0000000000072759576141834259033203125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000000728" },
+                { 1.00000000000363797880709171295166015625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000000364" },
+                { 1.000000000001818989403545856475830078125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000000182" },
+                { 1.0000000000009094947017729282379150390625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000000091" },
+                { 1.00000000000045474735088646411895751953125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000000045" },
+                { 1.000000000000227373675443232059478759765625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000000023" },
+                { 1.0000000000001136868377216160297393798828125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000000011" },
+                { 1.00000000000005684341886080801486968994140625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000000006" },
+                { 1.000000000000028421709430404007434844970703125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000000003" },
+                { 1.0000000000000142108547152020037174224853515625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000000001" },
+                { 1.00000000000000710542735760100185871124267578125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1.00000000000001" },
+                { 1.000000000000003552713678800500929355621337890625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1" },
+                { 1.0000000000000017763568394002504646778106689453125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1" },
+                { 1.00000000000000088817841970012523233890533447265625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1" },
+                { 1.000000000000000444089209850062616169452667236328125,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1" },
+                { 1.0000000000000002220446049250313080847263336181640625,
+                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+                  '.', true, "1" },
+
+                // 1, 1+2^-1, ..., 1+2^-52
+                // Too few decimal digits are printed, so that various different
+                // double values lead to the same output:
+                { 1, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000000000000000000000000000000000000000000000" },
+                { 1.5, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.50000000000000000000000000000000000000000000000000000" },
+                { 1.25, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.25000000000000000000000000000000000000000000000000000" },
+                { 1.125, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.12500000000000000000000000000000000000000000000000000" },
+                { 1.0625, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.06250000000000000000000000000000000000000000000000000" },
+                { 1.03125, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.03125000000000000000000000000000000000000000000000000" },
+                { 1.015625, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.01562500000000000000000000000000000000000000000000000" },
+                { 1.0078125, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00781250000000000000000000000000000000000000000000000" },
+                { 1.00390625, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00390625000000000000000000000000000000000000000000000" },
+                { 1.001953125, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00195312500000000000000000000000000000000000000000000" },
+                { 1.0009765625, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00097656250000000000000000000000000000000000000000000" },
+                { 1.00048828125, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00048828125000000000000000000000000000000000000000000" },
+                { 1.000244140625, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00024414062500000000000000000000000000000000000000000" },
+                { 1.0001220703125, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00012207031250000000000000000000000000000000000000000" },
+                { 1.00006103515625, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00006103515625000000000000000000000000000000000000000" },
+                { 1.000030517578125, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00003051757813000000000000000000000000000000000000000" },
+                { 1.0000152587890625, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00001525878906000000000000000000000000000000000000000" },
+                { 1.00000762939453125, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000762939453000000000000000000000000000000000000000" },
+                { 1.000003814697265625, rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000381469727000000000000000000000000000000000000000" },
+                { 1.0000019073486328125, rtl_math_StringFormat_F, 53, '.',
+                  false,
+                  "1.00000190734863000000000000000000000000000000000000000" },
+                { 1.00000095367431640625, rtl_math_StringFormat_F, 53, '.',
+                  false,
+                  "1.00000095367432000000000000000000000000000000000000000" },
+                { 1.000000476837158203125, rtl_math_StringFormat_F, 53, '.',
+                  false,
+                  "1.00000047683716000000000000000000000000000000000000000" },
+                { 1.0000002384185791015625, rtl_math_StringFormat_F, 53, '.',
+                  false,
+                  "1.00000023841858000000000000000000000000000000000000000" },
+                { 1.00000011920928955078125, rtl_math_StringFormat_F, 53, '.',
+                  false,
+                  "1.00000011920929000000000000000000000000000000000000000" },
+                { 1.000000059604644775390625, rtl_math_StringFormat_F, 53, '.',
+                  false,
+                  "1.00000005960464000000000000000000000000000000000000000" },
+                { 1.0000000298023223876953125, rtl_math_StringFormat_F, 53, '.',
+                  false,
+                  "1.00000002980232000000000000000000000000000000000000000" },
+                { 1.00000001490116119384765625, rtl_math_StringFormat_F, 53,
+                  '.', false,
+                  "1.00000001490116000000000000000000000000000000000000000" },
+                { 1.000000007450580596923828125, rtl_math_StringFormat_F, 53,
+                  '.', false,
+                  "1.00000000745058000000000000000000000000000000000000000" },
+                { 1.0000000037252902984619140625, rtl_math_StringFormat_F, 53,
+                  '.', false,
+                  "1.00000000372529000000000000000000000000000000000000000" },
+                { 1.00000000186264514923095703125, rtl_math_StringFormat_F, 53,
+                  '.', false,
+                  "1.00000000186265000000000000000000000000000000000000000" },
+                { 1.000000000931322574615478515625, rtl_math_StringFormat_F, 53,
+                  '.', false,
+                  "1.00000000093132000000000000000000000000000000000000000" },
+                { 1.0000000004656612873077392578125, rtl_math_StringFormat_F,
+                  53, '.', false,
+                  "1.00000000046566000000000000000000000000000000000000000" },
+                { 1.00000000023283064365386962890625, rtl_math_StringFormat_F,
+                  53, '.', false,
+                  "1.00000000023283000000000000000000000000000000000000000" },
+                { 1.000000000116415321826934814453125, rtl_math_StringFormat_F,
+                  53, '.', false,
+                  "1.00000000011642000000000000000000000000000000000000000" },
+                { 1.0000000000582076609134674072265625, rtl_math_StringFormat_F,
+                  53, '.', false,
+                  "1.00000000005821000000000000000000000000000000000000000" },
+                { 1.00000000002910383045673370361328125,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000002910000000000000000000000000000000000000000" },
+                { 1.000000000014551915228366851806640625,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000001455000000000000000000000000000000000000000" },
+                { 1.0000000000072759576141834259033203125,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000728000000000000000000000000000000000000000" },
+                { 1.00000000000363797880709171295166015625,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000364000000000000000000000000000000000000000" },
+                { 1.000000000001818989403545856475830078125,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000182000000000000000000000000000000000000000" },
+                { 1.0000000000009094947017729282379150390625,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000091000000000000000000000000000000000000000" },
+                { 1.00000000000045474735088646411895751953125,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000045000000000000000000000000000000000000000" },
+                { 1.000000000000227373675443232059478759765625,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000023000000000000000000000000000000000000000" },
+                { 1.0000000000001136868377216160297393798828125,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000011000000000000000000000000000000000000000" },
+                { 1.00000000000005684341886080801486968994140625,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000006000000000000000000000000000000000000000" },
+                { 1.000000000000028421709430404007434844970703125,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000003000000000000000000000000000000000000000" },
+                { 1.0000000000000142108547152020037174224853515625,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000001000000000000000000000000000000000000000" },
+                { 1.00000000000000710542735760100185871124267578125,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000001000000000000000000000000000000000000000" },
+                { 1.000000000000003552713678800500929355621337890625,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000000000000000000000000000000000000000000000" },
+                { 1.0000000000000017763568394002504646778106689453125,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000000000000000000000000000000000000000000000" },
+                { 1.00000000000000088817841970012523233890533447265625,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000000000000000000000000000000000000000000000" },
+                { 1.000000000000000444089209850062616169452667236328125,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000000000000000000000000000000000000000000000" },
+                { 1.0000000000000002220446049250313080847263336181640625,
+                  rtl_math_StringFormat_F, 53, '.', false,
+                  "1.00000000000000000000000000000000000000000000000000000" } };
+        size_t const nCount = SAL_N_ELEMENTS(aTest);
+
+//LLA: the float tests are wrong here, due to the fact that
+//     we calculate with too less digits after the point
+
+//        bReturn &= testNumberToString< StringTraits, FloatTraits >(
+//            pTestResult, aTest, nCount);
+        testNumberToString< StringTraits, DoubleTraits >(aTest, nCount);
+//        bReturn &= testNumberToString< UStringTraits, FloatTraits >(
+//            pTestResult, aTest, nCount);
+        testNumberToString< UStringTraits, DoubleTraits >(aTest, nCount);
+    }
+
+    void rtl_math_002()
+    {
+        static TestStringToNumberToString const aTest[]
+            = { { "1", rtl_math_StringFormat_Automatic,
+                rtl_math_DecimalPlaces_Max, '.', true, "1" },
+                { " 1", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1" },
+                { "  1", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1" },
+                { "\t1", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1" },
+                { "\t 1", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1" },
+                { " \t1", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "1" },
+
+                { "-1", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "-1" },
+                { " -1", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "-1" },
+                { "  -1", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "-1" },
+                { "\t-1", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "-1" },
+                { "\t -1", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "-1" },
+                { " \t-1", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', true, "-1" },
+
+                { "1.#INF", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
+                { " 1.#INF", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
+                { "  1.#INF", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
+                { "\t1.#INF", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
+                { "\t 1.#INF", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
+                { " \t1.#INF", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
+
+                { "-1.#INF", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
+                { " -1.#INF", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
+                { "  -1.#INF", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
+                { "\t-1.#INF", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
+                { "\t -1.#INF", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
+                { " \t-1.#INF", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
+
+                { "1.#NAN", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
+                { " 1.#NAN", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
+                { "  1.#NAN", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
+                { "\t1.#NAN", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
+                { "\t 1.#NAN", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
+                { " \t1.#NAN", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
+
+                { "-1.#NAN", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
+                { " -1.#NAN", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
+                { "  -1.#NAN", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
+                { "\t-1.#NAN", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
+                { "\t -1.#NAN", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
+                { " \t-1.#NAN", rtl_math_StringFormat_Automatic,
+                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
+
+                { "3.14E-2000", rtl_math_StringFormat_E, 4, '.', false,
+                  "0.0000E+000" },
+                { "3.14E-200", rtl_math_StringFormat_E, 4, '.', false,
+                  "3.1400E-200" },
+                { "3.14E-20", rtl_math_StringFormat_E, 4, '.', false,
+                  "3.1400E-020" },
+                { "3.14E-2", rtl_math_StringFormat_E, 4, '.', false,
+                  "3.1400E-002" },
+                { "3.14E2", rtl_math_StringFormat_E, 4, '.', false,
+                  "3.1400E+002" },
+                { "3.14E20", rtl_math_StringFormat_E, 4, '.', false,
+                  "3.1400E+020" },
+                { "3.14E200", rtl_math_StringFormat_E, 4, '.', false,
+                  "3.1400E+200" },
+                { "3.14E2000", rtl_math_StringFormat_E, 4, '.', false,
+                  "1.#INF" },
+            };
+        size_t const nCount = SAL_N_ELEMENTS(aTest);
+        testStringToNumberToString< StringTraits >(aTest, nCount);
+        testStringToNumberToString< UStringTraits >(aTest, nCount);
+    }
+
+    CPPUNIT_TEST_SUITE(Math);
+    CPPUNIT_TEST(rtl_math_001);
+    CPPUNIT_TEST(rtl_math_002);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+// -----------------------------------------------------------------------------
+//extern "C" void /* sal_Bool */ SAL_CALL test_rtl_math2( hTestResult hRtlTestResult )
+//{
+//    c_rtl_tres_state_start(hRtlTestResult, "rtl_math" );
+//
+//    test_rtl_math( hRtlTestResult );
+//
+//    c_rtl_tres_state_end(hRtlTestResult, "rtl_math" );
+//}
+// -----------------------------------------------------------------------------
+//void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc)
+//{
+//    if (_pFunc)
+//    {
+//        (_pFunc)(&test_rtl_math2, "");
+//    }
+//}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(::Math);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/ostring/joblist.txt b/sal/qa/rtl/ostring/joblist.txt
deleted file mode 100644
index 81d1b7a6ba8e..000000000000
--- a/sal/qa/rtl/ostring/joblist.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# JobFile for rtl_OString
-# header source sal/inc/rtl/string.hxx
-
-rtl_OString.valueOf.valueOf_test_001
-rtl_OString.valueOf.valueOf_test_002
-rtl_OString.valueOf.valueOf_test_003
-rtl_OString.valueOf.valueOf_test_004
-rtl_OString.valueOf.valueOf_test_005
-rtl_OString.valueOf.valueOf_test_006
-rtl_OString.valueOf.valueOf_test_007
diff --git a/sal/qa/rtl/ostring/makefile.mk b/sal/qa/rtl/ostring/makefile.mk
index 06469b38a407..5436736cdf36 100644
--- a/sal/qa/rtl/ostring/makefile.mk
+++ b/sal/qa/rtl/ostring/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS=  \
     $(SLO)$/rtl_OString2.obj
 
 SHL1TARGET= rtl_OString2
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -64,7 +64,7 @@ SHL2OBJS=  \
     $(SLO)$/rtl_str.obj
 
 SHL2TARGET= rtl_str
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
@@ -76,7 +76,7 @@ SHL3OBJS=  \
     $(SLO)$/rtl_string.obj
 
 SHL3TARGET= rtl_string
-SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL3IMPLIB= i$(SHL3TARGET)
 DEF3NAME    =$(SHL3TARGET)
@@ -89,5 +89,4 @@ SHL3VERSIONMAP= $(PRJ)$/qa$/export.map
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx
index ee380c86812d..a4a50d8ca880 100644
--- a/sal/qa/rtl/ostring/rtl_OString2.cxx
+++ b/sal/qa/rtl/ostring/rtl_OString2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,12 @@
 // autogenerated file with codegen.pl
 // There exist some more test code in sal/qa/rtl_strings/rtl_OString.cxx
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#include <rtl/string.hxx>
+
 #include "valueequal.hxx"
 
 namespace rtl_OString
@@ -43,7 +49,7 @@ class valueOf : public CppUnit::TestFixture
         {
             rtl::OString sValue;
             sValue = rtl::OString::valueOf( _nValue );
-            t_print(T_VERBOSE, "nFloat := %.9f  sValue := %s\n", _nValue, sValue.getStr());
+            printf("nFloat := %.9f  sValue := %s\n", _nValue, sValue.getStr());
 
             float nValueATOF = static_cast<float>(atof( sValue.getStr() ));
 
@@ -121,7 +127,7 @@ private:
         {
             rtl::OString sValue;
             sValue = rtl::OString::valueOf( _nValue );
-            t_print(T_VERBOSE, "nDouble := %.20f  sValue := %s\n", _nValue, sValue.getStr());
+            printf("nDouble := %.20f  sValue := %s\n", _nValue, sValue.getStr());
 
             double nValueATOF = atof( sValue.getStr() );
 
@@ -254,7 +260,7 @@ public:
     // insert your test code here.
     void toDouble_selftest()
         {
-            t_print("Start selftest:\n");
+            printf("Start selftest:\n");
             CPPUNIT_ASSERT (is_double_equal(1.0, 1.01) == false);
             CPPUNIT_ASSERT (is_double_equal(1.0, 1.001) == false);
             CPPUNIT_ASSERT (is_double_equal(1.0, 1.0001) == false);
@@ -271,7 +277,7 @@ public:
             CPPUNIT_ASSERT (is_double_equal(1.0, 1.00000000000001) == true);
             CPPUNIT_ASSERT (is_double_equal(1.0, 1.000000000000001) == true);
             CPPUNIT_ASSERT (is_double_equal(1.0, 1.0000000000000001) == true);
-            t_print("Selftest done.\n");
+            printf("Selftest done.\n");
         }
 
     void toDouble_test_3()
@@ -388,7 +394,7 @@ public:
                 rtl::OString sToken = sTokenStr.getToken( 0, ';', nIndex );
             }
             while ( nIndex >= 0 );
-            // t_print("Index %d\n", nIndex);
+            // printf("Index %d\n", nIndex);
             // should not GPF
         }
 
@@ -497,7 +503,7 @@ public:
          ::rtl::OString aStr1;
         aStr1= input->replaceAt( index, count, *newStr );
 
-        t_print("the result OString is %s#\n", aStr1.getStr() );
+        printf("the result OString is %s#\n", aStr1.getStr() );
 
         sal_Bool bRes = ( expVal->compareTo(aStr1) == 0 );
         return bRes;
@@ -552,10 +558,10 @@ public:
 
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OString::valueOf, "rtl_OString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OString::toDouble, "rtl_OString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OString::getToken, "rtl_OString");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OString::replaceAt, "rtl_OString");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::valueOf);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::toDouble);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::getToken);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::replaceAt);
 
 } // namespace rtl_OString
 
@@ -564,5 +570,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OString::replaceAt, "rtl_OString");
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx
index b513c6cb1398..b04a49d8b500 100644
--- a/sal/qa/rtl/ostring/rtl_str.cxx
+++ b/sal/qa/rtl/ostring/rtl_str.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <testshl/simpleheader.hxx>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#include <rtl/string.hxx>
+#include <cstring>
 
 namespace rtl_str
 {
@@ -252,7 +259,7 @@ namespace rtl_str
             {
                 rtl::OString aStr1 = "Line for a hashCode.";
                 sal_Int32 nHashCode = rtl_str_hashCode( aStr1.getStr() );
-                t_print("hashcode: %d\n", nHashCode);
+                printf("hashcode: %d\n", nHashCode);
                 // CPPUNIT_ASSERT_MESSAGE("failed.", nValue == 0);
             }
 
@@ -637,7 +644,7 @@ namespace rtl_str
 
                 rtl_str_toAsciiLowerCase_WithLength( pStr, 10 );
 
-                t_print("Lowercase with length: '%s'\n", pStr);
+                printf("Lowercase with length: '%s'\n", pStr);
                 CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
                 free(pStr);
             }
@@ -709,7 +716,7 @@ namespace rtl_str
                 strcpy(pStr, aStr1.getStr());
                 rtl_str_toAsciiUpperCase_WithLength( pStr, 10 );
 
-                t_print("Uppercase with length: '%s'\n", aStr1.getStr());
+                printf("Uppercase with length: '%s'\n", aStr1.getStr());
                 CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
                 free(pStr);
             }
@@ -860,26 +867,26 @@ namespace rtl_str
     };
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::compare, "rtl_str");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::compareIgnoreAsciiCase, "rtl_str");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::shortenedCompareIgnoreAsciiCase_WithLength, "rtl_str");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::hashCode, "rtl_str");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::compare);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::compareIgnoreAsciiCase);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::shortenedCompareIgnoreAsciiCase_WithLength);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::hashCode);
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::indexOfChar, "rtl_str");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::lastIndexOfChar, "rtl_str");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::indexOfStr, "rtl_str");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::lastIndexOfStr, "rtl_str");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::indexOfChar);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::lastIndexOfChar);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::indexOfStr);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::lastIndexOfStr);
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::replaceChar, "rtl_str");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::replaceChar_WithLength, "rtl_str");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::replaceChar);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::replaceChar_WithLength);
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::toAsciiLowerCase, "rtl_str");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::toAsciiLowerCase_WithLength, "rtl_str");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::toAsciiUpperCase, "rtl_str");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::toAsciiUpperCase_WithLength, "rtl_str");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::toAsciiLowerCase);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::toAsciiLowerCase_WithLength);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::toAsciiUpperCase);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::toAsciiUpperCase_WithLength);
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::trim_WithLength, "rtl_str");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::valueOfChar, "rtl_str");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::trim_WithLength);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::valueOfChar);
 
 } // namespace rtl_str
 
@@ -887,4 +894,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_str::valueOfChar, "rtl_str");
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx
index e252476f3f8c..0b5e169d49bd 100644
--- a/sal/qa/rtl/ostring/rtl_string.cxx
+++ b/sal/qa/rtl/ostring/rtl_string.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <testshl/simpleheader.hxx>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#include <rtl/ustring.hxx>
+#include <cstring>
 
 namespace rtl_string
 {
@@ -113,7 +120,7 @@ namespace rtl_string
 
         void convertUStringToString_001()
             {
-                rtl::OUString suString = rtl::OUString::createFromAscii("Hello");
+                rtl::OUString suString(RTL_CONSTASCII_USTRINGPARAM("Hello"));
                 rtl::OString sString;
                 sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS);
 
@@ -172,12 +179,14 @@ namespace rtl_string
 } // namespace rtl_string
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_string::getLength, "rtl_string");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_string::newFromString, "rtl_string");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_string::convertUStringToString, "rtl_string");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::getLength);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::newFromString);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::convertUStringToString);
 
 // -----------------------------------------------------------------------------
 
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/oustring/makefile.mk b/sal/qa/rtl/oustring/makefile.mk
index 6f15637651c6..b84860357a9c 100644
--- a/sal/qa/rtl/oustring/makefile.mk
+++ b/sal/qa/rtl/oustring/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS=  \
     $(SLO)$/rtl_OUString2.obj
 
 SHL1TARGET= rtl_OUString2
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -64,7 +64,7 @@ SHL2OBJS=  \
     $(SLO)$/rtl_ustr.obj
 
 SHL2TARGET= rtl_ustr
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
@@ -78,5 +78,4 @@ SHL2VERSIONMAP= $(PRJ)$/qa$/export.map
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 878f42713278..2c48da7740fb 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,7 +59,7 @@ namespace rtl_OUString
         /// test of OUString(rtl_uString*)
         void ctors_001()
             {
-                rtl::OUString *pStr = new rtl::OUString( rtl::OUString::createFromAscii("a String") );
+                rtl::OUString *pStr = new rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("a String") );
 
                 rtl::OUString aStrToTest(pStr->pData);
                 delete pStr;
@@ -68,7 +69,7 @@ namespace rtl_OUString
                 memset(pBuffer, 0, 2 * 8);
                 free(pBuffer);
 
-                sal_Bool bResult = aStrToTest.equals(rtl::OUString::createFromAscii("a String"));
+                sal_Bool bResult = aStrToTest.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a String")));
                 CPPUNIT_ASSERT_MESSAGE("String must not be empty",  bResult == sal_True);
             }
 
@@ -691,88 +692,88 @@ public:
     void lastIndexOf_test_oustring_offset_001()
         {
             // search for sun, start at the end, found (pos==0)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring_offset(aStr, aSearchStr, 0, aStr.getLength());
         }
 
     void lastIndexOf_test_oustring_offset_002()
         {
             // search for sun, start at pos = 3, found (pos==0)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring_offset(aStr, aSearchStr, 0, 3);
         }
 
     void lastIndexOf_test_oustring_offset_003()
         {
             // search for sun, start at pos = 2, found (pos==-1)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring_offset(aStr, aSearchStr, -1, 2);
         }
 
     void lastIndexOf_test_oustring_offset_004()
         {
             // search for sun, start at the end, found (pos==0)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring_offset(aStr, aSearchStr, -1, -1);
         }
 
     void lastIndexOf_test_oustring_001()
         {
             // search for sun, found (pos==0)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring(aStr, aSearchStr, 0);
         }
 
     void lastIndexOf_test_oustring_002()
         {
             // search for sun, found (pos==4)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring(aStr, aSearchStr, 4);
         }
 
     void lastIndexOf_test_oustring_003()
         {
             // search for sun, found (pos==8)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring(aStr, aSearchStr, 8);
         }
 
     void lastIndexOf_test_oustring_004()
         {
             // search for sun, found (pos==8)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring(aStr, aSearchStr, 8);
         }
 
     void lastIndexOf_test_oustring_005()
         {
             // search for sun, found (pos==4)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun su");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun su"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring(aStr, aSearchStr, 4);
         }
 
     void lastIndexOf_test_oustring_006()
         {
             // search for sun, found (pos==-1)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the su su");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the su su"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring(aStr, aSearchStr, -1);
         }
 
     void lastIndexOf_test_oustring_007()
         {
             // search for earth, not found (-1)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the su su");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("earth");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the su su"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("earth"));
             lastIndexOf_oustring(aStr, aSearchStr, -1);
         }
 
@@ -780,7 +781,7 @@ public:
         {
             // search for earth, not found (-1)
             rtl::OUString aStr = rtl::OUString();
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("earth");
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("earth"));
             lastIndexOf_oustring(aStr, aSearchStr, -1);
         }
 
@@ -796,7 +797,7 @@ public:
     void lastIndexOf_test_salunicode_001()
         {
             // search for 's', found (19)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system"));
             sal_Unicode suChar = L's';
             lastIndexOf_salunicode(aStr, suChar, 19);
         }
@@ -804,7 +805,7 @@ public:
     void lastIndexOf_test_salunicode_002()
         {
             // search for 'x', not found (-1)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system"));
             sal_Unicode suChar = L'x';
             lastIndexOf_salunicode(aStr, suChar, -1);
         }
@@ -812,21 +813,21 @@ public:
     void lastIndexOf_test_salunicode_offset_001()
         {
             // search for 's', start from pos last char, found (19)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system"));
             sal_Unicode cuChar = L's';
             lastIndexOf_salunicode_offset(aStr, cuChar, 19, aStr.getLength());
         }
     void lastIndexOf_test_salunicode_offset_002()
         {
             // search for 's', start pos is last occur from search behind, found (17)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system"));
             sal_Unicode cuChar = L's';
             lastIndexOf_salunicode_offset(aStr, cuChar, 17, 19);
         }
     void lastIndexOf_test_salunicode_offset_003()
         {
             // search for 't', start pos is 1, found (0)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system"));
             sal_Unicode cuChar = L't';
             lastIndexOf_salunicode_offset(aStr, cuChar, 0, 1);
         }
@@ -885,66 +886,66 @@ public:
 
     void getToken_001()
         {
-            rtl::OUString suTokenStr = rtl::OUString::createFromAscii("a;b");
+            rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("a;b"));
 
             sal_Int32 nIndex = 0;
 
             rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString::createFromAscii("a")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString::createFromAscii("b")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("b"))) == sal_True);
             CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
         }
 
     void getToken_002()
         {
-            rtl::OUString suTokenStr = rtl::OUString::createFromAscii("a;b.c");
+            rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("a;b.c"));
 
             sal_Int32 nIndex = 0;
 
             rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString::createFromAscii("a")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString::createFromAscii("b")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("b"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'c'", suToken.equals(rtl::OUString::createFromAscii("c")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'c'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("c"))) == sal_True);
             CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
         }
 
     void getToken_003()
         {
-            rtl::OUString suTokenStr = rtl::OUString::createFromAscii("a;;b");
+            rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("a;;b"));
 
             sal_Int32 nIndex = 0;
 
             rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString::createFromAscii("a")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be empty", suToken.getLength() == 0);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString::createFromAscii("b")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("b"))) == sal_True);
             CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
         }
 
     void getToken_004()
         {
-            rtl::OUString suTokenStr = rtl::OUString::createFromAscii("longer.then.ever.");
+            rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("longer.then.ever."));
 
             sal_Int32 nIndex = 0;
 
             rtl::OUString suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be 'longer'", suToken.equals(rtl::OUString::createFromAscii("longer")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be 'longer'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("longer"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be 'then'", suToken.equals(rtl::OUString::createFromAscii("then")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be 'then'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("then"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be 'ever'", suToken.equals(rtl::OUString::createFromAscii("ever")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be 'ever'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ever"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be empty", suToken.getLength() == 0);
@@ -985,7 +986,7 @@ void convertToString::test() {
     static sal_Unicode const utf16[] = { 0x0041, 0x00E4, 0x0061 };
     rtl::OString s;
     CPPUNIT_ASSERT(
-        rtl::OUString(utf16, sizeof utf16 / sizeof utf16[0]).convertToString(
+        rtl::OUString(utf16, SAL_N_ELEMENTS(utf16)).convertToString(
             &s, RTL_TEXTENCODING_UTF7,
             (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR |
              RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)));
@@ -1023,7 +1024,7 @@ public:
 
         ::rtl::OUString aFoo( RTL_CONSTASCII_USTRINGPARAM("foo") );
         ::rtl::OUString aFooIntern = aFoo.intern();
-        CPPUNIT_ASSERT_MESSAGE("string contents", aFooIntern.equalsAscii("foo"));
+        CPPUNIT_ASSERT_MESSAGE("string contents", aFooIntern.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("foo")));
         CPPUNIT_ASSERT_MESSAGE("string length", aFooIntern.getLength() == 3);
         // We have to dup due to no atomic 'intern' bit-set operation
         CPPUNIT_ASSERT_MESSAGE("intern dups", aFoo.pData != aFooIntern.pData);
@@ -1278,3 +1279,5 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
 NOADDITIONAL;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx
index fd207ef0778c..f0cd05c3e4f6 100644
--- a/sal/qa/rtl/oustring/rtl_ustr.cxx
+++ b/sal/qa/rtl/oustring/rtl_ustr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,7 +59,7 @@ namespace rtl_ustr
 
         void compare_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_compare( aStr1.getStr(), NULL);
                 // should not GPF
             }
@@ -73,8 +74,8 @@ namespace rtl_ustr
 
         void compare_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
 
                 sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -82,8 +83,8 @@ namespace rtl_ustr
 
         void compare_003()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must differ.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line foo bar, ok, differ.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ."));
 
                 sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -114,7 +115,7 @@ namespace rtl_ustr
 
         void compare_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
             }
         void compare_001()
@@ -128,8 +129,8 @@ namespace rtl_ustr
 
         void compare_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
 
                 sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -137,8 +138,8 @@ namespace rtl_ustr
 
         void compare_002_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("LINE MUST BE EQUAL.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("LINE MUST BE EQUAL."));
 
                 sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitve).", nValue == 0);
@@ -146,8 +147,8 @@ namespace rtl_ustr
 
         void compare_003()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must differ.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line foo bar, ok, differ.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ."));
 
                 sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -180,7 +181,7 @@ namespace rtl_ustr
 
         void compare_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0, 1);
             }
         void compare_001()
@@ -194,8 +195,8 @@ namespace rtl_ustr
 
         void compare_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -205,8 +206,8 @@ namespace rtl_ustr
 
         void compare_002_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("LINE MUST BE EQUAL.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("LINE MUST BE EQUAL."));
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -216,8 +217,8 @@ namespace rtl_ustr
 
         void compare_003()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must differ.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line foo bar, ok, differ.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ."));
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -227,8 +228,8 @@ namespace rtl_ustr
 
         void compare_004()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must differ.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line foo bar, ok, differ.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ."));
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -320,7 +321,7 @@ namespace rtl_ustr
 
         void indexOfChar_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfChar.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfChar."));
 
                 sal_Int32 nIndex = rtl_ustr_indexOfChar( aStr1.getStr(), 'L' );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
@@ -337,7 +338,7 @@ namespace rtl_ustr
 
         void indexOfChar_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfChar.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfChar."));
                 sal_Int32 nIndex = rtl_ustr_indexOfChar( aStr1.getStr(), 'y' );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -366,7 +367,7 @@ namespace rtl_ustr
 
         void lastIndexOfChar_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfChar.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfChar."));
 
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfChar( aStr1.getStr(), 'C' );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 22);
@@ -383,7 +384,7 @@ namespace rtl_ustr
 
         void lastIndexOfChar_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfChar.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfChar."));
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfChar( aStr1.getStr(), 'y' );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -414,35 +415,35 @@ namespace rtl_ustr
 
         void indexOfStr_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfStr.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfStr."));
                 rtl_ustr_indexOfStr( aStr1.getStr(), 0 );
             }
 
         void indexOfStr_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfStr.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfStr."));
 
-                rtl::OUString suSearch = rtl::OUString::createFromAscii("Line");
+                rtl::OUString suSearch(RTL_CONSTASCII_USTRINGPARAM("Line"));
                 sal_Int32 nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
 
-                /* rtl::OUString */ suSearch = rtl::OUString::createFromAscii("for");
+                /* rtl::OUString */ suSearch(RTL_CONSTASCII_USTRINGPARAM("for"));
                 /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 5);
 
-                /* rtl::OUString */ suSearch = rtl::OUString::createFromAscii("a");
+                /* rtl::OUString */ suSearch(RTL_CONSTASCII_USTRINGPARAM("a"));
                 /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 9);
 
-                /* rtl::OUString */ suSearch = rtl::OUString::createFromAscii("a index");
+                /* rtl::OUString */ suSearch(RTL_CONSTASCII_USTRINGPARAM("a index"));
                 /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex ==9);
             }
 
         void indexOfStr_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfStr.");
-                rtl::OUString suSearch = rtl::OUString::createFromAscii("not exist");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfStr."));
+                rtl::OUString suSearch(RTL_CONSTASCII_USTRINGPARAM("not exist"));
                 sal_Int32 nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -472,31 +473,31 @@ namespace rtl_ustr
 
         void lastIndexOfStr_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfStr.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr."));
                 rtl_ustr_lastIndexOfStr( aStr1.getStr(), NULL );
             }
 
         void lastIndexOfStr_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfStr.");
-                rtl::OUString aSearchStr = rtl::OUString::createFromAscii("Index");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr."));
+                rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("Index"));
 
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 15);
 
-                /* rtl::OString */ aSearchStr = rtl::OUString::createFromAscii("Line");
+                /* rtl::OString */ aSearchStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Line"));
                 /* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
 
-                /* rtl::OString */ aSearchStr = rtl::OUString::createFromAscii("");
+                /* rtl::OString */ aSearchStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""));
                 /* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1);
             }
 
         void lastIndexOfStr_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfStr.");
-                rtl::OUString aSearchStr = rtl::OUString::createFromAscii("foo");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr."));
+                rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("foo"));
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -504,8 +505,8 @@ namespace rtl_ustr
 
         void lastIndexOfStr_003()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfStr.");
-                rtl::OUString aSearchStr = rtl::OUString::createFromAscii("O");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr."));
+                rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("O"));
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 20 );
@@ -536,8 +537,8 @@ namespace rtl_ustr
 
         void replaceChar_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("replace char.");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("ruplacu char.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("replace char."));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("ruplacu char."));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc( nLength + sizeof(sal_Unicode)); // length + 1 (null terminator)
@@ -579,8 +580,8 @@ namespace rtl_ustr
             }
         void replaceChar_WithLength_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("replace char.");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("ruplace char.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("replace char."));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("ruplace char."));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);
@@ -596,8 +597,8 @@ namespace rtl_ustr
 
         void replaceChar_WithLength_002()
             {
-                rtl::OUString aStr1       = rtl::OUString::createFromAscii("eeeeeeeeeeeee");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("uuuuuueeeeeee");
+                rtl::OUString aStr1      (RTL_CONSTASCII_USTRINGPARAM("eeeeeeeeeeeee"));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("uuuuuueeeeeee"));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);                 // no null terminator is need
@@ -637,8 +638,8 @@ namespace rtl_ustr
 
         void toAsciiLowerCase_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII LOWER CASE.");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("change this to ascii lower case.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII LOWER CASE."));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii lower case."));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode) );  // we need to add '\0' so one more
@@ -675,8 +676,8 @@ namespace rtl_ustr
 
         void toAsciiLowerCase_WithLength_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII LOWER CASE.");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("change thiS TO ASCII LOWER CASE.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII LOWER CASE."));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("change thiS TO ASCII LOWER CASE."));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);
@@ -719,8 +720,8 @@ namespace rtl_ustr
 
         void toAsciiUpperCase_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("change this to ascii upper case.");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII UPPER CASE.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii upper case."));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII UPPER CASE."));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator
@@ -757,8 +758,8 @@ namespace rtl_ustr
 
         void toAsciiUpperCase_WithLength_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("change this to ascii lower case.");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("CHANGE THIs to ascii lower case.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii lower case."));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIs to ascii lower case."));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);
@@ -797,7 +798,7 @@ namespace rtl_ustr
 
         void trim_WithLength_000_1()
         {
-            rtl::OUString suStr = rtl::OUString::createFromAscii("  trim this");
+            rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("  trim this"));
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -809,7 +810,7 @@ namespace rtl_ustr
 
         void trim_WithLength_001()
         {
-            rtl::OUString suStr = rtl::OUString::createFromAscii("  trim this");
+            rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("  trim this"));
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
             memcpy(pStr, suStr.getStr(), nLength);
@@ -823,7 +824,7 @@ namespace rtl_ustr
 
         void trim_WithLength_002()
         {
-            rtl::OUString suStr = rtl::OUString::createFromAscii("trim this");
+            rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("trim this"));
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -838,7 +839,7 @@ namespace rtl_ustr
 
         void trim_WithLength_003()
         {
-            rtl::OUString suStr = rtl::OUString::createFromAscii("     trim   this");
+            rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("     trim   this"));
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -852,7 +853,7 @@ namespace rtl_ustr
 
         void trim_WithLength_004()
         {
-            rtl::OUString suStr = rtl::OUString::createFromAscii("\r\n\t \n\r    trim  \n this");
+            rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("\r\n\t \n\r    trim  \n this"));
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -866,7 +867,7 @@ namespace rtl_ustr
 
         void trim_WithLength_005()
         {
-            rtl::OUString suStr = rtl::OUString::createFromAscii("\r\n\t \n\r    trim \t this \n\r\t\t     ");
+            rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("\r\n\t \n\r    trim \t this \n\r\t\t     "));
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -1021,13 +1022,13 @@ namespace rtl_ustr
 
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0);
                 // should not GPF
             }
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_2()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                 "Line is shorter.";
                 rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr(), 0);
                 // should not GPF
@@ -1043,7 +1044,7 @@ namespace rtl_ustr
 
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_002()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength());
@@ -1052,7 +1053,7 @@ namespace rtl_ustr
 
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_003()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
                 rtl::OString sStr2 =                                  "Line must be differ and longer.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength());
@@ -1087,13 +1088,13 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_WithLength_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), 0, NULL);
                 // should not GPF
             }
         void ascii_compareIgnoreAsciiCase_WithLength_000_2()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                 "Line is shorter.";
                 rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr());
                 // should not GPF
@@ -1109,7 +1110,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_WithLength_002()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr());
@@ -1118,7 +1119,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_WithLength_003()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
                 rtl::OString sStr2 =                                  "Line must be differ and longer.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr());
@@ -1153,7 +1154,7 @@ namespace rtl_ustr
 
         void ascii_compare_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_ascii_compare( aStr1.getStr(), NULL);
                 // should not GPF
             }
@@ -1168,7 +1169,7 @@ namespace rtl_ustr
 
         void ascii_compare_002()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr());
@@ -1177,7 +1178,7 @@ namespace rtl_ustr
 
         void ascii_compare_003()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
                 rtl::OString sStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr());
@@ -1211,7 +1212,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_ascii_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
                 // should not GPF
             }
@@ -1226,7 +1227,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_002()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
@@ -1235,7 +1236,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_002_1()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal, when ignore case.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal, when ignore case."));
                 rtl::OString sStr2 =                                 "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
@@ -1244,7 +1245,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_003()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
                 rtl::OString sStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
@@ -1255,8 +1256,8 @@ namespace rtl_ustr
 
         // void ascii_compareIgnoreAsciiCase_001()
         //     {
-        //         rtl::OUString suStr1 = rtl::OUString::createFromAscii("change this to ascii upper case.");
-        //         rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII UPPER CASE.");
+        //         rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii upper case."));
+        //         rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII UPPER CASE."));
         //
         //         sal_uInt32 nLength = suStr1.getLength() * sizeof(sal_Unicode);
         //         sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator
@@ -1309,7 +1310,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_ascii_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
                 // should not GPF
             }
@@ -1324,7 +1325,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_002()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
@@ -1333,7 +1334,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_002_1()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal, when ignore case.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal, when ignore case."));
                 rtl::OString sStr2 =                                 "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
@@ -1342,7 +1343,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_003()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
                 rtl::OString sStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
@@ -1353,8 +1354,8 @@ namespace rtl_ustr
 
         // void ascii_compareIgnoreAsciiCase_001()
         //     {
-        //         rtl::OUString suStr1 = rtl::OUString::createFromAscii("change this to ascii upper case.");
-        //         rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII UPPER CASE.");
+        //         rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii upper case."));
+        //         rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII UPPER CASE."));
         //
         //         sal_uInt32 nLength = suStr1.getLength() * sizeof(sal_Unicode);
         //         sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator
@@ -1422,3 +1423,4 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ustr::ascii_shortenedCompareIgnoreAsci
 NOADDITIONAL;
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/oustringbuffer/makefile.mk b/sal/qa/rtl/oustringbuffer/makefile.mk
index 544f7b7df170..32583c2ff25a 100644
--- a/sal/qa/rtl/oustringbuffer/makefile.mk
+++ b/sal/qa/rtl/oustringbuffer/makefile.mk
@@ -25,46 +25,33 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..
-INCPRE+= $(PRJ)$/qa$/inc
+PRJ := ..$/..$/..
+PRJNAME := sal
 
-PRJNAME=sal
-TARGET=rtl_oustringbuffer2
+TARGET := qa_rtl_oustringbuffer
 
-ENABLE_EXCEPTIONS=TRUE
+ENABLE_EXCEPTIONS := TRUE
 
-# --- Settings -----------------------------------------------------
+.INCLUDE: settings.mk
 
-.INCLUDE :  settings.mk
+.IF "$(CROSS_COMPILING)"!="YES"
 
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl
-SHL1OBJS=  \
-    $(SLO)$/rtl_OUStringBuffer2.obj
+SHL1TARGET := $(TARGET)
+SHL1OBJS := \
+    $(SLO)$/test_oustringbuffer_utf32.obj \
+    $(SLO)$/test_oustringbuffer_tostring.obj \
+    $(SLO)$/test_oustringbuffer_noadditional.obj
+SHL1IMPLIB := i$(SHL1TARGET)
+SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB)
+SHL1VERSIONMAP := $(PRJ)$/qa$/export.map
+DEF1NAME := $(SHL1TARGET)
 
-SHL1TARGET= rtl_OUStringBuffer2
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME    =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:joblist
-# END ------------------------------------------------------------------
-
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.ENDIF
 
+.INCLUDE: target.mk
+.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx b/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx
deleted file mode 100644
index b70ce5ae4bae..000000000000
--- a/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx
+++ /dev/null
@@ -1,101 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-#include <testshl/simpleheader.hxx>
-#include "stringhelper.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <rtl/uri.hxx>
-
-namespace rtl_OUStringBuffer
-{
-
-
-class insertUtf32 : public CppUnit::TestFixture
-{
-public:
-    // initialise your test code values here.
-    void setUp()
-    {
-    }
-
-    void tearDown()
-    {
-    }
-
-    void insertUtf32_001()
-        {
-            ::rtl::OUStringBuffer aUStrBuf(4);
-            aUStrBuf.insertUtf32(0,0x10ffff);
-
-            rtl::OUString suStr = aUStrBuf.makeStringAndClear();
-            rtl::OUString suStr2 = rtl::Uri::encode(suStr, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
-
-            rtl::OString sStr;
-            sStr <<= suStr2;
-            t_print("%s\n", sStr.getStr());
-
-            CPPUNIT_ASSERT_MESSAGE("Strings must be '%F4%8F%BF%BF'", sStr.equals(rtl::OString("%F4%8F%BF%BF")) == sal_True);
-        }
-
-    void insertUtf32_002()
-        {
-            ::rtl::OUStringBuffer aUStrBuf(4);
-            aUStrBuf.insertUtf32(0,0x41);
-            aUStrBuf.insertUtf32(1,0x42);
-            aUStrBuf.insertUtf32(2,0x43);
-
-            rtl::OUString suStr = aUStrBuf.makeStringAndClear();
-            rtl::OUString suStr2 = rtl::Uri::encode(suStr, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
-
-            rtl::OString sStr;
-            sStr <<= suStr2;
-            t_print("%s\n", sStr.getStr());
-
-            CPPUNIT_ASSERT_MESSAGE("Strings must be 'ABC'", sStr.equals(rtl::OString("ABC")) == sal_True);
-        }
-
-    CPPUNIT_TEST_SUITE(insertUtf32);
-    CPPUNIT_TEST(insertUtf32_001);
-    CPPUNIT_TEST(insertUtf32_002);
-    CPPUNIT_TEST_SUITE_END();
-}; // class getToken
-
-// -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OUStringBuffer::insertUtf32, "rtl_OUStringBuffer");
-
-} // namespace rtl_OUStringBuffer
-
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
-
diff --git a/sal/rtl/source/gen_makefile.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx
index 0b11c11d06c9..18e8a634460b 100644
--- a/sal/rtl/source/gen_makefile.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,14 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include "macro.hxx"
-#include <stdio.h>
-
-int main()
-{
-  printf( "RTL_OS:=%s\n", THIS_OS );
-  printf( "RTL_ARCH:=%s\n", THIS_ARCH );
-  return 0;
-}
+#include <cppunit/plugin/TestPlugIn.h>
 
+CPPUNIT_PLUGIN_IMPLEMENT();
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
new file mode 100644
index 000000000000..df38ce6295bb
--- /dev/null
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sal.hxx"
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+
+namespace test { namespace oustringbuffer {
+
+class ToString: public CppUnit::TestFixture {
+private:
+    void testToString();
+
+    CPPUNIT_TEST_SUITE(ToString);
+    CPPUNIT_TEST(testToString);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+} }
+
+CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::ToString);
+
+void test::oustringbuffer::ToString::testToString() {
+    rtl::OUStringBuffer sb(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test string")));
+    rtl::OUString str = sb.toString();
+    CPPUNIT_ASSERT(str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test string")));
+    // returned OUString must be independent from sb
+    sb.append( (sal_Unicode)'a' );
+    CPPUNIT_ASSERT(str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test string")));
+    sb.setLength(0);
+    CPPUNIT_ASSERT(str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("test string")));
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
index 4ec593f54edd..13e75a476adf 100644
--- a/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include "rtl/strbuf.hxx"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
@@ -49,37 +53,37 @@ private:
 
 } }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test::oustringbuffer::Utf32, "alltest");
+CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::Utf32);
 
 namespace {
 
-void appendString(rtl::OUStringBuffer & buffer, rtl::OUString const & string) {
-    buffer.append(static_cast< sal_Unicode >('"'));
+void appendString(rtl::OStringBuffer & buffer, rtl::OUString const & string) {
+    buffer.append('"');
     for (int i = 0; i < string.getLength(); ++i) {
-        buffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("\\u"));
+        buffer.append(RTL_CONSTASCII_STRINGPARAM("\\u"));
         sal_Unicode c = string[i];
         if (c < 0x1000) {
-            buffer.append(static_cast< sal_Unicode >('0'));
+            buffer.append('0');
             if (c < 0x100) {
-                buffer.append(static_cast< sal_Unicode >('0'));
+                buffer.append('0');
                 if (c < 0x10) {
-                    buffer.append(static_cast< sal_Unicode >('0'));
+                    buffer.append('0');
                 }
             }
         }
         buffer.append(
             static_cast< sal_Int32 >(c), static_cast< sal_Int16 >(16));
     }
-    buffer.append(static_cast< sal_Unicode >('"'));
+    buffer.append('"');
 }
 
 void createMessage(
-    rtl::OUStringBuffer & message, rtl::OUString const & string1,
+    rtl::OStringBuffer & message, rtl::OUString const & string1,
     rtl::OUString const & string2)
 {
     message.setLength(0);
     appendString(message, string1);
-    message.appendAscii(RTL_CONSTASCII_STRINGPARAM(" vs. "));
+    message.append(RTL_CONSTASCII_STRINGPARAM(" vs. "));
     appendString(message, string2);
 }
 
@@ -92,19 +96,19 @@ void test::oustringbuffer::Utf32::appendUtf32() {
     sal_Unicode const str2[str2Len] = { 'a', 'b', 'c', 'd' };
     int const str3Len = 6;
     sal_Unicode const str3[str3Len] = { 'a', 'b', 'c', 'd', 0xD800, 0xDC00 };
-    rtl::OUStringBuffer message;
+    rtl::OStringBuffer message;
     rtl::OUStringBuffer buf1(rtl::OUString(str1, str1Len));
     buf1.appendUtf32('d');
     rtl::OUString res1(buf1.makeStringAndClear());
     createMessage(message, res1, rtl::OUString(str2, str2Len));
     CPPUNIT_ASSERT_MESSAGE(
-        message.getStr(), res1 == rtl::OUString(str2, str2Len));
+        (const char *) message.getStr(), res1 == rtl::OUString(str2, str2Len));
     rtl::OUStringBuffer buf2(rtl::OUString(str2, str2Len));
     buf2.appendUtf32(0x10000);
     rtl::OUString res2(buf2.makeStringAndClear());
     createMessage(message, res2, rtl::OUString(str3, str3Len));
     CPPUNIT_ASSERT_MESSAGE(
-        message.getStr(), res2 == rtl::OUString(str3, str3Len));
+        (const char *)message.getStr(), res2 == rtl::OUString(str3, str3Len));
 }
 
 void test::oustringbuffer::Utf32::insertUtf32() {
@@ -114,17 +118,19 @@ void test::oustringbuffer::Utf32::insertUtf32() {
     sal_Unicode const str2[str2Len] = { 'a', 'b', 'd', 'c' };
     int const str3Len = 6;
     sal_Unicode const str3[str3Len] = { 'a', 'b', 0xDBFF, 0xDFFF, 'd', 'c' };
-    rtl::OUStringBuffer message;
+    rtl::OStringBuffer message;
     rtl::OUStringBuffer buf1(rtl::OUString(str1, str1Len));
     buf1.insertUtf32(2, 'd');
     rtl::OUString res1(buf1.makeStringAndClear());
     createMessage(message, res1, rtl::OUString(str2, str2Len));
     CPPUNIT_ASSERT_MESSAGE(
-        message.getStr(), res1 == rtl::OUString(str2, str2Len));
+        (const char *) message.getStr(), res1 == rtl::OUString(str2, str2Len));
     rtl::OUStringBuffer buf2(rtl::OUString(str2, str2Len));
     buf2.insertUtf32(2, 0x10FFFF);
     rtl::OUString res2(buf2.makeStringAndClear());
     createMessage(message, res2, rtl::OUString(str3, str3Len));
     CPPUNIT_ASSERT_MESSAGE(
-        message.getStr(), res2 == rtl::OUString(str3, str3Len));
+        (const char *) message.getStr(), res2 == rtl::OUString(str3, str3Len));
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/process/child_process.cxx b/sal/qa/rtl/process/child_process.cxx
index 6264be018376..a2f5838e3124 100644
--- a/sal/qa/rtl/process/child_process.cxx
+++ b/sal/qa/rtl/process/child_process.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(, argv)
     }
     return 2;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/process/child_process_id.cxx b/sal/qa/rtl/process/child_process_id.cxx
index f859a4b814c9..1c59b5e66d8a 100644
--- a/sal/qa/rtl/process/child_process_id.cxx
+++ b/sal/qa/rtl/process/child_process_id.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,3 +62,5 @@ SAL_IMPLEMENT_MAIN()
     printUuid( pTargetUUID );
     return 1;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/process/makefile.mk b/sal/qa/rtl/process/makefile.mk
index 5df9dc01504e..e3a26c9311ad 100644
--- a/sal/qa/rtl/process/makefile.mk
+++ b/sal/qa/rtl/process/makefile.mk
@@ -48,38 +48,22 @@ SHL1OBJS=  \
     $(SLO)$/rtl_Process.obj
 
 SHL1TARGET= rtl_Process
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 OBJ3FILES=$(OBJ)$/child_process.obj
 APP3TARGET=child_process
 APP3OBJS=$(OBJ3FILES)
-
-#.IF "$(GUI)" == "UNX"
-#APP3STDLIBS=$(LB)$/libsal.so
-#.ENDIF
-#.IF "$(GUI)" == "WNT"
-#APP3STDLIBS=$(KERNEL32LIB) $(LB)$/isal.lib
-#.ENDIF
 APP3STDLIBS=$(SALLIB)
 
 OBJ4FILES=$(OBJ)$/child_process_id.obj
 APP4TARGET=child_process_id
 APP4OBJS=$(OBJ4FILES)
-
-# .IF "$(GUI)" == "UNX"
-# APP4STDLIBS=$(LB)$/libsal.so
-# .ENDIF
-# .IF "$(GUI)" == "WNT"
-# APP4STDLIBS=$(KERNEL32LIB) $(LB)$/isal.lib
-# .ENDIF
 APP4STDLIBS=$(SALLIB)
 
 #------------------------------- All object files -------------------------------
@@ -89,5 +73,4 @@ SLOFILES=$(SHL1OBJS)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index 8c712668e634..426bddfb14b3 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,7 +44,10 @@
 #include "rtl_Process_Const.h"
 
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
 
 /** print a UNI_CODE String. And also print some comments of the string.
 */
@@ -68,7 +72,7 @@ inline ::rtl::OUString getModulePath( void )
     printUString(suDirPath, "modulePath:");
     suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') );
     suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') + 1);
-    suDirPath += rtl::OUString::createFromAscii("bin");
+    suDirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin"));
     return suDirPath;
 }
 
@@ -90,10 +94,10 @@ public:
 
     void getAppCommandArg_001()
     {
-#if defined(WNT) || defined(OS2)
-    const rtl::OUString EXECUTABLE_NAME = rtl::OUString::createFromAscii("child_process.exe");
+#if defined(WNT)
+    const rtl::OUString EXECUTABLE_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process.exe"));
 #else
-    const rtl::OUString EXECUTABLE_NAME = rtl::OUString::createFromAscii("child_process");
+    const rtl::OUString EXECUTABLE_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process"));
 #endif
         rtl::OUString suCWD = getModulePath();
         // rtl::OUString suCWD2 = getExecutableDirectory();
@@ -112,7 +116,7 @@ public:
         pParameters[3] = suParam3.pData;
 
         rtl::OUString suFileURL = suCWD;
-        suFileURL += rtl::OUString::createFromAscii("/");
+        suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         suFileURL += EXECUTABLE_NAME;
 
         oslProcessError osl_error = osl_executeProcess(
@@ -227,10 +231,10 @@ public:
     //different processes different pids
     void getGlobalProcessId_002()
     {
-#if defined(WNT) || defined(OS2)
-    const rtl::OUString EXEC_NAME = rtl::OUString::createFromAscii("child_process_id.exe");
+#if defined(WNT)
+    const rtl::OUString EXEC_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process_id.exe"));
 #else
-    const rtl::OUString EXEC_NAME = rtl::OUString::createFromAscii("child_process_id");
+    const rtl::OUString EXEC_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process_id"));
 #endif
         sal_uInt8 pTargetUUID1[16];
         rtl_getGlobalProcessId( pTargetUUID1 );
@@ -242,7 +246,7 @@ public:
     rtl::OUString suCWD = getModulePath();
         oslProcess hProcess = NULL;
        rtl::OUString suFileURL = suCWD;
-        suFileURL += rtl::OUString::createFromAscii("/");
+        suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         suFileURL += EXEC_NAME;
     oslFileHandle* pChildOutputRead = new oslFileHandle();
         oslProcessError osl_error = osl_executeProcess_WithRedirectedIO(
@@ -294,3 +298,5 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Process::getGlobalProcessId, "rtl_Proc
 // this macro creates an empty function, which will called by the RegisterAllFunctions()
 // to let the user the possibility to also register some functions by hand.
 NOADDITIONAL;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h
index a66d244a0cfe..106af3c73cf1 100644
--- a/sal/qa/rtl/process/rtl_Process_Const.h
+++ b/sal/qa/rtl/process/rtl_Process_Const.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 #ifndef _RTL_PROCESS_CONST_H_
 #define _RTL_PROCESS_CONST_H_
@@ -12,11 +13,10 @@ extern "C"
 {
 #endif
 //------------------------------------------------------------------------
-//::rtl::OUString suParam[4];
-::rtl::OUString suParam0 = ::rtl::OUString::createFromAscii("-join");
-::rtl::OUString suParam1 = OUString::createFromAscii("-with");
-::rtl::OUString suParam2 = OUString::createFromAscii("-child");
-::rtl::OUString suParam3 = OUString::createFromAscii("-process");
+::rtl::OUString suParam0(RTL_CONSTASCII_USTRINGPARAM("-join"));
+::rtl::OUString suParam1(RTL_CONSTASCII_USTRINGPARAM("-with"));
+::rtl::OUString suParam2(RTL_CONSTASCII_USTRINGPARAM("-child"));
+::rtl::OUString suParam3(RTL_CONSTASCII_USTRINGPARAM("-process"));
 
 //------------------------------------------------------------------------
 #ifdef __cplusplus
@@ -24,3 +24,5 @@ extern "C"
 #endif
 
 #endif /* RTL_PROCESS_CONST_H*/
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/random/makefile.mk b/sal/qa/rtl/random/makefile.mk
index ef8616a90916..ef5a86cedd15 100644
--- a/sal/qa/rtl/random/makefile.mk
+++ b/sal/qa/rtl/random/makefile.mk
@@ -35,30 +35,24 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
+DLLPRE = # no leading "lib" on .so files
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:job by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_random.obj
 
 SHL1TARGET= rtl_Random
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:job
-# END ------------------------------------------------------------------
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES= \
+    $(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx
index 47ff63e480c4..0ee897291c91 100644
--- a/sal/qa/rtl/random/rtl_random.cxx
+++ b/sal/qa/rtl/random/rtl_random.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,13 +29,19 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-// autogenerated file with codegen.pl
 
-#include <algorithm> // STL
+#include <algorithm>
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#include <osl/diagnose.h>
 #include <rtl/random.h>
 
+#include <string.h>
+
 namespace rtl_random
 {
 
@@ -160,7 +167,7 @@ public:
 
             rtl_random_addBytes(aPool, pBuffer, nBufLen);
 
-            t_print("%2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3]);
+            printf("%2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3]);
 
             rtl_random_destroyPool(aPool);
             delete [] pBuffer;
@@ -190,57 +197,62 @@ class Statistics
 
 public:
     void clearDispensation()
+    {
+        for (int i = 0;i < 256;++i)                        // clear array
         {
-            for (int i = 0;i < 256;i ++)                        // clear array
-            {
-                m_nDispensation[i] = 0;
-            }
+            m_nDispensation[i] = 0;
         }
+    }
     Statistics()
-        {
-            clearDispensation();
-        }
+    : m_nMin(0)
+    , m_nMax(0)
+    , m_nAverage(0)
+    , m_nMinDeviation(0)
+    , m_nMaxDeviation(0)
+    {
+        clearDispensation();
+    }
     ~Statistics(){}
 
     void addValue(sal_Int16 _nIndex, sal_Int32 _nValue)
-        {
-            OSL_ASSERT(_nIndex >= 0 && _nIndex < 256);
-            m_nDispensation[_nIndex] += _nValue;
-        }
+    {
+        OSL_ASSERT(_nIndex >= 0 && _nIndex < 256);
+        m_nDispensation[_nIndex] += _nValue;
+    }
 
     void build(sal_Int32 _nCountMax)
-        {
-            m_nMin = _nCountMax;
-            m_nMax = 0;
+    {
+        m_nMin = _nCountMax;
+        m_nMax = 0;
 
-            m_nAverage = _nCountMax / 256;
+        m_nAverage = _nCountMax / 256;
 
-            m_nMinDeviation = _nCountMax;
-            m_nMaxDeviation = 0;
+        m_nMinDeviation = _nCountMax;
+        m_nMaxDeviation = 0;
 
-            for (int i = 0;i < 256;i ++)                        // show dispensation
-            {
-                m_nMin = std::min(m_nMin, m_nDispensation[i]);
-                m_nMax = std::max(m_nMax, m_nDispensation[i]);
+        for (int i = 0;i < 256;++i)                        // show dispensation
+        {
+            m_nMin = std::min(m_nMin, m_nDispensation[i]);
+            m_nMax = std::max(m_nMax, m_nDispensation[i]);
 
-                m_nMinDeviation = std::min(m_nMinDeviation, abs(m_nAverage - m_nDispensation[i]));
-                m_nMaxDeviation = std::max(m_nMaxDeviation, abs(m_nAverage - m_nDispensation[i]));
-            }
+            m_nMinDeviation = std::min(m_nMinDeviation, abs(m_nAverage - m_nDispensation[i]));
+            m_nMaxDeviation = std::max(m_nMaxDeviation, abs(m_nAverage - m_nDispensation[i]));
         }
+    }
 
     void print()
-        {
-            // LLA: these are only info values
-            t_print("\nSome statistics\n");
-            t_print("Min: %d\n", m_nMin);
-            t_print("Max: %d\n", m_nMax);
-            t_print("Average: %d\n", m_nAverage);
-            t_print("Min abs deviation: %d\n", m_nMinDeviation);
-            t_print("Max abs deviation: %d\n", m_nMaxDeviation);
-        }
+    {
+        // LLA: these are only info values
+        printf("\nSome statistics\n");
+        printf("Min: %d\n", m_nMin);
+        printf("Max: %d\n", m_nMax);
+        printf("Average: %d\n", m_nAverage);
+        printf("Min abs deviation: %d\n", m_nMinDeviation);
+        printf("Max abs deviation: %d\n", m_nMaxDeviation);
+    }
 
-    sal_Int32 getAverage() {return m_nAverage;}
-    sal_Int32 getMaxDeviation() {return m_nMaxDeviation;}
+    sal_Int32 getAverage() const {return m_nAverage;}
+    sal_Int32 getMaxDeviation() const {return m_nMaxDeviation;}
 
 };
 
@@ -289,7 +301,7 @@ public:
         rtlRandomError aError = rtl_random_getBytes(aPool, pBuffer, nBufLen);
         CPPUNIT_ASSERT_MESSAGE("wrong parameter", aError == rtl_Random_E_None);
 
-        t_print("%2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3]);
+        printf("%2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3]);
 
         rtl_random_destroyPool(aPool);
         delete [] pBuffer;
@@ -308,7 +320,7 @@ public:
         rtlRandomError aError = rtl_random_getBytes(aPool, pBuffer, nBufLen);
         CPPUNIT_ASSERT_MESSAGE("wrong parameter", aError == rtl_Random_E_None);
 
-        t_print("%2x %2x %2x %2x %2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3], pBuffer[4], pBuffer[5], pBuffer[6], pBuffer[7]);
+        printf("%2x %2x %2x %2x %2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3], pBuffer[4], pBuffer[5], pBuffer[6], pBuffer[7]);
 
         CPPUNIT_ASSERT_MESSAGE("internal memory overwrite", pBuffer[4] == 0 && pBuffer[5] == 0 && pBuffer[6] == 0 && pBuffer[7] == 0);
 
@@ -331,7 +343,7 @@ public:
         int nCount = 0;
 
         int nCountMax = 1000000;
-        for(nCount = 0;nCount < nCountMax; nCount ++)                  // run 100000000 through getBytes(...)
+        for(nCount = 0;nCount < nCountMax; ++nCount)                  // run 100000000 through getBytes(...)
         {
             /* rtlRandomError aError = */ rtl_random_getBytes(aPool, pBuffer, nBufLen);
             /* CPPUNIT_ASSERT_MESSAGE("wrong parameter", aError == rtl_Random_E_None); */
@@ -363,15 +375,13 @@ public:
         int nCount = 0;
 
         int nCountMax = 10000;
-        for(nCount = 0;nCount < nCountMax; nCount ++)                  // run 100000000 through getBytes(...)
+        for(nCount = 0;nCount < nCountMax; ++nCount)                  // run 100000000 through getBytes(...)
         {
             /* rtlRandomError aError = */ rtl_random_getBytes(aPool, pBuffer, nBufLen);
             // CPPUNIT_ASSERT_MESSAGE("wrong parameter", aError == rtl_Random_E_None);
 
-            for (sal_uInt32 i=0;i<nBufLen;i++)
-            {
+            for (sal_uInt32 i=0;i<nBufLen;++i)
                 aStat.addValue(pBuffer[i], 1);
-            }
         }
 
         aStat.build(nCountMax * nBufLen);
@@ -397,16 +407,12 @@ public:
 }; // class getBytes
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_random::createPool, "rtl_random");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_random::destroyPool, "rtl_random");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_random::addBytes, "rtl_random");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_random::getBytes, "rtl_random");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::createPool);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::destroyPool);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::addBytes);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::getBytes);
 } // namespace rtl_random
 
+CPPUNIT_PLUGIN_IMPLEMENT();
 
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk
index 3c1b9219642f..821e04e7fea8 100644
--- a/sal/qa/rtl/strings/makefile.mk
+++ b/sal/qa/rtl/strings/makefile.mk
@@ -34,6 +34,8 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
@@ -41,15 +43,16 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 SHL1TARGET := $(TARGET)
 SHL1OBJS := \
-    $(SLO)$/test_oustringbuffer_utf32.obj \
     $(SLO)$/test_oustring_compare.obj \
     $(SLO)$/test_oustring_convert.obj \
     $(SLO)$/test_oustring_endswith.obj \
     $(SLO)$/test_oustring_noadditional.obj
 SHL1IMPLIB := i$(SHL1TARGET)
-SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB)
 SHL1VERSIONMAP := $(PRJ)$/qa$/export.map
 DEF1NAME := $(SHL1TARGET)
 
+.ENDIF
+
 .INCLUDE: target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx
index 7a0455c92c16..016ff94f2735 100644
--- a/sal/qa/rtl/strings/test_oustring_compare.cxx
+++ b/sal/qa/rtl/strings/test_oustring_compare.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "rtl/string.h"
 #include "rtl/ustring.hxx"
 
@@ -39,14 +41,14 @@ class Compare: public CppUnit::TestFixture
 private:
     void equalsIgnoreAsciiCaseAscii();
 
-    CPPUNIT_TEST_SUITE(Compare);
-    CPPUNIT_TEST(equalsIgnoreAsciiCaseAscii);
-    CPPUNIT_TEST_SUITE_END();
+CPPUNIT_TEST_SUITE(Compare);
+CPPUNIT_TEST(equalsIgnoreAsciiCaseAscii);
+CPPUNIT_TEST_SUITE_END();
 };
 
 } }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test::oustring::Compare, "alltest");
+CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::Compare);
 
 void test::oustring::Compare::equalsIgnoreAsciiCaseAscii()
 {
@@ -65,3 +67,5 @@ void test::oustring::Compare::equalsIgnoreAsciiCaseAscii()
     CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")).
                    equalsIgnoreAsciiCaseAscii("abcd"));
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx
index 379aa47e33c5..f35edbfa081f 100644
--- a/sal/qa/rtl/strings/test_oustring_convert.cxx
+++ b/sal/qa/rtl/strings/test_oustring_convert.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,10 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "rtl/strbuf.hxx"
 #include "rtl/string.hxx"
 #include "rtl/ustring.hxx"
+#include <sal/macros.h>
 
 namespace test { namespace oustring {
 
@@ -47,7 +50,7 @@ private:
 
 } }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test::oustring::Convert, "alltest");
+CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::Convert);
 
 namespace {
 
@@ -159,13 +162,12 @@ void test::oustring::Convert::convertToString()
                   | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR,
               0,
               "" },
-            // the next also tests that a short source produces a long target:
-            { { 0xB800 },
-              1,
+            { { 0x3001,  0xB800 },
+              2,
               RTL_TEXTENCODING_ISO_2022_JP,
               OUSTRING_TO_OSTRING_CVTFLAGS,
-              "\x1B(B?",
-              "\x1B(B?" },
+              "\x1b\x24\x42\x21\x22\x1b\x28\x42\x3f",
+              "\x1b\x24\x42\x21\x22\x1b\x28\x42\x3f" },
             { { 0x0041,0x0100,0x0042 },
               3,
               RTL_TEXTENCODING_ISO_8859_1,
@@ -179,6 +181,8 @@ void test::oustring::Convert::convertToString()
               OUSTRING_TO_OSTRING_CVTFLAGS,
               "A?B",
               "A?B" } };
-    for (unsigned int i = 0; i < sizeof aTests / sizeof aTests[0]; ++i)
+    for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
         testConvertToString(aTests[i]);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx b/sal/qa/rtl/strings/test_oustring_endswith.cxx
index 9011df782f3a..7a9c7df6f65a 100644
--- a/sal/qa/rtl/strings/test_oustring_endswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,13 +29,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "rtl/strbuf.hxx"
 #include "rtl/string.h"
 #include "rtl/string.hxx"
 #include "rtl/textenc.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
+#include <sal/macros.h>
 
 namespace test { namespace oustring {
 
@@ -50,7 +53,7 @@ private:
 
 } }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test::oustring::EndsWith, "alltest");
+CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::EndsWith);
 
 namespace {
 
@@ -102,7 +105,7 @@ void test::oustring::EndsWith::endsWith()
           RTL_CONSTASCII_STRINGPARAM("b\0c"), true },
         { RTL_CONSTASCII_STRINGPARAM("a\0b\0c"),
           RTL_CONSTASCII_STRINGPARAM("b"), false } };
-    for (int i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         rtl::OStringBuffer msg;
         appendString(msg, rtl::OString(data[i].str1, data[i].str1Len));
         msg.append(
@@ -119,3 +122,5 @@ void test::oustring::EndsWith::endsWith()
             == data[i].endsWith);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/strings/test_oustring_noadditional.cxx b/sal/qa/rtl/strings/test_oustring_noadditional.cxx
index 7208e8da36ae..18e8a634460b 100644
--- a/sal/qa/rtl/strings/test_oustring_noadditional.cxx
+++ b/sal/qa/rtl/strings/test_oustring_noadditional.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-#include "testshl/simpleheader.hxx"
+#include <cppunit/plugin/TestPlugIn.h>
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/textenc/makefile.mk b/sal/qa/rtl/textenc/makefile.mk
index 597309d9bfe6..4e6126235a1d 100644
--- a/sal/qa/rtl/textenc/makefile.mk
+++ b/sal/qa/rtl/textenc/makefile.mk
@@ -45,7 +45,7 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
 SHL1OBJS=  \
     $(SLO)$/rtl_textcvt.obj
 SHL1TARGET= rtl_textcvt
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
@@ -57,7 +57,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 SHL2OBJS=  \
     $(SLO)$/rtl_tencinfo.obj
 SHL2TARGET= rtl_tencinfo
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
@@ -72,4 +72,4 @@ SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
index d3577faedc4d..0f891478528f 100644
--- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
+++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1899,3 +1900,5 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(
 // -----------------------------------------------------------------------------
 
 NOADDITIONAL;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index 03eacc76d8f9..4ed39fb65d21 100644
--- a/sal/qa/rtl/textenc/rtl_textcvt.cxx
+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,6 +40,7 @@
 #include "rtl/textcvt.h"
 #include "rtl/textenc.h"
 #include "sal/types.h"
+#include <sal/macros.h>
 
 namespace {
 
@@ -1277,7 +1279,7 @@ void Test::testSingleByte() {
                 0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,
                 0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,
                 0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F } } };
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         testSingleByteCharSet(data[i]);
     }
 }
@@ -2505,7 +2507,7 @@ void Test::testComplex() {
               false,
               RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR }
         };
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         doComplexCharSetTest(data[i]);
     }
 }
@@ -2593,7 +2595,7 @@ void Test::testComplexCut() {
               false,
               false,
               RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR } */ };
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         doComplexCharSetCutTest(data[i]);
     }
 }
@@ -2720,7 +2722,7 @@ void Test::testMime() {
         { "CP154", RTL_TEXTENCODING_PT154, false },
         { "Cyrillic-Asian", RTL_TEXTENCODING_PT154, false }
     };
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         if (data[i].mime == 0) {
             OSL_ASSERT(data[i].reverse);
             CPPUNIT_ASSERT_EQUAL(
@@ -2820,7 +2822,7 @@ void Test::testWindows() {
         { 0, RTL_TEXTENCODING_UCS2, true },
         { 0, RTL_TEXTENCODING_ISCII_DEVANAGARI, true }
     };
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         OSL_ASSERT(data[i].codePage != 0 || data[i].reverse);
         if (data[i].codePage != 0) {
             CPPUNIT_ASSERT_EQUAL(
@@ -2886,7 +2888,7 @@ void Test::testInfo() {
         { RTL_TEXTENCODING_PT154, RTL_TEXTENCODING_INFO_ASCII, true },
         { RTL_TEXTENCODING_PT154, RTL_TEXTENCODING_INFO_MIME, true }
     };
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         rtl_TextEncodingInfo info;
         info.StructSize = sizeof info;
         CPPUNIT_ASSERT(rtl_getTextEncodingInfo(data[i].encoding, &info));
@@ -2899,3 +2901,5 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "rtl_textcvt");
 }
 
 NOADDITIONAL;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/uri/makefile.mk b/sal/qa/rtl/uri/makefile.mk
index d4a8814cc649..5d3fc19dc1ec 100644
--- a/sal/qa/rtl/uri/makefile.mk
+++ b/sal/qa/rtl/uri/makefile.mk
@@ -45,7 +45,7 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
 SHL1OBJS=  \
     $(SLO)$/rtl_Uri.obj
 SHL1TARGET= rtl_uri_simple
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
@@ -57,7 +57,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 SHL2OBJS=  \
     $(SLO)$/rtl_testuri.obj
 SHL2TARGET= rtl_Uri
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
@@ -72,4 +72,4 @@ SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 0a78f944a02f..741bab924e91 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -223,9 +224,9 @@ namespace Stringtest
         void test_UTF8_files()
             {
 #ifdef UNX
-                rtl::OUString suDirURL(rtl::OUString::createFromAscii("file:///tmp/atestdir"));
+                rtl::OUString suDirURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///tmp/atestdir")));
 #else /* Windows */
-                rtl::OUString suDirURL(rtl::OUString::createFromAscii("file:///c:/temp/atestdir"));
+                rtl::OUString suDirURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c:/temp/atestdir")));
 #endif
                 osl::Directory aDir(suDirURL);
                 aDir.open();
@@ -295,3 +296,5 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Stringtest::Convert, "Stringtest" );
 // LLA: doku anpassen!!!
 
 NOADDITIONAL;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index 88929a9fbebc..b5cc1caa5a73 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -367,7 +368,7 @@ void Test::test_Uri() {
             aAbs = rtl::Uri::convertRelToAbs(
                 rtl::OUString::createFromAscii(aRelToAbsTest[i].pBase),
                 rtl::OUString::createFromAscii(aRelToAbsTest[i].pRel));
-        } catch (rtl::MalformedUriException &) {
+        } catch (const rtl::MalformedUriException &) {
             bMalformed = true;
         }
         if (bMalformed
@@ -543,3 +544,5 @@ void Test::test_Uri() {
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "rtl_testuri");
 NOADDITIONAL;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/uuid/makefile.mk b/sal/qa/rtl/uuid/makefile.mk
index 40e583f8b019..ff1dc961f095 100644
--- a/sal/qa/rtl/uuid/makefile.mk
+++ b/sal/qa/rtl/uuid/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS=  \
     $(SLO)$/rtl_Uuid.obj
 
 SHL1TARGET= rtl_Uuid
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -64,5 +64,4 @@ SLOFILES=$(SHL1OBJS)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index 0c4bcefe66ac..a3efeda62ade 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,8 +42,9 @@
 #include <time.h>
 #endif
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 /** print a UNI_CODE String. And also print some comments of the string.
 */
 inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = "" )
@@ -153,7 +155,7 @@ namespace ThreadHelper
 #ifdef WNT      //Windows
         Sleep(_nSec * 10 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )  //Unix
+#if ( defined UNX )
         sleep( _nSec );
 #endif
     }
@@ -226,3 +228,4 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Uuid::createNamedUuid, "rtl_Uuid");
 NOADDITIONAL;
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/makefile.mk b/sal/qa/rtl_strings/makefile.mk
index 708a41a87887..b319fbf6845b 100644
--- a/sal/qa/rtl_strings/makefile.mk
+++ b/sal/qa/rtl_strings/makefile.mk
@@ -45,7 +45,7 @@ SHL1OBJS=  \
     $(SLO)$/rtl_OString.obj
 
 SHL1TARGET= rtl_OString
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -64,7 +64,7 @@ SHL2OBJS=  \
     $(SLO)$/rtl_OUString.obj
 
 SHL2TARGET= rtl_OUString
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 # SHL2DEF=    $(MISC)$/$(SHL2TARGET).def
@@ -83,7 +83,7 @@ SHL3OBJS=  \
     $(SLO)$/rtl_OUStringBuffer.obj
 
 SHL3TARGET= rtl_OUStringBuffer
-SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL3IMPLIB= i$(SHL3TARGET)
 # SHL3DEF=    $(MISC)$/$(SHL3TARGET).def
@@ -100,7 +100,7 @@ SHL4OBJS=  \
     $(SLO)$/rtl_old_teststrbuf.obj
 
 SHL4TARGET= rtl_old_teststrbuf
-SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL4IMPLIB= i$(SHL4TARGET)
 DEF4NAME    =$(SHL4TARGET)
@@ -113,7 +113,7 @@ SHL5OBJS=  \
     $(SLO)$/rtl_old_testowstring.obj
 
 SHL5TARGET= rtl_old_testowstring
-SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL5IMPLIB= i$(SHL5TARGET)
 DEF5NAME    =$(SHL5TARGET)
@@ -126,7 +126,7 @@ SHL6OBJS=  \
     $(SLO)$/rtl_old_testostring.obj
 
 SHL6TARGET= rtl_old_testostring
-SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL6IMPLIB= i$(SHL6TARGET)
 DEF6NAME    =$(SHL6TARGET)
@@ -147,6 +147,4 @@ SLOFILES=\
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
-
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl_strings/rtl_OString.cxx b/sal/qa/rtl_strings/rtl_OString.cxx
index fc777f11b723..b72197e45963 100644
--- a/sal/qa/rtl_strings/rtl_OString.cxx
+++ b/sal/qa/rtl_strings/rtl_OString.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,10 +34,6 @@
     #include <sal/types.h>
 #endif
 
-// #ifndef _RTL_TRES_H_
-//     #include <rtl/tres.h>
-// #endif
-
 #include <testshl/tresstatewrapper.hxx>
 
 #ifndef _RTL_STRING_HXX_
@@ -52,8 +49,7 @@
 #endif
 #include <rtl/ustring.h>
 
-using namespace rtl;
-
+using ::rtl::OString;
 //------------------------------------------------------------------------
 // test classes
 //------------------------------------------------------------------------
@@ -3603,3 +3599,5 @@ D:\local\644\SRX644\sal\qa\rtl_OString.cxx(3559) : error C2664:
         This conversion requires a reinterpret_cast, a C-style cast or function-
 style cast
 */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_OUString.cxx b/sal/qa/rtl_strings/rtl_OUString.cxx
index 41538065d4fc..b585c04efa05 100644
--- a/sal/qa/rtl_strings/rtl_OUString.cxx
+++ b/sal/qa/rtl_strings/rtl_OUString.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,24 +30,20 @@
 #include "precompiled_sal.hxx"
 #include <sal/types.h>
 
-//# #ifndef _RTL_TRES_H_
 //#     #include <rtl/tres.h>
-//# #endif
 #include <testshl/tresstatewrapper.hxx>
 #include "stringhelper.hxx"
 #include <rtl/string.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 #include <osl/thread.h>
 #include <rtl_String_Const.h>
 #include <rtl_String_Utils.hxx>
 
 
-
-    using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
 
 //------------------------------------------------------------------------
 // test classes
@@ -3856,3 +3853,5 @@ void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc)
         (_pFunc)(&test_rtl_OUString, "");
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
index 950231d1651c..73403d150177 100644
--- a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
+++ b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,6 @@
     #include <sal/types.h>
 #endif
 
-// #ifndef _RTL_TRES_H_
-//     #include <rtl/tres.h>
-// #endif
 #include <testshl/tresstatewrapper.hxx>
 
 #ifndef _RTL_STRING_HXX_
@@ -56,8 +54,7 @@
 #ifndef _RTL_USTRBUF_HXX
         #include <rtl/ustrbuf.hxx>
 #endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
+
 #ifndef _OSL_THREAD_H_
     #include <osl/thread.h>
 #endif
@@ -71,7 +68,9 @@
 #endif
 
 #include "stdio.h"
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
 
 //------------------------------------------------------------------------
 // test classes
@@ -152,11 +151,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_ctor_003(
                                                hTestResult hRtlTestResult )
 {
     ::rtl::OUStringBuffer aUStrBuf1(kTestStr2Len);
-#ifdef WITH_CORE
-    ::rtl::OUStringBuffer aUStrBuf2(kSInt32Max);     //will core dump
-#else
     ::rtl::OUStringBuffer aUStrBuf2(0);
-#endif
     ::rtl::OUStringBuffer aUStrBuf3(kNonSInt32Max);
 
 
@@ -165,13 +160,9 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_ctor_003(
         ! *(aUStrBuf1.getStr()) && aUStrBuf1.getCapacity() == kTestStr2Len ;
 
     bool b2 =
-#ifdef WITH_CORE
-        aUStrBuf2.getLength() == 0 &&
-        ! *(aUStrBuf2.getStr()) && aUStrBuf2.getCapacity() == kSInt32Max ;
-#else
         aUStrBuf2.getLength() == 0 &&
             ! *(aUStrBuf2.getStr()) && aUStrBuf2.getCapacity() == /* LLA: ??? 16 */ 0;
-#endif
+
     bool b3 =
         aUStrBuf3.getLength() == 0 &&
         ! *(aUStrBuf3.getStr()) && aUStrBuf3.getCapacity() == kNonSInt32Max;
@@ -444,10 +435,6 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_getCapacity(
             new OUStringBuffer(arrOUS[5]) },
         {"capacity of empty string (default constructor)", 16,
                         new OUStringBuffer() },
-#ifdef WITH_CORE
-        {"capacity of empty string (with capacity 2147483647)(code will core dump)", kSInt32Max,
-                        new OUStringBuffer(kSInt32Max) },// will core dump
-#endif
         {"capacity of empty string (with capacity -2147483648)", kNonSInt32Max,
                         new OUStringBuffer(kNonSInt32Max) },
         {"capacity of empty string (with capacity 16)", 16,
@@ -529,24 +516,8 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_ensureCapacity(
       {"capacity equal to 0, minimum is -1", 0,
                         new OUStringBuffer(0), -1},
     */
-#ifdef WITH_CORE
-        {"capacity equal to 2147483647, minimum is 65535", kSInt32Max,//will core dump
-                        new OUStringBuffer(kSInt32Max), 65535},
-        {"capacity equal to 2147483647, minimum is 2147483647", kSInt32Max,//will core dump
-                        new OUStringBuffer(kSInt32Max), kSInt32Max},
-        {"capacity equal to 2147483647, minimum is -1", kSInt32Max,//will core dump
-                        new OUStringBuffer(kSInt32Max), -1},
-        {"capacity equal to 2147483647, minimum is 0", kSInt32Max,//will core dump
-                        new OUStringBuffer(kSInt32Max), 0},
-        {"capacity equal to 2147483647, minimum is -2147483648", kSInt32Max,//will core dump
-                        new OUStringBuffer(kSInt32Max), kNonSInt32Max},
-#endif
         {"capacity equal to -2147483648, minimum is 65535", 65535,
                         new OUStringBuffer(kNonSInt32Max), 65535},
-#ifdef WITH_CORE
-        {"capacity equal to -2147483648, minimum is 2147483647", 2147483647,//will core dump
-                        new OUStringBuffer(kNonSInt32Max), 2147483647},
-#endif
         {"capacity equal to -2147483648, minimum is -1", 2,
                         new OUStringBuffer(kNonSInt32Max), -1},
         {"capacity equal to -2147483648, minimum is 0", 2,
@@ -952,23 +923,6 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_setCharAt(
     {"set the only of OUStringBuffer(aUStr28) with special character",
                 new OUString(aUStr34),
                 new OUStringBuffer(arrOUS[2]), 1, 5},
-/*
-        {"set the only of OUStringBuffer(aUStr28) with special character",
-                new OUString(aUStr35),
-                new OUStringBuffer(arrOUS[2]), 1, -5}
-*/
-#ifdef WITH_CORE
-    ,{"invalid character of OUStringBuffer()",
-                0,
-                new OUStringBuffer(arrOUS[3]), 0, 5},
-        {"invalid character of OUStringBuffer()",
-                0,
-                new OUStringBuffer(arrOUS[3]), -2, 5},
-        {"invalid character of OUStringBuffer()",
-                0,
-                new OUStringBuffer(arrOUS[3]), 3, 5}
-#endif
-
     };
 
 
@@ -1097,11 +1051,6 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_001(
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
                 new OUStringBuffer(arrOUS[4]), new OUString()}
-#ifdef WITH_CORE
-        ,{"Appends the string(length equal to 0) to the string buffer(with INT_MAX) ",
-                new OUString(),
-                new OUStringBuffer(kSInt32Max), new OUString()}
-#endif
     };
 
 
@@ -1219,11 +1168,6 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_002(
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
                 new OUStringBuffer(arrOUS[4]), aUStr25 }
-#ifdef WITH_CORE
-        ,{"Appends the string(length equal to 0) to the string buffer(with INT_MAX) ",
-                new OUString(),
-                new OUStringBuffer(kSInt32Max), aUStr25 }
-#endif
     };
 
 
@@ -1362,16 +1306,6 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_003(
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
                 new OUStringBuffer(arrOUS[4]), aUStr2, 0 },
-    /* LLA: input3 must null < 0
-      {"Appends the string(length less than 0) to the string buffer arrOUS[4]",
-                new OUString(aUStr42),
-                new OUStringBuffer(arrOUS[4]), aUStr2, -1 }
-    */
-#ifdef WITH_CORE
-        ,{"Appends the string(length equal to 0) to the string buffer(with INT_MAX) ",
-                new OUString(),
-                new OUStringBuffer(kSInt32Max), aUStr25 }
-#endif
     };
 
 
@@ -1460,14 +1394,6 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_004(
         {"Appends the sal_Bool(sal_False) to the string buffer arrOUS[4]",
                 new OUString(aUStr50),
                 new OUStringBuffer(arrOUS[4]), sal_False }
-#ifdef WITH_CORE
-        ,{"Appends the sal_Bool(sal_True) to the string buffer(with INT_MAX) ",
-                new OUString(aUStr47),
-                new OUStringBuffer(kSInt32Max), sal_True },
-        {"Appends the sal_Bool(sal_False) to the string buffer(with INT_MAX) ",
-                new OUString(aUStr48),
-                new OUStringBuffer(kSInt32Max), sal_False }
-#endif
     };
 
 
@@ -1599,15 +1525,6 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_001(
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
                 new OUStringBuffer(arrOUS[4]), kTestStr25 }
-        /*{"Appends the string(with special characters) to the string buffer arrOUS[4]",
-                new OUString(aUStr43),
-                new OUStringBuffer(arrOUS[4]), kTestStr44 }*/
-#ifdef WITH_CORE
-        ,{"Appends the string(length equal to 0) to the string buffer(with INT_MAX) ",
-                new OUString(),
-                new OUStringBuffer(kSInt32Max), kTestStr25 }
-#endif
-
     };
 
 
@@ -1744,16 +1661,6 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_002(
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
                 new OUStringBuffer(arrOUS[4]), kTestStr2, 0 },
-    /* LLA: input3 must null < 0
-        {"Appends the string(length less than 0) to the string buffer arrOUS[4]",
-                new OUString(aUStr42),
-                new OUStringBuffer(arrOUS[4]), kTestStr2, -1 }
-    */
-#ifdef WITH_CORE
-        ,{"Appends the string(length equal to 0) to the string buffer(with INT_MAX) ",
-                new OUString(),
-                new OUStringBuffer(kSInt32Max), kTestStr25 }
-#endif
     };
 
 
@@ -1821,3 +1728,5 @@ void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc)
         (_pFunc)(&test_rtl_OUStringBuffer, "");
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_String_Const.h b/sal/qa/rtl_strings/rtl_String_Const.h
index b950a7120436..2b14b46c9ab5 100644
--- a/sal/qa/rtl_strings/rtl_String_Const.h
+++ b/sal/qa/rtl_strings/rtl_String_Const.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,9 +26,6 @@
  *
  ************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _RTL_STRING_CONST_H_
 #define _RTL_STRING_CONST_H_
 
@@ -35,14 +33,8 @@
     #include <rtl_String_Utils.hxx>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #include <limits.h>
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _SAL_TYPES_H_
     #include <sal/types.h>
 #endif
@@ -55,28 +47,16 @@
     #include <rtl/ustring.h>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const rtl_TextEncoding kEncodingRTLTextUSASCII = RTL_TEXTENCODING_ASCII_US;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_uInt32 kConvertFlagsOUStringToOString = OUSTRING_TO_OSTRING_CVTFLAGS;
 static const sal_uInt32 kConvertFlagsOStringToOUString = OSTRING_TO_OUSTRING_CVTFLAGS;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Char *kTestStr1  = "Sun Microsystems";
 static const sal_Char *kTestStr2  = "Sun Microsystems Java Technology";
 static const sal_Char *kTestStr3  = "Sun microsystems";
@@ -136,8 +116,6 @@ static const sal_Char *kTestStr56 = "\50\3\5\7\11\13\15\17suns";
 //static const sal_Char *kTestStr57 = "\50\3\5\7\11\13\15\17sun\77777";
 //static const sal_Char *kTestStr58 = "\50\3\5\7\11\13\15\17sun\10000";
 static const sal_Char *kTestStr1PlusStr6  = "Sun Microsystems" "Java Technology";
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 
 static const sal_Int32 kTestStr1Len  = 16;
 static const sal_Int32 kTestStr2Len  = 32;
@@ -199,8 +177,6 @@ static const sal_Int32 kTestStr57Len = 12;
 static const sal_Int32 kTestStr58Len = 12;
 static const sal_Int32 kTestStr1PlusStr6Len = kTestStr1Len + kTestStr6Len;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
  static sal_Unicode aUStr1[kTestStr1Len+1];
  static sal_Unicode aUStr2[kTestStr2Len+1];
  static sal_Unicode aUStr3[kTestStr3Len+1];
@@ -400,40 +376,25 @@ static const sal_Int32 uTestStr5Len  = 16;
 static const sal_Int32 uTestStr9Len  = 32;
 static const sal_Int32 uTestStr22Len = 32;
 
-
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 const sal_Unicode uTestStr31[]= {0x400,0x410,0x4DF};
 const sal_Unicode uTestStr32[]= {0x9F9F,0xA000,0x8F80,0x9AD9};
 
-
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Int32 uTestStr31Len  = 3;
 static const sal_Int32 uTestStr32Len  = 4;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Int16 kRadixBinary     = 2;
 static const sal_Int16 kRadixOctol      = 8;
 static const sal_Int16 kRadixDecimal    = 10;
 static const sal_Int16 kRadixHexdecimal = 16;
 static const sal_Int16 kRadixBase36     = 36;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Int8  kSInt8Max  = SCHAR_MAX;
 static const sal_Int16 kUInt8Max  = UCHAR_MAX;
 static const sal_Int16 kSInt16Max = SHRT_MAX;
 static const sal_Int32 kUInt16Max = USHRT_MAX;
 static const sal_Int32 kSInt32Max = INT_MAX;
 static const sal_Int64 kUInt32Max = UINT_MAX;
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 static const sal_Int64 kSInt64Max = 9223372036854775807LL;
 #else
 static const sal_Int64 kSInt64Max = 9223372036854775807;
@@ -459,9 +420,6 @@ static const sal_Int64 kInt64MaxNums[kInt64MaxNumsCount] =
                             kSInt64Max
                         };
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Char *kSInt8MaxBinaryStr  = "1111111";
 static const sal_Char *kUInt8MaxBinaryStr  = "11111111";
 static const sal_Char *kSInt16MaxBinaryStr = "111111111111111";
@@ -513,9 +471,6 @@ static const sal_Char *kSInt32MaxBase36Str = "zik0zj";
 static const sal_Char *kUInt32MaxBase36Str = "1z141z3";
 static const sal_Char *kSInt64MaxBase36Str = "1y2p0ij32e8e7";
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Int32 kBinaryNumsCount = 16;
 
 static const sal_Char *kBinaryNumsStr[kBinaryNumsCount] =
@@ -644,8 +599,6 @@ static const sal_Char *kBase36MaxNumsStr[kBase36MaxNumsCount] =
                             kSInt64MaxBase36Str
                         };
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 static const sal_Int32 nDoubleCount=24;
 // static const sal_Char *inputDouble[nDoubleCount] =
 //  {
@@ -878,8 +831,6 @@ static const sal_Int32 kNonSInt16Max = SHRT_MIN;
 }
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #endif /* _RTL_STRING_CONST_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.cxx b/sal/qa/rtl_strings/rtl_String_Utils.cxx
index 0fccc111a184..9f882f796a7c 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.cxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 #
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,15 +29,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #include <math.h>
 #include <stdlib.h>
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _SAL_TYPES_H_
     #include <sal/types.h>
 #endif
@@ -49,18 +44,11 @@
     #include <rtl/string.hxx>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _RTL_STRING_UTILS_CONST_H_
     #include <rtl_String_Utils_Const.h>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-using namespace rtl;
-
+using ::rtl::OString;
 sal_uInt32 AStringLen( const sal_Char *pAStr )
 {
     sal_uInt32  nStrLen = 0;
@@ -254,11 +242,6 @@ sal_Bool AStringToDoubleCompare ( const sal_Char  *pStr,
     return cmp;
 } // AStringToDoubleCompare
 
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
 sal_uInt32 UStringLen( const sal_Unicode *pUStr )
 {
     sal_uInt32 nUStrLen = 0;
@@ -588,6 +571,4 @@ sal_Bool AStringToUStringNCopy( sal_Unicode       *pDest,
     return  bCopied;
 } // AStringToUStringNCopy
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.hxx b/sal/qa/rtl_strings/rtl_String_Utils.hxx
index ceecfde3395d..7c059ae57f27 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.hxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 #
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,23 +26,14 @@
  *
 #*************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _RTL_STRING_UTILS_HXX_
 #define _RTL_STRING_UTILS_HXX_
 
 #ifdef __cplusplus
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #include <math.h>
 #include <stdlib.h>
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _SAL_TYPES_H_
     #include <sal/types.h>
 #endif
@@ -54,8 +46,6 @@
     #include <rtl/string.hxx>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 sal_Char* cpystr( sal_Char* dst, const sal_Char* src );
 sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt );
 
@@ -122,9 +112,6 @@ sal_Bool AStringToUStringNCopy( sal_Unicode       *pDest,
                                 const sal_uInt32   nSrcLen
                               );
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #endif /* __cplusplus */
 
 #endif /* _RTL_STRING_UTILS_HXX */
@@ -135,3 +122,4 @@ sal_Bool AStringToUStringNCopy( sal_Unicode       *pDest,
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_String_Utils_Const.h b/sal/qa/rtl_strings/rtl_String_Utils_Const.h
index 29d6eb69c1fc..8af53eeab65d 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils_Const.h
+++ b/sal/qa/rtl_strings/rtl_String_Utils_Const.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,30 +26,18 @@
  *
  ************************************************************************/
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _RTL_STRING_UTILS_CONST_H_
 #define _RTL_STRING_UTILS_CONST_H_
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifndef _SAL_TYPES_H_
     #include <sal/types.h>
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 static const sal_Int32 kErrCompareAStringToUString     = -2;
 static const sal_Int32 kErrCompareNAStringToUString    = -3;
 static const sal_Int32 kErrCompareAStringToRTLUString  = -4;
@@ -58,17 +47,12 @@ static const sal_Int32 kErrAStringToByteStringNCompare = -7;
 static const sal_Int32 kErrCompareAStringToString      = -8;
 static const sal_Int32 kErrCompareNAStringToString     = -9;
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #ifdef __cplusplus
 }
 #endif
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
 #endif /* _RTL_STRING_UTILS_CONST_H_ */
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx b/sal/qa/rtl_strings/rtl_old_testostring.cxx
index 1f2958fb706f..214b228bfef5 100644
--- a/sal/qa/rtl_strings/rtl_old_testostring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,32 +33,15 @@
 // this file is converted to use with testshl2
 // original was placed in sal/test/textenc.cxx
 
-
-// -----------------------------------------------------------------------------
 #include <string.h>
 #include <stdio.h>
 
-// #ifndef _OSL_DIAGNOSE_H_
-// #include <osl/diagnose.h>
-// #endif
-
-#ifndef _RTL_STRING_HXX
 #include <rtl/string.hxx>
-#endif
 
 #include <testshl/simpleheader.hxx>
 
 #define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
-
-// #if OSL_DEBUG_LEVEL > 0
-// #define TEST_ENSHURE(c, m)   OSL_ENSURE(c, m)
-// #else
-// #define TEST_ENSHURE(c, m)   OSL_VERIFY(c)
-// #endif
-
-using namespace rtl;
-
-// -----------------------------------------------------------------------------
+using ::rtl::OString;
 namespace rtl_OString
 {
     class oldtests : public CppUnit::TestFixture
@@ -122,18 +106,13 @@ void oldtests::test_OString()
     s6 = s5.valueOf(n);
     TEST_ENSURE( s6.compareTo("123456789") == 0, "test_OString error 16");
 
-#ifndef SAL_OS2
 #ifdef SAL_UNX
     sal_Int64 m = -3223372036854775807LL;
-#elif defined(SAL_OS2)
-    sal_Int64 m;
-    sal_setInt64(&m, 3965190145L, -750499787L);
 #else
     sal_Int64 m = -3223372036854775807;
 #endif
     s6 = s5.valueOf(m);
     TEST_ENSURE( s6.compareTo("-3223372036854775807") == 0, "test_OString error 17");
-#endif
 
     OString s7("HaLLo");
     s7 = s7.toAsciiLowerCase();
@@ -264,3 +243,4 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_OString::oldtests, "rtl_OString" );
 // -----------------------------------------------------------------------------
 NOADDITIONAL;
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
index 6ab1aa0f87c5..082be3cde71c 100644
--- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,44 +33,27 @@
 // this file is converted to use with testshl2
 // original was placed in sal/test/textenc.cxx
 
-
-// -----------------------------------------------------------------------------
 #include <string.h>
 #include <stdio.h>
 
 #ifdef UNX
 #include <wchar.h>
 #endif
-#ifdef OS2__00
-#include <wcstr.h>
-#endif
-
-// #ifndef  _OSL_DIAGNOSE_H_
-// #include <osl/diagnose.h>
-// #endif
 
-#ifndef _RTL_USTRING_HXX
 #include <rtl/ustring.hxx>
-#endif
 
-#ifndef _RTL_STRING_HXX
 #include <rtl/string.hxx>
-#endif
 
 #include <rtl/locale.hxx>
 
 #include <testshl/simpleheader.hxx>
 
 #define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
-// #if OSL_DEBUG_LEVEL > 0
-// #define TEST_ENSHURE(c, m)   OSL_ENSURE(c, m)
-// #else
-// #define TEST_ENSHURE(c, m)   OSL_VERIFY(c)
-// #endif
 
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
 
-// -----------------------------------------------------------------------------
 namespace rtl_OUString
 {
     class oldtests : public CppUnit::TestFixture
@@ -90,14 +74,14 @@ void oldtests::test_OUString()
     //          "Mein erster RTL OUString\n"
     //           |    |    |    |    |
     //  Index    0    5    10   15   20
-    OUString s1(OUString::createFromAscii("Mein erster RTL OUString\n"));
-    TEST_ENSURE( s1 == OUString::createFromAscii("Mein erster RTL OUString\n"), "test_OWString error 1");
+    OUString s1(OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUString\n")));
+    TEST_ENSURE( s1 == OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUString\n")), "test_OWString error 1");
     TEST_ENSURE( s1.getLength() == 25, "test_OWString error 2");
 
     OUString s2 = s1;
     TEST_ENSURE( s2[16] == (sal_Unicode)'O', "test_OWString error 3");
     TEST_ENSURE( s2.equals(s1), "test_OWString error 4");
-    TEST_ENSURE( OUString( OUString::createFromAscii("hallo")) == OUString::createFromAscii( "hallo"), "test_OWString error 4");
+    TEST_ENSURE( OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("hallo"))) == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 4");
     TEST_ENSURE( s2.indexOf((sal_Unicode)'O') == 16, "test_OWString error 5");
     TEST_ENSURE( s2.indexOf((sal_Unicode)'O', 5) == 16, "test_OWString error 5a");
     TEST_ENSURE( s2.lastIndexOf((sal_Unicode)'r') == 20, "test_OWString error 6");
@@ -112,121 +96,116 @@ void oldtests::test_OUString()
     //           |    |    |    |    |    |    |    |    |    |    |    |
     //  Index    0    5    10   15   20   25   30   35   40   45   50   55
     OUString s3 = s2.copy(0, s2.getLength() - 1);
-    OUString s4 = s3.concat( OUString::createFromAscii(" ist ein String aus der RTL Library\n") );
+    OUString s4 = s3.concat( OUString(RTL_CONSTASCII_USTRINGPARAM(" ist ein String aus der RTL Library\n")) );
     TEST_ENSURE( s4.getLength() == 60, "test_OWString error 11");
 
     s1 = s4.copy(0, 39);
     OUString s5;
-    s5 = s1 + OUString::createFromAscii( " aus der RTL Library\n" );
+    s5 = s1 + OUString(RTL_CONSTASCII_USTRINGPARAM(" aus der RTL Library\n"));
     TEST_ENSURE( s5.compareTo(s4) == 0 , "test_OWString error 12");
-    TEST_ENSURE( s5.indexOf(OUString::createFromAscii("RTL")) == 12, "test_OWString error 13");
-    TEST_ENSURE( s5.lastIndexOf(OUString::createFromAscii("RTL")) == 48, "test_OWString error 13");
+    TEST_ENSURE( s5.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("RTL"))) == 12, "test_OWString error 13");
+    TEST_ENSURE( s5.lastIndexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("RTL"))) == 48, "test_OWString error 13");
 
     sal_Bool b = sal_False;
     OUString s6 = s5.valueOf(b);
-//  TEST_ENSURE( s6.compareTo(OUString::createFromAscii("False")) == 0, "test_OWString error 14");
+//  TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("False"))) == 0, "test_OWString error 14");
     s6 = s5.valueOf((sal_Unicode)'H');
-    TEST_ENSURE( s6.compareTo(OUString::createFromAscii("H")) == 0, "test_OWString error 15");
+    TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("H"))) == 0, "test_OWString error 15");
     sal_Int32 n = 123456789L;
     s6 = s5.valueOf(n);
-    TEST_ENSURE( s6.compareTo(OUString::createFromAscii("123456789")) == 0, "test_OWString error 16");
+    TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("123456789"))) == 0, "test_OWString error 16");
 
-#ifndef SAL_OS2
 #ifdef SAL_UNX
     sal_Int64 m = -3223372036854775807LL;
-#elif defined(SAL_OS2)
-    sal_Int64 m;
-    sal_setInt64(&m, 3965190145L, -750499787L);
 #else
     sal_Int64 m = -3223372036854775807;
 #endif
     s6 = s5.valueOf(m);
-    TEST_ENSURE( s6.compareTo( OUString::createFromAscii( "-3223372036854775807" ) ) == 0, "test_OWString error 17");
-#endif
+    TEST_ENSURE( s6.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("-3223372036854775807")) ) == 0, "test_OWString error 17");
 
 // LLA: locale tests removed        ::rtl::OLocale locale = ::rtl::OLocale::getDefault();
 // LLA: locale tests removed
-// LLA: locale tests removed    OUString s61(OUString::createFromAscii("HaLLo"));
+// LLA: locale tests removed    OUString s61(OUString(RTL_CONSTASCII_USTRINGPARAM("HaLLo")));
 // LLA: locale tests removed    s61 = s61.toLowerCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s61 == OUString::createFromAscii("hallo"), "test_OWString error 17a");
+// LLA: locale tests removed    TEST_ENSURE( s61 == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 17a");
 // LLA: locale tests removed    s61 = s61.toUpperCase();
-// LLA: locale tests removed    TEST_ENSURE( s61 == OUString::createFromAscii("HALLO"), "test_OWString error 17b");
+// LLA: locale tests removed    TEST_ENSURE( s61 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO")), "test_OWString error 17b");
 // LLA: locale tests removed    s61 = s61.toLowerCase();
-// LLA: locale tests removed    TEST_ENSURE( s61 == OUString::createFromAscii("hallo"), "test_OWString error 17c");
+// LLA: locale tests removed    TEST_ENSURE( s61 == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 17c");
 // LLA: locale tests removed
-// LLA: locale tests removed    ::rtl::OLocale::setDefault( OUString::createFromAscii( "de" ), OUString::createFromAscii( "DE" ), OUString() );
+// LLA: locale tests removed    ::rtl::OLocale::setDefault( OUString(RTL_CONSTASCII_USTRINGPARAM("de")), OUString(RTL_CONSTASCII_USTRINGPARAM("DE")), OUString() );
 // LLA: locale tests removed    locale = OLocale::getDefault();
 // LLA: locale tests removed
 // LLA: locale tests removed    // AB, 24.3.2000, removed NAMESPACE_RTL(OLocale)::getENGLISH() and error 18
 // LLA: locale tests removed
-// LLA: locale tests removed    OUString s7(OUString::createFromAscii("HaLLo"));
+// LLA: locale tests removed    OUString s7(OUString(RTL_CONSTASCII_USTRINGPARAM("HaLLo")));
 // LLA: locale tests removed    s7 = s7.toLowerCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s7 == OUString::createFromAscii("hallo"), "test_OWString error 19");
+// LLA: locale tests removed    TEST_ENSURE( s7 == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 19");
 // LLA: locale tests removed    s7 = s7.toUpperCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s7 == OUString::createFromAscii("HALLO"), "test_OWString error 20");
+// LLA: locale tests removed    TEST_ENSURE( s7 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO")), "test_OWString error 20");
 // LLA: locale tests removed
-// LLA: locale tests removed    OUString s8(OUString::createFromAscii("HaLLo ICH BIn eIn "));
+// LLA: locale tests removed    OUString s8(OUString(RTL_CONSTASCII_USTRINGPARAM("HaLLo ICH BIn eIn ")));
 // LLA: locale tests removed    s8 += OUString::valueOf( (sal_Unicode)0xDF );
-// LLA: locale tests removed    locale = OLocale::registerLocale( OUString::createFromAscii("tr"), OUString::createFromAscii("TR"), OUString());
+// LLA: locale tests removed    locale = OLocale::registerLocale( OUString(RTL_CONSTASCII_USTRINGPARAM("tr")), OUString(RTL_CONSTASCII_USTRINGPARAM("TR")), OUString());
 // LLA: locale tests removed    s8 = s8.toLowerCase(locale);
 // LLA: locale tests removed    s8 = s8.toUpperCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s8 == OUString::createFromAscii("HALLO ICH BIN EIN SS"), "test_OWString error 21");
+// LLA: locale tests removed    TEST_ENSURE( s8 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN SS")), "test_OWString error 21");
 // LLA: locale tests removed
-// LLA: locale tests removed    s7 = OUString::createFromAscii("Hallo ich bIn ein I");
+// LLA: locale tests removed    s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bIn ein I"));
 // LLA: locale tests removed    s7 = s8.toUpperCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s7 != OUString::createFromAscii("HALLO ICH BIN EIN I"), "test_OWString error 21.b");
+// LLA: locale tests removed    TEST_ENSURE( s7 != OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN I")), "test_OWString error 21.b");
 
      OUString s7;
-    OUString s8(OUString::createFromAscii("HALLO ICH BIN EIN SS"));
-    s7 = OUString::createFromAscii("          ");
-    s8 = s7 + s8 + OUString::createFromAscii("          " );
-    TEST_ENSURE( s8 == OUString::createFromAscii("          HALLO ICH BIN EIN SS          "),
+    OUString s8(OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN SS")));
+    s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("          "));
+    s8 = s7 + s8 + OUString(RTL_CONSTASCII_USTRINGPARAM("          "));
+    TEST_ENSURE( s8 == OUString(RTL_CONSTASCII_USTRINGPARAM("          HALLO ICH BIN EIN SS          ")),
                   "test_OWString error 22");
 
     s7 = s8.trim();
-    TEST_ENSURE( s7 == OUString::createFromAscii("HALLO ICH BIN EIN SS"), "test_OWString error 23");
+    TEST_ENSURE( s7 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN SS")), "test_OWString error 23");
 //  TEST_ENSURE( wcscmp(s7.getStr(), L"HALLO ICH BIN EIN SS") == 0, "test_OWString error 24");
 
-    s7 = OUString::createFromAscii("Hallo");
-    s8 = OUString::createFromAscii("aber Hallo");
+    s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo"));
+    s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("aber Hallo"));
 
     TEST_ENSURE( s7 < s8, "test_OWString error 25");
     TEST_ENSURE( s8 > s7, "test_OWString error 26");
     TEST_ENSURE( s7 != s8, "test_OWString error 27");
-    TEST_ENSURE( s7 != OUString::createFromAscii("blabla"), "test_OWString error 28");
-    TEST_ENSURE( OUString::createFromAscii("blabla") != s7, "test_OWString error 29");
+    TEST_ENSURE( s7 != OUString(RTL_CONSTASCII_USTRINGPARAM("blabla")), "test_OWString error 28");
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("blabla")) != s7, "test_OWString error 29");
 
-    s8 = OUString::createFromAscii("Hallo");
+    s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo"));
     TEST_ENSURE( s7 <= s8, "test_OWString error 30");
     TEST_ENSURE( s7 >= s8, "test_OwString error 31");
 
     s8 = s8.replace((sal_Unicode)'l', (sal_Unicode)'r');
-    TEST_ENSURE( s8 == OUString::createFromAscii("Harro"), "test_OWString error 32");
+    TEST_ENSURE( s8 == OUString(RTL_CONSTASCII_USTRINGPARAM("Harro")), "test_OWString error 32");
 // LLA: len() unknown   TEST_ENSURE( s8.len() == 5, "test_OWString error 33");
 
     //       "Ich bin ein String mit einem A und C und vielen m, m, m, m"
     //        |    |    |    |    |    |    |    |    |    |    |    |
     //index   0    5    10   15   20   25   30   35   40   45   50   55
-    s8 = OUString::createFromAscii("Ich bin ein String mit einem A und C und vielen m, m, m, m");
+    s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("Ich bin ein String mit einem A und C und vielen m, m, m, m"));
 // LLA: no matching     TEST_ENSURE( s8.search((sal_Unicode)'I') == 0, "test_OWString error 34");
 // LLA: no matching     TEST_ENSURE( s8.search((sal_Unicode)'A') == 29, "test_OWString error 35");
-// LLA: no matching     s7 = OUString::createFromAscii("A und C");
+// LLA: no matching     s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("A und C"));
 // LLA: no matching     TEST_ENSURE( s8.search(s7) == 29, "test_OWString error 36");
-// LLA: no matching     TEST_ENSURE( s8.search(OUString::createFromAscii("mit einem A")) == 19, "test_OWString error 37");
+// LLA: no matching     TEST_ENSURE( s8.search(OUString(RTL_CONSTASCII_USTRINGPARAM("mit einem A"))) == 19, "test_OWString error 37");
 // LLA: no matching
-// LLA: no matching     s8 = OUString::createFromAscii("||token1|token2|token3||token4|token5||" );
+// LLA: no matching     s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("||token1|token2|token3||token4|token5||"));
 // LLA: no matching     TEST_ENSURE( s8.getTokenCount('|') == 10, "test_OWString error 38a");
 // LLA: no matching     TEST_ENSURE( s8.getToken(10,'|') == OUString(), "test_OWString error 39a");
 // LLA: no matching
-// LLA: no matching     s8 = OUString::createFromAscii("token1");
+// LLA: no matching     s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("token1"));
 // LLA: no matching     TEST_ENSURE( s8.getTokenCount('|') == 1, "test_OWString error 38b");
-// LLA: no matching     TEST_ENSURE( s8.getToken(0,'|') == OUString::createFromAscii("token1"), "test_OWString error 39b");
+// LLA: no matching     TEST_ENSURE( s8.getToken(0,'|') == OUString(RTL_CONSTASCII_USTRINGPARAM("token1")), "test_OWString error 39b");
 // LLA: no matching     TEST_ENSURE( s8.getToken(-1,'|') == OUString(), "test_OWString error 39c");
 // LLA: no matching     TEST_ENSURE( s8.getToken(1,'|') == OUString(), "test_OWString error 39d");
 // LLA: no matching
-// LLA: no matching     s8 = OUString::createFromAscii("|hallo1|hallo2|hallo3|hallo4|hallo5|hallo6|hallo7|hallo8|");
+// LLA: no matching     s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("|hallo1|hallo2|hallo3|hallo4|hallo5|hallo6|hallo7|hallo8|"));
 // LLA: no matching     TEST_ENSURE( s8.getTokenCount((sal_Unicode)'|') == 10, "test_OWString error 38");
-// LLA: no matching     TEST_ENSURE( s8.getToken(3, (sal_Unicode)'|') == OUString::createFromAscii("hallo3"), "test_OWString error 39");
+// LLA: no matching     TEST_ENSURE( s8.getToken(3, (sal_Unicode)'|') == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo3")), "test_OWString error 39");
 
 // LLA: removed due to the fact, this is not a clean test!
 
@@ -234,48 +213,48 @@ void oldtests::test_OUString()
 // LLA:     s7 += s8;
 // LLA:     TEST_ENSURE( s7 == s8, "test_OWString error 40");
 // LLA:
-// LLA:     s7 = s8.replaceAt(8, 6, OUString::createFromAscii("mmmmmmmmmm"));
+// LLA:     s7 = s8.replaceAt(8, 6, OUString(RTL_CONSTASCII_USTRINGPARAM("mmmmmmmmmm")));
 // LLA:     TEST_ENSURE( s7.getLength() == 61, "test_OWString error 41");
 // LLA:
 // LLA:     s8 = s7.replaceAt(8, 11, OUString());
 // LLA:     TEST_ENSURE( s8.getLength() == 50, "test_OWString error 42");
 // LLA:
-// LLA:     s7 = s8.replaceAt(8, 0, OUString::createFromAscii("hallo2|"));
+// LLA:     s7 = s8.replaceAt(8, 0, OUString(RTL_CONSTASCII_USTRINGPARAM("hallo2|")));
 // LLA:     TEST_ENSURE( s7.getLength() == 57, "test_OWString error 43");
 // LLA:
 // LLA:     sal_Int32 pos = 0;
-// LLA:     while ((pos = s7.indexOf(OUString::createFromAscii("|"))) >= 0)
+// LLA:     while ((pos = s7.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("|")))) >= 0)
 // LLA:     {
-// LLA:         s8 = s7.replaceAt(pos, 1, OUString::createFromAscii("**"));
+// LLA:         s8 = s7.replaceAt(pos, 1, OUString(RTL_CONSTASCII_USTRINGPARAM("**")));
 // LLA:         s7 = s8;
 // LLA:     }
 // LLA:     TEST_ENSURE( s7.getLength() == 66, "test_OWString error 44");
 
-    TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("bbb" ) ) < 0, "test_OWString error 46" );
-    TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("aaa" ) ) == 0, "test_OWString error 46" );
-    TEST_ENSURE( OUString::createFromAscii("bbb" ).compareTo( OUString::createFromAscii("aaa" ) ) > 0, "test_OWString error 47" );
-    TEST_ENSURE( OUString::createFromAscii("aaaa" ).compareTo( OUString::createFromAscii("bbb" ) ) < 0, "test_OWString error 48" );
-    TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("bbbb" ) ) < 0, "test_OWString error 49" );
-    TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("aaaa" ) ) < 0, "test_OWString error 50" );
-    TEST_ENSURE( OUString::createFromAscii("aaaa" ).compareTo( OUString::createFromAscii("aaa" ) ) > 0, "test_OWString error 51" );
-    TEST_ENSURE( OUString::createFromAscii("bbbb" ).compareTo( OUString::createFromAscii("bbb" ) ) > 0, "test_OWString error 52" );
-    TEST_ENSURE( OUString::createFromAscii("bbb" ) == OUString::createFromAscii("bbb" ), "test_OWString error 53" );
-    TEST_ENSURE( OUString::createFromAscii("bbb" ) == OUString::createFromAscii("bbb" ), "test_OWString error 54" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) ) < 0, "test_OWString error 46" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")) ) == 0, "test_OWString error 46" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")) ) > 0, "test_OWString error 47" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) ) < 0, "test_OWString error 48" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbbb")) ) < 0, "test_OWString error 49" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaaa")) ) < 0, "test_OWString error 50" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")) ) > 0, "test_OWString error 51" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbbb")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) ) > 0, "test_OWString error 52" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) == OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")), "test_OWString error 53" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) == OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")), "test_OWString error 54" );
 
     {
-        OUString uStr = OUString::createFromAscii( "Hallo" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Hallo"), 5 ) == 0, "test_OWString error 54.2.1" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Halloa"), 6 ) < 0 , "test_OWString error 54.2.2" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("1Hallo"), 6 ) > 0, "test_OWString error 54.2.3" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Aallo"), 5 ) > 0, "test_OWString error 54.2.4" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Halla"), 5 ) > 0, "test_OWString error 54.2.5" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Mallo"), 5 ) < 0, "test_OWString error 54.2.6" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Hallp"), 5 ) < 0, "test_OWString error 54.2.7" );
+        OUString uStr = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo"));
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")), 5 ) == 0, "test_OWString error 54.2.1" );
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Halloa")), 6 ) < 0 , "test_OWString error 54.2.2" );
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("1Hallo")), 6 ) > 0, "test_OWString error 54.2.3" );
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Aallo")), 5 ) > 0, "test_OWString error 54.2.4" );
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Halla")), 5 ) > 0, "test_OWString error 54.2.5" );
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Mallo")), 5 ) < 0, "test_OWString error 54.2.6" );
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Hallp")), 5 ) < 0, "test_OWString error 54.2.7" );
     }
 
 #if OSL_DEBUG_LEVEL == 0
 //YD will fail copy assert on indexes, because ':' returns -1
-    s7 = OUString::createFromAscii("Hallo jetzt komm ich");
+    s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"));
     s8 = s7.copy(0, s7.indexOf((sal_Unicode)':'));
     TEST_ENSURE( s8.getLength() == 0, "test_OWString error 55");
     TEST_ENSURE( s8.compareTo(OUString()) == 0, "test_OWString error 56");
@@ -320,7 +299,7 @@ void oldtests::test_OUString()
     TEST_ENSURE( nCompareResult21_Len13 > 0, "test_OWString error 66" );
 
     {
-        OUString uStr = OUString::createFromAscii( "Hallo" );
+        OUString uStr = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo"));
         TEST_ENSURE( uStr.equalsAsciiL( "Hallo", 5 ), "test_OWString error 66.1.1" );
         TEST_ENSURE( !uStr.equalsAsciiL( "Hallo1", 6 ), "test_OWString error 66.1.2" );
         TEST_ENSURE( !uStr.equalsAsciiL( "1Hallo", 6 ), "test_OWString error 66.1.3" );
@@ -337,34 +316,34 @@ void oldtests::test_OUString()
     }
 
     // toInt64
-    OUString s9( OUString::createFromAscii(" -3223372036854775807") );
+    OUString s9( OUString(RTL_CONSTASCII_USTRINGPARAM(" -3223372036854775807")) );
     sal_Int64 ln1 = s9.toInt64();
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
     TEST_ENSURE( ln1 == -3223372036854775807LL, "test_OWString error 67" );
 #else
     TEST_ENSURE( ln1 == -3223372036854775807, "test_OWString error 67" );
 #endif
-    OUString s10( OUString::createFromAscii("13243A65f1H45") );
+    OUString s10( OUString(RTL_CONSTASCII_USTRINGPARAM("13243A65f1H45")) );
     sal_Int64 ln2 = s10.toInt64();
     TEST_ENSURE( ln2 == 13243, "test_OWString error 68" );
 
     sal_Int64 ln3 = s10.toInt64( 16 );
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
     TEST_ENSURE( ln3 == 0x13243A65F1LL, "test_OWString error 69" );
 #else
     TEST_ENSURE( ln3 == 0x13243A65F1, "test_OWString error 69" );
 #endif
     // Exotic base
-    OUString s11( OUString::createFromAscii("H4A") );
+    OUString s11( OUString(RTL_CONSTASCII_USTRINGPARAM("H4A")) );
     sal_Int64 ln4 = s11.toInt64( 23 );
     TEST_ENSURE( ln4 == 23*23*17 + 4 * 23 + 10, "test_OWString error 70" );
 
     // toInt32
-    OUString s12( OUString::createFromAscii(" -220368507") );
+    OUString s12( OUString(RTL_CONSTASCII_USTRINGPARAM(" -220368507")) );
     sal_Int32 n1 = s12.toInt32();
     TEST_ENSURE( n1 == -220368507, "test_OWString error 71" );
 
-    OUString s13( OUString::createFromAscii("4423A61H45") );
+    OUString s13( OUString(RTL_CONSTASCII_USTRINGPARAM("4423A61H45")) );
     sal_Int64 n2 = s13.toInt32();
     TEST_ENSURE( n2 == 4423, "test_OWString error 72" );
 
@@ -390,13 +369,13 @@ void oldtests::test_OString2OUStringAndViceVersa()
 {
     OString s1("Hallo jetzt komm ich");
     OUString u1 = OStringToOUString(s1, RTL_TEXTENCODING_MS_1252);
-    TEST_ENSURE( u1.equals(OUString::createFromAscii("Hallo jetzt komm ich")), "test_OString2OWStringAndViceVersa error 1" );
+    TEST_ENSURE( u1.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"))), "test_OString2OWStringAndViceVersa error 1" );
     u1 = OStringToOUString(s1, RTL_TEXTENCODING_IBM_850);
-    TEST_ENSURE( u1.equals(OUString::createFromAscii("Hallo jetzt komm ich")), "test_OString2OWStringAndViceVersa error 2" );
+    TEST_ENSURE( u1.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"))), "test_OString2OWStringAndViceVersa error 2" );
     u1 = OStringToOUString(s1, RTL_TEXTENCODING_ISO_8859_15);
-    TEST_ENSURE( u1.equals(OUString::createFromAscii("Hallo jetzt komm ich")), "test_OString2OWStringAndViceVersa error 3" );
+    TEST_ENSURE( u1.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"))), "test_OString2OWStringAndViceVersa error 3" );
     u1 = OStringToOUString(s1, RTL_TEXTENCODING_ASCII_US);
-    TEST_ENSURE( u1.equals(OUString::createFromAscii("Hallo jetzt komm ich")), "test_OString2OWStringAndViceVersa error 4" );
+    TEST_ENSURE( u1.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"))), "test_OString2OWStringAndViceVersa error 4" );
 
     OString s2 = OUStringToOString(u1, RTL_TEXTENCODING_MS_1252);
     TEST_ENSURE( s2.equals("Hallo jetzt komm ich"), "test_OString2OWStringAndViceVersa error 5" );
@@ -419,3 +398,4 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_OUString::oldtests, "rtl_OUString" );
 NOADDITIONAL;
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
index ef04f3f60c38..f1bec70cb39e 100644
--- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
+++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,37 +33,22 @@
 // this file is converted to use with testshl2
 // original was placed in sal/test/textenc.cxx
 
-
-// -----------------------------------------------------------------------------
-
 #include <string.h>
 #include <stdio.h>
 
-// #ifndef _OSL_DIAGNOSE_H_
-// #include <osl/diagnose.h>
-// #endif
-
-#ifndef _RTL_STRBUF_HXX
 #include <rtl/strbuf.hxx>
-#endif
 
-#ifndef _RTL_WSTRBUF_HXX
 #include <rtl/ustrbuf.hxx>
-#endif
 
 #include <testshl/simpleheader.hxx>
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OStringBuffer;
 #define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
 
-// #if OSL_DEBUG_LEVEL > 0
-// #define TEST_ENSHURE(c, m)   OSL_ENSURE(c, m)
-// #else
-// #define TEST_ENSHURE(c, m)   OSL_VERIFY(c)
-// #endif
 
-// -----------------------------------------------------------------------------
 namespace rtl_OStringBuffer
 {
     class oldtests : public CppUnit::TestFixture
@@ -107,12 +93,8 @@ void oldtests::test_OStringBuffer()
     b2.append(n);
     TEST_ENSURE( s1 == b2.getStr(), "test_OStringBuffer error 5");
 
-#ifndef SAL_OS2
 #ifdef SAL_UNX
     sal_Int64 m = -3223372036854775807LL;
-#elif defined(SAL_OS2)
-    sal_Int64 m;
-    sal_setInt64(&m, 3965190145L, -750499787L);
 #else
     sal_Int64 m = -3223372036854775807;
 #endif
@@ -120,7 +102,6 @@ void oldtests::test_OStringBuffer()
     b2.append(" ");
     b2.append(m);
     TEST_ENSURE( s1 == b2.getStr(), "test_OStringBuffer error 6");
-#endif
 
     OString s2(b2.makeStringAndClear());
     TEST_ENSURE( s1 == s2, "test_OStringBuffer error 7");
@@ -143,12 +124,10 @@ void oldtests::test_OStringBuffer()
     s2 = "Hier fuege ich jetzt ein > 123456789 false Hallo <\n";
     TEST_ENSURE( s2 == b2.getStr(), "test_OStringBuffer error 11");
 
-#ifndef SAL_OS2
     b2.insert(26, m);
     b2.insert(26, " ");
     s2 = "Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n";
     TEST_ENSURE( s2 == b2.getStr(), "test_OStringBuffer error 12");
-#endif
 
     printf("test_OStringBuffer OK !!!\n");
     return;
@@ -175,46 +154,41 @@ void oldtests::test_OUStringBuffer()
     //          "Mein erster RTL OUString\n"
     //           |    |    |    |    |
     //  Index    0    5    10   15   20
-    OUString s1(OUString::createFromAscii("Mein erster RTL OUString\n"));
+    OUString s1(OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUString\n")));
 
     OUStringBuffer b1(s1);
 
     TEST_ENSURE( b1.getCapacity() == 16 + s1.getLength(), "test_OWStringBuffer error 1");
 
-    b1.insert(b1.getLength() - 1, OUString::createFromAscii("Buffer"));
-    s1 = OUString::createFromAscii("Mein erster RTL OUStringBuffer\n");
+    b1.insert(b1.getLength() - 1, OUString(RTL_CONSTASCII_USTRINGPARAM("Buffer")));
+    s1 = OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUStringBuffer\n"));
     TEST_ENSURE( s1 == b1.getStr(), "test_OWStringBuffer error 2");
 
-    b1.insert(b1.getLength() - 1, OUString::createFromAscii(" ist viel zu gross fuer den alten Buffer"));
+    b1.insert(b1.getLength() - 1, OUString(RTL_CONSTASCII_USTRINGPARAM(" ist viel zu gross fuer den alten Buffer")));
     //TEST_ENSURE( b1.getCapacity() == b1.getLength(), "test_OWStringBuffer error 3");
 
     OUStringBuffer b2(30);
 
-    s1 = OUString::createFromAscii("false");
+    s1 = OUString(RTL_CONSTASCII_USTRINGPARAM("false"));
     sal_Bool b = sal_False;
     b2.append(b);
     TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 4");
 
     sal_Int32 n = 123456789L;
-    s1 += OUString::createFromAscii(" 123456789");
-    b2.append(OUString::createFromAscii(" "));
+    s1 += OUString(RTL_CONSTASCII_USTRINGPARAM(" 123456789"));
+    b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
     b2.append(n);
     TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 5");
 
-#ifndef SAL_OS2
 #ifdef SAL_UNX
     sal_Int64 m = -3223372036854775807LL;
-#elif defined(SAL_OS2)
-    sal_Int64 m;
-    sal_setInt64(&m, 3965190145L, -750499787L);
 #else
     sal_Int64 m = -3223372036854775807;
 #endif
-    s1 += OUString::createFromAscii(" -3223372036854775807");
-    b2.append(OUString::createFromAscii(" "));
+    s1 += OUString(RTL_CONSTASCII_USTRINGPARAM(" -3223372036854775807"));
+    b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
     b2.append(m);
     TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 6");
-#endif
 
     OUString s2(b2.makeStringAndClear());
     TEST_ENSURE( s1 == s2, "test_OWStringBuffer error 7");
@@ -222,34 +196,32 @@ void oldtests::test_OUStringBuffer()
     b2.ensureCapacity(50);
     TEST_ENSURE( b2.getCapacity() == 50, "test_OWStringBuffer error 8");
 
-    b2.append(OUString::createFromAscii("Hier fuege ich jetzt ein > <\n"));
-    b2.insert(26, OUString::createFromAscii(" Hallo"));
-    s2 = OUString::createFromAscii("Hier fuege ich jetzt ein > Hallo <\n");
+    b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > <\n")));
+    b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" Hallo")));
+    s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > Hallo <\n"));
     TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 9");
 
     b2.insert(26, b);
-    b2.insert(26, OUString::createFromAscii(" "));
-    s2 = OUString::createFromAscii("Hier fuege ich jetzt ein > false Hallo <\n");
+    b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
+    s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > false Hallo <\n"));
     TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 10");
 
     b2.insert(26, n);
-    b2.insert(26, OUString::createFromAscii(" "));
-    s2 = OUString::createFromAscii("Hier fuege ich jetzt ein > 123456789 false Hallo <\n");
+    b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
+    s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > 123456789 false Hallo <\n"));
     TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 11");
 
-#ifndef SAL_OS2
     b2.insert(26, m);
-    b2.insert(26, OUString::createFromAscii(" "));
-    s2 = OUString::createFromAscii("Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n");
+    b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
+    s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n"));
     TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 12");
-#endif
 
     // ASCII-Schnittstelle, AB 15.10.1999
-    OUString s3(OUString::createFromAscii("Noch'n RTL OUString"));
+    OUString s3(OUString(RTL_CONSTASCII_USTRINGPARAM("Noch'n RTL OUString")));
     OUStringBuffer b3(s3);
     sal_Char aAsciiStr[] = " mit appendetem ASCII\n";
     b3.appendAscii( aAsciiStr );
-    s3 = OUString::createFromAscii("Noch'n RTL OUString mit appendetem ASCII\n");
+    s3 = OUString(RTL_CONSTASCII_USTRINGPARAM("Noch'n RTL OUString mit appendetem ASCII\n"));
     TEST_ENSURE( b3.getStr() == s3 , "test_OWStringBuffer error 13");
 
 
@@ -267,3 +239,5 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_OStringBuffer::oldtests, "rtl_OString
 
 // -----------------------------------------------------------------------------
 NOADDITIONAL;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/sal/makefile.mk b/sal/qa/sal/makefile.mk
index 594eaa7d5ded..78c8646c307a 100644
--- a/sal/qa/sal/makefile.mk
+++ b/sal/qa/sal/makefile.mk
@@ -33,18 +33,18 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 SHL1TARGET = $(TARGET)_types
 SHL1OBJS = $(SLO)$/test_types.obj
-SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-SHL1VERSIONMAP = version.map
+SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB)
+SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
 
 SLOFILES = $(SHL1OBJS)
 
-.INCLUDE: target.mk
-
-ALLTAR: test
+.ENDIF
 
-test .PHONY: $(SHL1TARGETN)
-    testshl2 $(SHL1TARGETN)
+.INCLUDE: target.mk
+.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/sal/test_types.cxx b/sal/qa/sal/test_types.cxx
index e451fdaf9b26..0b7cdd661d3d 100644
--- a/sal/qa/sal/test_types.cxx
+++ b/sal/qa/sal/test_types.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,10 @@
 #include <stdio.h> // C99 snprintf not necessarily in <cstdio>
 #include <string.h> // wntmsci10 does not know <cstring> std::strcmp
 
-#include "testshl/simpleheader.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
 #include "sal/types.h"
 
 namespace {
@@ -74,8 +78,10 @@ void Test::test() {
     testPrintf("ABC", "%" SAL_PRIXUINTPTR, static_cast< sal_uIntPtr >(0xabc));
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/systools/makefile.mk b/sal/qa/systools/makefile.mk
index af45f4fa50f0..7b3798b7413b 100644
--- a/sal/qa/systools/makefile.mk
+++ b/sal/qa/systools/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS=  \
     $(SLO)$/test_comtools.obj
 
 SHL1TARGET= test_comtools
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) uuid.lib
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) uuid.lib
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
@@ -66,5 +66,4 @@ SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/systools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx
index e72d11ecfb7c..f09a7b4189f7 100644
--- a/sal/qa/systools/test_comtools.cxx
+++ b/sal/qa/systools/test_comtools.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -197,7 +198,7 @@ namespace test_comtools
                 sal::systools::COMReference<IUnknown> r2 = r1.QueryInterface<IUnknown>(IID_IUnknown);
                 CPPUNIT_ASSERT_MESSAGE("Wrong reference count, 2 is expected", reinterpret_cast<COMObject*>(r2.get())->GetRefCount() == 2);
             }
-            catch(sal::systools::ComError& ex)
+            catch(const sal::systools::ComError& ex)
             {
                 CPPUNIT_ASSERT_MESSAGE("Exception should not have been thrown", false);
             }
@@ -210,7 +211,7 @@ namespace test_comtools
                 sal::systools::COMReference<IUnknown> r1 = comObjectSource();
                 sal::systools::COMReference<IPersistFile> r2 = r1.QueryInterface<IPersistFile>(IID_IPersistFile);
             }
-            catch(sal::systools::ComError& ex)
+            catch(const sal::systools::ComError& ex)
             {
                 return;
             }
@@ -248,3 +249,4 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_comtools::test_COMReference, "test_co
 // to let the user the possibility to also register some functions by hand.
 NOADDITIONAL;
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/testHelperFunctions/makefile.mk b/sal/qa/testHelperFunctions/makefile.mk
index 4bdc0bda3a11..e7c2f9887e21 100644
--- a/sal/qa/testHelperFunctions/makefile.mk
+++ b/sal/qa/testHelperFunctions/makefile.mk
@@ -45,7 +45,7 @@ SHL1OBJS=  \
     $(SLO)$/testHelperFunctions2.obj
 
 SHL1TARGET= testHelperFunctions
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
@@ -60,4 +60,4 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/testHelperFunctions/testHelperFunctions.cxx b/sal/qa/testHelperFunctions/testHelperFunctions.cxx
index dd99c1396132..6341fe35a980 100644
--- a/sal/qa/testHelperFunctions/testHelperFunctions.cxx
+++ b/sal/qa/testHelperFunctions/testHelperFunctions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -215,7 +216,7 @@ namespace testOfHelperFunctions
         rtl::OString sValue("foo bar");
         t_print("a String '%s' (should be 'foo bar')\n", sValue.getStr());
 
-        rtl::OUString suValue(rtl::OUString::createFromAscii("a unicode string"));
+        rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM("a unicode string"));
         sValue <<= suValue;
         t_print("a String '%s'\n", sValue.getStr());
     }
@@ -452,3 +453,5 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( testOfHelperFunctions::test_TimeValues, "
 
 // -----------------------------------------------------------------------------
 NOADDITIONAL;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
index e95a6aee892b..52ec09121c6d 100644
--- a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
+++ b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,7 +47,7 @@ namespace testOfHelperFunctions
     void test_valueequal::valueequal_001( )
     {
         rtl::OString sValue;
-        rtl::OUString suValue(rtl::OUString::createFromAscii("This is only a test of some helper functions"));
+        rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM("This is only a test of some helper functions"));
         sValue <<= suValue;
         t_print("'%s'\n", sValue.getStr());
     }
@@ -59,3 +60,5 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( testOfHelperFunctions::test_valueequal, "
 // -----------------------------------------------------------------------------
 // This is only allowed to be in one file!
 // NOADDITIONAL;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/alloc_arena.c b/sal/rtl/source/alloc_arena.c
index 1e2ea5a741e4..b06366427f33 100644
--- a/sal/rtl/source/alloc_arena.c
+++ b/sal/rtl/source/alloc_arena.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,13 +37,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#ifdef OS2
-#undef OSL_TRACE
-#define OSL_TRACE                  1 ? ((void)0) : _OSL_GLOBAL osl_trace
-#define INCL_DOS
-#include <os2.h>
-#endif
-
 /* ================================================================= *
  *
  * arena internals.
@@ -101,13 +95,6 @@ rtl_machdep_pagesize (void);
 rtl_arena_type * gp_default_arena = 0;
 
 
-/** rtl_arena_init()
- *  @internal
- */
-static int
-rtl_arena_init (void);
-
-
 /* ================================================================= */
 
 /** rtl_arena_segment_constructor()
@@ -344,20 +331,6 @@ rtl_arena_hash_rescale (
             old_size, new_size
         );
 
-#if 0  /* DBG */
-        for (i = 0; i < arena->m_hash_size; i++)
-        {
-            sal_Size k = 0; rtl_arena_segment_type ** segpp = &(arena->m_hash_table[i]);
-            while (*segpp)
-            {
-                k += 1;
-                segpp = &((*segpp)->m_fnext);
-            }
-            fprintf(stdout, "%d, ", k);
-        }
-        fprintf(stdout, "\n");
-#endif /* DBG */
-
         arena->m_hash_table = new_table;
         arena->m_hash_size  = new_size;
         arena->m_hash_shift = highbit(arena->m_hash_size) - 1;
@@ -934,6 +907,8 @@ rtl_arena_deactivate (
  *
  * ================================================================= */
 
+extern void ensureArenaSingleton();
+
 /** rtl_arena_create()
  */
 rtl_arena_type *
@@ -986,7 +961,8 @@ try_alloc:
     }
     else if (gp_arena_arena == 0)
     {
-        if (rtl_arena_init())
+        ensureArenaSingleton();
+        if (gp_arena_arena)
         {
             /* try again */
             goto try_alloc;
@@ -1179,7 +1155,7 @@ SAL_CALL rtl_arena_free (
 
 #if defined(SAL_UNX)
 #include <sys/mman.h>
-#elif defined(SAL_W32) || defined(SAL_OS2)
+#elif defined(SAL_W32)
 #define MAP_FAILED 0
 #endif /* SAL_UNX || SAL_W32 */
 
@@ -1215,18 +1191,7 @@ SAL_CALL rtl_machdep_alloc (
     addr = mmap (NULL, (size_t)(size), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
 #elif defined(SAL_W32)
     addr = VirtualAlloc (NULL, (SIZE_T)(size), MEM_COMMIT, PAGE_READWRITE);
-#elif defined(SAL_OS2)
-    {
-    APIRET rc;
-    addr = 0;
-    // Use DosAlloc* to get a 4KB page aligned address.
-    rc = DosAllocMem( &addr, size, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY);
-    if (rc) {
-        fprintf( stderr, "sal3::DosAllocMem failed rc=%d\n", rc);
-        addr = 0;
-    }
-    }
-#endif /* (SAL_UNX || SAL_W32 || SAL_OS2) */
+#endif /* (SAL_UNX || SAL_W32) */
 
     if (addr != MAP_FAILED)
     {
@@ -1259,8 +1224,6 @@ SAL_CALL rtl_machdep_free (
     (void) munmap(pAddr, nSize);
 #elif defined(SAL_W32)
     (void) VirtualFree ((LPVOID)(pAddr), (SIZE_T)(0), MEM_RELEASE);
-#elif defined(SAL_OS2)
-    (void) DosFreeMem( pAddr);
 #endif /* (SAL_UNX || SAL_W32) */
 }
 
@@ -1270,7 +1233,7 @@ static sal_Size
 rtl_machdep_pagesize (void)
 {
 #if defined(SAL_UNX)
-#if defined(FREEBSD) || defined(NETBSD)
+#if defined(FREEBSD) || defined(NETBSD) || defined(DRAGONFLY)
     return ((sal_Size)getpagesize());
 #else  /* POSIX */
     return ((sal_Size)sysconf(_SC_PAGESIZE));
@@ -1279,10 +1242,6 @@ rtl_machdep_pagesize (void)
     SYSTEM_INFO info;
     GetSystemInfo (&info);
     return ((sal_Size)(info.dwPageSize));
-#elif defined(SAL_OS2)
-    ULONG ulPageSize;
-    DosQuerySysInfo(QSV_PAGE_SIZE, QSV_PAGE_SIZE, &ulPageSize, sizeof(ULONG));
-    return ((sal_Size)ulPageSize);
 #endif /* (SAL_UNX || SAL_W32) */
 }
 
@@ -1292,8 +1251,8 @@ rtl_machdep_pagesize (void)
  *
  * ================================================================= */
 
-static void
-rtl_arena_once_init (void)
+void
+rtl_arena_init (void)
 {
     {
         /* list of arenas */
@@ -1355,36 +1314,11 @@ rtl_arena_once_init (void)
         );
         OSL_ASSERT(gp_arena_arena != 0);
     }
-}
-
-static int
-rtl_arena_init (void)
-{
-    static sal_once_type g_once = SAL_ONCE_INIT;
-    SAL_ONCE(&g_once, rtl_arena_once_init);
-    return (gp_arena_arena != 0);
+    OSL_TRACE("rtl_arena_init completed");
 }
 
 /* ================================================================= */
 
-/*
-  Issue http://udk.openoffice.org/issues/show_bug.cgi?id=92388
-
-  Mac OS X does not seem to support "__cxa__atexit", thus leading
-  to the situation that "__attribute__((destructor))__" functions
-  (in particular "rtl_{memory|cache|arena}_fini") become called
-  _before_ global C++ object d'tors.
-
-  Delegated the call to "rtl_arena_fini()" into a dummy C++ object,
-  see alloc_fini.cxx .
-*/
-#if defined(__GNUC__) && !defined(MACOSX)
-static void rtl_arena_fini (void) __attribute__((destructor));
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma fini(rtl_arena_fini)
-static void rtl_arena_fini (void);
-#endif /* __GNUC__ || __SUNPRO_C */
-
 void
 rtl_arena_fini (void)
 {
@@ -1407,6 +1341,9 @@ rtl_arena_fini (void)
         }
         RTL_MEMORY_LOCK_RELEASE(&(g_arena_list.m_lock));
     }
+    OSL_TRACE("rtl_arena_fini completed");
 }
 
 /* ================================================================= */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/alloc_arena.h b/sal/rtl/source/alloc_arena.h
index 45907802dba9..8c0f08c0fd4f 100644
--- a/sal/rtl/source/alloc_arena.h
+++ b/sal/rtl/source/alloc_arena.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -135,3 +136,5 @@ extern rtl_arena_type * gp_default_arena;
 #endif
 
 #endif /* INCLUDED_RTL_ALLOC_ARENA_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/alloc_cache.c b/sal/rtl/source/alloc_cache.c
index f4d34bfdb437..91786ade6436 100644
--- a/sal/rtl/source/alloc_cache.c
+++ b/sal/rtl/source/alloc_cache.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,11 +41,6 @@
 #include <stdio.h>
 #endif
 
-#ifdef OS2
-#undef OSL_TRACE
-#define OSL_TRACE                  1 ? ((void)0) : _OSL_GLOBAL osl_trace
-#endif
-
 /* ================================================================= *
  *
  * cache internals.
@@ -59,7 +55,7 @@ struct rtl_cache_list_st
     rtl_memory_lock_type m_lock;
     rtl_cache_type       m_cache_head;
 
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
     pthread_t            m_update_thread;
     pthread_cond_t       m_update_cond;
 #elif defined(SAL_W32)
@@ -98,13 +94,6 @@ static rtl_cache_type * gp_cache_slab_cache = 0;
 static rtl_cache_type * gp_cache_bufctl_cache = 0;
 
 
-/** rtl_cache_init()
- *  @internal
- */
-static int
-rtl_cache_init (void);
-
-
 /* ================================================================= */
 
 /** RTL_CACHE_HASH_INDEX()
@@ -988,6 +977,7 @@ rtl_cache_deactivate (
     RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock));
 
     OSL_PRECOND(active, "rtl_cache_deactivate(): orphaned cache.");
+    (void)active;
 
     /* cleanup magazine layer */
     if (cache->m_magazine_cache != 0)
@@ -1117,6 +1107,8 @@ rtl_cache_deactivate (
  *
  * ================================================================= */
 
+extern void ensureCacheSingleton();
+
 /** rtl_cache_create()
  */
 rtl_cache_type *
@@ -1174,7 +1166,8 @@ try_alloc:
     }
     else if (gp_cache_arena == 0)
     {
-        if (rtl_cache_init())
+        ensureCacheSingleton();
+        if (gp_cache_arena)
         {
             /* try again */
             goto try_alloc;
@@ -1210,10 +1203,9 @@ SAL_CALL rtl_cache_alloc (
     if (cache == 0)
         return (0);
 
+    RTL_MEMORY_LOCK_ACQUIRE(&(cache->m_depot_lock));
     if (cache->m_cpu_curr != 0)
     {
-        RTL_MEMORY_LOCK_ACQUIRE(&(cache->m_depot_lock));
-
         for (;;)
         {
             /* take object from magazine layer */
@@ -1259,9 +1251,8 @@ SAL_CALL rtl_cache_alloc (
             /* no full magazine: fall through to slab layer */
             break;
         }
-
-        RTL_MEMORY_LOCK_RELEASE(&(cache->m_depot_lock));
     }
+    RTL_MEMORY_LOCK_RELEASE(&(cache->m_depot_lock));
 
     /* alloc buffer from slab layer */
     obj = rtl_cache_slab_alloc (cache);
@@ -1380,7 +1371,7 @@ rtl_cache_wsupdate_fini (void);
 
 /* ================================================================= */
 
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
 
 #include <sys/time.h>
 
@@ -1546,7 +1537,7 @@ rtl_cache_wsupdate (
 /** rtl_cache_wsupdate_all()
  *
  */
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
 static void *
 #elif defined(SAL_W32)
 static DWORD WINAPI
@@ -1583,8 +1574,8 @@ rtl_cache_wsupdate_all (void * arg)
  *
  * ================================================================= */
 
-static void
-rtl_cache_once_init (void)
+void
+rtl_cache_init (void)
 {
     {
         /* list of caches */
@@ -1680,36 +1671,11 @@ rtl_cache_once_init (void)
     }
 
     rtl_cache_wsupdate_init();
-}
-
-static int
-rtl_cache_init (void)
-{
-    static sal_once_type g_once = SAL_ONCE_INIT;
-    SAL_ONCE(&g_once, rtl_cache_once_init);
-    return (gp_cache_arena != 0);
+    OSL_TRACE("rtl_cache_init completed");
 }
 
 /* ================================================================= */
 
-/*
-  Issue http://udk.openoffice.org/issues/show_bug.cgi?id=92388
-
-  Mac OS X does not seem to support "__cxa__atexit", thus leading
-  to the situation that "__attribute__((destructor))__" functions
-  (in particular "rtl_{memory|cache|arena}_fini") become called
-  _before_ global C++ object d'tors.
-
-  Delegated the call to "rtl_cache_fini()" into a dummy C++ object,
-  see alloc_fini.cxx .
-*/
-#if defined(__GNUC__) && !defined(MACOSX)
-static void rtl_cache_fini (void) __attribute__((destructor));
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma fini(rtl_cache_fini)
-static void rtl_cache_fini (void);
-#endif /* __GNUC__ || __SUNPRO_C */
-
 void
 rtl_cache_fini (void)
 {
@@ -1765,6 +1731,9 @@ rtl_cache_fini (void)
         }
         RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock));
     }
+    OSL_TRACE("rtl_cache_fini completed");
 }
 
 /* ================================================================= */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/alloc_cache.h b/sal/rtl/source/alloc_cache.h
index 9fed61806fde..05efceb980c8 100644
--- a/sal/rtl/source/alloc_cache.h
+++ b/sal/rtl/source/alloc_cache.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -180,3 +181,5 @@ struct rtl_cache_st
 #endif
 
 #endif /* INCLUDED_RTL_ALLOC_CACHE_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/alloc_fini.cxx b/sal/rtl/source/alloc_fini.cxx
index cb04a525e75e..1c1d30af43d1 100755..100644
--- a/sal/rtl/source/alloc_fini.cxx
+++ b/sal/rtl/source/alloc_fini.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,31 +26,98 @@
  *
  ************************************************************************/
 
-/*
-  Issue http://udk.openoffice.org/issues/show_bug.cgi?id=92388
-
-  Mac OS X does not seem to support "__cxa__atexit", thus leading
-  to the situation that "__attribute__((destructor))__" functions
-  (in particular "rtl_{memory|cache|arena}_fini") become called
-  _before_ global C++ object d'tors.
-
-  Using a C++ dummy object instead.
-*/
+#include <rtl/instance.hxx>
 
 extern "C" void rtl_memory_fini (void);
+extern "C" void rtl_memory_init (void);
+namespace
+{
+    struct rtlMemorySingleton
+    {
+        rtlMemorySingleton()
+        {
+            rtl_memory_init();
+        }
+        ~rtlMemorySingleton()
+        {
+            rtl_memory_fini();
+        }
+    };
+    class theMemorySingleton
+        : public rtl::Static<rtlMemorySingleton, theMemorySingleton>{};
+}
+extern "C" void ensureMemorySingleton()
+{
+    theMemorySingleton::get();
+}
+
 extern "C" void rtl_cache_fini (void);
-extern "C" void rtl_arena_fini (void);
+extern "C" void rtl_cache_init (void);
+namespace
+{
+    struct rtlCacheSingleton
+    {
+        rtlCacheSingleton()
+        {
+            rtl_cache_init();
+        }
+        ~rtlCacheSingleton()
+        {
+            rtl_cache_fini();
+        }
+    };
+    class theCacheSingleton
+        : public rtl::Static<rtlCacheSingleton, theCacheSingleton>{};
+}
+extern "C" void ensureCacheSingleton()
+{
+    theCacheSingleton::get();
+}
 
-struct RTL_Alloc_Fini
+extern "C" void rtl_arena_fini (void);
+extern "C" void rtl_arena_init (void);
+namespace
 {
-  ~RTL_Alloc_Fini() ;
-};
+    struct rtlArenaSingleton
+    {
+        rtlArenaSingleton()
+        {
+            rtl_arena_init();
+        }
+        ~rtlArenaSingleton()
+        {
+            rtl_arena_fini();
+        }
+    };
+    class theArenaSingleton
+        : public rtl::Static<rtlArenaSingleton, theArenaSingleton>{};
+}
+extern "C" void ensureArenaSingleton()
+{
+    theArenaSingleton::get();
+}
 
-RTL_Alloc_Fini::~RTL_Alloc_Fini()
+extern "C" void rtl_locale_fini (void);
+extern "C" void rtl_locale_init (void);
+namespace
+{
+    struct rtlLocaleSingleton
+    {
+        rtlLocaleSingleton()
+        {
+            rtl_locale_init();
+        }
+        ~rtlLocaleSingleton()
+        {
+            rtl_locale_fini();
+        }
+    };
+    class theLocaleSingleton
+        : public rtl::Static<rtlLocaleSingleton, theLocaleSingleton>{};
+}
+extern "C" void ensureLocaleSingleton()
 {
-  rtl_memory_fini();
-  rtl_cache_fini();
-  rtl_arena_fini();
+    theLocaleSingleton::get();
 }
 
-static RTL_Alloc_Fini g_RTL_Alloc_Fini;
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/alloc_global.c b/sal/rtl/source/alloc_global.c
index 5da66ca49d96..9e0ae7d1c49f 100644
--- a/sal/rtl/source/alloc_global.c
+++ b/sal/rtl/source/alloc_global.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,29 +26,47 @@
  *
  ************************************************************************/
 
-#include "rtl/alloc.h"
 #include "alloc_impl.h"
+#include "rtl/alloc.h"
+#include <sal/macros.h>
+#include <osl/diagnose.h>
 
-#ifndef INCLUDED_STRING_H
 #include <string.h>
-#define INCLUDED_STRING_H
-#endif
+#include <stdio.h>
 
 #if !defined(FORCE_SYSALLOC)
 
+typedef enum { AMode_CUSTOM, AMode_SYSTEM, AMode_UNSET } AllocMode;
+
+static AllocMode alloc_mode = AMode_UNSET;
+
+static void determine_alloc_mode(void)
+{
+   /* This shouldn't happen, but still ... */
+    if (alloc_mode != AMode_UNSET)
+        return;
+
+    if (getenv("G_SLICE") != NULL)
+    {
+        alloc_mode = AMode_SYSTEM;
+        fprintf(stderr, "LibreOffice: Using system memory allocator.\n");
+        fprintf(stderr, "LibreOffice: This is for debugging only.  To disable,\n");
+        fprintf(stderr, "LibreOffice: unset the environment variable G_SLICE.\n");
+    }
+    else
+    {
+        alloc_mode = AMode_CUSTOM;
+    }
+}
+
 /* ================================================================= *
  *
  * custom allocator includes.
  *
  * ================================================================= */
 
-#ifndef INCLUDED_STDIO_H
-#include <stdio.h>
-#define INCLUDED_STDIO_H
-#endif
 #include "internal/once.h"
 #include "sal/macros.h"
-#include "osl/diagnose.h"
 
 /* ================================================================= *
  *
@@ -72,7 +91,7 @@ static const sal_Size g_alloc_sizes[] =
 };
 
 #define RTL_MEMORY_CACHED_LIMIT 4 * 4096
-#define RTL_MEMORY_CACHED_SIZES (sizeof(g_alloc_sizes) / sizeof(g_alloc_sizes[0]))
+#define RTL_MEMORY_CACHED_SIZES (SAL_N_ELEMENTS(g_alloc_sizes))
 
 static rtl_cache_type * g_alloc_caches[RTL_MEMORY_CACHED_SIZES] =
 {
@@ -89,106 +108,7 @@ static rtl_cache_type * g_alloc_table[RTL_MEMORY_CACHED_LIMIT >> RTL_MEMALIGN_SH
 
 static rtl_arena_type * gp_alloc_arena = 0;
 
-/* ================================================================= *
- *
- * custom allocator initialization / finalization.
- *
- * ================================================================= */
-
-static void
-rtl_memory_once_init (void)
-{
-    {
-        /* global memory arena */
-        OSL_ASSERT(gp_alloc_arena == 0);
-
-        gp_alloc_arena = rtl_arena_create (
-            "rtl_alloc_arena",
-            2048,     /* quantum */
-            0,        /* w/o quantum caching */
-            0,        /* default source */
-            rtl_arena_alloc,
-            rtl_arena_free,
-            0         /* flags */
-        );
-        OSL_ASSERT(gp_alloc_arena != 0);
-    }
-    {
-        sal_Size size;
-        int i, n = RTL_MEMORY_CACHED_SIZES;
-
-        for (i = 0; i < n; i++)
-        {
-            char name[RTL_CACHE_NAME_LENGTH + 1];
-            (void) snprintf (name, sizeof(name), "rtl_alloc_%lu", g_alloc_sizes[i]);
-            g_alloc_caches[i] = rtl_cache_create (name, g_alloc_sizes[i], 0, NULL, NULL, NULL, NULL, NULL, 0);
-        }
-
-        size = RTL_MEMALIGN;
-        for (i = 0; i < n; i++)
-        {
-            while (size <= g_alloc_sizes[i])
-            {
-                g_alloc_table[(size - 1) >> RTL_MEMALIGN_SHIFT] = g_alloc_caches[i];
-                size += RTL_MEMALIGN;
-            }
-        }
-    }
-}
-
-static int
-rtl_memory_init (void)
-{
-    static sal_once_type g_once = SAL_ONCE_INIT;
-    SAL_ONCE(&g_once, rtl_memory_once_init);
-    return (gp_alloc_arena != 0);
-}
-
-/* ================================================================= */
-
-/*
-  Issue http://udk.openoffice.org/issues/show_bug.cgi?id=92388
-
-  Mac OS X does not seem to support "__cxa__atexit", thus leading
-  to the situation that "__attribute__((destructor))__" functions
-  (in particular "rtl_{memory|cache|arena}_fini") become called
-  _before_ global C++ object d'tors.
-
-  Delegated the call to "rtl_memory_fini()" into a dummy C++ object,
-  see alloc_fini.cxx .
-*/
-#if defined(__GNUC__) && !defined(MACOSX)
-static void rtl_memory_fini (void) __attribute__((destructor));
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma fini(rtl_memory_fini)
-static void rtl_memory_fini (void);
-#endif /* __GNUC__ || __SUNPRO_C */
-
-void
-rtl_memory_fini (void)
-{
-    int i, n;
-
-    /* clear g_alloc_table */
-    memset (g_alloc_table, 0, sizeof(g_alloc_table));
-
-    /* cleanup g_alloc_caches */
-    for (i = 0, n = RTL_MEMORY_CACHED_SIZES; i < n; i++)
-    {
-        if (g_alloc_caches[i] != 0)
-        {
-            rtl_cache_destroy (g_alloc_caches[i]);
-            g_alloc_caches[i] = 0;
-        }
-    }
-
-    /* cleanup gp_alloc_arena */
-    if (gp_alloc_arena != 0)
-    {
-        rtl_arena_destroy (gp_alloc_arena);
-        gp_alloc_arena = 0;
-    }
-}
+extern void ensureMemorySingleton();
 
 /* ================================================================= *
  *
@@ -197,7 +117,7 @@ rtl_memory_fini (void)
  * ================================================================= */
 
 void *
-SAL_CALL rtl_allocateMemory (sal_Size n) SAL_THROW_EXTERN_C()
+SAL_CALL rtl_allocateMemory_CUSTOM (sal_Size n) SAL_THROW_EXTERN_C()
 {
     void * p = 0;
     if (n > 0)
@@ -225,7 +145,8 @@ try_alloc:
         }
         else if (gp_alloc_arena == 0)
         {
-            if (rtl_memory_init())
+            ensureMemorySingleton();
+            if (gp_alloc_arena)
             {
                 /* try again */
                 goto try_alloc;
@@ -237,7 +158,7 @@ try_alloc:
 
 /* ================================================================= */
 
-void SAL_CALL rtl_freeMemory (void * p) SAL_THROW_EXTERN_C()
+void SAL_CALL rtl_freeMemory_CUSTOM (void * p) SAL_THROW_EXTERN_C()
 {
     if (p != 0)
     {
@@ -253,7 +174,7 @@ void SAL_CALL rtl_freeMemory (void * p) SAL_THROW_EXTERN_C()
 
 /* ================================================================= */
 
-void * SAL_CALL rtl_reallocateMemory (void * p, sal_Size n) SAL_THROW_EXTERN_C()
+void * SAL_CALL rtl_reallocateMemory_CUSTOM (void * p, sal_Size n) SAL_THROW_EXTERN_C()
 {
     if (n > 0)
     {
@@ -281,18 +202,86 @@ void * SAL_CALL rtl_reallocateMemory (void * p, sal_Size n) SAL_THROW_EXTERN_C()
     return (p);
 }
 
-#else  /* FORCE_SYSALLOC */
+#endif
 
 /* ================================================================= *
  *
- * system allocator includes.
+ * custom allocator initialization / finalization.
  *
  * ================================================================= */
 
-#ifndef INCLUDED_STDLIB_H
-#include <stdlib.h>
-#define INCLUDED_STDLIB_H
+void rtl_memory_init (void)
+{
+#if !defined(FORCE_SYSALLOC)
+    {
+        /* global memory arena */
+        OSL_ASSERT(gp_alloc_arena == 0);
+
+        gp_alloc_arena = rtl_arena_create (
+            "rtl_alloc_arena",
+            2048,     /* quantum */
+            0,        /* w/o quantum caching */
+            0,        /* default source */
+            rtl_arena_alloc,
+            rtl_arena_free,
+            0         /* flags */
+        );
+        OSL_ASSERT(gp_alloc_arena != 0);
+    }
+    {
+        sal_Size size;
+        int i, n = RTL_MEMORY_CACHED_SIZES;
+
+        for (i = 0; i < n; i++)
+        {
+            char name[RTL_CACHE_NAME_LENGTH + 1];
+            (void) snprintf (name, sizeof(name), "rtl_alloc_%lu", g_alloc_sizes[i]);
+            g_alloc_caches[i] = rtl_cache_create (name, g_alloc_sizes[i], 0, NULL, NULL, NULL, NULL, NULL, 0);
+        }
+
+        size = RTL_MEMALIGN;
+        for (i = 0; i < n; i++)
+        {
+            while (size <= g_alloc_sizes[i])
+            {
+                g_alloc_table[(size - 1) >> RTL_MEMALIGN_SHIFT] = g_alloc_caches[i];
+                size += RTL_MEMALIGN;
+            }
+        }
+    }
 #endif
+    OSL_TRACE("rtl_memory_init completed");
+}
+
+/* ================================================================= */
+
+void rtl_memory_fini (void)
+{
+#if !defined(FORCE_SYSALLOC)
+    int i, n;
+
+    /* clear g_alloc_table */
+    memset (g_alloc_table, 0, sizeof(g_alloc_table));
+
+    /* cleanup g_alloc_caches */
+    for (i = 0, n = RTL_MEMORY_CACHED_SIZES; i < n; i++)
+    {
+        if (g_alloc_caches[i] != 0)
+        {
+            rtl_cache_destroy (g_alloc_caches[i]);
+            g_alloc_caches[i] = 0;
+        }
+    }
+
+    /* cleanup gp_alloc_arena */
+    if (gp_alloc_arena != 0)
+    {
+        rtl_arena_destroy (gp_alloc_arena);
+        gp_alloc_arena = 0;
+    }
+#endif
+    OSL_TRACE("rtl_memory_fini completed");
+}
 
 /* ================================================================= *
  *
@@ -300,34 +289,88 @@ void * SAL_CALL rtl_reallocateMemory (void * p, sal_Size n) SAL_THROW_EXTERN_C()
  *
  * ================================================================= */
 
-void * SAL_CALL rtl_allocateMemory (sal_Size n)
+void * SAL_CALL rtl_allocateMemory_SYSTEM (sal_Size n)
 {
     return malloc (n);
 }
 
 /* ================================================================= */
 
-void SAL_CALL rtl_freeMemory (void * p)
+void SAL_CALL rtl_freeMemory_SYSTEM (void * p)
 {
     free (p);
 }
 
 /* ================================================================= */
 
-void * SAL_CALL rtl_reallocateMemory (void * p, sal_Size n)
+void * SAL_CALL rtl_reallocateMemory_SYSTEM (void * p, sal_Size n)
 {
     return realloc (p, n);
 }
 
 /* ================================================================= */
 
-void
-rtl_memory_fini (void)
+void* SAL_CALL rtl_allocateMemory (sal_Size n) SAL_THROW_EXTERN_C()
 {
-    /* nothing to do */
+#if !defined(FORCE_SYSALLOC)
+    while (1)
+    {
+        if (alloc_mode == AMode_CUSTOM)
+        {
+            return rtl_allocateMemory_CUSTOM(n);
+        }
+        if (alloc_mode == AMode_SYSTEM)
+        {
+            return rtl_allocateMemory_SYSTEM(n);
+        }
+        determine_alloc_mode();
+    }
+#else
+    return rtl_allocateMemory_SYSTEM(n);
+#endif
 }
 
-#endif /* FORCE_SYSALLOC */
+void* SAL_CALL rtl_reallocateMemory (void * p, sal_Size n) SAL_THROW_EXTERN_C()
+{
+#if !defined(FORCE_SYSALLOC)
+    while (1)
+    {
+        if (alloc_mode == AMode_CUSTOM)
+        {
+            return rtl_reallocateMemory_CUSTOM(p,n);
+        }
+        if (alloc_mode == AMode_SYSTEM)
+        {
+            return rtl_reallocateMemory_SYSTEM(p,n);
+        }
+        determine_alloc_mode();
+    }
+#else
+    return rtl_reallocateMemory_SYSTEM(p,n);
+#endif
+}
+
+void SAL_CALL rtl_freeMemory (void * p) SAL_THROW_EXTERN_C()
+{
+#if !defined(FORCE_SYSALLOC)
+    while (1)
+    {
+        if (alloc_mode == AMode_CUSTOM)
+        {
+            rtl_freeMemory_CUSTOM(p);
+            return;
+        }
+        if (alloc_mode == AMode_SYSTEM)
+        {
+            rtl_freeMemory_SYSTEM(p);
+            return;
+        }
+        determine_alloc_mode();
+    }
+#else
+    rtl_freeMemory_SYSTEM(p);
+#endif
+}
 
 /* ================================================================= *
  *
@@ -355,3 +398,5 @@ void SAL_CALL rtl_freeZeroMemory (void * p, sal_Size n) SAL_THROW_EXTERN_C()
 }
 
 /* ================================================================= */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/alloc_impl.h b/sal/rtl/source/alloc_impl.h
index a95b7c47465c..a226f0607d9c 100644
--- a/sal/rtl/source/alloc_impl.h
+++ b/sal/rtl/source/alloc_impl.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -196,7 +197,7 @@ lowbit(sal_Size n)
 /** rtl_memory_lock_type
  *  (platform dependent)
  */
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
 
 #include <unistd.h>
 #include <pthread.h>
@@ -269,3 +270,5 @@ typedef CRITICAL_SECTION rtl_memory_lock_type;
 #endif
 
 #endif /* INCLUDED_RTL_ALLOC_IMPL_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index cc7d3336c2d2..6e3836b08356 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,7 +50,7 @@
 
 #include "macro.hxx"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <list>
 
 #define MY_STRING_(x) # x
@@ -272,7 +273,7 @@ static OUString & getIniFileName_Impl()
             && fileName.copy(fileName.getLength() - progExt.getLength()).equalsIgnoreAsciiCase(progExt))
                 fileName = fileName.copy(0, fileName.getLength() - progExt.getLength());
 
-            progExt = OUString::createFromAscii(".exe");
+            progExt = OUString(RTL_CONSTASCII_USTRINGPARAM(".exe"));
             if(fileName.getLength() > progExt.getLength()
             && fileName.copy(fileName.getLength() - progExt.getLength()).equalsIgnoreAsciiCase(progExt))
                 fileName = fileName.copy(0, fileName.getLength() - progExt.getLength());
@@ -311,9 +312,6 @@ inline void EnsureNoFinalSlash (rtl::OUString & url)
     }
 }
 
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
 struct Bootstrap_Impl
 {
     sal_Int32 _nRefCount;
@@ -355,7 +353,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
 {
     OUString base_ini( getIniFileName_Impl() );
     // normalize path
-    FileStatus status( FileStatusMask_FileURL );
+    FileStatus status( osl_FileStatus_Mask_FileURL );
     DirectoryItem dirItem;
     if (DirectoryItem::E_None == DirectoryItem::get( base_ini, dirItem ) &&
         DirectoryItem::E_None == dirItem.getFileStatus( status ))
@@ -603,15 +601,10 @@ void Bootstrap_Impl::expandValue(
              requestFile, requestKey, requestStack)).pData);
 }
 
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
 namespace {
 
 struct bootstrap_map {
-    // map<> may be preferred here, but hash_map<> is implemented fully inline,
-    // thus there is no need to link against the stlport:
-    typedef std::hash_map<
+    typedef boost::unordered_map<
         rtl::OUString, Bootstrap_Impl *,
         rtl::OUStringHash, std::equal_to< rtl::OUString >,
         rtl::Allocator< OUString > > t;
@@ -652,7 +645,7 @@ rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open (
     OUString iniName( pIniName );
 
     // normalize path
-    FileStatus status( FileStatusMask_FileURL );
+    FileStatus status( osl_FileStatus_Mask_FileURL );
     DirectoryItem dirItem;
     if (DirectoryItem::E_None != DirectoryItem::get( iniName, dirItem ) ||
         DirectoryItem::E_None != dirItem.getFileStatus( status ))
@@ -984,7 +977,7 @@ rtl::OUString expandMacros(
                         rtl::OUString line;
                         rtl::OUString url;
                         // Silently ignore any errors (is that good?):
-                        if (f.open(OpenFlag_Read) == osl::FileBase::E_None &&
+                        if (f.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None &&
                             f.readLine(seq) == osl::FileBase::E_None &&
                             rtl_convertStringToUString(
                                 &line.pData,
@@ -1000,7 +993,7 @@ rtl::OUString expandMacros(
                             try {
                                 buf.append(
                                     rtl::Uri::convertRelToAbs(seg[1], url));
-                            } catch (rtl::MalformedUriException &) {}
+                            } catch (const rtl::MalformedUriException &) {}
                         }
                     } else {
                         buf.append(
@@ -1057,3 +1050,5 @@ rtl::OUString expandMacros(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/byteseq.c b/sal/rtl/source/byteseq.c
index 42b905a8d78f..52c81d8df375 100644
--- a/sal/rtl/source/byteseq.c
+++ b/sal/rtl/source/byteseq.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -252,3 +253,5 @@ sal_Int32 SAL_CALL rtl_byte_sequence_getLength( sal_Sequence *pSequence )
 {
     return pSequence->nElements;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/cipher.c b/sal/rtl/source/cipher.c
index cb11f93cb8e4..e6ede4274af6 100644
--- a/sal/rtl/source/cipher.c
+++ b/sal/rtl/source/cipher.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,7 +26,7 @@
  *
  ************************************************************************/
 
-#define _RTL_CIPHER_C_ "$Revision: 1.5 $"
+#define _RTL_CIPHER_C_
 
 #include <sal/types.h>
 #include <rtl/alloc.h>
@@ -905,7 +906,6 @@ static void __rtl_cipherBF_updateCFB (
         sal_uInt8 c = iv[k];
         iv[k] = *pData;
         *pBuffer = *pData ^ c;
-        c = 0;
     }
 
     ctx->m_offset = ((k + 1) & 0x07);
@@ -1361,3 +1361,5 @@ void SAL_CALL rtl_cipher_destroyARCFOUR (rtlCipher Cipher)
             rtl_freeMemory (pImpl);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/cmdargs.cxx b/sal/rtl/source/cmdargs.cxx
index dc14cf59d031..ed44843b11cc 100644
--- a/sal/rtl/source/cmdargs.cxx
+++ b/sal/rtl/source/cmdargs.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -107,3 +108,5 @@ sal_uInt32 SAL_CALL rtl_getAppCommandArgCount (void)
     init();
     return g_nCommandArgCount;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/crc.c b/sal/rtl/source/crc.c
index d8fd53c3b330..fa372aaf4339 100644
--- a/sal/rtl/source/crc.c
+++ b/sal/rtl/source/crc.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,7 +26,7 @@
  *
  ************************************************************************/
 
-#define _RTL_CRC_C_ "$Revision: 1.3 $"
+#define _RTL_CRC_C_
 
 #include <sal/types.h>
 #include <rtl/crc.h>
@@ -162,3 +163,4 @@ sal_uInt32 SAL_CALL rtl_crc32 (
     return Crc;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/debugprint.cxx b/sal/rtl/source/debugprint.cxx
index 9b86ca077446..079643b07fd4 100644
--- a/sal/rtl/source/debugprint.cxx
+++ b/sal/rtl/source/debugprint.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,16 +29,24 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
+#include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
 
 const sal_Char *dbg_dump(const rtl::OString &rStr)
 {
-    static rtl::OStringBuffer aStr;
+    return rStr.getStr();
+}
 
-    aStr = rtl::OStringBuffer(rStr);
-    aStr.append(static_cast<char>(0));
-    return aStr.getStr();
+const sal_Char *dbg_dump(const rtl::OStringBuffer &rStrBuf)
+{
+    return rStrBuf.getStr();
+}
+
+const sal_Char *dbg_dump(rtl_String *pStr)
+{
+    return rtl_string_getStr(pStr);
 }
 
 const sal_Char *dbg_dump(const rtl::OUString &rStr)
@@ -45,9 +54,9 @@ const sal_Char *dbg_dump(const rtl::OUString &rStr)
     return dbg_dump(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8));
 }
 
-const sal_Char *dbg_dump(rtl_String *pStr)
+const sal_Char *dbg_dump(const rtl::OUStringBuffer &rStrBuf)
 {
-    return dbg_dump(rtl::OString(pStr));
+    return dbg_dump(rtl::OUString(rStrBuf.getStr()));
 }
 
 const sal_Char *dbg_dump(rtl_uString *pStr)
@@ -55,4 +64,4 @@ const sal_Char *dbg_dump(rtl_uString *pStr)
     return dbg_dump(rtl::OUString(pStr));
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/digest.c b/sal/rtl/source/digest.c
index 1d07fdbdc167..92736cf4dd95 100644
--- a/sal/rtl/source/digest.c
+++ b/sal/rtl/source/digest.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,7 +26,7 @@
  *
  ************************************************************************/
 
-#define _RTL_DIGEST_C_ "$Revision: 1.9 $"
+#define _RTL_DIGEST_C_
 
 #include <sal/types.h>
 #include <sal/macros.h>
@@ -706,7 +707,7 @@ static void __rtl_digest_endMD5 (DigestContextMD5 *ctx)
         case 0: X[i]  = ((sal_uInt32)(*(p++))) <<  0L;
         case 1: X[i] |= ((sal_uInt32)(*(p++))) <<  8L;
         case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L;
-        case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L;
+        case 3: X[i] |= ((sal_uInt32)(*p)) << 24L;
     }
 
     i += 1;
@@ -2116,3 +2117,5 @@ rtlDigestError SAL_CALL rtl_digest_PBKDF2 (
  * The End.
  *
  *======================================================================*/
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/hash.cxx b/sal/rtl/source/hash.cxx
index 7caa2341ca11..4e03dfc2a6d7 100644
--- a/sal/rtl/source/hash.cxx
+++ b/sal/rtl/source/hash.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,67 +28,162 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include "rtl/allocator.hxx"
 
 #include "hash.h"
 #include "strimp.h"
+#include <osl/diagnose.h>
+#include <sal/macros.h>
 
+struct StringHashTableImpl {
+    sal_uInt32    nEntries;
+    sal_uInt32    nSize;
+    rtl_uString **pData;
+};
 
-#include <hash_set>
+typedef StringHashTableImpl StringHashTable;
 
-namespace {
+// Only for use in the implementation
+static StringHashTable *rtl_str_hash_new (sal_uInt32 nSize);
+static void rtl_str_hash_free (StringHashTable *pHash);
 
-struct UStringHash
+StringHashTable *
+getHashTable ()
 {
-    size_t operator()(rtl_uString * const &rString) const
-    { return (size_t)rtl_ustr_hashCode_WithLength( rString->buffer, rString->length ); }
-};
+    static StringHashTable *pInternPool = NULL;
+    if (pInternPool == NULL) {
+        static StringHashTable* pHash = rtl_str_hash_new(1024);
+        pInternPool = pHash;
+    }
+    return pInternPool;
+}
+
+// Better / smaller / faster hash set ....
 
-struct UStringEqual
+// TODO: add bottom bit-set list terminator to string list
+
+static sal_uInt32
+getNextSize (sal_uInt32 nSize)
 {
-    sal_Bool operator() ( rtl_uString * const &pStringA,
-                          rtl_uString * const &pStringB) const
+    // Sedgewick - Algorithms in C P577.
+    static const sal_uInt32 nPrimes[] = { 1021, 2039, 4093, 8191, 16381, 32749,
+                                          65521, 131071,262139, 524287, 1048573,
+                                          2097143, 4194301, 8388593, 16777213,
+                                          33554393, 67108859, 134217689 };
+
+    for (sal_uInt32 i = 0; i < SAL_N_ELEMENTS(nPrimes); i++)
     {
-        if (pStringA == pStringB)
-            return true;
-        if (pStringA->length != pStringB->length)
-            return false;
-        return !rtl_ustr_compare_WithLength( pStringA->buffer, pStringA->length,
-                                             pStringB->buffer, pStringB->length);
+        if (nPrimes[i] > nSize)
+            return nPrimes[i];
     }
-};
+    return nSize * 2;
+}
 
-typedef std::hash_set< rtl_uString *, UStringHash, UStringEqual,
-                       rtl::Allocator<rtl_uString *> > StringHashTable;
+static sal_uInt32
+hashString (rtl_uString *pString)
+{
+    return (sal_uInt32) rtl_ustr_hashCode_WithLength (pString->buffer,
+                                                      pString->length);
+}
 
-StringHashTable *
-getHashTable ()
+static StringHashTable *
+rtl_str_hash_new (sal_uInt32 nSize)
 {
-    static StringHashTable *pInternPool = NULL;
-    if (pInternPool == NULL) {
-        static StringHashTable aImpl(1024);
-        pInternPool = &aImpl;
+    StringHashTable *pHash = (StringHashTable *)malloc (sizeof (StringHashTable));
+
+    pHash->nEntries = 0;
+    pHash->nSize = getNextSize (nSize);
+    pHash->pData = (rtl_uString **) calloc (sizeof (rtl_uString *), pHash->nSize);
+
+    return pHash;
+}
+
+static void
+rtl_str_hash_free (StringHashTable *pHash)
+{
+    if (!pHash)
+        return;
+    if (pHash->pData)
+        free (pHash->pData);
+    free (pHash);
+}
+
+static void
+rtl_str_hash_insert_nonequal (StringHashTable   *pHash,
+                              rtl_uString       *pString)
+{
+    sal_uInt32  nHash = hashString (pString);
+    sal_uInt32  n;
+
+    n = nHash % pHash->nSize;
+    while (pHash->pData[n] != NULL) {
+        n++;
+        if (n >= pHash->nSize)
+            n = 0;
     }
-    return pInternPool;
+    pHash->pData[n] = pString;
+}
+
+static void
+rtl_str_hash_resize (sal_uInt32        nNewSize)
+{
+    sal_uInt32 i;
+    StringHashTable *pNewHash;
+    StringHashTable *pHash = getHashTable();
+
+    OSL_ASSERT (nNewSize > pHash->nEntries);
+
+    pNewHash = rtl_str_hash_new (nNewSize);
+
+    for (i = 0; i < pHash->nSize; i++)
+    {
+        if (pHash->pData[i] != NULL)
+            rtl_str_hash_insert_nonequal (pNewHash, pHash->pData[i]);
+    }
+    pNewHash->nEntries = pHash->nEntries;
+    free (pHash->pData);
+    *pHash = *pNewHash;
+    pNewHash->pData = NULL;
+    rtl_str_hash_free (pNewHash);
 }
 
+static int
+compareEqual (rtl_uString *pStringA, rtl_uString *pStringB)
+{
+    if (pStringA == pStringB)
+        return 1;
+    if (pStringA->length != pStringB->length)
+        return 0;
+    return !rtl_ustr_compare_WithLength( pStringA->buffer, pStringA->length,
+                                         pStringB->buffer, pStringB->length);
 }
 
-extern "C" {
 
 rtl_uString *
 rtl_str_hash_intern (rtl_uString       *pString,
                      int                can_return)
 {
+    sal_uInt32  nHash = hashString (pString);
+    sal_uInt32  n;
+    rtl_uString *pHashStr;
+
     StringHashTable *pHash = getHashTable();
-    StringHashTable::iterator aIter;
-    aIter = pHash->find(pString);
-    if (aIter != pHash->end())
-    {
-        rtl_uString *pHashStr = *aIter;
-        rtl_uString_acquire (pHashStr);
-        return pHashStr;
+
+    // Should we resize ?
+    if (pHash->nEntries >= pHash->nSize/2)
+        rtl_str_hash_resize (getNextSize(pHash->nSize));
+
+    n = nHash % pHash->nSize;
+    while ((pHashStr = pHash->pData[n]) != NULL) {
+        if (compareEqual (pHashStr, pString))
+        {
+            rtl_uString_acquire (pHashStr);
+            return pHashStr;
+        }
+        n++;
+        if (n >= pHash->nSize)
+            n = 0;
     }
+
     if (!can_return)
     {
         rtl_uString *pCopy = NULL;
@@ -99,7 +195,8 @@ rtl_str_hash_intern (rtl_uString       *pString,
 
     if (!SAL_STRING_IS_STATIC (pString))
         pString->refCount |= SAL_STRING_INTERN_FLAG;
-    pHash->insert(pString);
+    pHash->pData[n] = pString;
+    pHash->nEntries++;
 
     return pString;
 }
@@ -107,7 +204,39 @@ rtl_str_hash_intern (rtl_uString       *pString,
 void
 rtl_str_hash_remove (rtl_uString       *pString)
 {
-    getHashTable()->erase(pString);
-}
+    sal_uInt32   n;
+    sal_uInt32   nHash = hashString (pString);
+    rtl_uString *pHashStr;
+
+    StringHashTable *pHash = getHashTable();
 
+    n = nHash % pHash->nSize;
+    while ((pHashStr = pHash->pData[n]) != NULL) {
+        if (compareEqual (pHashStr, pString))
+            break;
+        n++;
+        if (n >= pHash->nSize)
+            n = 0;
+    }
+    OSL_ASSERT (pHash->pData[n] != 0);
+    if (pHash->pData[n] == NULL)
+        return;
+
+    pHash->pData[n++] = NULL;
+    pHash->nEntries--;
+
+    if (n >= pHash->nSize)
+        n = 0;
+
+    while ((pHashStr = pHash->pData[n]) != NULL) {
+        pHash->pData[n] = NULL;
+        // FIXME: rather unsophisticated and N^2 in chain-length, but robust.
+        rtl_str_hash_insert_nonequal (pHash, pHashStr);
+        n++;
+        if (n >= pHash->nSize)
+            n = 0;
+    }
+    // FIXME: Should we down-size ?
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/hash.h b/sal/rtl/source/hash.h
index 2aadfb33efcd..6a6518833dfd 100644
--- a/sal/rtl/source/hash.h
+++ b/sal/rtl/source/hash.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef INCLUDED_RTL_SOURCE_HASH_H
 #define INCLUDED_RTL_SOURCE_HASH_H
 
@@ -19,3 +20,5 @@ void             rtl_str_hash_remove (rtl_uString       *pString);
 #endif /* __cplusplus */
 
 #endif /* INCLUDED_RTL_SOURCE_HASH_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/locale.c b/sal/rtl/source/locale.c
index 89a8568f8478..2885b4cc4b68 100644
--- a/sal/rtl/source/locale.c
+++ b/sal/rtl/source/locale.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,8 +58,6 @@ static RTL_HASHTABLE* g_pLocaleTable = NULL;
 
 static rtl_Locale* g_pDefaultLocale = NULL;
 
-static int rtl_locale_init (void);
-
 /*************************************************************************
  */
 void rtl_hashentry_destroy(RTL_HASHENTRY* entry)
@@ -227,29 +226,15 @@ sal_Bool rtl_hashtable_find(RTL_HASHTABLE * table, sal_Int32 key, sal_Int32 hash
 /*************************************************************************
  *  rtl_locale_init
  */
-static void rtl_locale_once_init (void)
+void rtl_locale_init (void)
 {
   OSL_ASSERT(g_pLocaleTable == 0);
   rtl_hashtable_init(&g_pLocaleTable, 1);
 }
 
-static int rtl_locale_init (void)
-{
-  static sal_once_type g_once = SAL_ONCE_INIT;
-  SAL_ONCE(&g_once, rtl_locale_once_init);
-  return (g_pLocaleTable != 0);
-}
-
 /*************************************************************************
  *  rtl_locale_fini
  */
-#if defined(__GNUC__)
-static void rtl_locale_fini (void) __attribute__((destructor));
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma fini(rtl_locale_fini)
-static void rtl_locale_fini (void);
-#endif /* __GNUC__ || __SUNPRO_C */
-
 void rtl_locale_fini (void)
 {
   if (g_pLocaleTable != 0)
@@ -259,6 +244,8 @@ void rtl_locale_fini (void)
   }
 }
 
+extern void ensureLocaleSingleton();
+
 /*************************************************************************
  *  rtl_locale_register
  */
@@ -277,7 +264,8 @@ rtl_Locale * SAL_CALL rtl_locale_register( const sal_Unicode * language, const s
     if ( !variant )
         variant = &c;
 
-    if (!rtl_locale_init())
+    ensureLocaleSingleton();
+    if (!g_pLocaleTable)
       return NULL;
 
     hashCode = rtl_ustr_hashCode(language) ^ rtl_ustr_hashCode(country) ^ rtl_ustr_hashCode(variant);
@@ -360,3 +348,5 @@ sal_Int32 SAL_CALL rtl_locale_equals( rtl_Locale * This, rtl_Locale * obj  )
 {
     return This == obj;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/logfile.cxx b/sal/rtl/source/logfile.cxx
index 56d5e5d5d68e..f71d8f5be689 100644
--- a/sal/rtl/source/logfile.cxx
+++ b/sal/rtl/source/logfile.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,17 +35,14 @@
 
 #include <rtl/logfile.h>
 #include <osl/process.h>
-#ifndef _OSL_FILE_H_
 #include <osl/time.h>
-#endif
 #include <osl/time.h>
 #include <osl/mutex.hxx>
 #include <rtl/bootstrap.h>
 #include <rtl/ustring.hxx>
-#ifndef _RTL_STRBUF_HXX_
 #include <rtl/ustrbuf.hxx>
-#endif
 #include <rtl/alloc.h>
+#include <rtl/instance.hxx>
 #include "osl/thread.h"
 
 #include <algorithm>
@@ -53,10 +51,12 @@
 #define vsnprintf _vsnprintf
 #endif
 
-using namespace rtl;
 using namespace osl;
 using namespace std;
 
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
 namespace {
 
 static oslFileHandle g_aFile = 0;
@@ -91,19 +91,14 @@ LoggerGuard::~LoggerGuard()
 // g_buffer in init():
 LoggerGuard loggerGuard;
 
-Mutex & getLogMutex()
+namespace
 {
-    static Mutex *pMutex = 0;
-    if( !pMutex )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pMutex )
-        {
-            static Mutex mutex;
-            pMutex = &mutex;
-        }
-    }
-    return *pMutex;
+    class theLogMutex : public rtl::Static<osl::Mutex, theLogMutex>{};
+}
+
+static Mutex & getLogMutex()
+{
+    return theLogMutex::get();
 }
 
 OUString getFileUrl( const OUString &name )
@@ -252,3 +247,5 @@ extern "C" sal_Bool SAL_CALL rtl_logfile_hasLogFile( void ) {
     init();
     return g_buffer != 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx
index 3fa0fbe58f42..09c802ee8271 100644
--- a/sal/rtl/source/macro.hxx
+++ b/sal/rtl/source/macro.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,8 +35,6 @@
 
 #if defined WIN32
 #define THIS_OS "Windows"
-#elif defined OS2
-#define THIS_OS "OS2"
 #elif defined SOLARIS
 #define THIS_OS "Solaris"
 #elif defined LINUX
@@ -44,12 +43,22 @@
 #else
 #define THIS_OS "Linux"
 #endif
+#elif defined ANDROID
+#define THIS_OS "Android"
 #elif defined MACOSX
 #define THIS_OS "MacOSX"
+#elif defined IOS
+#define THIS_OS "iOS"
 #elif defined NETBSD
 #define THIS_OS "NetBSD"
 #elif defined FREEBSD
 #define THIS_OS "FreeBSD"
+#elif defined AIX
+#define THIS_OS "AIX"
+#elif defined OPENBSD
+#define THIS_OS "OpenBSD"
+#elif defined DRAGONFLY
+#define THIS_OS "DragonFly"
 #endif
 
 #if ! defined THIS_OS
@@ -104,7 +113,4 @@ this is inserted for the case that the preprocessor ignores error
 
 #endif
 
-
-
-
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk
index 145aa50b8be0..2f1f610a5330 100644
--- a/sal/rtl/source/makefile.mk
+++ b/sal/rtl/source/makefile.mk
@@ -36,10 +36,6 @@ PROJECTPCH4DLL=TRUE
 PROJECTPCH=cont_pch
 PROJECTPCHSOURCE=cont_pch
 
-.IF "$(GUI)" == "OS2"
-STL_OS2_BUILDING=1
-.ENDIF
-
 TARGETTYPE=CUI
 
 # --- Settings -----------------------------------------------------
@@ -60,13 +56,11 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 # --- Files --------------------------------------------------------
 
-# safe that way: gen_makefile doesn't want it,
-# no other link target here
-UWINAPILIB:=
-
 .IF "$(header)" == ""
 
+.IF "$(OS)" != "AIX"
 ALWAYSDBGFILES=$(SLO)$/debugprint.obj
+.ENDIF
 
 .IF "$(ALWAYSDBGFILES)" != ""
 ALWAYSDBGTARGET=do_it_alwaysdebug
@@ -98,14 +92,9 @@ SLOFILES=   \
             $(SLO)$/math.obj        \
             $(SLO)$/alloc_global.obj\
             $(SLO)$/alloc_cache.obj \
-            $(SLO)$/alloc_arena.obj
-
-.IF "$(OS)"=="MACOSX"
-SLOFILES+=$(SLO)$/alloc_fini.obj
-.ENDIF
-
+            $(SLO)$/alloc_arena.obj \
+            $(SLO)$/alloc_fini.obj
 
-#.IF "$(UPDATER)"=="YES"
 OBJFILES=   \
             $(OBJ)$/memory.obj      \
             $(OBJ)$/cipher.obj      \
@@ -131,36 +120,9 @@ OBJFILES=   \
             $(OBJ)$/math.obj \
             $(OBJ)$/alloc_global.obj\
             $(OBJ)$/alloc_cache.obj \
-            $(OBJ)$/alloc_arena.obj
-
-.IF "$(OS)"=="MACOSX"
-OBJFILES+=$(OBJ)$/alloc_fini.obj
-.ENDIF
-
+            $(OBJ)$/alloc_arena.obj \
+            $(OBJ)$/alloc_fini.obj
 
-APP1TARGET=gen_makefile
-APP1OBJS=$(SLO)$/gen_makefile.obj
-APP1LIBSALCPPRT=
-APP1RPATH=NONE
-
-# --- Extra objs ----------------------------------------------------
-
-.IF "$(OS)"=="LINUX" || "$(OS)"=="OS2"
-
-#
-# This part builds a second version of alloc.c, with 
-# FORCE_SYSALLOC defined. Is later used in util/makefile.mk
-# to build a tiny replacement lib to LD_PRELOAD into the 
-# office, enabling e.g. proper valgrinding.
-#
-
-SECOND_BUILD=SYSALLOC
-SYSALLOC_SLOFILES=	$(SLO)$/alloc_global.obj
-SYSALLOCCDEFS+=-DFORCE_SYSALLOC
-
-.ENDIF # .IF "$(OS)"=="LINUX"
-
-#.ENDIF
 
 .ENDIF
 
@@ -198,6 +160,6 @@ $(ALWAYSDBGFILES):
 
 ALLTAR : $(BOOTSTRAPMK)
 
-$(BOOTSTRAPMK) : $(APP1TARGETN)
-    $(AUGMENT_LIBRARY_PATH) $< > $@
-
+$(BOOTSTRAPMK) :
+    (echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) >$(BOOTSTRAPMK).c
+    $(CC) -E $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(BOOTSTRAPMK).c | $(GREP) '^RTL_' | $(SED) -e 's/"//g' >$@
diff --git a/sal/rtl/source/math.cxx b/sal/rtl/source/math.cxx
index 34b940a301c9..1aee95642936 100644
--- a/sal/rtl/source/math.cxx
+++ b/sal/rtl/source/math.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1223,11 +1224,11 @@ double SAL_CALL rtl_math_erfc( double x ) SAL_THROW_EXTERN_C()
  */
 double SAL_CALL rtl_math_asinh( double fX ) SAL_THROW_EXTERN_C()
 {
-    double fSign = 1.0;
     if ( fX == 0.0 )
         return 0.0;
     else
     {
+        double fSign = 1.0;
         if ( fX < 0.0 )
         {
             fX = - fX;
@@ -1263,3 +1264,5 @@ double SAL_CALL rtl_math_acosh( double fX ) SAL_THROW_EXTERN_C()
     else
         return log( 2.0*fX);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/memory.c b/sal/rtl/source/memory.c
index a92d4201bd32..070b7898d413 100644
--- a/sal/rtl/source/memory.c
+++ b/sal/rtl/source/memory.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,3 +61,4 @@ void* SAL_CALL rtl_findInMemory(const void *MemA, sal_uInt8 ch, sal_Size Bytes)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/random.c b/sal/rtl/source/random.c
index 3ee911942684..101c7dffdbec 100644
--- a/sal/rtl/source/random.c
+++ b/sal/rtl/source/random.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,7 +26,7 @@
  *
  ************************************************************************/
 
-#define _RTL_RANDOM_C_ "$Revision: 1.6 $"
+#define _RTL_RANDOM_C_
 
 #include <sal/types.h>
 #include <osl/thread.h>
@@ -336,3 +337,4 @@ rtlRandomError SAL_CALL rtl_random_getBytes (
     return rtl_Random_E_None;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/rtl_process.c b/sal/rtl/source/rtl_process.c
index d70c92c17cee..0845f46f5723 100644
--- a/sal/rtl/source/rtl_process.c
+++ b/sal/rtl/source/rtl_process.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,4 @@ void SAL_CALL rtl_getGlobalProcessId( sal_uInt8 *pTargetUUID )
     memcpy( pTargetUUID , pUuid , 16 );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/strbuf.c b/sal/rtl/source/strbuf.c
index 09dd83f8b32f..47fd5c8b51ed 100644
--- a/sal/rtl/source/strbuf.c
+++ b/sal/rtl/source/strbuf.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -145,3 +146,4 @@ void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This,
     }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/strimp.c b/sal/rtl/source/strimp.c
index 993969700a88..ae75249fb4aa 100644
--- a/sal/rtl/source/strimp.c
+++ b/sal/rtl/source/strimp.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,5 @@ sal_Bool rtl_ImplIsWhitespace( sal_Unicode c )
 
     return sal_False;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/strimp.h b/sal/rtl/source/strimp.h
index 533b7087a652..3db89cec8145 100644
--- a/sal/rtl/source/strimp.h
+++ b/sal/rtl/source/strimp.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,5 @@ sal_Bool rtl_ImplIsWhitespace( sal_Unicode c );
 #endif /* __cplusplus */
 
 #endif /* INCLUDED_RTL_SOURCE_STRIMP_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/string.c b/sal/rtl/source/string.c
index c0f9a33c218b..2ee79611218a 100644
--- a/sal/rtl/source/string.c
+++ b/sal/rtl/source/string.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -178,7 +179,7 @@ sal_Bool SAL_CALL rtl_impl_convertUStringToString(rtl_String ** pTarget,
     OSL_ASSERT(pTarget != NULL
                && (pSource != NULL || nLength == 0)
                && nLength >= 0
-               && rtl_isOctetTextEncoding(nEncoding));
+               && (nLength == 0 || rtl_isOctetTextEncoding(nEncoding)));
 
     if ( !nLength )
         rtl_string_new( pTarget );
@@ -318,3 +319,5 @@ sal_Bool SAL_CALL rtl_convertUStringToString(rtl_String ** pTarget,
     return rtl_impl_convertUStringToString(pTarget, pSource, nLength, nEncoding,
                                            nFlags, sal_True);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/strtmpl.c b/sal/rtl/source/strtmpl.c
index 8c60583b14cc..bf3f4fd44600 100644
--- a/sal/rtl/source/strtmpl.c
+++ b/sal/rtl/source/strtmpl.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1565,3 +1566,5 @@ sal_Int32 SAL_CALL IMPL_RTL_STRINGNAME( getToken )( IMPL_RTL_STRINGDATA** ppThis
             return -1;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/surrogates.h b/sal/rtl/source/surrogates.h
index 48fe4182ad46..c686e181047a 100644
--- a/sal/rtl/source/surrogates.h
+++ b/sal/rtl/source/surrogates.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,3 +49,5 @@
      ((low) - SAL_RTL_FIRST_LOW_SURROGATE) + 0x10000)
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/tres.c b/sal/rtl/source/tres.c
index 85e5c4367066..2cf429c6a49c 100644
--- a/sal/rtl/source/tres.c
+++ b/sal/rtl/source/tres.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -684,3 +685,4 @@ rtl_cmpstate SAL_CALL rtl_tres_getnextcmpstate( rtl_cmpstate cstate)
 //} // </method_logPrintf>
  */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/unload.cxx b/sal/rtl/source/unload.cxx
index ba31bd9c86f9..2690973b7f28 100644
--- a/sal/rtl/source/unload.cxx
+++ b/sal/rtl/source/unload.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,8 +31,9 @@
 #include <rtl/unload.h>
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
+#include <rtl/instance.hxx>
 #include <osl/mutex.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include "rtl/allocator.hxx"
 
 #include <functional>
@@ -108,19 +110,14 @@ static sal_Bool hasEnoughTimePassed( const TimeValue* unusedSince, const TimeVal
     return retval;
 }
 
-static osl::Mutex* getUnloadingMutex()
+namespace
 {
-    static osl::Mutex * g_pMutex= NULL;
-    if (!g_pMutex)
-    {
-        MutexGuard guard( osl::Mutex::getGlobalMutex() );
-        if (!g_pMutex)
-        {
-            static osl::Mutex g_aMutex;
-            g_pMutex= &g_aMutex;
-        }
-    }
-    return g_pMutex;
+    class theUnloadingMutex : public rtl::Static<osl::Mutex, theUnloadingMutex>{};
+}
+
+static osl::Mutex& getUnloadingMutex()
+{
+    return theUnloadingMutex::get();
 }
 
 extern "C" void rtl_moduleCount_acquire(rtl_ModuleCount * that )
@@ -156,7 +153,7 @@ struct hashModule
     }
 };
 
-typedef std::hash_map<
+typedef boost::unordered_map<
     oslModule,
     std::pair<sal_uInt32, component_canUnloadFunc>,
     hashModule,
@@ -305,7 +302,7 @@ struct hashListener
     }
 };
 
-typedef std::hash_map<
+typedef boost::unordered_map<
     sal_Int32,
     std::pair<rtl_unloadingListenerFunc, void*>,
     hashListener,
@@ -415,3 +412,5 @@ static void rtl_notifyUnloadingListeners()
         callbackFunc( it->second.second);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/uri.cxx b/sal/rtl/source/uri.cxx
index 551c4f199251..928614eb32ce 100644
--- a/sal/rtl/source/uri.cxx
+++ b/sal/rtl/source/uri.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,6 +43,7 @@
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
+#include "sal/macros.h"
 
 #include <cstddef>
 
@@ -197,7 +199,7 @@ sal_uInt32 readUcs4(sal_Unicode const ** pBegin, sal_Unicode const * pEnd,
                 sal_Size nConverted;
                 sal_Size nDstSize = rtl_convertTextToUnicode(
                     aConverter, 0, aBuf.getStr(), aBuf.getLength(), aDst,
-                    sizeof aDst / sizeof aDst[0],
+                    SAL_N_ELEMENTS( aDst ),
                     (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR
                      | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
                      | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR),
@@ -360,7 +362,7 @@ struct Component
     sal_Unicode const * pBegin;
     sal_Unicode const * pEnd;
 
-    inline Component(): pBegin(0) {}
+    inline Component(): pBegin(0), pEnd(0) {}
 
     inline bool isPresent() const { return pBegin != 0; }
 
@@ -591,7 +593,7 @@ sal_Bool const * SAL_CALL rtl_getUriCharClass(rtl_UriCharClass eCharClass)
     OSL_ENSURE(
         (eCharClass >= 0
          && (sal::static_int_cast< std::size_t >(eCharClass)
-             < sizeof aCharClass / sizeof aCharClass[0])),
+             < SAL_N_ELEMENTS(aCharClass))),
         "bad eCharClass");
     return aCharClass[eCharClass];
 }
@@ -797,3 +799,5 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef,
     rtl_uString_assign(pResult, aBuffer.makeStringAndClear().pData);
     return true;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/ustrbuf.c b/sal/rtl/source/ustrbuf.c
index d9fdb9983fb1..3b05eb258c90 100644
--- a/sal/rtl/source/ustrbuf.c
+++ b/sal/rtl/source/ustrbuf.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -206,3 +207,4 @@ void SAL_CALL rtl_uStringbuffer_insert_ascii(   /*inout*/rtl_uString ** This,
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/ustring.c b/sal/rtl/source/ustring.c
index b0bdd2d98e73..feb597547ae1 100644
--- a/sal/rtl/source/ustring.c
+++ b/sal/rtl/source/ustring.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -551,7 +552,7 @@ static void rtl_string2UString_status( rtl_uString** ppThis,
                                        sal_uInt32 nCvtFlags,
                                        sal_uInt32 *pInfo )
 {
-    OSL_ENSURE(rtl_isOctetTextEncoding(eTextEncoding),
+    OSL_ENSURE(nLen == 0 || rtl_isOctetTextEncoding(eTextEncoding),
                "rtl_string2UString_status() - Wrong TextEncoding" );
 
     if ( !nLen )
@@ -800,6 +801,29 @@ void SAL_CALL rtl_uString_intern( rtl_uString ** newStr,
     }
 }
 
+static int rtl_canGuessUOutputLength( int len, rtl_TextEncoding eTextEncoding )
+{
+    // FIXME: Maybe we should use a bit flag in the higher bits of the
+    // eTextEncoding value itself to determine the encoding type.  But if we
+    // do, be sure to mask the value in certain places that expect the values
+    // to be numbered serially from 0 and up.  One such place is
+    // Impl_getTextEncodingData().
+
+    switch ( eTextEncoding )
+    {
+        // 1 to 1 (with no zero elements)
+        case RTL_TEXTENCODING_IBM_437:
+        case RTL_TEXTENCODING_IBM_850:
+        case RTL_TEXTENCODING_IBM_860:
+        case RTL_TEXTENCODING_IBM_861:
+        case RTL_TEXTENCODING_IBM_863:
+        case RTL_TEXTENCODING_IBM_865:
+            return len;
+        break;
+    }
+    return 0;
+}
+
 void SAL_CALL rtl_uString_internConvert( rtl_uString   ** newStr,
                                          const sal_Char * str,
                                          sal_Int32        len,
@@ -817,6 +841,7 @@ void SAL_CALL rtl_uString_internConvert( rtl_uString   ** newStr,
 
     if ( len < 256 )
     { // try various optimisations
+        sal_Int32 ulen;
         if ( len < 0 )
             len = strlen( str );
         if ( eTextEncoding == RTL_TEXTENCODING_ASCII_US )
@@ -836,6 +861,28 @@ void SAL_CALL rtl_uString_internConvert( rtl_uString   ** newStr,
             rtl_ustring_intern_internal( newStr, pScratch, CANNOT_RETURN );
             return;
         }
+        else if ( (ulen = rtl_canGuessUOutputLength(len, eTextEncoding)) != 0 )
+        {
+            rtl_uString *pScratch;
+            rtl_TextToUnicodeConverter hConverter;
+            sal_Size nSrcBytes;
+            sal_uInt32 nInfo;
+
+            pScratch = alloca( sizeof(rtl_uString) + ulen * sizeof (IMPL_RTL_STRCODE) );
+
+            hConverter = rtl_createTextToUnicodeConverter( eTextEncoding );
+            rtl_convertTextToUnicode(
+                hConverter, 0, str, len, pScratch->buffer, ulen, convertFlags, &nInfo, &nSrcBytes );
+            rtl_destroyTextToUnicodeConverter( hConverter );
+
+            if (pInfo)
+                *pInfo = nInfo;
+
+            pScratch->length = ulen;
+            rtl_ustring_intern_internal( newStr, pScratch, CANNOT_RETURN );
+            return;
+        }
+
         /* FIXME: we want a nice UTF-8 / alloca shortcut here */
     }
 
@@ -932,3 +979,5 @@ sal_Bool rtl_convertStringToUString(
     rtl_string2UString_status(target, source, length, encoding, flags, &info);
     return (sal_Bool) ((info & RTL_TEXTTOUNICODE_INFO_ERROR) == 0);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/uuid.cxx b/sal/rtl/source/uuid.cxx
index 79790c99887e..7be3847e6902 100644
--- a/sal/rtl/source/uuid.cxx
+++ b/sal/rtl/source/uuid.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -178,3 +179,4 @@ extern "C" sal_Int32 SAL_CALL rtl_compareUuid( const sal_uInt8 *pUUID1 , const s
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/kill/kill.cxx b/sal/systools/win32/kill/kill.cxx
deleted file mode 100644
index ec1379ccfa6b..000000000000
--- a/sal/systools/win32/kill/kill.cxx
+++ /dev/null
@@ -1,443 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-
-#include <tchar.h>
-
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#endif
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <tlhelp32.h>
-#include <psapi.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <signal.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#ifndef SIGNULL
-#define SIGNULL 0
-#endif
-
-#ifndef SIGKILL
-#define SIGKILL 9
-#endif
-
-#include <signal.h>
-
-#define MAX_MODULES 1024
-
-/////////////////////////////////////////////////////////////////////////////
-// Determines if a returned handle value is valid
-/////////////////////////////////////////////////////////////////////////////
-
-static inline bool IsValidHandle( HANDLE handle )
-{
-    return INVALID_HANDLE_VALUE != handle && NULL != handle;
-}
-
-
-#define elementsof( a ) (sizeof(a) / sizeof( (a)[0] ))
-
-/////////////////////////////////////////////////////////////////////////////
-// Retrieves function adress in another process
-/////////////////////////////////////////////////////////////////////////////
-
-#if 1
-#define GetProcAddressEx( hProcess, hModule, lpProcName ) GetProcAddress( hModule, lpProcName )
-#else
-FARPROC WINAPI GetProcAddressEx( HANDLE hProcess, HMODULE hModule, LPCSTR lpProcName )
-{
-    FARPROC lpfnProcAddress = GetProcAddress( hModule, lpProcName );
-
-    if ( lpfnProcAddress )
-    {
-        DWORD   dwProcessId = GetProcessId( hProcess );
-
-        if ( GetCurrentProcessId() != dwProcessId )
-        {
-            FARPROC lpfnRemoteProcAddress = NULL;
-            TCHAR   szBaseName[MAX_PATH];
-
-            if ( GetModuleBaseName( GetCurrentProcess(), hModule, szBaseName, elementsof(szBaseName) ) )
-            {
-                HMODULE ahModules[MAX_MODULES];
-                DWORD   cbNeeded = 0;
-
-                if ( EnumProcessModules( hProcess, ahModules, sizeof(ahModules), &cbNeeded ) )
-                {
-                    ULONG   nModules = cbNeeded / sizeof(ahModules[0]);
-
-                    for ( ULONG n = 0; n < nModules; n++ )
-                    {
-                        TCHAR   szRemoteBaseName[MAX_PATH];
-
-                        if ( GetModuleBaseName(
-                            hProcess, ahModules[n], szRemoteBaseName, elementsof(szRemoteBaseName) ) &&
-                            0 == lstrcmpi( szRemoteBaseName, szBaseName )
-                            )
-                        {
-                            lpfnRemoteProcAddress = lpfnProcAddress;
-
-                            if ( ahModules[n] != hModule )
-                                *(LPBYTE*)&lpfnRemoteProcAddress += (LPBYTE)ahModules[n] - (LPBYTE)hModule;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            lpfnProcAddress = lpfnRemoteProcAddress;
-        }
-    }
-
-    return lpfnProcAddress;
-}
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// Raises a signal in an other process
-/////////////////////////////////////////////////////////////////////////////
-
-static DWORD SignalToExceptionCode( int signal )
-{
-    switch ( signal )
-    {
-    case SIGSEGV:
-        return EXCEPTION_ACCESS_VIOLATION;
-    case SIGFPE:
-        return EXCEPTION_FLT_INVALID_OPERATION;
-    case SIGILL:
-        return EXCEPTION_ILLEGAL_INSTRUCTION;
-    case SIGINT:
-        return CONTROL_C_EXIT;
-    case SIGBREAK:
-        return CONTROL_C_EXIT;
-    default:
-        return 0;
-    }
-}
-
-static BOOL RaiseSignalEx( HANDLE hProcess, int sig )
-{
-    DWORD   dwProcessId = GetProcessId( hProcess );
-
-    HANDLE  hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 );
-    HANDLE  hThread = 0;
-    BOOL fSuccess = FALSE;
-
-    if ( IsValidHandle(hSnapshot) )
-    {
-        THREADENTRY32   te;
-
-        te.dwSize = sizeof(te);
-        fSuccess = Thread32First( hSnapshot, &te );
-        while ( fSuccess )
-        {
-            if ( te.th32OwnerProcessID == dwProcessId )
-            {
-                hThread = OpenThread(
-                    THREAD_SUSPEND_RESUME | THREAD_QUERY_INFORMATION |
-                    THREAD_GET_CONTEXT | THREAD_SET_CONTEXT,
-                    FALSE, te.th32ThreadID );
-                if ( IsValidHandle(hThread) )
-                    break;
-            }
-
-            fSuccess = Thread32Next( hSnapshot, &te );
-        }
-
-        CloseHandle( hSnapshot );
-    }
-
-    if ( fSuccess )
-    {
-        CONTEXT aContext;
-
-        if ( SuspendThread( hThread ) != (DWORD)-1 )
-        {
-            ZeroMemory( &aContext, sizeof(aContext) );
-            aContext.ContextFlags = CONTEXT_FULL;
-
-            fSuccess = GetThreadContext( hThread, &aContext );
-
-            if ( fSuccess )
-            {
-                if ( sig )
-                {
-                    DWORD   dwStackBuffer[] =
-                    {
-                        aContext.Eip,
-                        SignalToExceptionCode( sig ),
-                        EXCEPTION_NONCONTINUABLE,
-                        0,
-                        0
-                    };
-
-                    aContext.Esp -= sizeof(dwStackBuffer);
-                    WriteProcessMemory( hProcess, (LPVOID)aContext.Esp, dwStackBuffer, sizeof(dwStackBuffer), NULL );
-                    aContext.Eip = (DWORD)GetProcAddressEx( hProcess, GetModuleHandleA("KERNEL32"), "RaiseException" );
-                }
-                else
-                {
-                    aContext.Ecx = aContext.Eax = aContext.Ebx = aContext.Edx = aContext.Esi = aContext.Edi = 0;
-                }
-
-                fSuccess = SetThreadContext( hThread, &aContext );
-            }
-
-            fSuccess = ResumeThread( hThread ) && fSuccess;
-
-            DWORD   dwLastError = GetLastError();
-            CloseHandle( hThread );
-            SetLastError( dwLastError );
-
-            return fSuccess;
-        }
-    }
-
-    return FALSE;
-}
-/////////////////////////////////////////////////////////////////////////////
-// Command line parameter parsing
-/////////////////////////////////////////////////////////////////////////////
-
-static void ParseCommandArgs( LPDWORD lpProcesses, LPDWORD lpdwNumProcesses, int *pSig )
-{
-    typedef struct _SignalEntry
-    {
-        LPCTSTR lpSignalName;
-        int iSignalValue;
-    } SignalEntry;
-
-    #define SIG_ENTRY( signal ) { TEXT(#signal), SIG##signal }
-
-    static SignalEntry SupportedSignals[] =
-    {
-        SIG_ENTRY( NULL ),
-        SIG_ENTRY( SEGV ),
-        SIG_ENTRY( ILL ),
-        SIG_ENTRY( FPE ),
-        SIG_ENTRY( INT ),
-        SIG_ENTRY( BREAK ),
-        SIG_ENTRY( TERM ),
-        SIG_ENTRY( ABRT ),
-        SIG_ENTRY( KILL )
-    };
-
-    const int NumSupportedSignals = elementsof(SupportedSignals);
-
-    DWORD   dwMaxProcesses = *lpdwNumProcesses;
-    int     argc = __argc;
-    TCHAR   **argv = __targv;
-
-    *lpdwNumProcesses = 0;
-
-    for ( int argn = 1; argn < argc; argn++ )
-    {
-        if ( 0 == lstrcmpi( argv[argn], TEXT("-l") ) ||
-             0 == lstrcmpi( argv[argn], TEXT("/l") ) )
-
-        {
-            for ( int n = 0; n < NumSupportedSignals; n++ )
-            {
-                _tprintf( _T("%s "), SupportedSignals[n].lpSignalName );
-            }
-            _tprintf( _T("\n") );
-            ExitProcess( 0 );
-        }
-        else if ( 0 == lstrcmpi( argv[argn], TEXT("-?") ) ||
-                  0 == lstrcmpi( argv[argn], TEXT("/?") ) ||
-                  0 == lstrcmpi( argv[argn], TEXT("-h") ) ||
-                  0 == lstrcmpi( argv[argn], TEXT("/h") ) ||
-                  0 == lstrcmpi( argv[argn], TEXT("--help") ) )
-        {
-            _tprintf(
-                _T("Terminates a process by sending a signal.\n\n")
-                _T("Usage: kill [ -l ] [ -signal ] pid ...\n\n")
-                _T("-l        Lists supported signals\n")
-                _T("-signal   Sends the specified signal to the given processes.\n")
-                _T("          signal can be a numeric value specifying the signal number\n")
-                _T("          or a string listed by the -l parameter. If no signal is\n")
-                _T("          given SIGTERM (-TERM) is used.\n")
-                _T("pid       Process id(s) or executables names(s) of processes to \n")
-                _T("          signal or terminate.\n\n")
-                );
-            ExitProcess( 0 );
-        }
-        else if ( argv[argn] && ( *argv[argn] == '-' || *argv[argn] == '/' ) )
-        {
-            LPCTSTR argsig = CharNext( argv[argn] );
-
-            int n;
-            for ( n = 0; n < NumSupportedSignals; n++ )
-            {
-                _TCHAR *endptr = NULL;
-
-                if ( 0 == lstrcmpi( SupportedSignals[n].lpSignalName, argsig ) ||
-                     _tcstoul( argsig, &endptr, 0 ) == static_cast< unsigned >(SupportedSignals[n].iSignalValue) && (!endptr || !*endptr) )
-                {
-                    *pSig = SupportedSignals[n].iSignalValue;
-                    break;
-                }
-            }
-
-            if ( n >= NumSupportedSignals )
-            {
-                _ftprintf( stderr,
-                    _T("kill: Illegal argument %s\n")
-                    _T("Type 'kill --help' to show allowed syntax.\n")
-                    _T("Type 'kill -l' to show supported signals.\n"),
-                    argv[argn] );
-                ExitProcess( 0 );
-            }
-        }
-        else
-        {
-            unsigned long value = 0;
-            _TCHAR  *endptr = NULL;
-
-            value = _tcstoul( argv[argn], &endptr, 0 );
-
-            if ( !endptr || !*endptr )
-            {
-                if ( *lpdwNumProcesses < dwMaxProcesses )
-                {
-                    *(lpProcesses++) = value;
-                    (*lpdwNumProcesses)++;
-                }
-            }
-            else
-            {
-                HANDLE  hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
-
-                if ( IsValidHandle( hSnapshot ) )
-                {
-                    PROCESSENTRY32  pe;
-
-                    pe.dwSize = sizeof(pe);
-                    BOOL fSuccess = Process32First( hSnapshot, &pe );
-
-                    while ( fSuccess )
-                    {
-                        if ( 0 == lstrcmpi( argv[argn], pe.szExeFile ) )
-                        {
-                            if ( *lpdwNumProcesses < dwMaxProcesses )
-                            {
-                                *(lpProcesses++) = pe.th32ProcessID;
-                                (*lpdwNumProcesses)++;
-                            }
-                        }
-                        fSuccess = Process32Next( hSnapshot, &pe );
-                    }
-
-                    CloseHandle( hSnapshot );
-                }
-            }
-        }
-    }
-
-    if ( !*lpdwNumProcesses )
-    {
-        _ftprintf( stderr,
-            _T("kill: No process specified.\n")
-            _T("Use kill --help to show allowed syntax.\n")
-            );
-        ExitProcess( 0 );
-    }
-
-}
-
-void OutputSystemMessage( DWORD dwErrorCode )
-{
-    LPVOID lpMsgBuf;
-    FormatMessageA(
-                    FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                    FORMAT_MESSAGE_FROM_SYSTEM |
-                    FORMAT_MESSAGE_IGNORE_INSERTS,
-                    NULL,
-                    dwErrorCode,
-                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-                    (LPSTR)&lpMsgBuf,
-                    0,
-                    NULL
-                );
-
-    printf( (LPSTR)lpMsgBuf );
-    LocalFree( lpMsgBuf );
-}
-
-int _tmain()
-{
-    DWORD   dwProcessIds[1024];
-    DWORD   nProcesses = elementsof(dwProcessIds);
-    int     sig = SIGTERM;
-
-
-    ParseCommandArgs( dwProcessIds, &nProcesses, &sig );
-
-    for ( ULONG n = 0; n < nProcesses; n++ )
-    {
-        HANDLE  hProcess;
-
-        _tprintf( _T("Sending signal to process id %d..."), dwProcessIds[n] );
-        hProcess = OpenProcess( PROCESS_TERMINATE | PROCESS_CREATE_THREAD | SYNCHRONIZE |
-            PROCESS_QUERY_INFORMATION | PROCESS_VM_OPERATION | PROCESS_VM_WRITE | PROCESS_VM_READ,
-            FALSE, dwProcessIds[n] );
-
-        if ( IsValidHandle( hProcess ) )
-        {
-            if ( SIGKILL == sig )
-                TerminateProcess( hProcess, 255 );
-            else
-            {
-                if ( RaiseSignalEx( hProcess, sig ) )
-                    _tprintf( _T("OK\n") );
-                else
-                {
-                    OutputSystemMessage( GetLastError() );
-                }
-            }
-
-            CloseHandle( hProcess );
-        }
-        else
-        {
-            OutputSystemMessage( GetLastError() );
-        }
-    }
-
-    return 0;
-}
-
diff --git a/sal/systools/win32/kill/makefile.mk b/sal/systools/win32/kill/makefile.mk
deleted file mode 100644
index 3bb961bd1123..000000000000
--- a/sal/systools/win32/kill/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sal
-TARGET=kill
-LIBTARGET=NO
-DYNAMIC_CRT=
-ENABLE_EXCEPTIONS=TRUE
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(COM)"=="GCC"
-CDEFS=-D_WIN32_WINNT=0x0501
-.ENDIF
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-UWINAPILIB=
-
-OBJFILES=\
-    $(OBJ)$/kill.obj
-    
-APP1NOSAL=TRUE
-APP1OBJS=$(OBJFILES)
-APP1TARGET=$(TARGET)
-
-STDLIB1=
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/sal/systools/win32/onlineupdate/makefile.mk b/sal/systools/win32/onlineupdate/makefile.mk
index f09b01bb3145..027ddef11192 100644..100755
--- a/sal/systools/win32/onlineupdate/makefile.mk
+++ b/sal/systools/win32/onlineupdate/makefile.mk
@@ -66,11 +66,7 @@ DEF1DEPN=\
 
 SHL1OBJS=$(SLOFILES)
 
-#No default libraries
-#STDSHL=
-
 SHL1STDLIBS=\
-        $(UNICOWSLIB)\
         $(KERNEL32LIB)\
         $(LIBCMT)\
         $(WININETLIB)
diff --git a/sal/systools/win32/onlineupdate/onlinecheck.cxx b/sal/systools/win32/onlineupdate/onlinecheck.cxx
index f0d85d915b6c..650db4a6fabe 100644
--- a/sal/systools/win32/onlineupdate/onlinecheck.cxx
+++ b/sal/systools/win32/onlineupdate/onlinecheck.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,6 +33,7 @@
 #endif
 
 #include <sal/types.h>
+#include <sal/macros.h>
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -41,11 +43,6 @@
 #define _UNICODE
 #endif
 #include <tchar.h>
-#ifdef __MINGW32__
-#include <excpt.h>
-#endif
-
-#define elementsof(a) (sizeof(a)/sizeof((a)[0]))
 
 // #i71984
 extern "C" sal_Bool SAL_CALL hasInternetConnection()
@@ -53,30 +50,22 @@ extern "C" sal_Bool SAL_CALL hasInternetConnection()
     DWORD   dwFlags;
     TCHAR   szConnectionName[1024];
 
-#ifdef __MINGW32__
-        jmp_buf jmpbuf;
-        __SEHandler han;
-        if (__builtin_setjmp(jmpbuf) == 0)
-        {
-        han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER);
-#else
+#ifndef __MINGW32__
     __try {
 #endif
     BOOL fIsConnected = InternetGetConnectedStateEx(
         &dwFlags,
         szConnectionName,
-        elementsof(szConnectionName),
+        SAL_N_ELEMENTS(szConnectionName),
         0 );
 
     return fIsConnected ? sal_True : sal_False;
 
-#ifdef __MINGW32__
-        }
-        else return sal_False;
-        han.Reset();
-#else
+#ifndef __MINGW32__
     } __except( EXCEPTION_EXECUTE_HANDLER ) {
         return sal_False;
     }
 #endif
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/CheckTokenMembership.cpp b/sal/systools/win32/uwinapi/CheckTokenMembership.cpp
index b3a30c4b3f31..7c825cf60697 100644
--- a/sal/systools/win32/uwinapi/CheckTokenMembership.cpp
+++ b/sal/systools/win32/uwinapi/CheckTokenMembership.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,3 +33,5 @@
 
 
 DEFINE_DEFAULT_THUNK( advapi32, TRYLOAD, BOOL, WINAPI, CheckTokenMembership, (HANDLE TokenHandle, PSID SidToCheck, PBOOL IsMember) )
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp b/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp
index 282e1aa6b283..1385c0bb6411 100644
--- a/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp
+++ b/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -169,4 +170,5 @@ IMPLEMENT_THUNK( shell32, WINDOWS, LPWSTR *, WINAPI, CommandLineToArgvW, ( LPCWS
     }
 
     return lpArgvW;
-}
\ No newline at end of file
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/CopyFileExA.cpp b/sal/systools/win32/uwinapi/CopyFileExA.cpp
index 9369a6deee60..f694fb3420f6 100644
--- a/sal/systools/win32/uwinapi/CopyFileExA.cpp
+++ b/sal/systools/win32/uwinapi/CopyFileExA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -164,4 +165,5 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExA, ( LPCSTR lpExisti
     }
 
     return fSuccess;
-}
\ No newline at end of file
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/CopyFileExW.cpp b/sal/systools/win32/uwinapi/CopyFileExW.cpp
index 73870beb1754..08165707dc54 100644
--- a/sal/systools/win32/uwinapi/CopyFileExW.cpp
+++ b/sal/systools/win32/uwinapi/CopyFileExW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,4 +38,5 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExW, ( LPCWSTR lpExist
     AUTO_WSTR2STR( lpNewFileName );
 
     return CopyFileExA( lpExistingFileNameA, lpNewFileNameA, lpProgressRoutine, lpData, pbCancel, dwCopyFlags );
-}
\ No newline at end of file
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp
index c2d23c3d0064..260a95b27157 100644
--- a/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp
+++ b/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,4 +31,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, DeleteVolumeMountPointA, (LPCSTR lpszVolumeMountPoint) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, DeleteVolumeMountPointA, (LPCSTR lpszVolumeMountPoint) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp
index 1b98ab0b56db..60eae2a5e3b8 100644
--- a/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp
+++ b/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,4 +31,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, DeleteVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, DeleteVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DllGetVersion.cpp b/sal/systools/win32/uwinapi/DllGetVersion.cpp
index cb21d82f3885..f1eee397d24e 100644
--- a/sal/systools/win32/uwinapi/DllGetVersion.cpp
+++ b/sal/systools/win32/uwinapi/DllGetVersion.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,3 +72,5 @@ extern "C" HRESULT CALLBACK DllGetVersion( DLLVERSIONINFO *pdvi )
 
     return fSuccess ? HRESULT_FROM_WIN32( GetLastError() ) : HRESULT_FROM_WIN32( NO_ERROR );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DllMain.cpp b/sal/systools/win32/uwinapi/DllMain.cpp
index 94f6c34fec24..d856dbd4b28d 100644
--- a/sal/systools/win32/uwinapi/DllMain.cpp
+++ b/sal/systools/win32/uwinapi/DllMain.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -233,3 +234,5 @@ extern "C" BOOL WINAPI DllMain( HMODULE hModule, DWORD dwReason, LPVOID )
     }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DrawStateW.cpp b/sal/systools/win32/uwinapi/DrawStateW.cpp
index 9143131b3bab..99d14f22d43b 100644
--- a/sal/systools/win32/uwinapi/DrawStateW.cpp
+++ b/sal/systools/win32/uwinapi/DrawStateW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,5 @@ IMPLEMENT_THUNK( user32, WINDOWS, BOOL, WINAPI, DrawStateW,
         return DrawStateA( hdc, hbr, lpOutputFunc, lData, wData, x, y, cx, cy, fuFlags );
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/EnumProcesses.cpp b/sal/systools/win32/uwinapi/EnumProcesses.cpp
index b98541ff1f40..228ecddf1cda 100644
--- a/sal/systools/win32/uwinapi/EnumProcesses.cpp
+++ b/sal/systools/win32/uwinapi/EnumProcesses.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include "macros.h"
 #include <tlhelp32.h>
 
@@ -39,3 +40,4 @@ IMPLEMENT_THUNK( psapi, WINDOWS, BOOL, WINAPI, EnumProcesses, ( LPDWORD lpProces
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp
index b174623b3d4f..035c3c1e4007 100644
--- a/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp
+++ b/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp
index 436eb9c84428..ee54d434e5b1 100644
--- a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp
+++ b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ extern "C" _declspec( dllexport ) FARPROC kernel32_FindFirstVolumeMountPointA_Pt
 static HANDLE __stdcall FindFirstVolumeMountPointA_Failure (LPSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength)
 { SetLastError( 120L ); return (HANDLE)0; }
 */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp
index 54f4d7307970..6bdb6b20360b 100644
--- a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp
+++ b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,5 @@ DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPoi
 #else
 DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointW, (LPCWSTR lpszRootPathName, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp
index f6444c8e97df..2bef40a6cc5e 100644
--- a/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp
+++ b/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeA.cpp b/sal/systools/win32/uwinapi/FindNextVolumeA.cpp
index 6ec46a67e28a..dfda390ea54b 100644
--- a/sal/systools/win32/uwinapi/FindNextVolumeA.cpp
+++ b/sal/systools/win32/uwinapi/FindNextVolumeA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp
index b2ad8810b1d9..67de06905bfe 100644
--- a/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp
+++ b/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeMountPointA, (HANDLE hFindVolumeMountPoint, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeMountPointA, (HANDLE hFindVolumeMountPoint, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp
index 2ff5017c2abe..b9f52cd8ac61 100644
--- a/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp
+++ b/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeMountPointW, (HANDLE hFindVolumeMountPoint, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeMountPointW, (HANDLE hFindVolumeMountPoint, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeW.cpp b/sal/systools/win32/uwinapi/FindNextVolumeW.cpp
index eb06a2755c18..e2cfc82d5491 100644
--- a/sal/systools/win32/uwinapi/FindNextVolumeW.cpp
+++ b/sal/systools/win32/uwinapi/FindNextVolumeW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeW, (HANDLE hFindVolume, LPWSTR lpszVolumeName, DWORD cchBufferLength) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeW, (HANDLE hFindVolume, LPWSTR lpszVolumeName, DWORD cchBufferLength) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindVolumeClose.cpp b/sal/systools/win32/uwinapi/FindVolumeClose.cpp
index fdee78575095..8b0ff3aa8517 100644
--- a/sal/systools/win32/uwinapi/FindVolumeClose.cpp
+++ b/sal/systools/win32/uwinapi/FindVolumeClose.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindVolumeClose, (HANDLE hFindVolume) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindVolumeClose, (HANDLE hFindVolume) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp b/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp
index f821e9c018ab..6dcdfd217a46 100644
--- a/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp
+++ b/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindVolumeMountPointClose, (HANDLE hFindVolumeMountPoint ) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindVolumeMountPointClose, (HANDLE hFindVolumeMountPoint ) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp
index a217b961de03..d33553d2df66 100644
--- a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp
+++ b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,4 @@ IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetDiskFreeSpaceExA,(
     return fSuccess;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp
index 6e6f4cbe32c5..150d9e18ed84 100644
--- a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp
+++ b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,4 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, GetDiskFreeSpaceExW,(
     return GetDiskFreeSpaceExA( lpRootPathNameA, lpFreeBytesAvailable, lpTotalNumberOfBytes, lpTotalNumberOfFreeBytes );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp b/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp
index 9f49c72d3431..9fee78298ffc 100644
--- a/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp
+++ b/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,4 +39,5 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, DWORD, WINAPI, GetLogicalDriveStringsW, ( DW
         STRBUF2WSTR( lpBuffer, (int) (dwResult + 1), (int) cchBuffer );
 
     return dwResult;
-}
\ No newline at end of file
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetLongPathName.cpp b/sal/systools/win32/uwinapi/GetLongPathName.cpp
index fc10d64ee5b0..52027646810a 100644
--- a/sal/systools/win32/uwinapi/GetLongPathName.cpp
+++ b/sal/systools/win32/uwinapi/GetLongPathName.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -111,3 +112,4 @@
     return dwResult;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetLongPathNameA.cpp b/sal/systools/win32/uwinapi/GetLongPathNameA.cpp
index d3d458ad9ae1..eef6503d046e 100644
--- a/sal/systools/win32/uwinapi/GetLongPathNameA.cpp
+++ b/sal/systools/win32/uwinapi/GetLongPathNameA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,4 +29,5 @@
 #include "macros.h"
 
 IMPLEMENT_THUNK( kernel32, WINDOWS, DWORD, WINAPI, GetLongPathNameA, ( LPCTSTR lpShortPath, LPTSTR lpLongPath, DWORD cchBuffer ) )
-#include "GetLongPathName.cpp"
\ No newline at end of file
+#include "GetLongPathName.cpp"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetLongPathNameW.cpp b/sal/systools/win32/uwinapi/GetLongPathNameW.cpp
index 42fded1195a0..b7280db13bb0 100644
--- a/sal/systools/win32/uwinapi/GetLongPathNameW.cpp
+++ b/sal/systools/win32/uwinapi/GetLongPathNameW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,3 +62,5 @@ EXTERN_C void WINAPI ResolveThunk_GetLongPathNameW( FARPROC *lppfn, LPCSTR lpLib
 
 
 DEFINE_CUSTOM_THUNK( kernel32, GetLongPathNameW, DWORD, WINAPI, GetLongPathNameW, ( LPCWSTR lpShortPathW, LPWSTR lpLongPathW, DWORD cchBuffer ) );
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp b/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp
index b66ebf6dab70..f5231b212490 100644
--- a/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp
+++ b/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include "macros.h"
 #ifdef _MSC_VER
 #pragma warning(push,1) // disable warnings within system headers
@@ -51,3 +52,4 @@ IMPLEMENT_THUNK( psapi, WINDOWS, DWORD, WINAPI, GetModuleFileNameExA, (HANDLE hP
     return dwResult;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp b/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp
index 1f952792241f..2c476731c19a 100644
--- a/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp
+++ b/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include "macros.h"
 #ifdef _MSC_VER
 #pragma warning(push,1) // disable warnings within system headers
@@ -15,4 +16,5 @@ IMPLEMENT_THUNK( psapi, WINDOWS, DWORD, WINAPI, GetModuleFileNameExW, (HANDLE hP
         return (DWORD) STR2WSTR( lpFileName, nSize );
     else
         return 0;
-}
\ No newline at end of file
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetProcessId.cpp b/sal/systools/win32/uwinapi/GetProcessId.cpp
index 10251e498ba2..0e365a040008 100644
--- a/sal/systools/win32/uwinapi/GetProcessId.cpp
+++ b/sal/systools/win32/uwinapi/GetProcessId.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,3 +163,5 @@ EXTERN_C void WINAPI ResolveThunk_GetProcessId( FARPROC *lppfn, LPCSTR lpLibFile
 
 
 DEFINE_CUSTOM_THUNK( kernel32, GetProcessId, DWORD, WINAPI, GetProcessId, ( HANDLE hProcess ) );
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp b/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp
index 843f3049a166..0947640464f6 100644
--- a/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp
+++ b/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,3 +33,4 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, LANGID, WINAPI, GetUserDefaultUILanguage,())
     return LANGIDFROMLCID(GetUserDefaultLCID());
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDomainA.cpp b/sal/systools/win32/uwinapi/GetUserDomainA.cpp
index 880e53648d91..9b2d31c17260 100644
--- a/sal/systools/win32/uwinapi/GetUserDomainA.cpp
+++ b/sal/systools/win32/uwinapi/GetUserDomainA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,4 @@ EXTERN_C void WINAPI ResolveThunk_GetUserDomainA( FARPROC *lppfn, LPCSTR lpLibFi
 
 DEFINE_CUSTOM_THUNK( kernel32, GetUserDomainA, DWORD, WINAPI, GetUserDomainA, ( LPSTR lpBuffer, DWORD nSize ) );
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDomainW.cpp b/sal/systools/win32/uwinapi/GetUserDomainW.cpp
index c49aa79da905..efb1b7b04590 100644
--- a/sal/systools/win32/uwinapi/GetUserDomainW.cpp
+++ b/sal/systools/win32/uwinapi/GetUserDomainW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,4 @@ EXTERN_C void WINAPI ResolveThunk_GetUserDomainW( FARPROC *lppfn, LPCSTR lpLibFi
 
 DEFINE_CUSTOM_THUNK( kernel32, GetUserDomainW, DWORD, WINAPI, GetUserDomainW, ( LPWSTR lpBuffer, DWORD cchBuffer ) );
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp b/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp
index 289cf80f74d5..b444dbd9bdbc 100644
--- a/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp
+++ b/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,3 +29,5 @@
 {
     return GetEnvironmentVariable( TEXT("USERDOMAIN"), lpBuffer, nSize );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp b/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp
index 20f86ab3c78d..67e7b7018f08 100644
--- a/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp
+++ b/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,3 +78,5 @@
 
     return dwResult;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp
index 9b02baa76b26..500978c79ed3 100644
--- a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp
+++ b/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumeNameForVolumeMountPointA, (LPCSTR lpszVolumeMountPoint, LPSTR lpszVolumeName, DWORD cchBufferLength) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumeNameForVolumeMountPointA, (LPCSTR lpszVolumeMountPoint, LPSTR lpszVolumeName, DWORD cchBufferLength) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp
index c3b72ba3cf02..de61fd2d93d4 100644
--- a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp
+++ b/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumeNameForVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint, LPWSTR lpszVolumeName, DWORD cchBufferLength) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumeNameForVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint, LPWSTR lpszVolumeName, DWORD cchBufferLength) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp b/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp
index 9df190b2f69c..ac63033c1989 100644
--- a/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp
+++ b/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumePathNameA, (LPCSTR lpszFileName, LPSTR lpszVolumePathName, DWORD cchBufferLength) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumePathNameA, (LPCSTR lpszFileName, LPSTR lpszVolumePathName, DWORD cchBufferLength) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp b/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp
index 8989ea4ff032..1bb585bf601d 100644
--- a/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp
+++ b/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumePathNameW, (LPCWSTR lpszFileName, LPWSTR lpszVolumePathName, DWORD cchBufferLength) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetVolumePathNameW, (LPCWSTR lpszFileName, LPWSTR lpszVolumePathName, DWORD cchBufferLength) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/MCIWndCreateW.cpp b/sal/systools/win32/uwinapi/MCIWndCreateW.cpp
index 13f334745d7b..73f58a406dcd 100644
--- a/sal/systools/win32/uwinapi/MCIWndCreateW.cpp
+++ b/sal/systools/win32/uwinapi/MCIWndCreateW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,4 +40,5 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, HWND, VFWAPIV, MCIWndCreateW,
     AUTO_WSTR2STR( lpFile );
 
     return MCIWndCreateA( hwndParent, hInstance, dwStyle, lpFileA );
-}
\ No newline at end of file
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/MoveFileExA.cpp b/sal/systools/win32/uwinapi/MoveFileExA.cpp
index e3525bbcc312..c1e6a3663576 100644
--- a/sal/systools/win32/uwinapi/MoveFileExA.cpp
+++ b/sal/systools/win32/uwinapi/MoveFileExA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,6 +27,7 @@
  ************************************************************************/
 
 #include "macros.h"
+#include <sal/macros.h>
 
 #define WININIT_FILENAME    "wininit.ini"
 #define RENAME_SECTION      "rename"
@@ -49,7 +51,7 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, MoveFileExA, ( LPCSTR lpExisti
             )
         {
             CHAR    szBuffer[32767];    // The buffer size must not exceed 32K
-            DWORD   dwBufLen = GetPrivateProfileSectionA( RENAME_SECTION, szBuffer, elementsof(szBuffer), WININIT_FILENAME );
+            DWORD   dwBufLen = GetPrivateProfileSectionA( RENAME_SECTION, szBuffer, SAL_N_ELEMENTS(szBuffer), WININIT_FILENAME );
 
             CHAR    szRename[MAX_PATH]; // This is enough for at most to times 67 chracters
             strcpy( szRename, szNewFileNameA );
@@ -57,7 +59,7 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, MoveFileExA, ( LPCSTR lpExisti
             strcat( szRename, szExistingFileNameA );
             size_t  lnRename = strlen(szRename);
 
-            if ( dwBufLen + lnRename + 2 <= elementsof(szBuffer) )
+            if ( dwBufLen + lnRename + 2 <= SAL_N_ELEMENTS(szBuffer) )
             {
                 CopyMemory( &szBuffer[dwBufLen], szRename, lnRename );
                 szBuffer[dwBufLen + lnRename ] = 0;
@@ -95,3 +97,4 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, MoveFileExA, ( LPCSTR lpExisti
     return fSuccess;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/MoveFileExW.cpp b/sal/systools/win32/uwinapi/MoveFileExW.cpp
index 134a1f4571c3..7613be22681f 100644
--- a/sal/systools/win32/uwinapi/MoveFileExW.cpp
+++ b/sal/systools/win32/uwinapi/MoveFileExW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,3 +37,4 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, MoveFileExW, ( LPCWSTR lpExist
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathAddBackslashW.cpp b/sal/systools/win32/uwinapi/PathAddBackslashW.cpp
index a6acecf6982e..089fb332c330 100644
--- a/sal/systools/win32/uwinapi/PathAddBackslashW.cpp
+++ b/sal/systools/win32/uwinapi/PathAddBackslashW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,3 +41,5 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathAddBackslashW,
     STR2WSTR(lpPath, MAX_PATH);
     return lpPathW + wcslen(lpPathW);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathCompactPathExW.cpp b/sal/systools/win32/uwinapi/PathCompactPathExW.cpp
index 8c3ad013b744..794a6fc2594d 100644
--- a/sal/systools/win32/uwinapi/PathCompactPathExW.cpp
+++ b/sal/systools/win32/uwinapi/PathCompactPathExW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,4 +44,5 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathCompactPathExW,
     BOOL bret = PathCompactPathExA(pOutA, lpPathA, cchMax, dwFlags);
     MultiByteToWideChar(CP_ACP, 0, pOutA, -1, pszOut, (int) cchMax);
     return bret;
-}
\ No newline at end of file
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathFileExistsW.cpp b/sal/systools/win32/uwinapi/PathFileExistsW.cpp
index 9cf9c513cc0a..e66a3fc01ee4 100644
--- a/sal/systools/win32/uwinapi/PathFileExistsW.cpp
+++ b/sal/systools/win32/uwinapi/PathFileExistsW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,5 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathFileExistsW,
     AUTO_WSTR2STR(lpPath);
     return PathFileExistsA(lpPathA);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathFindExtensionW.cpp b/sal/systools/win32/uwinapi/PathFindExtensionW.cpp
index 1617f3b86b5e..f218dd5b1292 100644
--- a/sal/systools/win32/uwinapi/PathFindExtensionW.cpp
+++ b/sal/systools/win32/uwinapi/PathFindExtensionW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,5 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathFindExtensionW,
     else
         return const_cast<LPWSTR>(lpPathW) + wcslen(lpPathW);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathFindFileNameW.cpp b/sal/systools/win32/uwinapi/PathFindFileNameW.cpp
index 6d9854e6102a..fdcf46b91d5e 100644
--- a/sal/systools/win32/uwinapi/PathFindFileNameW.cpp
+++ b/sal/systools/win32/uwinapi/PathFindFileNameW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathFindFileNameW,
     else
         return const_cast<LPWSTR>(lpPathW);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp b/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp
index eaf037c1dea1..22ac05f109e4 100644
--- a/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp
+++ b/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,5 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathIsFileSpecW,
     AUTO_WSTR2STR(lpPath);
     return PathIsFileSpecA(lpPathA);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathIsUNCW.cpp b/sal/systools/win32/uwinapi/PathIsUNCW.cpp
index a86c66236749..2aeb660c3ea3 100644
--- a/sal/systools/win32/uwinapi/PathIsUNCW.cpp
+++ b/sal/systools/win32/uwinapi/PathIsUNCW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,5 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathIsUNCW,
     AUTO_WSTR2STR(lpPath);
     return PathIsUNCA(lpPathA);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp b/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp
index 04a466c149bd..790ce1ce15d1 100644
--- a/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp
+++ b/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, void, WINAPI, PathRemoveExtensionW,
     PathRemoveExtensionA(lpPathA);
     STR2WSTR(lpPath, wcslen(lpPathW) + 1);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp b/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp
index 100eeedf2b6c..21bec5bd5281 100644
--- a/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp
+++ b/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,3 +41,5 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathRemoveFileSpecW,
     STR2WSTR(lpPath, wcslen(lpPathW) + 1);
     return bret;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp b/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp
index e855e674e47f..b79702c06ca0 100644
--- a/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp
+++ b/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,3 +41,5 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, void, WINAPI, PathSetDlgItemPathW,
     AUTO_WSTR2STR(lpPath);
     PathSetDlgItemPathA(hDlg, id, lpPathA);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathStripToRootW.cpp b/sal/systools/win32/uwinapi/PathStripToRootW.cpp
index bd912527a2bc..05a3ce875f96 100644
--- a/sal/systools/win32/uwinapi/PathStripToRootW.cpp
+++ b/sal/systools/win32/uwinapi/PathStripToRootW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,3 +41,5 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathStripToRootW,
     STR2WSTR(lpPath, wcslen(lpPathW) + 1);
     return bret;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/ResolveThunk.cpp b/sal/systools/win32/uwinapi/ResolveThunk.cpp
index d635b8c43b64..0f4ed5e3bb7c 100644
--- a/sal/systools/win32/uwinapi/ResolveThunk.cpp
+++ b/sal/systools/win32/uwinapi/ResolveThunk.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,4 @@ EXTERN_C void WINAPI ResolveThunk_ALLWAYS( FARPROC *lppfn, LPCSTR lpLibFileName,
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/ResolveUnicows.cpp b/sal/systools/win32/uwinapi/ResolveUnicows.cpp
index d2864d3413cb..d38e75063ccf 100644
--- a/sal/systools/win32/uwinapi/ResolveUnicows.cpp
+++ b/sal/systools/win32/uwinapi/ResolveUnicows.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifdef __MINGW32__
 #define _GDI32_
 #include "macros.h"
@@ -513,3 +514,5 @@ DEFINE_UNICOWS_THUNK( winmm, PROC, WINAPI, wglGetProcAddress, (LPCSTR) )
 DEFINE_UNICOWS_THUNK( user32, int, WINAPIV, wsprintfW, (LPWSTR,LPCWSTR,...) )
 DEFINE_UNICOWS_THUNK( user32, int, WINAPI, wvsprintfW, (LPWSTR,LPCWSTR,va_list arglist) )
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp b/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp
index e3be7348eb73..c9d28c3443e8 100644
--- a/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp
+++ b/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,4 +31,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( shell32, TRYLOAD, HRESULT, WINAPI, SHCreateItemFromParsingName, (PCWSTR pszPath, IBindCtx *pbc, REFIID riid, void **ppv) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( shell32, TRYLOAD, HRESULT, WINAPI, SHCreateItemFromParsingName, (PCWSTR pszPath, IBindCtx *pbc, REFIID riid, void **ppv) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp b/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp
index f00eae8025b6..e0ae9f35e551 100644
--- a/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp
+++ b/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include "uwinapi.h"
 
 EXTERN_C LPITEMIDLIST WINAPI SHSimpleIDListFromPathW_Failure( LPCWSTR lpPathW )
@@ -30,3 +31,5 @@ EXTERN_C void WINAPI ResolveThunk_SHSimpleIDListFromPathW( FARPROC *lppfn, LPCST
 
 
 DEFINE_CUSTOM_THUNK( kernel32, GetLongPathNameW, DWORD, WINAPI, GetLongPathNameW, ( LPCWSTR lpShortPathW, LPWSTR lpLongPathW, DWORD cchBuffer ) );
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp
index 597bdd6ca3bd..423e8238185b 100644
--- a/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp
+++ b/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, SetVolumeMountPointA, (LPCSTR lpszVolumeMountPoint, LPCSTR lpszVolumeName) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, SetVolumeMountPointA, (LPCSTR lpszVolumeMountPoint, LPCSTR lpszVolumeName) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp
index e438b742ee91..e56d3df6fa9e 100644
--- a/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp
+++ b/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,4 +28,5 @@
 
 #include "macros.h"
 
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, SetVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint, LPCWSTR lpszVolumeName) )
\ No newline at end of file
+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, SetVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint, LPCWSTR lpszVolumeName) )
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/Uwinapi.h b/sal/systools/win32/uwinapi/Uwinapi.h
index 45a8645f43e4..da3e336af1c7 100644
--- a/sal/systools/win32/uwinapi/Uwinapi.h
+++ b/sal/systools/win32/uwinapi/Uwinapi.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #pragma once
 
 #ifdef _UWINAPI_
@@ -47,11 +48,6 @@ EXTERN_C WINBASEAPI LPWSTR WINAPI lstrrchrW( LPCWSTR lpString, WCHAR c );
 #define lstrchr     lstrchrA
 #endif
 
-// macro that calculates the count of elements of a static array
-
-#define bufsizeof(buf)  (sizeof(buf) / sizeof((buf)[0]))
-
-
 #define IsValidHandle(Handle)   ((DWORD)(Handle) + 1 > 1)
 
 #ifdef __cplusplus
@@ -134,4 +130,5 @@ EXTERN_C _declspec( naked ) rettype calltype func params \
 { \
     _asm    jmp [module##_##func##_Ptr] \
 } \
-EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk;
\ No newline at end of file
+EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk;
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/macros.h b/sal/systools/win32/uwinapi/macros.h
index b75926be9d0f..91f83af1fc70 100644
--- a/sal/systools/win32/uwinapi/macros.h
+++ b/sal/systools/win32/uwinapi/macros.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,7 @@
 #   ifdef UNICODE
 #       define _UNICODE
 #   endif
-#   include <TCHAR.H>
+#   include <tchar.h>
 #endif
 
 // Globally disable "warning C4100: unreferenced formal parameter" caused by
@@ -230,3 +231,5 @@ static rettype calltype func##_##Failure params \
     return (rettype)0; \
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk
index 4893bfefae07..1ec7706b8c0d 100644
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -47,14 +47,11 @@ CXXFLAGS+= $(LFS_CFLAGS)
 CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type
 .ENDIF
 
-.IF "$(COMEX)"=="9"
-.IF "$(PSDK_HOME)"!=""
-# Since the 02/2003 PSDK the "new" linker is needed here.
-LINK=$(WRAPCMD) "$(PSDK_HOME)$/Bin$/Win64$/LINK.EXE"
-.ENDIF
-.ENDIF
+SLOFILES=
 
-SLOFILES=\
+.IF "$(CPU)"=="I" && "$(CROSS_COMPILING)"!="YES"
+
+SLOFILES+=\
         $(SLO)$/CheckTokenMembership.obj\
         $(SLO)$/CommandLineToArgvW.obj\
         $(SLO)$/CopyFileExA.obj\
@@ -79,8 +76,6 @@ SLOFILES=\
         $(SLO)$/DllMain.obj\
         $(SLO)$/ResolveThunk.obj\
         $(SLO)$/ResolveUnicows.obj\
-        $(SLO)$/snprintf.obj\
-        $(SLO)$/snwprintf.obj\
         $(SLO)$/FindFirstVolumeA.obj\
         $(SLO)$/FindFirstVolumeW.obj\
         $(SLO)$/FindNextVolumeA.obj\
@@ -111,25 +106,21 @@ SLOFILES=\
         $(SLO)$/PathSetDlgItemPathW.obj\
         $(SLO)$/PathStripToRootW.obj\
         $(SLO)$/SHCreateItemFromParsingName.obj
-        
+
+.ENDIF
+
+SLOFILES+=\
+        $(SLO)$/snprintf.obj\
+        $(SLO)$/snwprintf.obj
+
 SHL1TARGET=$(TARGET)
 SHL1IMPLIB=$(SHL1TARGET)
 SHL1DEF=$(MISC)/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
-.IF "$(COM)"=="GCC"
-DEF1EXPORTFILE=\
-    $(SHL1TARGET)_mingw.dxp\
-    unicows_mingw.dxp
-.ELSE
-DEF1EXPORTFILE=\
-    $(SHL1TARGET).dxp\
-    unicows.dxp
-.ENDIF
 DEF1DEPN=\
         $(DEF1EXPORTFILE)\
         makefile.mk
 
-#SHL1VERINFO=$(SHL1TARGET).rc
 SHL1OBJS=$(SLOFILES)
 
 #No default libraries
@@ -141,9 +132,6 @@ SHL1STDLIBS=\
         $(MINGW_LIBGCC)
 MINGWSSTDOBJ=
 MINGWSSTDENDOBJ=
-.ELSE
-SHL1STDLIBS=\
-        unicows.lib
 .ENDIF
 
 SHL1STDLIBS+=\
@@ -157,11 +145,4 @@ SHL1STDLIBS+=\
 
 .ENDIF
 
-.IF "$(COM)"=="GCC"
-ALL: ALLTAR $(LB)$/libuwinapi.a
-
-$(LB)$/libuwinapi.a: $(MISC)$/uwinapi.def
-    dlltool --dllname uwinapi.dll --input-def=$(MISC)$/uwinapi.def --kill-at --output-lib=$(LB)$/libuwinapi.a
-.ENDIF
-
 .INCLUDE : target.mk
diff --git a/sal/systools/win32/uwinapi/snprintf.c b/sal/systools/win32/uwinapi/snprintf.c
index 694eef21fbf9..3c07e6863d94 100644
--- a/sal/systools/win32/uwinapi/snprintf.c
+++ b/sal/systools/win32/uwinapi/snprintf.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* Not unicode */
 #undef _UNICODE
 
@@ -8,3 +9,5 @@
 #endif
 
 #include "sntprintf.c"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/sntprintf.c b/sal/systools/win32/uwinapi/sntprintf.c
index 69d47821311c..424e5bd3a3a3 100644
--- a/sal/systools/win32/uwinapi/sntprintf.c
+++ b/sal/systools/win32/uwinapi/sntprintf.c
@@ -1,8 +1,13 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #define _SNPRINTF_DLLIMPORT __declspec( dllexport )
 
 #include <stdarg.h>
 #include <stdio.h>
 
+#ifdef __MINGW32__
+/* MinGW-w64 doesn't have a _tcsinc() inline or library function */
+#define _MB_MAP_DIRECT
+#endif
 #include <tchar.h>
 #include <systools/win32/snprintf.h>
 
@@ -116,3 +121,5 @@ _SNPRINTF_DLLIMPORT int __cdecl sntprintf( _TCHAR *buffer, size_t count, const _
 
     return retval;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/snwprintf.c b/sal/systools/win32/uwinapi/snwprintf.c
index 80a5760c86f1..9b159c9b227b 100644
--- a/sal/systools/win32/uwinapi/snwprintf.c
+++ b/sal/systools/win32/uwinapi/snwprintf.c
@@ -1,5 +1,8 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef _UNICODE
 #define _UNICODE
 #endif
 
 #include "sntprintf.c"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/toolhelp.cpp b/sal/systools/win32/uwinapi/toolhelp.cpp
index 7b651581bae7..411b6a2b6e17 100644
--- a/sal/systools/win32/uwinapi/toolhelp.cpp
+++ b/sal/systools/win32/uwinapi/toolhelp.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include "macros.h"
 #include <tlhelp32.h>
 
@@ -55,3 +56,5 @@ IMPLEMENT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, CreateToolhelp32Snapshot, (D
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
     return NULL;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/win95sys.h b/sal/systools/win32/uwinapi/win95sys.h
index 4ca0c8e8fcff..f5500fc7ea9c 100644
--- a/sal/systools/win32/uwinapi/win95sys.h
+++ b/sal/systools/win32/uwinapi/win95sys.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #pragma once
 
 //Kernel32 objects
@@ -346,3 +347,4 @@ DWORD   LastTlsSetValueEIP[64]; // 200h (parallel to TlsArray, contains EIP
                 //  where TLS value was last set from)
 } THREAD_DATABASE, *PTHREAD_DATABASE;
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/test/makefile.mk b/sal/test/makefile.mk
index 6edba90ce6b9..1f4b339a1692 100644
--- a/sal/test/makefile.mk
+++ b/sal/test/makefile.mk
@@ -33,13 +33,13 @@ TARGETTYPE=CUI
 LIBTARGET=NO
 USE_LDUMP2=TRUE
 ENABLE_EXCEPTIONS=TRUE
-#LDUMP2=LDUMP3
-
 
 # --- Settings -----------------------------------------------------
+
 .INCLUDE :  settings.mk
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
+
 # ------------------------------------------------------------------
 
 .IF "$(GUI)"=="WNT"
@@ -70,6 +70,7 @@ APP4STDLIBS = $(SALLIB)
 
 
 # --- Targets ------------------------------------------------------
+
 .IF "$(depend)" == ""
 ALL : ALLTAR \
       $(BIN)$/$(BOOTSTRAPSCRIPT) \
@@ -144,6 +145,7 @@ $(BIN)$/bootstraptest.ini : bootstraptest.ini
 
 
 # --- SO2-Filter-Datei ---
+
 $(MISC)$/tsl$(DLLPOSTFIX).flt:
     @echo ------------------------------
     @echo Making: $@
diff --git a/sal/test/test_salmain.cxx b/sal/test/test_salmain.cxx
index 24cfb1cf56b9..1b409b82a765 100644
--- a/sal/test/test_salmain.cxx
+++ b/sal/test/test_salmain.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,3 +41,5 @@ SAL_IMPLEMENT_MAIN()
 
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/test/test_salmainwithargs.cxx b/sal/test/test_salmainwithargs.cxx
index 420a235313e8..605945d4e7d1 100644
--- a/sal/test/test_salmainwithargs.cxx
+++ b/sal/test/test_salmainwithargs.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,3 +41,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/test/testbootstrap.cxx b/sal/test/testbootstrap.cxx
index 757b877d4db5..871f527a17c9 100644
--- a/sal/test/testbootstrap.cxx
+++ b/sal/test/testbootstrap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -132,3 +133,5 @@ int main( int argc, char *argv[] )
 
     return result;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/test/unloading/makefile.mk b/sal/test/unloading/makefile.mk
index 6c6f6f74f058..24800ef156db 100644
--- a/sal/test/unloading/makefile.mk
+++ b/sal/test/unloading/makefile.mk
@@ -30,7 +30,6 @@ PRJNAME=	sal
 TARGET=		unloading
 TARGET1=samplelib1
 TARGET2=samplelib2
-#LIBTARGET=NO
 TARGETTYPE=CUI
 COMP1TYPELIST=$(TARGET1)
 
@@ -65,10 +64,6 @@ INCPRE+=	$(OUT)$/inc$/light
 .ENDIF
 
 
-#SLOFILES=	\
-#		$(SLO)$/samplelib1.obj	\
-#		$(SLO)$/samplelib2.obj
-
 LIB1TARGET=$(SLB)$/$(TARGET1).lib
 LIB1OBJFILES= \
         $(SLO)$/samplelib1.obj
@@ -80,14 +75,12 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB)	\
         $(SALLIB)
 
-
-
 SHL1DEPN=
-#SHL1IMPLIB=	i$(TARGET1)
 SHL1LIBS=	$(SLB)$/$(TARGET1).lib
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1EXPORTFILE=	exports.dxp
 DEF1NAME=	$(SHL1TARGET)
+
 #-------------------------------------------------------
 
 LIB2TARGET=$(SLB)$/$(TARGET2).lib
diff --git a/sal/test/unloading/samplelib1.cxx b/sal/test/unloading/samplelib1.cxx
index d4632f3beb80..7f25869156a8 100644
--- a/sal/test/unloading/samplelib1.cxx
+++ b/sal/test/unloading/samplelib1.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -135,7 +136,7 @@ static Reference<XInterface> SAL_CALL test4_createInstance(const Reference<XMult
 
 // Standard UNO library interface -------------------------------------------------
 extern "C" {
-    void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv){
+    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv){
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
@@ -147,37 +148,37 @@ extern "C" {
             {
                 Reference< XRegistryKey > xNewKey(
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString::createFromAscii( "/" IMPLNAME1 "/UNO/SERVICES" ) ) );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME1 "/UNO/SERVICES" )) ) );
 
                 xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)));
 
                 xNewKey=
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString::createFromAscii( "/" IMPLNAME2 "/UNO/SERVICES" ) );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME2 "/UNO/SERVICES" )) );
 
                 xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)));
                 xNewKey=
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString::createFromAscii( "/" IMPLNAME3 "/UNO/SERVICES" )   );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME3 "/UNO/SERVICES" ))   );
 
                 xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)));
 
                 xNewKey=
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString::createFromAscii( "/" IMPLNAME4 "/UNO/SERVICES" )   );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME4 "/UNO/SERVICES" ))   );
 
                 xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4)));
                 return sal_True;
             }
-            catch (InvalidRegistryException &)
+            catch (const InvalidRegistryException &)
             {
-                OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+                OSL_FAIL( "### InvalidRegistryException!" );
             }
         }
         return sal_False;
     }
 
-    void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) throw()
+    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) throw()
     {
         void * pRet = 0;
 
@@ -267,3 +268,5 @@ extern "C" {
         return globalModuleCount.canUnload( &globalModuleCount, libUnused);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/test/unloading/samplelib2.cxx b/sal/test/unloading/samplelib2.cxx
index 0ac6e0b5209a..75150bb9c50a 100644
--- a/sal/test/unloading/samplelib2.cxx
+++ b/sal/test/unloading/samplelib2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -125,7 +126,7 @@ static Reference<XInterface> SAL_CALL test23_createInstance(const Reference<XMul
 
 // Standard UNO library interface -------------------------------------------------
 extern "C" {
-    void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv){
+    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv){
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
@@ -137,18 +138,18 @@ extern "C" {
             {
                 Reference< XRegistryKey > xNewKey(
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString::createFromAscii( "/" IMPLNAME1 "/UNO/SERVICES" ) ) );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME1 "/UNO/SERVICES" )) ) );
 
                 xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)));
 
                 xNewKey=
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString::createFromAscii( "/" IMPLNAME2 "/UNO/SERVICES" ) );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME2 "/UNO/SERVICES" )) );
 
                 xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)));
                 xNewKey=
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString::createFromAscii( "/" IMPLNAME3 "/UNO/SERVICES" )   );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME3 "/UNO/SERVICES" ))   );
 
                 xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)));
 
@@ -156,13 +157,13 @@ extern "C" {
             }
             catch (InvalidRegistryException &)
             {
-                OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+                OSL_FAIL( "### InvalidRegistryException!" );
             }
         }
         return sal_False;
     }
 
-    void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) throw()
+    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) throw()
     {
         void * pRet = 0;
 
@@ -234,3 +235,5 @@ extern "C" {
         return globalModuleCount.canUnload( &globalModuleCount, libUnused);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/test/unloading/unloadTest.cxx b/sal/test/unloading/unloadTest.cxx
index d8589ab76717..31c3a6e7e05e 100644
--- a/sal/test/unloading/unloadTest.cxx
+++ b/sal/test/unloading/unloadTest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -654,3 +655,5 @@ sal_Bool test9()
         retval= sal_True;
     return retval;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/context.c b/sal/textenc/context.c
index 4b120d5d4843..26232cbd89c8 100644
--- a/sal/textenc/context.c
+++ b/sal/textenc/context.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ void ImplDestroyContext(void * pContext)
 {
     rtl_freeMemory(pContext);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/context.h b/sal/textenc/context.h
index 769625ae8df8..6b7740ebadbb 100644
--- a/sal/textenc/context.h
+++ b/sal/textenc/context.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,5 @@ void ImplDestroyContext(void * pContext) SAL_THROW_EXTERN_C();
 #endif /* __cpluscplus */
 
 #endif /* INCLUDED_RTL_TEXTENC_CONTEXT_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertadobe.tab b/sal/textenc/convertadobe.tab
index 31ec3305933b..4267aa100811 100644
--- a/sal/textenc/convertadobe.tab
+++ b/sal/textenc/convertadobe.tab
@@ -30,6 +30,7 @@
 #include "tenchelp.h"
 
 #include "rtl/tencinfo.h"
+#include <sal/macros.h>
 
 namespace {
 
@@ -103,8 +104,7 @@ adobeStandardEncodingConverterData = {
       0x0141, 0x00D8, 0x0152, 0x00BA, 0xffff, 0xffff, 0xffff, 0xffff,
       0xffff, 0x00E6, 0xffff, 0xffff, 0xffff, 0x0131, 0xffff, 0xffff, // 0xF0
       0x0142, 0x00F8, 0x0153, 0x00DF, 0xffff, 0xffff, 0xffff, 0xffff },
-    (sizeof unicodeToAdobeStandardEncoding
-     / sizeof unicodeToAdobeStandardEncoding[0]),
+    SAL_N_ELEMENTS(unicodeToAdobeStandardEncoding),
     unicodeToAdobeStandardEncoding };
 
 // RTL_TEXTENCODING_ADOBE_SYMBOL is based on
@@ -225,8 +225,7 @@ adobeSymbolEncodingConverterData = {
       0x239D, 0x23A1, 0x23A2, 0x23A3, 0x23A7, 0x23A8, 0x23A9, 0x23AA,
       0xffff, 0x232A, 0x222B, 0x2320, 0x23AE, 0x2321, 0x239E, 0x239F, // 0xF0
       0x23A0, 0x23A4, 0x23A5, 0x23A6, 0x23AB, 0x23AC, 0x23AD, 0xffff },
-    (sizeof unicodeToAdobeSymbolEncoding
-     / sizeof unicodeToAdobeSymbolEncoding[0]),
+    SAL_N_ELEMENTS( unicodeToAdobeSymbolEncoding ),
     unicodeToAdobeSymbolEncoding };
 
 // RTL_TEXTENCODING_ADOBE_DINGBATS is based on
diff --git a/sal/textenc/convertbig5hkscs.c b/sal/textenc/convertbig5hkscs.c
index 06fabe33a9b9..2237a96475d9 100644
--- a/sal/textenc/convertbig5hkscs.c
+++ b/sal/textenc/convertbig5hkscs.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -491,3 +492,5 @@ sal_Size ImplConvertUnicodeToBig5Hkscs(ImplTextConverterData const * pData,
 
     return pDestBufPtr - pDestBuf;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertbig5hkscs.h b/sal/textenc/convertbig5hkscs.h
index 629dd327ccfe..e7e66434b9c9 100644
--- a/sal/textenc/convertbig5hkscs.h
+++ b/sal/textenc/convertbig5hkscs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,3 +80,5 @@ sal_Size ImplConvertUnicodeToBig5Hkscs(ImplTextConverterData const * pData,
 #endif /* __cpluscplus */
 
 #endif /* INCLUDED_RTL_TEXTENC_CONVERTBIG5HKSCS_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/converter.c b/sal/textenc/converter.c
index 8911b9dc28e3..07c1e04c9ba3 100644
--- a/sal/textenc/converter.c
+++ b/sal/textenc/converter.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,3 +163,5 @@ ImplHandleBadInputUnicodeToTextConversion(sal_Bool bUndefined,
     else
         return IMPL_BAD_INPUT_NO_OUTPUT;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/converter.h b/sal/textenc/converter.h
index 703aa4173acc..c74652704781 100644
--- a/sal/textenc/converter.h
+++ b/sal/textenc/converter.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,5 @@ ImplHandleBadInputUnicodeToTextConversion(sal_Bool bUndefined,
 #endif /* __cpluscplus */
 
 #endif /* INCLUDED_RTL_TEXTENC_CONVERTER_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/converteuctw.c b/sal/textenc/converteuctw.c
index f55d87b73d17..062862abf76a 100644
--- a/sal/textenc/converteuctw.c
+++ b/sal/textenc/converteuctw.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -450,3 +451,5 @@ sal_Size ImplConvertUnicodeToEucTw(ImplTextConverterData const * pData,
 
     return pDestBufPtr - pDestBuf;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/converteuctw.h b/sal/textenc/converteuctw.h
index f883546a2924..6d30fced354a 100644
--- a/sal/textenc/converteuctw.h
+++ b/sal/textenc/converteuctw.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,5 @@ sal_Size ImplConvertUnicodeToEucTw(ImplTextConverterData const * pData,
 #endif /* __cpluscplus */
 
 #endif /* INCLUDED_RTL_TEXTENC_CONVERTEUCTW_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertgb18030.c b/sal/textenc/convertgb18030.c
index bb8fa521d88e..c9cac4bf7693 100644
--- a/sal/textenc/convertgb18030.c
+++ b/sal/textenc/convertgb18030.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -466,3 +467,5 @@ sal_Size ImplConvertUnicodeToGb18030(ImplTextConverterData const * pData,
 
     return pDestBufPtr - pDestBuf;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertgb18030.h b/sal/textenc/convertgb18030.h
index 0cbbd9e5c2cd..b80224d62d35 100644
--- a/sal/textenc/convertgb18030.h
+++ b/sal/textenc/convertgb18030.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ sal_Size ImplConvertUnicodeToGb18030(ImplTextConverterData const * pData,
 #endif /* __cpluscplus */
 
 #endif /* INCLUDED_RTL_TEXTENC_CONVERTGB18030_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertiso2022cn.c b/sal/textenc/convertiso2022cn.c
index 6ae445d99e73..40a0039aa3f0 100644
--- a/sal/textenc/convertiso2022cn.c
+++ b/sal/textenc/convertiso2022cn.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -860,3 +861,5 @@ sal_Size ImplConvertUnicodeToIso2022Cn(ImplTextConverterData const * pData,
 
     return pDestBufPtr - pDestBuf;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertiso2022cn.h b/sal/textenc/convertiso2022cn.h
index 4315e63b4faf..bf5186d66e1f 100644
--- a/sal/textenc/convertiso2022cn.h
+++ b/sal/textenc/convertiso2022cn.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,3 +83,5 @@ sal_Size ImplConvertUnicodeToIso2022Cn(ImplTextConverterData const * pData,
 #endif /* __cpluscplus */
 
 #endif /* INCLUDED_RTL_TEXTENC_CONVERTISO2022CN_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertiso2022jp.c b/sal/textenc/convertiso2022jp.c
index 82edc8dbfb68..e4792b573373 100644
--- a/sal/textenc/convertiso2022jp.c
+++ b/sal/textenc/convertiso2022jp.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -567,3 +568,5 @@ sal_Size ImplConvertUnicodeToIso2022Jp(ImplTextConverterData const * pData,
 
     return pDestBufPtr - pDestBuf;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertiso2022jp.h b/sal/textenc/convertiso2022jp.h
index 275d51c7caba..257558387456 100644
--- a/sal/textenc/convertiso2022jp.h
+++ b/sal/textenc/convertiso2022jp.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,5 @@ sal_Size ImplConvertUnicodeToIso2022Jp(ImplTextConverterData const * pData,
 #endif /* __cpluscplus */
 
 #endif /* INCLUDED_RTL_TEXTENC_CONVERTISO2022JP_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertiso2022kr.c b/sal/textenc/convertiso2022kr.c
index c2bbee3196a8..8354b312ab87 100644
--- a/sal/textenc/convertiso2022kr.c
+++ b/sal/textenc/convertiso2022kr.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -525,3 +526,5 @@ sal_Size ImplConvertUnicodeToIso2022Kr(ImplTextConverterData const * pData,
 
     return pDestBufPtr - pDestBuf;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertiso2022kr.h b/sal/textenc/convertiso2022kr.h
index 82255d74f7a8..7208bcf63bb0 100644
--- a/sal/textenc/convertiso2022kr.h
+++ b/sal/textenc/convertiso2022kr.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,5 @@ sal_Size ImplConvertUnicodeToIso2022Kr(ImplTextConverterData const * pData,
 #endif /* __cpluscplus */
 
 #endif /* INCLUDED_RTL_TEXTENC_CONVERTISO2022KR_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertsinglebytetobmpunicode.cxx b/sal/textenc/convertsinglebytetobmpunicode.cxx
index 1e482249907c..75f94d3cc60a 100644
--- a/sal/textenc/convertsinglebytetobmpunicode.cxx
+++ b/sal/textenc/convertsinglebytetobmpunicode.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -209,3 +210,5 @@ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte(
     }
     return destBufPtr - destBuf;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertsinglebytetobmpunicode.hxx b/sal/textenc/convertsinglebytetobmpunicode.hxx
index badc01673fbc..39ebed9eabca 100644
--- a/sal/textenc/convertsinglebytetobmpunicode.hxx
+++ b/sal/textenc/convertsinglebytetobmpunicode.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -124,3 +125,5 @@ extern "C" sal_Size rtl_textenc_convertBmpUnicodeToSingleByte(
     sal_Size * srcCvtChars);
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/gettextencodingdata.h b/sal/textenc/gettextencodingdata.h
index 9307074f6cff..f2d31be82902 100644
--- a/sal/textenc/gettextencodingdata.h
+++ b/sal/textenc/gettextencodingdata.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ Impl_getTextEncodingData(rtl_TextEncoding nEncoding) SAL_THROW_EXTERN_C();
 #endif /* __cplusplus */
 
 #endif /* INCLUDED_RTL_TEXTENC_GETTEXTENCODINGDATA_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/makefile.mk b/sal/textenc/makefile.mk
index 260559366ffd..7970ae0526eb 100644
--- a/sal/textenc/makefile.mk
+++ b/sal/textenc/makefile.mk
@@ -28,13 +28,19 @@
 PRJ = ..
 PRJNAME = sal
 TARGET = textenc
+LIBTARGET=NO
 
 .INCLUDE: settings.mk
 
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-SLOFILES = \
+SAL_OBJECTS = \
+    $(SLO)$/tencinfo.obj \
+    $(SLO)$/textcvt.obj \
+    $(SLO)$/textenc.obj
+
+SAL_COMMON_OBJECTS = \
     $(SLO)$/context.obj \
     $(SLO)$/convertbig5hkscs.obj \
     $(SLO)$/converter.obj \
@@ -49,12 +55,19 @@ SLOFILES = \
     $(SLO)$/tcvtutf7.obj \
     $(SLO)$/tcvtutf8.obj \
     $(SLO)$/tenchelp.obj \
-    $(SLO)$/tencinfo.obj \
-    $(SLO)$/textcvt.obj \
-    $(SLO)$/textenc.obj \
     $(SLO)$/unichars.obj
 
-OBJFILES = \
+SAL_TABLES_OBJECTS = \
+    $(SLO)$/tables.obj
+
+SLOFILES = $(SAL_OBJECTS) $(SAL_COMMON_OBJECTS) $(SAL_TABLES_OBJECTS)
+
+SAL_OBJFILES = \
+    $(OBJ)$/tencinfo.obj \
+    $(OBJ)$/textcvt.obj \
+    $(OBJ)$/textenc.obj
+
+SAL_COMMON_OBJFILES = \
     $(OBJ)$/context.obj \
     $(OBJ)$/convertbig5hkscs.obj \
     $(OBJ)$/converter.obj \
@@ -69,19 +82,36 @@ OBJFILES = \
     $(OBJ)$/tcvtutf7.obj \
     $(OBJ)$/tcvtutf8.obj \
     $(OBJ)$/tenchelp.obj \
-    $(OBJ)$/tencinfo.obj \
-    $(OBJ)$/textcvt.obj \
-    $(OBJ)$/textenc.obj \
     $(OBJ)$/unichars.obj
 
+SAL_TABLES_OBJFILES = \
+    $(OBJ)$/tables.obj
+
+OBJFILES = $(SAL_OBJFILES) $(SAL_COMMON_OBJFILES) $(SAL_TABLES_OBJFILES)
+
 # Optimization off on Solaris Intel due to internal compiler error; to be
 # reevaluated after compiler upgrade:
 .IF "$(OS)$(CPU)" == "SOLARISI"
 
 NOOPTFILES = \
     $(OBJ)$/textenc.obj \
-    $(SLO)$/textenc.obj
+    $(SLO)$/textenc.obj \
+    $(OBJ)$/tables.obj \
+    $(SLO)$/tables.obj
 
 .ENDIF # OS, CPU, SOLARISI
 
+LIB1TARGET= $(SLB)$/$(TARGET).lib
+LIB1OBJFILES= $(SAL_OBJECTS) $(SAL_COMMON_OBJECTS)
+OBJTARGET=$(LB)$/$(TARGET).lib
+
+# be nicer to avoid DLLPRE
+.IF "$(GUI)" == "WNT"
+CDEFS+=-DPLUGIN_NAME=$(DLLPRE)sal_textenc$(UDK_MAJOR)$(DLLPOST)
+.ELSE
+CDEFS+=-DPLUGIN_NAME=$(DLLPRE)sal_textenc$(DLLPOST).$(UDK_MAJOR)
+.ENDIF
+LIB2TARGET= $(SLB)$/textenc_tables.lib
+LIB2OBJFILES= $(SAL_TABLES_OBJECTS) $(SAL_COMMON_OBJECTS)
+
 .INCLUDE: target.mk
diff --git a/sal/textenc/tables.cxx b/sal/textenc/tables.cxx
new file mode 100644
index 000000000000..00d78110106b
--- /dev/null
+++ b/sal/textenc/tables.cxx
@@ -0,0 +1,236 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_RTL_TEXTENC_GETTEXTENCODINGDATA_H
+#include "gettextencodingdata.h"
+#endif
+
+#ifndef INCLUDED_RTL_TEXTENC_TENCHELP_H
+#include "tenchelp.h"
+#endif
+
+#ifndef _RTL_TEXTENC_H
+#include "rtl/textenc.h"
+#endif
+
+#ifndef INCLUDED_STDDEF_H
+#include <stddef.h>
+#define INCLUDED_STDDEF_H
+#endif
+
+#define NOTABUNI_START 0xFF
+#define NOTABUNI_END 0x00
+
+#define NOTABCHAR_START 0xFFFF
+#define NOTABCHAR_END 0x0000
+
+#define SAME8090UNI_START 0x80
+#define SAME8090UNI_END 0x9F
+static sal_uInt16 const aImpl8090SameToUniTab[SAME8090UNI_END
+                                                  - SAME8090UNI_START
+                                                  + 1]
+= { 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, /* 0x80 */
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, /* 0x90 */
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F };
+
+#define SAME8090CHAR_START 0x0080
+#define SAME8090CHAR_END 0x009F
+static sal_uChar const aImpl8090SameToCharTab[SAME8090CHAR_END
+                                                  - SAME8090CHAR_START
+                                                  + 1]
+    = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, /* 0x0080 */
+        0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F,
+        0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, /* 0x0090 */
+        0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F };
+
+#define SAMEA0FFCHAR_START 0x00A0
+#define SAMEA0FFCHAR_END 0x00FF
+static sal_uChar const aImplA0FFSameToCharTab[SAMEA0FFCHAR_END
+                                                  - SAMEA0FFCHAR_START
+                                                  + 1]
+    = { 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, /* 0x00A0 */
+        0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF,
+        0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, /* 0x00B0 */
+        0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF,
+        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, /* 0x00C0 */
+        0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
+        0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, /* 0x00D0 */
+        0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
+        0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, /* 0x00E0 */
+        0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+        0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, /* 0x00F0 */
+        0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF };
+
+static sal_uInt16 const aImplDoubleByteIdentifierTab[1] = { 0 };
+
+#include "tcvtarb1.tab"
+#include "tcvteas1.tab"
+#include "tcvtest1.tab"
+#include "tcvtjp1.tab"
+#include "tcvtjp2.tab"
+#include "tcvtjp3.tab"
+#include "tcvtjp4.tab"
+#include "tcvtjp5.tab"
+#include "tcvtjp6.tab"
+#include "tcvtkr1.tab"
+#include "tcvtkr2.tab"
+#include "tcvtkr4.tab"
+#include "tcvtkr5.tab"
+#include "tcvtkr6.tab"
+#include "tcvtlat1.tab"
+#include "tcvtscn1.tab"
+#include "tcvtscn2.tab"
+#include "tcvtscn3.tab"
+#include "tcvtscn4.tab"
+#include "tcvtscn5.tab"
+#include "tcvtscn6.tab"
+#include "tcvtsym1.tab"
+#include "tcvttcn1.tab"
+#include "tcvttcn2.tab"
+#include "tcvttcn6.tab"
+#include "tcvtuni1.tab"
+#include "convertiscii.tab"
+
+#include "convertbig5hkscs.tab"
+#include "converteuctw.tab"
+#include "convertgb18030.tab"
+#include "convertiso2022cn.tab"
+#include "convertiso2022jp.tab"
+#include "convertiso2022kr.tab"
+#include "convertadobe.tab"
+
+ImplTextEncodingData const *
+Impl_getTextEncodingData(rtl_TextEncoding nEncoding)
+#ifdef IOS
+    // Dunno if the g++ for iOS is just pickier, or why other g++
+    // versions don't complain about the lack of throw to match the
+    // one in the declaration in gettextencodingdata.h.o
+    SAL_THROW_EXTERN_C()
+#endif
+{
+    static ImplTextEncodingData const * const aData[]
+        = { NULL, /* DONTKNOW */
+            &aImplMS1252TextEncodingData, /* MS_1252 */
+            &aImplAPPLEROMANTextEncodingData, /* APPLE_ROMAN */
+            &aImplIBM437TextEncodingData, /* IBM_437 */
+            &aImplIBM850TextEncodingData, /* IBM_850 */
+            &aImplIBM860TextEncodingData, /* IBM_860 */
+            &aImplIBM861TextEncodingData, /* IBM_861 */
+            &aImplIBM863TextEncodingData, /* IBM_863 */
+            &aImplIBM865TextEncodingData, /* IBM_865 */
+            NULL, /* reserved (SYSTEM) */
+            &aImplSYMBOLTextEncodingData, /* SYMBOL */
+            &aImplUSASCIITextEncodingData, /* ASCII_US */
+            &aImplISO88591TextEncodingData, /* ISO_8859_1 */
+            &aImplISO88592TextEncodingData, /* ISO_8859_2 */
+            &aImplISO88593TextEncodingData, /* ISO_8859_3 */
+            &aImplISO88594TextEncodingData, /* ISO_8859_4 */
+            &aImplISO88595TextEncodingData, /* ISO_8859_5 */
+            &aImplISO88596TextEncodingData, /* ISO_8859_6 */
+            &aImplISO88597TextEncodingData, /* ISO_8859_7 */
+            &aImplISO88598TextEncodingData, /* ISO_8859_8 */
+            &aImplISO88599TextEncodingData, /* ISO_8859_9 */
+            &aImplISO885914TextEncodingData, /* ISO_8859_14 */
+            &aImplISO885915TextEncodingData, /* ISO_8859_15 */
+            &aImplIBM737TextEncodingData, /* IBM_737 */
+            &aImplIBM775TextEncodingData, /* IBM_775 */
+            &aImplIBM852TextEncodingData, /* IBM_852 */
+            &aImplIBM855TextEncodingData, /* IBM_855 */
+            &aImplIBM857TextEncodingData, /* IBM_857 */
+            &aImplIBM862TextEncodingData, /* IBM_862 */
+            &aImplIBM864TextEncodingData, /* IBM_864 */
+            &aImplIBM866TextEncodingData, /* IBM_866 */
+            &aImplIBM869TextEncodingData, /* IBM_869 */
+            &aImplMS874TextEncodingData, /* MS_874 */
+            &aImplMS1250TextEncodingData, /* MS_1250 */
+            &aImplMS1251TextEncodingData, /* MS_1251 */
+            &aImplMS1253TextEncodingData, /* MS_1253 */
+            &aImplMS1254TextEncodingData, /* MS_1254 */
+            &aImplMS1255TextEncodingData, /* MS_1255 */
+            &aImplMS1256TextEncodingData, /* MS_1256 */
+            &aImplMS1257TextEncodingData, /* MS_1257 */
+            &aImplMS1258TextEncodingData, /* MS_1258 */
+            NULL, /* TODO! APPLE_ARABIC */
+            &aImplAPPLECENTEUROTextEncodingData, /* APPLE_CENTEURO */
+            &aImplAPPLECROATIANTextEncodingData, /* APPLE_CROATIAN */
+            &aImplAPPLECYRILLICTextEncodingData, /* APPLE_CYRILLIC */
+            NULL, /* TODO! APPLE_DEVANAGARI */
+            NULL, /* TODO! APPLE_FARSI */
+            &aImplAPPLEGREEKTextEncodingData, /* APPLE_GREEK */
+            NULL, /* TODO! APPLE_GUJARATI */
+            NULL, /* TODO! APPLE_GURMUKHI */
+            NULL, /* TODO! APPLE_HEBREW */
+            &aImplAPPLEICELANDTextEncodingData, /* APPLE_ICELAND */
+            &aImplAPPLEROMANIANTextEncodingData, /* APPLE_ROMANIAN */
+            NULL, /* TODO! APPLE_THAI */
+            &aImplAPPLETURKISHTextEncodingData, /* APPLE_TURKISH */
+            &aImplAPPLEUKRAINIANTextEncodingData, /* APPLE_UKRAINIAN */
+            &aImplAPPLECHINSIMPTextEncodingData, /* APPLE_CHINSIMP */
+            &aImplAPPLECHINTRADTextEncodingData, /* APPLE_CHINTRAD */
+            &aImplAPPLEJAPANESETextEncodingData, /* APPLE_JAPANESE */
+            &aImplAPPLEKOREANTextEncodingData, /* APPLE_KOREAN */
+            &aImplMS932TextEncodingData, /* MS_932 */
+            &aImplMS936TextEncodingData, /* MS_936 */
+            &aImplMS949TextEncodingData, /* MS_949 */
+            &aImplMS950TextEncodingData, /* MS_950 */
+            &aImplSJISTextEncodingData, /* SHIFT_JIS */
+            &aImplGB2312TextEncodingData, /* GB_2312 */
+            &aImplGBT12345TextEncodingData, /* GBT_12345 */
+            &aImplGBKTextEncodingData, /* GBK */
+            &aImplBIG5TextEncodingData, /* BIG5 */
+            &aImplEUCJPTextEncodingData, /* EUC_JP */
+            &aImplEUCCNTextEncodingData, /* EUC_CN */
+            &aImplEucTwTextEncodingData, /* EUC_TW */
+            &aImplIso2022JpTextEncodingData, /* ISO_2022_JP */
+            &aImplIso2022CnTextEncodingData, /* ISO_2022_CN */
+            &aImplKOI8RTextEncodingData, /* KOI8_R */
+            &aImplUTF7TextEncodingData, /* UTF7 */
+            &aImplUTF8TextEncodingData, /* UTF8 */
+            &aImplISO885910TextEncodingData, /* ISO_8859_10 */
+            &aImplISO885913TextEncodingData, /* ISO_8859_13 */
+            &aImplEUCKRTextEncodingData, /* EUC_KR */
+            &aImplIso2022KrTextEncodingData, /* ISO_2022_KR */
+            &aImplJISX0201TextEncodingData, /* JIS_X_0201 */
+            &aImplJISX0208TextEncodingData, /* JIS_X_0208 */
+            &aImplJISX0212TextEncodingData, /* JIS_X_0212 */
+            &aImplMS1361TextEncodingData, /* MS_1361 */
+            &aImplGb18030TextEncodingData, /* GB_18030 */
+            &aImplBig5HkscsTextEncodingData, /* BIG5_HKSCS */
+            &aImplTis620TextEncodingData, /* TIS_620 */
+            &aImplKoi8UTextEncodingData, /* KOI8_U */
+            &aImplIsciiDevanagariTextEncodingData, /* ISCII_DEVANAGARI */
+            &aImplJavaUtf8TextEncodingData, /* JAVA_UTF8 */
+            &adobeStandardEncodingData, /* ADOBE_STANDARD */
+            &adobeSymbolEncodingData, /* ADOBE_SYMBOL */
+            &aImplPT154TextEncodingData }; /* PT154 */
+    return
+        nEncoding < SAL_N_ELEMENTS(aData) ? aData[nEncoding] : NULL;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/tcvtbyte.c b/sal/textenc/tcvtbyte.c
index 238c51fba223..b8e3ed222f7c 100644
--- a/sal/textenc/tcvtbyte.c
+++ b/sal/textenc/tcvtbyte.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -640,6 +641,51 @@ sal_Size ImplCharToUnicode( const ImplTextConverterData* pData,
 
 /* ----------------------------------------------------------------------- */
 
+sal_Size ImplUpperCharToUnicode( const ImplTextConverterData* pData,
+                            void* pContext,
+                            const sal_Char* pSrcBuf, sal_Size nSrcBytes,
+                            sal_Unicode* pDestBuf, sal_Size nDestChars,
+                            sal_uInt32 nFlags, sal_uInt32* pInfo,
+                            sal_Size* pSrcCvtBytes )
+{
+    sal_uChar                   c;
+    sal_Unicode                 cConv;
+    const ImplByteConvertData*  pConvertData = (const ImplByteConvertData*)pData;
+    sal_Unicode*                pEndDestBuf;
+    const sal_Char*             pEndSrcBuf;
+
+    (void) pContext; /* unused */
+    (void) nFlags;   /* unused */
+
+    *pInfo = 0;
+    pEndDestBuf = pDestBuf+nDestChars;
+    pEndSrcBuf  = pSrcBuf+nSrcBytes;
+    if ( pDestBuf == pEndDestBuf )
+    {
+        *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+        *pSrcCvtBytes = 0;
+        return 0;
+    }
+    while ( pSrcBuf < pEndSrcBuf )
+    {
+        c = (sal_uChar)*pSrcBuf;
+        if (c < 0x80)
+            cConv = c;
+        else
+            // c <= 0xFF is implied.
+            cConv = pConvertData->mpToUniTab1[c - 0x80];
+
+        *pDestBuf = cConv;
+        pDestBuf++;
+        pSrcBuf++;
+    }
+
+    *pSrcCvtBytes = nSrcBytes - (pEndSrcBuf-pSrcBuf);
+    return (nDestChars - (pEndDestBuf-pDestBuf));
+}
+
+/* ----------------------------------------------------------------------- */
+
 // Writes 0--2 characters to dest:
 static int ImplConvertUnicodeCharToChar(
     const ImplByteConvertData* pConvertData, sal_Unicode c, sal_Char * dest )
@@ -808,3 +854,5 @@ sal_Size ImplUnicodeToChar( const ImplTextConverterData* pData,
     *pSrcCvtChars = nSrcChars - (pEndSrcBuf-pSrcBuf);
     return (nDestBytes - (pEndDestBuf-pDestBuf));
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/tcvtlat1.tab b/sal/textenc/tcvtlat1.tab
index 6e8e55cf1d65..60c3218b64b3 100644
--- a/sal/textenc/tcvtlat1.tab
+++ b/sal/textenc/tcvtlat1.tab
@@ -188,7 +188,7 @@ static ImplByteConvertData const aImplIBM437ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM437TextEncodingData
     = { { &aImplIBM437ByteCvtData,
-          ImplCharToUnicode,
+          ImplUpperCharToUnicode,
           ImplUnicodeToChar,
           NULL,
           NULL,
@@ -322,7 +322,7 @@ static ImplByteConvertData const aImplIBM850ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM850TextEncodingData
     = { { &aImplIBM850ByteCvtData,
-          ImplCharToUnicode,
+          ImplUpperCharToUnicode,
           ImplUnicodeToChar,
           NULL,
           NULL,
@@ -495,7 +495,7 @@ static ImplByteConvertData const aImplIBM860ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM860TextEncodingData
     = { { &aImplIBM860ByteCvtData,
-          ImplCharToUnicode,
+          ImplUpperCharToUnicode,
           ImplUnicodeToChar,
           NULL,
           NULL,
@@ -670,7 +670,7 @@ static ImplByteConvertData const aImplIBM861ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM861TextEncodingData
     = { { &aImplIBM861ByteCvtData,
-          ImplCharToUnicode,
+          ImplUpperCharToUnicode,
           ImplUnicodeToChar,
           NULL,
           NULL,
@@ -845,7 +845,7 @@ static ImplByteConvertData const aImplIBM863ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM863TextEncodingData
     = { { &aImplIBM863ByteCvtData,
-          ImplCharToUnicode,
+          ImplUpperCharToUnicode,
           ImplUnicodeToChar,
           NULL,
           NULL,
@@ -1020,7 +1020,7 @@ static ImplByteConvertData const aImplIBM865ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM865TextEncodingData
     = { { &aImplIBM865ByteCvtData,
-          ImplCharToUnicode,
+          ImplUpperCharToUnicode,
           ImplUnicodeToChar,
           NULL,
           NULL,
@@ -1560,7 +1560,7 @@ static ImplByteConvertData const aImplAPPLEICELANDByteCvtData =
 
 static ImplTextEncodingData const aImplAPPLEICELANDTextEncodingData
     = { { &aImplAPPLEICELANDByteCvtData,
-          ImplCharToUnicode,
+          ImplUpperCharToUnicode,
           ImplUnicodeToChar,
           NULL,
           NULL,
@@ -1707,7 +1707,7 @@ static ImplByteConvertData const aImplAPPLEROMANByteCvtData =
 
 static ImplTextEncodingData const aImplAPPLEROMANTextEncodingData
     = { { &aImplAPPLEROMANByteCvtData,
-          ImplCharToUnicode,
+          ImplUpperCharToUnicode,
           ImplUnicodeToChar,
           NULL,
           NULL,
diff --git a/sal/textenc/tcvtmb.c b/sal/textenc/tcvtmb.c
index 4801e2ed665e..e0936979eb19 100644
--- a/sal/textenc/tcvtmb.c
+++ b/sal/textenc/tcvtmb.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -114,7 +115,6 @@ sal_Size ImplDBCSToUnicode( const ImplTextConverterData* pData, void* pContext,
                     if ( (cLead >= pEUDCTab->mnLeadStart) &&
                          (cLead <= pEUDCTab->mnLeadEnd) )
                     {
-                        sal_uInt16 nTrailCount = 0;
                         if ( (cTrail >= pEUDCTab->mnTrail1Start) &&
                              (cTrail <= pEUDCTab->mnTrail1End) )
                         {
@@ -125,7 +125,7 @@ sal_Size ImplDBCSToUnicode( const ImplTextConverterData* pData, void* pContext,
                         }
                         else
                         {
-                            nTrailCount = pEUDCTab->mnTrail1End-pEUDCTab->mnTrail1Start+1;
+                            sal_uInt16 nTrailCount = pEUDCTab->mnTrail1End-pEUDCTab->mnTrail1Start+1;
                             if ( (pEUDCTab->mnTrailCount >= 2) &&
                                  (cTrail >= pEUDCTab->mnTrail2Start) &&
                                  (cTrail <= pEUDCTab->mnTrail2End) )
@@ -691,3 +691,5 @@ sal_Size ImplUnicodeToEUCJP( const ImplTextConverterData* pData,
     *pSrcCvtChars = nSrcChars - (pEndSrcBuf-pSrcBuf);
     return (nDestBytes - (pEndDestBuf-pDestBuf));
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/tcvtutf7.c b/sal/textenc/tcvtutf7.c
index 344aae6ab5dd..8093a866f0c4 100644
--- a/sal/textenc/tcvtutf7.c
+++ b/sal/textenc/tcvtutf7.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -586,3 +587,5 @@ sal_Size ImplUnicodeToUTF7( const ImplTextConverterData* pData, void* pContext,
     *pSrcCvtChars = nSrcChars - (pEndSrcBuf-pSrcBuf);
     return (nDestBytes - (pEndDestBuf-pDestBuf));
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/tcvtutf8.c b/sal/textenc/tcvtutf8.c
index cc5141f2c3e2..3023c3e754e6 100644
--- a/sal/textenc/tcvtutf8.c
+++ b/sal/textenc/tcvtutf8.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -417,3 +418,5 @@ sal_Size ImplConvertUnicodeToUtf8(ImplTextConverterData const * pData,
         *pSrcCvtChars = pSrcBufPtr - pSrcBuf;
     return pDestBufPtr - pDestBuf;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/tenchelp.c b/sal/textenc/tenchelp.c
index 73495b05a98b..ed924336fa17 100644
--- a/sal/textenc/tenchelp.c
+++ b/sal/textenc/tenchelp.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -211,3 +212,4 @@ ImplHandleUndefinedUnicodeToTextChar(ImplTextConverterData const * pData,
     return sal_True;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/tenchelp.h b/sal/textenc/tenchelp.h
index 98be923472ba..7f6879c4bee1 100644
--- a/sal/textenc/tenchelp.h
+++ b/sal/textenc/tenchelp.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -230,6 +231,11 @@ sal_Size ImplCharToUnicode( const ImplTextConverterData* pData, void* pContext,
                             const sal_Char* pSrcBuf, sal_Size nSrcBytes,
                             sal_Unicode* pDestBuf, sal_Size nDestChars,
                             sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes );
+/** For those encodings only with unicode range of 0x80 to 0xFF. */
+sal_Size ImplUpperCharToUnicode( const ImplTextConverterData* pData, void* pContext,
+                            const sal_Char* pSrcBuf, sal_Size nSrcBytes,
+                            sal_Unicode* pDestBuf, sal_Size nDestChars,
+                            sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes );
 sal_Size ImplUnicodeToChar( const ImplTextConverterData* pData, void* pContext,
                             const sal_Unicode* pSrcBuf, sal_Size nSrcChars,
                             sal_Char* pDestBuf, sal_Size nDestBytes,
@@ -295,3 +301,5 @@ sal_Size ImplConvertUnicodeToUtf8(ImplTextConverterData const * pData,
 #endif /* __cplusplus */
 
 #endif /* INCLUDED_RTL_TEXTENC_TENCHELP_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/tencinfo.c b/sal/textenc/tencinfo.c
index 30a2fef0da72..2731880c66d2 100644
--- a/sal/textenc/tencinfo.c
+++ b/sal/textenc/tencinfo.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -212,166 +213,6 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromWindowsCharset( sal_uInt8 nWinC
 
 /* ----------------------------------------------------------------------- */
 
-#if 0
-
-rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMacTextEncoding( sal_uInt32 nMacTextEncoding )
-{
-    rtl_TextEncoding eTextEncoding;
-
-    switch ( nMacTextEncoding )
-    {
-        case 0:     eTextEncoding = RTL_TEXTENCODING_APPLE_ROMAN; break;
-        case 1:     eTextEncoding = RTL_TEXTENCODING_APPLE_JAPANESE; break;
-        case 2:     eTextEncoding = RTL_TEXTENCODING_APPLE_CHINTRAD; break;
-        case 3:     eTextEncoding = RTL_TEXTENCODING_APPLE_KOREAN; break;
-        case 4:     eTextEncoding = RTL_TEXTENCODING_APPLE_ARABIC; break;
-        case 5:     eTextEncoding = RTL_TEXTENCODING_APPLE_HEBREW; break;
-        case 6:     eTextEncoding = RTL_TEXTENCODING_APPLE_GREEK; break;
-        case 7:     eTextEncoding = RTL_TEXTENCODING_APPLE_CYRILLIC; break;
-        /* RIGHT-TO-LEFT SYMBOLS = 8  ??? */
-        case 9:     eTextEncoding = RTL_TEXTENCODING_APPLE_DEVANAGARI; break;
-        case 10:    eTextEncoding = RTL_TEXTENCODING_APPLE_GURMUKHI; break;
-        case 11:    eTextEncoding = RTL_TEXTENCODING_APPLE_GUJARATI; break;
-        /* MacOriya = 12 */
-        /* MacBengali = 13 */
-        /* MacTamil = 14 */
-        /* MacTelugu = 15 */
-        /* MacKannada = 16 */
-        /* MacMalayalam = 17 */
-        /* MacSinhalese = 18 */
-        /* MacBurmese = 19 */
-        /* MacKhmer = 20 */
-        case 21:    eTextEncoding = RTL_TEXTENCODING_APPLE_THAI; break;
-        /* MacLaotian = 22 */
-        /* MacGeorgian = 23 */
-        /* MacArmenian = 24 */
-        case 25:    eTextEncoding = RTL_TEXTENCODING_APPLE_CHINSIMP; break;
-        /* MacTibetan = 26 */
-        /* MacMongolian = 27 */
-        /* MacEthiopic = 28 */
-        case 29:    eTextEncoding = RTL_TEXTENCODING_APPLE_CENTEURO; break;     /* MacCentralEurRoman */
-        /* MacVietnamese = 30 */
-        /* MacExtArabic = 31 */
-        case 32:    eTextEncoding = RTL_TEXTENCODING_SYMBOL; break;
-        case 33:    eTextEncoding = RTL_TEXTENCODING_SYMBOL; break;     /* MacSymbol */
-        case 34:    eTextEncoding = RTL_TEXTENCODING_SYMBOL; break;     /* MacDingbats */
-        case 35:    eTextEncoding = RTL_TEXTENCODING_APPLE_TURKISH; break;      /* MacTurkish */
-        case 36:    eTextEncoding = RTL_TEXTENCODING_APPLE_CROATIAN; break;     /* MacCroatian */
-        case 37:    eTextEncoding = RTL_TEXTENCODING_APPLE_ICELAND; break;      /* MacIcelandic */
-        case 38:    eTextEncoding = RTL_TEXTENCODING_APPLE_ROMANIAN; break;     /* MacRomanian */
-        /* MacCeltic = 39 */
-        /* MacGaelic = 40 */
-        /* Beginning in Mac OS 8.5, the set of Mac OS script codes has been */
-        /* extended for some Mac OS components to include Unicode. Some of */
-        /* these components have only 7 bits available for script code, so */
-        /* kTextEncodingUnicodeDefault cannot be used to indicate Unicode. */
-        /* Instead, the following meta-value is used to indicate Unicode */
-        /* handled as a special Mac OS script code; TEC handles this value */
-        /* like kTextEncodingUnicodeDefault. */
-        /* The following use script code 4, smArabic */
-        case 0x08C: eTextEncoding = RTL_TEXTENCODING_APPLE_FARSI; break;        /* MacFarsi */
-        /* The following use script code 7, smCyrillic */
-        case 0x098: eTextEncoding = RTL_TEXTENCODING_APPLE_UKRAINIAN; break;    /* MacUkrainian */
-        /* The following use script code 28, smEthiopic */
-        /* MacInuit = 0xEC */
-        /* The following use script code 32, smUninterp */
-        case 0x0FC: eTextEncoding = RTL_TEXTENCODING_SYMBOL; break;       /* MacVT100 - VT100/102 font */
-        /* Special Mac OS encodings */
-        /* MacHFS = 0xFF */ /* metavalue. */
-        /* Unicode & ISO UCS encodings begin at 0x100 */
-        case 0x100: eTextEncoding = RTL_TEXTENCODING_UNICODE; break;    /* UnicodeDefault */
-        case 0x101: eTextEncoding = RTL_TEXTENCODING_UNICODE; break;    /* UnicodeV1_1 / ISO10646_1993 */
-        case 0x103: eTextEncoding = RTL_TEXTENCODING_UNICODE; break;    /* UnicodeV2_1 - new location for Korean Hangul / UnicodeV2_1 */
-        /* ISO 8-bit and 7-bit encodings begin at 0x200 */
-        case 0x201: eTextEncoding = RTL_TEXTENCODING_ISO_8859_1; break; /* ISOLatin1 - ISO 8859-1 */
-        case 0x202: eTextEncoding = RTL_TEXTENCODING_ISO_8859_2; break; /* ISOLatin2 - ISO 8859-2 */
-        case 0x203: eTextEncoding = RTL_TEXTENCODING_ISO_8859_3; break; /* ISOLatin3 - ISO 8859-3 */
-        case 0x204: eTextEncoding = RTL_TEXTENCODING_ISO_8859_4; break; /* ISOLatin4 - ISO 8859-4 */
-        case 0x205: eTextEncoding = RTL_TEXTENCODING_ISO_8859_5; break; /* ISOLatinCyrillic - ISO 8859-5 */
-        case 0x206: eTextEncoding = RTL_TEXTENCODING_ISO_8859_6; break; /* ISOLatinArabic - ISO 8859-6, = ASMO 708, =DOS CP 708 */
-        case 0x207: eTextEncoding = RTL_TEXTENCODING_ISO_8859_7; break; /* ISOLatinGreek - ISO 8859-7 */
-        case 0x208: eTextEncoding = RTL_TEXTENCODING_ISO_8859_8; break; /* ISOLatinHebrew - ISO 8859-8 */
-        case 0x209: eTextEncoding = RTL_TEXTENCODING_ISO_8859_9; break; /* ISOLatin5 - ISO 8859-9 */
-        /* MS-DOS & Windows encodings begin at 0x400 */
-        case 0x400: eTextEncoding = RTL_TEXTENCODING_IBM_437; break;    /* DOSLatinUS - code page 437 */
-        case 0x405: eTextEncoding = RTL_TEXTENCODING_IBM_737; break;    /* DOSGreek - code page 737 (formerly 437G) */
-        case 0x406: eTextEncoding = RTL_TEXTENCODING_IBM_775; break;    /* DOSBalticRim - code page 775 */
-        case 0x410: eTextEncoding = RTL_TEXTENCODING_IBM_850; break;    /* DOSLatin1 - code page 850, "Multilingual" */
-/* !!!       case 0x411: eTextEncoding = RTL_TEXTENCODING_IBM_851; break; */    /* DOSGreek1 - code page 851 */
-        case 0x412: eTextEncoding = RTL_TEXTENCODING_IBM_852; break;    /* DOSLatin2 - code page 852, Slavic */
-        case 0x413: eTextEncoding = RTL_TEXTENCODING_IBM_855; break;    /* DOSCyrillic - code page 855, IBM Cyrillic */
-        case 0x414: eTextEncoding = RTL_TEXTENCODING_IBM_857; break;    /* DOSTurkish - code page 857, IBM Turkish */
-        case 0x415: eTextEncoding = RTL_TEXTENCODING_IBM_860; break;    /* DOSPortuguese - code page 860 */
-        case 0x416: eTextEncoding = RTL_TEXTENCODING_IBM_861; break;    /* DOSIcelandic - code page 861 */
-        case 0x417: eTextEncoding = RTL_TEXTENCODING_IBM_862; break;    /* DOSHebrew - code page 862 */
-        case 0x418: eTextEncoding = RTL_TEXTENCODING_IBM_863; break;    /* DOSCanadianFrench - code page 863 */
-        case 0x419: eTextEncoding = RTL_TEXTENCODING_IBM_864; break;    /* DOSArabic - code page 864 */
-        case 0x41A: eTextEncoding = RTL_TEXTENCODING_IBM_865; break;    /* DOSNordic - code page 865 */
-        case 0x41B: eTextEncoding = RTL_TEXTENCODING_IBM_866; break;    /* DOSRussian - code page 866 */
-        case 0x41C: eTextEncoding = RTL_TEXTENCODING_IBM_869; break;    /* DOSGreek2 - code page 869, IBM Modern Greek */
-        case 0x41D: eTextEncoding = RTL_TEXTENCODING_MS_874; break;     /* DOSThai - code page 874, also for Windows */
-        case 0x420: eTextEncoding = RTL_TEXTENCODING_MS_932; break;     /* DOSJapanese - code page 932, also for Windows */
-        case 0x421: eTextEncoding = RTL_TEXTENCODING_MS_936; break;     /* DOSChineseSimplif - code page 936, also for Windows */
-        case 0x422: eTextEncoding = RTL_TEXTENCODING_MS_949; break;     /* DOSKorean - code page 949, also for Windows;Unified Hangul */
-        case 0x423: eTextEncoding = RTL_TEXTENCODING_MS_950; break;     /* DOSChineseTrad - code page 950, also for Windows */
-        case 0x500: eTextEncoding = RTL_TEXTENCODING_MS_1252; break;    /* WindowsLatin1 / WindowsANSI - code page 1252 */
-        case 0x501: eTextEncoding = RTL_TEXTENCODING_MS_1250; break;    /* WindowsLatin2 - code page 1250, Central Europe */
-        case 0x502: eTextEncoding = RTL_TEXTENCODING_MS_1251; break;    /* WindowsCyrillic - code page 1251, Slavic Cyrillic */
-        case 0x503: eTextEncoding = RTL_TEXTENCODING_MS_1253; break;    /* WindowsGreek - code page 1253 */
-        case 0x504: eTextEncoding = RTL_TEXTENCODING_MS_1254; break;    /* WindowsLatin5 - code page 1254, Turkish */
-        case 0x505: eTextEncoding = RTL_TEXTENCODING_MS_1255; break;    /* WindowsHebrew - code page 1255 */
-        case 0x506: eTextEncoding = RTL_TEXTENCODING_MS_1256; break;    /* WindowsArabic - code page 1256 */
-        case 0x507: eTextEncoding = RTL_TEXTENCODING_MS_1257; break;    /* WindowsBalticRim - code page 1257 */
-        case 0x508: eTextEncoding = RTL_TEXTENCODING_MS_1258; break;    /* WindowsVietnamese - code page 1258 */
-        case 0x510: eTextEncoding = RTL_TEXTENCODING_MS_1361; break;    /* WindowsKoreanJohab - code page 1361, for Windows NT */
-        /* Various national standards begin at 0x600 */
-        case 0x600: eTextEncoding = RTL_TEXTENCODING_ASCII_US; break;    /* US_ASCII */
-        case 0x620: eTextEncoding = RTL_TEXTENCODING_JIS_X_0201; break;  /* JIS_X0201_76 */
-        case 0x621: eTextEncoding = RTL_TEXTENCODING_JIS_X_0208; break;  /* JIS_X0208_83 */
-        case 0x622: eTextEncoding = RTL_TEXTENCODING_JIS_X_0208; break;  /* JIS_X0208_90 */
-        case 0x623: eTextEncoding = RTL_TEXTENCODING_JIS_X_0212; break;  /* JIS_X0212_90 */
-        /* !!! JIS_C6226_78 = 0x624 */
-        /* !!! GB_2312_80 = 0x630 */
-        /* !!! GBK_95 = 0x631 */ /* annex to GB 13000-93; for Windows 95 */
-//        case 0x640: eTextEncoding = RTL_TEXTENCODING_KSC_5601_1987; break; /* KSC_5601_87 */ /* same as KSC 5601-92 without Johab annex */
-//        case 0x641: eTextEncoding = RTL_TEXTENCODING_KSC_5601_1992; break; /* KSC 5601-92 Johab annex */
-        /* !!! CNS_11643_92_P1 = 0x651 */ /* CNS 11643-1992 plane 1 */
-        /* !!! CNS_11643_92_P2 = 0x652 */ /* CNS 11643-1992 plane 2 */
-        /* !!! CNS_11643_92_P3 = 0x653 */ /* CNS 11643-1992 plane 3 (11643-1986 plane 14) */
-        /* ISO 2022 collections begin at 0x800 */
-        case 0x820: eTextEncoding = RTL_TEXTENCODING_ISO_2022_JP; break;    /* ISO_2022_JP */
-        case 0x821: eTextEncoding = RTL_TEXTENCODING_ISO_2022_JP; break;    /* ISO_2022_JP_2 */
-        case 0x830: eTextEncoding = RTL_TEXTENCODING_ISO_2022_CN; break;    /* ISO_2022_CN */
-        case 0x831: eTextEncoding = RTL_TEXTENCODING_ISO_2022_CN; break;    /* ISO_2022_CN_EXT */
-        /* !!! ISO_2022_KR = 0x840 */
-        /* EUC collections begin at 0x900 */
-        case 0x920: eTextEncoding = RTL_TEXTENCODING_EUC_JP; break;    /* EUC_JP - ISO 646,1-byte Katakana,JIS 208,JIS 212 */
-        case 0x930: eTextEncoding = RTL_TEXTENCODING_EUC_CN; break;    /* EUC_CN - ISO 646, GB 2312-80 */
-        case 0x931: eTextEncoding = RTL_TEXTENCODING_EUC_TW; break;    /* EUC_TW - ISO 646, CNS 11643-1992 Planes 1-16 */
-        case 0x940: eTextEncoding = RTL_TEXTENCODING_EUC_KR; break;    /* EUC_KR - ISO 646, KS C 5601-1987 */
-        /* Miscellaneous standards begin at 0xA00 */
-        case 0xA01: eTextEncoding = RTL_TEXTENCODING_SHIFT_JIS; break; /* ShiftJIS - plain Shift-JIS */
-        case 0xA02: eTextEncoding = RTL_TEXTENCODING_KOI8_R; break;    /* KOI8_R - Russian Internet standard */
-        case 0xA03: eTextEncoding = RTL_TEXTENCODING_BIG5; break;      /* Big5 - Big-5 */
-        /* !!! MacRomanLatin1 = 0xA04 */ /* Mac OS Roman permuted to align with 8859-1 */
-        /* !!! HZ_GB_2312 = 0xA05 */ /* HZ (RFC 1842, for Chinese mail & news) */
-        /* Other platform encodings */
-        /* !!! NextStepLatin = 0xB01 */ /* NextStep encoding */
-        /* EBCDIC & IBM host encodings begin at 0xC00 */
-        /* !!! EBCDIC_US = 0xC01 */ /* basic EBCDIC-US */
-        /* !!! EBCDIC_CP037 = 0xC02 */ /* code page 037, extended EBCDIC-US Latin1 */
-        /* Special value */
-        /* MultiRun = 0xFFF */ /* Multiple encoded text, external run info */
-        default:    eTextEncoding = RTL_TEXTENCODING_DONTKNOW; break;
-    };
-
-    return eTextEncoding;
-}
-
-#endif
-
-/* ----------------------------------------------------------------------- */
-
 rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const sal_Char* pUnixCharset )
 {
     /* See <ftp://ftp.x.org/pub/DOCS/registry>, section 14 ("Font Charset
@@ -911,7 +752,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const sal_Char* pM
         { "pt154", RTL_TEXTENCODING_PT154 },
         { "cp154", RTL_TEXTENCODING_PT154 },
         { "xisciide", RTL_TEXTENCODING_ISCII_DEVANAGARI },
-            /* This is no official MIME character set name, but is in use by
+            /* This is not an official MIME character set name, but is in use by
                various windows APIs. */
         { NULL, RTL_TEXTENCODING_DONTKNOW }
     };
@@ -1157,3 +998,5 @@ rtl_getWindowsCodePageFromTextEncoding(rtl_TextEncoding nEncoding)
     default: return 0;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/textcvt.c b/sal/textenc/textcvt.c
index 1ef20285f015..0030590cf926 100644
--- a/sal/textenc/textcvt.c
+++ b/sal/textenc/textcvt.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -262,3 +263,5 @@ sal_Size SAL_CALL rtl_convertUnicodeToText( rtl_UnicodeToTextConverter hConverte
                                                    nFlags, pInfo,
                                                    pSrcCvtChars );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index 00a46e509f02..66ca45ca601b 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,6 +35,9 @@
 #include "gettextencodingdata.h"
 #include "tenchelp.h"
 #include "rtl/textenc.h"
+#include <sal/macros.h>
+#include "rtl/ustring.hxx"
+#include "osl/module.h"
 
 #ifndef INCLUDED_STDDEF_H
 #include <stddef.h>
@@ -86,141 +90,71 @@ static sal_uChar const aImplA0FFSameToCharTab[SAMEA0FFCHAR_END
 
 static sal_uInt16 const aImplDoubleByteIdentifierTab[1] = { 0 };
 
-#include "tcvtarb1.tab"
-#include "tcvteas1.tab"
 #include "tcvtest1.tab"
-#include "tcvtjp1.tab"
-#include "tcvtjp2.tab"
-#include "tcvtjp3.tab"
-#include "tcvtjp4.tab"
-#include "tcvtjp5.tab"
-#include "tcvtjp6.tab"
-#include "tcvtkr1.tab"
-#include "tcvtkr2.tab"
-#include "tcvtkr4.tab"
-#include "tcvtkr5.tab"
-#include "tcvtkr6.tab"
 #include "tcvtlat1.tab"
-#include "tcvtscn1.tab"
-#include "tcvtscn2.tab"
-#include "tcvtscn3.tab"
-#include "tcvtscn4.tab"
-#include "tcvtscn5.tab"
-#include "tcvtscn6.tab"
-#include "tcvtsym1.tab"
-#include "tcvttcn1.tab"
-#include "tcvttcn2.tab"
-#include "tcvttcn6.tab"
 #include "tcvtuni1.tab"
-#include "convertiscii.tab"
 
-#include "convertbig5hkscs.tab"
-#include "converteuctw.tab"
-#include "convertgb18030.tab"
-#include "convertiso2022cn.tab"
-#include "convertiso2022jp.tab"
-#include "convertiso2022kr.tab"
-#include "convertadobe.tab"
+extern "C" {
+        typedef ImplTextEncodingData const *(*TextEncodingFunction) (rtl_TextEncoding nEncoding);
+};
+
+// Yes - we should use the unpleasant to use templatized
+// sal:: doublecheckfoo thing here.
+static TextEncodingFunction pTables;
+
+#define DOSTRING( x )  #x
+#define STRING( x )    DOSTRING( x )
 
 ImplTextEncodingData const *
 Impl_getTextEncodingData(rtl_TextEncoding nEncoding) SAL_THROW_EXTERN_C()
 {
-    static ImplTextEncodingData const * const aData[]
-        = { NULL, /* DONTKNOW */
-            &aImplMS1252TextEncodingData, /* MS_1252 */
-            &aImplAPPLEROMANTextEncodingData, /* APPLE_ROMAN */
-            &aImplIBM437TextEncodingData, /* IBM_437 */
-            &aImplIBM850TextEncodingData, /* IBM_850 */
-            &aImplIBM860TextEncodingData, /* IBM_860 */
-            &aImplIBM861TextEncodingData, /* IBM_861 */
-            &aImplIBM863TextEncodingData, /* IBM_863 */
-            &aImplIBM865TextEncodingData, /* IBM_865 */
-            NULL, /* reserved (SYSTEM) */
-            &aImplSYMBOLTextEncodingData, /* SYMBOL */
-            &aImplUSASCIITextEncodingData, /* ASCII_US */
-            &aImplISO88591TextEncodingData, /* ISO_8859_1 */
-            &aImplISO88592TextEncodingData, /* ISO_8859_2 */
-            &aImplISO88593TextEncodingData, /* ISO_8859_3 */
-            &aImplISO88594TextEncodingData, /* ISO_8859_4 */
-            &aImplISO88595TextEncodingData, /* ISO_8859_5 */
-            &aImplISO88596TextEncodingData, /* ISO_8859_6 */
-            &aImplISO88597TextEncodingData, /* ISO_8859_7 */
-            &aImplISO88598TextEncodingData, /* ISO_8859_8 */
-            &aImplISO88599TextEncodingData, /* ISO_8859_9 */
-            &aImplISO885914TextEncodingData, /* ISO_8859_14 */
-            &aImplISO885915TextEncodingData, /* ISO_8859_15 */
-            &aImplIBM737TextEncodingData, /* IBM_737 */
-            &aImplIBM775TextEncodingData, /* IBM_775 */
-            &aImplIBM852TextEncodingData, /* IBM_852 */
-            &aImplIBM855TextEncodingData, /* IBM_855 */
-            &aImplIBM857TextEncodingData, /* IBM_857 */
-            &aImplIBM862TextEncodingData, /* IBM_862 */
-            &aImplIBM864TextEncodingData, /* IBM_864 */
-            &aImplIBM866TextEncodingData, /* IBM_866 */
-            &aImplIBM869TextEncodingData, /* IBM_869 */
-            &aImplMS874TextEncodingData, /* MS_874 */
-            &aImplMS1250TextEncodingData, /* MS_1250 */
-            &aImplMS1251TextEncodingData, /* MS_1251 */
-            &aImplMS1253TextEncodingData, /* MS_1253 */
-            &aImplMS1254TextEncodingData, /* MS_1254 */
-            &aImplMS1255TextEncodingData, /* MS_1255 */
-            &aImplMS1256TextEncodingData, /* MS_1256 */
-            &aImplMS1257TextEncodingData, /* MS_1257 */
-            &aImplMS1258TextEncodingData, /* MS_1258 */
-            NULL, /* TODO! APPLE_ARABIC */
-            &aImplAPPLECENTEUROTextEncodingData, /* APPLE_CENTEURO */
-            &aImplAPPLECROATIANTextEncodingData, /* APPLE_CROATIAN */
-            &aImplAPPLECYRILLICTextEncodingData, /* APPLE_CYRILLIC */
-            NULL, /* TODO! APPLE_DEVANAGARI */
-            NULL, /* TODO! APPLE_FARSI */
-            &aImplAPPLEGREEKTextEncodingData, /* APPLE_GREEK */
-            NULL, /* TODO! APPLE_GUJARATI */
-            NULL, /* TODO! APPLE_GURMUKHI */
-            NULL, /* TODO! APPLE_HEBREW */
-            &aImplAPPLEICELANDTextEncodingData, /* APPLE_ICELAND */
-            &aImplAPPLEROMANIANTextEncodingData, /* APPLE_ROMANIAN */
-            NULL, /* TODO! APPLE_THAI */
-            &aImplAPPLETURKISHTextEncodingData, /* APPLE_TURKISH */
-            &aImplAPPLEUKRAINIANTextEncodingData, /* APPLE_UKRAINIAN */
-            &aImplAPPLECHINSIMPTextEncodingData, /* APPLE_CHINSIMP */
-            &aImplAPPLECHINTRADTextEncodingData, /* APPLE_CHINTRAD */
-            &aImplAPPLEJAPANESETextEncodingData, /* APPLE_JAPANESE */
-            &aImplAPPLEKOREANTextEncodingData, /* APPLE_KOREAN */
-            &aImplMS932TextEncodingData, /* MS_932 */
-            &aImplMS936TextEncodingData, /* MS_936 */
-            &aImplMS949TextEncodingData, /* MS_949 */
-            &aImplMS950TextEncodingData, /* MS_950 */
-            &aImplSJISTextEncodingData, /* SHIFT_JIS */
-            &aImplGB2312TextEncodingData, /* GB_2312 */
-            &aImplGBT12345TextEncodingData, /* GBT_12345 */
-            &aImplGBKTextEncodingData, /* GBK */
-            &aImplBIG5TextEncodingData, /* BIG5 */
-            &aImplEUCJPTextEncodingData, /* EUC_JP */
-            &aImplEUCCNTextEncodingData, /* EUC_CN */
-            &aImplEucTwTextEncodingData, /* EUC_TW */
-            &aImplIso2022JpTextEncodingData, /* ISO_2022_JP */
-            &aImplIso2022CnTextEncodingData, /* ISO_2022_CN */
-            &aImplKOI8RTextEncodingData, /* KOI8_R */
-            &aImplUTF7TextEncodingData, /* UTF7 */
-            &aImplUTF8TextEncodingData, /* UTF8 */
-            &aImplISO885910TextEncodingData, /* ISO_8859_10 */
-            &aImplISO885913TextEncodingData, /* ISO_8859_13 */
-            &aImplEUCKRTextEncodingData, /* EUC_KR */
-            &aImplIso2022KrTextEncodingData, /* ISO_2022_KR */
-            &aImplJISX0201TextEncodingData, /* JIS_X_0201 */
-            &aImplJISX0208TextEncodingData, /* JIS_X_0208 */
-            &aImplJISX0212TextEncodingData, /* JIS_X_0212 */
-            &aImplMS1361TextEncodingData, /* MS_1361 */
-            &aImplGb18030TextEncodingData, /* GB_18030 */
-            &aImplBig5HkscsTextEncodingData, /* BIG5_HKSCS */
-            &aImplTis620TextEncodingData, /* TIS_620 */
-            &aImplKoi8UTextEncodingData, /* KOI8_U */
-            &aImplIsciiDevanagariTextEncodingData, /* ISCII_DEVANAGARI */
-            &aImplJavaUtf8TextEncodingData, /* JAVA_UTF8 */
-            &adobeStandardEncodingData, /* ADOBE_STANDARD */
-            &adobeSymbolEncodingData, /* ADOBE_SYMBOL */
-            &aImplPT154TextEncodingData, /* PT154 */
-            &adobeDingbatsEncodingData }; /* ADOBE_DINGBATS */
-    return
-        nEncoding < sizeof aData / sizeof aData[0] ? aData[nEncoding] : NULL;
+    switch(nEncoding)
+    {
+        case RTL_TEXTENCODING_ASCII_US:
+            return &aImplUSASCIITextEncodingData; break;
+        case RTL_TEXTENCODING_MS_1252:
+            return &aImplMS1252TextEncodingData; break;
+        case RTL_TEXTENCODING_UTF8:
+            return &aImplUTF8TextEncodingData; break;
+        case RTL_TEXTENCODING_ISO_8859_1:
+            return &aImplISO88591TextEncodingData; break;
+
+#ifndef TOOLS_STRING_MISSUSE
+// ----------------------------------------------
+// These are here temporarily since they are used in error
+// all over the place
+// ----------------------------------------------
+        case RTL_TEXTENCODING_IBM_850:
+            return &aImplIBM850TextEncodingData; break;
+        case RTL_TEXTENCODING_IBM_857:
+            return &aImplIBM857TextEncodingData; break;
+        case RTL_TEXTENCODING_IBM_860:
+            return &aImplIBM860TextEncodingData; break;
+        case RTL_TEXTENCODING_IBM_861:
+            return &aImplIBM861TextEncodingData; break;
+        case RTL_TEXTENCODING_IBM_863:
+            return &aImplIBM863TextEncodingData; break;
+// ----------------------------------------------
+#endif
+        default:
+            if (!pTables)
+            {
+                static char const pName[] = STRING(PLUGIN_NAME);
+                oslModule aModule = osl_loadModuleAscii(pName, SAL_LOADMODULE_DEFAULT);
+
+                if(aModule)
+                {
+                    static char const pSymbol[] = "Impl_getTextEncodingData";
+                    pTables = (TextEncodingFunction)osl_getAsciiFunctionSymbol(aModule, pSymbol);
+                }
+            }
+            if (pTables)
+                return pTables(nEncoding);
+//          else
+//              fprintf (stderr, "missing text encoding library for %d\n", nEncoding);
+            break;
+    }
+    return NULL;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/unichars.c b/sal/textenc/unichars.c
index 454e057c7f84..0d4131699732 100644
--- a/sal/textenc/unichars.c
+++ b/sal/textenc/unichars.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -134,3 +135,5 @@ sal_uInt32 ImplCombineSurrogates(sal_uInt32 nHigh, sal_uInt32 nLow)
                "specification violation");
     return (((nHigh & 0x3FF) << 10) | (nLow & 0x3FF)) + 0x10000;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/unichars.h b/sal/textenc/unichars.h
index f629432a29f8..f1e18460dfb0 100644
--- a/sal/textenc/unichars.h
+++ b/sal/textenc/unichars.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,3 +61,5 @@ sal_uInt32 ImplCombineSurrogates(sal_uInt32 nHigh, sal_uInt32 nLow)
 #endif /* __cpluscplus */
 
 #endif /* INCLUDED_RTL_TEXTENC_UNICHARS_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/typesconfig/makefile.mk b/sal/typesconfig/makefile.mk
index d5f7db30dd5c..662bd7d7e186 100644
--- a/sal/typesconfig/makefile.mk
+++ b/sal/typesconfig/makefile.mk
@@ -42,20 +42,50 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 # --- Files --------------------------------------------------------
 
+.IF "$(CROSS_COMPILING)"!="YES" && "$(COM)"!="MSC"
+
 APP1TARGET=	$(TARGET)
 APP1OBJS=		$(OBJ)$/typesconfig.obj
 APP1STDLIBS=
 APP1DEF=
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
 
 .IF "$(L10N-framework)"==""
+.IF "$(COM)"!="MSC"
 ALLTAR : $(INCCOM)$/sal$/typesizes.h
+.ENDIF
 .ENDIF			# "$(L10N-framework)"==""
 
+.IF "$(CROSS_COMPILING)"!="YES"
+
 $(INCCOM)$/sal$/typesizes.h : $(BIN)$/$(TARGET)
     -$(MKDIR) $(INCCOM)$/sal
     $(AUGMENT_LIBRARY_PATH) $(BIN)$/$(TARGET) $@
 
+.ELSE
+
+$(INCCOM)$/sal$/typesizes.h : 
+    -$(MKDIRHIER) $(INCCOM)$/sal
+    echo '/* This file is autogenerated from configure script data */' >$@
+    echo >>$@
+    echo "#define SAL_TYPES_ALIGNMENT2	$(ALIGNOF_SHORT)" >>$@
+    echo "#define SAL_TYPES_ALIGNMENT4	$(ALIGNOF_INT)" >>$@
+.IF "$(SIZEOF_LONG)"=="8"
+    echo "#define SAL_TYPES_ALIGNMENT8	$(ALIGNOF_LONG)" >>$@
+.ELIF "$(SIZEOF_DOUBLE)"=="8"
+    echo "#define SAL_TYPES_ALIGNMENT8	$(ALIGNOF_DOUBLE)" >>$@
+.ELSE
+    echo "#error alignment of some 8-byte type unknown" >>$@
+.ENDIF
+    echo "#define SAL_TYPES_SIZEOFSHORT	$(SIZEOF_SHORT)" >>$@
+    echo "#define SAL_TYPES_SIZEOFINT	$(SIZEOF_INT)" >>$@
+    echo "#define SAL_TYPES_SIZEOFLONG	$(SIZEOF_LONG)" >>$@
+    echo "#define SAL_TYPES_SIZEOFLONGLONG	$(SIZEOF_LONGLONG)" >>$@
+    echo "#define SAL_TYPES_SIZEOFPOINTER	$(SIZEOF_POINTER)" >>$@
+
+.ENDIF
diff --git a/sal/typesconfig/typesconfig.c b/sal/typesconfig/typesconfig.c
index 708837be926b..3ede103a17b2 100644
--- a/sal/typesconfig/typesconfig.c
+++ b/sal/typesconfig/typesconfig.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,9 +51,6 @@
 |*
 |*  Beschreibung        True, wenn CPU BigEndian ist
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 int IsBigEndian()
 {
@@ -75,9 +73,6 @@ typedef int (*TestFunc)( Type, void* );
 |*
 |*  Beschreibung        Testfunktion fuer variable Parameter
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 void PrintArgs( int p, ... )
 {
@@ -101,9 +96,6 @@ void PrintArgs( int p, ... )
 |*
 |*  Beschreibung        faengt SIGBUS und SIGSEGV in check() ab
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 
 static sigjmp_buf jmpbuf;
@@ -122,9 +114,6 @@ void SignalHdl( int sig )
 |*
 |*  Beschreibung        Testet MemoryZugriff (read/write)
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 int check( TestFunc func, Type eT, void* p )
 {
@@ -156,9 +145,6 @@ int check( TestFunc func, Type eT, void* p )
 |*
 |*  Beschreibung        memory read access
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 #if defined(IA64) || defined(ARM32) || defined(HPPA) || defined(AXP)
 
@@ -215,9 +201,6 @@ int dummy(void* unused)
 |*
 |*  Beschreibung        memory write access
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 int SetAtAddress( Type eT, void* p )
 {
@@ -252,9 +235,6 @@ char* TypeName( Type eT )
 |*  Beschreibung        Testet MemoryZugriff (read/write)
 |*                      Zugriffsverletzungen werden abgefangen
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 int CheckGetAccess( Type eT, void* p )
 {
@@ -286,9 +266,6 @@ int CheckSetAccess( Type eT, void* p )
 |*
 |*  Beschreibung        Bestimmt das Alignment verschiedener Typen
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 int GetAlignment( Type eT )
 {
@@ -313,9 +290,6 @@ int GetAlignment( Type eT )
 |*
 |*  Beschreibung        Beschreibt die Parameter der Architektur
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 struct Description
 {
@@ -329,9 +303,6 @@ struct Description
 |*
 |*  Beschreibung        Bestimmt die Parameter der Architektur
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 void Description_Ctor( struct Description* pThis )
 {
@@ -358,9 +329,6 @@ void Description_Ctor( struct Description* pThis )
 |*
 |*  Beschreibung        Schreibt die Parameter der Architektur als Header
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 void Description_Print( struct Description* pThis, char* name )
 {
@@ -397,9 +365,6 @@ void Description_Print( struct Description* pThis, char* name )
 |*
 |*  Beschreibung        Informeller Bytezugriffstest
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 void InfoMemoryAccess( char* p )
 {
@@ -420,9 +385,6 @@ void InfoMemoryAccess( char* p )
 |*
 |*  Beschreibung        Informeller Zugriffstest verschiedener Typen
 |*
-|*  Ersterstellung      EG 15.08.96
-|*  Letzte Aenderung
-|*
 *************************************************************************/
 void InfoMemoryTypeAccess( Type eT )
 {
@@ -488,3 +450,5 @@ int main( int argc, char* argv[] )
 
   exit( 0 );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index 82ebbc811c8d..22f85949dbae 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -66,29 +66,13 @@ LIB1FILES=	\
     $(SLB)$/cpprtl.lib	\
     $(SLB)$/textenc.lib 
 
-#.IF "$(GUI)"=="UNX"
-#LIB1FILES+=$(SLB)$/systoolsunx.lib
-#.ENDIF # UNX
-
-
-LIB3TARGET=$(LB)$/a$(TARGET).lib
-LIB3ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
-LIB3FILES=	\
-    $(LB)$/oslall.lib	\
-    $(LB)$/cpposl.lib	\
-    $(LB)$/cpprtl.lib	\
-    $(LB)$/textenc.lib
-
-#.IF "$(GUI)"=="UNX"
-#LIB3FILES+=$(LB)$/systoolsunx.lib
-#.ENDIF # UNX
-
-.IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2"
+.IF "$(COM)" == "MSC"
 SHL1TARGET= $(TARGET)
+SHL1IMPLIB= i$(TARGET)
 .ELSE
 SHL1TARGET= uno_$(TARGET)
+SHL1IMPLIB= $(SHL1TARGET)
 .ENDIF
-SHL1IMPLIB= i$(TARGET)
 SHL1VERSIONMAP=	$(TARGET).map
 SHL1RPATH=URELIB
 
@@ -103,7 +87,7 @@ UWINAPILIB=     $(LB)$/uwinapi.lib
 SHL1STDLIBS=	\
                 $(UWINAPILIB)\
                 $(ADVAPI32LIB)\
-                $(WSOCK32LIB)\
+                $(WS2_32LIB)\
                 $(MPRLIB)\
                 $(SHELL32LIB)\
                 $(COMDLG32LIB)\
@@ -125,43 +109,10 @@ SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract
 .ENDIF # SOLARIS
 .ENDIF # UNX
 
-.IF "$(GUI)"=="OS2"
-SHL1STDLIBS=pthread.lib
-.ENDIF # OS2
-
-# If we compile sal with STLport checking iterators
-# we need to link against the STLport
-.IF "$(USE_STLP_DEBUG)" != ""
-SHL1STDLIBS+=$(LIBSTLPORT)
-.ENDIF
-
-#The irony that using the system STL instead of
-#stlport requires that we link libsal with the
-#LIBSTLPORT alias which is not required when using
-#stlport is not lost on me
-.IF "$(USE_SYSTEM_STL)"=="YES"
-SHL1STDLIBS+=$(LIBSTLPORT)
-.ENDIF
-
 .IF "$(OS)"=="MACOSX"
 SHL1STDLIBS+=-framework CoreFoundation -framework Carbon
 .ENDIF
 
-.IF "$(OS)" == "LINUX"
-.IF "$(PAM_LINK)" == "YES"
-SHL1STDLIBS+=-lpam
-.ENDIF
-.IF "$(CRYPT_LINK)" == "YES"
-SHL1STDLIBS+=-lcrypt
-.ENDIF
-.ENDIF
-
-# #i105898# required for LD_PRELOAD libsalalloc_malloc.so
-#           if sal is linked with -Bsymbolic-functions
-.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
-SHL1LINKFLAGS+=-Wl,--dynamic-list=salalloc.list
-.ENDIF # .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
-
 SHL1LIBS+=$(SLB)$/$(TARGET).lib
 
 .IF "$(linkinc)" != ""
@@ -182,24 +133,6 @@ SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME= $(SHL1TARGET)
 
-#
-# This part builds a tiny extra lib,
-# containing an alloc.c which uses system 
-# heap instead of our own mem management. 
-# This is e.g. useful for proper valgrinding
-# the office.
-#
-.IF "$(OS)"=="LINUX"
-
-TARGET2 = salalloc_malloc
-SHL2TARGET= $(TARGET2)
-SHL2IMPLIB= i$(TARGET2)
-SHL2VERSIONMAP=	salalloc.map
-
-SHL2LIBS+=$(SLB)$/SYSALLOC_cpprtl.lib
-
-.ENDIF # .IF "$(OS)"=="LINUX"
-
 # --- Coverage -----------------------------------------------------
 # LLA: 20040304 The follows lines are an additional which is only need if we run
 #               coverage tests. For normal test runs this feature is not used.
@@ -219,6 +152,15 @@ SHL1STDLIBS+=-lgcc
 .ENDIF
 .ENDIF
 
+SHL4DEPN+=$(SHL1TARGETN)
+SHL4LIBS=$(SLB)$/textenc_tables.lib
+SHL4TARGET=sal_textenc
+SHL4STDLIBS=$(SALLIB)
+SHL4VERSIONMAP=saltextenc.map
+
+SHL4DEF=$(MISC)$/$(SHL4TARGET).def
+DEF4NAME=$(SHL4TARGET)
+
 # --- Targets ------------------------------------------------------
 
 .ENDIF # $(header) != ""
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 73ae4431100e..020e11fbcb57 100755
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -553,6 +553,7 @@ UDK_3.5 {
 
 UDK_3.6 { # OOo 2.3
     global:
+        osl_loadModuleAscii;
         osl_getAsciiFunctionSymbol;
         osl_getModuleHandle;
         rtl_uString_intern;
diff --git a/sal/util/salalloc.list b/sal/util/salalloc.list
deleted file mode 100644
index 303d225dda7f..000000000000
--- a/sal/util/salalloc.list
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-        rtl_allocateMemory;
-        rtl_reallocateMemory;
-        rtl_freeMemory;
-        rtl_allocateZeroMemory;
-        rtl_freeZeroMemory;
-};
diff --git a/sal/util/salalloc.map b/sal/util/salalloc.map
deleted file mode 100644
index 3cd098b83bdf..000000000000
--- a/sal/util/salalloc.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        rtl_allocateMemory;
-        rtl_reallocateMemory;
-        rtl_freeMemory;
-        rtl_allocateZeroMemory;
-        rtl_freeZeroMemory;
-    local:
-        *;
-};
diff --git a/sal/util/saltextenc.map b/sal/util/saltextenc.map
new file mode 100644
index 000000000000..e88a0af15723
--- /dev/null
+++ b/sal/util/saltextenc.map
@@ -0,0 +1,6 @@
+UDK_3_0_0 {
+    global:
+    Impl_getTextEncodingData;
+    local:
+        *;
+};
diff --git a/sal/workben/clipboardwben/testcopy/StdAfx.cpp b/sal/workben/clipboardwben/testcopy/StdAfx.cpp
index cb07d603f28f..b39aced7f001 100644
--- a/sal/workben/clipboardwben/testcopy/StdAfx.cpp
+++ b/sal/workben/clipboardwben/testcopy/StdAfx.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet
 //  TestWin32.pch ist die vorkompilierte Header-Datei
 //  stdafx.obj enth�lt die vorkompilierte Typinformation
@@ -6,3 +7,5 @@
 
 // ZU ERLEDIGEN: Verweis auf alle zus�tzlichen Header-Dateien, die Sie in STDAFX.H
 // und nicht in dieser Datei ben�tigen
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testcopy/StdAfx.h b/sal/workben/clipboardwben/testcopy/StdAfx.h
index bb762adbdc36..d71036003969 100644
--- a/sal/workben/clipboardwben/testcopy/StdAfx.h
+++ b/sal/workben/clipboardwben/testcopy/StdAfx.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // stdafx.h : Include-Datei f�r Standard-System-Include-Dateien,
 //  oder projektspezifische Include-Dateien, die h�ufig benutzt, aber
 //      in unregelm��igen Abst�nden ge�ndert werden.
@@ -30,3 +31,5 @@
 // Microsoft Visual C++ f�gt zus�tzliche Deklarationen unmittelbar vor der vorherigen Zeile ein.
 
 #endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
index 14887dd9021c..d8e80a895c27 100644
--- a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
+++ b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
 //------------------------------------------------------------------------
 #include <osl/diagnose.h>
 
-#ifndef _TWRAPPERDATAOBJECT_HXX_
 #include "XTDataObject.hxx"
-#endif
 
 #include <windows.h>
 #include <ole2.h>
@@ -468,3 +467,4 @@ STDMETHODIMP CEnumFormatEtc::Clone( IEnumFORMATETC** ppenum )
     return hr;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
index d2639b591590..213247c1e6b2 100644
--- a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
+++ b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,11 +45,6 @@
 #include <ole2.h>
 #include <objidl.h>
 
-
-//------------------------------------------------------------------------
-//
-//------------------------------------------------------------------------
-
 class EnumFormatEtc;
 
 class CXTDataObject : public IDataObject
@@ -98,10 +94,6 @@ private:
     friend class CEnumFormatEtc;
 };
 
-//------------------------------------------------------------------------
-//
-//------------------------------------------------------------------------
-
 class CEnumFormatEtc : public IEnumFORMATETC
 {
 public:
@@ -130,3 +122,5 @@ private:
 typedef CEnumFormatEtc *PCEnumFormatEtc;
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testcopy/cbcpytest.cxx b/sal/workben/clipboardwben/testcopy/cbcpytest.cxx
index 1ce6c8cd2d76..b9f3b64b45b3 100644
--- a/sal/workben/clipboardwben/testcopy/cbcpytest.cxx
+++ b/sal/workben/clipboardwben/testcopy/cbcpytest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -400,3 +401,4 @@ void SetLocale()
     LCID threadLcid = GetThreadLocale();
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testcopy/resource.h b/sal/workben/clipboardwben/testcopy/resource.h
index 5f70db1bb13f..49813993870a 100644
--- a/sal/workben/clipboardwben/testcopy/resource.h
+++ b/sal/workben/clipboardwben/testcopy/resource.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
 // Used by cbcpytest.rc
@@ -29,3 +30,5 @@
 #define _APS_NEXT_SYMED_VALUE           110
 #endif
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testpaste/StdAfx.cpp b/sal/workben/clipboardwben/testpaste/StdAfx.cpp
index cb07d603f28f..b39aced7f001 100644
--- a/sal/workben/clipboardwben/testpaste/StdAfx.cpp
+++ b/sal/workben/clipboardwben/testpaste/StdAfx.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet
 //  TestWin32.pch ist die vorkompilierte Header-Datei
 //  stdafx.obj enth�lt die vorkompilierte Typinformation
@@ -6,3 +7,5 @@
 
 // ZU ERLEDIGEN: Verweis auf alle zus�tzlichen Header-Dateien, die Sie in STDAFX.H
 // und nicht in dieser Datei ben�tigen
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testpaste/StdAfx.h b/sal/workben/clipboardwben/testpaste/StdAfx.h
index bb762adbdc36..d71036003969 100644
--- a/sal/workben/clipboardwben/testpaste/StdAfx.h
+++ b/sal/workben/clipboardwben/testpaste/StdAfx.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // stdafx.h : Include-Datei f�r Standard-System-Include-Dateien,
 //  oder projektspezifische Include-Dateien, die h�ufig benutzt, aber
 //      in unregelm��igen Abst�nden ge�ndert werden.
@@ -30,3 +31,5 @@
 // Microsoft Visual C++ f�gt zus�tzliche Deklarationen unmittelbar vor der vorherigen Zeile ein.
 
 #endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testpaste/cbptest.cxx b/sal/workben/clipboardwben/testpaste/cbptest.cxx
index f26d51ec6d72..442b3728a824 100644
--- a/sal/workben/clipboardwben/testpaste/cbptest.cxx
+++ b/sal/workben/clipboardwben/testpaste/cbptest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -426,3 +427,5 @@ void PasteClipboardData(HWND hwndParent)
     }
 }
 */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testpaste/resource.h b/sal/workben/clipboardwben/testpaste/resource.h
index 5206e911eabf..3f0af2dc3ecc 100644
--- a/sal/workben/clipboardwben/testpaste/resource.h
+++ b/sal/workben/clipboardwben/testpaste/resource.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
 // Used by mtacb.rc
@@ -26,3 +27,5 @@
 #define _APS_NEXT_SYMED_VALUE           110
 #endif
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testviewer/StdAfx.cpp b/sal/workben/clipboardwben/testviewer/StdAfx.cpp
index cb07d603f28f..b39aced7f001 100644
--- a/sal/workben/clipboardwben/testviewer/StdAfx.cpp
+++ b/sal/workben/clipboardwben/testviewer/StdAfx.cpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet
 //  TestWin32.pch ist die vorkompilierte Header-Datei
 //  stdafx.obj enth�lt die vorkompilierte Typinformation
@@ -6,3 +7,5 @@
 
 // ZU ERLEDIGEN: Verweis auf alle zus�tzlichen Header-Dateien, die Sie in STDAFX.H
 // und nicht in dieser Datei ben�tigen
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testviewer/StdAfx.h b/sal/workben/clipboardwben/testviewer/StdAfx.h
index bb762adbdc36..d71036003969 100644
--- a/sal/workben/clipboardwben/testviewer/StdAfx.h
+++ b/sal/workben/clipboardwben/testviewer/StdAfx.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // stdafx.h : Include-Datei f�r Standard-System-Include-Dateien,
 //  oder projektspezifische Include-Dateien, die h�ufig benutzt, aber
 //      in unregelm��igen Abst�nden ge�ndert werden.
@@ -30,3 +31,5 @@
 // Microsoft Visual C++ f�gt zus�tzliche Deklarationen unmittelbar vor der vorherigen Zeile ein.
 
 #endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testviewer/cbvtest.cxx b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
index d79758971728..1368b34f2f1e 100644
--- a/sal/workben/clipboardwben/testviewer/cbvtest.cxx
+++ b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -349,3 +350,4 @@ void CALLBACK OnClipboardContentChange( void )
     UpdateWindow( g_hwndMain );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testviewer/resource.h b/sal/workben/clipboardwben/testviewer/resource.h
index fa4a79779aa9..87f33704b725 100644
--- a/sal/workben/clipboardwben/testviewer/resource.h
+++ b/sal/workben/clipboardwben/testviewer/resource.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
 // Used by cbvtest.rc
@@ -30,3 +31,5 @@
 #define _APS_NEXT_SYMED_VALUE           110
 #endif
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/getlocaleinfotest.cxx b/sal/workben/getlocaleinfotest.cxx
index a0c3134c5fa4..f8467e945a91 100644
--- a/sal/workben/getlocaleinfotest.cxx
+++ b/sal/workben/getlocaleinfotest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,8 +35,8 @@
 
 int _cdecl main( int argc, char * argv[] )
 {
-    rtl::OUString lang = rtl::OUString::createFromAscii( "de" );
-    rtl::OUString country = rtl::OUString::createFromAscii( "DE" );
+    rtl::OUString lang(RTL_CONSTASCII_USTRINGPARAM("de"));
+    rtl::OUString country(RTL_CONSTASCII_USTRINGPARAM("DE"));
     rtl_TextEncoding rtlTextEnc;
 
     rtl_Locale* rtlLocale =
@@ -48,3 +49,4 @@ int _cdecl main( int argc, char * argv[] )
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk
index c93d756ba132..79b18ac4f55d 100644
--- a/sal/workben/makefile.mk
+++ b/sal/workben/makefile.mk
@@ -31,356 +31,208 @@ PRJNAME=sal
 TARGET=workben
 LIBTARGET=NO
 TARGETTYPE=CUI
-#ENABLE_EXCEPTIONS=TRUE
 NO_DEFAULT_STL=YES
 
-#TESTAPP=test_osl_getVolInfo
-#TESTAPP=test_osl_joinProcess
-#TESTAPP=getlocaleinfotest
-#TESTAPP=test_osl_joinProcess
-#TESTAPP=getlocaleinfotest
-#TESTAPP=salstattest
-#TESTAPP=saldyntest
-
-TESTAPP=t_readline
-#TESTAPP=t_cipher
-#TESTAPP=t_digest
-#TESTAPP=t_random
-#TESTAPP=t_layer
-#TESTAPP=t_tls
-#TESTAPP=t_zip
-
-#TESTAPP=testfile
-#TESTAPP=testpipe
-#TESTAPP=testpip2
-#TESTAPP=testproc
-#TESTAPP=tgetpwnam
-#TESTAPP=salstattest
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
 
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
+CFLAGS+=$(LFS_CFLAGS)
+CXXFLAGS+=$(LFS_CFLAGS)
 
 # --- Files --------------------------------------------------------
 
-.IF "$(TESTAPP)" == "test_osl_getVolInfo"    
-
-SHL1OBJS=$(SLO)$/t_osl_getVolInfo.obj
-SHL1TARGET=togvi
-
-.IF "$(GUI)" == "WNT"
-APP1STDLIBS=$(KERNEL32LIB)
-SHL1STDLIBS=$(LB)$/isal.lib
-SHL1STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS=$(LB)$/libsal.so
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-.ENDIF
-    
-SHL1IMPLIB=i$(SHL1TARGET) 
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET) 
-DEF1EXPORTFILE=export.exp
-.ENDIF
-
-.IF "$(TESTAPP)" == "test_osl_joinProcess"    
-OBJFILES=$(OBJ)$/t_ojp_exe.obj 
-APP1TARGET=ojpx
-APP1OBJS=$(OBJFILES)
-
-.IF "$(GUI)" == "UNX"
-APP1STDLIBS=$(LB)$/libsal.so
-.ENDIF
-
-SHL1OBJS=$(SLO)$/t_osl_joinProcess.obj
-SHL1TARGET=tojp
-
-.IF "$(GUI)" == "WNT"
-APP1STDLIBS=$(KERNEL32LIB)
-SHL1STDLIBS=$(LB)$/isal.lib
-SHL1STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS=$(LB)$/libsal.so
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-.ENDIF
-    
-SHL1IMPLIB=i$(SHL1TARGET) 
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET) 
-DEF1EXPORTFILE=export.exp
-.ENDIF
-
-.IF "$(TESTAPP)" == "getlocaleinfotest"
-
-    OBJFILES=$(OBJ)$/getlocaleinfotest.obj
-
-    APP1TARGET=	getlitest
-    APP1OBJS=$(OBJFILES)
-
-    APP1STDLIBS=\
-                $(KERNEL32LIB)
-
-    APP1LIBS=\
-            $(LB)$/kernel9x.lib\
-            $(LB)$/isal.lib
-
-    APP1DEPN=$(LB)$/isal.lib
-
-.ENDIF
-
-.IF "$(TESTAPP)" == "salstattest"
-
-    CFLAGS+= -DUSE_SAL_STATIC
-
-    OBJFILES=	$(OBJ)$/salstattest.obj
-
-    APP1TARGET=	salstattest
-    APP1OBJS=	$(OBJFILES)
-    APP1STDLIBS=\
-                $(LB)$/asal.lib\
-                $(SHELL32LIB)\
-                $(USER32LIB)\
-                $(COMDLG32LIB)\
-                $(ADVAPI32LIB)
-
-    APP1DEPN=	$(LB)$/asal.lib	
-
-.ENDIF # salstattest
-
-.IF "$(TESTAPP)" == "saldyntest"
-
-    OBJFILES=	$(OBJ)$/saldyntest.obj
-
-    APP1TARGET=	saldyntest
-    APP1OBJS=	$(OBJFILES)
-    APP1STDLIBS=\
-                $(LB)$/isal.lib\
-                $(SHELL32LIB)\
-                $(USER32LIB)\
-                $(COMDLG32LIB)\
-                $(ADVAPI32LIB)
-
-    APP1DEPN=	$(LB)$/isal.lib
-
-.ENDIF # salstattest
-
 #
 # t_readline
 #
-.IF "$(TESTAPP)" == "t_readline"
-
-CFILES=		t_readline.c
-OBJFILES=	$(OBJ)$/t_readline.obj
+OBJFILES+=\
+    $(OBJ)$/t_readline.obj
 
-APP1TARGET=	t_readline
-APP1OBJS=	$(OBJFILES)
+APP1TARGET=t_readline
+APP1OBJS=$(OBJ)$/t_readline.obj
 APP1STDLIBS=$(SALLIB)
-APP1DEPN=	$(SLB)$/sal.lib
-
+APP1DEPN=$(SLB)$/sal.lib
 APP1RPATH=UREBIN
 
-.ENDIF # t_readline
-
 #
-# t_cipher
+# testfile
 #
-.IF "$(TESTAPP)" == "t_cipher"
-
-CFILES=		t_cipher.c
-OBJFILES=	$(OBJ)$/t_cipher.obj
+OBJFILES+=\
+    $(OBJ)$/testfile.obj
 
-APP1TARGET=	t_cipher
-APP1OBJS=	$(OBJFILES)
+APP1TARGET=testfile
+APP1OBJS=$(OBJ)$/testfile.obj
 APP1STDLIBS=$(SALLIB)
-APP1DEPN=	$(SLB)$/sal.lib
-
-.ENDIF # t_cipher
+APP1DEPN=$(SLB)$/sal.lib
 
 #
-# t_digest.
+# testpipe
 #
-.IF "$(TESTAPP)" == "t_digest"
+OBJFILES+=\
+    $(OBJ)$/testpipe.obj
 
-CFILES=		t_digest.c
-OBJFILES=	$(OBJ)$/t_digest.obj
-
-APP2TARGET=	t_digest
-APP2OBJS=	$(OBJFILES)
+APP2TARGET=testpipe
+APP2OBJS=$(OBJ)$/testpipe.obj
 APP2STDLIBS=$(SALLIB)
-APP2DEPN=	$(SLB)$/sal.lib
-
-.ENDIF # t_digest
+APP2DEPN=$(SLB)$/sal.lib
 
 #
-# t_random.
+# testpip2
 #
-.IF "$(TESTAPP)" == "t_random"
+OBJFILES+=\
+    $(OBJ)$/testpip2.obj
 
-CFILES=		t_random.c
-OBJFILES=	$(OBJ)$/t_random.obj
-
-APP3TARGET=	t_random
-APP3OBJS=	$(OBJFILES)
+APP3TARGET=testpip2
+APP3OBJS=$(OBJ)$/testpip2.obj
 APP3STDLIBS=$(SALLIB)
-APP3DEPN=	$(SLB)$/sal.lib
-
-.ENDIF # t_random
+APP3DEPN=$(SLB)$/sal.lib
 
 #
-# t_layer.
+# testproc
 #
-.IF "$(TESTAPP)" == "t_layer"
+OBJFILES+=\
+    $(OBJ)$/testproc.obj
 
-CFILES=		t_layer.c
-OBJFILES=	$(OBJ)$/t_layer.obj
-
-APP4TARGET=	t_layer
-APP4OBJS=	$(OBJFILES)
+APP4TARGET=testproc
+APP4OBJS=$(OBJ)$/testproc.obj
 APP4STDLIBS=$(SALLIB)
-APP4DEPN=	$(SLB)$/sal.lib
-
-.ENDIF # t_layer
+APP4DEPN=$(SLB)$/sal.lib
 
 #
-# t_tls.
+# tgetpwnam
 #
-.IF "$(TESTAPP)" == "t_tls"
-
-CFILES=		t_tls.c
-OBJFILES=	$(OBJ)$/t_tls.obj
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD" || \
+    "$(OS)"=="DRAGONFLY"
+OBJFILES+=\
+    $(OBJ)$/tgetpwnam.obj
 
-.IF "$(SALTLSLIB)" == ""
-
-.IF "$(GUI)" == "UNX"
-SALTLSLIB=		-lsaltls2
-.ENDIF # unx
-
-.IF "$(GUI)" == "WNT"
-SALTLSLIB=		$(SALTLSLIB)
-.ENDIF # wnt
-
-.ENDIF # saltlslib
-
-APP5TARGET=	t_tls
-APP5OBJS=	$(OBJFILES)
-APP5STDLIBS=$(SALTLSLIB) $(SALLIB)
-APP5DEPN=	$(SLB)$/sal.lib
-
-.ENDIF # t_tls
+APP5TARGET=tgetpwnam
+APP5OBJS=$(OBJ)$/tgetpwnam.obj
+APP5STDLIBS=$(SALLIB)
+APP5DEPN=$(SLB)$/sal.lib
+.ENDIF # (netbsd | freebsd)
 
 #
-# t_zip.
+# measure_oustrings
 #
-.IF "$(TESTAPP)" == "t_zip"
+OBJFILES+=\
+    $(OBJ)$/measure_oustrings.obj
 
-CFILES=		t_zip.c
-OBJFILES=	$(OBJ)$/t_zip.obj
-
-.IF "$(SALZIPLIB)" == ""
-
-.IF "$(GUI)" == "UNX"
-SALZIPLIB=	-lsalzip2
-.ENDIF # unx
-
-.IF "$(GUI)" == "WNT"
-SALZIPLIB=	$(SALZIPLIB)
-.ENDIF # wnt
+.IF "$(HAVE_CALLGRIND)" == "YES"
+CFLAGSCXX+=-DHAVE_CALLGRIND
+.ENDIF
 
-.ENDIF # salziplib
+APP6TARGET=measure_oustrings
+APP6OBJS=$(OBJ)$/measure_oustrings.obj
+APP6STDLIBS=$(SALLIB)
+APP6DEPN=$(SLB)$/sal.lib
 
-APP6TARGET=	t_zip
-APP6OBJS=	$(OBJFILES)
-APP6STDLIBS=$(SALZIPLIB) $(SALLIB)
-APP6DEPN=	$(SLB)$/sal.lib
+#
+# t_random.
+#
+OBJFILES+=\
+    $(OBJ)$/t_random.obj
 
-.ENDIF # t_zip
+APP7TARGET=t_random
+APP7OBJS=$(OBJ)$/t_random.obj
+APP7STDLIBS=$(SALLIB)
+APP7DEPN=$(SLB)$/sal.lib
 
 #
-# testfile
+# t_cipher
 #
-.IF "$(TESTAPP)" == "testfile"
+OBJFILES+=\
+    $(OBJ)$/t_cipher.obj
 
-CXXFILES=	testfile.cxx
-OBJFILES=	$(OBJ)$/testfile.obj
+APP8TARGET=t_cipher
+APP8OBJS=$(OBJ)$/t_cipher.obj
+APP8STDLIBS=$(SALLIB)
+APP8DEPN=$(SLB)$/sal.lib
 
-APP1TARGET=	testfile
-APP1OBJS=	$(OBJFILES)
-APP1STDLIBS=$(SALLIB)
-APP1DEPN=	$(SLB)$/sal.lib
+#
+# t_digest.
+#
+OBJFILES+=\
+    $(OBJ)$/t_digest.obj
 
-.ENDIF # testfile
+APP9TARGET=t_digest
+APP9OBJS=$(OBJ)$/t_digest.obj
+APP9STDLIBS=$(SALLIB)
+APP9DEPN=$(SLB)$/sal.lib
 
 #
-# testpipe
+# getlitest
 #
-.IF "$(TESTAPP)" == "testpipe"
+.IF "$(TESTAPP)" == "getlocaleinfotest"
+OBJFILES+=\
+    $(OBJ)$/getlocaleinfotest.obj
 
-CXXFILES=	testpipe.cxx
-OBJFILES=	$(OBJ)$/testpipe.obj
+APP10TARGET=getlitest
+APP10OBJS=$(OBJ)$/getlocaleinfotest.obj
 
-APP2TARGET= testpipe
-APP2OBJS=   $(OBJFILES)
-APP2STDLIBS=$(SALLIB)
-APP2DEPN=	$(SLB)$/sal.lib
+APP10STDLIBS=\
+    $(KERNEL32LIB)
 
-.ENDIF # testpipe
+APP10LIBS=\
+    $(LB)$/kernel9x.lib\
+    $(LB)$/isal.lib
 
-#
-# testpip2
-#
-.IF "$(TESTAPP)" == "testpip2"
+APP10DEPN=$(LB)$/isal.lib
+.ENDIF
 
-CXXFILES=	testpip2.cxx
-OBJFILES=	$(OBJ)$/testpip2.obj
+.IF "$(TESTAPP)" == "test_osl_getVolInfo"
 
-APP3TARGET=	testpip2
-APP3OBJS=	$(OBJFILES)
-APP3STDLIBS=$(SALLIB)
-APP3DEPN=	$(SLB)$/sal.lib
+SHL10OBJS=$(SLO)$/t_osl_getVolInfo.obj
+SHL10TARGET=togvi
 
-.ENDIF # testpip2
+.IF "$(GUI)" == "WNT"
+APP10STDLIBS=$(KERNEL32LIB)
+SHL10STDLIBS=$(LB)$/isal.lib
+SHL10STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
+.ENDIF
 
-#
-# testproc
-#
-.IF "$(TESTAPP)" == "testproc"
+.IF "$(GUI)" == "UNX"
+SHL10STDLIBS=$(LB)$/libsal.so
+SHL10STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
+.ENDIF
 
-CXXFILES=	testproc.cxx
-OBJFILES=	$(OBJ)$/testproc.obj
+SHL10IMPLIB=i$(SHL1TARGET)
+SHL10DEF=$(MISC)$/$(SHL1TARGET).def
+DEF10NAME=$(SHL1TARGET)
+DEF10EXPORTFILE=export.exp
+.ENDIF
 
-APP4TARGET= testproc
-APP4OBJS=	$(OBJFILES)
-APP4STDLIBS=$(SALLIB)
-APP4DEPN=	$(SLB)$/sal.lib
+.IF "$(TESTAPP)" == "test_osl_joinProcess"
+OBJFILES+=\
+    $(OBJ)$/t_ojp_exe.obj
+APP10TARGET=ojpx
+APP10OBJS=$(OBJ)$/t_ojp_exe.obj
 
-.ENDIF # testproc
+.IF "$(GUI)" == "UNX"
+APP10STDLIBS=$(LB)$/libsal.so
+.ENDIF
 
-#
-# tgetpwnam
-#
-.IF "$(TESTAPP)" == "tgetpwnam"
-.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+SHL10OBJS=$(SLO)$/t_osl_joinProcess.obj
+SHL10TARGET=tojp
 
-CXXFILES=	tgetpwnam.cxx
-OBJFILES=	$(OBJ)$/tgetpwnam.obj
+.IF "$(GUI)" == "WNT"
+APP10STDLIBS=$(KERNEL32LIB)
+SHL10STDLIBS=$(LB)$/isal.lib
+SHL10STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
+.ENDIF
 
-APP5TARGET= tgetpwnam
-APP5OBJS=	$(OBJFILES)
-APP5STDLIBS=$(SALLIB)
-APP5DEPN=	$(SLB)$/sal.lib
+.IF "$(GUI)" == "UNX"
+SHL10STDLIBS=$(LB)$/libsal.so
+SHL10STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
+.ENDIF
 
-.ENDIF # (sco | netbsd | freebsd)
-.ENDIF # tgetpwname
+SHL10IMPLIB=i$(SHL1TARGET)
+SHL10DEF=$(MISC)$/$(SHL1TARGET).def
+DEF10NAME=$(SHL1TARGET)
+DEF10EXPORTFILE=export.exp
+.ENDIF
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-
diff --git a/sal/workben/measure_oustrings.cxx b/sal/workben/measure_oustrings.cxx
new file mode 100644
index 000000000000..f9ce02bec8bd
--- /dev/null
+++ b/sal/workben/measure_oustrings.cxx
@@ -0,0 +1,282 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       [ Caolán McNamara <caolanm:redhat.com> ]
+ * Portions created by Caolán McNamara are Copyright (C) 2010 * Red Hat, Inc.
+ * All Rights Reserved.
+ *
+ * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#include <sal/main.h>
+#include <rtl/ustring.hxx>
+#include <osl/time.h>
+#include <osl/process.h>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+#ifdef HAVE_CALLGRIND
+#    include <valgrind/callgrind.h>
+int COUNT = 1;
+#else
+#    define CALLGRIND_DUMP_STATS_AT
+#    define CALLGRIND_START_INSTRUMENTATION
+#    define CALLGRIND_STOP_INSTRUMENTATION
+#    define CALLGRIND_ZERO_STATS
+int COUNT = 10000000;
+#endif
+
+#if defined __GXX_EXPERIMENTAL_CXX0X__
+#   define HAVE_CXX_Ox 1
+#endif
+
+#ifdef HAVE_CXX_Ox
+#  define SAL_DECLARE_UTF16(str) u ## str
+#elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550)
+#  define SAL_DECLARE_UTF16(str) U ## str
+#elif __SIZEOF_WCHAR_T__ == 2
+#  define SAL_DECLARE_UTF16(str) L ## str
+#endif
+
+#ifdef SAL_DECLARE_UTF16
+#  define RTL_CONSTASCII_USTRINGPARAM_WIDE(str) \
+     reinterpret_cast<const sal_Unicode*>(SAL_DECLARE_UTF16(str)), (SAL_N_ELEMENTS(str)-1)
+#endif
+
+#define RTL_CONSTASCII_USTRINGPARAM_CLASSIC(str) \
+    str, ((sal_Int32)(SAL_N_ELEMENTS(str)-1)), RTL_TEXTENCODING_ASCII_US
+
+int currenttest = 1;
+oslProcessInfo pidinfo;
+
+class TimerMeasure
+{
+private:
+    const char *m_pMessage;
+    sal_uInt32 m_nStartTime, m_nEndTime;
+public:
+    TimerMeasure(const char *pMessage)
+    : m_pMessage(pMessage)
+    {
+        m_nStartTime = osl_getGlobalTimer();
+        CALLGRIND_START_INSTRUMENTATION
+        CALLGRIND_ZERO_STATS
+    }
+
+    ~TimerMeasure()
+    {
+        CALLGRIND_STOP_INSTRUMENTATION
+        CALLGRIND_DUMP_STATS_AT(m_pMessage);
+        m_nEndTime = osl_getGlobalTimer();
+        std::cout << m_pMessage << std::endl;
+        std::cout << "    callgrind Instruction cost is: " << std::flush;
+
+        std::stringstream aFileName;
+        aFileName << "callgrind.out." << pidinfo.Ident << "." << currenttest;
+
+        std::ifstream myfile(aFileName.str(), std::ios::in);
+        if (myfile.is_open())
+        {
+            std::stringstream aGetGrindStats;
+            aGetGrindStats << "callgrind_annotate " << aFileName.str() <<
+                " | grep TOTALS | sed 's/ PROGRAM TOTALS//'";
+            system(aGetGrindStats.str().c_str());
+            myfile.close();
+        }
+        else
+            std::cout << "Unavailable" << std::endl;
+        currenttest++;
+#ifndef HAVE_CALLGRIND
+        std::cout << "    Elapsed Time is: " << m_nEndTime - m_nStartTime << "ms" << std::endl;
+#endif
+    }
+};
+
+#define TIME(msg, test) \
+{\
+    { test } /*Run the test one to shake out any firsttime lazy loading stuff*/ \
+    TimerMeasure aMeasure(msg);\
+    for (int i = 0; i < COUNT; ++i)\
+        test\
+}
+
+SAL_IMPLEMENT_MAIN()
+{
+    CALLGRIND_STOP_INSTRUMENTATION
+    CALLGRIND_ZERO_STATS
+
+    pidinfo.Size = sizeof(pidinfo);
+    osl_getProcessInfo(0, osl_Process_IDENTIFIER, &pidinfo);
+
+#ifdef HAVE_CALLGRIND
+    std::cout << "Execute using: valgrind --tool=callgrind ./measure_oustrings" << std::endl;
+#else
+    //get my cpu fan up to speed :-)
+    for (int i = 0; i < 10000000; ++i)
+    {
+        rtl::OUString sFoo(rtl::OUString::createFromAscii("X"));
+        rtl::OUString sBar(RTL_CONSTASCII_USTRINGPARAM_CLASSIC("X"));
+        rtl::OUString sBaz(static_cast<sal_Unicode>('X'));
+        rtl::OUString sNone;
+    }
+#endif
+
+    std::cout << "--Empty Strings Construction--" << std::endl;
+
+    TIME
+    (
+        "rtl::OUString()",
+        rtl::OUString sFoo;
+    )
+
+    TIME
+    (
+        "rtl::OUString::createFromAscii()",
+        rtl::OUString sFoo(rtl::OUString::createFromAscii(""));
+    )
+
+    std::cout << "--Single Chars Construction--" << std::endl;
+
+    TIME
+    (
+        "rtl::OUString(static_cast<sal_Unicode>('X')",
+        rtl::OUString sBaz(static_cast<sal_Unicode>('X'));
+    )
+
+#ifdef SAL_DECLARE_UTF16
+    TIME
+    (
+        "rtl::OUString(RTL_CONSTASCII_USTRINGPARAM_WIDE(\"X\"))",
+        rtl::OUString sBar(RTL_CONSTASCII_USTRINGPARAM_WIDE("X"));
+    )
+#endif
+
+    TIME
+    (
+        "rtl::OUString(RTL_CONSTASCII_USTRINGPARAM_CLASSIC(\"X\"))",
+        rtl::OUString sBar(RTL_CONSTASCII_USTRINGPARAM_CLASSIC("X"));
+    )
+
+    TIME
+    (
+        "rtl::OUString::createFromAscii(\"X\")",
+        rtl::OUString sFoo(rtl::OUString::createFromAscii("X"));
+    )
+
+    std::cout << "--MultiChar Strings Construction--" << std::endl;
+
+#ifdef SAL_DECLARE_UTF16
+    TIME
+    (
+        "rtl::OUString(RTL_CONSTASCII_USTRINGPARAM_WIDE(\"XXXXXXXX\"))",
+        rtl::OUString sBar(RTL_CONSTASCII_USTRINGPARAM_WIDE("XXXXXXXXXXXXXXX"));
+    )
+#endif
+
+    TIME
+    (
+        "rtl::OUString(RTL_CONSTASCII_USTRINGPARAM_CLASSIC(\"XXXXXXXX\"))",
+        rtl::OUString sBar(RTL_CONSTASCII_USTRINGPARAM_CLASSIC("XXXXXXXXXXXXXXX"));
+    )
+
+    TIME
+    (
+        "rtl::OUString::createFromAscii(\"XXXXXXXX\")",
+        rtl::OUString sFoo(rtl::OUString::createFromAscii("XXXXXXXXXXXXXXX"));
+    )
+
+    std::cout << "--Ascii Unequal Comparison--" << std::endl;
+
+    rtl::OUString sCompare(RTL_CONSTASCII_USTRINGPARAM_CLASSIC("XXXXXXXXXXXXXXX"));
+
+    TIME
+    (
+        "rtl::OUString::equalsAsciiL",
+        sCompare.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("apple"));
+    )
+
+    rtl::OUString sUnequalCompareTo(RTL_CONSTASCII_USTRINGPARAM_CLASSIC("apple"));
+
+    TIME
+    (
+        "operator==(precreated OUString(\"apple\"))",
+        sCompare == sUnequalCompareTo;
+    )
+
+    TIME
+    (
+        "rtl::OUString::equalsAscii",
+        sCompare.equalsAscii("apple");
+    )
+
+    //(const sal_Char*, sal_Int32) version has different semantics
+    TIME
+    (
+        "rtl::OUString::compareToAscii (const sal_Char*)",
+        sCompare.compareToAscii("apple");
+    )
+
+    TIME
+    (
+        "operator==(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM_CLASSIC(\"apple\")))",
+        sCompare == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM_CLASSIC("apple"));
+    )
+
+    std::cout << "--Ascii Equal Comparison--" << std::endl;
+
+    TIME
+    (
+        "rtl::OUString::equalsAsciiL",
+        sCompare.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("XXXXXXXXXXXXXXX"));
+    )
+
+    rtl::OUString sEqualCompareTo(RTL_CONSTASCII_USTRINGPARAM_CLASSIC("XXXXXXXXXXXXXXX"));
+
+    TIME
+    (
+        "operator==(precreated OUString(\"XXXXXXXXXXXXXXX\"))",
+        sCompare == sEqualCompareTo;
+    )
+
+    TIME
+    (
+        "rtl::OUString::equalsAscii",
+        sCompare.equalsAscii("XXXXXXXXXXXXXXX");
+    )
+
+    //(const sal_Char*, sal_Int32) version has different semantics
+    TIME
+    (
+        "rtl::OUString::compareToAscii (const sal_Char*)",
+        sCompare.compareToAscii("XXXXXXXXXXXXXXX");
+    )
+
+    TIME
+    (
+        "operator==(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM_CLASSIC(\"XXXXXXXXXXXXXXX\"))",
+        sCompare == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM_CLASSIC("XXXXXXXXXXXXXXX"));
+    )
+
+    return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/saldyntest.c b/sal/workben/saldyntest.c
deleted file mode 100644
index c8cc6c430d26..000000000000
--- a/sal/workben/saldyntest.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <systools/win32/shell9x.h>
-#include <systools/win32/kernel9x.h>
-
-int _cdecl main( int argc, char * argv[] )
-{
-    BROWSEINFOW bi;
-    wchar_t     buff[260];
-    DWORD       dwRet;
-
-    bi.hwndOwner = NULL;
-    bi.pidlRoot = NULL;
-    bi.pszDisplayName = buff;
-    bi.lpszTitle = L"Test";
-    bi.ulFlags = 0;
-    bi.lpfn = NULL;
-    bi.lParam = 0;
-
-    SHBrowseForFolderW( &bi );
-
-    dwRet = GetCanonicalPathW( L"c:\\", buff, 260 );
-
-    return(0);
-}
-
-
diff --git a/sal/workben/salstattest.c b/sal/workben/salstattest.c
deleted file mode 100644
index e19e07ad8260..000000000000
--- a/sal/workben/salstattest.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <stdio.h>
-#include <systools/win32/shell9x.h>
-#include <systools/win32/kernel9x.h>
-
-//#include <windows.h>
-//#include <shlobj.h>
-
-int _cdecl main( int argc, char * argv[] )
-{
-    BROWSEINFOW bi;
-    wchar_t     buff[260];
-    DWORD       dwRet;
-
-    bi.hwndOwner = NULL;
-    bi.pidlRoot = NULL;
-    bi.pszDisplayName = buff;
-    bi.lpszTitle = L"Test";
-    bi.ulFlags = 0;
-    bi.lpfn = NULL;
-    bi.lParam = 0;
-
-    SHBrowseForFolderW( &bi );
-
-    dwRet = GetLongPathNameW( L"c:\\", buff, 260 );
-
-    return(0);
-}
-
-
diff --git a/sal/workben/t_cipher.c b/sal/workben/t_cipher.c
index b7126bd46de1..d6c456463f7a 100644
--- a/sal/workben/t_cipher.c
+++ b/sal/workben/t_cipher.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,6 +26,7 @@
  *
  ************************************************************************/
 #include <sal/types.h>
+#include <sal/macros.h>
 #include <osl/diagnose.h>
 #include <rtl/cipher.h>
 
@@ -150,28 +152,6 @@ static sal_uInt8 cbc_iv[8] =
 
 static sal_Char cbc_data[40] = "7654321 Now is the time for ";
 
-static sal_uInt8 ecb_ok[32] =
-{
-    0x2A, 0xFD, 0x7D, 0xAA, 0x60, 0x62, 0x6B, 0xA3,
-    0x86, 0x16, 0x46, 0x8C, 0xC2, 0x9C, 0xF6, 0xE1,
-    0x29, 0x1E, 0x81, 0x7C, 0xC7, 0x40, 0x98, 0x2D,
-    0x6F, 0x87, 0xAC, 0x5F, 0x17, 0x1A, 0xAB, 0xEA
-};
-static sal_uInt8 cbc_ok[32] =
-{
-    0x6B, 0x77, 0xB4, 0xD6, 0x30, 0x06, 0xDE, 0xE6,
-    0x05, 0xB1, 0x56, 0xE2, 0x74, 0x03, 0x97, 0x93,
-    0x58, 0xDE, 0xB9, 0xE7, 0x15, 0x46, 0x16, 0xD9,
-    0x59, 0xF1, 0x65, 0x2B, 0xD5, 0xFF, 0x92, 0xCC
-};
-static sal_uInt8 cfb_ok[] =
-{
-    0xE7, 0x32, 0x14, 0xA2, 0x82, 0x21, 0x39, 0xCA,
-    0xF2, 0x6E, 0xCF, 0x6D, 0x2E, 0xB9, 0xE7, 0x6E,
-    0x3D, 0xA3, 0xDE, 0x04, 0xD1, 0x51, 0x72, 0x00,
-    0x51, 0x9D, 0x57, 0xA6, 0xC3
-};
-
 static sal_uInt8 arcfour_key[6][30] =
 {
     { 8, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
@@ -200,6 +180,29 @@ static sal_uInt8 arcfour_data[6][30] =
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
       0x00, 0x00, 0xff }
 };
+
+#if OSL_DEBUG_LEVEL > 0
+static sal_uInt8 ecb_ok[32] =
+{
+    0x2A, 0xFD, 0x7D, 0xAA, 0x60, 0x62, 0x6B, 0xA3,
+    0x86, 0x16, 0x46, 0x8C, 0xC2, 0x9C, 0xF6, 0xE1,
+    0x29, 0x1E, 0x81, 0x7C, 0xC7, 0x40, 0x98, 0x2D,
+    0x6F, 0x87, 0xAC, 0x5F, 0x17, 0x1A, 0xAB, 0xEA
+};
+static sal_uInt8 cbc_ok[32] =
+{
+    0x6B, 0x77, 0xB4, 0xD6, 0x30, 0x06, 0xDE, 0xE6,
+    0x05, 0xB1, 0x56, 0xE2, 0x74, 0x03, 0x97, 0x93,
+    0x58, 0xDE, 0xB9, 0xE7, 0x15, 0x46, 0x16, 0xD9,
+    0x59, 0xF1, 0x65, 0x2B, 0xD5, 0xFF, 0x92, 0xCC
+};
+static sal_uInt8 cfb_ok[] =
+{
+    0xE7, 0x32, 0x14, 0xA2, 0x82, 0x21, 0x39, 0xCA,
+    0xF2, 0x6E, 0xCF, 0x6D, 0x2E, 0xB9, 0xE7, 0x6E,
+    0x3D, 0xA3, 0xDE, 0x04, 0xD1, 0x51, 0x72, 0x00,
+    0x51, 0x9D, 0x57, 0xA6, 0xC3
+};
 static sal_uInt8 arcfour_ok[6][30] =
 {
     { 0x75, 0xb7, 0x87, 0x80, 0x99, 0xe0, 0xc5, 0x96, 0x00},
@@ -215,8 +218,9 @@ static sal_uInt8 arcfour_ok[6][30] =
     { 0xd6, 0xa1, 0x41, 0xa7, 0xec, 0x3c, 0x38, 0xdf,
       0xbd, 0x61, 0x00}
 };
+#endif
 
-int SAL_CALL main (int argc, char *argv)
+int SAL_CALL main (void)
 {
     rtlCipher cipher;
 
@@ -327,7 +331,7 @@ int SAL_CALL main (int argc, char *argv)
         sal_Size       length;
         int            i, n;
 
-        n = sizeof(arcfour_data_len) / sizeof(arcfour_data_len[0]);
+        n = SAL_N_ELEMENTS(arcfour_data_len);
         for (i = 0; i < n; i++)
         {
             length = arcfour_data_len[i];
@@ -394,3 +398,5 @@ int SAL_CALL main (int argc, char *argv)
     /* Done */
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/t_digest.c b/sal/workben/t_digest.c
index ab6acf11572b..7d947ba253e7 100644
--- a/sal/workben/t_digest.c
+++ b/sal/workben/t_digest.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -164,7 +165,7 @@ static char *pt (unsigned char *md, int length)
     return(buf);
 }
 
-int SAL_CALL main (int argc, char **argv)
+int SAL_CALL main (void)
 {
     const char **P,**R, **Q;
     char *p;
@@ -307,7 +308,7 @@ int SAL_CALL main (int argc, char **argv)
     i = 1;
     while (*P)
     {
-        rtl_digest_initHMAC_MD5 (Digest, *Q, strlen(*Q));
+        rtl_digest_initHMAC_MD5 (Digest, (const sal_uInt8*)(*Q), strlen(*Q));
         rtl_digest_updateHMAC_MD5 (Digest, *P, strlen(*P));
         rtl_digest_getHMAC_MD5 (Digest, md, sizeof(md));
 
@@ -335,8 +336,8 @@ int SAL_CALL main (int argc, char **argv)
     i = 1;
     while (*P)
     {
-        rtl_digest_initHMAC_SHA1 (Digest, *Q, strlen(*Q));
-        rtl_digest_updateHMAC_SHA1 (Digest, *P, strlen(*P));
+        rtl_digest_initHMAC_SHA1 (Digest, (const sal_uInt8*)(*Q), strlen(*Q));
+        rtl_digest_updateHMAC_SHA1 (Digest, (const sal_uInt8*)(*P), strlen(*P));
         rtl_digest_getHMAC_SHA1 (Digest, md, sizeof(md));
 
         p=pt (md, RTL_DIGEST_LENGTH_HMAC_SHA1);
@@ -360,8 +361,8 @@ int SAL_CALL main (int argc, char **argv)
     Q=digest_key_HMAC_MD5;
     rtl_digest_PBKDF2 (
         md, RTL_DIGEST_LENGTH_MD5, /* [out] derived key     */
-        Q[1], strlen(Q[1]),        /* [in]  password        */
-        P[1], strlen(P[1]),        /* [in]  salt            */
+        (const sal_uInt8*)(Q[1]), strlen(Q[1]),        /* [in]  password        */
+        (const sal_uInt8*)(P[1]), strlen(P[1]),        /* [in]  salt            */
         1000);                     /* [in]  iteration count */
 
     p=pt (md, RTL_DIGEST_LENGTH_MD5);
@@ -376,3 +377,4 @@ int SAL_CALL main (int argc, char **argv)
     return (err);
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/t_ojp_exe.cxx b/sal/workben/t_ojp_exe.cxx
index 4e8cdcd5962a..33fda9336135 100644
--- a/sal/workben/t_ojp_exe.cxx
+++ b/sal/workben/t_ojp_exe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,3 +54,4 @@ int main(int argc, char* argv[])
     return (0);
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/t_osl_getVolInfo.cxx b/sal/workben/t_osl_getVolInfo.cxx
index 74e7a310f9ae..7504cd8dfdff 100644
--- a/sal/workben/t_osl_getVolInfo.cxx
+++ b/sal/workben/t_osl_getVolInfo.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,10 +49,6 @@
 #   define  TEST_PATH_6 "/blah"
 #endif
 
-//------------------------------
-//
-//------------------------------
-
 void test_getVolumeInformation(const rtl::OUString& path_url)
     {
         oslVolumeInfo vi;
@@ -78,10 +75,6 @@ void test_getVolumeInformation(const rtl::OUString& path_url)
         );
     }
 
-//------------------------------
-//
-//------------------------------
-
 class TestClass_osl_getVolumeInformation : public CppUnit::TestFixture
 {
 public:
@@ -95,28 +88,28 @@ public:
 
     void test_osl_getVolumeInformation()
     {
-        rtl::OUString path = rtl::OUString::createFromAscii(TEST_PATH_1);
+        rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_1));
         rtl::OUString path_url;
         osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
         test_getVolumeInformation(path_url);
 
-        path = rtl::OUString::createFromAscii(TEST_PATH_2);
+        path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_2));
         osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
         test_getVolumeInformation(path_url);
 
-        path = rtl::OUString::createFromAscii(TEST_PATH_3);
+        path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_3));
         osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
         test_getVolumeInformation(path_url);
 
-        path = rtl::OUString::createFromAscii(TEST_PATH_4);
+        path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_4));
         osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
         test_getVolumeInformation(path_url);
 
-        path = rtl::OUString::createFromAscii(TEST_PATH_5);
+        path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_5));
         osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
         test_getVolumeInformation(path_url);
 
-        path = rtl::OUString::createFromAscii(TEST_PATH_6);
+        path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TEST_PATH_6));
         osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
         test_getVolumeInformation(path_url);
     }
@@ -130,3 +123,4 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestClass_osl_getVolumeInformation, "Test
 
 NOADDITIONAL;
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/t_osl_joinProcess.cxx b/sal/workben/t_osl_joinProcess.cxx
index 1c6f366505f8..40d19fe50c41 100644
--- a/sal/workben/t_osl_joinProcess.cxx
+++ b/sal/workben/t_osl_joinProcess.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,16 +36,12 @@
 #include <signal.h>
 
 #ifdef WNT
-    const rtl::OUString IMAGE_NAME = rtl::OUString::createFromAscii("ojpx.exe");
+    const rtl::OUString IMAGE_NAME(RTL_CONSTASCII_USTRINGPARAM("ojpx.exe"));
 #else
-    const rtl::OUString IMAGE_NAME = rtl::OUString::createFromAscii("ojpx");
+    const rtl::OUString IMAGE_NAME(RTL_CONSTASCII_USTRINGPARAM("ojpx"));
 #endif
 
-const rtl::OUString CWD        = rtl::OUString::createFromAscii(".");
-
-//------------------------------
-//
-//------------------------------
+const rtl::OUString CWD(RTL_CONSTASCII_USTRINGPARAM("."));
 
 class Test_osl_Process : public CppUnit::TestFixture
 {
@@ -226,3 +223,4 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_osl_Process, "Test_osl_Process");
 
 NOADDITIONAL;
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/t_random.c b/sal/workben/t_random.c
index dfd303a1c5da..51a751fb6364 100644
--- a/sal/workben/t_random.c
+++ b/sal/workben/t_random.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,11 +45,7 @@ static char *pt (unsigned char *md, int length)
 /*
  * main.
  */
-#ifdef WIN32
-int __cdecl main (int argc, char **argv)
-#else
-int main (int argc, char **argv)
-#endif
+int SAL_CALL main (void)
 {
     rtlRandomPool pool;
     pool = rtl_random_createPool();
@@ -63,3 +60,4 @@ int main (int argc, char **argv)
     return(0);
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/t_readline.c b/sal/workben/t_readline.c
index 9cbc7d39cf20..e44380d23d5e 100644
--- a/sal/workben/t_readline.c
+++ b/sal/workben/t_readline.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * t_readline.c
  */
@@ -40,11 +41,6 @@ int main (int argc, char ** argv)
         result = osl_readLine (hFile, &pBuffer);
         if (result != osl_File_E_None)
           break;
-#if 0
-        if (pBuffer->elements[0] == 0)
-          /* @@@ cannot distinguish empty line from EOF @@@ */
-          break;
-#endif
         for (i = 0, n = pBuffer->nElements; i < n; i++)
           printf ("%c", (char)(pBuffer->elements[i]));
         printf("\n");
@@ -56,3 +52,5 @@ int main (int argc, char ** argv)
   }
   return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/test.cxx b/sal/workben/test.cxx
index 27469b4df02b..454bc8919846 100644
--- a/sal/workben/test.cxx
+++ b/sal/workben/test.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 #include <stdio.h>
 
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
 int main( int argc, char * argv[] )
 #else
 int _cdecl main( int argc, char * argv[] )
@@ -64,3 +65,4 @@ int _cdecl main( int argc, char * argv[] )
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx
index 8e3296a5aab5..1230ebefa90b 100644
--- a/sal/workben/testfile.cxx
+++ b/sal/workben/testfile.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,17 +72,17 @@ rtl::OUString   file_not_exist;
 
 
 
-void print_error(::rtl::OString& str, FileBase::RC rc);
+void print_error(const ::rtl::OString& str, FileBase::RC rc);
 
 void PressKey()
 {
     printf("\nPress Return !\n");
-    int i=getchar();
+    getchar();
 }
 
-void printFileName(::rtl::OUString& str)
+void printFileName(const ::rtl::OUString& str)
 {
-    rtl::OString        aString;
+    rtl::OString aString;
 
     aString = rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
 
@@ -128,7 +129,7 @@ sal_Bool testLineBreak( sal_Char *pCount , sal_uInt64 nLen , sal_uInt32 *cLineBr
 sal_Bool Initialize( void )
 {
     DirectoryItem   aItem;
-    FileStatus      aStatus( FileStatusMask_All );
+    FileStatus      aStatus( osl_FileStatus_Mask_All );
     rtl_uString     *strExeFileURL=NULL;
     oslProcessError ProcessError;
 
@@ -162,11 +163,11 @@ sal_Bool Initialize( void )
         iniFileURL=rtl::OUString( rtl_uString_getStr(strExeFileURL) ,(int) (pExeFileCount-rtl_uString_getStr(strExeFileURL)) );
 
         // add "/testfile.ini" to iniFileURL
-        iniFileURL+=rtl::OUString::createFromAscii("/testfile.ini");
+        iniFileURL+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testfile.ini"));
 
         // Open the ini-File
         pFile=new File( iniFileURL );
-        rc=pFile->open( OpenFlag_Read | OpenFlag_Write );
+        rc=pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
         if ( rc!=FileBase::E_None )
         {
             rtl_uString_release(strExeFileURL);
@@ -192,7 +193,7 @@ sal_Bool Initialize( void )
     uBytesRequested=aStatus.getFileSize();
 
     // read ini-File
-    rc=pFile->setPos( Pos_Absolut, 0 );
+    rc=pFile->setPos( osl_Pos_Absolut, 0 );
     pBuffer=(sal_Char*) rtl_allocateMemory( (sal_uInt32) (uBytesRequested+1)*sizeof(sal_Char) );
     rtl_zeroMemory( pBuffer, (sal_uInt32)(uBytesRequested+1)*sizeof(sal_Char) );
 
@@ -207,13 +208,13 @@ sal_Bool Initialize( void )
     for ( int i=0 ; i<12 ; i++ )
     {
         sal_uInt32      cLineBrake=0;
-        while ( (pCount-pBuffer < uBytesRead) && *pCount!='=')
+        while ( (static_cast<sal_uInt64>(pCount-pBuffer) < uBytesRead) && *pCount!='=')
             pCount++;
 
         pCount++;
         pBegin=pCount;
 
-        while ( (pCount-pBuffer < uBytesRead) && !testLineBreak(pCount,uBytesRead-(pCount-pBuffer), &cLineBrake))
+        while ( (static_cast<sal_uInt64>(pCount-pBuffer) < uBytesRead) && !testLineBreak(pCount,uBytesRead-(pCount-pBuffer), &cLineBrake))
             pCount++;
 
         dir[i]=rtl::OUString(pBegin, pCount-pBegin, RTL_TEXTENCODING_ASCII_US);
@@ -256,21 +257,21 @@ sal_Bool Initialize( void )
         return sal_False;
 
     pFile=new File( file1 );
-    rc=pFile->open( OpenFlag_Write | OpenFlag_Create );
+    rc=pFile->open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
     if ( rc!=FileBase::E_None )
         return sal_False;
     rc=pFile->close();
     delete pFile;
 
     pFile=new File( file2 );
-    rc=pFile->open( OpenFlag_Write | OpenFlag_Create );
+    rc=pFile->open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
     if ( rc!=FileBase::E_None )
         return sal_False;
     rc=pFile->close();
     delete pFile;
 
     pFile=new File( file_on_server );
-    rc=pFile->open( OpenFlag_Write | OpenFlag_Create );
+    rc=pFile->open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
     if ( rc!=FileBase::E_None )
         return sal_False;
     rc=pFile->close();
@@ -353,29 +354,29 @@ void showAttributes( sal_uInt64 uAttributes )
 {
     if ( uAttributes==0 )
         printf( "No Attributes \n" );
-    if ( uAttributes & Attribute_ReadOnly )
+    if ( uAttributes & osl_File_Attribute_ReadOnly )
         printf( "Attribute: ReadOnly \n" );
-    if ( uAttributes & Attribute_Hidden )
+    if ( uAttributes & osl_File_Attribute_Hidden )
         printf( "Attribute: Hidden \n" );
-    if ( uAttributes & Attribute_Executable )
+    if ( uAttributes & osl_File_Attribute_Executable )
         printf( "Attribute: Executable \n");
-    if ( uAttributes & Attribute_GrpWrite )
+    if ( uAttributes & osl_File_Attribute_GrpWrite )
         printf( "Attribute: GrpWrite \n");
-    if ( uAttributes & Attribute_GrpRead )
+    if ( uAttributes & osl_File_Attribute_GrpRead )
         printf( "Attribute: GrpRead \n" );
-    if ( uAttributes & Attribute_GrpExe )
+    if ( uAttributes & osl_File_Attribute_GrpExe )
         printf( "Attribute: GrpExe \n" );
-    if ( uAttributes & Attribute_OwnWrite )
+    if ( uAttributes & osl_File_Attribute_OwnWrite )
         printf( "Attribute: OwnWrite \n");
-    if ( uAttributes & Attribute_OwnRead )
+    if ( uAttributes & osl_File_Attribute_OwnRead )
         printf( "Attribute: OwnRead \n" );
-    if ( uAttributes & Attribute_OwnExe )
+    if ( uAttributes & osl_File_Attribute_OwnExe )
         printf( "Attribute: OwnExe \n" );
-    if ( uAttributes & Attribute_OthWrite )
+    if ( uAttributes & osl_File_Attribute_OthWrite )
         printf( "Attribute: OthWrite \n" );
-    if ( uAttributes & Attribute_OthRead )
+    if ( uAttributes & osl_File_Attribute_OthRead )
         printf( "Attribute: OthRead \n");
-    if ( uAttributes & Attribute_OthExe )
+    if ( uAttributes & osl_File_Attribute_OthExe )
         printf( "Attribute: OthExe \n" );
 
     return;
@@ -459,7 +460,6 @@ TimeValue getSystemTime()
 void DirectoryOpenAndCloseTest( void )
 {
     FileBase::RC    rc;
-    int i=0;
     Directory   *pDir;
 
     printf( "--------------------------------------------\n");
@@ -584,7 +584,6 @@ void DirectoryOpenAndCloseTest( void )
 void DirectoryCreateAndRemoveTest( void )
 {
     FileBase::RC    rc,rc1;
-    int i=0;
     Directory   *pDir;
 
     printf( "--------------------------------------------\n" );
@@ -672,7 +671,6 @@ void DirectoryCreateAndRemoveTest( void )
 static void FileOpenAndCloseTest( void )
 {
     FileBase::RC    rc;
-    int i=0;
 
     printf( "--------------------------------------------\n" );
     printf( "File-Open-And-Close-Test\n" );
@@ -690,7 +688,7 @@ static void FileOpenAndCloseTest( void )
     // open an existing file (Read)
     //--------------------------------------------------
 
-    rc=pFile->open( OpenFlag_Read );
+    rc=pFile->open( osl_File_OpenFlag_Read );
     print_error( rtl::OString( "Open File (Read)" ), rc );
 
     //--------------------------------------------------
@@ -706,7 +704,7 @@ static void FileOpenAndCloseTest( void )
     // open an existing file (Write)
     //--------------------------------------------------
 
-    rc=pFile->open( OpenFlag_Write );
+    rc=pFile->open( osl_File_OpenFlag_Write );
     print_error( rtl::OString( "Open File (Write)" ), rc );
 
     //--------------------------------------------------
@@ -752,7 +750,7 @@ void FileCreateAndRemoveTest()
     // open (create) a not existing file (Read and write)
     //----------------------------------------------------
 
-    rc = pFile->open( OpenFlag_Read | OpenFlag_Write | osl_File_OpenFlag_Create );
+    rc = pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
 
     print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc );
 
@@ -782,7 +780,7 @@ void FileCreateAndRemoveTest()
     // remove an open file
     //----------------------------------------------------
 
-    pFile->open( OpenFlag_Read | OpenFlag_Write | osl_File_OpenFlag_Create );
+    pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
 
     rc=pFile->remove( file_not_exist );
     print_error( rtl::OString( "Remove an open File" ), rc );
@@ -805,7 +803,7 @@ void FileWriteAndReadTest( void )
 
     sal_uInt64 uWritten;
     sal_uInt64 uRead;
-    sal_Char    *pWriteBuffer="Hier kommt der Osterhase !";
+    const sal_Char *pWriteBuffer="Hier kommt der Osterhase !";
     sal_uInt64  nLen=strlen( pWriteBuffer );
     sal_Char *pReadBuffer;
 
@@ -825,7 +823,7 @@ void FileWriteAndReadTest( void )
     // open (create) a not existing file (Read and write)
     //----------------------------------------------------
 
-    rc = pFile->open( OpenFlag_Read | OpenFlag_Write | osl_File_OpenFlag_Create );
+    rc = pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
 
     print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc );
 
@@ -848,7 +846,7 @@ void FileWriteAndReadTest( void )
     // move the filepointer to the beginning
     //----------------------------------------------------
 
-    rc=pFile->setPos( Pos_Absolut , 0 );
+    rc=pFile->setPos( osl_Pos_Absolut , 0 );
     print_error( rtl::OString( "Set FilePointer to the beginning of the file" ), rc );
 
     printf( "\n" );
@@ -908,7 +906,7 @@ void FileCopyAndMoveTest( void )
     // FileCopyTest
     //--------------------------------------------------
 
-    destPath+=rtl::OUString::createFromAscii("/");
+    destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     destPath+=file3;
 
     printf( "Copy the file ");
@@ -923,7 +921,7 @@ void FileCopyAndMoveTest( void )
 
     pFile=new File( destPath );
 
-    rc=pFile->open( OpenFlag_Read );
+    rc=pFile->open( osl_File_OpenFlag_Read );
     if ( rc == FileBase::E_None)
     {
         printf( "Verify: OK!\n" );
@@ -942,11 +940,13 @@ void FileCopyAndMoveTest( void )
     //--------------------------------------------------
 
     destPath=rtl::OUString( dir_not_exist );
-    destPath+=rtl::OUString::createFromAscii("/");
+    destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     destPath+=file3;
 
     printf( "Copy a file to a not existing directory \n");
-    printf( "Copy the file  %s to %s\n", file1.getStr(), destPath.getStr() );
+    printf( "Copy the file %s to %s\n",
+        rtl::OUStringToOString( file1, RTL_TEXTENCODING_ASCII_US ).getStr(),
+        rtl::OUStringToOString( destPath, RTL_TEXTENCODING_ASCII_US ).getStr() );
 
     rc=File::copy( file1, destPath );
     print_error( rtl::OString( "FileCopy" ), rc );
@@ -973,7 +973,7 @@ void FileCopyAndMoveTest( void )
     //--------------------------------------------------
 
     destPath=rtl::OUString( dir2 );
-    destPath+=rtl::OUString::createFromAscii("/");
+    destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     destPath+=file3;
 
     printf( "Move the file ");
@@ -987,7 +987,7 @@ void FileCopyAndMoveTest( void )
 
     pFile=new File( destPath );
 
-    rc=pFile->open( OpenFlag_Read );
+    rc=pFile->open( osl_File_OpenFlag_Read );
     if ( rc==FileBase::E_None )
     {
         pFile->close();
@@ -995,7 +995,7 @@ void FileCopyAndMoveTest( void )
         delete pFile;
         pFile=new File( file1 );
 
-        rc=pFile->open( OpenFlag_Read );
+        rc=pFile->open( osl_File_OpenFlag_Read );
 
         if ( rc!=FileBase::E_None )
         {
@@ -1022,7 +1022,7 @@ void FileCopyAndMoveTest( void )
     //--------------------------------------------------
 
     destPath=rtl::OUString( dir_not_exist );
-    destPath+=rtl::OUString::createFromAscii("/");
+    destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     destPath+=file3;
 
     printf( "Move a file to a not existing directory: \n");
@@ -1084,7 +1084,7 @@ void FileSizeTest( void )
     printFileName( file_not_exist );
     printf( "\n\n");
 
-    rc = aFile.open( OpenFlag_Read | OpenFlag_Write | osl_File_OpenFlag_Create );
+    rc = aFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
     print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc );
     printf( "\n" );
 
@@ -1110,7 +1110,7 @@ void FileSizeTest( void )
 
         if ( rc == FileBase::E_None )
         {
-            FileStatus rStatus( FileStatusMask_FileSize  );
+            FileStatus rStatus( osl_FileStatus_Mask_FileSize  );
             rc=aItem.getFileStatus( rStatus );
             print_error( rtl::OString( "Get FileStatus" ), rc );
 
@@ -1119,9 +1119,9 @@ void FileSizeTest( void )
                 filesize=rStatus.getFileSize();
 
                 if ( filesize == 5000 )
-                    printf( "\nOK : FileSize: %i\n", filesize );
+                    printf( "\nOK : FileSize: %" SAL_PRIuUINT64 "\n", filesize );
                 else
-                    printf( "\nError : FileSize: %i\n", filesize );
+                    printf( "\nError : FileSize: %" SAL_PRIuUINT64 "\n", filesize );
             }
         }
 
@@ -1172,7 +1172,7 @@ void FilePointerTest( void )
     printFileName( file_not_exist );
     printf( "\n\n");
 
-    rc = rFile.open( OpenFlag_Read | OpenFlag_Write | osl_File_OpenFlag_Create );
+    rc = rFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
     print_error( rtl::OString( "Create and Open File (Read & Write) "), rc );
     printf( "\n" );
 
@@ -1185,7 +1185,7 @@ void FilePointerTest( void )
 
         rc =rFile.getPos( filepointer );
         print_error( rtl::OString( "GetPos" ), rc );
-        printf( "Position of the FilePointer: %i\n", filepointer );
+        printf( "Position of the FilePointer: %" SAL_PRIuUINT64 "\n", filepointer );
 
         printf( "\n" );
 
@@ -1197,7 +1197,7 @@ void FilePointerTest( void )
         rFile.setSize( 5000 );
 
         printf( "Set the FilePointer at the end of the file (5000)\n" );
-        rc=rFile.setPos( Pos_End,0 );
+        rc=rFile.setPos( osl_Pos_End,0 );
         print_error( rtl::OString( "SetPos" ), rc );
 
         rc=rFile.getPos( filepointer );
@@ -1206,13 +1206,13 @@ void FilePointerTest( void )
         {
             print_error( rtl::OString( "GetPos" ), rc );
             printf( "\nVerify: OK !\n" );
-            printf( "Filepointer-Position: %llu\n",filepointer );
+            printf( "Filepointer-Position: %" SAL_PRIuUINT64 "\n",filepointer );
         }
         else
         {
             print_error( rtl::OString( "GetPos" ), rc );
             printf( "\nFilePointer-Test: Error\n" );
-            printf( "Filepointer-Position: %i != 5000 \n",filepointer );
+            printf( "Filepointer-Position: %" SAL_PRIuUINT64 " != 5000 \n",filepointer );
         }
 
         printf( "\n" );
@@ -1239,7 +1239,7 @@ void verifyFileAttributes( void )
 {
     FileBase::RC    rc;
     DirectoryItem   aItem;
-    FileStatus rStatus( FileStatusMask_Attributes  );
+    FileStatus rStatus( osl_FileStatus_Mask_Attributes  );
 
     printf( "\nVerify:\n" );
 
@@ -1278,7 +1278,7 @@ void FileAttributesTest( void )
     printf( "\n\n" );
 
 
-    rc=File::setAttributes( file1, Attribute_GrpWrite );
+    rc=File::setAttributes( file1, osl_File_Attribute_GrpWrite );
     print_error( rtl::OString( "Set Attribute: GrpWrite" ), rc );
 
     verifyFileAttributes();
@@ -1287,7 +1287,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_GrpRead );
+    rc=File::setAttributes( file1, osl_File_Attribute_GrpRead );
     print_error( rtl::OString( "Set Attribute: GrpRead" ), rc );
 
     verifyFileAttributes();
@@ -1296,7 +1296,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_GrpExe );
+    rc=File::setAttributes( file1, osl_File_Attribute_GrpExe );
     print_error( rtl::OString( "Set Attribute: GrpExe" ), rc );
 
     verifyFileAttributes();
@@ -1305,7 +1305,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_OwnWrite );
+    rc=File::setAttributes( file1, osl_File_Attribute_OwnWrite );
     print_error( rtl::OString( "Set Attribute: OwnWrite" ), rc );
 
     verifyFileAttributes();
@@ -1314,7 +1314,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_OwnRead );
+    rc=File::setAttributes( file1, osl_File_Attribute_OwnRead );
     print_error( rtl::OString( "Set Attribute: OwnRead" ), rc );
 
     verifyFileAttributes();
@@ -1323,7 +1323,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_OwnExe );
+    rc=File::setAttributes( file1, osl_File_Attribute_OwnExe );
     print_error( rtl::OString( "Set Attribute: OwnExe" ), rc );
 
     verifyFileAttributes();
@@ -1332,7 +1332,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_OthWrite );
+    rc=File::setAttributes( file1, osl_File_Attribute_OthWrite );
     print_error( rtl::OString( "Set Attribute: OthWrite" ), rc );
 
     verifyFileAttributes();
@@ -1341,7 +1341,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_OthRead );
+    rc=File::setAttributes( file1, osl_File_Attribute_OthRead );
     print_error( rtl::OString( "Set Attribute: OthRead" ), rc );
 
     verifyFileAttributes();
@@ -1350,7 +1350,7 @@ void FileAttributesTest( void )
     if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
-    rc=File::setAttributes( file1, Attribute_OthExe );
+    rc=File::setAttributes( file1, osl_File_Attribute_OthExe );
     print_error( rtl::OString( "Set Attribute: OthExe" ), rc );
 
     verifyFileAttributes();
@@ -1360,7 +1360,7 @@ void FileAttributesTest( void )
         print_error( rtl::OString( "Reset Attributes" ), rc );
 
 
-    rc=File::setAttributes( file1, Attribute_GrpWrite | Attribute_GrpRead | Attribute_GrpExe | Attribute_OwnWrite | Attribute_OwnRead | Attribute_OwnExe | Attribute_OthWrite | Attribute_OthRead | Attribute_OthExe );
+    rc=File::setAttributes( file1, osl_File_Attribute_GrpWrite | osl_File_Attribute_GrpRead | osl_File_Attribute_GrpExe | osl_File_Attribute_OwnWrite | osl_File_Attribute_OwnRead | osl_File_Attribute_OwnExe | osl_File_Attribute_OthWrite | osl_File_Attribute_OthRead | osl_File_Attribute_OthExe );
     print_error( rtl::OString( "Set all Attributes" ), rc );
 
     verifyFileAttributes();
@@ -1385,7 +1385,7 @@ void FileAttributesTest( void )
     printf( "\n\n" );
 
 
-    rc=File::setAttributes( file1, Attribute_ReadOnly );
+    rc=File::setAttributes( file1, osl_File_Attribute_ReadOnly );
     print_error( rtl::OString( "Set Attribute: ReadOnly" ), rc );
 
     verifyFileAttributes();
@@ -1395,7 +1395,7 @@ void FileAttributesTest( void )
 
     verifyFileAttributes();
 
-    rc=File::setAttributes( file1, Attribute_Hidden );
+    rc=File::setAttributes( file1, osl_File_Attribute_Hidden );
     print_error( rtl::OString( "Set Attribute: Hidden" ), rc );
 
     verifyFileAttributes();
@@ -1405,7 +1405,7 @@ void FileAttributesTest( void )
 
     verifyFileAttributes();
 
-    rc=File::setAttributes( file1, Attribute_Hidden | Attribute_ReadOnly );
+    rc=File::setAttributes( file1, osl_File_Attribute_Hidden | osl_File_Attribute_ReadOnly );
     print_error( rtl::OString( "Set Attribute: Hidden & ReadOnly" ), rc );
 
     verifyFileAttributes();
@@ -1431,17 +1431,37 @@ void FileTimeTest( void )
 
     DirectoryItem   aItem;
 
-    struct tm sSysCreationTime = { 0, 20, 12, 4, 9, 100 };
-    struct tm sSysAccessTime = { 0, 40, 1, 6, 5, 98 };
-    struct tm sSysModifyTime = { 0, 1, 24, 13, 11, 95 };
-
-    time_t aSysCreationTime =  mktime( &sSysCreationTime );
-    time_t aSysAccessTime =  mktime( &sSysAccessTime );
-    time_t aSysModifyTime =  mktime( &sSysModifyTime );
+    struct tm sSysCreationTime;
+    sSysCreationTime.tm_sec = 0;
+    sSysCreationTime.tm_min = 20;
+    sSysCreationTime.tm_hour = 12;
+    sSysCreationTime.tm_mday = 4;
+    sSysCreationTime.tm_mon = 9;
+    sSysCreationTime.tm_year = 99;
+
+    struct tm sSysAccessTime;
+    sSysAccessTime.tm_sec = 0;
+    sSysAccessTime.tm_min = 40;
+    sSysAccessTime.tm_hour = 1;
+    sSysAccessTime.tm_mday = 6;
+    sSysAccessTime.tm_mon = 5;
+    sSysAccessTime.tm_year = 98;
+
+    struct tm sSysModifyTime;
+    sSysModifyTime.tm_sec = 0;
+    sSysModifyTime.tm_min = 1;
+    sSysModifyTime.tm_hour = 24;
+    sSysModifyTime.tm_mday = 13;
+    sSysModifyTime.tm_mon = 11;
+    sSysModifyTime.tm_year = 95;
+
+    sal_uInt32 aSysCreationTime = mktime( &sSysCreationTime );
+    sal_uInt32 aSysAccessTime =  mktime( &sSysAccessTime );
+    sal_uInt32 aSysModifyTime =  mktime( &sSysModifyTime );
 
     TimeValue       aCreationTime   = { aSysCreationTime, 0};
-    TimeValue       aAccessTime     = { aSysAccessTime, 0};
-    TimeValue       aModifyTime     = { aSysModifyTime, 0};
+    TimeValue       aAccessTime = { aSysAccessTime, 0};
+    TimeValue       aModifyTime = { aSysModifyTime, 0};
 
     TimeValue       aCreationTimeRead;
     TimeValue       aAccessTimeRead;
@@ -1477,7 +1497,7 @@ void FileTimeTest( void )
     // Verify
     //--------------------------------------------------
 
-    FileStatus rStatus( FileStatusMask_CreationTime | FileStatusMask_AccessTime | FileStatusMask_ModifyTime);
+    FileStatus rStatus( osl_FileStatus_Mask_CreationTime | osl_FileStatus_Mask_AccessTime | osl_FileStatus_Mask_ModifyTime);
 
     printf( "\nVerify:\n" );
 
@@ -1568,7 +1588,7 @@ void DirectoryItemTest( void )
     rc=DirectoryItem::get( dir1 , aItem );
     print_error( rtl::OString( "GetDirectoryItem" ), rc );
 
-    pStatus=new FileStatus( FileStatusMask_All );
+    pStatus=new FileStatus( osl_FileStatus_Mask_All );
     rc=aItem.getFileStatus( *pStatus );
 
     if ( rc==FileBase::E_None )
@@ -1606,7 +1626,7 @@ void DirectoryItemTest( void )
     rc=DirectoryItem::get( file1 , aItem );
     print_error( rtl::OString( "GetDirectoryItem" ), rc );
 
-    pStatus=new FileStatus( FileStatusMask_All );
+    pStatus=new FileStatus( osl_FileStatus_Mask_All );
     rc=aItem.getFileStatus( *pStatus );
 
     if ( rc==FileBase::E_None )
@@ -1652,17 +1672,17 @@ void DirectoryItemTest( void )
 
     pFile=new File( file1 );
 
-    rc=pFile->open( OpenFlag_Read );
+    rc=pFile->open( osl_File_OpenFlag_Read );
     if ( rc==FileBase::E_None )
     {
         printf( "Get DirectoryItem from a File-Handle: ");
         printFileName( file1 );
         printf( "\n" );
 
-        rc=DirectoryItem::get( *pFile , aItem );
+        rc=DirectoryItem::get( file1 , aItem );
         print_error( rtl::OString( "GetDirectoryItem" ), rc );
 
-        pStatus=new FileStatus( FileStatusMask_All );
+        pStatus=new FileStatus( osl_FileStatus_Mask_All );
         rc=aItem.getFileStatus( *pStatus );
 
         if ( rc==FileBase::E_None )
@@ -1682,17 +1702,13 @@ void DirectoryItemTest( void )
     printf( "\n" );
 
     //---------------------------------------------------
-    // get DirectoryItem from an empty file-handle
+    // get DirectoryItem
     //--------------------------------------------------
 
-    pFile=new File( file1 );
-
     printf( "Get DirectoryItem from an empty File-Handle\n" );
-    rc=DirectoryItem::get( *pFile , aItem );
+    rc=DirectoryItem::get( file1 , aItem );
     print_error( rtl::OString( "GetDirectoryItem" ), rc );
 
-    delete pFile;
-
     printf( "\n" );
 
     //--------------------------------------------------
@@ -1725,7 +1741,7 @@ void DirectoryItemTest( void )
         while( rc==FileBase::E_None )
         {
 
-            FileStatus rStatus( FileStatusMask_All );
+            FileStatus rStatus( osl_FileStatus_Mask_All );
             aItem.getFileStatus( rStatus );
 
             str=rStatus.getFileName();
@@ -1750,7 +1766,7 @@ void DirectoryItemTest( void )
             rc=pDir->reset();
             rc=pDir->getNextItem( aItem );
 
-            FileStatus rStatus( FileStatusMask_All );
+            FileStatus rStatus( osl_FileStatus_Mask_All );
             aItem.getFileStatus( rStatus );
 
             str1[i]=rStatus.getFileName();
@@ -1860,7 +1876,7 @@ void FileStatusTest( FileStatus *pStatus )
     printf( "\ngetFileSize:\n" );
 
     FileSize=pStatus->getFileSize();
-    printf( "FileSize: %i\n", FileSize);
+    printf( "FileSize: %" SAL_PRIuUINT64 "\n", FileSize);
 
     //--------------------------------------------------
     // GetFileName
@@ -1929,7 +1945,7 @@ void DirectoryFileStatusTest( void )
 
     if ( rc==FileBase::E_None )
     {
-        pStatus=new FileStatus( FileStatusMask_All );
+        pStatus=new FileStatus( osl_FileStatus_Mask_All );
         rc=aItem.getFileStatus( *pStatus );
 
         FileStatusTest( pStatus );
@@ -1968,7 +1984,7 @@ void FileFileStatusTest( void )
 
     if ( rc==FileBase::E_None )
     {
-        pStatus=new FileStatus( FileStatusMask_All );
+        pStatus=new FileStatus( osl_FileStatus_Mask_All );
         rc=aItem.getFileStatus( *pStatus );
 
         FileStatusTest( pStatus );
@@ -2007,7 +2023,7 @@ void VolumeFileStatusTest( void )
 
     if ( rc==FileBase::E_None )
     {
-        pStatus=new FileStatus( FileStatusMask_All) ;
+        pStatus=new FileStatus( osl_FileStatus_Mask_All) ;
         rc=aItem.getFileStatus( *pStatus );
 
         FileStatusTest( pStatus );
@@ -2039,7 +2055,7 @@ void VolumeInfoTest( void )
 
     printf( "\n" );
 
-    VolumeInfo rInfo( VolumeInfoMask_FreeSpace );
+    VolumeInfo rInfo( osl_VolumeInfo_Mask_FreeSpace );
     rc=Directory::getVolumeInfo( root , rInfo );
     print_error( rtl::OString( "GetVolumeInfo" ),rc );
 
@@ -2069,7 +2085,7 @@ void VolumeInfoTest( void )
 
     sal_uInt64  TotalSpace;
     TotalSpace=rInfo.getTotalSpace();
-    printf( "Total Space: %i\n",TotalSpace );
+    printf( "Total Space: %" SAL_PRIuUINT64 "\n",TotalSpace );
 
     //--------------------------------------------------
     // getFreeSpace
@@ -2077,7 +2093,7 @@ void VolumeInfoTest( void )
 
     sal_uInt64  FreeSpace;
     FreeSpace=rInfo.getFreeSpace();
-    printf( "Free Space: %i\n",FreeSpace );
+    printf( "Free Space: %" SAL_PRIuUINT64 "\n",FreeSpace );
 
     //--------------------------------------------------
     // getUsedSpace
@@ -2085,7 +2101,7 @@ void VolumeInfoTest( void )
 
     sal_uInt64  UsedSpace;
     UsedSpace=rInfo.getUsedSpace();
-    printf( "Used Space: %i\n",UsedSpace );
+    printf( "Used Space: %" SAL_PRIuUINT64 "\n",UsedSpace );
 
     //--------------------------------------------------
     // getMaxNameLength
@@ -2093,7 +2109,7 @@ void VolumeInfoTest( void )
 
     sal_uInt32  MaxNameLength;
     MaxNameLength=rInfo.getMaxNameLength();
-    printf( "MaxNameLength: %i\n",MaxNameLength );
+    printf( "MaxNameLength: %" SAL_PRIuUINT32 "\n",MaxNameLength );
 
     //--------------------------------------------------
     // getMaxPathLength
@@ -2101,7 +2117,7 @@ void VolumeInfoTest( void )
 
     sal_uInt32  MaxPathLength;
     MaxPathLength=rInfo.getMaxPathLength();
-    printf( "MaxPathLength: %i\n",MaxPathLength );
+    printf( "MaxPathLength: %" SAL_PRIuUINT32 "\n",MaxPathLength );
 
     //--------------------------------------------------
     // getFileSystemName
@@ -2286,15 +2302,15 @@ void AbsolutePathTest(void)
     printf( "AbsolutePath-Test\n" );
     printf( "--------------------------------------------\n\n" );
 
-    DoAbsolutePathTest(dir1, rtl::OUString::createFromAscii("."));
-    DoAbsolutePathTest(dir1, rtl::OUString::createFromAscii(".."));
-    DoAbsolutePathTest(dir1, rtl::OUString::createFromAscii("../.."));
-    DoAbsolutePathTest(dir1, rtl::OUString::createFromAscii("../HUHU"));
+    DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")));
+    DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")));
+    DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../..")));
+    DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../HUHU")));
 
-    DoAbsolutePathTest(dir_on_server, rtl::OUString::createFromAscii("."));
-    DoAbsolutePathTest(dir_on_server, rtl::OUString::createFromAscii(".."));
-    DoAbsolutePathTest(dir_on_server, rtl::OUString::createFromAscii("../.."));
-    DoAbsolutePathTest(dir_on_server, rtl::OUString::createFromAscii("../HUHU"));
+    DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")));
+    DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")));
+    DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../..")));
+    DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../HUHU")));
 
     PressKey();
     return;
@@ -2404,7 +2420,7 @@ void SearchPathTest(void)
     printFileName( file3 );
     printf( "\n" );
 
-    rc=FileBase::searchFileURL( file3 , rtl::OUString::createFromAscii("") , strResultPath );
+    rc=FileBase::searchFileURL( file3 , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) , strResultPath );
 
     if ( rc == FileBase::E_None )
     {
@@ -2441,7 +2457,7 @@ void SearchPathTest(void)
     //------------------------------------------------------------
 
     rtl::OUString       strSearchPath( dir_not_exist );
-    strSearchPath+=rtl::OUString::createFromAscii(";");
+    strSearchPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
     strSearchPath+=dir_on_server;
 
     printf( "\nsearchFileURL:  File : ");
@@ -2532,10 +2548,10 @@ void CanonicalNameTest(void)
 // print_error
 //--------------------------------------------------
 
-void print_error( ::rtl::OString& str, FileBase::RC rc )
+void print_error( const ::rtl::OString& str, FileBase::RC rc )
 {
 
-    printf( "%s : ",str.getStr() );
+    printf( "%s : ", str.getStr() );
     switch(rc)
     {
     case FileBase::E_None:
@@ -2784,3 +2800,4 @@ int MAIN( int argc, char* argv[] )
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/testpip2.cxx b/sal/workben/testpip2.cxx
index 0fd57b083a15..53f8dd3ba040 100644
--- a/sal/workben/testpip2.cxx
+++ b/sal/workben/testpip2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define INCL_DOSPROCESS
 #include <osl/pipe.h>
-#include <os2.h>
 
 // eindeutiger Name f�r die Pipe
 const char pszPipeName[] = "TestPipe";
@@ -57,13 +56,13 @@ void fail( const char * pszText, int retval )
 int main (void)
 {
     char    szBuffer[ 256 ];
-    sSize_t nChars;
+    rtl_uString* ustrPipeName=0;
+    sal_Int32 nChars;
 
-    // gib dem Server die Chance, die Pipe zu �ffnen
-    DosSleep( 1000 );
+    rtl_uString_newFromAscii(&ustrPipeName,pszPipeName);
 
     // erzeuge die Pipe
-    Pipe = osl_createPipe( pszPipeName, osl_Pipe_OPEN, 0 );
+    Pipe = osl_createPipe( ustrPipeName, osl_Pipe_OPEN, 0 );
 
     if( !Pipe )
         fail( "unable to open pipe.\n",
@@ -87,7 +86,7 @@ int main (void)
               osl_getLastPipeError( Pipe ) );
 
     // schliesse die Pipe
-    osl_destroyPipe( Pipe );
+    osl_releasePipe( Pipe );
 
     printf( "TestPipe Client: test passed.\n" );
     return 0;
@@ -95,3 +94,4 @@ int main (void)
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/testpipe.cxx b/sal/workben/testpipe.cxx
index 6b860351d6b4..ed4b653dcf2a 100644
--- a/sal/workben/testpipe.cxx
+++ b/sal/workben/testpipe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,8 +44,8 @@ const char szTestString[] = "This is a test";
 char       szBuffer[256];
 
 const char *  cp;
-Size_t  n;
-sSize_t nChars;
+size_t  n;
+sal_Int32 nChars;
 
 // osl specific variables
 oslPipe          Pipe;
@@ -90,10 +91,9 @@ int main (int argc, const char *argv[])
                                        0,
                                         osl_Process_NORMAL,
                                         0,
-                                        NULL,
                                        NULL,
-                                       0,
-                                        NULL,
+                                       NULL,
+                                        0,
                                         &Process );
 
     if( ProcessError != osl_Process_E_None )
@@ -157,8 +157,8 @@ int main (int argc, const char *argv[])
     osl_freeProcessHandle( Process );
 
     // schliesse die Pipes
-    osl_destroyPipe( C1Pipe );
-    osl_destroyPipe( Pipe );
+    osl_releasePipe( C1Pipe );
+    osl_releasePipe( Pipe );
 
     printf( "TestPipe Server: test passed.\n" );
     return 0;
@@ -166,3 +166,4 @@ int main (int argc, const char *argv[])
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/testproc.cxx b/sal/workben/testproc.cxx
index 4fdb2ee9cac6..ed515ef2e9ea 100644
--- a/sal/workben/testproc.cxx
+++ b/sal/workben/testproc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,9 +40,9 @@
     #define MAIN main
 #endif
 
-void MAIN (void)
+int MAIN (void)
 {
-    oslProcess Process;
+    //oslProcess Process;
     oslProcessError  ProcessError;
     sal_uInt32 nArgCount;
     sal_uInt32 index;
@@ -58,7 +59,7 @@ void MAIN (void)
 
         osl_getCommandArg(index,&ustrArg);
 
-        fprintf(stderr,"done ...\n\n",index);
+        fprintf(stderr,"done ...\n\n");
     }
 
     ProcessError = osl_getExecutableFile(&ustrExeFile);
@@ -72,6 +73,8 @@ void MAIN (void)
                         NULL,
                         NULL,
                         &Process );*/
+    return 0;
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/tgetpwnam.cxx b/sal/workben/tgetpwnam.cxx
index 912c6b951532..c6fe6f917a93 100644
--- a/sal/workben/tgetpwnam.cxx
+++ b/sal/workben/tgetpwnam.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -246,3 +247,4 @@ int main(int argc, char *argv[])
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/condition.hxx b/salhelper/inc/salhelper/condition.hxx
index de0664cd197d..efc042ca6156 100644
--- a/salhelper/inc/salhelper/condition.hxx
+++ b/salhelper/inc/salhelper/condition.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,5 @@ namespace salhelper
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/dynload.hxx b/salhelper/inc/salhelper/dynload.hxx
index cb657ec72ff1..8f0325162455 100644
--- a/salhelper/inc/salhelper/dynload.hxx
+++ b/salhelper/inc/salhelper/dynload.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -204,3 +205,4 @@ ORealDynamicLoader* ODynamicLoader<API>::m_pStaticLoader = NULL;
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/future.hxx b/salhelper/inc/salhelper/future.hxx
index a16b9c8815d6..96159b649cf1 100644
--- a/salhelper/inc/salhelper/future.hxx
+++ b/salhelper/inc/salhelper/future.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,3 +119,5 @@ public:
 } // namespace salhelper
 
 #endif /* !_SALHELPER_FUTURE_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/futurequeue.hxx b/salhelper/inc/salhelper/futurequeue.hxx
index 64915317440b..6b4214825fe1 100644
--- a/salhelper/inc/salhelper/futurequeue.hxx
+++ b/salhelper/inc/salhelper/futurequeue.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -106,3 +107,5 @@ public:
 } // namespace salhelper
 
 #endif /* !_SALHELPER_FUTUREQUEUE */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/linkhelper.hxx b/salhelper/inc/salhelper/linkhelper.hxx
new file mode 100644
index 000000000000..c8744dcca0b4
--- /dev/null
+++ b/salhelper/inc/salhelper/linkhelper.hxx
@@ -0,0 +1,93 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef _SALHELPER_LINKHELPER_HXX
+#define _SALHELPER_LINKHELPER_HXX
+
+#include <rtl/ustring.hxx>
+#include <osl/file.hxx>
+
+namespace salhelper
+{
+    class LinkResolver
+    {
+    public:
+        osl::FileStatus m_aStatus;
+
+        LinkResolver(sal_uInt32 nMask)
+            : m_aStatus(nMask |
+                        osl_FileStatus_Mask_FileURL |
+                        osl_FileStatus_Mask_Type |
+                        osl_FileStatus_Mask_LinkTargetURL)
+        {
+        }
+
+        /** Resolve a file url if its a symbolic link, to a maximum depth of
+         *  nDepth and fill in m_aStatus with the requested ctor flags
+         *
+         *  @return osl::FileBase::E_None on success
+         *
+         *  @see DirectoryItem::getFileStatus
+         */
+        osl::FileBase::RC fetchFileStatus(const rtl::OUString &rURL,
+            int nDepth = 128)
+        {
+            //In an ideal world this wouldn't be inline, but I want to use this
+            //in jvmfwk hence salhelper, but salhelper is .map controlled and
+            //getting all the mangled names right is a misery, moving it over
+            //to visibility markup would drop per-symbol versioning
+            osl::FileBase::RC eReturn;
+
+            osl::DirectoryItem item;
+            rtl::OUString sURL(rURL);
+            while ((eReturn = osl::DirectoryItem::get(sURL, item))
+                  == osl::File::E_None)
+            {
+                if (--nDepth == 0)
+                {
+                    eReturn = osl::FileBase::E_MULTIHOP;
+                    break;
+                }
+                eReturn = item.getFileStatus(m_aStatus);
+                if (eReturn != osl::File::E_None)
+                    break;
+                if (m_aStatus.getFileType() != osl::FileStatus::Link)
+                {
+                    eReturn = osl::FileBase::E_None;
+                    break;
+                }
+                sURL = m_aStatus.getLinkTargetURL();
+            }
+
+            return eReturn;
+        }
+    };
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/monitor.hxx b/salhelper/inc/salhelper/monitor.hxx
index 5c683d386570..b7c0ceec9d3c 100644
--- a/salhelper/inc/salhelper/monitor.hxx
+++ b/salhelper/inc/salhelper/monitor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -286,3 +287,5 @@ typedef WriterGuard<QueuedReaderWriterMonitor> QueuedWriterGuard;
 } // namespace salhelper
 
 #endif /* !_SALHELPER_MONITOR_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/queue.hxx b/salhelper/inc/salhelper/queue.hxx
index 445cc5f32da1..f32fbcf73f93 100644
--- a/salhelper/inc/salhelper/queue.hxx
+++ b/salhelper/inc/salhelper/queue.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
 #include <sal/types.h>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
-#ifndef _OSL_SEMAPHOR_HXX_
 #include <osl/semaphor.hxx>
-#endif
 
 #ifndef __LIST__
 #include <list>
@@ -184,3 +183,5 @@ public:
 } // namespace salhelper
 
 #endif /* !_SALHELPER_QUEUE_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/refobj.hxx b/salhelper/inc/salhelper/refobj.hxx
index a1851eb84259..07ddfc90e0e9 100644
--- a/salhelper/inc/salhelper/refobj.hxx
+++ b/salhelper/inc/salhelper/refobj.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ protected:
 } // namespace salhelper
 
 #endif /* !_SALHELPER_REFOBJ_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx
index 4d2c60b733aa..c5ef6dbbd070 100755..100644
--- a/salhelper/inc/salhelper/simplereferenceobject.hxx
+++ b/salhelper/inc/salhelper/simplereferenceobject.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -120,6 +121,12 @@ private:
      */
     void operator =(SimpleReferenceObject);
 
+#ifdef _MSC_VER
+/* We can't now have these private with MSVC2008 at least, it leads to
+   compilation errors in xmloff and other places.
+*/
+protected:
+#endif
     /** not implemented (see general class documentation)
         @internal
      */
@@ -134,3 +141,5 @@ private:
 }
 
 #endif // _SALHELPER_SIMPLEREFERENCEOBJECT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/singletonref.hxx b/salhelper/inc/salhelper/singletonref.hxx
index 9a62be5dfe92..bf9dc69f7f87 100644
--- a/salhelper/inc/salhelper/singletonref.hxx
+++ b/salhelper/inc/salhelper/singletonref.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -208,3 +209,5 @@ sal_Int32 SingletonRef< SingletonClass >::m_nRef = 0;
 } // namespace salhelper
 
 #endif // _SALHELPER_SINGLETONREF_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/inc/salhelper/timer.hxx b/salhelper/inc/salhelper/timer.hxx
new file mode 100644
index 000000000000..7b94b11a4f00
--- /dev/null
+++ b/salhelper/inc/salhelper/timer.hxx
@@ -0,0 +1,238 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef _SALHELPER_TIMER_HXX_
+#define _SALHELPER_TIMER_HXX_
+
+#include <salhelper/simplereferenceobject.hxx>
+#include <osl/time.h>
+
+namespace salhelper
+{
+
+/** Helper class for easier manipulation with TimeValue.
+ *
+ *  Times are seconds in UTC since 01.01.1970
+ */
+struct TTimeValue : public TimeValue
+{
+    TTimeValue()
+    {
+        Seconds = 0;
+        Nanosec = 0;
+    }
+
+    TTimeValue( sal_uInt32 Secs, sal_uInt32 Nano )
+    {
+        Seconds = Secs;
+        Nanosec = Nano;
+
+        normalize();
+    }
+
+    TTimeValue(sal_uInt32 MilliSecs)
+    {
+        Seconds = MilliSecs / 1000L;
+        Nanosec = (MilliSecs % 1000) * 1000000L;
+
+        normalize();
+    }
+
+    TTimeValue( const TTimeValue& rTimeValue )
+    {
+        Seconds = rTimeValue.Seconds;
+        Nanosec = rTimeValue.Nanosec;
+
+        normalize();
+    }
+
+    TTimeValue( const TimeValue& rTimeValue )
+    {
+        Seconds = rTimeValue.Seconds;
+        Nanosec = rTimeValue.Nanosec;
+
+        normalize();
+    }
+
+    void SAL_CALL normalize()
+    {
+        if ( Nanosec > 1000000000 )
+        {
+            Seconds += Nanosec / 1000000000;
+            Nanosec %= 1000000000;
+        }
+    }
+
+    void SAL_CALL addTime( const TTimeValue& Delta )
+    {
+        Seconds += Delta.Seconds;
+        Nanosec += Delta.Nanosec;
+
+        normalize();
+    }
+
+    sal_Bool SAL_CALL isEmpty() const
+    {
+        return ( ( Seconds == 0 ) && ( Nanosec == 0 ) );
+    }
+};
+
+inline sal_Bool operator<( const TTimeValue& rTimeA, const TTimeValue& rTimeB )
+{
+    if ( rTimeA.Seconds < rTimeB.Seconds )
+        return sal_True;
+    else if ( rTimeA.Seconds > rTimeB.Seconds )
+        return sal_False;
+    else
+        return ( rTimeA.Nanosec < rTimeB.Nanosec );
+}
+
+inline sal_Bool operator>( const TTimeValue& rTimeA, const TTimeValue& rTimeB )
+{
+    if ( rTimeA.Seconds > rTimeB.Seconds )
+        return sal_True;
+    else if ( rTimeA.Seconds < rTimeB.Seconds )
+        return sal_False;
+    else
+        return ( rTimeA.Nanosec > rTimeB.Nanosec );
+}
+
+inline sal_Bool operator==( const TTimeValue& rTimeA, const TTimeValue& rTimeB )
+{
+    return ( ( rTimeA.Seconds == rTimeB.Seconds ) &&
+             ( rTimeA.Nanosec == rTimeB.Nanosec ) );
+}
+
+class TimerManager;
+
+/** Interface for the Timer and handling the event
+*/
+class Timer : public salhelper::SimpleReferenceObject
+{
+public:
+
+    /** Constructor.
+     */
+    Timer();
+
+    /** Constructor.
+     */
+    Timer( const TTimeValue& Time );
+
+    /** Constructor.
+     */
+    Timer( const TTimeValue& Time, const TTimeValue& RepeatTime );
+
+    /** Start timer.
+     */
+    void        SAL_CALL start();
+
+    /** Abort timer prematurely.
+     */
+    void        SAL_CALL stop();
+
+    /** Returns sal_True if timer is running.
+     */
+    sal_Bool    SAL_CALL isTicking() const;
+
+    /** Is the timer expired?
+     */
+    sal_Bool    SAL_CALL isExpired() const;
+
+    /** Does pTimer expires before us?
+     */
+    sal_Bool    SAL_CALL expiresBefore( const Timer* pTimer ) const;
+
+    /** Set the absolute time when the timer should fire.
+     */
+    void        SAL_CALL setAbsoluteTime( const TTimeValue& Time );
+
+    /** Set the time to fire to 'now' + Remaining.
+     */
+    void        SAL_CALL setRemainingTime( const TTimeValue& Remaining );
+
+    /** Set the time to fire to 'now' + Remaining with repeat interveal
+     * Repeat.
+     */
+    void        SAL_CALL setRemainingTime( const TTimeValue& Remaining, const TTimeValue& Repeat );
+
+    /** Adds Time to the 'fire time'.
+     */
+    void        SAL_CALL addTime( const TTimeValue& Time );
+
+    /** Returns the remaining time before timer expiration relative to now.
+     */
+    TTimeValue  SAL_CALL getRemainingTime() const;
+
+protected:
+
+    /** Destructor.
+     */
+    virtual ~Timer();
+
+    /** What should be done when the 'timer fires'.
+     */
+    virtual void SAL_CALL onShot() = 0;
+
+protected:
+
+    /** holds (initial) exparation time of this timer.
+     */
+    TTimeValue  m_aTimeOut;
+
+    /** holds the time of exparation of this timer.
+     */
+    TTimeValue  m_aExpired;
+
+    /** holds the time interveal of successive expirations.
+     */
+    TTimeValue  m_aRepeatDelta;
+
+    /** Pointer to the next timer (to fire).
+     */
+    Timer*      m_pNext;
+
+private:
+
+    /** Copy constructor disabled.
+     */
+    Timer( const Timer& rTimer );
+
+    /** Assignment operator disabled.
+     */
+    void SAL_CALL operator=( const Timer& rTimer );
+
+    friend class TimerManager;
+};
+
+}
+
+#endif  //_SALHELPER_TIMER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/prj/d.lst b/salhelper/prj/d.lst
index 9cf9e3ad8ebb..6f5df50693c1 100644
--- a/salhelper/prj/d.lst
+++ b/salhelper/prj/d.lst
@@ -1,21 +1,23 @@
-mkdir: %_DEST%\inc%_EXT%\salhelper
+mkdir: %_DEST%\inc\salhelper
 
-..\inc\salhelper\condition.hxx %_DEST%\inc%_EXT%\salhelper\condition.hxx
-..\inc\salhelper\dynload.hxx %_DEST%\inc%_EXT%\salhelper\dynload.hxx
-..\inc\salhelper\future.hxx %_DEST%\inc%_EXT%\salhelper\future.hxx
-..\inc\salhelper\futurequeue.hxx %_DEST%\inc%_EXT%\salhelper\futurequeue.hxx
-..\inc\salhelper\monitor.hxx %_DEST%\inc%_EXT%\salhelper\monitor.hxx
-..\inc\salhelper\queue.hxx %_DEST%\inc%_EXT%\salhelper\queue.hxx
-..\inc\salhelper\refobj.hxx %_DEST%\inc%_EXT%\salhelper\refobj.hxx
-..\inc\salhelper\simplereferenceobject.hxx %_DEST%\inc%_EXT%\salhelper\simplereferenceobject.hxx
-..\inc\salhelper\singletonref.hxx %_DEST%\inc%_EXT%\salhelper\singletonref.hxx
+..\inc\salhelper\condition.hxx %_DEST%\inc\salhelper\condition.hxx
+..\inc\salhelper\dynload.hxx %_DEST%\inc\salhelper\dynload.hxx
+..\inc\salhelper\future.hxx %_DEST%\inc\salhelper\future.hxx
+..\inc\salhelper\futurequeue.hxx %_DEST%\inc\salhelper\futurequeue.hxx
+..\inc\salhelper\monitor.hxx %_DEST%\inc\salhelper\monitor.hxx
+..\inc\salhelper\queue.hxx %_DEST%\inc\salhelper\queue.hxx
+..\inc\salhelper\linkhelper.hxx %_DEST%\inc\salhelper\linkhelper.hxx
+..\inc\salhelper\refobj.hxx %_DEST%\inc\salhelper\refobj.hxx
+..\inc\salhelper\simplereferenceobject.hxx %_DEST%\inc\salhelper\simplereferenceobject.hxx
+..\inc\salhelper\singletonref.hxx %_DEST%\inc\salhelper\singletonref.hxx
+..\inc\salhelper\timer.hxx %_DEST%\inc\salhelper\timer.hxx
 
-..\%__SRC%\bin\salhelp*.dll %_DEST%\bin%_EXT%\salhelp*.dll
-..\%__SRC%\lib\*salhelper*.lib %_DEST%\lib%_EXT%\*
+..\%__SRC%\bin\salhelp*.dll %_DEST%\bin\salhelp*.dll
+..\%__SRC%\lib\*salhelper*.lib %_DEST%\lib\*
 
-..\%__SRC%\lib\libuno_salhelper*.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libuno_salhelper*.* %_DEST%\lib\*
 
-..\%__SRC%\lib\libsalhelper*.a %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\salhelper*.lib %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libsalhelper*.a %_DEST%\lib\*
+..\%__SRC%\lib\salhelper*.lib %_DEST%\lib\*
 
 linklib: libuno_salhelper*.*.*
diff --git a/salhelper/qa/makefile.mk b/salhelper/qa/makefile.mk
index fe2aff7453be..fae96cfe6328 100644
--- a/salhelper/qa/makefile.mk
+++ b/salhelper/qa/makefile.mk
@@ -37,7 +37,7 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_api.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB)
+SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB)
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1VERSIONMAP = version.map
 DEF1NAME = $(SHL1TARGET)
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index fff66f8d1cd2..dfdbee59aa71 100644
--- a/salhelper/qa/test_api.cxx
+++ b/salhelper/qa/test_api.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -248,3 +249,5 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
 }
 
 NOADDITIONAL;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/source/condition.cxx b/salhelper/source/condition.cxx
index 87f0c2e50509..42e0676fbb96 100644
--- a/salhelper/source/condition.cxx
+++ b/salhelper/source/condition.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -140,3 +141,5 @@ ConditionWaiter::~ConditionWaiter()
         osl_resetCondition(m_aCond.m_aCondition);
     m_aCond.m_aMutex.release();
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/source/dynload.cxx b/salhelper/source/dynload.cxx
index 09a228719286..6db64f002de8 100644
--- a/salhelper/source/dynload.cxx
+++ b/salhelper/source/dynload.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,4 @@ void* ORealDynamicLoader::getApi() const
 
 } // namespace salhelper
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/source/gcc3.map b/salhelper/source/gcc3.map
index cfd3b7e40bf2..7c63d5d9ee24 100644
--- a/salhelper/source/gcc3.map
+++ b/salhelper/source/gcc3.map
@@ -70,4 +70,27 @@ UDK_3.1 {
         _ZN9salhelper15ConditionWaiter8timedoutD2Ev;
         # _ZTIN9salhelper15ConditionWaiter8timedoutE;
         # _ZTSN9salhelper15ConditionWaiter8timedoutE;
+
+
+    _ZN9salhelper5TimerC1ERKNS_10TTimeValueE;
+    _ZN9salhelper5TimerC1ERKNS_10TTimeValueES3_;
+    _ZN9salhelper5TimerC1Ev;
+    _ZN9salhelper5TimerC2ERKNS_10TTimeValueE;
+    _ZN9salhelper5TimerC2ERKNS_10TTimeValueES3_;
+    _ZN9salhelper5TimerC2Ev;
+    _ZN9salhelper5TimerD0Ev;
+    _ZN9salhelper5TimerD1Ev;
+    _ZN9salhelper5TimerD2Ev;
+    _ZN9salhelper5Timer5startEv;
+    _ZN9salhelper5Timer4stopEv;
+    _ZNK9salhelper5Timer9isTickingEv;
+    _ZNK9salhelper5Timer9isExpiredEv;
+    _ZNK9salhelper5Timer13expiresBeforeEPKS0_;
+    _ZN9salhelper5Timer15setAbsoluteTimeERKNS_10TTimeValueE;
+    _ZN9salhelper5Timer16setRemainingTimeERKNS_10TTimeValueE;
+    _ZN9salhelper5Timer16setRemainingTimeERKNS_10TTimeValueES3_;
+    _ZN9salhelper5Timer7addTimeERKNS_10TTimeValueE;
+    _ZNK9salhelper5Timer16getRemainingTimeEv;
+
+
 } UDK_3_0_0;
diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk
index a6b83cb5e090..8c7d8a2c0963 100644
--- a/salhelper/source/makefile.mk
+++ b/salhelper/source/makefile.mk
@@ -33,7 +33,7 @@ ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 USE_DEFFILE=TRUE
 
-.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2"
+.IF "$(OS)" != "WNT"
 UNIXVERSIONNAMES=UDK
 .ENDIF # WNT
 
@@ -46,20 +46,20 @@ UNIXVERSIONNAMES=UDK
 SLOFILES=	\
     $(SLO)$/condition.obj \
     $(SLO)$/dynload.obj \
-    $(SLO)$/simplereferenceobject.obj
+    $(SLO)$/simplereferenceobject.obj \
+    $(SLO)$/timer.obj
 
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
 SHL1TARGET=	$(TARGET)$(UDK_MAJOR)$(COMID)
-.ELIF "$(GUI)" == "OS2"
-SHL1TARGET=	salhelp$(UDK_MAJOR)
+SHL1IMPLIB=	i$(TARGET)
 .ELSE
 SHL1TARGET=	uno_$(TARGET)$(COMID)
+SHL1IMPLIB=	$(SHL1TARGET)
 .ENDIF
 
 SHL1STDLIBS=$(SALLIB)
 
 SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 SHL1RPATH=  URELIB
@@ -68,8 +68,8 @@ DEF1NAME=	$(SHL1TARGET)
 
 .IF "$(COMNAME)"=="msci"
 SHL1VERSIONMAP=msci.map
-.ELIF "$(GUI)"=="OS2"
-SHL1VERSIONMAP=gcc3os2.map
+.ELIF "$(COMNAME)"=="mscx"
+SHL1VERSIONMAP=mscx.map
 .ELIF "$(COMNAME)"=="sunpro5"
 SHL1VERSIONMAP=sols.map
 .ELIF "$(COMNAME)"=="gcc3"
diff --git a/salhelper/source/msci.map b/salhelper/source/msci.map
index 737513c93d04..b0359e0c7166 100644
--- a/salhelper/source/msci.map
+++ b/salhelper/source/msci.map
@@ -19,6 +19,7 @@ GetVersionInfo
 
 UDK_3.1 {
     global:
+        ??_VSimpleReferenceObject@salhelper@@KAXPAX@Z;
         ??_7SimpleReferenceObject@salhelper@@6B@;
 
         ??0Condition@salhelper@@QAE@AAVMutex@osl@@@Z;
@@ -35,4 +36,15 @@ UDK_3.1 {
         ??0timedout@ConditionWaiter@salhelper@@QAE@ABU012@@Z;
         ??1timedout@ConditionWaiter@salhelper@@UAE@XZ;
         ??4timedout@ConditionWaiter@salhelper@@QAEAAU012@ABU012@@Z;
+
+        ??0Timer@salhelper@@QAE@XZ;
+        ??0Timer@salhelper@@QAE@ABUTTimeValue@1@@Z;
+        ??0Timer@salhelper@@QAE@ABUTTimeValue@1@0@Z;
+        ??1Timer@salhelper@@MAE@XZ;
+
+        ?isExpired@Timer@salhelper@@QBAEXZ;
+        ?isTicking@Timer@salhelper@@QBAEXZ;
+        ?setRemainingTime@Timer@salhelper@@QAAXABUTTimeValue@2@@Z;
+        ?start@Timer@salhelper@@QAAXXZ;
+        ?stop@Timer@salhelper@@QAAXXZ;
 } UDK_3_0_0;
diff --git a/salhelper/source/mscx.map b/salhelper/source/mscx.map
new file mode 100644
index 000000000000..58f26e9041ab
--- /dev/null
+++ b/salhelper/source/mscx.map
@@ -0,0 +1,50 @@
+UDK_3_0_0 {
+    global:
+GetVersionInfo
+??0ORealDynamicLoader@salhelper@@IEAA@PEAPEAV01@AEBVOUString@rtl@@1PEAX2@Z
+??1ORealDynamicLoader@salhelper@@MEAA@XZ
+??_7ORealDynamicLoader@salhelper@@6B@
+?acquire@ORealDynamicLoader@salhelper@@QEAAKXZ
+?getApi@ORealDynamicLoader@salhelper@@QEBAPEAXXZ
+?newInstance@ORealDynamicLoader@salhelper@@SAPEAV12@PEAPEAV12@AEBVOUString@rtl@@1@Z
+?release@ORealDynamicLoader@salhelper@@QEAAKXZ
+??1SimpleReferenceObject@salhelper@@MEAA@XZ
+??2SimpleReferenceObject@salhelper@@SAPEAX_K@Z
+??2SimpleReferenceObject@salhelper@@SAPEAX_KAEBUnothrow_t@std@@@Z
+??3SimpleReferenceObject@salhelper@@SAXPEAX@Z
+??3SimpleReferenceObject@salhelper@@SAXPEAXAEBUnothrow_t@std@@@Z
+    local:
+        *;
+};
+
+UDK_3.1 {
+    global:
+        ??_VSimpleReferenceObject@salhelper@@KAXPEAX@Z;
+        ??_7SimpleReferenceObject@salhelper@@6B@;
+
+        ??0Condition@salhelper@@QEAA@AEAVMutex@osl@@@Z;
+        ??1Condition@salhelper@@UEAA@XZ;
+
+        ??0ConditionModifier@salhelper@@QEAA@AEAVCondition@1@@Z;
+        ??1ConditionModifier@salhelper@@QEAA@XZ;
+
+        ??0ConditionWaiter@salhelper@@QEAA@AEAVCondition@1@@Z;
+        ??0ConditionWaiter@salhelper@@QEAA@AEAVCondition@1@K@Z;
+        ??1ConditionWaiter@salhelper@@QEAA@XZ;
+
+        ??0timedout@ConditionWaiter@salhelper@@QEAA@XZ;
+        ??0timedout@ConditionWaiter@salhelper@@QEAA@AEBU012@@Z;
+        ??1timedout@ConditionWaiter@salhelper@@UEAA@XZ;
+        ??4timedout@ConditionWaiter@salhelper@@QEAAAEAU012@AEBU012@@Z;
+
+        ??0Timer@salhelper@@QEAA@XZ;
+        ??0Timer@salhelper@@QEAA@AEBUTTimeValue@1@@Z;
+        ??0Timer@salhelper@@QEAA@AEBUTTimeValue@1@0@Z;
+        ??1Timer@salhelper@@MEAA@XZ;
+
+        ?isExpired@Timer@salhelper@@QEBAEXZ;
+        ?isTicking@Timer@salhelper@@QEBAEXZ;
+        ?setRemainingTime@Timer@salhelper@@QEAAXAEBUTTimeValue@2@@Z;
+        ?start@Timer@salhelper@@QEAAXXZ;
+        ?stop@Timer@salhelper@@QEAAXXZ;
+} UDK_3_0_0;
diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx
index 1e7ac29d3aa9..6df42cc1c930 100755..100644
--- a/salhelper/source/simplereferenceobject.cxx
+++ b/salhelper/source/simplereferenceobject.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,20 @@ void SimpleReferenceObject::operator delete(void * pPtr, std::nothrow_t const &)
     ::operator delete(pPtr, std::nothrow);
 #endif // WNT
 }
+
+#ifdef _MSC_VER
+
+/* This operator is supposed to be unimplemented, but that now leads
+ * to compilation and/or linking errors with MSVC2008. (Don't know
+ * about MSVC2010.) As it can be left unimplemented just fine with
+ * gcc, presumably it is never called. So do implement it then to
+ * avoid the compilation and/or linking errors, but make it crash
+ * intentionally if called.
+ */
+void SimpleReferenceObject::operator delete[](void * /* pPtr */)
+{
+    free(NULL);
+}
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx
new file mode 100644
index 000000000000..aff006c95e8b
--- /dev/null
+++ b/salhelper/source/timer.cxx
@@ -0,0 +1,488 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#include <salhelper/timer.hxx>
+
+#include <osl/diagnose.h>
+#include <salhelper/simplereferenceobject.hxx>
+#include <osl/thread.hxx>
+#include <osl/conditn.hxx>
+#include <osl/mutex.hxx>
+
+using namespace salhelper;
+
+class salhelper::TimerManager : public osl::Thread
+{
+
+public:
+
+    ///
+    TimerManager();
+
+    ///
+    ~TimerManager();
+
+    /// register timer
+    sal_Bool SAL_CALL registerTimer(salhelper::Timer* pTimer);
+
+    /// unregister timer
+    sal_Bool SAL_CALL unregisterTimer(salhelper::Timer* pTimer);
+
+    /// lookup timer
+    sal_Bool SAL_CALL lookupTimer(const salhelper::Timer* pTimer);
+
+    /// retrieves the "Singleton" TimerManager Instance
+    static TimerManager* SAL_CALL getTimerManager();
+
+
+protected:
+
+    /// worker-function of thread
+    virtual void SAL_CALL run();
+
+    // Checking and triggering of a timer event
+    void SAL_CALL checkForTimeout();
+
+    // cleanup Method
+    virtual void SAL_CALL onTerminated();
+
+    // sorted-queue data
+    salhelper::Timer*       m_pHead;
+    // List Protection
+    osl::Mutex                  m_Lock;
+    // Signal the insertion of a timer
+    osl::Condition              m_notEmpty;
+
+    // Synchronize access to TimerManager
+    static osl::Mutex           m_Access;
+
+    // "Singleton Pattern"
+    static salhelper::TimerManager* m_pManager;
+
+    friend class TimerManagerCleanup;
+
+};
+
+using namespace salhelper;
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Timer class
+//
+
+Timer::Timer()
+    : m_aTimeOut( 0 ),
+      m_aExpired( 0 ),
+      m_aRepeatDelta( 0 ),
+      m_pNext( NULL )
+{
+}
+
+Timer::Timer( const TTimeValue& Time )
+    : m_aTimeOut( Time ),
+      m_aExpired( 0 ),
+      m_aRepeatDelta( 0 ),
+      m_pNext( NULL )
+{
+}
+
+Timer::Timer( const TTimeValue& Time, const TTimeValue& Repeat )
+    : m_aTimeOut( Time ),
+      m_aExpired( 0 ),
+      m_aRepeatDelta( Repeat ),
+      m_pNext( NULL )
+{
+}
+
+Timer::~Timer()
+{
+    stop();
+}
+
+void Timer::start()
+{
+    if (! isTicking())
+    {
+        if (! m_aTimeOut.isEmpty())
+            setRemainingTime(m_aTimeOut);
+
+        TimerManager *pManager = TimerManager::getTimerManager();
+
+        OSL_ASSERT(pManager);
+
+        if ( pManager != 0 )
+        {
+            pManager->registerTimer(this);
+        }
+    }
+}
+
+void Timer::stop()
+{
+    TimerManager *pManager = TimerManager::getTimerManager();
+
+    OSL_ASSERT(pManager);
+
+    if ( pManager != 0 )
+    {
+        pManager->unregisterTimer(this);
+    }
+}
+
+sal_Bool Timer::isTicking() const
+{
+    TimerManager *pManager = TimerManager::getTimerManager();
+
+    OSL_ASSERT(pManager);
+
+    if (pManager)
+        return pManager->lookupTimer(this);
+    else
+        return sal_False;
+
+}
+
+sal_Bool Timer::isExpired() const
+{
+    TTimeValue Now;
+
+    osl_getSystemTime(&Now);
+
+    return !(Now < m_aExpired);
+}
+
+sal_Bool Timer::expiresBefore(const Timer* pTimer) const
+{
+    OSL_ASSERT(pTimer);
+
+    if ( pTimer != 0 )
+    {
+        return m_aExpired < pTimer->m_aExpired;
+    }
+    else
+    {
+        return sal_False;
+    }
+}
+
+void Timer::setAbsoluteTime(const TTimeValue& Time)
+{
+    m_aTimeOut     = 0;
+    m_aExpired     = Time;
+    m_aRepeatDelta = 0;
+
+    m_aExpired.normalize();
+}
+
+void Timer::setRemainingTime(const TTimeValue& Remaining)
+{
+    osl_getSystemTime(&m_aExpired);
+
+    m_aExpired.addTime(Remaining);
+}
+
+void Timer::setRemainingTime(const TTimeValue& Remaining, const TTimeValue& Repeat)
+{
+    osl_getSystemTime(&m_aExpired);
+
+    m_aExpired.addTime(Remaining);
+
+    m_aRepeatDelta = Repeat;
+}
+
+void Timer::addTime(const TTimeValue& Delta)
+{
+    m_aExpired.addTime(Delta);
+}
+
+TTimeValue Timer::getRemainingTime() const
+{
+    TTimeValue Now;
+
+    osl_getSystemTime(&Now);
+
+    sal_Int32 secs = m_aExpired.Seconds - Now.Seconds;
+
+    if (secs < 0)
+        return TTimeValue(0, 0);
+
+    sal_Int32 nsecs = m_aExpired.Nanosec - Now.Nanosec;
+
+    if (nsecs < 0)
+    {
+        if (secs > 0)
+        {
+            secs  -= 1;
+            nsecs += 1000000000L;
+        }
+        else
+            return TTimeValue(0, 0);
+    }
+
+    return TTimeValue(secs, nsecs);
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Timer manager
+//
+
+osl::Mutex salhelper::TimerManager::m_Access;
+TimerManager* salhelper::TimerManager::m_pManager = NULL;
+
+TimerManager::TimerManager()
+{
+    osl::MutexGuard Guard(&m_Access);
+
+    OSL_ASSERT(m_pManager == 0);
+
+    m_pManager = this;
+
+    m_pHead= 0;
+
+    m_notEmpty.reset();
+
+    // start thread
+    create();
+}
+
+TimerManager::~TimerManager()
+{
+    osl::MutexGuard Guard(&m_Access);
+
+    if ( m_pManager == this )
+        m_pManager = 0;
+}
+
+void TimerManager::onTerminated()
+{
+    delete this; // mfe: AAARRRGGGHHH!!!
+}
+
+TimerManager* TimerManager::getTimerManager()
+{
+    osl::MutexGuard Guard(&m_Access);
+
+    if (! m_pManager)
+        new TimerManager;
+
+    return (m_pManager);
+}
+
+sal_Bool TimerManager::registerTimer(Timer* pTimer)
+{
+    OSL_ASSERT(pTimer);
+
+    if ( pTimer == 0 )
+    {
+        return sal_False;
+    }
+
+    osl::MutexGuard Guard(&m_Lock);
+
+    // try to find one with equal or lower remaining time.
+    Timer** ppIter = &m_pHead;
+
+    while (*ppIter)
+    {
+        if (pTimer->expiresBefore(*ppIter))
+        {
+            // next element has higher remaining time,
+            // => insert new timer before
+            break;
+        }
+        ppIter= &((*ppIter)->m_pNext);
+    }
+
+    // next element has higher remaining time,
+    // => insert new timer before
+    pTimer->m_pNext= *ppIter;
+    *ppIter = pTimer;
+
+
+    if (pTimer == m_pHead)
+    {
+        // it was inserted as new head
+        // signal it to TimerManager Thread
+        m_notEmpty.set();
+    }
+
+    return sal_True;
+}
+
+sal_Bool TimerManager::unregisterTimer(Timer* pTimer)
+{
+    OSL_ASSERT(pTimer);
+
+    if ( pTimer == 0 )
+    {
+        return sal_False;
+    }
+
+    // lock access
+    osl::MutexGuard Guard(&m_Lock);
+
+    Timer** ppIter = &m_pHead;
+
+    while (*ppIter)
+    {
+        if (pTimer == (*ppIter))
+        {
+            // remove timer from list
+            *ppIter = (*ppIter)->m_pNext;
+            return sal_True;
+        }
+        ppIter= &((*ppIter)->m_pNext);
+    }
+
+    return sal_False;
+}
+
+sal_Bool TimerManager::lookupTimer(const Timer* pTimer)
+{
+    OSL_ASSERT(pTimer);
+
+    if ( pTimer == 0 )
+    {
+        return sal_False;
+    }
+
+    // lock access
+    osl::MutexGuard Guard(&m_Lock);
+
+    // check the list
+    for (Timer* pIter = m_pHead; pIter != 0; pIter= pIter->m_pNext)
+    {
+        if (pIter == pTimer)
+        {
+            return sal_True;
+        }
+    }
+
+    return sal_False;
+}
+
+void TimerManager::checkForTimeout()
+{
+
+    m_Lock.acquire();
+
+    if ( m_pHead == 0 )
+    {
+        m_Lock.release();
+        return;
+    }
+
+    Timer* pTimer = m_pHead;
+
+    if (pTimer->isExpired())
+    {
+        // remove expired timer
+        m_pHead = pTimer->m_pNext;
+
+        pTimer->acquire();
+
+        m_Lock.release();
+
+        pTimer->onShot();
+
+        // restart timer if specified
+        if ( ! pTimer->m_aRepeatDelta.isEmpty() )
+        {
+            TTimeValue Now;
+
+            osl_getSystemTime(&Now);
+
+            Now.Seconds += pTimer->m_aRepeatDelta.Seconds;
+            Now.Nanosec += pTimer->m_aRepeatDelta.Nanosec;
+
+            pTimer->m_aExpired = Now;
+
+            registerTimer(pTimer);
+        }
+        pTimer->release();
+    }
+    else
+    {
+        m_Lock.release();
+    }
+
+
+    return;
+}
+
+void TimerManager::run()
+{
+    setPriority( osl_Thread_PriorityBelowNormal );
+
+    while (schedule())
+    {
+        TTimeValue      delay;
+        TTimeValue*     pDelay=0;
+
+
+        m_Lock.acquire();
+
+        if (m_pHead != 0)
+        {
+            delay = m_pHead->getRemainingTime();
+            pDelay=&delay;
+        }
+        else
+        {
+            pDelay=0;
+        }
+
+
+        m_notEmpty.reset();
+
+        m_Lock.release();
+
+
+        m_notEmpty.wait(pDelay);
+
+        checkForTimeout();
+    }
+
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Timer manager cleanup
+//
+
+// jbu:
+// The timer manager cleanup has been removed (no thread is killed anymore).
+// So the thread leaks.
+// This will result in a GPF in case the salhelper-library gets unloaded before
+// process termination.
+// -> TODO : rewrite this file, so that the timerManager thread gets destroyed,
+//           when there are no timers anymore !
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/Symbols/loader.cxx b/salhelper/test/Symbols/loader.cxx
index 82adeecaea9e..f6c862eda3f2 100644
--- a/salhelper/test/Symbols/loader.cxx
+++ b/salhelper/test/Symbols/loader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 #include  <salhelper/dynload.hxx>
 #include <rtl/ustring>
@@ -6,7 +7,8 @@
 
 
 using namespace salhelper;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 
 class SampleLibLoader
@@ -35,3 +37,5 @@ int main( int argc, char *argv[ ], char *envp[ ] )
 
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/Symbols/makefile.mk b/salhelper/test/Symbols/makefile.mk
index d6026a3c893b..e91066670601 100644
--- a/salhelper/test/Symbols/makefile.mk
+++ b/salhelper/test/Symbols/makefile.mk
@@ -72,8 +72,6 @@ DEF1NAME=	$(SHL1TARGET)
 DEFLIB1NAME=	$(TARGET1)
 DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt
 
-#DEF1EXPORTFILE=	exports.dxp
-
 # ------------------------------------------------------------------------------
 
 OBJFILES=	$(OBJ)$/loader.obj
diff --git a/salhelper/test/Symbols/samplelib.cxx b/salhelper/test/Symbols/samplelib.cxx
index f4809f51fd2e..6f66aa73f324 100644
--- a/salhelper/test/Symbols/samplelib.cxx
+++ b/salhelper/test/Symbols/samplelib.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include "samplelib.hxx"
 #include <sal/types.h>
 /*
@@ -35,3 +36,4 @@ double SAL_CALL funcB( double a)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/Symbols/samplelib.hxx b/salhelper/test/Symbols/samplelib.hxx
index d5986ad67c5c..fbe96c372a84 100644
--- a/salhelper/test/Symbols/samplelib.hxx
+++ b/salhelper/test/Symbols/samplelib.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef __SAMPLELIB_HXX_
 #define __SAMPLELIB_HXX_
 
@@ -20,3 +21,5 @@ double SAL_CALL funcB( double a);
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/dynamicloader/loader.cxx b/salhelper/test/dynamicloader/loader.cxx
index 82adeecaea9e..f6c862eda3f2 100644
--- a/salhelper/test/dynamicloader/loader.cxx
+++ b/salhelper/test/dynamicloader/loader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 #include  <salhelper/dynload.hxx>
 #include <rtl/ustring>
@@ -6,7 +7,8 @@
 
 
 using namespace salhelper;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 
 class SampleLibLoader
@@ -35,3 +37,5 @@ int main( int argc, char *argv[ ], char *envp[ ] )
 
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/dynamicloader/makefile.mk b/salhelper/test/dynamicloader/makefile.mk
index 718f9cbe6bbc..d786692cb551 100644
--- a/salhelper/test/dynamicloader/makefile.mk
+++ b/salhelper/test/dynamicloader/makefile.mk
@@ -43,14 +43,11 @@ BOOTSTRAP_SERVICE=FALSE
 
 # --- Files ---
 
-
 #RTTI on
 .IF "$(OS)" == "WNT"
 CFLAGS+= -GR
 .ENDIF
 
-
-# UNOTYPES= com.sun.star.lang.XInitialization \
 #---------------------------------------------------------------------------
 # Build the test library which is loaded by the 
 # RealDynamicLoader
@@ -79,8 +76,6 @@ DEF1NAME=	$(SHL1TARGET)
 DEFLIB1NAME =$(TARGET1)
 DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt
 
-#DEF1EXPORTFILE=	exports.dxp
-
 # ------------------------------------------------------------------------------
 
 APP1NOSAL=TRUE
@@ -94,8 +89,6 @@ APP1STDLIBS= \
     $(CPPUHELPERLIB) \
     $(CPPULIB)
 
-#APP1LIBS=	$(LB)$/isalhelper.lib
-
 .IF "$(OS)" == "WNT"
 APP1STDLIBS+=   $(LB)$/isalhelper.lib
 .ELSE
@@ -114,4 +107,3 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo Making: $@
     @echo __CT>>$@
 
-
diff --git a/salhelper/test/dynamicloader/samplelib.cxx b/salhelper/test/dynamicloader/samplelib.cxx
index f4809f51fd2e..6f66aa73f324 100644
--- a/salhelper/test/dynamicloader/samplelib.cxx
+++ b/salhelper/test/dynamicloader/samplelib.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include "samplelib.hxx"
 #include <sal/types.h>
 /*
@@ -35,3 +36,4 @@ double SAL_CALL funcB( double a)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/dynamicloader/samplelib.hxx b/salhelper/test/dynamicloader/samplelib.hxx
index d5986ad67c5c..fbe96c372a84 100644
--- a/salhelper/test/dynamicloader/samplelib.hxx
+++ b/salhelper/test/dynamicloader/samplelib.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef __SAMPLELIB_HXX_
 #define __SAMPLELIB_HXX_
 
@@ -20,3 +21,5 @@ double SAL_CALL funcB( double a);
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/rtti/exports.dxp b/salhelper/test/rtti/exports.dxp
index 41a9804fdbeb..beafa6a1c40f 100644
--- a/salhelper/test/rtti/exports.dxp
+++ b/salhelper/test/rtti/exports.dxp
@@ -1,8 +1,6 @@
 ?funcA@MyClassA@@UAEXXZ
 ?funcB@MyClassA@@UAEXXZ
 ?funcC@MyClassA@@MAEXXZ
-?funcD@MyClassA@@EAEXXZ
 ?funcA@MyClassB@@UAEXXZ
 ?funcB@MyClassB@@UAEXXZ
 ?funcC@MyClassB@@MAEXXZ
-?funcD@MyClassB@@EAEXXZ
\ No newline at end of file
diff --git a/salhelper/test/rtti/rttitest.cxx b/salhelper/test/rtti/rttitest.cxx
index ad03f3dc7960..c44cb9ead34a 100644
--- a/salhelper/test/rtti/rttitest.cxx
+++ b/salhelper/test/rtti/rttitest.cxx
@@ -1,29 +1,21 @@
-#include <rtl/ustring>
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include <stdio.h>
 #include <typeinfo>
 #include "samplelibrtti.hxx"
 
-
-//using namespace salhelper;
-using namespace rtl;
-
-
-
-int main( int argc, char *argv[ ], char *envp[ ] )
+int main( void )
 {
     MyClassB b;
     MyClassA* pA= &b;
     // test the virtual function
     pA->funcA();
 
-//  const type_info& i1= typeid ( b);
-//  const type_info& i2= typeid( pA);
-
     if( typeid( b) == typeid( pA))
         printf("\nsame types");
 
-
     MyClassB* pB= dynamic_cast<MyClassB* >( pA);
-        pB->funcA();
+    pB->funcA();
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/rtti/samplelibrtti.cxx b/salhelper/test/rtti/samplelibrtti.cxx
index 151ed9ae3c0a..e3cec911865e 100644
--- a/salhelper/test/rtti/samplelibrtti.cxx
+++ b/salhelper/test/rtti/samplelibrtti.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include "samplelibrtti.hxx"
 #include <stdio.h>
 
@@ -15,10 +16,6 @@ void MyClassA::funcC()
 {
 }
 
-void MyClassA::funcD()
-{
-}
-
 // MyClassB ===============================================================
 void MyClassB::funcA()
 {
@@ -34,6 +31,4 @@ void MyClassB::funcC()
 {
 }
 
-void MyClassB::funcD()
-{
-}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/rtti/samplelibrtti.hxx b/salhelper/test/rtti/samplelibrtti.hxx
index 5f1294dd73af..dd6a87052c6d 100644
--- a/salhelper/test/rtti/samplelibrtti.hxx
+++ b/salhelper/test/rtti/samplelibrtti.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef __SAMPLELIBRTTI_HXX_
 #define __SAMPLELIBRTTI_HXX_
 
@@ -8,8 +9,6 @@ public:
     virtual void  funcB();
 protected:
     virtual void  funcC();
-private:
-    virtual void  funcD();
 };
 
 
@@ -20,9 +19,8 @@ public:
     virtual void  funcB();
 protected:
     virtual void  funcC();
-private:
-    virtual void  funcD();
-
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/rtti/sols.map b/salhelper/test/rtti/sols.map
index babf2c901585..aa778d405666 100644
--- a/salhelper/test/rtti/sols.map
+++ b/salhelper/test/rtti/sols.map
@@ -7,12 +7,10 @@ _init;
 __1cIMyClassAFfuncA6M_v_;
 __1cIMyClassAFfuncB6M_v_;
 __1cIMyClassAFfuncC6M_v_;
-__1cIMyClassAFfuncD6M_v_;
 __1cIMyClassAG__vtbl_;
 __1cIMyClassBFfuncA6M_v_;
 __1cIMyClassBFfuncB6M_v_;
 __1cIMyClassBFfuncC6M_v_;
-__1cIMyClassBFfuncD6M_v_;
 __1cIMyClassBG__vtbl_;
 __RTTI__1CpknIMyClassA_;
 __RTTI__1CpknIMyClassB_;
diff --git a/stoc/inc/bootstrapservices.hxx b/stoc/inc/bootstrapservices.hxx
index 56bfda2612f3..e504b164f89a 100644
--- a/stoc/inc/bootstrapservices.hxx
+++ b/stoc/inc/bootstrapservices.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,3 +110,5 @@ namespace stoc_bootstrap
     ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL tdmgr_getSupportedServiceNames();
     ::rtl::OUString SAL_CALL tdmgr_getImplementationName();
 } // namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/inc/pch/precompiled_stoc.cxx b/stoc/inc/pch/precompiled_stoc.cxx
index 309f053446c8..9e1e04a932b9 100644
--- a/stoc/inc/pch/precompiled_stoc.cxx
+++ b/stoc/inc/pch/precompiled_stoc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_stoc.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/inc/pch/precompiled_stoc.hxx b/stoc/inc/pch/precompiled_stoc.hxx
index 965dc87ff23c..3e0b4d6dee3f 100644
--- a/stoc/inc/pch/precompiled_stoc.hxx
+++ b/stoc/inc/pch/precompiled_stoc.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -287,3 +288,5 @@
 //---MARKER---
 #endif
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/inc/stocservices.hxx b/stoc/inc/stocservices.hxx
index efdd62f9ff43..e27124758f41 100644
--- a/stoc/inc/stocservices.hxx
+++ b/stoc/inc/stocservices.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,3 +93,5 @@ namespace stoc_services
     com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames();
     }
 } // namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/prj/d.lst b/stoc/prj/d.lst
index 79b2d77348b4..35863e7e9227 100644
--- a/stoc/prj/d.lst
+++ b/stoc/prj/d.lst
@@ -1,28 +1,28 @@
-mkdir: %_DEST%\inc%_EXT%\stoc
+mkdir: %_DEST%\inc\stoc
 
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\*
-..\%__SRC%\misc\bootstrap.component %_DEST%\xml%_EXT%\bootstrap.component
-..\%__SRC%\misc\introspection.component %_DEST%\xml%_EXT%\introspection.component
-..\%__SRC%\misc\invocadapt.component %_DEST%\xml%_EXT%\invocadapt.component
-..\%__SRC%\misc\invocation.component %_DEST%\xml%_EXT%\invocation.component
-..\%__SRC%\misc\javaloader.component %_DEST%\xml%_EXT%\javaloader.component
-..\%__SRC%\misc\javavm.component %_DEST%\xml%_EXT%\javavm.component
-..\%__SRC%\misc\namingservice.component %_DEST%\xml%_EXT%\namingservice.component
-..\%__SRC%\misc\proxyfac.component %_DEST%\xml%_EXT%\proxyfac.component
-..\%__SRC%\misc\reflection.component %_DEST%\xml%_EXT%\reflection.component
-..\%__SRC%\misc\stocservices.component %_DEST%\xml%_EXT%\stocservices.component
+..\%__SRC%\bin\*.dll %_DEST%\bin\*
+..\%__SRC%\lib\*.so %_DEST%\lib\*
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\bin\*.rdb %_DEST%\rdb\*
+..\%__SRC%\misc\bootstrap.component %_DEST%\xml\bootstrap.component
+..\%__SRC%\misc\introspection.component %_DEST%\xml\introspection.component
+..\%__SRC%\misc\invocadapt.component %_DEST%\xml\invocadapt.component
+..\%__SRC%\misc\invocation.component %_DEST%\xml\invocation.component
+..\%__SRC%\misc\javaloader.component %_DEST%\xml\javaloader.component
+..\%__SRC%\misc\javavm.component %_DEST%\xml\javavm.component
+..\%__SRC%\misc\namingservice.component %_DEST%\xml\namingservice.component
+..\%__SRC%\misc\proxyfac.component %_DEST%\xml\proxyfac.component
+..\%__SRC%\misc\reflection.component %_DEST%\xml\reflection.component
+..\%__SRC%\misc\stocservices.component %_DEST%\xml\stocservices.component
 
-..\source\module-description.dtd %_DEST%\xml%_EXT%\module-description.dtd
-..\source\corereflection\corefl.xml %_DEST%\xml%_EXT%\reflection.uno.xml
-..\source\inspect\insp.xml %_DEST%\xml%_EXT%\introspection.uno.xml
-..\source\invocation\inv.xml %_DEST%\xml%_EXT%\invocation.uno.xml
-..\source\invocation_adapterfactory\invadp.xml %_DEST%\xml%_EXT%\invocadapt.uno.xml
-..\source\javavm\jen.xml %_DEST%\xml%_EXT%\javavm.uno.xml
-..\source\javaloader\javaloader.xml %_DEST%\xml%_EXT%\javaloader.uno.xml
-..\source\namingservice\namingservice.xml %_DEST%\xml%_EXT%\namingservice.uno.xml
-..\source\proxy_factory\proxyfac.xml %_DEST%\xml%_EXT%\proxyfac.uno.xml
-..\source\bootstrap\bootstrap.xml %_DEST%\xml%_EXT%\bootstrap.uno.xml
-..\source\typeconv\stocserv.xml %_DEST%\xml%_EXT%\stocserv.uno.xml
+..\source\module-description.dtd %_DEST%\xml\module-description.dtd
+..\source\corereflection\corefl.xml %_DEST%\xml\reflection.uno.xml
+..\source\inspect\insp.xml %_DEST%\xml\introspection.uno.xml
+..\source\invocation\inv.xml %_DEST%\xml\invocation.uno.xml
+..\source\invocation_adapterfactory\invadp.xml %_DEST%\xml\invocadapt.uno.xml
+..\source\javavm\jen.xml %_DEST%\xml\javavm.uno.xml
+..\source\javaloader\javaloader.xml %_DEST%\xml\javaloader.uno.xml
+..\source\namingservice\namingservice.xml %_DEST%\xml\namingservice.uno.xml
+..\source\proxy_factory\proxyfac.xml %_DEST%\xml\proxyfac.uno.xml
+..\source\bootstrap\bootstrap.xml %_DEST%\xml\bootstrap.uno.xml
+..\source\typeconv\stocserv.xml %_DEST%\xml\stocserv.uno.xml
diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx
index 7d295f4de78c..4826309c65bb 100644
--- a/stoc/source/bootstrap/services.cxx
+++ b/stoc/source/bootstrap/services.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,7 +43,6 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
 
 extern rtl_StandardModuleCount g_moduleCount;
 
@@ -126,16 +126,18 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx
index 2ef60da60d0b..580b5b40c703 100644
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,8 +26,6 @@
  *
  ************************************************************************/
 //  #define TEST_LIST_CLASSES
-//  #define TRACE(x) OSL_TRACE(x)
-#define TRACE(x)
 
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
@@ -43,7 +42,7 @@
 #include <list>
 #include <algorithm>
 #endif
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -57,12 +56,12 @@
 
 using namespace std;
 using namespace osl;
-using namespace rtl;
 using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::reflection;
 using namespace com::sun::star::container;
+using ::rtl::OUString;
 
 
 namespace stoc_corefl
@@ -93,9 +92,9 @@ inline typelib_TypeDescription * getTypeByName( const OUString & rName )
     return pTypeDescr;
 }
 
-typedef std::hash_map< OUString, WeakReference< XIdlField >,
+typedef boost::unordered_map< OUString, WeakReference< XIdlField >,
     FctHashOUString, equal_to< OUString > > OUString2Field;
-typedef std::hash_map< OUString, WeakReference< XIdlMethod >,
+typedef boost::unordered_map< OUString, WeakReference< XIdlMethod >,
     FctHashOUString, equal_to< OUString > > OUString2Method;
 
 //==================================================================================================
@@ -451,3 +450,4 @@ inline sal_Bool coerce_assign(
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/corereflection/crarray.cxx b/stoc/source/corereflection/crarray.cxx
index 1546b2389fbb..5e3c6df2fd3f 100644
--- a/stoc/source/corereflection/crarray.cxx
+++ b/stoc/source/corereflection/crarray.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -230,3 +231,4 @@ Reference< XIdlArray > ArrayIdlClassImpl::getArray()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/corereflection/crbase.cxx b/stoc/source/corereflection/crbase.cxx
index 93d6aa4f2d24..3f17d9283082 100644
--- a/stoc/source/corereflection/crbase.cxx
+++ b/stoc/source/corereflection/crbase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -164,21 +165,21 @@ void IdlClassImpl::createObject( Any & rObj )
 Sequence< Reference< XIdlClass > > IdlClassImpl::getClasses()
     throw(::com::sun::star::uno::RuntimeException)
 {
-    OSL_ENSURE( sal_False, "### unexpected use!" );
+    OSL_FAIL( "### unexpected use!" );
     return Sequence< Reference< XIdlClass > >();
 }
 //__________________________________________________________________________________________________
 Reference< XIdlClass > IdlClassImpl::getClass( const OUString & )
     throw(::com::sun::star::uno::RuntimeException)
 {
-    OSL_ENSURE( sal_False, "### unexpected use!" );
+    OSL_FAIL( "### unexpected use!" );
     return Reference< XIdlClass >();
 }
 //__________________________________________________________________________________________________
 Sequence< Reference< XIdlClass > > IdlClassImpl::getInterfaces()
     throw(::com::sun::star::uno::RuntimeException)
 {
-//      OSL_ENSURE( sal_False, "### unexpected use!" );
+//      OSL_FAIL( "### unexpected use!" );
     return Sequence< Reference< XIdlClass > >();
 }
 
@@ -289,3 +290,4 @@ OUString IdlMemberImpl::getName()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx
index db3c2741322f..ea62dc55105b 100644
--- a/stoc/source/corereflection/crcomp.cxx
+++ b/stoc/source/corereflection/crcomp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -403,3 +404,4 @@ Sequence< Reference< XIdlField > > CompoundIdlClassImpl::getFields()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index d3ebed762bac..361b611e93d2 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 #include <cppuhelper/queryinterface.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/reflection/XTypeDescription.hpp>
@@ -41,7 +40,10 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 
 #include "base.hxx"
 
@@ -60,33 +62,14 @@ static rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
 
 static Sequence< OUString > core_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) );
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) );
+    return seqNames;
 }
 
 static OUString core_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 //__________________________________________________________________________________________________
 IdlReflectionServiceImpl::IdlReflectionServiceImpl(
@@ -103,7 +86,6 @@ IdlReflectionServiceImpl::IdlReflectionServiceImpl(
 //__________________________________________________________________________________________________
 IdlReflectionServiceImpl::~IdlReflectionServiceImpl()
 {
-    TRACE( "> IdlReflectionServiceImpl dtor <\n" );
     g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
 }
 
@@ -174,7 +156,6 @@ Sequence< sal_Int8 > IdlReflectionServiceImpl::getImplementationId()
 void IdlReflectionServiceImpl::dispose()
     throw(::com::sun::star::uno::RuntimeException)
 {
-    TRACE( "> disposing corereflection... <" );
     OComponentHelper::dispose();
 
     MutexGuard aGuard( _aComponentMutex );
@@ -271,7 +252,7 @@ inline Reference< XIdlClass > IdlReflectionServiceImpl::constructClass(
 #if OSL_DEBUG_LEVEL > 1
         OSL_TRACE( "### corereflection type unsupported: " );
         OString aName( OUStringToOString( pTypeDescr->pTypeName, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( aName.getStr() );
+        OSL_TRACE( "%s", aName.getStr() );
         OSL_TRACE( "\n" );
 #endif
         return Reference< XIdlClass >();
@@ -500,15 +481,17 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx
index 174e177080fe..c94bf65769b7 100644
--- a/stoc/source/corereflection/crenum.cxx
+++ b/stoc/source/corereflection/crenum.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -245,3 +246,4 @@ void EnumIdlClassImpl::createObject( Any & rObj )
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index 95d9990257f5..b30c87d7fabc 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
 #ifdef SAL_UNX
 #include <sal/alloca.h>
 #endif
-#if !(defined(MACOSX) || defined(FREEBSD))
+#if !(defined(MACOSX) || defined(IOS) || defined(FREEBSD))
 #include <malloc.h>
 #endif
 #include <rtl/alloc.h>
@@ -334,7 +335,7 @@ void IdlAttributeFieldImpl::checkException(
             throw WrappedTargetRuntimeException(
                 OUString(
                     RTL_CONSTASCII_USTRINGPARAM(
-                        "non-RuntimeException occured when accessing an"
+                        "non-RuntimeException occurred when accessing an"
                         " interface type attribute")),
                 context, e);
         }
@@ -748,7 +749,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > &
 
             InvocationTargetException aExc;
             aExc.Context = *(const Reference< XInterface > *)rObj.getValue();
-            aExc.Message = OUString( RTL_CONSTASCII_USTRINGPARAM("exception occured during invocation!") );
+            aExc.Message = OUString( RTL_CONSTASCII_USTRINGPARAM("exception occurred during invocation!") );
             uno_any_destruct(
                 &aExc.TargetException,
                 reinterpret_cast< uno_ReleaseFunc >(cpp_release) );
@@ -991,3 +992,4 @@ void InterfaceIdlClassImpl::createObject( Any & rObj )
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx
index 98c5faf4586d..b6e397b56306 100644
--- a/stoc/source/corereflection/lrucache.hxx
+++ b/stoc/source/corereflection/lrucache.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
 #include <osl/mutex.hxx>
 #include "rtl/ustring.hxx"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 /** Implementation of a least recently used (lru) cache.
     <br>
@@ -49,7 +50,7 @@ class LRU_Cache
         CacheEntry *        pPred;
         CacheEntry *        pSucc;
     };
-    typedef ::std::hash_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element;
+    typedef ::boost::unordered_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element;
 
     mutable ::osl::Mutex        _aCacheMutex;
     sal_Int32                   _nCachedElements;
@@ -165,7 +166,7 @@ inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue( const t
         toFront( pEntry );
 #ifdef __CACHE_DIAGNOSE
         OSL_TRACE( "> retrieved element \"" );
-        OSL_TRACE( ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
+        OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
         OSL_TRACE( "\" from cache <\n" );
 #endif
         return pEntry->aVal;
@@ -190,7 +191,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
             if (pEntry->aKey.getLength())
             {
                 OSL_TRACE( "> kicking element \"" );
-                OSL_TRACE( ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
+                OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
                 OSL_TRACE( "\" from cache <\n" );
             }
 #endif
@@ -202,7 +203,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
             pEntry = (*iFind).second;
 #ifdef __CACHE_DIAGNOSE
             OSL_TRACE( "> replacing element \"" );
-            OSL_TRACE( ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
+            OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
             OSL_TRACE( "\" in cache <\n" );
 #endif
         }
@@ -242,3 +243,5 @@ typedef LRU_Cache< ::rtl::OUString, ::com::sun::star::uno::Any,
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index b56e47698c02..2dae9012cbab 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,18 +29,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 #include <osl/mutex.hxx>
-#ifndef _OSL_DIAGNOSE_HXX_
 #include <osl/diagnose.h>
-#endif
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase3.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <registry/registry.hxx>
 
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
@@ -58,8 +55,7 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
-
+using ::rtl::OUString;
 
 #define SERVICENAME "com.sun.star.registry.NestedRegistry"
 #define IMPLNAME       "com.sun.star.comp.stoc.NestedRegistry"
@@ -70,33 +66,14 @@ namespace stoc_bootstrap
 {
 Sequence< OUString > defreg_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 OUString defreg_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 }
 
@@ -1291,7 +1268,7 @@ void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool )
     throw(InvalidRegistryException, RuntimeException)
 {
     throw InvalidRegistryException(
-            OUString::createFromAscii("the 'open' method is not specified for a nested registry"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("the 'open' method is not specified for a nested registry")),
             Reference< XInterface >() );
 }
 
@@ -1327,7 +1304,7 @@ void SAL_CALL NestedRegistryImpl::close(  )
     }
 /*
     throw InvalidRegistryException(
-            OUString::createFromAscii("the 'close' method is not specified for a nested registry"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("the 'close' method is not specified for a nested registry")),
             Reference< XInterface >() );
 */
 }
@@ -1337,7 +1314,7 @@ void SAL_CALL NestedRegistryImpl::destroy(  )
     throw(InvalidRegistryException, RuntimeException)
 {
     throw InvalidRegistryException(
-            OUString::createFromAscii("the 'destroy' method is not specified for a nested registry"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("the 'destroy' method is not specified for a nested registry")),
             Reference< XInterface >() );
 }
 
@@ -1421,3 +1398,4 @@ Reference<XInterface> SAL_CALL NestedRegistry_CreateInstance( const Reference<XC
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index cbb49c162fe1..b6e2baf6be78 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,12 +37,8 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/servicefactory.hxx>
-#ifndef _CPPUHELPER_IMPLBASE3_HXX
 #include <cppuhelper/implbase3.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 
 #include <uno/mapping.hxx>
 #include <osl/thread.h>
@@ -62,7 +59,7 @@
 
 #include "mergekeys.hxx"
 
-#if defined(SAL_W32) || defined(SAL_OS2)
+#if defined(SAL_W32)
 #include <io.h>
 #endif
 
@@ -76,10 +73,10 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
 
-
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
 #define IMPLNAME "com.sun.star.comp.stoc.ImplementationRegistration"
 #define SERVICENAME         "com.sun.star.registry.ImplementationRegistration"
 namespace stoc_impreg
@@ -144,18 +141,9 @@ namespace stoc_bootstrap
 {
 Sequence< OUString > impreg_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = stoc_impreg::spool().sServiceName;
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = stoc_impreg::spool().sServiceName;
+    return seqNames;
 }
 
 OUString impreg_getImplementationName()
@@ -490,14 +478,9 @@ static void prepareUserLink(const Reference < XSimpleRegistry >& xDest,
                                 const OUString& linkName,
                                 const OUString& linkTarget,
                                 const OUString& implName)
-    // throw ( InvalidRegistryException, RuntimeException )
 {
-    sal_Bool ret = sal_False;
-
     Reference < XRegistryKey > xRootKey;
 
-//      try
-//      {
     xRootKey = xDest->getRootKey();
 
     if (xRootKey->getKeyType(linkName) == RegistryKeyType_LINK)
@@ -510,23 +493,9 @@ static void prepareUserLink(const Reference < XSimpleRegistry >& xDest,
                 linkName + spool().colon_old ), oldImplName);
         }
     }
-//      }
-//      catch (InvalidRegistryException&)
-//      {
-//      }
 
-//      try
-//      {
     if (xRootKey->isValid())
-    {
-        ret = xRootKey->createLink(linkName, linkTarget);
-    }
-//      }
-//      catch(InvalidRegistryException&)
-//      {
-//      }
-
-//      return ret;
+        xRootKey->createLink(linkName, linkTarget);
 }
 
 //*************************************************************************
@@ -670,7 +639,6 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
                                 const Reference < XRegistryKey >& xKey,
                                 const OUString& implName,
                                 sal_Bool bRegister)
-    // throw ( InvalidRegistryException, RuntimeException )
 {
     sal_Bool hasSubKeys = sal_False;
 
@@ -738,7 +706,6 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
             }
         }
     }
-    return;
 }
 
 //*************************************************************************
@@ -1686,7 +1653,7 @@ sal_Bool ImplementationRegistration::revokeImplementation(const OUString& locati
         {
             // no way to transport the error, as no exception is specified and a runtime
             // exception is not appropriate.
-            OSL_ENSURE( 0 , "InvalidRegistryException during revokeImplementation" );
+            OSL_FAIL( "InvalidRegistryException during revokeImplementation" );
         }
     }
 
@@ -1783,7 +1750,7 @@ Sequence< OUString > ImplementationRegistration::getImplementations(
 Sequence< OUString > ImplementationRegistration::checkInstantiation(const OUString&)
     throw ( RuntimeException )
 {
-    OSL_ENSURE( sal_False, "ImplementationRegistration::checkInstantiation not implemented" );
+    OSL_FAIL( "ImplementationRegistration::checkInstantiation not implemented" );
     return Sequence<OUString>();
 }
 
@@ -1923,3 +1890,4 @@ Reference<XInterface> SAL_CALL ImplementationRegistration_CreateInstance(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/implementationregistration/mergekeys.cxx b/stoc/source/implementationregistration/mergekeys.cxx
index acfec677badf..d5200719664a 100644
--- a/stoc/source/implementationregistration/mergekeys.cxx
+++ b/stoc/source/implementationregistration/mergekeys.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -184,3 +185,5 @@ void mergeKeys(
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/implementationregistration/mergekeys.hxx b/stoc/source/implementationregistration/mergekeys.hxx
index 3a8bd177b56d..745403af3f6b 100644
--- a/stoc/source/implementationregistration/mergekeys.hxx
+++ b/stoc/source/implementationregistration/mergekeys.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,5 @@ void mergeKeys(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 051ff3e2ae3c..f4b8995b8a00 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
 #include <string.h>
 
 // Schalter fuer Introspection-Caching
-#ifndef OS2
 #define USE_INTROSPECTION_CACHE
-#endif
 
 #ifdef USE_INTROSPECTION_CACHE
 #define INTROSPECTION_CACHE_MAX_SIZE 100
@@ -74,7 +73,7 @@
 
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -87,7 +86,10 @@ using namespace com::sun::star::beans::PropertyConcept;
 using namespace com::sun::star::beans::MethodConcept;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 
 #define IMPLEMENTATION_NAME "com.sun.star.comp.stoc.Introspection"
 #define SERVICE_NAME        "com.sun.star.beans.Introspection"
@@ -172,7 +174,7 @@ struct eqName_Impl
     }
 };
 
-typedef std::hash_map
+typedef boost::unordered_map
 <
     OUString,
     sal_Int32,
@@ -184,7 +186,7 @@ IntrospectionNameMap;
 
 // Hashtable zur Zuordnung der exakten Namen zu den zu Lower-Case
 // konvertierten Namen, dient zur Unterst�tzung von XExactName
-typedef std::hash_map
+typedef boost::unordered_map
 <
     OUString,
     OUString,
@@ -1316,20 +1318,6 @@ Sequence< Property > ImplIntrospectionAccess::getProperties(sal_Int32 PropertyCo
         sal_Int32 nConcept = pConcepts[ i ];
         if( nConcept & PropertyConcepts )
             pDestProps[ iDest++ ] = pSourceProps[ i ];
-
-        /*
-        // Property mit Concepts ausgeben
-        OUString aPropName = pSourceProps[ i ].Name;
-        String aNameStr = OOUStringToString(aPropName, CHARSET_SYSTEM);
-        String ConceptStr;
-        if( nConcept & PROPERTYSET )
-            ConceptStr += "PROPERTYSET";
-        if( nConcept & ATTRIBUTES )
-            ConceptStr += "ATTRIBUTES";
-        if( nConcept & METHODS )
-            ConceptStr += "METHODS";
-        printf( "Property %ld: %s, Concept = %s\n", i, aNameStr.GetStr(), ConceptStr.GetStr() );
-        */
     }
 
     // PropertyConcept merken, dies entspricht maLastPropertySeq
@@ -1565,7 +1553,7 @@ struct hashIntrospectionAccessCache_Impl
 
 };
 
-typedef std::hash_map
+typedef boost::unordered_map
 <
     hashIntrospectionKey_Impl,
     IntrospectionAccessStatic_Impl*,
@@ -1586,7 +1574,7 @@ public:
 
             (*iter).second->release();
             (*iter).second = NULL;
-            iter++;
+            ++iter;
         }
     }
 };
@@ -1664,7 +1652,7 @@ size_t TypeProviderAccessCache_Impl::operator()(const hashTypeProviderKey_Impl &
 }
 
 
-typedef std::hash_map
+typedef boost::unordered_map
 <
     hashTypeProviderKey_Impl,
     IntrospectionAccessStatic_Impl*,
@@ -1684,7 +1672,7 @@ public:
          {
             (*iter).second->release();
             (*iter).second = NULL;
-            iter++;
+            ++iter;
         }
     }
 };
@@ -1926,14 +1914,14 @@ Sequence< OUString > ImplIntrospection::getSupportedServiceNames(void) throw()
 // Helper XServiceInfo
 OUString ImplIntrospection::getImplementationName_Static(  )
 {
-    return OUString::createFromAscii( IMPLEMENTATION_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLEMENTATION_NAME));
 }
 
 // ORegistryServiceManager_Static
 Sequence< OUString > ImplIntrospection::getSupportedServiceNames_Static(void) throw()
 {
     Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString::createFromAscii( SERVICE_NAME );
+    aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
     return aSNS;
 }
 
@@ -1991,7 +1979,7 @@ struct eqInterface_Impl
     }
 };
 
-typedef std::hash_map
+typedef boost::unordered_map
 <
     void*,
     void*,
@@ -2316,8 +2304,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                 }
                 else
                 {
-                    OSL_ENSURE( sal_False,
-                        OString( "Introspection: Property \"" ) +
+                    OSL_FAIL( OString( "Introspection: Property \"" ) +
                         OUStringToOString( aPropName, RTL_TEXTENCODING_ASCII_US ) +
                         OString( "\" found more than once in PropertySet" ) );
                 }
@@ -2985,7 +2972,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
         Reference<XIdlClass> xClassRef = TypeToIdlClass( aToInspectObj.getValueType(), m_xSMgr );
         if( !xClassRef.is() )
         {
-            OSL_ENSURE( sal_False, "Can't get XIdlClass from Reflection" );
+            OSL_FAIL( "Can't get XIdlClass from Reflection" );
             return pAccess;
         }
 
@@ -3058,13 +3045,13 @@ Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Referen
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
     void * pRet = 0;
@@ -3089,3 +3076,4 @@ void * SAL_CALL component_getFactory(
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index f66c3af742d7..1f76914e672e 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,13 +30,9 @@
 #include "precompiled_stoc.hxx"
 #include <osl/mutex.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#ifndef _CPPUHELER_WEAK_HXX_
 #include <cppuhelper/weak.hxx>
-#endif
 #include <cppuhelper/factory.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX__
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/implbase2.hxx>
 
@@ -76,9 +73,8 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::registry;
 using namespace com::sun::star::container;
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
-
+using ::rtl::OUString;
 
 namespace stoc_inv
 {
@@ -86,33 +82,14 @@ static rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
 
 static Sequence< OUString > inv_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 static OUString inv_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 
 // TODO: Zentral implementieren
@@ -642,7 +619,7 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value )
         catch (Exception & exc)
         {
             throw InvocationTargetException(
-                OUString( RTL_CONSTASCII_USTRINGPARAM("exception occured in setValue(): ") ) +
+                OUString( RTL_CONSTASCII_USTRINGPARAM("exception occurred in setValue(): ") ) +
                 exc.Message, Reference< XInterface >(), makeAny( exc /* though sliced */ ) );
         }
     }
@@ -1245,13 +1222,13 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
@@ -1260,3 +1237,4 @@ void * SAL_CALL component_getFactory(
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 70d2562657ad..b8d3939928d8 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,8 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 
-#include <hash_map>
-#include <hash_set>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
 
 #include <osl/diagnose.h>
 #include <osl/interlck.h>
@@ -75,34 +76,15 @@ static rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
 
 static Sequence< OUString > invadp_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] =
-                OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] =
+        OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 static OUString invadp_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 
 struct hash_ptr
@@ -110,8 +92,8 @@ struct hash_ptr
     inline size_t operator() ( void * p ) const
         { return (size_t)p; }
 };
-typedef hash_set< void *, hash_ptr, equal_to< void * > > t_ptr_set;
-typedef hash_map< void *, t_ptr_set, hash_ptr, equal_to< void * > > t_ptr_map;
+typedef boost::unordered_set< void *, hash_ptr, equal_to< void * > > t_ptr_set;
+typedef boost::unordered_map< void *, t_ptr_set, hash_ptr, equal_to< void * > > t_ptr_map;
 
 //==============================================================================
 class FactoryImpl
@@ -303,7 +285,7 @@ bool AdapterImpl::coerce_assign(
             m_pFactory->m_pConverter,
             m_pFactory->m_pConvertToTD, &ret, args, &p_exc );
 
-        if (p_exc) // exception occured
+        if (p_exc) // exception occurred
         {
             OSL_ASSERT(
                 p_exc->pType->eTypeClass == typelib_TypeClass_EXCEPTION );
@@ -1009,17 +991,19 @@ sal_Bool SAL_CALL component_canUnload(
 }
 
 //==============================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
 //==============================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
         pImplName, pServiceManager, pRegistryKey , g_entries );
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 396ff48ec310..a14481994e6a 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,37 +86,18 @@ static Mutex & getInitMutex();
 
 static Sequence< OUString > loader_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(2);
-            seqNames.getArray()[0] = OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Java") );
-            seqNames.getArray()[1] = OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Java2") );
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(2);
+    seqNames.getArray()[0] = OUString(
+        RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Java") );
+    seqNames.getArray()[1] = OUString(
+        RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Java2") );
+    return seqNames;
 }
 
 static OUString loader_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName(
-                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.JavaComponentLoader" ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(
+        RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.JavaComponentLoader" ) );
 }
 
 class JavaComponentLoader : public WeakImplHelper2<XImplementationLoader, XServiceInfo>
@@ -466,15 +448,17 @@ extern "C"
 // NOTE: component_canUnload is not exported, as the library cannot be unloaded.
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index 024d34acf12e..4aac812a1b00 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -123,3 +124,5 @@ bool InteractionRequest::retry() const
 
 InteractionRequest::~InteractionRequest()
 {}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx
index 7db3fd949b68..7acd68f9c28d 100644
--- a/stoc/source/javavm/interact.hxx
+++ b/stoc/source/javavm/interact.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,3 +74,5 @@ private:
 }
 
 #endif // INCLUDED_STOC_JAVAVM_INTERACT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 1ea792270861..5c50e89693f1 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -534,10 +535,11 @@ static void setTimeZone(stoc_javavm::JVM * pjvm) throw() {
     char * p = tmData->tm_zone;
 #else
     char * p = tzname[0];
+    (void)tmData;
 #endif
 
     if (!strcmp(TIMEZONE, p))
-        pjvm->pushProp(rtl::OUString::createFromAscii("user.timezone=ECT"));
+        pjvm->pushProp(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user.timezone=ECT")));
 }
 
 void initVMConfiguration(
@@ -607,14 +609,13 @@ private:
 
 }
 
-extern "C" void SAL_CALL
-component_getImplementationEnvironment(sal_Char const ** pEnvTypeName,
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(sal_Char const ** pEnvTypeName,
                                        uno_Environment **)
 {
     *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-extern "C" void * SAL_CALL component_getFactory(sal_Char const * pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName,
                                                 void * pServiceManager,
                                                 void * pRegistryKey)
 {
@@ -772,7 +773,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
         rtl::OString sJavaOption("-");
         typedef std::vector<rtl::OUString>::const_iterator cit;
         int index = 0;
-        for (cit i = props.begin(); i != props.end(); i++)
+        for (cit i = props.begin(); i != props.end(); ++i)
         {
             rtl::OString sOption = rtl::OUStringToOString(
                 *i, osl_getThreadTextEncoding());
@@ -1386,7 +1387,7 @@ JavaVirtualMachine::~JavaVirtualMachine()
         }
         catch (css::uno::Exception &)
         {
-            OSL_ENSURE(false, "com.sun.star.uno.Exception caught");
+            OSL_FAIL("com.sun.star.uno.Exception caught");
         }
     if (m_xJavaConfiguration.is())
         // We should never get here, but just in case...
@@ -1396,7 +1397,7 @@ JavaVirtualMachine::~JavaVirtualMachine()
         }
         catch (css::uno::Exception &)
         {
-            OSL_ENSURE(false, "com.sun.star.uno.Exception caught");
+            OSL_FAIL("com.sun.star.uno.Exception caught");
         }
 }
 
@@ -1623,12 +1624,11 @@ void JavaVirtualMachine::setINetSettingsInVM(bool set_reset)
     }
     catch (css::uno::RuntimeException &)
     {
-        OSL_ENSURE(false, "RuntimeException");
+        OSL_FAIL("RuntimeException");
     }
     catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &)
     {
-        OSL_ENSURE(false,
-                   "jvmaccess::VirtualMachine::AttachGuard::CreationException");
+        OSL_FAIL("jvmaccess::VirtualMachine::AttachGuard::CreationException");
     }
 }
 
@@ -1774,3 +1774,5 @@ void JavaVirtualMachine::handleJniException(JNIEnv * environment) {
             RTL_CONSTASCII_USTRINGPARAM("JNI exception occurred")),
         static_cast< cppu::OWeakObject * >(this));
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx
index d04ed4a2805c..0a2df2442f1f 100644
--- a/stoc/source/javavm/javavm.hxx
+++ b/stoc/source/javavm/javavm.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -170,3 +171,5 @@ private:
 }
 
 #endif // INCLUDED_STOC_JAVAVM_JAVAVM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/javavm/jvmargs.cxx b/stoc/source/javavm/jvmargs.cxx
index 8563b46a41f9..06d12d9007e7 100644
--- a/stoc/source/javavm/jvmargs.cxx
+++ b/stoc/source/javavm/jvmargs.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,8 +35,7 @@
 
 #define OUSTR(x) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
 
-using namespace rtl;
-
+using ::rtl::OUString;
 namespace stoc_javavm {
 
 JVM::JVM() throw()//: _enabled(sal_False)
@@ -64,3 +64,5 @@ const ::std::vector< ::rtl::OUString > & JVM::getProperties() const
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/javavm/jvmargs.hxx b/stoc/source/javavm/jvmargs.hxx
index 5eae66da9d07..36d4449f19f2 100644
--- a/stoc/source/javavm/jvmargs.hxx
+++ b/stoc/source/javavm/jvmargs.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,5 @@ namespace stoc_javavm {
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index d50f209718ed..86d96a76ce3a 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,9 +43,7 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/shlib.hxx>
 #include <cppuhelper/implbase3.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX__
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <cppuhelper/bootstrap.hxx>
 
 #include <com/sun/star/loader/XImplementationLoader.hpp>
@@ -66,42 +65,22 @@ using namespace com::sun::star::loader;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
-
+using ::rtl::OUString;
 extern rtl_StandardModuleCount g_moduleCount;
 
 namespace stoc_bootstrap
 {
 Sequence< OUString > loader_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 OUString loader_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 }
 
@@ -181,7 +160,7 @@ Sequence<OUString> SAL_CALL DllComponentLoader::getSupportedServiceNames(  )
 void DllComponentLoader::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& )
     throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
 {
-    OSL_ENSURE( 0, "dllcomponentloader::initialize should not be called !" );
+    OSL_FAIL( "dllcomponentloader::initialize should not be called !" );
 //      if( aArgs.getLength() != 1 )
 //      {
 //          throw IllegalArgumentException();
@@ -259,3 +238,4 @@ Reference<XInterface> SAL_CALL DllComponentLoader_CreateInstance( const Referenc
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index a2ea1d361202..8aaee2ced7e9 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 #include <uno/dispatcher.h>
@@ -38,15 +39,12 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/implbase2.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 
 #include <com/sun/star/uno/XNamingService.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
 using namespace std;
 
@@ -54,6 +52,8 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 
+using ::rtl::OUString;
+
 #define SERVICENAME "com.sun.star.uno.NamingService"
 #define IMPLNAME    "com.sun.star.comp.stoc.NamingService"
 
@@ -63,33 +63,14 @@ static rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
 
 static Sequence< OUString > ns_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 static OUString ns_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 
 struct equalOWString_Impl
@@ -104,7 +85,7 @@ struct hashOWString_Impl
         { return rName.hashCode(); }
 };
 
-typedef hash_map
+typedef boost::unordered_map
 <
     OUString,
     Reference<XInterface >,
@@ -131,7 +112,7 @@ public:
     throw(::com::sun::star::uno::RuntimeException);
     static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static()
     {
-        OUString aStr( OUString::createFromAscii( SERVICENAME ) );
+        OUString aStr( OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)) );
         return Sequence< OUString >( &aStr, 1 );
     }
 
@@ -232,15 +213,17 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index 644f8ecb624c..b05c94d4fba8 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -159,7 +160,7 @@ UnoInterfaceReference FactoryImpl::binuno_queryInterface(
     }
     else
     {
-        // exception occured:
+        // exception occurred:
         OSL_ENSURE(
             typelib_typedescriptionreference_isAssignableFrom(
                 ::getCppuType( reinterpret_cast<
@@ -520,13 +521,13 @@ sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
     return g_moduleCount.canUnload( &g_moduleCount, pTime );
 }
 
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
@@ -535,3 +536,4 @@ void * SAL_CALL component_getFactory(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/base.hxx b/stoc/source/registry_tdprovider/base.hxx
index 0e2deed76919..532b81dd8468 100644
--- a/stoc/source/registry_tdprovider/base.hxx
+++ b/stoc/source/registry_tdprovider/base.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 
 #include "registry/refltype.hxx"
 
@@ -63,7 +62,6 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
 using namespace std;
-using namespace rtl;
 using namespace osl;
 using namespace cppu;
 using namespace com::sun::star::uno;
@@ -71,6 +69,8 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
 using namespace com::sun::star::reflection;
 
+using ::rtl::OUString;
+
 //--------------------------------------------------------------------------------------------------
 
 extern rtl_StandardModuleCount g_moduleCount;
@@ -135,7 +135,7 @@ inline sal_Int32 getRTValueAsInt32( const RTConstValue & rVal )
     case RT_TYPE_UINT32:
         return rVal.m_value.aULong;
     default:
-        OSL_ENSURE( sal_False, "### unexpected value type!" );
+        OSL_FAIL( "### unexpected value type!" );
         return 0;
     }
 }
@@ -170,7 +170,7 @@ inline Any getRTValue( const RTConstValue & rVal )
         return Any( &aStr, ::getCppuType( (const OUString *)0 ) );
     }
     default:
-        OSL_ENSURE( sal_False, "### unexpected RTValue!" );
+        OSL_FAIL( "### unexpected RTValue!" );
         return Any();
     }
 }
@@ -645,3 +645,5 @@ public:
 }
 
 #endif /* _STOC_RDBTDP_BASE_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/functiondescription.cxx b/stoc/source/registry_tdprovider/functiondescription.cxx
index b771d0843151..01af60d9b988 100644
--- a/stoc/source/registry_tdprovider/functiondescription.cxx
+++ b/stoc/source/registry_tdprovider/functiondescription.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -113,3 +114,5 @@ typereg::Reader FunctionDescription::getReader() const {
     return typereg::Reader(
         m_bytes.getConstArray(), m_bytes.getLength(), false, TYPEREG_VERSION_1);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/functiondescription.hxx b/stoc/source/registry_tdprovider/functiondescription.hxx
index d61af71b970f..1ecb88b945c0 100644
--- a/stoc/source/registry_tdprovider/functiondescription.hxx
+++ b/stoc/source/registry_tdprovider/functiondescription.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ private:
 } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/methoddescription.cxx b/stoc/source/registry_tdprovider/methoddescription.cxx
index 7301f84248c5..7914a82a6781 100644
--- a/stoc/source/registry_tdprovider/methoddescription.cxx
+++ b/stoc/source/registry_tdprovider/methoddescription.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -142,3 +143,5 @@ MethodDescription::getParameters() const {
     }
     return m_parameters;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/methoddescription.hxx b/stoc/source/registry_tdprovider/methoddescription.hxx
index 8d46eced73ac..c2f5b452901d 100644
--- a/stoc/source/registry_tdprovider/methoddescription.hxx
+++ b/stoc/source/registry_tdprovider/methoddescription.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,5 @@ private:
 } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
index 7104fbf57d92..3aea56231ad9 100644
--- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
+++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -152,8 +153,7 @@ TypeDescriptionEnumerationImpl::createInstance(
                 }
                 else
                 {
-                    OSL_ENSURE(
-                        sal_False,
+                    OSL_FAIL(
                         "TypeDescriptionEnumerationImpl::createInstance "
                         "- Invalid registry key!" );
                 }
@@ -163,12 +163,11 @@ TypeDescriptionEnumerationImpl::createInstance(
         {
             // openKey, getValueType, getBinaryValue
 
-            OSL_ENSURE( sal_False,
-                        "TypeDescriptionEnumerationImpl::createInstance "
+            OSL_FAIL( "TypeDescriptionEnumerationImpl::createInstance "
                         "- Caught InvalidRegistryException!" );
         }
 
-        it++;
+        ++it;
     }
 
     if ( !bOpenKeySucceeded )
@@ -217,8 +216,7 @@ TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl()
         catch (...)
         {
             // No exceptions from dtors, please!
-            OSL_ENSURE( sal_False,
-            "TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl "
+            OSL_FAIL( "TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl "
             "- Caught exception!" );
         }
 
@@ -237,12 +235,11 @@ TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl()
         catch (Exception &)
         {
             // No exceptions from dtors, please!
-            OSL_ENSURE( sal_False,
-            "TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl "
+            OSL_FAIL( "TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl "
             "- Caught exception!" );
         }
 
-        it++;
+        ++it;
     }
 
     g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
@@ -289,8 +286,8 @@ TypeDescriptionEnumerationImpl::nextTypeDescription()
         return xTD;
 
     throw container::NoSuchElementException(
-        rtl::OUString::createFromAscii(
-            "No further elements in enumeration!" ),
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ),
         static_cast< cppu::OWeakObject * >( this  ) );
 }
 
@@ -434,8 +431,7 @@ bool TypeDescriptionEnumerationImpl::queryMore()
                     }
                     else
                     {
-                        OSL_ENSURE( sal_False,
-                            "TypeDescriptionEnumerationImpl::queryMore "
+                        OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore "
                             "- Invalid registry key!" );
                     }
 
@@ -444,8 +440,7 @@ bool TypeDescriptionEnumerationImpl::queryMore()
                 {
                     // getValueType, getBinaryValue
 
-                    OSL_ENSURE( sal_False,
-                                "TypeDescriptionEnumerationImpl::queryMore "
+                    OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore "
                                 "- Caught InvalidRegistryException!" );
 
                     // Don't stop iterating!
@@ -464,8 +459,7 @@ bool TypeDescriptionEnumerationImpl::queryMore()
                 }
                 catch ( registry::InvalidRegistryException const & )
                 {
-                    OSL_ENSURE( sal_False,
-                                "TypeDescriptionEnumerationImpl::queryMore "
+                    OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore "
                                 "- Caught InvalidRegistryException!" );
                 }
             }
@@ -531,8 +525,7 @@ bool TypeDescriptionEnumerationImpl::queryMore()
                 {
                     // getBinaryValue
 
-                    OSL_ENSURE( sal_False,
-                                "TypeDescriptionEnumerationImpl::queryMore "
+                    OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore "
                                 "- Caught InvalidRegistryException!" );
                 }
             }
@@ -550,8 +543,7 @@ bool TypeDescriptionEnumerationImpl::queryMore()
         }
         catch ( registry::InvalidRegistryException const & )
         {
-            OSL_ENSURE( sal_False,
-                        "TypeDescriptionEnumerationImpl::queryMore "
+            OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore "
                         "- Caught InvalidRegistryException!" );
         }
 */
@@ -613,8 +605,7 @@ TypeDescriptionEnumerationImpl::queryNext()
                 }
                 else
                 {
-                    OSL_ENSURE( sal_False,
-                        "TypeDescriptionEnumerationImpl::queryNext "
+                    OSL_FAIL( "TypeDescriptionEnumerationImpl::queryNext "
                         "- Invalid registry key!" );
                 }
             }
@@ -623,8 +614,7 @@ TypeDescriptionEnumerationImpl::queryNext()
         {
             // getValueType, getBinaryValue
 
-            OSL_ENSURE( sal_False,
-                        "TypeDescriptionEnumerationImpl::queryNext "
+            OSL_FAIL( "TypeDescriptionEnumerationImpl::queryNext "
                         "- Caught InvalidRegistryException!" );
         }
 
@@ -641,3 +631,4 @@ TypeDescriptionEnumerationImpl::queryNext()
 
 } // namespace stoc_rdbtdp
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx
index 7e2c84840aae..b255e5ef06d7 100644
--- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx
+++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -114,3 +115,4 @@ private:
 
 #endif /* _STOC_RDBTDP_TDENUMERATION_HXX */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/structtypedescription.cxx b/stoc/source/registry_tdprovider/structtypedescription.cxx
index 52cc247fae2e..1da060386245 100644
--- a/stoc/source/registry_tdprovider/structtypedescription.cxx
+++ b/stoc/source/registry_tdprovider/structtypedescription.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -137,3 +138,5 @@ sal_Bool StructTypeDescription::isPublished() throw (css::uno::RuntimeException)
 {
     return m_base->isPublished();
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/structtypedescription.hxx b/stoc/source/registry_tdprovider/structtypedescription.hxx
index ba2ce701992e..268f67a8fdb1 100644
--- a/stoc/source/registry_tdprovider/structtypedescription.hxx
+++ b/stoc/source/registry_tdprovider/structtypedescription.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,3 +104,5 @@ private:
 } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/td.cxx b/stoc/source/registry_tdprovider/td.cxx
index 27a5a936d54b..b532cbeb1282 100644
--- a/stoc/source/registry_tdprovider/td.cxx
+++ b/stoc/source/registry_tdprovider/td.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,4 @@ OUString TypeDescriptionImpl::getName()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdcomp.cxx b/stoc/source/registry_tdprovider/tdcomp.cxx
index d7ca4887ee7c..1ab3dda91334 100644
--- a/stoc/source/registry_tdprovider/tdcomp.cxx
+++ b/stoc/source/registry_tdprovider/tdcomp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -185,3 +186,4 @@ Sequence< OUString > CompoundTypeDescriptionImpl::getMemberNames()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdconsts.cxx b/stoc/source/registry_tdprovider/tdconsts.cxx
index fe98f010a3a9..aef656417ead 100644
--- a/stoc/source/registry_tdprovider/tdconsts.cxx
+++ b/stoc/source/registry_tdprovider/tdconsts.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ ConstantsTypeDescriptionImpl::getConstants()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdef.cxx b/stoc/source/registry_tdprovider/tdef.cxx
index 91b182697122..c4f7f865de31 100644
--- a/stoc/source/registry_tdprovider/tdef.cxx
+++ b/stoc/source/registry_tdprovider/tdef.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,4 @@ Reference< XTypeDescription > TypedefTypeDescriptionImpl::getReferencedType()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdenum.cxx b/stoc/source/registry_tdprovider/tdenum.cxx
index d6922ce4226a..22ad592f5d8c 100644
--- a/stoc/source/registry_tdprovider/tdenum.cxx
+++ b/stoc/source/registry_tdprovider/tdenum.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -133,3 +134,4 @@ Sequence< sal_Int32 > EnumTypeDescriptionImpl::getEnumValues()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdiface.cxx b/stoc/source/registry_tdprovider/tdiface.cxx
index abee4540773a..9018867b281a 100644
--- a/stoc/source/registry_tdprovider/tdiface.cxx
+++ b/stoc/source/registry_tdprovider/tdiface.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -583,3 +584,5 @@ InterfaceTypeDescriptionImpl::getOptionalBaseTypes() throw (RuntimeException) {
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdmodule.cxx b/stoc/source/registry_tdprovider/tdmodule.cxx
index 50d0a2cfaca3..82464efb9442 100644
--- a/stoc/source/registry_tdprovider/tdmodule.cxx
+++ b/stoc/source/registry_tdprovider/tdmodule.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -98,8 +99,7 @@ ModuleTypeDescriptionImpl::getMembers()
             }
             catch ( NoSuchElementException const & )
             {
-                OSL_ENSURE( sal_False,
-                    "ModuleTypeDescriptionImpl::getMembers - "
+                OSL_FAIL( "ModuleTypeDescriptionImpl::getMembers - "
                     " Caught NoSuchElementException!" );
             }
         }
@@ -124,3 +124,5 @@ ModuleTypeDescriptionImpl::getMembers()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdprop.cxx b/stoc/source/registry_tdprovider/tdprop.cxx
index b103b5f06192..c022b88fe804 100644
--- a/stoc/source/registry_tdprovider/tdprop.cxx
+++ b/stoc/source/registry_tdprovider/tdprop.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,5 @@ Any SAL_CALL ConstantTypeDescriptionImpl::getConstantValue()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx
index 2cf26706993c..726760d816d6 100644
--- a/stoc/source/registry_tdprovider/tdprovider.cxx
+++ b/stoc/source/registry_tdprovider/tdprovider.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,33 +68,14 @@ namespace stoc_bootstrap
 {
 uno::Sequence< OUString > rdbtdp_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 OUString rdbtdp_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 }
 
@@ -418,8 +400,7 @@ Any ProviderImpl::getByHierarchicalNameImpl( const OUString & rName )
         }
         catch ( InvalidRegistryException const & )
         {
-            OSL_ENSURE( sal_False,
-                        "ProviderImpl::getByHierarchicalName "
+            OSL_FAIL( "ProviderImpl::getByHierarchicalName "
                         "- Caught InvalidRegistryException!" );
 
             // openKey, closeKey, getValueType, getBinaryValue, isValid
@@ -598,11 +579,11 @@ com::sun::star::uno::Reference< XTypeDescription > createTypeDescription(
         case RT_TYPE_INVALID:
         case RT_TYPE_OBJECT:      // deprecated and not used
         case RT_TYPE_UNION:       // deprecated and not used
-            OSL_ENSURE( sal_False, "createTypeDescription - Unsupported Type!" );
+            OSL_FAIL( "createTypeDescription - Unsupported Type!" );
             break;
 
         default:
-            OSL_ENSURE( sal_False, "createTypeDescription - Unknown Type!" );
+            OSL_FAIL( "createTypeDescription - Unknown Type!" );
             break;
     }
 
@@ -627,3 +608,5 @@ com::sun::star::uno::Reference< XInterface > SAL_CALL ProviderImpl_create(
     return com::sun::star::uno::Reference< XInterface >( *new stoc_rdbtdp::ProviderImpl( xContext ) );
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx
index b8a1de58b1aa..76c50932f22b 100644
--- a/stoc/source/registry_tdprovider/tdservice.cxx
+++ b/stoc/source/registry_tdprovider/tdservice.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,6 +41,7 @@
 #include <memory>
 
 using namespace com::sun::star;
+using ::rtl::OUStringBuffer;
 
 namespace {
 
@@ -541,7 +543,7 @@ void ServiceTypeDescriptionImpl::getReferences()
             case RT_REF_NEEDS:
                 break;
             default:
-                OSL_ENSURE( sal_False, "### unsupported reference type!" );
+                OSL_FAIL( "### unsupported reference type!" );
                 break;
             }
         }
@@ -563,3 +565,5 @@ void ServiceTypeDescriptionImpl::getReferences()
 
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdsingleton.cxx b/stoc/source/registry_tdprovider/tdsingleton.cxx
index ef38dacb657e..cda20dd67232 100644
--- a/stoc/source/registry_tdprovider/tdsingleton.cxx
+++ b/stoc/source/registry_tdprovider/tdsingleton.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -130,3 +131,5 @@ SingletonTypeDescriptionImpl::getInterface()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index c7b1779a5a87..133d13c7b521 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,6 +58,8 @@
 
 #include "lru_cache.h"
 #include "permissions.h"
+#include "bootstrapservices.hxx"
+
 
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 #define SERVICE_NAME "com.sun.star.security.AccessController"
@@ -79,12 +82,8 @@ namespace stoc_sec
 {
 // static stuff initialized when loading lib
 static OUString s_envType = OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
-static OUString s_implName = OUSTR(IMPL_NAME);
-static OUString s_serviceName = OUSTR(SERVICE_NAME);
 static OUString s_acRestriction = OUSTR("access-control.restriction");
 
-static Sequence< OUString > s_serviceNames = Sequence< OUString >( &s_serviceName, 1 );
-
 //##################################################################################################
 
 /** ac context intersects permissions of two ac contexts
@@ -617,13 +616,13 @@ static void dumpPermissions(
             RTL_CONSTASCII_STRINGPARAM("> dumping default permissions:") );
     }
     OString str( ::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-    OSL_TRACE( str.getStr() );
+    OSL_TRACE( "%s", str.getStr() );
     Sequence< OUString > permissions( collection.toStrings() );
     OUString const * p = permissions.getConstArray();
     for ( sal_Int32 nPos = 0; nPos < permissions.getLength(); ++nPos )
     {
         OString str( ::rtl::OUStringToOString( p[ nPos ], RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( str.getStr() );
+        OSL_TRACE( "%s", str.getStr() );
     }
     OSL_TRACE( "> permission dump done" );
 }
@@ -690,7 +689,7 @@ void AccessController::checkAndClearPostPoned() SAL_THROW( (RuntimeException) )
             break;
         }
         default:
-            OSL_ENSURE( 0, "### this should never be called in this ac mode!" );
+            OSL_FAIL( "### this should never be called in this ac mode!" );
             break;
         }
     }
@@ -744,7 +743,7 @@ PermissionCollection AccessController::getEffectivePermissions(
         break;
     }
     default:
-        OSL_ENSURE( 0, "### this should never be called in this ac mode!" );
+        OSL_FAIL( "### this should never be called in this ac mode!" );
         return PermissionCollection();
     }
 
@@ -765,7 +764,7 @@ PermissionCollection AccessController::getEffectivePermissions(
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"") );
         OString str(
             ::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( str.getStr() );
+        OSL_TRACE( "%s", str.getStr() );
 #endif
         return PermissionCollection( new AllPermission() );
     }
@@ -853,7 +852,7 @@ PermissionCollection AccessController::getEffectivePermissions(
         clearPostPoned(); // safety: exception could have happened before checking postponed?
         OUStringBuffer buf( 64 );
         buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("deployment error (AccessControlException occured): ") );
+            RTL_CONSTASCII_STRINGPARAM("deployment error (AccessControlException occurred): ") );
         buf.append( exc.Message );
         throw DeploymentException( buf.makeStringAndClear(), exc.Context );
     }
@@ -1008,14 +1007,15 @@ Reference< security::XAccessControlContext > AccessController::getContext()
 OUString AccessController::getImplementationName()
     throw (RuntimeException)
 {
-    return s_implName;
+    return stoc_bootstrap::ac_getImplementationName();
 }
 //__________________________________________________________________________________________________
 sal_Bool AccessController::supportsService( OUString const & serviceName )
     throw (RuntimeException)
 {
-    OUString const * pNames = s_serviceNames.getConstArray();
-    for ( sal_Int32 nPos = s_serviceNames.getLength(); nPos--; )
+    Sequence< OUString > aSNL = getSupportedServiceNames();
+    const OUString * pNames = aSNL.getConstArray();
+    for ( sal_Int32 nPos = aSNL.getLength(); --nPos; )
     {
         if (serviceName.equals( pNames[ nPos ] ))
         {
@@ -1028,7 +1028,7 @@ sal_Bool AccessController::supportsService( OUString const & serviceName )
 Sequence< OUString > AccessController::getSupportedServiceNames()
     throw (RuntimeException)
 {
-    return s_serviceNames;
+    return stoc_bootstrap::ac_getSupportedServiceNames();
 }
 }
 //##################################################################################################
@@ -1043,12 +1043,15 @@ Reference< XInterface > SAL_CALL ac_create(
 //--------------------------------------------------------------------------------------------------
 Sequence< OUString > ac_getSupportedServiceNames() SAL_THROW( () )
 {
-    return stoc_sec::s_serviceNames;
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
+    return aSNS;
 }
 //--------------------------------------------------------------------------------------------------
 OUString ac_getImplementationName() SAL_THROW( () )
 {
-    return stoc_sec::s_implName;
+    static OUString s_implName = OUSTR(IMPL_NAME);
+    return s_implName;
 }
 //--------------------------------------------------------------------------------------------------
 Reference< XInterface > SAL_CALL filepolicy_create(
@@ -1059,3 +1062,5 @@ Sequence< OUString > filepolicy_getSupportedServiceNames() SAL_THROW( () );
 //--------------------------------------------------------------------------------------------------
 OUString filepolicy_getImplementationName() SAL_THROW( () );
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index b59502852d1d..068f63a62f31 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include <osl/diagnose.h>
 #include <osl/file.h>
@@ -48,11 +49,12 @@
 #include <com/sun/star/io/FilePermission.hpp>
 #include <com/sun/star/connection/SocketPermission.hpp>
 
+#include "bootstrapservices.hxx"
+
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 #define SERVICE_NAME "com.sun.star.security.Policy"
 #define IMPL_NAME "com.sun.star.security.comp.stoc.FilePolicy"
 
-
 using namespace ::osl;
 using namespace ::rtl;
 using namespace ::cppu;
@@ -63,13 +65,6 @@ extern ::rtl_StandardModuleCount g_moduleCount;
 
 namespace stoc_sec
 {
-// static stuff initialized when loading lib
-static OUString s_implName = OUSTR(IMPL_NAME);
-static OUString s_serviceName = OUSTR(SERVICE_NAME);
-
-static Sequence< OUString > s_serviceNames = Sequence< OUString >( &s_serviceName, 1 );
-//##################################################################################################
-
 //--------------------------------------------------------------------------------------------------
 static inline void dispose( Reference< XInterface > const & x )
     SAL_THROW( (RuntimeException) )
@@ -98,7 +93,7 @@ class FilePolicy
     AccessControl m_ac;
 
     Sequence< Any > m_defaultPermissions;
-    typedef std::hash_map< OUString, Sequence< Any >, OUStringHash > t_permissions;
+    typedef boost::unordered_map< OUString, Sequence< Any >, OUStringHash > t_permissions;
     t_permissions m_userPermissions;
     bool m_init;
 
@@ -204,12 +199,12 @@ class PolicyReader
     inline void back( sal_Unicode c ) SAL_THROW( () )
         { m_back = c; }
 
-    inline bool isWhiteSpace( sal_Unicode c ) SAL_THROW( () )
+    inline bool isWhiteSpace( sal_Unicode c ) const SAL_THROW( () )
         { return (' ' == c || '\t' == c || '\n' == c || '\r' == c); }
     void skipWhiteSpace()
         SAL_THROW( (RuntimeException) );
 
-    inline bool isCharToken( sal_Unicode c ) SAL_THROW( () )
+    inline bool isCharToken( sal_Unicode c ) const SAL_THROW( () )
         { return (';' == c || ',' == c || '{' == c || '}' == c); }
 
 public:
@@ -439,16 +434,16 @@ PolicyReader::~PolicyReader()
     }
 }
 
-static OUString s_grant = OUSTR("grant");
-static OUString s_user = OUSTR("user");
-static OUString s_permission = OUSTR("permission");
-static OUString s_openBrace = OUSTR("{");
-static OUString s_closingBrace = OUSTR("}");
+#define s_grant "grant"
+#define s_user "user"
+#define s_permission "permission"
+#define s_openBrace "{"
+#define s_closingBrace "}"
 
-static OUString s_filePermission = OUSTR("com.sun.star.io.FilePermission");
-static OUString s_socketPermission = OUSTR("com.sun.star.connection.SocketPermission");
-static OUString s_runtimePermission = OUSTR("com.sun.star.security.RuntimePermission");
-static OUString s_allPermission = OUSTR("com.sun.star.security.AllPermission");
+#define s_filePermission "com.sun.star.io.FilePermission"
+#define s_socketPermission "com.sun.star.connection.SocketPermission"
+#define s_runtimePermission "com.sun.star.security.RuntimePermission"
+#define s_allPermission "com.sun.star.security.AllPermission"
 
 //__________________________________________________________________________________________________
 void FilePolicy::refresh()
@@ -474,46 +469,46 @@ void FilePolicy::refresh()
     OUString token( reader.getToken() );
     while (token.getLength())
     {
-        if (! token.equals( s_grant ))
+        if (!token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_grant)))
             reader.error( OUSTR("expected >grant< token!") );
         OUString userId;
         token = reader.assureToken();
-        if (token.equals( s_user )) // next token is user-id
+        if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_user))) // next token is user-id
         {
             userId = reader.assureQuotedToken();
             token = reader.assureToken();
         }
-        if (! token.equals( s_openBrace ))
+        if (!token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_openBrace)))
             reader.error( OUSTR("expected opening brace >{<!") );
         token = reader.assureToken();
         // permissions list
-        while (! token.equals( s_closingBrace ))
+        while (!token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_closingBrace)))
         {
-            if (! token.equals( s_permission ))
+            if (!token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_permission)))
                 reader.error( OUSTR("expected >permission< or closing brace >}<!") );
 
             token = reader.assureToken(); // permission type
             Any perm;
-            if (token.equals( s_filePermission )) // FilePermission
+            if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_filePermission))) // FilePermission
             {
                 OUString url( reader.assureQuotedToken() );
                 reader.assureToken( ',' );
                 OUString actions( reader.assureQuotedToken() );
                 perm <<= io::FilePermission( url, actions );
             }
-            else if (token.equals( s_socketPermission )) // SocketPermission
+            else if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_socketPermission))) // SocketPermission
             {
                 OUString host( reader.assureQuotedToken() );
                 reader.assureToken( ',' );
                 OUString actions( reader.assureQuotedToken() );
                 perm <<= connection::SocketPermission( host, actions );
             }
-            else if (token.equals( s_runtimePermission )) // RuntimePermission
+            else if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_runtimePermission))) // RuntimePermission
             {
                 OUString name( reader.assureQuotedToken() );
                 perm <<= security::RuntimePermission( name );
             }
-            else if (token.equals( s_allPermission )) // AllPermission
+            else if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_allPermission))) // AllPermission
             {
                 perm <<= security::AllPermission();
             }
@@ -557,14 +552,15 @@ void FilePolicy::refresh()
 OUString FilePolicy::getImplementationName()
     throw (RuntimeException)
 {
-    return s_implName;
+    return stoc_bootstrap::filepolicy_getImplementationName();
 }
 //__________________________________________________________________________________________________
 sal_Bool FilePolicy::supportsService( OUString const & serviceName )
     throw (RuntimeException)
 {
-    OUString const * pNames = s_serviceNames.getConstArray();
-    for ( sal_Int32 nPos = s_serviceNames.getLength(); nPos--; )
+    Sequence< OUString > aSNL = getSupportedServiceNames();
+    const OUString * pNames = aSNL.getConstArray();
+    for ( sal_Int32 nPos = aSNL.getLength(); --nPos; )
     {
         if (serviceName.equals( pNames[ nPos ] ))
         {
@@ -577,7 +573,7 @@ sal_Bool FilePolicy::supportsService( OUString const & serviceName )
 Sequence< OUString > FilePolicy::getSupportedServiceNames()
     throw (RuntimeException)
 {
-    return s_serviceNames;
+    return stoc_bootstrap::filepolicy_getSupportedServiceNames();
 }
 }
 //##################################################################################################
@@ -593,11 +589,16 @@ Reference< XInterface > SAL_CALL filepolicy_create(
 //--------------------------------------------------------------------------------------------------
 Sequence< OUString > filepolicy_getSupportedServiceNames() SAL_THROW( () )
 {
-    return stoc_sec::s_serviceNames;
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
+    return aSNS;
 }
 //--------------------------------------------------------------------------------------------------
 OUString filepolicy_getImplementationName() SAL_THROW( () )
 {
-    return stoc_sec::s_implName;
+    static OUString s_implName = OUSTR(IMPL_NAME);
+    return s_implName;
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h
index 3f2312a67aab..123e0b181a19 100644
--- a/stoc/source/security/lru_cache.h
+++ b/stoc/source/security/lru_cache.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,7 +28,7 @@
 #ifndef _STOC_SEC_LRU_CACHE_H_
 #define _STOC_SEC_LRU_CACHE_H_
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 // __CACHE_DIAGNOSE works only for OUString keys
 #ifdef __CACHE_DIAGNOSE
@@ -53,7 +54,7 @@ class lru_cache
         Entry * m_pred;
         Entry * m_succ;
     };
-    typedef ::std::hash_map< t_key, Entry *, t_hashKey, t_equalKey > t_key2element;
+    typedef ::boost::unordered_map< t_key, Entry *, t_hashKey, t_equalKey > t_key2element;
     t_key2element m_key2element;
     ::std::size_t m_size;
 
@@ -202,7 +203,7 @@ inline t_val const * lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lookup(
             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" from cache") );
             ::rtl::OString str( ::rtl::OUStringToOString(
                 buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-            OSL_TRACE( str.getStr() );
+            OSL_TRACE( "%s", str.getStr() );
 #endif
             return &entry->m_val;
         }
@@ -231,7 +232,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set(
                 buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" from cache") );
                 ::rtl::OString str( ::rtl::OUStringToOString(
                     buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-                OSL_TRACE( str.getStr() );
+                OSL_TRACE( "%s", str.getStr() );
             }
 #endif
             m_key2element.erase( entry->m_key );
@@ -252,7 +253,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set(
             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" in cache") );
             ::rtl::OString str( ::rtl::OUStringToOString(
                 buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-            OSL_TRACE( str.getStr() );
+            OSL_TRACE( "%s", str.getStr() );
 #endif
         }
         entry->m_val = val;
@@ -277,3 +278,5 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::clear() SAL_THROW(
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index f889725986b7..c41643287020 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,7 +89,7 @@ static inline sal_Int32 makeMask(
             buf.append( item );
             ::rtl::OString str( ::rtl::OUStringToOString(
                 buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-            OSL_TRACE( str.getStr() );
+            OSL_TRACE( "%s", str.getStr() );
         }
 #endif
     }
@@ -579,7 +580,7 @@ static void demanded_diag(
     buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" => ok.") );
     ::rtl::OString str(
         ::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-    OSL_TRACE( str.getStr() );
+    OSL_TRACE( "%s", str.getStr() );
 }
 #endif
 //--------------------------------------------------------------------------------------------------
@@ -664,3 +665,5 @@ void PermissionCollection::checkPermission( Any const & perm ) const
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h
index 4599023eb205..898759482a6e 100644
--- a/stoc/source/security/permissions.h
+++ b/stoc/source/security/permissions.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,5 @@ public:
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 97eb82b6b997..efefe0ad10e1 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,8 +32,8 @@
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 
-#include <hash_map>
-#include <hash_set>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
 #include <list>
 #include <uno/mapping.hxx>
 #include <uno/dispatcher.h>
@@ -40,13 +41,9 @@
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/factory.hxx>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
 #include <cppuhelper/implbase1.hxx>
-#endif
 #include <cppuhelper/typeprovider.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <rtl/unload.h>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/bootstrap.hxx>
@@ -85,111 +82,57 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
 using namespace std;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
+
 rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
 
 namespace stoc_bootstrap
 {
 Sequence< OUString > smgr_wrapper_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(
-                RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory") );
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory") );
+    return seqNames;
 }
 
 OUString smgr_wrapper_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName(
-                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.OServiceManagerWrapper" ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.OServiceManagerWrapper"));
 }
 
 Sequence< OUString > smgr_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(2);
-            seqNames.getArray()[0] = OUString(
-                RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory") );
-            seqNames.getArray()[1] = OUString(
-                RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.ServiceManager") );
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(2);
+    seqNames.getArray()[0] = OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory") );
+    seqNames.getArray()[1] = OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.ServiceManager") );
+    return seqNames;
 }
 
 OUString smgr_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName(
-                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.OServiceManager" ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.OServiceManager"));
 }
 
 Sequence< OUString > regsmgr_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(2);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory"));
-            seqNames.getArray()[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.RegistryServiceManager"));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(2);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.MultiServiceFactory"));
+    seqNames.getArray()[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.RegistryServiceManager"));
+    return seqNames;
 }
 
 OUString regsmgr_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.ORegistryServiceManager" ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.stoc.ORegistryServiceManager" ) );
 }
 }
 
@@ -286,7 +229,7 @@ struct equaltoRef_Impl
         { return rName1 == rName2; }
 };
 
-typedef hash_set
+typedef boost::unordered_set
 <
     Reference<XInterface >,
     hashRef_Impl,
@@ -453,14 +396,14 @@ struct hashOWString_Impl
         { return rName.hashCode(); }
 };
 
-typedef hash_set
+typedef boost::unordered_set
 <
     OUString,
     hashOWString_Impl,
     equalOWString_Impl
 > HashSet_OWString;
 
-typedef hash_multimap
+typedef boost::unordered_multimap
 <
     OUString,
     Reference<XInterface >,
@@ -468,7 +411,7 @@ typedef hash_multimap
     equalOWString_Impl
 > HashMultimap_OWString_Interface;
 
-typedef hash_map
+typedef boost::unordered_map
 <
     OUString,
     Reference<XInterface >,
@@ -505,11 +448,11 @@ void OServiceManager_Listener::disposing(const EventObject & rEvt )
         }
         catch( const IllegalArgumentException & )
         {
-            OSL_ENSURE( sal_False, "IllegalArgumentException catched" );
+            OSL_FAIL( "IllegalArgumentException caught" );
         }
         catch( const NoSuchElementException & )
         {
-            OSL_ENSURE( sal_False, "NoSuchElementException catched" );
+            OSL_FAIL( "NoSuchElementException caught" );
         }
     }
 }
@@ -932,8 +875,8 @@ void OServiceManager::onUnloadingNotify()
     IT_MM it_end1= m_ServiceMap.end();
     list<IT_MM> listDeleteServiceMap;
     typedef list<IT_MM>::const_iterator CIT_DMM;
-    // find occurences in m_ServiceMap
-    for(IT_MM it_i1= m_ServiceMap.begin(); it_i1 != it_end1; it_i1++)
+    // find occurrences in m_ServiceMap
+    for(IT_MM it_i1= m_ServiceMap.begin(); it_i1 != it_end1; ++it_i1)
     {
         if( m_SetLoadedFactories.find( it_i1->second) != it_SetEnd)
         {
@@ -957,7 +900,7 @@ void OServiceManager::onUnloadingNotify()
     IT_M it_end3= m_ImplementationNameMap.end();
     list<IT_M> listDeleteImplementationNameMap;
     typedef list<IT_M>::const_iterator CIT_DM;
-    for( IT_M it_i3= m_ImplementationNameMap.begin();  it_i3 != it_end3; it_i3++)
+    for( IT_M it_i3= m_ImplementationNameMap.begin();  it_i3 != it_end3; ++it_i3)
     {
         if( m_SetLoadedFactories.find( it_i3->second) != it_SetEnd)
         {
@@ -981,7 +924,7 @@ void OServiceManager::onUnloadingNotify()
     IT_S it_end5= m_ImplementationMap.end();
     list<IT_S> listDeleteImplementationMap;
     typedef list<IT_S>::const_iterator CIT_DS;
-    for( IT_S it_i5= m_ImplementationMap.begin(); it_i5 != it_end5; it_i5++)
+    for( IT_S it_i5= m_ImplementationMap.begin(); it_i5 != it_end5; ++it_i5)
     {
         if( m_SetLoadedFactories.find( *it_i5) != it_SetEnd)
         {
@@ -1004,7 +947,7 @@ void OServiceManager::onUnloadingNotify()
     IT_S it_end7= m_SetLoadedFactories.end();
 
     Reference<XEventListener> xlistener= getFactoryListener();
-    for( IT_S it_i7= m_SetLoadedFactories.begin(); it_i7 != it_end7; it_i7++)
+    for( IT_S it_i7= m_SetLoadedFactories.begin(); it_i7 != it_end7; ++it_i7)
     {
         Reference<XComponent> xcomp( *it_i7, UNO_QUERY);
         if( xcomp.is())
@@ -1045,7 +988,7 @@ void OServiceManager::disposing()
         {
 #if OSL_DEBUG_LEVEL > 1
             OString str( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
-            OSL_TRACE( "### RuntimeException occured upon disposing factory: %s", str.getStr() );
+            OSL_TRACE( "### RuntimeException occurred upon disposing factory: %s", str.getStr() );
 #else
             (void) exc; // unused
 #endif
@@ -1267,7 +1210,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext(
         {
 #if OSL_DEBUG_LEVEL > 1
             OString str( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
-            OSL_TRACE( "### DisposedException occured: %s", str.getStr() );
+            OSL_TRACE( "### DisposedException occurred: %s", str.getStr() );
 #else
             (void) exc; // unused
 #endif
@@ -1331,7 +1274,7 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext(
         {
 #if OSL_DEBUG_LEVEL > 1
             OString str( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
-            OSL_TRACE( "### DisposedException occured: %s", str.getStr() );
+            OSL_TRACE( "### DisposedException occurred: %s", str.getStr() );
 #else
             (void) exc; // unused
 #endif
@@ -1375,7 +1318,7 @@ void OServiceManager::initialize( Sequence< Any > const & )
     throw (Exception)
 {
     check_undisposed();
-    OSL_ENSURE( 0, "not impl!" );
+    OSL_FAIL( "not impl!" );
 }
 
 // XServiceInfo
@@ -2057,3 +2000,5 @@ Reference<XInterface > SAL_CALL OServiceManagerWrapper_CreateInstance(
     return (OWeakObject *)new stoc_smgr::OServiceManagerWrapper( xContext );
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index 9c6b71bc6c83..4485f69e020c 100755..100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1318,3 +1319,4 @@ rtl::OUString simreg_getImplementationName() {
 }
 
 }
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/simpleregistry/textualservices.cxx b/stoc/source/simpleregistry/textualservices.cxx
index 5a50a5aa62c6..483c8ba5bc4e 100644
--- a/stoc/source/simpleregistry/textualservices.cxx
+++ b/stoc/source/simpleregistry/textualservices.cxx
@@ -283,13 +283,7 @@ void Parser::handleComponent() {
                     css::uno::Reference< css::uno::XInterface >());
             }
         } else {
-            throw css::registry::InvalidRegistryException(
-                (reader_.getUrl() +
-                 rtl::OUString(
-                     RTL_CONSTASCII_USTRINGPARAM(
-                         ": expected <component> attribute \"uri\" or"
-                         " \"loader\""))),
-                css::uno::Reference< css::uno::XInterface >());
+          OSL_FAIL ("unexpected component attribute, expected 'uri' or 'loader'");
         }
     }
     if (attrUri_.getLength() == 0) {
diff --git a/stoc/source/stocservices/stocservices.cxx b/stoc/source/stocservices/stocservices.cxx
index 6270d508eb37..85b31be9c77e 100644
--- a/stoc/source/stocservices/stocservices.cxx
+++ b/stoc/source/stocservices/stocservices.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,6 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
 using namespace stoc_services;
 
 rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
@@ -96,16 +96,18 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/tdmanager/lrucache.hxx b/stoc/source/tdmanager/lrucache.hxx
index fadc0a59b7bf..36f3c62390c5 100644
--- a/stoc/source/tdmanager/lrucache.hxx
+++ b/stoc/source/tdmanager/lrucache.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
 #include <osl/mutex.hxx>
 #include "rtl/ustring.hxx"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 
 /** Implementation of a least recently used (lru) cache.
@@ -50,7 +51,7 @@ class LRU_Cache
         CacheEntry *        pPred;
         CacheEntry *        pSucc;
     };
-    typedef ::std::hash_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element;
+    typedef ::boost::unordered_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element;
 
     mutable ::osl::Mutex        _aCacheMutex;
     sal_Int32                   _nCachedElements;
@@ -169,7 +170,7 @@ inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue(
         toFront( pEntry );
 #ifdef __CACHE_DIAGNOSE
         OSL_TRACE( "> retrieved element \"" );
-        OSL_TRACE( ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
+        OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
         OSL_TRACE( "\" from cache <\n" );
 #endif
         return pEntry->aVal;
@@ -194,7 +195,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
             if (pEntry->aKey.getLength())
             {
                 OSL_TRACE( "> kicking element \"" );
-                OSL_TRACE( ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
+                OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
                 OSL_TRACE( "\" from cache <\n" );
             }
 #endif
@@ -206,7 +207,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
             pEntry = (*iFind).second;
 #ifdef __CACHE_DIAGNOSE
             OSL_TRACE( "> replacing element \"" );
-            OSL_TRACE( ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
+            OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
             OSL_TRACE( "\" in cache <\n" );
 #endif
         }
@@ -245,3 +246,5 @@ typedef LRU_Cache< ::rtl::OUString, ::com::sun::star::uno::Any,
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx
index 390881bb0d1d..6c6e89700f4d 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,13 +32,9 @@
 #include <osl/mutex.hxx>
 #include "rtl/ustrbuf.hxx"
 #include <cppuhelper/factory.hxx>
-#ifndef _CPPUHELPER_IMPLBASE5_HXX_
 #include <cppuhelper/compbase5.hxx>
-#endif
 #include <cppuhelper/implbase1.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include "tdmgr_common.hxx"
 #include "tdmgr_tdenumeration.hxx"
 #include "lrucache.hxx"
@@ -65,7 +62,6 @@
 
 using namespace std;
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
@@ -74,7 +70,8 @@ using namespace com::sun::star::reflection;
 using namespace com::sun::star::container;
 using namespace com::sun::star::registry;
 
-
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
 
 static const sal_Int32 CACHE_SIZE = 512;
 
@@ -89,33 +86,14 @@ namespace stoc_bootstrap
 {
 Sequence< OUString > SAL_CALL tdmgr_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( !pNames )
-        {
-            static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-            pNames = &seqNames;
-        }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 OUString SAL_CALL tdmgr_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-        MutexGuard guard( Mutex::getGlobalMutex() );
-        if( ! pImplName )
-        {
-            static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-            pImplName = &implName;
-        }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 }
 
@@ -479,7 +457,7 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement )
                     catch (container::NoSuchElementException & exc)
                     {
                         throw lang::IllegalArgumentException(
-                            OUSTR("NoSuchElementException occured: ") +
+                            OUSTR("NoSuchElementException occurred: ") +
                             exc.Message, static_cast<OWeakObject *>(this),
                             -1 /* unknown */ );
                     }
@@ -515,13 +493,13 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement )
             catch (reflection::NoSuchTypeNameException & exc)
             {
                 throw lang::IllegalArgumentException(
-                    OUSTR("NoSuchTypeNameException occured: ") + exc.Message,
+                    OUSTR("NoSuchTypeNameException occurred: ") + exc.Message,
                     static_cast<OWeakObject *>(this), -1 /* unknown */ );
             }
             catch (reflection::InvalidTypeNameException & exc)
             {
                 throw lang::IllegalArgumentException(
-                    OUSTR("InvalidTypeNameException occured: ") + exc.Message,
+                    OUSTR("InvalidTypeNameException occurred: ") + exc.Message,
                     static_cast<OWeakObject *>(this), -1 /* unknown */ );
             }
         }
@@ -588,7 +566,7 @@ ManagerImpl::createTypeDescriptionEnumeration(
         if ( xEnumAccess.is() )
             aStack.push( xEnumAccess );
 
-        it++;
+        ++it;
     }
 
     return Reference< XTypeDescriptionEnumeration >(
@@ -1161,3 +1139,4 @@ Reference< XInterface > SAL_CALL ManagerImpl_create(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/tdmanager/tdmgr_check.cxx b/stoc/source/tdmanager/tdmgr_check.cxx
index 0a19403532bf..0d1fad28f0e8 100644
--- a/stoc/source/tdmanager/tdmgr_check.cxx
+++ b/stoc/source/tdmanager/tdmgr_check.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -554,3 +555,5 @@ void check( Reference<reflection::XTypeDescription> const & xNewTD,
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/tdmanager/tdmgr_common.hxx b/stoc/source/tdmanager/tdmgr_common.hxx
index 5d640e99f919..e6d6dff352f3 100644
--- a/stoc/source/tdmanager/tdmgr_common.hxx
+++ b/stoc/source/tdmanager/tdmgr_common.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,5 @@ void check(
 } // namespace stoc_tdmgr
 
 #endif /* _STOC_TDMGR_COMMON_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx
index c1815c932db5..aa48a275cb8e 100644
--- a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx
+++ b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -98,8 +99,8 @@ uno::Any SAL_CALL TypeDescriptionEnumerationImpl::nextElement()
         return xEnum->nextElement();
 
     throw container::NoSuchElementException(
-        rtl::OUString::createFromAscii(
-            "No further elements in enumeration!" ),
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ),
         static_cast< cppu::OWeakObject * >( this  ) );
 }
 
@@ -121,8 +122,8 @@ TypeDescriptionEnumerationImpl::nextTypeDescription()
         return xEnum->nextTypeDescription();
 
     throw container::NoSuchElementException(
-        rtl::OUString::createFromAscii(
-            "No further elements in enumeration!" ),
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ),
         static_cast< cppu::OWeakObject * >( this  ) );
 }
 
@@ -163,14 +164,12 @@ TypeDescriptionEnumerationImpl::queryCurrentChildEnumeration()
         }
         catch ( reflection::NoSuchTypeNameException const & )
         {
-            OSL_ENSURE( sal_False,
-               "TypeDescriptionEnumerationImpl::queryCurrentChildEnumeration "
+            OSL_FAIL( "TypeDescriptionEnumerationImpl::queryCurrentChildEnumeration "
                "- Caught NoSuchTypeNameException!" );
         }
         catch ( reflection::InvalidTypeNameException const & )
         {
-            OSL_ENSURE( sal_False,
-               "TypeDescriptionEnumerationImpl::queryCurrentChildEnumeration "
+            OSL_FAIL( "TypeDescriptionEnumerationImpl::queryCurrentChildEnumeration "
                "- Caught InvalidTypeNameException!" );
         }
 
@@ -185,3 +184,4 @@ TypeDescriptionEnumerationImpl::queryCurrentChildEnumeration()
 
 } // namespace stoc_tdmgr
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/tdmanager/tdmgr_tdenumeration.hxx b/stoc/source/tdmanager/tdmgr_tdenumeration.hxx
index 1b383af538c1..32268f3be988 100644
--- a/stoc/source/tdmanager/tdmgr_tdenumeration.hxx
+++ b/stoc/source/tdmanager/tdmgr_tdenumeration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,3 +88,4 @@ private:
 
 #endif /* _STOC_TDMGR_TDENUMERATION_HXX */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 0b81d3e49d1c..66f20480696f 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,9 +56,8 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::script;
 using namespace com::sun::star::registry;
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
-
+using ::rtl::OUString;
 #define SERVICENAME "com.sun.star.script.Converter"
 #define IMPLNAME    "com.sun.star.comp.stoc.TypeConverter"
 
@@ -68,33 +68,14 @@ namespace stoc_services
 {
 Sequence< OUString > tcv_getSupportedServiceNames()
 {
-    static Sequence < OUString > *pNames = 0;
-    if( ! pNames )
-    {
-    MutexGuard guard( Mutex::getGlobalMutex() );
-    if( !pNames )
-    {
-        static Sequence< OUString > seqNames(1);
-        seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
-        pNames = &seqNames;
-    }
-    }
-    return *pNames;
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+    return seqNames;
 }
 
 OUString tcv_getImplementationName()
 {
-    static OUString *pImplName = 0;
-    if( ! pImplName )
-    {
-    MutexGuard guard( Mutex::getGlobalMutex() );
-    if( ! pImplName )
-    {
-        static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
-        pImplName = &implName;
-    }
-    }
-    return *pImplName;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
 }
 }
 
@@ -901,7 +882,9 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
         }
 
         case TypeClass_BOOLEAN:
-            aRet <<= OUString::createFromAscii( (*(sal_Bool *)rVal.getValue() ? "true" : "false") );
+            aRet <<= (*(sal_Bool *)rVal.getValue()) ?
+                OUString(RTL_CONSTASCII_USTRINGPARAM("true")) :
+                OUString(RTL_CONSTASCII_USTRINGPARAM("false"));
             break;
         case TypeClass_CHAR:
             aRet <<= OUString( (sal_Unicode *)rVal.getValue(), 1 );
@@ -961,3 +944,4 @@ Reference< XInterface > SAL_CALL TypeConverter_Impl_CreateInstance(
 }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index b11ba0fc0df2..1a9f65e641e1 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -221,20 +222,22 @@ css::uno::Reference< css::uno::XInterface > create(
         return static_cast< cppu::OWeakObject * >(new Translator(context));
     } catch (std::bad_alloc &) {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii("std::bad_alloc"), 0);
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0);
     }
 }
 
 rtl::OUString getImplementationName() {
-    return rtl::OUString::createFromAscii(
-        "com.sun.star.comp.uri.ExternalUriReferenceTranslator");
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.ExternalUriReferenceTranslator"));
 }
 
 css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
     css::uno::Sequence< rtl::OUString > s(1);
-    s[0] = rtl::OUString::createFromAscii(
-        "com.sun.star.uri.ExternalUriReferenceTranslator");
+    s[0] = rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator"));
     return s;
 }
 
 } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx
index 60b17bf39a6f..f3eb93a2219c 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ namespace ExternalUriReferenceTranslator {
 } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx
index 12654f4d6b90..88f312addc4b 100644
--- a/stoc/source/uriproc/UriReference.cxx
+++ b/stoc/source/uriproc/UriReference.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -204,3 +205,5 @@ void UriReference::appendSchemeSpecificPart(rtl::OUStringBuffer & buffer) const
         buffer.append(m_query);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx
index 38b8f5518fbf..efd187977b7e 100644
--- a/stoc/source/uriproc/UriReference.hxx
+++ b/stoc/source/uriproc/UriReference.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -106,3 +107,5 @@ private:
 } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 89367ade36cf..1d87c69ab07c 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -421,7 +422,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse(
                 throw;
             } catch (css::uno::Exception & e) {
                 throw css::lang::WrappedTargetRuntimeException(
-                    rtl::OUString::createFromAscii("creating service ")
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("creating service "))
                         + serviceName,
                     static_cast< cppu::OWeakObject * >(this),
                     css::uno::makeAny(e)); //TODO: preserve type of e
@@ -440,7 +441,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse(
             uriRef = parseGeneric(scheme, schemeSpecificPart);
         } catch (std::bad_alloc &) {
             throw css::uno::RuntimeException(
-                rtl::OUString::createFromAscii("std::bad_alloc"),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")),
                 static_cast< cppu::OWeakObject * >(this));
         }
     }
@@ -705,20 +706,22 @@ css::uno::Reference< css::uno::XInterface > create(
         return static_cast< cppu::OWeakObject * >(new Factory(context));
     } catch (std::bad_alloc &) {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii("std::bad_alloc"), 0);
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0);
     }
 }
 
 rtl::OUString getImplementationName() {
-    return rtl::OUString::createFromAscii(
-        "com.sun.star.comp.uri.UriReferenceFactory");
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.UriReferenceFactory"));
 }
 
 css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
     css::uno::Sequence< rtl::OUString > s(1);
-    s[0] = rtl::OUString::createFromAscii(
-        "com.sun.star.uri.UriReferenceFactory");
+    s[0] = rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.UriReferenceFactory"));
     return s;
 }
 
 } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/UriReferenceFactory.hxx b/stoc/source/uriproc/UriReferenceFactory.hxx
index 0aca96fce962..8acc8e46662e 100644
--- a/stoc/source/uriproc/UriReferenceFactory.hxx
+++ b/stoc/source/uriproc/UriReferenceFactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ namespace UriReferenceFactory {
 } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index a84a1200c953..999bde852429 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -266,3 +267,5 @@ css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() {
 }
 
 } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.hxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.hxx
index 2008b7ba82e3..fa3501d83bb3 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.hxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,3 +61,5 @@ namespace UriSchemeParser_vndDOTsunDOTstarDOTexpand {
 } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 512f18a114ab..310f3aa318b6 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -448,7 +449,7 @@ Parser::parse(
         return new UrlReference(scheme, schemeSpecificPart);
     } catch (std::bad_alloc &) {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii("std::bad_alloc"), 0);
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0);
     }
 }
 
@@ -466,20 +467,22 @@ css::uno::Reference< css::uno::XInterface > create(
         return static_cast< cppu::OWeakObject * >(new Parser);
     } catch (std::bad_alloc &) {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii("std::bad_alloc"), 0);
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0);
     }
 }
 
 rtl::OUString getImplementationName() {
-    return rtl::OUString::createFromAscii(
-        "com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript");
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"));
 }
 
 css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
     css::uno::Sequence< rtl::OUString > s(1);
-    s[0] = rtl::OUString::createFromAscii(
-        "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript");
+    s[0] = rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"));
     return s;
 }
 
 } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx
index 00c39ef0e0be..e2340154d09e 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,5 @@ namespace UriSchemeParser_vndDOTsunDOTstarDOTscript {
 } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 0422bad6a770..1ac83724614a 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -148,20 +149,22 @@ css::uno::Reference< css::uno::XInterface > create(
         return static_cast< cppu::OWeakObject * >(new Factory(context));
     } catch (std::bad_alloc &) {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii("std::bad_alloc"), 0);
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0);
     }
 }
 
 rtl::OUString getImplementationName() {
-    return rtl::OUString::createFromAscii(
-        "com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory");
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory"));
 }
 
 css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
     css::uno::Sequence< rtl::OUString > s(1);
-    s[0] = rtl::OUString::createFromAscii(
-        "com.sun.star.uri.VndSunStarPkgUrlReferenceFactory");
+    s[0] = rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.VndSunStarPkgUrlReferenceFactory"));
     return s;
 }
 
 } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx
index 2e869d4e2648..f515e8264a19 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ namespace VndSunStarPkgUrlReferenceFactory {
 } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/supportsService.cxx b/stoc/source/uriproc/supportsService.cxx
index 77b55252bd4d..464714f2c6a8 100644
--- a/stoc/source/uriproc/supportsService.cxx
+++ b/stoc/source/uriproc/supportsService.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ bool supportsService(
 }
 
 } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/uriproc/supportsService.hxx b/stoc/source/uriproc/supportsService.hxx
index 35b2ed662195..1ec83bb6cd75 100644
--- a/stoc/source/uriproc/supportsService.hxx
+++ b/stoc/source/uriproc/supportsService.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,3 +42,5 @@ bool supportsService(
 } }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/excomp/excomp.cxx b/stoc/test/excomp/excomp.cxx
index bdfa520a6e39..fd01fa5b8b02 100644
--- a/stoc/test/excomp/excomp.cxx
+++ b/stoc/test/excomp/excomp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,7 +51,9 @@ using namespace com::sun::star::registry;
 using namespace com::sun::star::lang;
 using namespace example;
 using namespace cppu;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
 
 #if OSL_DEBUG_LEVEL > 0
 #define TEST_ENSHURE(c, m)   OSL_ENSURE(c, m)
@@ -64,7 +67,7 @@ OUString getExePath()
 
     OSL_VERIFY(osl_getExecutableFile( &exe.pData) == osl_Process_E_None);
 
-#if defined(WIN32) || defined(__OS2__) || defined(WNT)
+#if defined(WIN32) || defined(WNT)
     exe = exe.copy(0, exe.getLength() - 10);
 #else
     exe = exe.copy(0, exe.getLength() - 6);
@@ -85,25 +88,25 @@ SAL_IMPLEMENT_MAIN()
     OUString exePath( getExePath() );
     OUString excompRdb(exePath);
 
-    excompRdb += OUString::createFromAscii("excomp.rdb");
+    excompRdb += OUString(RTL_CONSTASCII_USTRINGPARAM("excomp.rdb"));
 
     Reference< XMultiServiceFactory > xSMgr  = ::cppu::createRegistryServiceFactory( excompRdb );
     TEST_ENSHURE( xSMgr.is(), "excomp error 0" );
 
     typelib_TypeDescription* pTypeDesc = NULL;
-    OUString sType = OUString::createFromAscii("com.sun.star.text.XTextDocument");
+    OUString sType(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.XTextDocument"));
     typelib_typedescription_getByName( &pTypeDesc, sType.pData);
 //  typelib_InterfaceTypeDescription* pInterDesc = (typelib_InterfaceTypeDescription*)pTypeDesc;
 
-    Reference< XInterface > xIFace = xSMgr->createInstance(OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration"));
+    Reference< XInterface > xIFace = xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")));
     Reference< XImplementationRegistration > xImpReg( xIFace, UNO_QUERY);
     TEST_ENSHURE( xImpReg.is(), "excomp error 1" );
     try
     {
-        xImpReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
+        xImpReg->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
                                         compName1,
                                         Reference< XSimpleRegistry >() );
-        xImpReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
+        xImpReg->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
                                         compName2,
                                         Reference< XSimpleRegistry >() );
     }
@@ -112,10 +115,10 @@ SAL_IMPLEMENT_MAIN()
         TEST_ENSHURE( e.Message.getLength(), OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US).getStr() );
     }
 
-    Reference< XTest > xTest1( xSMgr->createInstance(OUString::createFromAscii("example.ExampleComponent1")),
+    Reference< XTest > xTest1( xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("example.ExampleComponent1"))),
                                UNO_QUERY);
     TEST_ENSHURE( xTest1.is(), "excomp error 2" );
-    Reference< XTest > xTest2( xSMgr->createInstance(OUString::createFromAscii("example.ExampleComponent2")),
+    Reference< XTest > xTest2( xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("example.ExampleComponent2"))),
                                UNO_QUERY);
     TEST_ENSHURE( xTest2.is(), "excomp error 3" );
 
@@ -134,3 +137,4 @@ SAL_IMPLEMENT_MAIN()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/excomp/excomp1.cxx b/stoc/test/excomp/excomp1.cxx
index 210bee770cc9..f329f11fa542 100644
--- a/stoc/test/excomp/excomp1.cxx
+++ b/stoc/test/excomp/excomp1.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,7 +46,8 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 #define SERVICENAME1 "example.ExampleComponent1"
 #define IMPLNAME1   "example.ExampleComponent1.Impl"
@@ -128,7 +130,7 @@ Sequence<OUString> SAL_CALL ExampleComponent1Impl::getSupportedServiceNames_Stat
 OUString SAL_CALL ExampleComponent1Impl::getMessage() throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
-    return OUString::createFromAscii("Lalelu nur der Mann im Mond schaut zu ...");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("Lalelu nur der Mann im Mond schaut zu ..."));
 }
 
 
@@ -153,7 +155,7 @@ Reference<XInterface> SAL_CALL ExampleComponent1_CreateInstance( const Reference
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -181,13 +183,13 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+            OSL_FAIL( "### InvalidRegistryException!" );
         }
     }
     return sal_False;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
     void * pRet = 0;
@@ -213,3 +215,4 @@ void * SAL_CALL component_getFactory(
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/excomp/excomp1.xml b/stoc/test/excomp/excomp1.xml
index 80b6cb0450f9..f7abad04302c 100644
--- a/stoc/test/excomp/excomp1.xml
+++ b/stoc/test/excomp/excomp1.xml
@@ -24,10 +24,8 @@
     </component-description>
     <project-build-dependency>  cppuhelper  </project-build-dependency>
     <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  vos         </project-build-dependency>
     <project-build-dependency>  sal         </project-build-dependency>
     <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
     <runtime-module-dependency> cppu        </runtime-module-dependency>
-    <runtime-module-dependency> vos         </runtime-module-dependency>
     <runtime-module-dependency> sal         </runtime-module-dependency>
 </module-description>
diff --git a/stoc/test/excomp/excomp2.cxx b/stoc/test/excomp/excomp2.cxx
index 3595b6ecda06..0f1967a2c469 100644
--- a/stoc/test/excomp/excomp2.cxx
+++ b/stoc/test/excomp/excomp2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,7 +49,8 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 #define SERVICENAME2 "example.ExampleComponent2"
 #define IMPLNAME2   "example.ExampleComponent2.Impl"
@@ -198,7 +200,7 @@ Sequence<OUString> SAL_CALL ExampleComponent2Impl::getSupportedServiceNames_Stat
 OUString SAL_CALL ExampleComponent2Impl::getMessage() throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
-    return OUString::createFromAscii("Alle meine Entchen schwimmen auf dem See, schwimmen auf dem See ...");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("Alle meine Entchen schwimmen auf dem See, schwimmen auf dem See ..."));
 }
 
 
@@ -224,7 +226,7 @@ Reference<XInterface> SAL_CALL ExampleComponent2_CreateInstance( const Reference
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -252,13 +254,13 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+            OSL_FAIL( "### InvalidRegistryException!" );
         }
     }
     return sal_False;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
     void * pRet = 0;
@@ -284,3 +286,4 @@ void * SAL_CALL component_getFactory(
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/excomp/excomp2.xml b/stoc/test/excomp/excomp2.xml
index 67df74bd188d..4801cf240135 100644
--- a/stoc/test/excomp/excomp2.xml
+++ b/stoc/test/excomp/excomp2.xml
@@ -24,10 +24,8 @@
     </component-description>
     <project-build-dependency>  cppuhelper  </project-build-dependency>
     <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  vos         </project-build-dependency>
     <project-build-dependency>  sal         </project-build-dependency>
     <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
     <runtime-module-dependency> cppu        </runtime-module-dependency>
-    <runtime-module-dependency> vos         </runtime-module-dependency>
     <runtime-module-dependency> sal         </runtime-module-dependency>
 </module-description>
diff --git a/stoc/test/excomp/makefile.mk b/stoc/test/excomp/makefile.mk
index b41acb372620..01ffb65a5fcc 100644
--- a/stoc/test/excomp/makefile.mk
+++ b/stoc/test/excomp/makefile.mk
@@ -31,7 +31,6 @@ TARGET=		excomp
 TARGET1=	excomp1
 TARGET2=	excomp2
 TARGETTYPE=CUI
-#LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=	TRUE
 NO_BSYMBOLIC=	TRUE
diff --git a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
index 076a2e9c1e62..a661eb89eb74 100644
--- a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
+++ b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,10 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 
-
 #include <jni.h>
 
-//#include <iostream>
 #include <stdio.h>
 #include <sal/main.h>
 #include <rtl/process.h>
@@ -60,17 +59,20 @@
 #include <com/sun/star/java/JavaVMCreationFailureException.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <uno/current_context.hxx>
+
 using namespace std;
-using namespace rtl;
 using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
-//using namespace com::sun::star::reflection;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace com::sun::star::java;
 using namespace com::sun::star::task;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
 #define OUSTR( x ) OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
 #define INTERACTION_HANDLER_NAME "java-vm.interaction-handler"
 
@@ -119,9 +121,6 @@ void SAL_CALL InteractionHandler::handle( const Reference< XInteractionRequest >
             break;
     }
 
-//     if( abort.is())
-//         abort->select();
-
     static int cRetry= 0;
 
     if( cRetry++ == 5)
@@ -203,3 +202,4 @@ SAL_IMPLEMENT_MAIN()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/javavm/makefile.mk b/stoc/test/javavm/makefile.mk
index 7f6190fecc4f..4998b0a64a73 100644
--- a/stoc/test/javavm/makefile.mk
+++ b/stoc/test/javavm/makefile.mk
@@ -35,14 +35,11 @@ NO_BSYMBOLIC=	TRUE
 
 UNOUCRDEP=	$(SOLARBINDIR)$/udkapi.rdb
 UNOUCRRDB=	$(SOLARBINDIR)$/udkapi.rdb
-#UNOUCROUT=	$(OUT)$/inc$/test
 UNOUCROUT=	$(OUT)$/inc$
-#INCPRE+=	$(OUT)$/inc$/test
 INCPRE+=	$(OUT)$/inc$
 
-
-
 # --- Settings -----------------------------------------------------
+
 .INCLUDE :  settings.mk
 
 # --- Application 6 - testjavavm ------------------------------------
@@ -65,7 +62,6 @@ APP6STDLIBS= \
         $(CPPUHELPERLIB) 	\
         $(SALHELPERLIB) 	\
         $(SALLIB)	
-#		$(UNOLIB)
 
 # --- Target ------------------------------------------------
 
diff --git a/stoc/test/javavm/testapplet/makefile.mk b/stoc/test/javavm/testapplet/makefile.mk
index 4ddadebd9aa2..31872c5386df 100644
--- a/stoc/test/javavm/testapplet/makefile.mk
+++ b/stoc/test/javavm/testapplet/makefile.mk
@@ -31,11 +31,12 @@ PRJNAME = testapplet
 PACKAGE =
 TARGET  = TestApplet
 
-
 # --- Settings -----------------------------------------------------
-#.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE : settings.mk
+
 # Files --------------------------------------------------------
+
 JARFILES = ridl.jar jurt.jar unoil.jar
 
 JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
@@ -45,11 +46,7 @@ JAVACLASSFILES= \
     $(CLASSDIR)$/$(PACKAGE)$/TestApplet.class 	
 
 JARCLASSDIRS= .
-#JARTARGET		= $(TARGET).jar
-#JARCOMPRESS= TRUE
-#CUSTOMMANIFESTFILE= .$/manifest
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
diff --git a/stoc/test/javavm/testcomponent/makefile.mk b/stoc/test/javavm/testcomponent/makefile.mk
index a2f8eb16fe4d..9d77ebfb9bdf 100644
--- a/stoc/test/javavm/testcomponent/makefile.mk
+++ b/stoc/test/javavm/testcomponent/makefile.mk
@@ -31,11 +31,12 @@ PRJNAME = testcomponent
 PACKAGE =
 TARGET  = JavaTestComponent
 
-
 # --- Settings -----------------------------------------------------
-#.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE : settings.mk
+
 # Files --------------------------------------------------------
+
 JARFILES = ridl.jar jurt.jar unoil.jar
 
 CUSTOMMANIFESTFILE= manifest
@@ -48,11 +49,6 @@ JAVAFILES= \
 
 JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
-
-
-
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index e9111bd3cd1d..fbbcb646a7c6 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,10 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 
-
 #include <jni.h>
 
-//#include <iostream>
 #include <stdio.h>
 #include <sal/main.h>
 #include <rtl/process.h>
@@ -47,18 +46,18 @@
 #include <com/sun/star/registry/XImplementationRegistration.hpp>
 #include <com/sun/star/java/XJavaThreadRegister_11.hpp>
 
-//#include <cppuhelper/implbase1.hxx>
-
 using namespace std;
-using namespace rtl;
 using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
-//using namespace com::sun::star::reflection;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace com::sun::star::java;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
 
 sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
 {
@@ -80,7 +79,7 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
     Any anyVM = xVM->getJavaVM( Sequence<sal_Int8>(arId, 16));
     if ( ! anyVM.hasValue())
     {
-        OSL_ENSURE(0,"could not get Java VM");
+        OSL_FAIL("could not get Java VM");
         return sal_False;
     }
 
@@ -104,44 +103,15 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
     if( _jvm->AttachCurrentThread((void**) &p_env, 0))
         return sal_False;
 
-//  jclass aJProg = p_env->FindClass("TestJavaVM");
-//  if( p_env->ExceptionOccurred()){
-//      p_env->ExceptionDescribe();
-//      p_env->ExceptionClear();
-//  }
-//
-//  jmethodID mid= p_env->GetStaticMethodID( aJProg,"main", "([Ljava/lang/String;)V");
-
     jclass cls = p_env->FindClass( "TestJavaVM");
     if (cls == 0) {
         OSL_TRACE( "Can't find Prog class\n");
         exit(1);
     }
 
-//   jmethodID methid = p_env->GetStaticMethodID( cls, "main", "([Ljava/lang/String;)V");
-//    if (methid == 0) {
-//        OSL_TRACE("Can't find Prog.main\n");
-//        exit(1);
-//    }
-
-//    jstring jstr = p_env->NewStringUTF(" from C!");
-//    if (jstr == 0) {
-//        OSL_TRACE("Out of memory\n");
-//        exit(1);
-//    }
-//    jobjectArray args = p_env->NewObjectArray( 1,
-//                        p_env->FindClass("java/lang/String"), jstr);
-//    if (args == 0) {
-//        OSL_TRACE( "Out of memory\n");
-//        exit(1);
-//    }
-//    p_env->CallStaticVoidMethod( cls, methid, args);
-
-
     jmethodID id = p_env->GetStaticMethodID( cls, "getInt", "()I");
     if( id)
     {
-//      jint _i= p_env->CallStaticIntMethod(cls, id);
         p_env->CallStaticIntMethod(cls, id);
     }
 
@@ -185,18 +155,18 @@ SAL_IMPLEMENT_MAIN()
     }
     catch (Exception & rExc)
     {
-        OSL_ENSURE( sal_False, "### exception occured!" );
+        OSL_FAIL( "### exception occurred!" );
         OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( "### exception occured: " );
-        OSL_TRACE( aMsg.getStr() );
+        OSL_TRACE( "### exception occurred: " );
+        OSL_TRACE( "%s", aMsg.getStr() );
         OSL_TRACE( "\n" );
     }
 
     Reference< XComponent > xCompContext( context, UNO_QUERY );
     xCompContext->dispose();
     printf("javavm %s", bSucc ? "succeeded" : "failed");
-//  cout << "javavm " << (bSucc ? "succeeded" : "failed") << " !" << endl;
     return (bSucc ? 0 : -1);
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/makefile.mk b/stoc/test/makefile.mk
index a7b18d062f8b..d4be0a9eca34 100644
--- a/stoc/test/makefile.mk
+++ b/stoc/test/makefile.mk
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+
 PRJ=..
 
 PRJNAME=stoc
@@ -38,7 +39,7 @@ TARGET7=testconv
 TARGET8=testproxyfac
 TARGET9=testsmgr2
 TARGETTYPE=CUI
-#LIBTARGET=NO
+
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 
@@ -59,7 +60,6 @@ SHL1STDLIBS= \
 SHL1TARGET=testsmgr_component
 SHL1DEPN=
 SHL1IMPLIB=i$(SHL1TARGET)
-#SHL1LIBS=$(SLB)$/$(SHL1TARGET).lib
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 SHL1VERSIONMAP=testsmgr_cpnt.map
@@ -98,7 +98,7 @@ APP3STDLIBS= \
 .IF "$(GUI)"=="UNX"
 APP3STDLIBS+= -l$(SHL1TARGET)
 .ENDIF
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 APP3STDLIBS+= i$(SHL1TARGET).lib
 .ENDIF
 
diff --git a/stoc/test/mergekeys_.cxx b/stoc/test/mergekeys_.cxx
index b75a1ef7df35..e47de6cfbc00 100644
--- a/stoc/test/mergekeys_.cxx
+++ b/stoc/test/mergekeys_.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,3 +30,5 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 #include "../source/implementationregistration/mergekeys.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
index ca245d7d7f43..8a8a6dd98a65 100644
--- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
+++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -867,7 +868,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
 }
 
 rtl::OUString Service::getImplementationName() {
-    return rtl::OUString::createFromAscii("test.registrytdprovider.impl");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.impl"));
 }
 
 css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames() {
@@ -881,7 +882,7 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
     return static_cast< cppu::OWeakObject * >(new Service(context));
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     char const ** envTypeName, uno_Environment **)
 {
     if (envTypeName != 0) {
@@ -889,7 +890,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
     }
 }
 
-extern "C" void * SAL_CALL component_getFactory(char const * implName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName,
                                                 void * serviceManager, void *) {
     void * p = 0;
     if (serviceManager != 0) {
@@ -911,9 +912,9 @@ namespace {
 
 bool writeInfo(void * registryKey, rtl::OUString const & implementationName,
                css::uno::Sequence< rtl::OUString > const & serviceNames) {
-    rtl::OUString keyName(rtl::OUString::createFromAscii("/"));
+    rtl::OUString keyName(RTL_CONSTASCII_USTRINGPARAM("/"));
     keyName += implementationName;
-    keyName += rtl::OUString::createFromAscii("/UNO/SERVICES");
+    keyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     css::uno::Reference< css::registry::XRegistryKey > key;
     try {
         key = static_cast< css::registry::XRegistryKey * >(registryKey)->
@@ -941,3 +942,5 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(void *, void * registryKey) {
         && writeInfo(registryKey, Service::getImplementationName(),
                      Service::getSupportedServiceNames());
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/security/test_security.cxx b/stoc/test/security/test_security.cxx
index 3678ed2b7c65..510f832b09b1 100644
--- a/stoc/test/security/test_security.cxx
+++ b/stoc/test/security/test_security.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -521,3 +522,5 @@ SAL_IMPLEMENT_MAIN()
         return 1;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx
index 53b793c8fbe4..83e29e3d79f0 100644
--- a/stoc/test/tdmanager/testtdmanager.cxx
+++ b/stoc/test/tdmanager/testtdmanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -298,7 +299,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
 }
 
 rtl::OUString Service::getImplementationName() {
-    return rtl::OUString::createFromAscii("test.tdmanager.impl");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test.tdmanager.impl"));
 }
 
 css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames() {
@@ -312,7 +313,7 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
     return static_cast< cppu::OWeakObject * >(new Service(context));
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     char const ** envTypeName, uno_Environment **)
 {
     if (envTypeName != 0) {
@@ -320,7 +321,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
     }
 }
 
-extern "C" void * SAL_CALL component_getFactory(char const * implName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName,
                                                 void * serviceManager, void *) {
     void * p = 0;
     if (serviceManager != 0) {
@@ -342,9 +343,9 @@ namespace {
 
 bool writeInfo(void * registryKey, rtl::OUString const & implementationName,
                css::uno::Sequence< rtl::OUString > const & serviceNames) {
-    rtl::OUString keyName(rtl::OUString::createFromAscii("/"));
+    rtl::OUString keyName(RTL_CONSTASCII_USTRINGPARAM("/"));
     keyName += implementationName;
-    keyName += rtl::OUString::createFromAscii("/UNO/SERVICES");
+    keyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     css::uno::Reference< css::registry::XRegistryKey > key;
     try {
         key = static_cast< css::registry::XRegistryKey * >(registryKey)->
@@ -372,3 +373,5 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(void *, void * registryKey) {
         && writeInfo(registryKey, Service::getImplementationName(),
                      Service::getSupportedServiceNames());
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index 0687046512af..3284da625335 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,7 +44,6 @@
 #include <stdio.h>
 
 
-using namespace rtl;
 using namespace cppu;
 using namespace osl;
 using namespace com::sun::star::uno;
@@ -52,6 +52,9 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::reflection;
 using namespace com::sun::star::registry;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
 const double MIN_DOUBLE     = -DBL_MAX;
 const double MAX_DOUBLE     = DBL_MAX;
 const double MIN_FLOAT      = -FLT_MAX;
@@ -81,7 +84,7 @@ static void printValue( const Any & rVal )
         char ar[2];
         ar[0] = (char)*(sal_Unicode *)rVal.getValue();
         ar[1] = 0;
-        printf( ar );
+        printf( "%s", ar );
         break;
     }
     case TypeClass_BYTE:
@@ -305,66 +308,66 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
     sal_uInt32 nElems = 0;
 
     // ==BYTE==
-    aVal <<= OUString::createFromAscii( "0xff" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0xff"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 );
-    aVal <<= OUString::createFromAscii( "255" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("255"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 );
     aVal <<= (sal_Int8)0xffu;
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "0x80" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x80"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 );
-    aVal <<= OUString::createFromAscii( "128" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("128"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 );
     aVal <<= (sal_Int8)( 0x80u );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "0x7f" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x7f"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 );
-    aVal <<= OUString::createFromAscii( "127" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("127"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 );
     aVal <<= (sal_Int8)( 0x7f );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "5" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("5"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0 );
-    aVal <<= OUString::createFromAscii( "+5" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("+5"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 );
     aVal <<= (sal_Int8)( 5 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "-5" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-5"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     aVal <<= (sal_Int8)( -5 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "256" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("256"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     // ==UINT16==
-    aVal <<= OUString::createFromAscii( "65535" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("65535"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 );
-    aVal <<= OUString::createFromAscii( "0xffff" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0xffff"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 );
     aVal <<= (sal_uInt16)( 0xffff );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "32768" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("32768"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 );
     aVal <<= (sal_uInt16)( 0x8000 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "32767" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("32767"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 );
-    aVal <<= OUString::createFromAscii( "0x7fff" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x7fff"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 );
     aVal <<= (sal_uInt16)( 0x7fff );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "256" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("256"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 );
-    aVal <<= OUString::createFromAscii( "0x100" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x100"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 );
     aVal <<= (sal_uInt16)( 0x100 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0 );
@@ -395,33 +398,33 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     // ==UINT32==
-    aVal <<= OUString::createFromAscii( "+4294967295" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("+4294967295"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
-    aVal <<= OUString::createFromAscii( "4294967295" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("4294967295"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
-    aVal <<= OUString::createFromAscii( "0xffffffff" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0xffffffff"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
     aVal <<= (sal_uInt32)( 0xffffffff );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "-2147483648" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-2147483648"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 );
-    aVal <<= OUString::createFromAscii( "-0x80000000" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-0x80000000"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     aVal <<= (sal_uInt32)( 0x80000000 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "2147483647" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("2147483647"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 );
-    aVal <<= OUString::createFromAscii( "0x7fffffff" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x7fffffff"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 );
     aVal <<= (sal_uInt32)( 0x7fffffff );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "65536" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("65536"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 );
-    aVal <<= OUString::createFromAscii( "0x10000" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x10000"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 );
     aVal <<= (sal_uInt32)( 0x10000 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0 );
@@ -432,7 +435,7 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
     aVal <<= (sal_uInt32)( 5 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "0xfffffffb" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0xfffffffb"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
     aVal <<= (sal_uInt32)( -5 ); // is 0xfffffffb
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
@@ -460,27 +463,27 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     // ==FLOAT==
-    aVal <<= OUString::createFromAscii( "-3.4e+38" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-3.4e+38"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
     aVal <<= (float)( MIN_FLOAT );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "+3.4e+38" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("+3.4e+38"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
     aVal <<= (float)( MAX_FLOAT );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "9e-20" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("9e-20"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 );
     aVal <<= (float)( 9e-20 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "+.7071067811865" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("+.7071067811865"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 );
     aVal <<= (float)( .7071067811865 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "3.14159265359" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("3.14159265359"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 );
     aVal <<= (float)( 3.14159265359 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 );
@@ -489,12 +492,12 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     // ==DOUBLE==
-    aVal <<= OUString::createFromAscii( "-1.7976931348623155e+308" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-1.7976931348623155e+308"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
     aVal <<= (double)( MIN_DOUBLE );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "1.7976931348623155e+308" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("1.7976931348623155e+308"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
     aVal <<= (double)( MAX_DOUBLE );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
@@ -520,12 +523,10 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
     aVal <<= (double)( 0xffffffff );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "0x100000000" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x100000000"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
-#ifndef OS2
     aVal <<= (double)( SAL_CONST_INT64(0x100000000) );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
-#endif
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     aVal <<= (double)( 5 );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 );
@@ -535,20 +536,20 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
     aVal.setValue( &c, ::getCharCppuType() );
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "A" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("A"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     // ==BOOL==
-    aVal <<= OUString::createFromAscii( "0" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "1" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("1"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "False" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("False"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "true" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("true"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
 
@@ -560,17 +561,17 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
     aVal <<= OUString();
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "-" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "-0" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-0"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     // ==TYPECLASS ENUM==
-    aVal <<= OUString::createFromAscii( "eNuM" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("eNuM"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
-    aVal <<= OUString::createFromAscii( "DOUBLE" );
+    aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE"));
     pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     int e = 1;
@@ -600,19 +601,19 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
     Sequence< Any > aAnySeq( 2 ), aAnySeq2( 2 ), aAnySeq3( 2 );
     Any * pAnySeq    = aAnySeq.getArray();
     pAnySeq[0]       = makeAny( aINT32Seq );
-    pAnySeq[1]       = makeAny( OUString::createFromAscii("lala") );
+    pAnySeq[1]       = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("lala")) );
     aVal <<= aAnySeq;
     pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     pAnySeq = aAnySeq2.getArray();
     pAnySeq[0]       <<= (sal_Int32)4711;
-    pAnySeq[1]       <<= OUString::createFromAscii("0815");
+    pAnySeq[1]       <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0815"));
     aVal <<= aAnySeq2;
     pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     pAnySeq = aAnySeq3.getArray();
-    pAnySeq[0]       <<= OUString::createFromAscii("TypeClass_UNION");
-    pAnySeq[1]       <<= OUString::createFromAscii("TypeClass_ENUM");
+    pAnySeq[0]       <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TypeClass_UNION"));
+    pAnySeq[1]       <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TypeClass_ENUM"));
     aVal <<= aAnySeq3;
     pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
@@ -625,7 +626,7 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr )
     printf( "test_Conversion(): start...\n" );
 
     Reference< XTypeConverter > xConverter( xMgr->createInstance(
-        OUString::createFromAscii( "com.sun.star.script.Converter" ) ), UNO_QUERY );
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter")) ), UNO_QUERY );
 
     ConvBlock * pTestBlocks = new ConvBlock[256];
     sal_Int32 nPos = initBlocks( pTestBlocks );
@@ -675,31 +676,33 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr )
 
 SAL_IMPLEMENT_MAIN()
 {
-    Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( OUString::createFromAscii("stoctest.rdb") ) );
+    Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( OUString(RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb")) ) );
 
     try
     {
         Reference< XImplementationRegistration > xImplReg(
-            xMgr->createInstance( OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration") ), UNO_QUERY );
+            xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) ), UNO_QUERY );
         OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
 
         OUString aLibName(
             RTL_CONSTASCII_USTRINGPARAM("stocservices.uno" SAL_DLLEXTENSION) );
         xImplReg->registerImplementation(
-            OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
             aLibName, Reference< XSimpleRegistry >() );
 
         test_Conversion( xMgr );
     }
     catch (Exception & rExc)
     {
-        OSL_ENSURE( sal_False, "### exception occured!" );
+        OSL_FAIL( "### exception occurred!" );
         OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( "### exception occured: " );
-        OSL_TRACE( aMsg.getStr() );
+        OSL_TRACE( "### exception occurred: " );
+        OSL_TRACE( "%s", aMsg.getStr() );
         OSL_TRACE( "\n" );
     }
 
     Reference< XComponent >( xMgr, UNO_QUERY )->dispose();
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 31cc9fc18b8a..d3a5a5d1b153 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,7 +60,6 @@
 #include <stdio.h>
 
 
-using namespace rtl;
 using namespace cppu;
 using namespace osl;
 using namespace ModuleA;
@@ -74,6 +74,10 @@ using namespace com::sun::star::registry;
 using namespace com::sun::star::reflection;
 using namespace com::sun::star::container;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
 
 //==================================================================================================
 class OInterfaceA : public WeakImplHelper1< XInterfaceA >
@@ -105,23 +109,23 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
     Reference< XHierarchicalNameAccess > xHNameAccess( xRefl, UNO_QUERY );
     TEST_ENSHURE(xHNameAccess.is(), "### cannot get XHierarchicalNameAccess!" );
 
-    TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("ModuleA.StructA"))->getName() == OUString::createFromAscii("ModuleA.StructA"), "test_RegCoreReflection(): error 2b");
-    TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("ModuleA.ExceptionB"))->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 2c");
-    TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("ModuleA.ModuleB.EnumA")).is(), "test_RegCoreReflection(): error 2e");
+    TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")))->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")), "test_RegCoreReflection(): error 2b");
+    TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ExceptionB")))->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 2c");
+    TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ModuleB.EnumA"))).is(), "test_RegCoreReflection(): error 2e");
     // const
 
-    TEST_ENSHURE(*(const sal_Bool *)xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstBoolean")).getValue() == aConstBoolean, "test_RegCoreReflection(): error 4c");
-    TEST_ENSHURE(*(const sal_Int8 *)xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstByte")).getValue() == aConstByte, "test_RegCoreReflection(): error 4e");
-    TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstShort")) == aConstShort, "test_RegCoreReflection(): error 4g");
-    TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstUShort")) == aConstUShort, "test_RegCoreReflection(): error 4i");
-    TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstLong")) == aConstLong, "test_RegCoreReflection(): error 4k");
-    TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstULong")) == aConstULong, "test_RegCoreReflection(): error 4m");
-//      TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstFloat")) == aConstFloat, "test_RegCoreReflection(): error 4o");
-//      TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstDouble")) == aConstDouble, "test_RegCoreReflection(): error 4q");
+    TEST_ENSHURE(*(const sal_Bool *)xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstBoolean"))).getValue() == aConstBoolean, "test_RegCoreReflection(): error 4c");
+    TEST_ENSHURE(*(const sal_Int8 *)xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstByte"))).getValue() == aConstByte, "test_RegCoreReflection(): error 4e");
+    TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstShort"))) == aConstShort, "test_RegCoreReflection(): error 4g");
+    TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstUShort"))) == aConstUShort, "test_RegCoreReflection(): error 4i");
+    TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstLong"))) == aConstLong, "test_RegCoreReflection(): error 4k");
+    TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstULong"))) == aConstULong, "test_RegCoreReflection(): error 4m");
+//      TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstFloat"))) == aConstFloat, "test_RegCoreReflection(): error 4o");
+//      TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstDouble"))) == aConstDouble, "test_RegCoreReflection(): error 4q");
 
     // Enums
 
-    xClass = xRefl->forName(OUString::createFromAscii("ModuleA.ModuleB.EnumA"));
+    xClass = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ModuleB.EnumA")));
 
     TEST_ENSHURE(xClass.is(), "test_RegCoreReflection(): error 5");
 
@@ -140,9 +144,9 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
 
     // Interface
 
-    Reference< XIdlClass > xA = xRefl->forName( OUString::createFromAscii("ModuleC.XInterfaceB") );
+    Reference< XIdlClass > xA = xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceB")) );
 
-    xClass = xRefl->forName(OUString::createFromAscii("ModuleC.XInterfaceB"));
+    xClass = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceB")));
 
     TEST_ENSHURE(xClass == xA, "test_RegCoreReflection(): error 7");
     TEST_ENSHURE(xClass.is(), "test_RegCoreReflection(): error 7a");
@@ -158,10 +162,10 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
     typelib_typedescription_release( pTD );
 
     TEST_ENSHURE(xClass->getSuperclasses().getLength() == 1, "test_RegCoreReflection(): error 9");
-    TEST_ENSHURE(xClass->getSuperclasses().getArray()[0]->getName() == OUString::createFromAscii("ModuleC.XInterfaceA"), "test_RegCoreReflection(): error 10");
+    TEST_ENSHURE(xClass->getSuperclasses().getArray()[0]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")), "test_RegCoreReflection(): error 10");
     TEST_ENSHURE(xClass->getMethods().getLength() == 7, "test_RegCoreReflection(): error 11");
     TEST_ENSHURE(xA->getMethods().getLength() == 7, "test_RegCoreReflection(): error 11a");
-    TEST_ENSHURE(xClass->getMethods().getArray()[3]->getName() == OUString::createFromAscii("methodA"), "test_RegCoreReflection(): 12");
+    TEST_ENSHURE(xClass->getMethods().getArray()[3]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("methodA")), "test_RegCoreReflection(): 12");
     TEST_ENSHURE(xClass->getMethods().getArray()[3]->getReturnType()->getTypeClass() == TypeClass_VOID, "test_RegCoreReflection(): error 13");
     TEST_ENSHURE(xClass->getMethods().getArray()[3]->getParameterTypes().getLength() == 0, "test_RegCoreReflection(): error 14");
     TEST_ENSHURE(xClass->getMethods().getArray()[3]->getExceptionTypes().getLength() == 0, "test_RegCoreReflection(): error 15");
@@ -174,44 +178,44 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
     TEST_ENSHURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aType == xRefl->forName( OUString( RTL_CONSTASCII_USTRINGPARAM("short") ) ), "test_RegCoreReflection(): error 18b");
     TEST_ENSHURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aMode == ParamMode_IN, "test_RegCoreReflection(): error 18c");
     TEST_ENSHURE(xClass->getMethods().getArray()[4]->getExceptionTypes().getLength() == 0, "test_RegCoreReflection(): error 19");
-    TEST_ENSHURE(xClass->getMethods().getArray()[5]->getName() == OUString::createFromAscii("methodC"), "test_RegCoreReflection(): error 20");
+    TEST_ENSHURE(xClass->getMethods().getArray()[5]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")), "test_RegCoreReflection(): error 20");
     TEST_ENSHURE(xClass->getMethods().getArray()[5]->getMode() == MethodMode_TWOWAY, "test_RegCoreReflection(): error 20a");
     TEST_ENSHURE(xClass->getMethods().getArray()[5]->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 21");
     TEST_ENSHURE(xClass->getMethods().getArray()[5]->getReturnType()->getComponentType()->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 22");
-    TEST_ENSHURE(xClass->getMethods().getArray()[5]->getReturnType()->getComponentType()->getName() == OUString::createFromAscii("ModuleA.StructB"), "test_RegCoreReflection(): error 23");
+    TEST_ENSHURE(xClass->getMethods().getArray()[5]->getReturnType()->getComponentType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructB")), "test_RegCoreReflection(): error 23");
     TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getLength() == 2, "test_RegCoreReflection(): error 24");
     TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[0]->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 25");
-    TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[0]->getName() == OUString::createFromAscii("ModuleA.StructC"), "test_RegCoreReflection(): error 26");
+    TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[0]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")), "test_RegCoreReflection(): error 26");
     TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[1]->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 27");
-    TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[1]->getName() == OUString::createFromAscii("ModuleA.StructA"), "test_RegCoreReflection(): error 28");
+    TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[1]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")), "test_RegCoreReflection(): error 28");
     TEST_ENSHURE(xClass->getMethods().getArray()[5]->getExceptionTypes().getLength() == 0, "test_RegCoreReflection(): error 29");
-    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getName() == OUString::createFromAscii("methodD"), "test_RegCoreReflection(): error 30");
+    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("methodD")), "test_RegCoreReflection(): error 30");
     TEST_ENSHURE(xClass->getMethods().getArray()[6]->getReturnType()->getTypeClass() == TypeClass_INTERFACE, "test_RegCoreReflection(): error 31");
-    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getReturnType()->getName() == OUString::createFromAscii("ModuleC.XInterfaceA"), "test_RegCoreReflection(): error 32");
+    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getReturnType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")), "test_RegCoreReflection(): error 32");
     TEST_ENSHURE(xClass->getMethods().getArray()[6]->getParameterTypes().getLength() == 1, "test_RegCoreReflection(): error 33");
     TEST_ENSHURE(xClass->getMethods().getArray()[6]->getParameterTypes().getArray()[0]->getTypeClass() == TypeClass_ENUM, "test_RegCoreReflection(): error 34");
-    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getParameterTypes().getArray()[0]->getName() == OUString::createFromAscii("ModuleA.ModuleB.EnumA"), "test_RegCoreReflection(): error 35");
+    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getParameterTypes().getArray()[0]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ModuleB.EnumA")), "test_RegCoreReflection(): error 35");
     TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getLength() == 3, "test_RegCoreReflection(): error 36");
     TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[0]->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 37");
-    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[0]->getName() == OUString::createFromAscii("ModuleA.ExceptionA"), "test_RegCoreReflection(): error 38");
+    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[0]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ExceptionA")), "test_RegCoreReflection(): error 38");
     TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[1]->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 38");
-    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[1]->getName() == OUString::createFromAscii("ModuleA.ExceptionB"), "test_RegCoreReflection(): error 39");
+    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[1]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ExceptionB")), "test_RegCoreReflection(): error 39");
     TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 40");
-    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getName() == OUString::createFromAscii("ModuleA.ExceptionC"), "test_RegCoreReflection(): error 41");
+    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ExceptionC")), "test_RegCoreReflection(): error 41");
     TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getLength() == 3, "test_RegCoreReflection(): error 42");
     TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[0]->getType()->getTypeClass() == TypeClass_BOOLEAN, "test_RegCoreReflection(): error 43");
-    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[0]->getType()->getName() == OUString::createFromAscii("boolean"), "test_RegCoreReflection(): error 43a");
+    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[0]->getType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")), "test_RegCoreReflection(): error 43a");
     TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[1]->getType()->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 44");
-    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[1]->getType()->getName() == OUString::createFromAscii("ModuleA.StructC"), "test_RegCoreReflection(): error 45");
+    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[1]->getType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")), "test_RegCoreReflection(): error 45");
     TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[2]->getType()->getTypeClass() == TypeClass_INTERFACE, "test_RegCoreReflection(): error 46");
-    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[2]->getType()->getName() == OUString::createFromAscii("ModuleA.XInterface1"), "test_RegCoreReflection(): error 47");
+    TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[2]->getType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.XInterface1")), "test_RegCoreReflection(): error 47");
 
     // SequenceReflections
 
-    TEST_ENSHURE(xRefl->forName( OUString::createFromAscii("[]ModuleA.StructA") )->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 48");
-    TEST_ENSHURE(xRefl->forName( OUString::createFromAscii("[]ModuleA.StructA") )->getComponentType().is(), "test_RegCoreReflection(): error 49");
-    TEST_ENSHURE(xRefl->forName( OUString::createFromAscii("[][]ModuleA.StructA") )->getComponentType()->getComponentType()->getName() == OUString::createFromAscii("ModuleA.StructA"), "test_RegCoreReflection(): error 50");
-    TEST_ENSHURE(xRefl->forName( OUString::createFromAscii("[]com.sun.star.uno.XInterface") ) == xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC") ))->getField(OUString::createFromAscii("aInterfaceSeq"))->getType(), "test_RegCoreReflection(): error 51");
+    TEST_ENSHURE(xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA.StructA")) )->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 48");
+    TEST_ENSHURE(xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA.StructA")) )->getComponentType().is(), "test_RegCoreReflection(): error 49");
+    TEST_ENSHURE(xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[][]ModuleA.StructA")) )->getComponentType()->getComponentType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")), "test_RegCoreReflection(): error 50");
+    TEST_ENSHURE(xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]com.sun.star.uno.XInterface")) ) == xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC") ))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aInterfaceSeq")))->getType(), "test_RegCoreReflection(): error 51");
 
     StructC aStructC;
     aStructC.aLong = aConstLong;
@@ -222,7 +226,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
 
     Any aAny;
 
-    xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aInterfaceSeq"))->getType()->createObject(aAny);
+    xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aInterfaceSeq")))->getType()->createObject(aAny);
 
     TEST_ENSHURE(aAny.getValueType() == ::getCppuType( (const Sequence<Reference< XInterface > > *)0 ), "test_RegCoreReflection(): error 51a");
 
@@ -233,33 +237,33 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
 
     TEST_ENSHURE(*(sal_Int32*)xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA") ))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->get(
         Any(&aStructC, ::getCppuType( (const StructC *)0 ))).getValue() == aConstLong, "test_RegCoreReflection(): error 52");
-    TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("ModuleA.StructA"))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->getAccessMode() == FieldAccessMode_READWRITE, "test_RegCoreReflection(): error 52a");
+    TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->getAccessMode() == FieldAccessMode_READWRITE, "test_RegCoreReflection(): error 52a");
     Reference< XIdlField2 > rField ( xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC") ))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") )) , UNO_QUERY );
     rField->set(aStructAny, aAny);
-    TEST_ENSHURE(*(sal_Int32*)xRefl->forName(OUString::createFromAscii("ModuleA.StructB"))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->get(aStructAny).getValue() == *(sal_Int32*)aAny.getValue(), "test_RegCoreReflection(): error 53");
+    TEST_ENSHURE(*(sal_Int32*)xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructB")))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->get(aStructAny).getValue() == *(sal_Int32*)aAny.getValue(), "test_RegCoreReflection(): error 53");
 
-    xRefl->forName( OUString::createFromAscii("[]ModuleA.StructA") )->createObject(aAny);
+    xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA.StructA")) )->createObject(aAny);
 
     TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]ModuleA.StructA")), "test_RegCoreReflection(): error 54");
-    xRefl->forName(OUString::createFromAscii("[][]ModuleA.StructA"))->createObject(aAny);
+    xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("[][]ModuleA.StructA")))->createObject(aAny);
 
     TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("[][]ModuleA.StructA") ), "test_RegCoreReflection(): error 56");
 
 //      xClass = xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.XIntroTest") ));
 
 //      TEST_ENSHURE(xClass.is(), "test_RegCoreReflection(): error 58");
-//      TEST_ENSHURE(xClass->getMethod(OUString::createFromAscii("getStrings"))->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 59");
-//      TEST_ENSHURE(xClass->getMethod(OUString::createFromAscii("getStrings"))->getReturnType()->getComponentType()->getName() == OUString::createFromAscii("string"), "test_RegCoreReflection(): error 60");
+//      TEST_ENSHURE(xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 59");
+//      TEST_ENSHURE(xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->getComponentType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("string")), "test_RegCoreReflection(): error 60");
 
-//      xClass->getMethod(OUString::createFromAscii("getStrings"))->getReturnType()->createObject(aAny);
+//      xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->createObject(aAny);
 //      TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("[]string") ),  "test_RegCoreReflection(): error 61");
 
-    TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("[][][]unsigned long"))->getComponentType()->getComponentType()->getComponentType()->getTypeClass() == TypeClass_UNSIGNED_LONG, "test_RegCoreReflection(): error 62");
+    TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("[][][]unsigned long")))->getComponentType()->getComponentType()->getComponentType()->getTypeClass() == TypeClass_UNSIGNED_LONG, "test_RegCoreReflection(): error 62");
 
     try
     {
         fprintf( stderr, "%1\n" );
-        Any bla = xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->get(Any());
+        Any bla = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString")))->get(Any());
         TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 63");
         return sal_False;
     }
@@ -273,9 +277,9 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
         Any blup;
         blup <<= aStructC;
         Any gulp;
-        rField = Reference< XIdlField2 > ( xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString")) , UNO_QUERY);
+        rField = Reference< XIdlField2 > ( xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString"))) , UNO_QUERY);
         rField->set( blup, gulp);
-//          xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->set(blup, gulp);
+//          xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString")))->set(blup, gulp);
         TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 64");
         return sal_False;
     }
@@ -291,8 +295,8 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
         Any blup;
         blup <<= aStructC;
         rField = Reference< XIdlField2 > (
-            xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString")) , UNO_QUERY);
-        xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->set(blup, gulp);
+            xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString"))) , UNO_QUERY);
+        xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString")))->set(blup, gulp);
         TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 65");
         return sal_False;
     }
@@ -301,10 +305,10 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
     }
 
     Any gulp;
-    gulp <<= OUString(OUString::createFromAscii("Test"));
+    gulp <<= OUString(OUString(RTL_CONSTASCII_USTRINGPARAM("Test")));
     Any blup;
     blup <<= aStructC;
-    xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->set(blup, gulp);
+    xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString")))->set(blup, gulp);
 
     Reference< XInterfaceA > xAI = new OInterfaceA();
 
@@ -315,7 +319,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
 
         Any a;
         a <<= xAI;
-        Any bla = xRefl->forName(OUString::createFromAscii("ModuleC.XInterfaceA"))->getMethod(OUString::createFromAscii("methodC"))->invoke(a, params);
+        Any bla = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")))->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")))->invoke(a, params);
         TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 66");
         return sal_False;
     }
@@ -333,7 +337,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
 
         Any a;
         a <<= xAI;
-        Any bla = xRefl->forName(OUString::createFromAscii("ModuleC.XInterfaceA"))->getMethod(OUString::createFromAscii("methodC"))->invoke(a, params);
+        Any bla = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")))->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")))->invoke(a, params);
     }
     try
     {
@@ -344,7 +348,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
 
         Any a;
         a <<= xAI;
-        Any bla = xRefl->forName(OUString::createFromAscii("ModuleC.XInterfaceA"))->getMethod(OUString::createFromAscii("methodC"))->invoke(a, params);
+        Any bla = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")))->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")))->invoke(a, params);
         TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 67");
         return sal_False;
     }
@@ -359,7 +363,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
 
     Any a;
     a <<= xAI;
-    TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("ModuleC.XInterfaceA"))->getMethod(OUString::createFromAscii("methodC"))->invoke(a, params).getValueType()
+    TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")))->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")))->invoke(a, params).getValueType()
         == ::getCppuType( (const Sequence<StructB> *)0 ), "test_RegCoreReflection(): error 68");
 
     return sal_True;
@@ -399,14 +403,16 @@ SAL_IMPLEMENT_MAIN()
     }
     catch (Exception & rExc)
     {
-        OSL_ENSURE( sal_False, "### exception occured!" );
+        OSL_FAIL( "### exception occurred!" );
         OString aMsg(
             OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( "### exception occured: " );
-        OSL_TRACE( aMsg.getStr() );
+        OSL_TRACE( "### exception occurred: " );
+        OSL_TRACE( "%s", aMsg.getStr() );
         OSL_TRACE( "\n" );
     }
 
     printf( "testcorefl %s !\n", (bSucc ? "succeeded" : "failed") );
     return (bSucc ? 0 : -1);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index 62c9736aa204..9a111ce0aac2 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,7 +50,6 @@
 
 
 using namespace test;
-using namespace rtl;
 using namespace cppu;
 using namespace osl;
 using namespace com::sun::star::uno;
@@ -60,6 +60,10 @@ using namespace com::sun::star::reflection;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+
 
 //==================================================================================================
 sal_Bool equals( const test::TestElement & rData1, const test::TestElement & rData2 )
@@ -112,7 +116,7 @@ sal_Bool equals( const test::TestData & rData1, const test::TestData & rData2 )
         {
             if (! equals( pElements1[nLen], pElements2[nLen] ))
             {
-                OSL_ENSURE( sal_False, "### sequence element did not match!" );
+                OSL_FAIL( "### sequence element did not match!" );
                 return sal_False;
             }
         }
@@ -537,7 +541,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
     }
     catch (Exception &)
     {
-        OSL_ENSURE( sal_False, "### unexpected exception caught!" );
+        OSL_FAIL( "### unexpected exception caught!" );
         throw;
     }
 
@@ -763,7 +767,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
                 sal_True, '@', 17, 0x1234, 0xfedc, 0x12345678, 0xfedcba98,
                 SAL_CONST_INT64(0x123456789abcdef0),
                 SAL_CONST_UINT64(0xfedcba9876543210),
-                (float)17.0815, 3.1415926359, TestEnum_LOLA, OUString::createFromAscii("dumdidum"), xI,
+                (float)17.0815, 3.1415926359, TestEnum_LOLA, OUString(RTL_CONSTASCII_USTRINGPARAM("dumdidum")), xI,
                 Any( &xI, ::getCppuType( (const Reference<XInterface > *)0 ) ) );
 
         OSL_ENSURE( aData.Any == xI, "### unexpected any!" );
@@ -866,7 +870,7 @@ test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cC
 {
     IllegalArgumentException aExc;
     aExc.ArgumentPosition = 5;
-    aExc.Message          = OUString::createFromAscii("dum dum dum ich tanz im kreis herum...");
+    aExc.Message          = OUString(RTL_CONSTASCII_USTRINGPARAM("dum dum dum ich tanz im kreis herum..."));
     aExc.Context          = *this;
     throw aExc;
 }
@@ -874,7 +878,7 @@ test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cC
 sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeException)
 {
     RuntimeException aExc;
-    aExc.Message          = OUString::createFromAscii("dum dum dum ich tanz im kreis herum...");
+    aExc.Message          = OUString(RTL_CONSTASCII_USTRINGPARAM("dum dum dum ich tanz im kreis herum..."));
     aExc.Context          = *this;
     throw aExc;
 }
@@ -882,7 +886,7 @@ sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeE
 void Test_Impl::setRuntimeException( sal_Int32 /*_runtimeexception*/ ) throw(::com::sun::star::uno::RuntimeException)
 {
     RuntimeException aExc;
-    aExc.Message          = OUString::createFromAscii("dum dum dum ich tanz im kreis herum...");
+    aExc.Message          = OUString(RTL_CONSTASCII_USTRINGPARAM("dum dum dum ich tanz im kreis herum..."));
     aExc.Context          = *this;
     throw aExc;
 }
@@ -951,7 +955,7 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT )
 static sal_Bool test_adapter( const Reference< XMultiServiceFactory > & xMgr )
 {
     Reference< XInvocationAdapterFactory > xAdapFac(
-        xMgr->createInstance( OUString::createFromAscii("com.sun.star.script.InvocationAdapterFactory") ), UNO_QUERY );
+        xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.InvocationAdapterFactory")) ), UNO_QUERY );
     Reference< XInvocationAdapterFactory2 > xAdapFac2( xAdapFac, UNO_QUERY_THROW );
 
     Reference< XLanguageBindingTest > xOriginal( (XLanguageBindingTest *)new Test_Impl() );
@@ -996,9 +1000,9 @@ static sal_Bool test_adapter( const Reference< XMultiServiceFactory > & xMgr )
 static sal_Bool test_invocation( const Reference< XMultiServiceFactory > & xMgr )
 {
     Reference< XInvocationAdapterFactory > xAdapFac(
-        xMgr->createInstance( OUString::createFromAscii("com.sun.star.script.InvocationAdapterFactory") ), UNO_QUERY );
+        xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.InvocationAdapterFactory")) ), UNO_QUERY );
     Reference< XSingleServiceFactory > xInvocFac(
-        xMgr->createInstance( OUString::createFromAscii("com.sun.star.script.Invocation") ), UNO_QUERY );
+        xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Invocation")) ), UNO_QUERY );
 
     Reference< XLanguageBindingTest > xOriginal( (XLanguageBindingTest *)new Test_Impl() );
     Any aOriginal( &xOriginal, ::getCppuType( &xOriginal ) );
@@ -1027,24 +1031,24 @@ SAL_IMPLEMENT_MAIN()
         OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
 
         xImplReg->registerImplementation(
-            OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
-            OUString::createFromAscii("invocadapt.uno" SAL_DLLEXTENSION),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invocadapt.uno" SAL_DLLEXTENSION)),
             Reference< XSimpleRegistry >() );
         xImplReg->registerImplementation(
-            OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
-            OUString::createFromAscii("stocservices.uno" SAL_DLLEXTENSION),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("stocservices.uno" SAL_DLLEXTENSION)),
             Reference< XSimpleRegistry >() );
         xImplReg->registerImplementation(
-            OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
-            OUString::createFromAscii("invocation.uno" SAL_DLLEXTENSION),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invocation.uno" SAL_DLLEXTENSION)),
             Reference< XSimpleRegistry >() );
         xImplReg->registerImplementation(
-            OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
-            OUString::createFromAscii("reflection.uno" SAL_DLLEXTENSION),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("reflection.uno" SAL_DLLEXTENSION)),
             Reference< XSimpleRegistry >() );
         xImplReg->registerImplementation(
-            OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
-            OUString::createFromAscii("introspection.uno" SAL_DLLEXTENSION),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("introspection.uno" SAL_DLLEXTENSION)),
             Reference< XSimpleRegistry >() );
 
         if (test_adapter( xMgr ))
@@ -1058,7 +1062,7 @@ SAL_IMPLEMENT_MAIN()
     }
     catch (Exception & rExc)
     {
-        fprintf( stderr, "> exception occured: " );
+        fprintf( stderr, "> exception occurred: " );
         OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
         fprintf( stderr, "%s\n", aMsg.getStr() );
     }
@@ -1067,3 +1071,5 @@ SAL_IMPLEMENT_MAIN()
 
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index a706f8666fee..692a7c1113dd 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,8 +35,6 @@
 #include <cppuhelper/servicefactory.hxx>
 #include <osl/diagnose.h>
 
-//#include <vos/dynload.hxx>
-
 #include <ModuleA/XIntroTest.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XIntrospection.hpp>
@@ -48,21 +47,14 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/reflection/XIdlReflection.hpp>
-//#include <com/sun/star/registry/XSimpleRegistry.hpp>
 #include <com/sun/star/registry/XImplementationRegistration.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 
 #include <stdio.h>
 #include <string.h>
 
-
-using namespace rtl;
 using namespace cppu;
-//using namespace vos;
 using namespace ModuleA;
-//using namespace ModuleB;
-//using namespace ModuleC;
-//using namespace ModuleA::ModuleB;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -71,6 +63,11 @@ using namespace com::sun::star::reflection;
 using namespace com::sun::star::container;
 using namespace com::sun::star::beans::PropertyAttribute;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+
 
 typedef WeakImplHelper4< XIntroTest, XPropertySet, XNameAccess, XIndexAccess > ImplIntroTestHelper;
 typedef WeakImplHelper1< XPropertySetInfo > ImplPropertySetInfoHelper;
@@ -85,10 +82,6 @@ typedef WeakImplHelper1< XPropertySetInfo > ImplPropertySetInfoHelper;
 #define TEST_ENSHURE(c, m)   OSL_VERIFY(c)
 #endif
 
-//class IntroTestWritelnOutput;
-
-
-
 //**************************************************************
 //*** Hilfs-Funktion, um vom Type eine XIdlClass zu bekommen ***
 //**************************************************************
@@ -106,7 +99,7 @@ Reference<XIdlClass> TypeToIdlClass( const Type& rType, const Reference< XMultiS
         if( !xRefl.is() )
         {
             xRefl = Reference< XIdlReflection >( xMgr->createInstance(
-                OUString::createFromAscii("com.sun.star.reflection.CoreReflection") ), UNO_QUERY );
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")) ), UNO_QUERY );
             OSL_ENSURE( xRefl.is(), "### no corereflection!" );
         }
         xRetClass = xRefl->forName( sOWName );
@@ -130,32 +123,28 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference<
     OUString aRetStr;
     switch( eType )
     {
-        case TypeClass_TYPE:            aRetStr = OUString::createFromAscii("TYPE TYPE");               break;
-        case TypeClass_INTERFACE:       aRetStr = OUString::createFromAscii("TYPE INTERFACE");      break;
-        case TypeClass_SERVICE:         aRetStr = OUString::createFromAscii("TYPE SERVICE");            break;
-        case TypeClass_STRUCT:          aRetStr = OUString::createFromAscii("TYPE STRUCT");         break;
-        case TypeClass_TYPEDEF:         aRetStr = OUString::createFromAscii("TYPE TYPEDEF");            break;
-        case TypeClass_UNION:           aRetStr = OUString::createFromAscii("TYPE UNION");          break;
-        case TypeClass_ENUM:            aRetStr = OUString::createFromAscii("TYPE ENUM");               break;
-        case TypeClass_EXCEPTION:       aRetStr = OUString::createFromAscii("TYPE EXCEPTION");      break;
-        case TypeClass_ARRAY:           aRetStr = OUString::createFromAscii("TYPE ARRAY");          break;
-        case TypeClass_SEQUENCE:        aRetStr = OUString::createFromAscii("TYPE SEQUENCE");           break;
-        case TypeClass_VOID:            aRetStr = OUString::createFromAscii("TYPE void");               break;
-        case TypeClass_ANY:             aRetStr = OUString::createFromAscii("TYPE any");                break;
-        case TypeClass_UNKNOWN:         aRetStr = OUString::createFromAscii("TYPE unknown");            break;
+        case TypeClass_TYPE:            aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE TYPE"));               break;
+        case TypeClass_INTERFACE:       aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE INTERFACE"));      break;
+        case TypeClass_SERVICE:         aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE SERVICE"));            break;
+        case TypeClass_STRUCT:          aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE STRUCT"));         break;
+        case TypeClass_TYPEDEF:         aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE TYPEDEF"));            break;
+        case TypeClass_UNION:           aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE UNION"));          break;
+        case TypeClass_ENUM:            aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE ENUM"));               break;
+        case TypeClass_EXCEPTION:       aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE EXCEPTION"));      break;
+        case TypeClass_ARRAY:           aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE ARRAY"));          break;
+        case TypeClass_SEQUENCE:        aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE SEQUENCE"));           break;
+        case TypeClass_VOID:            aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE void"));               break;
+        case TypeClass_ANY:             aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE any"));                break;
+        case TypeClass_UNKNOWN:         aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE unknown"));            break;
         case TypeClass_BOOLEAN:
         {
             sal_Bool b = *(sal_Bool*)aValue.getValue();
-            //aRet.setValue( &b, getCppuBooleanType() );
-            //aValue >>= b;
             aRetStr = OUString::valueOf( b );
             break;
         }
         case TypeClass_CHAR:
         {
             sal_Unicode c = *(sal_Unicode*)aValue.getValue();
-            //aValue >>= c;
-            //getCppuCharType()
             aRetStr = OUString::valueOf( c );
             break;
         }
@@ -201,76 +190,17 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference<
             aRetStr = OUString::valueOf( n );
             break;
         }
-        /*
-        case TypeClass_HYPER:
-        {
-            aRetStr = L"TYPE HYPER";
-            break;
-        }
-        case TypeClass_UNSIGNED_SHORT:
-        {
-            aRetStr = StringToUString(WSString(aValue.getUINT16()), CHARSET_SYSTEM);
-            break;
-        }
-        case TypeClass_UNSIGNED_LONG:
-        {
-            aRetStr = StringToUString(WSString(aValue.getUINT32()), CHARSET_SYSTEM);
-            break;
-        }
-        case TypeClass_UNSIGNED_HYPER:
-        {
-            aRetStr = L"TYPE UNSIGNED_HYPER";
-            break;
-        }
-        */
     default: ;
     }
 
     if( bIncludeType )
     {
         Reference< XIdlClass > xIdlClass = TypeToIdlClass( aValType, xMgr );
-        aRetStr = aRetStr + OUString( OUString::createFromAscii(" (Typ: ") ) + xIdlClass->getName() + OUString::createFromAscii(")");
+        aRetStr = aRetStr + OUString( OUString(RTL_CONSTASCII_USTRINGPARAM(" (Typ: ")) ) + xIdlClass->getName() + OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
     }
     return aRetStr;
 }
 
-/*
-// Hilfs-Funktion, um ein UString in einen Any zu konvertieren
-UsrAny StringToAny( UString aStr, TypeClass eTargetType )
-{
-    UsrAny aRetAny;
-    switch( eTargetType )
-    {
-        case TypeClass_INTERFACE:       break;
-        case TypeClass_SERVICE:         break;
-        case TypeClass_STRUCT:          break;
-        case TypeClass_TYPEDEF:         break;
-        case TypeClass_UNION:           break;
-        case TypeClass_ENUM:            break;
-        case TypeClass_EXCEPTION:       break;
-        case TypeClass_ARRAY:           break;
-        case TypeClass_SEQUENCE:        break;
-        case TypeClass_VOID:            break;
-        case TypeClass_ANY:             break;
-        case TypeClass_UNKNOWN:         break;
-        case TypeClass_BOOLEAN:         aRetAny.setBOOL( short(aStr)!=0 );  break;
-        case TypeClass_CHAR:            aRetAny.setChar( char(aStr) );      break;
-        case TypeClass_STRING:          aRetAny.setString( aStr );          break;
-        case TypeClass_FLOAT:           aRetAny.setFloat( (float)strtod( aStr.GetStr(), NULL ) );   break;
-        case TypeClass_DOUBLE:          aRetAny.setDouble( strtod( aStr.GetStr(), NULL ) ); break;
-        case TypeClass_BYTE:            aRetAny.setBYTE( BYTE(short(aStr)) );   break;
-        case TypeClass_SHORT:           aRetAny.setINT16( short(aStr) );    break;
-        case TypeClass_LONG:            aRetAny.setINT32( long(aStr) );     break;
-        case TypeClass_HYPER:           break;
-        case TypeClass_UNSIGNED_SHORT:  aRetAny.setUINT16( USHORT(aStr) );  break;
-        case TypeClass_UNSIGNED_LONG:   aRetAny.setUINT32( ULONG(aStr) );   break;
-        case TypeClass_UNSIGNED_HYPER:  break;
-    }
-    return aRetAny;
-}
-*/
-
-
 //*****************************************
 //*** XPropertySetInfo fuer Test-Klasse ***
 //*****************************************
@@ -284,15 +214,6 @@ class ImplPropertySetInfo : public ImplPropertySetInfoHelper
 public:
     ImplPropertySetInfo( const Reference< XMultiServiceFactory > & xMgr )
         : mxMgr( xMgr ) {}
-        //: mxMgr( xMgr ), ImplPropertySetInfoHelper( xMgr ) {}
-
-/*
-    // Methoden von XInterface
-    virtual sal_Bool    SAL_CALL queryInterface( const Uik & rUik, Any & ifc ) throw( RuntimeException );
-    virtual void        SAL_CALL acquire() throw() { OWeakObject::acquire(); }
-    virtual void        SAL_CALL release() throw() { OWeakObject::release(); }
-    //ALT: sal_Bool queryInterface( Uik aUik, Reference<XInterface> & rOut );
-*/
 
     // Methods of XPropertySetInfo
     virtual Sequence< Property > SAL_CALL getProperties(  )
@@ -301,35 +222,9 @@ public:
         throw(UnknownPropertyException, RuntimeException);
     virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
         throw(RuntimeException);
-    //virtual Sequence< Property > SAL_CALL getProperties(void) throw( RuntimeException );
-    //virtual Property SAL_CALL getPropertyByName(const OUString& Name) throw( RuntimeException );
-    //virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& Name) throw( RuntimeException );
 };
 
 
-/*
-// Methoden von XInterface
-sal_Bool SAL_CALL ImplPropertySetInfo::queryInterface( const Uik & rUik, Any & ifc )
-    throw( RuntimeException )
-{
-    // PropertySet-Implementation
-    if( com::sun::star::uno::queryInterface( rUik, ifc,
-                                             SAL_STATIC_CAST(XPropertySetInfo*, this) ) )
-        return sal_True;
-
-    return OWeakObject::queryInterface( rUik, ifc );
-}
-
-sal_Bool ImplPropertySetInfo::queryInterface( Uik aUik, Reference<XInterface> & rOut )
-{
-    if( aUik == XPropertySetInfo::getSmartUik() )
-        rOut = (XPropertySetInfo *)this;
-    else
-        UsrObject::queryInterface( aUik, rOut );
-    return rOut.is();
-}
-*/
-
 Sequence< Property > ImplPropertySetInfo::getProperties(void)
     throw( RuntimeException )
 {
@@ -341,25 +236,19 @@ Sequence< Property > ImplPropertySetInfo::getProperties(void)
         pSeq = new Sequence<Property>( 3 );
         Property * pAry = pSeq->getArray();
 
-        pAry[0].Name = OUString::createFromAscii("Factor");
+        pAry[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Factor"));
         pAry[0].Handle = -1;
         pAry[0].Type = getCppuType( (double*) NULL );
-        //pAry[0].Type = TypeToIdlClass( getCppuType( (double*) NULL ), mxMgr );
-        //pAry[0].Type = Double_getReflection()->getIdlClass();
         pAry[0].Attributes = BOUND | TRANSIENT;
 
-        pAry[1].Name = OUString::createFromAscii("MyCount");
+        pAry[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("MyCount"));
         pAry[1].Handle = -1;
         pAry[1].Type = getCppuType( (sal_Int32*) NULL );
-        //pAry[1].Type = TypeToIdlClass( getCppuType( (sal_Int32*) NULL ), mxMgr );
-        //pAry[1].Type = INT32_getReflection()->getIdlClass();
         pAry[1].Attributes = BOUND | TRANSIENT;
 
-        pAry[2].Name = OUString::createFromAscii("Info");
+        pAry[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Info"));
         pAry[2].Handle = -1;
         pAry[2].Type = getCppuType( (OUString*) NULL );
-        //pAry[2].Type = TypeToIdlClass( getCppuType( (OUString*) NULL ), mxMgr );
-        //pAry[2].Type = OUString_getReflection()->getIdlClass();
         pAry[2].Attributes = TRANSIENT;
     }
     // Die Information �ber alle drei Properties liefern.
@@ -396,13 +285,7 @@ sal_Bool ImplPropertySetInfo::hasPropertyByName(const OUString& Name)
     return sal_False;
 }
 
-
-
-
 //*****************************************************************
-
-
-
 class ImplIntroTest : public ImplIntroTestHelper
 {
       Reference< XMultiServiceFactory > mxMgr;
@@ -412,9 +295,6 @@ class ImplIntroTest : public ImplIntroTestHelper
     // Properties fuer das PropertySet
     Any aAnyArray[10];
 
-    // Optionale Schnittstelle fuer die writeln-Ausgabe
-    //IntroTestWritelnOutput* m_pOutput;
-
     Reference< XPropertySetInfo > m_xMyInfo;
 
     OUString m_ObjectName;
@@ -454,24 +334,10 @@ class ImplIntroTest : public ImplIntroTestHelper
 public:
     ImplIntroTest( const Reference< XMultiServiceFactory > & xMgr )
         : mxMgr( xMgr )
-        //: mxMgr( xMgr ), ImplIntroTestHelper( xMgr )
     {
         Init();
     }
 
-    /*
-    ImplIntroTest( IntroTestWritelnOutput* pOutput_ )
-    {
-        Init();
-        m_pOutput = pOutput_;
-    }
-    */
-
-    //SMART_UNO_DECLARATION(ImplIntroTest,UsrObject);
-
-    //BOOL queryInterface( Uik aUik, Reference< XInterface > & rOut );
-    //Reference< XIdlClass > getIdlClass();
-
     // Trotz virtual inline, um Schreibarbeit zu sparen (nur fuer Testzwecke)
     // XPropertySet
     virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
@@ -493,19 +359,6 @@ public:
         throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
             {}
 
-    /*
-    virtual void setIndexedPropertyValue(const OUString& aPropertyName, INT32 nIndex, const Any& aValue) {}
-    virtual Any getIndexedPropertyValue(const UString& aPropertyName, INT32 nIndex) const { return Any(); }
-    virtual void addPropertyChangeListener(const UString& aPropertyName, const XPropertyChangeListenerRef& aListener)
-        THROWS( (UnknownPropertyException, WrappedTargetException, UsrSystemException) ) {}
-    virtual void removePropertyChangeListener(const UString& aPropertyName, const XPropertyChangeListenerRef& aListener)
-        THROWS( (UnknownPropertyException, WrappedTargetException, UsrSystemException) ) {}
-    virtual void addVetoableChangeListener(const UString& aPropertyName, const XVetoableChangeListenerRef& aListener)
-        THROWS( (UnknownPropertyException, WrappedTargetException, UsrSystemException) ) {}
-    virtual void removeVetoableChangeListener(const UString& aPropertyName, const XVetoableChangeListenerRef& aListener)
-        THROWS( (UnknownPropertyException, WrappedTargetException, UsrSystemException) ) {}
-        */
-
     // XIntroTest-Methoden
     // Attributes
     virtual OUString SAL_CALL getObjectName() throw(RuntimeException)
@@ -515,7 +368,7 @@ public:
     virtual OUString SAL_CALL getFirstName()
         throw(RuntimeException);
     virtual OUString SAL_CALL getLastName() throw(RuntimeException)
-        { return OUString( OUString::createFromAscii("Meyer") ); }
+        { return OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("Meyer")) ); }
     virtual sal_Int16 SAL_CALL getAge() throw(RuntimeException)
         { return m_nMarkusAge; }
     virtual sal_Int16 SAL_CALL getChildrenCount() throw(RuntimeException)
@@ -578,8 +431,6 @@ public:
         throw(RuntimeException);
     virtual sal_Bool SAL_CALL hasElements(  )
         throw(RuntimeException);
-    //virtual XIdlClassRef getElementType(void) constTHROWS( (UsrSystemException) );
-    //virtual BOOL hasElements(void) const THROWS( (UsrSystemException) );
 
     // XNameAccess-Methoden
     // Methods
@@ -589,10 +440,6 @@ public:
         throw(RuntimeException);
     virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
         throw(RuntimeException);
-    //virtual Any getByName(const UString& Name) const
-        //THROWS( (NoSuchElementException, WrappedTargetException, UsrSystemException) );
-    //virtual Sequence<UString> getElementNames(void) const THROWS( (UsrSystemException) );
-    //virtual BOOL hasByName(const UString& Name) const THROWS( (UsrSystemException) );
 
     // XIndexAccess-Methoden
     // Methods
@@ -600,28 +447,20 @@ public:
         throw(RuntimeException);
     virtual Any SAL_CALL getByIndex( sal_Int32 Index )
         throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException);
-    //virtual INT32 getCount(void) const THROWS( (UsrSystemException) );
-    //virtual Any getByIndex(INT32 Index) const
-        //THROWS( (IndexOutOfBoundsException, WrappedTargetException, UsrSystemException) );
 };
 
-//SMART_UNO_IMPLEMENTATION(ImplIntroTest,UsrObject)
-
 void ImplIntroTest::Init( void )
 {
     // Eindeutigen Namen verpassen
     static sal_Int32 nObjCount = 0;
-    OUString aName( OUString::createFromAscii("IntroTest-Obj Nr. ") );
+    OUString aName( RTL_CONSTASCII_USTRINGPARAM("IntroTest-Obj Nr. ") );
     aName += OUString::valueOf( nObjCount );
     setObjectName( aName );
 
     // Properties initialisieren
     aAnyArray[0] <<= 3.14;
     aAnyArray[1] <<= (sal_Int32)42;
-    aAnyArray[2] <<= OUString( OUString::createFromAscii("Hallo") );
-
-    // Output-Interface
-    //m_pOutput = NULL;
+    aAnyArray[2] <<= OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")) );
 
     // Einmal fuer den internen Gebrauch die PropertySetInfo abholen
     m_xMyInfo = getPropertySetInfo();
@@ -640,12 +479,12 @@ void ImplIntroTest::Init( void )
     // String-Sequence intitialisieren
     aStringSeq.realloc( 3 );
     OUString* pStr = aStringSeq.getArray();
-    pStr[ 0 ] = OUString( OUString::createFromAscii("String 0") );
-    pStr[ 1 ] = OUString( OUString::createFromAscii("String 1") );
-    pStr[ 2 ] = OUString( OUString::createFromAscii("String 2") );
+    pStr[ 0 ] = OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("String 0")) );
+    pStr[ 1 ] = OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("String 1")) );
+    pStr[ 2 ] = OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("String 2")) );
 
     // structs initialisieren
-    m_aFirstStruct.Name = OUString::createFromAscii("FirstStruct-Name");
+    m_aFirstStruct.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("FirstStruct-Name"));
     m_aFirstStruct.Handle = 77777;
     //XIdlClassRef Type;
     m_aFirstStruct.Attributes = -222;
@@ -663,36 +502,6 @@ void ImplIntroTest::Init( void )
     pNameAccessTab = NULL;
 }
 
-/*
-BOOL ImplIntroTest::queryInterface( Uik aUik, XInterfaceRef & rOut )
-{
-    if( aUik == XIntroTest::getSmartUik() )
-        rOut = (XIntroTest*)this;
-    else if( aUik == XPropertySet::getSmartUik() )
-        rOut = (XPropertySet*)this;
-    else if( aUik == XNameAccess::getSmartUik() )
-        rOut = (XNameAccess*)this;
-    else if( aUik == XIndexAccess::getSmartUik() )
-        rOut = (XIndexAccess*)this;
-    else if( aUik == ((XElementAccess*)NULL)->getSmartUik() )
-        rOut = (XElementAccess*)(XIndexAccess *)this;
-    else
-        UsrObject::queryInterface( aUik, rOut );
-    return rOut.is();
-}
-
-XIdlClassRef ImplIntroTest::getIdlClass()
-{
-    static XIdlClassRef xClass = createStandardClass( L"ImplIntroTest",
-        UsrObject::getUsrObjectIdlClass(), 4,
-            XIntroTest_getReflection(),
-            XPropertySet_getReflection(),
-            XNameAccess_getReflection(),
-            XIndexAccess_getReflection() );
-    return xClass;
-}
-*/
-
 Reference< XPropertySetInfo > ImplIntroTest::getPropertySetInfo()
     throw(RuntimeException)
 {
@@ -700,16 +509,10 @@ Reference< XPropertySetInfo > ImplIntroTest::getPropertySetInfo()
     // Alle Objekt haben die gleichen Properties, deshalb kann
     // die Info f�r alle gleich sein
     return &aInfo;
-
-    //if( m_xMyInfo == NULL )
-    //  ((ImplIntroTest*)this)->m_xMyInfo = new ImplPropertySetInfo( this );
-    //return m_xMyInfo;
 }
 
 void ImplIntroTest::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
     throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
-//void ImplIntroTest::setPropertyValue( const UString& aPropertyName, const Any& aValue )
-//  THROWS( (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, UsrSystemException) )
 {
     if( aPropChangeListener.is() && aPropertyName == aPropChangeListenerStr )
     {
@@ -717,9 +520,6 @@ void ImplIntroTest::setPropertyValue( const OUString& aPropertyName, const Any&
         aEvt.Source = (OWeakObject*)this;
         aEvt.PropertyName = aPropertyName;
         aEvt.PropertyHandle = 0L;
-        //aEvt.OldValue;
-        //aEvt.NewValue;
-        //aEvt.PropagationId;
         aPropChangeListener->propertyChange( aEvt );
     }
     if( aVetoPropChangeListener.is() && aPropertyName == aVetoPropChangeListenerStr )
@@ -728,9 +528,6 @@ void ImplIntroTest::setPropertyValue( const OUString& aPropertyName, const Any&
         aEvt.Source = (OWeakObject*)this;
         aEvt.PropertyName = aVetoPropChangeListenerStr;
         aEvt.PropertyHandle = 0L;
-        //aEvt.OldValue;
-        //aEvt.NewValue;
-        //aEvt.PropagationId;
         aVetoPropChangeListener->vetoableChange( aEvt );
     }
 
@@ -746,8 +543,6 @@ void ImplIntroTest::setPropertyValue( const OUString& aPropertyName, const Any&
 
 Any ImplIntroTest::getPropertyValue( const OUString& PropertyName )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
-//Any ImplIntroTest::getPropertyValue(const UString& aPropertyName) const
-    //THROWS( (UnknownPropertyException, WrappedTargetException, UsrSystemException) )
 {
     Sequence<Property> aPropSeq = m_xMyInfo->getProperties();
     sal_Int32 nLen = aPropSeq.getLength();
@@ -763,7 +558,7 @@ Any ImplIntroTest::getPropertyValue( const OUString& PropertyName )
 OUString ImplIntroTest::getFirstName(void)
     throw(RuntimeException)
 {
-    return OUString( OUString::createFromAscii("Markus") );
+    return OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("Markus")) );
 }
 
 void ImplIntroTest::writeln( const OUString& Text )
@@ -771,21 +566,11 @@ void ImplIntroTest::writeln( const OUString& Text )
 {
     OString aStr( Text.getStr(), Text.getLength(), RTL_TEXTENCODING_ASCII_US );
 
-    // Haben wir ein Output?
-    //if( m_pOutput )
-    //{
-        //m_pOutput->doWriteln( TextStr );
-    //}
-    // Sonst einfach rausbraten
-    //else
-    {
-        printf( "%s", aStr.getStr() );
-    }
+    printf( "%s", aStr.getStr() );
 }
 
 Reference< XIntroTest > ImplIntroTest::getIntroTest()
     throw(RuntimeException)
-//XIntroTestRef ImplIntroTest::getIntroTest(void) THROWS( (UsrSystemException) )
 {
     if( !m_xIntroTest.is() )
         m_xIntroTest = new ImplIntroTest( mxMgr );
@@ -795,7 +580,6 @@ Reference< XIntroTest > ImplIntroTest::getIntroTest()
 // Methoden von XElementAccess
 Type ImplIntroTest::getElementType(  )
     throw(RuntimeException)
-//XIdlClassRef ImplIntroTest::getElementType(void) const THROWS( (UsrSystemException) )
 {
     // TODO
     Type aRetType;
@@ -806,7 +590,6 @@ Type ImplIntroTest::getElementType(  )
 
 sal_Bool ImplIntroTest::hasElements(  )
     throw(RuntimeException)
-//BOOL ImplIntroTest::hasElements(void) const THROWS( (UsrSystemException) )
 {
     return sal_True;
 }
@@ -815,7 +598,7 @@ sal_Bool ImplIntroTest::hasElements(  )
 sal_Int32 getIndexForName( const OUString& ItemName )
 {
     OUString aLeftStr = ItemName.copy( 0, 4 );
-    if( aLeftStr == OUString::createFromAscii("Item") )
+    if( aLeftStr == OUString(RTL_CONSTASCII_USTRINGPARAM("Item")) )
     {
         // TODO
         OUString aNumStr = ItemName.copy( 4 );
@@ -829,8 +612,6 @@ sal_Int32 getIndexForName( const OUString& ItemName )
 
 Any ImplIntroTest::getByName( const OUString& aName )
     throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-//Any ImplIntroTest::getByName(const UString& Name) const
-    //THROWS( (NoSuchElementException, WrappedTargetException, UsrSystemException) )
 {
     Any aRetAny;
 
@@ -843,33 +624,27 @@ Any ImplIntroTest::getByName( const OUString& aName )
         if( !pNameAccessTab[iIndex].is() )
         {
             ImplIntroTest* p = new ImplIntroTest( mxMgr );
-            OUString aName2( OUString::createFromAscii("IntroTest by Name-Access, Index = ") );
+            OUString aName2( RTL_CONSTASCII_USTRINGPARAM("IntroTest by Name-Access, Index = ") );
             aName2 += OUString::valueOf( iIndex );
-            //aName2 = aName2 + StringToUString( String( iIndex ), CHARSET_SYSTEM );
             p->setObjectName( aName2 );
             pNameAccessTab[iIndex] = p;
         }
 
         Reference< XIntroTest > xRet = pNameAccessTab[iIndex];
         aRetAny = makeAny( xRet );
-
-        //aRetAny.set( &xRet, XIntroTest_getReflection() );
-        //return (UsrObject*)(XIntroTest*)pNameAccessTab[iIndex];
     }
     return aRetAny;
 }
 
 Sequence< OUString > ImplIntroTest::getElementNames(  )
     throw(RuntimeException)
-//Sequence<UString> ImplIntroTest::getElementNames(void) const THROWS( (UsrSystemException) )
 {
     Sequence<OUString> aStrSeq( DEFAULT_NAME_ACCESS_COUNT );
     OUString* pStr = aStrSeq.getArray();
     for( sal_Int32 i = 0 ; i < DEFAULT_NAME_ACCESS_COUNT ; i++ )
     {
-        OUString aName( OUString::createFromAscii("Item") );
+        OUString aName( RTL_CONSTASCII_USTRINGPARAM("Item") );
         aName += OUString::valueOf( i );
-        //aName = aName + StringToUString( i, CHARSET_SYSTEM );
         pStr[i] = aName;
     }
     return aStrSeq;
@@ -877,7 +652,6 @@ Sequence< OUString > ImplIntroTest::getElementNames(  )
 
 sal_Bool ImplIntroTest::hasByName( const OUString& aName )
     throw(RuntimeException)
-//BOOL ImplIntroTest::hasByName(const UString& Name) const THROWS( (UsrSystemException) )
 {
     return ( getIndexForName( aName ) != -1 );
 }
@@ -885,15 +659,12 @@ sal_Bool ImplIntroTest::hasByName( const OUString& aName )
 // XIndexAccess-Methoden
 sal_Int32 ImplIntroTest::getCount(  )
     throw(RuntimeException)
-//sal_Int32 ImplIntroTest::getCount(void) const THROWS( (UsrSystemException) )
 {
     return iIndexAccessCount;
 }
 
 Any ImplIntroTest::getByIndex( sal_Int32 Index )
     throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
-//Any ImplIntroTest::getByIndex( sal_Int32 Index ) const
-    //THROWS( (IndexOutOfBoundsException, WrappedTargetException, UsrSystemException) )
 {
     Any aRetAny;
 
@@ -905,9 +676,8 @@ Any ImplIntroTest::getByIndex( sal_Int32 Index )
         if( !pNameAccessTab[Index].is() )
         {
             ImplIntroTest* p = new ImplIntroTest( mxMgr );
-            OUString aName( OUString::createFromAscii("IntroTest by Index-Access, Index = ") );
+            OUString aName( RTL_CONSTASCII_USTRINGPARAM("IntroTest by Index-Access, Index = ") );
             aName += OUString::valueOf( Index );
-            //aName = aName + StringToUString( String( iIndex ), CHARSET_SYSTEM );
             p->setObjectName( aName );
             pIndexAccessTab[Index] = p;
         }
@@ -920,17 +690,12 @@ Any ImplIntroTest::getByIndex( sal_Int32 Index )
 void ImplIntroTest::addPropertiesChangeListener( const Sequence< OUString >& /*PropertyNames*/,
                                                  const Reference< XPropertiesChangeListener >& /*Listener*/ )
         throw(RuntimeException)
-//void ImplIntroTest::addPropertiesChangeListener
-//(const Sequence< UString >& PropertyNames, const XPropertiesChangeListenerRef& Listener)
-    //THROWS( (UsrSystemException) )
 {
 }
 
 void ImplIntroTest::removePropertiesChangeListener
 ( const Reference< XPropertiesChangeListener >& /*Listener*/ )
         throw(RuntimeException)
-//void ImplIntroTest::removePropertiesChangeListener(const XPropertiesChangeListenerRef& Listener)
-    //THROWS( (UsrSystemException) )
 {
 }
 
@@ -986,34 +751,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
         { NULL, 0 }
     };
 
-    // Tabelle der Property-Namen, die gefunden werden muessen
-//  char* pDemandedPropNames[] =
-//  {
-//      "Factor",
-//      "MyCount",
-//      "Info",
-//      "ObjectName",
-//      "FirstName",
-//      "LastName",
-//      "Age",
-//      "ChildrenCount",
-//      "FirstStruct",
-//      "SecondStruct",
-//      "Droenk",
-//      "IntroTest",
-//      "Bla",
-//      "Blub",
-//      "Gulp",
-//      "Strings",
-//      "MultiSequence",
-//      "PropertySetInfo",
-//      "ElementType",
-//      "ElementNames",
-//      "Count",
-//      "Types"
-//      "ImplementationId"
-//  };
-
     char const * pDemandedPropVals[] =
     {
         "3.140000",
@@ -1094,8 +831,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
         "[]type",
         "[]byte",
     };
-    //is() nDemandedPropCount = 22;
-
 
     DefItem pMethodDefs[] =
     {
@@ -1149,14 +884,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
     // Test-Objekt anlegen
     Any aObjAny = getIntrospectionTestObject( xMgr );
 
-    // Introspection-Service holen
-    //Reference< XMultiServiceFactory > xServiceManager(getProcessServiceManager(), USR_QUERY);
-    //Reference< XIntrospection > xIntrospection( xMgr->createInstance(L"com.sun.star.beans.Introspection"), UNO_QUERY );
-    //TEST_ENSHURE( xIntrospection.is(), "Creation of introspection instance failed" );
-    //if( !xIntrospection.is() )
-        //return sal_False;
-
-    // und unspecten
+    // Introspection-Service unspecten
     Reference< XIntrospectionAccess > xAccess = xIntrospection->inspect( aObjAny );
     xAccess = xIntrospection->inspect( aObjAny );
     xAccess = xIntrospection->inspect( aObjAny );
@@ -1168,16 +896,9 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
 
     // XPropertySet-UIK ermitteln
     Type aType = getCppuType( (Reference< XPropertySet >*) NULL );
-    //typelib_InterfaceTypeDescription* pTypeDesc = NULL;
-    //aType.getDescription( (typelib_TypeDescription**)&pTypeDesc );
-    //Uik aPropertySetUik = *(Uik*)&pTypeDesc->aUik;
-    //typelib_typedescription_release( (typelib_TypeDescription*)pTypeDesc );
 
     Reference< XInterface > xPropSetIface = xAccess->queryAdapter( aType );
-    //Reference< XInterface > xPropSetIface = xAccess->queryAdapter( aPropertySetUik );
     Reference< XPropertySet > xPropSet( xPropSetIface, UNO_QUERY );
-    //XPropertySetRef xPropSet = (XPropertySet*)xPropSetIface->
-    //  queryInterface( XPropertySet::getSmartUik() );
     TEST_ENSHURE( xPropSet.is(), "Could not get XPropertySet by queryAdapter()" );
 
     // XExactName
@@ -1187,9 +908,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
     // Schleife ueber alle Kombinationen von Concepts
     for( sal_Int32 nConcepts = 0 ; nConcepts < 16 ; nConcepts++ )
     {
-//printf( "*******************************************************\n" );
-//printf( "nConcepts = %ld\n", nConcepts );
-
         // Wieviele Properties sollten es sein
         sal_Int32 nDemandedPropCount = 0;
         sal_Int32 iList = 0;
@@ -1203,7 +921,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
         if( xPropSet.is() )
         {
             Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo();
-            //Sequence<Property> aRetSeq = xPropSetInfo->getProperties();
             Sequence<Property> aRetSeq = xAccess->getProperties( nConcepts );
 
             sal_Int32 nLen = aRetSeq.getLength();
@@ -1214,11 +931,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
             aErrorStr += OString::valueOf( nLen );
             TEST_ENSHURE( nLen == nDemandedPropCount, aErrorStr.getStr() );
 
-            // cout << "**********************************\n";
-            // cout << "*** Ergebnis der Introspection ***\n";
-            // cout << "**********************************\n";
-            // cout << "\nIntrospection hat " << nLen << " Properties gefunden:\n";
-
             const Property* pProps = aRetSeq.getConstArray();
             Any aPropVal;
             sal_Int32 i;
@@ -1239,27 +951,18 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
 
                 OUString aPropName = aProp.Name;
                 OString aNameStr( aPropName.getStr(), aPropName.getLength(), RTL_TEXTENCODING_ASCII_US );
-                    //UStringToString(aPropName, CHARSET_SYSTEM);
-
-//printf( "Property = %s\n", aNameStr.getStr() );
 
                 OString aDemandedName = pPropertyDefs[ iDemanded ].pName;
-                //OString aDemandedName = pDemandedPropNames[ i ];
                 aErrorStr  = "Expected property \"";
                 aErrorStr += aDemandedName;
                 aErrorStr += "\", found \"";
                 aErrorStr += aNameStr;
                 aErrorStr += "\"";
                 TEST_ENSHURE( aNameStr == aDemandedName, aErrorStr.getStr() );
-                // cout << "Property " << (i+1) << ": \"" << (const char*)UStringToString(aPropName, CHARSET_SYSTEM) << "\"";
-
 
                 Type aPropType = aProp.Type;
                 OString aTypeNameStr( OUStringToOString(aPropType.getTypeName(), RTL_TEXTENCODING_ASCII_US) );
-                //Reference< XIdlClass > xPropType = aProp.Type;
-                //OString aTypeNameStr( xPropType->getName(), xPropType->getName().getLength(), RTL_TEXTENCODING_ASCII_US );
                 OString aDemandedTypeNameStr = pDemandedPropTypes[ iDemanded ];
-                //OString aDemandedTypeNameStr = pDemandedPropTypes[ i ];
                 aErrorStr  = "Property \"";
                 aErrorStr += aDemandedName;
                 aErrorStr += "\", expected type >";
@@ -1268,15 +971,12 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
                 aErrorStr += aTypeNameStr;
                 aErrorStr += "<";
                 TEST_ENSHURE( aTypeNameStr == aDemandedTypeNameStr, aErrorStr.getStr() );
-                // cout << " (Prop-Typ: " << (const char*)UStringToString(xPropType->getName(), CHARSET_SYSTEM) << ")";
 
                 // Wert des Property lesen und ausgeben
                 aPropVal = xPropSet->getPropertyValue( aPropName );
-                // cout << "\n\tWert = " << (const char*)UStringToString(AnyToString( aPropVal, sal_True ), CHARSET_SYSTEM);
 
                 OString aValStr = OUStringToOString( AnyToString( aPropVal, sal_False, xMgr ), RTL_TEXTENCODING_ASCII_US );
                 OString aDemandedValStr = pDemandedPropVals[ iDemanded ];
-                //OString aDemandedValStr = pDemandedPropVals[ i ];
                 aErrorStr  = "Property \"";
                 aErrorStr += aDemandedName;
                 aErrorStr += "\", expected val >";
@@ -1288,8 +988,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
 
                 // Wert pruefen und typgerecht modifizieren
                 TypeClass eType = aPropVal.getValueType().getTypeClass();
-                //Reference< XIdlClass > xIdlClass = aPropVal.getReflection()->getIdlClass();
-                //TypeClass eType = xIdlClass->getTypeClass();
                 Any aNewVal;
                 sal_Bool bModify = sal_True;
                 switch( eType )
@@ -1298,8 +996,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
                     {
                         OUString aStr;
                         aPropVal >>= aStr;
-                        //OString aStr = aPropVal.getString();
-                        aStr = aStr + OUString::createFromAscii(" (Modified!)");
+                        aStr = aStr + OUString(RTL_CONSTASCII_USTRINGPARAM(" (Modified!)"));
                         aNewVal <<= aStr;
                         break;
                     }
@@ -1354,9 +1051,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
                 // Neuen Wert setzen, wieder lesen und ausgeben
                 if( bModify )
                 {
-                    // cout.flush();
-
-                    // 1.7.1999, UnknownPropertyException bei ReadOnly-Properties abfangen
+                    // UnknownPropertyException bei ReadOnly-Properties abfangen
                     try
                     {
                         xPropSet->setPropertyValue( aPropName, aNewVal );
@@ -1366,7 +1061,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
                     }
 
                     aPropVal = xPropSet->getPropertyValue( aPropName );
-                    // cout << "\n\tModifizierter Wert = " << (const char*) UStringToString(AnyToString( aPropVal, sal_True ), CHARSET_SYSTEM) << "\n";
 
                     OUString aStr = AnyToString( aPropVal, sal_False, xMgr );
                     OString aModifiedValStr = OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US );
@@ -1380,10 +1074,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
                     aErrorStr += "<";
                     TEST_ENSHURE( aModifiedValStr == aDemandedModifiedValStr, aErrorStr.getStr() );
                 }
-                else
-                {
-                    // cout << "\n\tWert wurde nicht modifiziert\n";
-                }
 
                 // Checken, ob alle Properties auch einzeln gefunden werden
                 aErrorStr  = "property \"";
@@ -1391,7 +1081,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
                 aErrorStr += "\" not found with hasProperty()";
                 OUString aWDemandedName = OStringToOUString(aDemandedName, RTL_TEXTENCODING_ASCII_US );
                 sal_Bool bProperty = xAccess->hasProperty( aWDemandedName, nConcepts );
-                //sal_Bool bProperty = xAccess->hasProperty( aWDemandedName, PropertyConcept::ALL - PropertyConcept::DANGEROUS );
                 TEST_ENSHURE( bProperty, aErrorStr.getStr() );
 
                 aErrorStr  = "property \"";
@@ -1400,8 +1089,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
                 try
                 {
                     Property aGetProp = xAccess->getProperty( aWDemandedName, nConcepts );
-                    //Property aGetProp = xAccess->getProperty( aWDemandedName, PropertyConcept::ALL );
-                    //TEST_ENSHURE( aGetProp == aProp , aErrorStr.getStr() );
                 }
                 catch (RuntimeException e1)
                 {
@@ -1418,9 +1105,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
     // Schleife ueber alle Kombinationen von Concepts
     for( sal_Int32 nConcepts = 0 ; nConcepts < 128 ; nConcepts++ )
     {
-//printf( "*******************************************************\n" );
-//printf( "nConcepts = %ld\n", nConcepts );
-
         // Das 2^6-Bit steht fuer "den Rest"
         sal_Int32 nRealConcepts = nConcepts;
         if( nConcepts & 0x40 )
@@ -1437,13 +1121,8 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
         }
 
         // Methoden-Array ausgeben
-        //aMethodSeq = xAccess->getMethods
         Sequence< Reference< XIdlMethod > > aMethodSeq = xAccess->getMethods( nRealConcepts );
-        //Sequence<XIdlMethodRef> aMethodSeq = xAccess->getMethods
-        //  ( MethodConcept::ALL - MethodConcept::DANGEROUS - MethodConcept::PROPERTY );
         sal_Int32 nLen = aMethodSeq.getLength();
-        // cout << "\n\n*** Methoden ***\n";
-        // cout << "Introspection hat " << nLen << " Methoden gefunden:\n";
 
         aErrorStr  = "Expected to find ";
         aErrorStr += OString::valueOf( nDemandedMethCount );
@@ -1464,8 +1143,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
             OUString aMethName = rxMethod->getName();
             OString aNameStr = OUStringToOString(aMethName, RTL_TEXTENCODING_ASCII_US );
 
-//printf( "Method = %s\n", aNameStr.getStr() );
-
             // Naechste Passende Methode in der Liste suchen
             while( pMethodDefs[ iList ].pName )
             {
@@ -1476,15 +1153,12 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
             OString aDemandedName = pMethodDefs[ iList ].pName;
             iList++;
 
-            //OString aDemandedName = pDemandedMethNames[ i ];
             aErrorStr  = "Expected method \"";
             aErrorStr += aDemandedName;
             aErrorStr += "\", found \"";
             aErrorStr += aNameStr;
             aErrorStr += "\"";
             TEST_ENSHURE( aNameStr == aDemandedName, aErrorStr.getStr() );
-            // cout << "Methode " << (i+1) << ": " << (const char*) UStringToString(rxMethod->getReturnType()->getName(), CHARSET_SYSTEM)
-            //   << " " << (const char*) UStringToString(rxMethod->getName(), CHARSET_SYSTEM) << "( ";
 
             // Checken, ob alle Methoden auch einzeln gefunden werden
             aErrorStr  = "method \"";
@@ -1492,7 +1166,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
             aErrorStr += "\" not found with hasMethod()";
             OUString aWDemandedName = OStringToOUString(aDemandedName, RTL_TEXTENCODING_ASCII_US );
             sal_Bool bMethod = xAccess->hasMethod( aWDemandedName, nRealConcepts );
-            //sal_Bool bMethod = xAccess->hasMethod( aWDemandedName, MethodConcept::ALL );
             TEST_ENSHURE( bMethod, aErrorStr.getStr() );
 
             aErrorStr  = "method \"";
@@ -1501,7 +1174,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
             try
             {
                 Reference< XIdlMethod > xGetMethod = xAccess->getMethod( aWDemandedName, nRealConcepts );
-                //XIdlMethodRef xGetMethod = xAccess->getMethod( aWDemandedName, MethodConcept::ALL );
                 TEST_ENSHURE( xGetMethod == rxMethod , aErrorStr.getStr() );
             }
             catch (RuntimeException e1)
@@ -1517,8 +1189,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
     // Listener-Klassen ausgeben
     Sequence< Type > aClassSeq = xAccess->getSupportedListeners();
     sal_Int32 nLen = aClassSeq.getLength();
-    // cout << "\n\n*** Anmeldbare Listener ***\n";
-    // cout << "Introspection hat " << nLen << " Listener gefunden:\n";
 
     const Type* pListeners = aClassSeq.getConstArray();
     for( sal_Int32 i = 0 ; i < nLen ; i++ )
@@ -1528,67 +1198,53 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
 
         // Namen besorgen
         OUString aListenerClassName = aListenerType.getTypeName();
-        // cout << "Listener " << (i+1) << ": " << (const char*)UStringToString(aListenerClassName, CHARSET_SYSTEM) << "\n";
     }
 
-
-    // Performance bei hasMethod testen.
-    //CheckMethodPerformance( xAccess, "queryInterface", 100000 );
-    //CheckMethodPerformance( xAccess, "getIdlClasses", 100000 );
-
-    // cout.flush();
-
-
-
-
     return sal_True;
 }
 
 
 SAL_IMPLEMENT_MAIN()
 {
-    Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( OUString::createFromAscii("stoctest.rdb") ) );
+    Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( OUString(RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb")) ) );
 
     sal_Bool bSucc = sal_False;
     try
     {
         Reference< XImplementationRegistration > xImplReg(
-            xMgr->createInstance( OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration") ), UNO_QUERY );
+            xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) ), UNO_QUERY );
         OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
 
         // Register services
         OUString libName( RTL_CONSTASCII_USTRINGPARAM(
                               "reflection.uno" SAL_DLLEXTENSION) );
-//          ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("corefl"), libName);
         fprintf(stderr, "1\n" );
-        xImplReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
+        xImplReg->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
                                          libName, Reference< XSimpleRegistry >() );
         fprintf(stderr, "2\n" );
-        Reference< XIdlReflection > xRefl( xMgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.CoreReflection") ), UNO_QUERY );
+        Reference< XIdlReflection > xRefl( xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")) ), UNO_QUERY );
         OSL_ENSURE( xRefl.is(), "### no corereflection!" );
 
         // Introspection
-        libName = OUString::createFromAscii(
-            "introspection.uno" SAL_DLLEXTENSION);
-//          ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("insp"), libName);
+        libName = OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "introspection.uno" SAL_DLLEXTENSION));
         fprintf(stderr, "3\n" );
-        xImplReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
+        xImplReg->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
                                          libName, Reference< XSimpleRegistry >() );
         fprintf(stderr, "4\n" );
-        Reference< XIntrospection > xIntrosp( xMgr->createInstance( OUString::createFromAscii("com.sun.star.beans.Introspection") ), UNO_QUERY );
+        Reference< XIntrospection > xIntrosp( xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection")) ), UNO_QUERY );
         OSL_ENSURE( xRefl.is(), "### no corereflection!" );
 
         fprintf(stderr, "before test_introsp\n" );
         bSucc = test_introsp( xMgr, xRefl, xIntrosp );
         fprintf(stderr, "after test_introsp\n" );
-        //bSucc = test_corefl( xRefl );
     }
     catch (Exception & rExc)
     {
-        OSL_ENSURE( sal_False, "### exception occured!" );
+        OSL_FAIL( "### exception occurred!" );
         OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( "### exception occured: " );
-        OSL_TRACE( aMsg.getStr() );
+        OSL_TRACE( "### exception occurred: " );
+        OSL_TRACE( "%s", aMsg.getStr() );
         OSL_TRACE( "\n" );
     }
 
@@ -1598,20 +1254,4 @@ SAL_IMPLEMENT_MAIN()
     return (bSucc ? 0 : -1);
 }
 
-
-
-
-
-
-
-//*****************************
-//*** TEST-Implementationen ***
-//*****************************
-// Bleibt auf Dauer nicht drin, dient als exportierbare Test-Klasse
-// z.B. fuer Basic-Anbindung
-
-
-
-
-
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx
index a0ef275565e0..e6830dec36e4 100644
--- a/stoc/test/testloader.cxx
+++ b/stoc/test/testloader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
 #include <stdio.h>
 
 #include <sal/main.h>
-#ifndef _OSL_MODULE_H_
 #include <osl/module.hxx>
-#endif
 #include <osl/diagnose.h>
 
 #include <com/sun/star/loader/XImplementationLoader.hpp>
@@ -53,9 +52,10 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::loader;
 using namespace com::sun::star::lang;
 using namespace osl;
-using namespace rtl;
 using namespace cppu;
 
+using ::rtl::OUString;
+
 #if OSL_DEBUG_LEVEL > 0
 #define TEST_ENSHURE(c, m)   OSL_ENSURE(c, m)
 #else
@@ -92,7 +92,7 @@ SAL_IMPLEMENT_MAIN()
     {
         // try to get provider from module
         component_getFactoryFunc pCompFactoryFunc = (component_getFactoryFunc)
-            module.getFunctionSymbol( OUString::createFromAscii(COMPONENT_GETFACTORY) );
+            module.getFunctionSymbol( OUString(RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETFACTORY)) );
 
         if (pCompFactoryFunc)
         {
@@ -135,3 +135,4 @@ SAL_IMPLEMENT_MAIN()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index 38ab9eef51d2..991eff6b6a3e 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,7 +77,7 @@ public:
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() throw (RuntimeException)
-        { return OUString::createFromAscii( "target" ); }
+        { return OUString(RTL_CONSTASCII_USTRINGPARAM("target")); }
     virtual sal_Bool SAL_CALL supportsService( const OUString & /*rServiceName*/ )
         throw (RuntimeException)
         { return sal_False; }
@@ -140,7 +141,7 @@ public:
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() throw (RuntimeException)
-        { return OUString::createFromAscii( "master" ); }
+        { return OUString(RTL_CONSTASCII_USTRINGPARAM("master")); }
     virtual sal_Bool SAL_CALL supportsService( const OUString & /*rServiceName*/ )
         throw (RuntimeException)
         { return sal_False; }
@@ -283,8 +284,8 @@ SAL_IMPLEMENT_MAIN()
 
             Reference< reflection::XProxyFactory > xProxyFac(
                 xMgr->createInstance(
-                    OUString::createFromAscii(
-                        "com.sun.star.reflection.ProxyFactory") ),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.reflection.ProxyFactory")) ),
                 UNO_QUERY_THROW );
 
             Reference< XAggregation > x(
@@ -377,3 +378,4 @@ SAL_IMPLEMENT_MAIN()
     }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index 7be7136933e7..b420749ee9a2 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,9 +60,12 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::registry;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
-using namespace rtl;
 using namespace osl;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
 #if OSL_DEBUG_LEVEL > 0
 #define TEST_ENSHURE(c, m)   OSL_ENSURE(c, m)
 #else
@@ -71,35 +75,35 @@ using namespace osl;
 namespace stoc_impreg
 {
 void SAL_CALL mergeKeys(
-    Reference< registry::XRegistryKey > const & xDest,
-    Reference< registry::XRegistryKey > const & xSource )
-    SAL_THROW( (registry::InvalidRegistryException, registry::MergeConflictException) );
+Reference< registry::XRegistryKey > const & xDest,
+Reference< registry::XRegistryKey > const & xSource )
+SAL_THROW( (registry::InvalidRegistryException, registry::MergeConflictException) );
 }
 static void mergeKeys(
-    Reference< registry::XSimpleRegistry > const & xDest,
-    OUString const & rBaseNode,
-    OUString const & rURL )
-    SAL_THROW( (registry::InvalidRegistryException, registry::MergeConflictException) )
+Reference< registry::XSimpleRegistry > const & xDest,
+OUString const & rBaseNode,
+OUString const & rURL )
+SAL_THROW( (registry::InvalidRegistryException, registry::MergeConflictException) )
 {
-    Reference< registry::XRegistryKey > xDestRoot( xDest->getRootKey() );
-    Reference< registry::XRegistryKey > xDestKey;
-    if (rBaseNode.getLength())
-    {
-        xDestKey = xDestRoot->createKey( rBaseNode );
-        xDestRoot->closeKey();
-    }
-    else
-    {
-        xDestKey = xDestRoot;
-    }
-    Reference< registry::XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
-    xSimReg->open( rURL, sal_True, sal_False );
-    OSL_ASSERT( xSimReg->isValid() );
-    Reference< registry::XRegistryKey > xSourceKey( xSimReg->getRootKey() );
-    ::stoc_impreg::mergeKeys( xDestKey, xSourceKey );
-    xSourceKey->closeKey();
-    xSimReg->close();
-    xDestKey->closeKey();
+Reference< registry::XRegistryKey > xDestRoot( xDest->getRootKey() );
+Reference< registry::XRegistryKey > xDestKey;
+if (rBaseNode.getLength())
+{
+xDestKey = xDestRoot->createKey( rBaseNode );
+xDestRoot->closeKey();
+}
+else
+{
+xDestKey = xDestRoot;
+}
+Reference< registry::XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
+xSimReg->open( rURL, sal_True, sal_False );
+OSL_ASSERT( xSimReg->isValid() );
+Reference< registry::XRegistryKey > xSourceKey( xSimReg->getRootKey() );
+::stoc_impreg::mergeKeys( xDestKey, xSourceKey );
+xSourceKey->closeKey();
+xSimReg->close();
+xDestKey->closeKey();
 }
 
 
@@ -107,33 +111,33 @@ OString userRegEnv("STAR_USER_REGISTRY=");
 
 OUString getExePath()
 {
-    OUString        exe;
-    OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None);
-#if defined(WIN32) || defined(__OS2__) || defined(WNT)
-    exe = exe.copy(0, exe.getLength() - 16);
+OUString        exe;
+OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None);
+#if defined(WIN32) || defined(WNT)
+exe = exe.copy(0, exe.getLength() - 16);
 #else
-    exe = exe.copy(0, exe.getLength() - 12);
+exe = exe.copy(0, exe.getLength() - 12);
 #endif
-    return exe;
+return exe;
 }
 
 void setStarUserRegistry()
 {
-    Registry *myRegistry = new Registry();
+Registry *myRegistry = new Registry();
 
-    RegistryKey rootKey, rKey, rKey2;
+RegistryKey rootKey, rKey, rKey2;
 
-    OUString userReg = getExePath();
-    userReg += OUString::createFromAscii("user.rdb");
-    if(myRegistry->open(userReg, REG_READWRITE))
-    {
-        TEST_ENSHURE(!myRegistry->create(userReg), "setStarUserRegistry error 1");
-    }
+OUString userReg = getExePath();
+userReg += OUString(RTL_CONSTASCII_USTRINGPARAM("user.rdb"));
+if(myRegistry->open(userReg, REG_READWRITE))
+{
+TEST_ENSHURE(!myRegistry->create(userReg), "setStarUserRegistry error 1");
+}
 
-    TEST_ENSHURE(!myRegistry->close(), "setStarUserRegistry error 9");
-    delete myRegistry;
+TEST_ENSHURE(!myRegistry->close(), "setStarUserRegistry error 9");
+delete myRegistry;
 
-    userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US);
+userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US);
     putenv((char *)userRegEnv.getStr());
 }
 
@@ -144,7 +148,7 @@ void setLinkInDefaultRegistry(const OUString& linkName, const OUString& linkTarg
     RegistryKey rootKey;
 
     OUString appReg = getExePath();
-    appReg += OUString::createFromAscii("stoctest.rdb");
+    appReg += OUString(RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb"));
 
     TEST_ENSHURE(!myRegistry->open(appReg, REG_READWRITE), "setLinkInDefaultRegistry error 1");
     TEST_ENSHURE(!myRegistry->openRootKey(rootKey), "setLinkInDefaultRegistry error 2");
@@ -173,7 +177,7 @@ void test_SimpleRegistry(
     {
         // try to get provider from module
         component_getFactoryFunc pCompFactoryFunc = (component_getFactoryFunc)
-            module.getFunctionSymbol( OUString::createFromAscii(COMPONENT_GETFACTORY) );
+            module.getFunctionSymbol( OUString(RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETFACTORY)) );
 
         if (pCompFactoryFunc)
         {
@@ -457,11 +461,11 @@ void test_DefaultRegistry(
     OUString userRdb(exePath);
     OUString applicatRdb(exePath);
 
-    userRdb += OUString::createFromAscii("user.rdb");
-    applicatRdb += OUString::createFromAscii("stoctest.rdb");
+    userRdb += OUString(RTL_CONSTASCII_USTRINGPARAM("user.rdb"));
+    applicatRdb += OUString(RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb"));
 
     Reference < XMultiServiceFactory > rSMgr  = ::cppu::createRegistryServiceFactory( userRdb, applicatRdb, sal_False, OUString());
-                                                                                      //OUString::createFromAscii("//./e:/src596/stoc/wntmsci3/bin") );
+                                                                                      //OUString(RTL_CONSTASCII_USTRINGPARAM("//./e:/src596/stoc/wntmsci3/bin")) );
 
     Reference< XPropertySet > xPropSet( rSMgr, UNO_QUERY);
     TEST_ENSHURE( xPropSet.is(), "test_DefaultRegistry error0");
@@ -668,8 +672,8 @@ void test_DefaultRegistry(
 SAL_IMPLEMENT_MAIN()
 {
 //  setStarUserRegistry();
-     setLinkInDefaultRegistry(OUString::createFromAscii("/Test/DefaultLink"),
-                              OUString::createFromAscii("/Test/FifthKey/MyFirstLink"));
+     setLinkInDefaultRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("/Test/DefaultLink")),
+                              OUString(RTL_CONSTASCII_USTRINGPARAM("/Test/FifthKey/MyFirstLink")));
 
     OUString reg1( RTL_CONSTASCII_USTRINGPARAM("testreg1.rdb") );
     OUString reg2( RTL_CONSTASCII_USTRINGPARAM("testreg2.rdb") );
@@ -694,3 +698,4 @@ SAL_IMPLEMENT_MAIN()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/testsmgr.cxx b/stoc/test/testsmgr.cxx
index afa1291db8e3..1b6363e08157 100644
--- a/stoc/test/testsmgr.cxx
+++ b/stoc/test/testsmgr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,7 +65,7 @@ OUString getExePath()
 
     OSL_VERIFY( osl_getExecutableFile( &exe.pData) == osl_Process_E_None);
 
-#if defined(WIN32) || defined(__OS2__) || defined(WNT)
+#if defined(WIN32) || defined(WNT)
     exe = exe.copy(0, exe.getLength() - 16);
 #else
     exe = exe.copy(0, exe.getLength() - 12);
@@ -79,7 +80,7 @@ void setStarUserRegistry()
     RegistryKey rootKey, rKey, rKey2;
 
     OUString userReg = getExePath();
-    userReg += OUString::createFromAscii("user.rdb");
+    userReg += OUString(RTL_CONSTASCII_USTRINGPARAM("user.rdb"));
     if(myRegistry->open(userReg, REG_READWRITE))
     {
         TEST_ENSHURE(!myRegistry->create(userReg), "setStarUserRegistry error 1");
@@ -103,3 +104,5 @@ SAL_IMPLEMENT_MAIN()
     printf( "ServiceManagerTest : OK\n" );
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/testsmgr2.cxx b/stoc/test/testsmgr2.cxx
index b04f188c10f9..f3027ed84cd7 100644
--- a/stoc/test/testsmgr2.cxx
+++ b/stoc/test/testsmgr2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -116,3 +117,5 @@ SAL_IMPLEMENT_MAIN()
         return 1;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index aecdbc55514f..0ec682f48d7e 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,9 +75,12 @@ using namespace com::sun::star::registry;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
 using namespace osl;
-using namespace rtl;
 using namespace cppu;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
 
 Reference<XMultiServiceFactory> getProcessServiceManager()
 {
@@ -85,7 +89,7 @@ Reference<XMultiServiceFactory> getProcessServiceManager()
     {
         MutexGuard aGuard( Mutex::getGlobalMutex() );
         if (! s_x.is())
-            s_x = createRegistryServiceFactory( OUString::createFromAscii( "stoctest.rdb" ), sal_False );
+            s_x = createRegistryServiceFactory( OUString(RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb")), sal_False );
     }
     return s_x;
 }
@@ -149,7 +153,7 @@ Reference < XInterface > SAL_CALL Test_Manager_Impl_CreateInstance(
 //
 OUString Test_Manager_Impl::getImplementationName() throw()
 {
-    return OUString::createFromAscii(IMPLEMENTATION_NAME);
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLEMENTATION_NAME));
 }
 
 //*************************************************************************
@@ -179,8 +183,8 @@ Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames(void) throw ()
 Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames_Static(void) throw ()
 {
     Sequence< OUString > aSNS( 2 );
-    aSNS.getArray()[0] = OUString::createFromAscii(SERVICE_NAME);
-    aSNS.getArray()[1] = OUString::createFromAscii("com.sun.star.bridge.Bridge");
+    aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
+    aSNS.getArray()[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge"));
     return aSNS;
 }
 
@@ -217,7 +221,7 @@ extern "C" void SAL_CALL test_ServiceManager()
 
     Reference<XContentEnumerationAccess> xContEnum(xSMgr, UNO_QUERY);
     TEST_ENSHURE( xContEnum.is() , "query on XContentEnumerationAccess failed" );
-    Reference<XEnumeration > xEnum(xContEnum->createContentEnumeration(OUString::createFromAscii("com.sun.star.registry.SimpleRegistry")));
+    Reference<XEnumeration > xEnum(xContEnum->createContentEnumeration(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.SimpleRegistry"))));
     TEST_ENSHURE( xEnum.is() , "createContentEnumeration failed" );
     sal_Int32 nLen = 0;
     while( xEnum->hasMoreElements() )
@@ -242,33 +246,33 @@ extern "C" void SAL_CALL test_ServiceManager()
     TEST_ENSHURE( nLen == 8, "more than 6 factories" );
 
     // try to get an instance for a unknown service
-    TEST_ENSHURE( !xSMgr->createInstance(OUString::createFromAscii("bla.blup.Q")).is(), "unknown service provider found" );
+    TEST_ENSHURE( !xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("bla.blup.Q"))).is(), "unknown service provider found" );
 
     //
     // First test : register service via the internal function of the component itself
     //
     {
         Reference< XImplementationRegistration >
-            xInst( xSMgr->createInstance(OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration")), UNO_QUERY );
+            xInst( xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration"))), UNO_QUERY );
         TEST_ENSHURE( xInst.is(), "no ImplementationRegistration" );
 
         try {
             // register the services via writeComponentRegInfo (see at end of this file)
-            xInst->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), atUModule2, Reference< XSimpleRegistry >() );
+            xInst->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), atUModule2, Reference< XSimpleRegistry >() );
         }
         catch( CannotRegisterImplementationException e ) {
             TEST_ENSHURE( 0, "register implementation failed" );
         }
 
         // getImplementations() check
-         Sequence<OUString> seqImpl = xInst->getImplementations(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), atUModule2);
+         Sequence<OUString> seqImpl = xInst->getImplementations(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), atUModule2);
         TEST_ENSHURE( seqImpl.getLength() == 1, "count of implementantions is wrong" );
-        TEST_ENSHURE( seqImpl.getConstArray()[0] == OUString::createFromAscii("com.sun.star.DummyService.V10"), "implementation name is not equal" );
+        TEST_ENSHURE( seqImpl.getConstArray()[0] == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.DummyService.V10")), "implementation name is not equal" );
 
 
         // tests, if a service provider can be instantiated.
 
-        Reference< XInterface > xIFace(xSMgr->createInstance(OUString::createFromAscii("com.sun.star.ts.TestManagerImpl")));
+        Reference< XInterface > xIFace(xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ts.TestManagerImpl"))));
         TEST_ENSHURE( xIFace.is(), "loadable service not found" );
 
         // remove the service
@@ -276,129 +280,6 @@ extern "C" void SAL_CALL test_ServiceManager()
                         "revoke implementation failed" );
     }
 
-
-//  Reference < XSimpleRegistry > xSReg(  xSMgr->createInstance(OUString::createFromAscii("com::sun::star.uno.repos.SimpleRegistry")), UNO_QUERY );
-//  TEST_ENSHURE( xSReg.is() , "Simple registry couldn't be instantiated" );
-
-//  xSReg->open(OUString::createFromAscii("dummy.reg"), sal_False, sal_True);
-//  xSReg->close();
-
-    // laut dbo : C-API muss nicht mehr unterstuezt werden
-    //TEST_ENSHURE( registerExternService(atModule, "dummy.reg"), "install failed" );
-    //TEST_ENSHURE( deregisterExternService(atModule, "dummy.reg"), "deinstall failed" );
-
-
-//  UNO_INTERFACE(XMultiServiceFactory) xUnoSMgr = {0,0};
-//  smart2uno(xSMgr, xUnoSMgr);
-
-//  TEST_ENSHURE(registerExternImplementation(xUnoSMgr, "com::sun::star.loader.SharedLibrary", atModule2, "dummy.reg"), "install failed" );
-//  TEST_ENSHURE(revokeExternImplementation(xUnoSMgr, atModule2, "dummy.reg"), "deinstall failed" );
-
-//  TEST_ENSHURE(registerExternImplementation(xUnoSMgr, "com::sun::star.loader.SharedLibrary", atModule2, "dummy2.reg"), "install failed" );
-
-//TODO : Java loader test
-//  String testUrl(getTestJarUrl());
-//  TEST_ENSHURE(registerExternImplementation(xUnoSMgr, "com::sun::star.loader.Java", testUrl, "dummy.reg"), "install failed" );
-//  TEST_ENSHURE(revokeExternImplementation(xUnoSMgr, testUrl, "dummy.reg"), "deinstall failed" );
-
-//  if (!UNO_isNull((UNO_Ifc*)&xUnoSMgr))
-//      xUnoSMgr.m_pVmt->release(xUnoSMgr.m_pCtx);
-
-//  xSReg->open(OUString::createFromAscii("dummy.reg"), sal_True, sal_False);
-//  TEST_ENSHURE(!xSReg->getRootKey()->openKey(OUString::createFromAscii("/SERVICES/com::sun::star/ts/TestManagerImpl/URL")).is(),
-//              "deinstall failed" );
-
-//  xSReg->close();
-
-//  xSReg->open(OUString::createFromAscii("dummy.reg"), sal_False, sal_False);
-//  xSReg->destroy();
-//  xSReg->open(OUString::createFromAscii("dummy2.reg"), sal_False, sal_False);
-//  xSReg->destroy();
-
-
-    // Test initialisieren
-/*
-    XServiceProviderRef xSiSP1 = createSimpleServiceProvider( OUString::createFromAscii("com::sun::star.usr.Test_Manager_Impl1"), Test_Manager_Impl_getReflection );
-    XServiceProviderRef xSiSP11 = createSimpleServiceProvider( OUString::createFromAscii("com::sun::star.usr.Test_Manager_Impl1"), Test_Manager_Impl_getReflection );
-    XServiceProviderRef xSiSP2 = createSimpleServiceProvider( OUString::createFromAscii("com::sun::star.usr.Test_Manager_Impl2"), Test_Manager_Impl_getReflection );
-*/
-/*
-    // second test
-    // create XServiceProvider via createSingleFactory and write them directly into the registry
-    // For this is needed a sequence of supported servicenames and a createComponent function pointer
-    {
-        Reference< XServiceProvider > xSiSP1(createSingleFactory(
-            xSMgr,
-            OUString::createFromAscii("com::sun::star.usr.Test_Manager_Impl1),
-            Test_Manager_Impl_CreateInstance,
-            Test_Manager_Impl::getSupportedServiceNames_Static() ), UNO_QUERY);
-        Reference< XServiceProvider > xSiSP11(createSingleFactory(
-            xSMgr,
-            OUString::createFromAscii("com::sun::star.usr.Test_Manager_Impl1"),
-            Test_Manager_Impl_CreateInstance,
-            Test_Manager_Impl::getSupportedServiceNames_Static() ),UNO_QUERY);
-        Reference< XServiceProvider > xSiSP2(createSingleFactory(
-            xSMgr,
-            L"com::sun::star.usr.Test_Manager_Impl2",
-            Test_Manager_Impl_CreateInstance,
-            Test_Manager_Impl::getSupportedServiceNames_Static() ), UNO_QUERY);
-
-        // put the service providers into the registry
-        xReg->registerServiceProvider( L"com::sun::star.test.TestManager1", xSiSP1 );
-        xReg->registerServiceProvider( L"com::sun::star.test.TestManager1", xSiSP11 );
-        xReg->registerServiceProvider( L"com::sun::star.test.TestManager2", xSiSP2 );
-
-        // TestManager1
-        Reference< XServiceProvider > xProv = xSMgr->queryServiceProvider( L"com::sun::star.test.TestManager1");
-        Reference< XSingleServiceFactory > xFact( xProv, UNO_QUERY );
-        TEST_ENSHURE( xFact.is(), "Service com::sun::star.test.TestManager1 not found" );
-
-        Reference< XInterface > xTest1 = xFact->createInstance();
-        TEST_ENSHURE( nInstanceCount == 1, "wrong service instanciated" );
-
-        // TestManager2
-        xProv = xSMgr->queryServiceProvider( L"com::sun::star.test.TestManager2");
-        xFact = Reference < XSingleServiceFactory > ( xProv , UNO_QUERY );
-        TEST_ENSHURE( xFact.is(), "Service com::sun::star.test.TestManager2 not found" );
-
-        Reference < XInterface > xTest2 = xFact->createInstance();
-        TEST_ENSHURE( nInstanceCount == 2, "wrong service instanciated" );
-
-        xTest1 = Reference< XInterface >();
-        xTest2 = Reference< XInterface >();
-        TEST_ENSHURE( nInstanceCount == 0, "wrong service deleted" );
-
-        Reference< XEnumeration > xEnum = xSMgr->createProviderEnumeration( L"com::sun::star.test.TestManager1");
-        TEST_ENSHURE( xEnum.is() , "no provider enumeration" );
-
-        sal_Int32 nSPTestManagerImplLen2 = 0;
-
-        while (xEnum.is() && xEnum->hasMoreElements())
-        {
-            nSPTestManagerImplLen2++;
-            xEnum->nextElement();
-
-        }
-        TEST_ENSHURE( nSPTestManagerImplLen2 == 2, "queryServiceProviders() wrong length" );
-
-        sal_Int32 nCount = 0;
-        xEnum = xSMgr->createProviderEnumeration( L"com::sun::star.test.TestManager1");
-        while (xEnum->hasMoreElements())
-        {
-            Reference< XServiceProvider > xProv;
-            xEnum->nextElement() >>= xProv;
-            if (xProv == xSiSP1 || xProv == xSiSP11)
-                nCount++;
-        }
-
-        TEST_ENSHURE( nCount == 2 , "not all com::sun::star.testimpl.TestManagerImpl registered" );
-*/
-/*
-    {
-        Reference< XMultiServiceFactory > xTestManager(createRegistryServiceManager(L"testmanager.rdb"));
-        TEST_ENSHURE( xTestManager.is(), "create Test ServiceManager failed!" );
-    }
-*/
     Reference<XComponent> xComp(xSMgr, UNO_QUERY);
     xComp->dispose();
 
@@ -411,7 +292,7 @@ extern "C" void SAL_CALL test_ServiceManager()
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -438,13 +319,13 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+            OSL_FAIL( "### InvalidRegistryException!" );
         }
     }
     return sal_False;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
@@ -470,3 +351,4 @@ void * SAL_CALL component_getFactory(
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx
index a7ad8d9abf94..34ac40b504de 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,6 +55,7 @@
 #include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
+#include <sal/macros.h>
 
 #include <cstdlib>
 
@@ -204,7 +206,7 @@ void Test::testParse() {
           "/", false, 1, "", "", "", "", "", 0, 0 },
         { "////", 0, "////", true, "",
           "//", false, 2, "", "", "", "", "", 0, 0 } };
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         css::uno::Reference< css::uri::XUriReference > uriRef(
             m_uriFactory->parse(
                 rtl::OUString::createFromAscii(data[i].uriReference)));
@@ -251,7 +253,7 @@ void Test::testParse() {
                 data[i].pathSegmentCount, uriRef->getPathSegmentCount());
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(""), uriRef->getPathSegment(-1));
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), uriRef->getPathSegment(-1));
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
                 rtl::OUString::createFromAscii(data[i].pathSegment0),
@@ -274,7 +276,7 @@ void Test::testParse() {
                 uriRef->getPathSegment(4));
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(""), uriRef->getPathSegment(5));
+                rtl::OUString(), uriRef->getPathSegment(5));
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
                 data[i].query != 0, uriRef->hasQuery());
@@ -594,7 +596,7 @@ void Test::testMakeAbsolute() {
           css::uri::RelativeUriExcessParentSegments_ERROR, "scheme://a#s" },
         { "scheme://a#s1", "#s2", true,
           css::uri::RelativeUriExcessParentSegments_ERROR, "scheme://a#s2" } };
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         css::uno::Reference< css::uri::XUriReference > baseUriRef(
             m_uriFactory->parse(
                 rtl::OUString::createFromAscii(data[i].baseUriReference)));
@@ -699,7 +701,7 @@ void Test::testMakeRelative() {
           0 },
         { "scheme://auth/a/b", "scheme://auth/c/d", true, false, false,
           "../c/d", 0 } };
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         css::uno::Reference< css::uri::XUriReference > baseUriRef(
             m_uriFactory->parse(
                 rtl::OUString::createFromAscii(data[i].baseUriReference)));
@@ -752,7 +754,7 @@ void Test::testVndSunStarExpand() {
                   RTL_CONSTASCII_USTRINGPARAM(
                       "/singletons/com.sun.star.util.theMacroExpander"))),
         css::uno::UNO_QUERY_THROW);
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         css::uno::Reference< css::uri::XUriReference > uriRef(
             m_uriFactory->parse(
                 rtl::OUString::createFromAscii(data[i].uriReference)));
@@ -792,7 +794,7 @@ void Test::testVndSunStarScript() {
         { "vnd.sun.star.script:name?a=&", 0, true, {} },
         { "vnd.sun.star.script:name?key1=&%26=%3D&key1=hello", "name", true,
           { { "key1", "" }, { "key2", 0 }, { "&", "=" } } } };
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         css::uno::Reference< css::uri::XUriReference > uriRef(
             m_uriFactory->parse(
                 rtl::OUString::createFromAscii(data[i].uriReference)));
@@ -848,7 +850,7 @@ void Test::testVndSunStarScript() {
                                 "testVndSunStarScript",
                                 static_cast< double >(i)
                                 + static_cast< double >(j) / 10.0,
-                                ::rtl::OUString::createFromAscii("setParameter"),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setParameter")),
                                 originalReference,
                                 uriRef->getUriReference());
                         }
@@ -860,7 +862,7 @@ void Test::testVndSunStarScript() {
                 TEST_ASSERT_EQUAL(
                     "testVndSunStarScript",
                     i,
-                    ::rtl::OUString::createFromAscii("setName"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setName")),
                     originalReference,
                     uriRef->getUriReference());
             }
@@ -902,8 +904,8 @@ void Test::testVndSunStarScript() {
     }
     TEST_ASSERT_EQUAL(
         "testVndSunStarScript",
-        ::rtl::OUString::createFromAscii("illegal arguments"),
-        ::rtl::OUString::createFromAscii("name"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("illegal arguments")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")),
         caughtExpected,
         true);
 
@@ -911,15 +913,15 @@ void Test::testVndSunStarScript() {
     try {
         scriptUrl->setParameter(
             ::rtl::OUString(),
-            ::rtl::OUString::createFromAscii("non-empty"));
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("non-empty")));
     }
     catch( const css::lang::IllegalArgumentException& ) {
         caughtExpected = true;
     }
     TEST_ASSERT_EQUAL(
         "testVndSunStarScript",
-        ::rtl::OUString::createFromAscii("illegal arguments"),
-        ::rtl::OUString::createFromAscii("parameter"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("illegal arguments")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("parameter")),
         caughtExpected,
         true);
 }
@@ -949,7 +951,7 @@ void Test::testTranslator() {
         { "file:///abc/%25ef", "file:///abc/%25ef", true } };
     css::uno::Reference< css::uri::XExternalUriReferenceTranslator >
         translator(css::uri::ExternalUriReferenceTranslator::create(m_context));
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         if (data[i].toInternal) {
             TEST_ASSERT_EQUAL(
                 "testTranslator, translateToInternal", i,
@@ -980,7 +982,7 @@ void Test::testPkgUrlFactory() {
           "vnd.sun.star.pkg://file:%2F%2F%2Fa%2525b%252fc%2Fd~e&f@g%3Fh" } };
     css::uno::Reference< css::uri::XVndSunStarPkgUrlReferenceFactory > factory(
         css::uri::VndSunStarPkgUrlReferenceFactory::create(m_context));
-    for (std::size_t i = 0; i < sizeof data / sizeof data[0]; ++i) {
+    for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         css::uno::Reference< css::uri::XUriReference > url(
             factory->createVndSunStarPkgUrlReference(
                 m_uriFactory->parse(
@@ -1002,3 +1004,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/inc/pch/precompiled_store.cxx b/store/inc/pch/precompiled_store.cxx
index fa23aac43f84..7fe9c284c5a6 100644
--- a/store/inc/pch/precompiled_store.cxx
+++ b/store/inc/pch/precompiled_store.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_store.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/inc/pch/precompiled_store.hxx b/store/inc/pch/precompiled_store.hxx
index c6e74b3424bc..fe00b2bb716b 100644
--- a/store/inc/pch/precompiled_store.hxx
+++ b/store/inc/pch/precompiled_store.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
 #ifdef PRECOMPILED_HEADERS
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/inc/store/store.h b/store/inc/store/store.h
index 0a283a378a29..b4d6626d9d1f 100644
--- a/store/inc/store/store.h
+++ b/store/inc/store/store.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #ifndef _STORE_STORE_H_
-#define _STORE_STORE_H_ "$Revision: 1.6 $"
+#define _STORE_STORE_H_
 
 #include <store/types.h>
 
@@ -409,3 +410,4 @@ storeError SAL_CALL store_remove (
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/inc/store/store.hxx b/store/inc/store/store.hxx
index 8e90de321345..e4970845d38b 100644
--- a/store/inc/store/store.hxx
+++ b/store/inc/store/store.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -607,3 +608,4 @@ private:
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/inc/store/types.h b/store/inc/store/types.h
index 1214cacfc92d..272900f11c77 100644
--- a/store/inc/store/types.h
+++ b/store/inc/store/types.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #ifndef _STORE_TYPES_H_
-#define _STORE_TYPES_H_ "$Revision: 1.8 $"
+#define _STORE_TYPES_H_
 
 #include <sal/types.h>
 #include <rtl/ustring.h>
@@ -165,3 +166,4 @@ typedef struct __store_FindData storeFindData;
 
 #endif /* _STORE_TYPES_H_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/prj/d.lst b/store/prj/d.lst
index e39be093c53a..871fcf85e436 100644
--- a/store/prj/d.lst
+++ b/store/prj/d.lst
@@ -1,12 +1,13 @@
-mkdir: %_DEST%\inc%_EXT%\store
-..\inc\store\*.h %_DEST%\inc%_EXT%\store\*.h
-..\inc\store\store.hxx %_DEST%\inc%_EXT%\store\store.hxx
-..\inc\store\store.inl %_DEST%\inc%_EXT%\store\store.inl
-..\util\store.xml %_DEST%\xml%_EXT%\store.xml
-
-..\%__SRC%\lib\istore.lib %_DEST%\lib%_EXT%\istore.lib
-..\%__SRC%\lib\libstore.*.* %_DEST%\lib%_EXT%\*
-..\%__SRC%\bin\sto*.dll %_DEST%\bin%_EXT%\sto*.dll
+mkdir: %_DEST%\inc\store
+..\inc\store\*.h %_DEST%\inc\store\*.h
+..\inc\store\store.hxx %_DEST%\inc\store\store.hxx
+..\inc\store\store.inl %_DEST%\inc\store\store.inl
+..\util\store.xml %_DEST%\xml\store.xml
+
+..\%__SRC%\lib\istore.lib %_DEST%\lib\istore.lib
+..\%__SRC%\lib\libstore*.dll.a %_DEST%\lib\libstore*.dll.a
+..\%__SRC%\lib\libstore.*.* %_DEST%\lib\*
+..\%__SRC%\bin\sto*.dll %_DEST%\bin\sto*.dll
 
 
 
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index 7e4ac7bcbb00..b947dd0e3b97 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -946,3 +947,5 @@ MemoryLockBytes_createInstance (
 }
 
 } // namespace store
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/lockbyte.hxx b/store/source/lockbyte.hxx
index b2b6c905f9fd..c54b64d538c8 100644
--- a/store/source/lockbyte.hxx
+++ b/store/source/lockbyte.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,23 +29,13 @@
 #ifndef _STORE_LOCKBYTE_HXX_
 #define _STORE_LOCKBYTE_HXX_
 
-#ifndef _SAL_TYPES_H_
 #include "sal/types.h"
-#endif
 
-#ifndef _RTL_REF_HXX_
 #include "rtl/ref.hxx"
-#endif
-#ifndef _RTL_USTRING_H_
 #include "rtl/ustring.h"
-#endif
 
-#ifndef _STORE_TYPES_H_
 #include "store/types.h"
-#endif
-#ifndef _STORE_STORBASE_HXX_
 #include "storbase.hxx"
-#endif
 
 namespace store
 {
@@ -182,3 +173,4 @@ MemoryLockBytes_createInstance (
 
 #endif /* !_STORE_LOCKBYTE_HXX_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/object.cxx b/store/source/object.cxx
index 40c1cfbbee9c..bebb5f0a170c 100644
--- a/store/source/object.cxx
+++ b/store/source/object.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,3 +111,5 @@ oslInterlockedCount SAL_CALL OStoreObject::release (void)
 }
 
 } // namespace store
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/object.hxx b/store/source/object.hxx
index a3b5ab1c6e63..5f985f5b66af 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,17 +29,11 @@
 #ifndef _STORE_OBJECT_HXX_
 #define _STORE_OBJECT_HXX_
 
-#ifndef _SAL_TYPES_H_
 #include "sal/types.h"
-#endif
 
-#ifndef _RTL_REF_HXX_
 #include "rtl/ref.hxx"
-#endif
 
-#ifndef _OSL_INTERLCK_H_
 #include "osl/interlck.h"
-#endif
 
 namespace store
 {
@@ -136,3 +131,5 @@ SAL_CALL query (IStoreHandle *pHandle, OStoreObject*)
 } // namespace store
 
 #endif /* !_STORE_OBJECT_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx
index 690bff8d258e..8fd79ba27eff 100644
--- a/store/source/storbase.cxx
+++ b/store/source/storbase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -196,3 +197,5 @@ PageData::Allocator::createInstance (rtl::Reference< PageData::Allocator > & rxA
 OStorePageObject::~OStorePageObject (void)
 {
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index 9c1e4ea985bf..e2fe649f743b 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #ifndef _STORE_STORBASE_HXX_
-#define _STORE_STORBASE_HXX_ "$Revision: 1.10.8.4 $"
+#define _STORE_STORBASE_HXX_
 
 #include "sal/types.h"
 
@@ -952,3 +953,5 @@ inline void OStorePageObject::location (sal_uInt32 nAddr)
 } // namespace store
 
 #endif /* !_STORE_STORBASE_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx
index d2612d60b3db..b5f247bf4a99 100644
--- a/store/source/storbios.cxx
+++ b/store/source/storbios.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1127,3 +1128,5 @@ storeError OStorePageBIOS::scanNext (
     // Done.
     return store_E_CantSeek;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index 439089d41bd6..74cfdc131584 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -265,3 +266,5 @@ inline bool OStorePageBIOS::ScanContext::isValid (void) const
 } // namespace store
 
 #endif /* !_STORE_STORBIOS_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index f0e216575277..79c34492e978 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,6 +32,7 @@
 #include "storcach.hxx"
 
 #include "sal/types.h"
+#include "sal/macros.h"
 #include "rtl/alloc.h"
 #include "osl/diagnose.h"
 
@@ -341,7 +343,7 @@ PageCache_Impl::PageCache_Impl (sal_uInt16 nPageSize)
       m_nHit         (0),
       m_nMissed      (0)
 {
-    static size_t const theSize = sizeof(m_hash_table_0) / sizeof(m_hash_table_0[0]);
+    static size_t const theSize = SAL_N_ELEMENTS(m_hash_table_0);
     STORE_STATIC_ASSERT(theSize == theTableSize);
     memset(m_hash_table_0, 0, sizeof(m_hash_table_0));
 }
@@ -559,3 +561,5 @@ PageCache_createInstance (
 }
 
 } // namespace store
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index 7f56a8d83075..46ad5eff15f0 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #ifndef _STORE_STORCACH_HXX
-#define _STORE_STORCACH_HXX "$Revision: 1.6.8.2 $"
+#define _STORE_STORCACH_HXX
 
 #include "sal/types.h"
 #include "rtl/ref.hxx"
@@ -110,3 +111,4 @@ PageCache_createInstance (
 
 #endif /* !_STORE_STORCACH_HXX */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stordata.cxx b/store/source/stordata.cxx
index 901da15c8040..db85ce0eff13 100644
--- a/store/source/stordata.cxx
+++ b/store/source/stordata.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -723,31 +724,6 @@ OStoreDirectoryPageObject::scope (
     return page::SCOPE_UNREACHABLE;
 }
 
-#if 0  /* NYI */
-/*
- * chunk (external data page).
- */
-inode::ChunkDescriptor OStoreDirectoryPageObject::chunk (sal_uInt32 nOffset)
-{
-    // @@@ INSUFFICIENT: NEED SCOPE AS WELL @@@
-    sal_uInt32 nCapacity = m_rPage.capacity();
-    if (nOffset < nCapacity)
-        // Internal scope (inode page).
-        return inode::ChunkDescriptor (nOffset, nCapacity);
-    else
-        // External scope (data page).
-        return inode::ChunkDescriptor (nOffset - nCapacity, data::capacity(m_rPage.m_aDescr));
-
-    inode::ChunkScope eScope = m_rPage.scope(nOffset);
-    if (eScope == inode::SCOPE_INTERNAL)
-        // Inode page (internal scope).
-        return inode::ChunkDescriptor (nOffset, m_rPage.capacity());
-    else
-        // Data page (external scope).
-        return inode::ChunkDescriptor (nOffset - m_rPage.capacity(), data::capacity(m_rPage.m_aDescr));
-}
-#endif /* NYI */
-
 /*
  * read (external data page).
  */
@@ -1128,3 +1104,5 @@ storeError OStoreDirectoryPageObject::truncate (
     // Invalid scope.
     return store_E_InvalidAccess;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index 01ea2c0f86ec..61625c32c046 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -868,3 +869,4 @@ private:
 
 #endif /* !_STORE_STORDATA_HXX_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx
index 0b3f16da3cfb..01d4357a2a46 100644
--- a/store/source/stordir.cxx
+++ b/store/source/stordir.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,37 +31,19 @@
 
 #include "stordir.hxx"
 
-#ifndef _SAL_TYPES_H_
 #include <sal/types.h>
-#endif
 
-#ifndef _RTL_TEXTCVT_H_
 #include <rtl/textcvt.h>
-#endif
-#ifndef _RTL_REF_HXX_
 #include <rtl/ref.hxx>
-#endif
 
-#ifndef _OSL_MUTEX_HXX_
 #include <osl/mutex.hxx>
-#endif
 
-#ifndef _STORE_TYPES_H_
 #include "store/types.h"
-#endif
-#ifndef _STORE_OBJECT_HXX_
 #include "object.hxx"
-#endif
 
-#ifndef _STORE_STORBASE_HXX_
 #include "storbase.hxx"
-#endif
-#ifndef _STORE_STORDATA_HXX_
 #include "stordata.hxx"
-#endif
-#ifndef _STORE_STORPAGE_HXX_
 #include "storpage.hxx"
-#endif
 
 using namespace store;
 
@@ -239,3 +222,5 @@ storeError OStoreDirectory_Impl::iterate (storeFindData &rFindData)
     memset (&rFindData, 0, sizeof (storeFindData));
     return store_E_NoMoreFiles;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index 2e3d79e71319..44c14f19cdae 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,29 +29,15 @@
 #ifndef _STORE_STORDIR_HXX_
 #define _STORE_STORDIR_HXX_
 
-#ifndef _SAL_TYPES_H_
 #include <sal/types.h>
-#endif
 
-#ifndef _RTL_TEXTCVT_H_
 #include <rtl/textcvt.h>
-#endif
-#ifndef _RTL_STRING_H_
 #include <rtl/string.h>
-#endif
-#ifndef _RTL_REF_HXX_
 #include <rtl/ref.hxx>
-#endif
 
-#ifndef _STORE_OBJECT_HXX_
 #include "object.hxx"
-#endif
-#ifndef _STORE_STORBASE_HXX_
 #include "storbase.hxx"
-#endif
-#ifndef _STORE_STORPAGE_HXX_
 #include "storpage.hxx"
-#endif
 
 namespace store
 {
@@ -147,3 +134,4 @@ SAL_CALL query (IStoreHandle *pHandle, OStoreDirectory_Impl*)
 
 #endif /* !_STORE_STORDIR_HXX_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/store.cxx b/store/source/store.cxx
index fdcce8dd2d00..a77b34acc9ca 100644
--- a/store/source/store.cxx
+++ b/store/source/store.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -763,3 +764,5 @@ storeError SAL_CALL store_remove (
     // Remove.
     return xManager->remove (aKey);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storlckb.cxx b/store/source/storlckb.cxx
index 5a02131d53eb..658ec52646b6 100644
--- a/store/source/storlckb.cxx
+++ b/store/source/storlckb.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -449,3 +450,5 @@ storeError OStoreLockBytes::stat (sal_uInt32 &rnSize)
     rnSize = aPage.dataLength();
     return store_E_None;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index fd6ef7384613..352095b72bc0 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #ifndef _STORE_STORLCKB_HXX_
-#define _STORE_STORLCKB_HXX_ "$Revision: 1.6.8.1 $"
+#define _STORE_STORLCKB_HXX_
 
 #include "sal/types.h"
 
@@ -169,3 +170,4 @@ SAL_CALL query (IStoreHandle *pHandle, OStoreLockBytes*)
 
 #endif /* !_STORE_STORLCKB_HXX_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx
index a49e850061b6..b91528a615df 100644
--- a/store/source/storpage.cxx
+++ b/store/source/storpage.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -163,71 +164,6 @@ storeError OStorePageManager::find_lookup (
  * remove_Impl (possibly down from root).
  * Internal: Precond: initialized, writeable, exclusive access.
  */
-#if 0  /* EXP */
-storeError OStorePageManager::remove_Impl (entry & rEntry)
-{
-    // Find Node and Index.
-    OStoreBTreeNodeObject aNode;
-    sal_uInt16 nIndex = 0;
-    eErrCode = m_aRoot.find_lookup (aNode, nIndex, entry::CompareGreater(rEntry), *this);
-
-    // @@@
-
-    PageHolderObject< page > xPage (aNode.get());
-    page & rPage = (*xPage);
-
-    // Check current page index.
-    sal_uInt16 i = rPage.find (rEntry), n = rPage.usageCount();
-    if (!(i < n))
-    {
-        // Path to entry not exists (Must not happen(?)).
-        return store_E_NotExists;
-    }
-
-    // Compare entry.
-    entry::CompareResult result = rEntry.compare (rPage.m_pData[i]);
-
-    for (; result == entry::COMPARE_GREATER && xPage->depth() > 0; )
-    {
-        // Check next node address.
-        sal_uInt32 const nAddr = rPage.m_pData[i].m_aLink.location();
-        if (nAddr == STORE_PAGE_NULL)
-        {
-            // Path to entry not exists (Must not happen(?)).
-            return store_E_NotExists;
-        }
-
-        // Load next node page.
-        eErrCode = loadObjectAt (aNode, nAddr);
-
-        PageHolderObject< page > xNext (aNode.get());
-        xNext.swap (xPage);
-    }
-
-    aNode.remove (nIndex, rEntry, *this);
-
-
-    do
-    {
-        // Load next node page.
-        eErrCode = loadObjectAt (aNode, nAddr);
-
-        page const & rPage = (*xPage);
-
-        // Check current page index.
-        sal_uInt16 i = rPage.find (rEntry), n = rPage.usageCount();
-        if (!(i < n))
-        {
-            // Path to entry not exists (Must not happen(?)).
-            return store_E_NotExists;
-        }
-
-        // Compare entry.
-        result = rEntry.compare (rPage.m_pData[i]);
-
-    } while (result == entry::COMPATE_GREATER);
-}
-#endif /* EXP */
 
 storeError OStorePageManager::remove_Impl (entry & rEntry)
 {
@@ -1055,3 +991,5 @@ storeError OStorePageManager::rebuild (
     // Done.
     return store_E_None;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index bd5d60a72d3c..80841a618e72 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #ifndef _STORE_STORPAGE_HXX_
-#define _STORE_STORPAGE_HXX_ "$Revision: 1.6.8.2 $"
+#define _STORE_STORPAGE_HXX_
 
 #include "sal/types.h"
 
@@ -224,3 +225,4 @@ SAL_CALL query (IStoreHandle *pHandle, OStorePageManager*)
 
 #endif /* !_STORE_STORPAGE_HXX_ */
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx
index 23d7ca778961..508748c3b285 100644
--- a/store/source/stortree.cxx
+++ b/store/source/stortree.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -124,22 +125,6 @@ void OStoreBTreeNodeData::remove (sal_uInt16 i)
     }
 }
 
-#if 0  /* NYI */
-/*
- * merge (with right page).
- */
-void OStoreBTreeNodeData::merge (const self& rPageR)
-{
-    sal_uInt16 const n = usageCount();
-    sal_uInt16 const m = rPageR.usageCount();
-    if ((n + m) <= capacityCount())
-    {
-        memcpy (&(m_pData[n]), &(rPageR.m_pData[0]), m * sizeof(T));
-        usageCount (n + m);
-    }
-}
-#endif
-
 /*
  * split (left half copied from right half of left page).
  */
@@ -280,25 +265,6 @@ storeError OStoreBTreeNodeObject::remove (
         }
         else
         {
-#if 0   /* NYI */
-            // Check for right sibling.
-            sal_uInt16 const nIndexR = nIndexL + 1;
-            if (nIndexR < rPage.usageCount())
-            {
-                // Load right link node.
-                self aNodeR;
-                eErrCode = rBIOS.loadObjectAt (aNodeR, rPage.m_pData[nIndexR].m_aLink.location());
-                if (eErrCode == store_E_None)
-                {
-                    if (rPageL.queryMerge (rPageR))
-                    {
-                        rPageL.merge (rPageR);
-
-                        eErrCode = rBIOS.free (rPageR.location());
-                    }
-                }
-            }
-#endif  /* NYI */
 
             // Relink.
             rPage.m_pData[nIndexL].m_aKey = xPageL->m_pData[0].m_aKey;
@@ -580,3 +546,5 @@ storeError OStoreBTreeRootObject::find_insert (
     (void) testInvariant("OStoreBTreeRootObject::find_insert(): leave");
     return store_E_None;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx
index 820b270b3649..15cb581d1e01 100644
--- a/store/source/stortree.hxx
+++ b/store/source/stortree.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
  ************************************************************************/
 
 #ifndef _STORE_STORTREE_HXX
-#define _STORE_STORTREE_HXX "$Revision: 1.6.8.2 $"
+#define _STORE_STORTREE_HXX
 
 #include "sal/types.h"
 
@@ -221,12 +222,6 @@ struct OStoreBTreeNodeData : public store::OStorePageData
     void       insert (sal_uInt16 i, const T& t);
     void       remove (sal_uInt16 i);
 
-#if 0  /* NYI */
-    /** merge (with right page).
-     */
-    void merge (const self& rPageR);
-#endif
-
     /** split (left half copied from right half of left page).
     */
     void split (const self& rPageL);
@@ -343,3 +338,5 @@ private:
 } // namespace store
 
 #endif /* !_STORE_STORTREE_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/util/makefile.mk b/store/util/makefile.mk
index 492f54cfa4f4..5129273d81d0 100644
--- a/store/util/makefile.mk
+++ b/store/util/makefile.mk
@@ -56,7 +56,11 @@ LIB1FILES=	$(LB)$/store.lib
 # --- Shared-Library ---
 
 SHL1TARGET= 	$(TARGET)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB= 	istore
+.ELSE
+SHL1IMPLIB= 	store$(UDK_MAJOR)
+.ENDIF
 
 SHL1VERSIONMAP=	$(TARGET).map
 
diff --git a/store/workben/t_base.cxx b/store/workben/t_base.cxx
index 7f99c287a210..6a96b7c15bb1 100644
--- a/store/workben/t_base.cxx
+++ b/store/workben/t_base.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -182,15 +183,6 @@ static void __store_string_newFromUnicode_WithLength (
         OUSTRING_TO_OSTRING_CVTFLAGS);
 }
 
-#if 0  /* UNSUSED */
-static void __store_string_newFromUnicode (
-    rtl_String **newString, const rtl_uString *value)
-{
-    __store_string_newFromUnicode_WithLength (
-        newString, value->buffer, value->length);
-}
-#endif /* UNUSED */
-
 static void __store_string_newFromUnicode (
     rtl_String **newString, const sal_Unicode *value)
 {
@@ -369,3 +361,5 @@ int SAL_CALL main (int argc, char **argv)
     xBIOS.clear();
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/workben/t_file.cxx b/store/workben/t_file.cxx
index f03b0346db4c..6357e7b8a5a6 100644
--- a/store/workben/t_file.cxx
+++ b/store/workben/t_file.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,28 +63,6 @@ int SAL_CALL main (int argc, char **argv)
             argv[1], rtl_str_getLength(argv[1]),
             osl_getThreadTextEncoding());
 
-#if 0   /* EXP */
-        oslFileError result;
-        rtl::OUString aPath;
-
-        result = osl_getFileURLFromSystemPath(aFilename.pData, &(aPath.pData));
-        if (result != osl_File_E_None)
-        {
-            // not SystemPath, assume FileUrl.
-            aPath = aFilename;
-        }
-        if (rtl_ustr_ascii_shortenedCompare_WithLength(aPath.pData->buffer, aPath.pData->length, "file://", 7) != 0)
-        {
-            // not FileUrl, assume relative path.
-            rtl::OUString aBase;
-            (void) osl_getProcessWorkingDir (&(aBase.pData));
-
-            // absolute FileUrl.
-            (void) osl_getAbsoluteFileURL(aBase.pData, aPath.pData, &(aPath.pData));
-        }
-        aFilename = aPath;
-#endif  /* EXP */
-
         eErrCode = FileLockBytes_createInstance (
             xLockBytes, aFilename.pData, store_AccessReadWrite);
         if (eErrCode != store_E_None)
@@ -242,3 +221,5 @@ int SAL_CALL main (int argc, char **argv)
     xLockBytes.clear();
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/workben/t_leak.cxx b/store/workben/t_leak.cxx
index d4d7b8a840e1..32033268d618 100644
--- a/store/workben/t_leak.cxx
+++ b/store/workben/t_leak.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * t_leak.cxx
  */
@@ -11,9 +12,7 @@
 {
     rtl_Locale * pLocale = 0;
     osl_getProcessLocale (&pLocale);
-#if 0
-    rtl_TextEncoding te = osl_getThreadTextEncoding();
-    (void) te;
-#endif
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/workben/t_page.cxx b/store/workben/t_page.cxx
index a0645f00bc58..33ca80ea81a9 100644
--- a/store/workben/t_page.cxx
+++ b/store/workben/t_page.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * t_page.cxx
  */
@@ -126,12 +127,6 @@ SharedCount::Allocator::~Allocator()
 
 /*======================================================================*/
 
-#if 0  /* OLD */
-
-typedef store::OStorePageData PageData;
-
-#else  /* NEW */
-
 #if defined(OSL_BIGENDIAN)
 #define STORE_DWORD(dword) OSL_SWAPDWORD((dword))
 #else
@@ -209,8 +204,6 @@ struct PageData
     }
 };
 
-#endif /* NEW */
-
 class IPageAllocator
 {
 public:
@@ -707,75 +700,6 @@ public:
 };
 
 /*======================================================================*/
-#if 0  /* NYI */
-BIOS::load (PageObject & rPage, sal_uInt32 nOffset)
-{
-    result = m_xCache->readPageAt (rPage.get(), nOffset);
-    if (result == NotExists)
-    {
-        result = m_xLockBytes->readPageAt (rPage.get(), nOffset);
-        if (result != None)
-            return result;
-
-        result = rPage.verify();
-        if (result != None)
-            return result;
-
-        result = m_xCache->writePageAt (rPage.get(), nOffset);
-    }
-    return result;
-}
-BIOS::save (PageObject & rPage, sal_uInt32 nOffset)
-{
-    rPage.guard();
-    result = m_xLockBytes->writePageAt (rPage.get(), nOffset);
-    if (result != None)
-        return result;
-
-    return m_xCache->writePageAt (rPage.get(), nOffset);
-}
-BIOS::init (rxLockBytes, eAccessMode, nPageSize)
-{
-    SuperPage super;
-    if (eAccessMode == store_AccessCreate)
-    {
-        sal_uInt16 pagesize = nPageSize;
-        if ((STORE_MINIMUM_PAGESIZE > pagesize) || (pagesize > STORE_MAXIMUM_PAGESIZE))
-            return store_E_InvalidParameter;
-
-        pagesize = ((pagesize + STORE_MINIMUM_PAGESIZE - 1) & ~(STORE_MINIMUM_PAGESIZE - 1));
-        rxLockBytes->init (pagesize);
-
-        super = allocator->construct<SuperPage>();
-        super->guard();
-
-        rxLockBytes->writeAt (0, super, super->size());
-
-    }
-    if (eAccessMode != store_AccessCreate)
-    {
-        rxLockBytes->readAt (0, &super, super::theSize);
-
-        super.verify();
-    }
-    if (eErrCode != store_E_NotExists)
-
-
-}
-#endif /* NYI */
-/*======================================================================*/
-
-#if 0  /* NYI */
-class PageCache
-{
-  std::set<const sal_uInt32, PageObject> m_pages;
-public:
-  storeError readPageAt (PageObject & rPage, sal_uInt32 nOffset);
-  storeError writePageAt (PageObject const & rPage, sal_uInt32 nOffset);
-};
-#endif /* NYI */
-
-/*======================================================================*/
 
 class IPageAllocator;
 class IPageAccess
@@ -1225,15 +1149,6 @@ storeError MemoryPageAccess::writePageAt_Impl (PageHolder const & rPage, sal_uIn
     if (!(pagedata != 0))
         return store_E_InvalidParameter;
 
-#if 0  /* NYI */
-    sal_uInt16 const bytes = pagedata->size(); // Descr.m_nSize;
-    OSL_ASSERT(bytes >= PageData::thePageSize);
-
-    offset = rPage.location(); // Descr.m_nAddr;
-    OSL_ASSERT(nOffset == offset);
-
-    OSL_PRECOND(offset % bytes == 0, "Unaligned page write.");
-#endif /* NYI */
     return pokeAt (nOffset, pagedata, pagedata->size());
 }
 storeError MemoryPageAccess::peekAt_Impl (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes)
@@ -1374,106 +1289,6 @@ void MappedPageAccess::unmapFile (sal_uInt8 * pData, sal_uInt32 nSize)
   (void) osl_unmapFile (pData, nSize);
 }
 
-#if 0  /* NYI */
-storeError MemoryPageAccess_createInstance (
-  rtl::Reference< IPageAccess > & rxPageAccess,
-  storeAccessMode                 eAccessMode,
-  sal_uInt16                      nPageSize
-)
-{
-  rxPageAccess = new MemoryPageAccess();
-  if (!rxPageAccess.is())
-    return store_E_OutOfMemory;
-
-  return rxPageAccess->initialize (eAccessMode, nPageSize);
-}
-
-storeError FilePageAccess_createInstance (
-  rtl::Reference< IPageAccess > & rxPageAccess,
-  rtl_uString *                   pFilename,
-  storeAccessMode                 eAccessMode,
-  sal_uInt16                      nPageSize
-)
-{
-  // Acquire file handle.
-  ResourceHolder<FileHandle> xFile;
-  result = xFile.get().initialize (pFilename, MODE_TO_NATIVE(eAccessMode));
-  if (result != osl_File_E_None)
-    return ERROR_FROM_NATIVE(result);
-
-  if (eAccessMode == store_AccessReadOnly)
-  {
-    ResourceHolder<FileMapping> xMapping;
-    result = xMapping.get().initialize (xFile.get());
-    if (result == osl_File_E_None)
-    {
-      const sal_uInt32 nSize = sal::static_int_cast<sal_uInt32>(xMapping.get().m_uSize);
-      rxPageAccess = new MappedPageAccess (xMapping.get().m_pAddr, nSize);
-      if (!rxPageAccess.is())
-    return store_E_OutOfMemory;
-      (void) xMapping.release();
-    }
-  }
-  if (!rxPageAccess.is())
-  {
-    rxPageAccess = new FilePageAccess (xFile.get());
-    if (!rxPageAccess.is())
-      return store_E_OutOfMemory;
-    (void) xFile.release();
-  }
-  return rxPageAccess->initialize (eAccessMode, nPageSize);
-}
-#endif /* NYI */
-
-/*========================================================================
- *
- * test...
- *
- *======================================================================*/
-#if 0  /* NYI */
-
-struct IDataBlock
-{
-  virtual sal_uInt16 singleCount() const = 0;
-  virtual sal_uInt32 singleLink (sal_uInt16 nIndex) const = 0;
-  virtual void singleLink (sal_uInt16 nIndex, sal_uInt32 nAddr) = 0;
-
-  virtual storeError get() = 0;
-  virtual storeError put() = 0;
-  virtual storeError truncate() = 0;
-};
-
-struct InodePageData : public PageData
-{
-  virtual INameBlock & getNameBlock() = 0;
-  virtual IDataBlock & getDataBlock() = 0;
-};
-
-template< class page_data_type >
-page_data_type * query (PageData *, page_data_type *);
-
-template<> InodePageDataV2*
-query (PageData & rData, InodePageDataV2 *)
-{
-  if (rData.isKindOf(InodePageDataV2::m_nTypeId))
-    return static_cast<InodePageDataV2*>(&rData);
-  return 0;
-}
-
-class InodePageObject : public PageObject
-{
-public:
-  static InodePageObject createInstance (PageData & rData)
-  {
-    if (query(&rData, static_cast<InodePageDataV2*>(0)))
-      return InodePageObjectV2 (static_cast<InodePageDataV2&>(rData));
-    else if (query(&rData, static_cast<InodePageDataV1*>(0)))
-      return InodePageObjectV1 (static_cast<InodePageDataV1&>(rData));
-  }
-};
-
-#endif /* NYI */
-
 /*========================================================================
  *
  * main.
@@ -1482,33 +1297,6 @@ public:
 
 #include <stdio.h>
 
-#if 0  /* EXP */
-class Interface
-{
-public:
-  virtual void deallocate(void *) /* = 0 */;
-};
-
-class Implementation : public Interface
-{
-  SharedCount m_count;
-
-public:
-  Implementation() : Interface() { printf("Ctor(%p)\n", this); }
-  ~Implementation() { printf("Dtor(%p)\n", this); }
-
-  Implementation (Implementation const & rhs) : Interface(), m_count (rhs.m_count) { printf("CopyCtor(%p)\n", this); }
-
-  virtual void deallocate(void *) {}
-};
-
-Interface Interface_createInstance()
-{
-  Implementation aInst;
-  return aInst;
-}
-#endif /* EXP */
-
 int SAL_CALL main (int argc, char ** argv)
 {
   OSL_PRECOND(argc >= 1, "t_page: error: insufficient number of arguments.");
@@ -1533,12 +1321,6 @@ int SAL_CALL main (int argc, char ** argv)
       TestClient aClient;
       aClient.dwim (aBIOS);
   }
-#if 0  /* EXP */
-  {
-    Interface aIfc1 (Interface_createInstance());
-    Interface aIfc2 (aIfc1);
-  }
-#endif /* EXP */
 
   if (argc > 1)
   {
@@ -1572,3 +1354,5 @@ int SAL_CALL main (int argc, char ** argv)
 
   return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx
index 88e77cb07196..19678b2ab86e 100644
--- a/store/workben/t_store.cxx
+++ b/store/workben/t_store.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_store.hxx"
 
-#define _T_STORE_CXX "$Revision: 1.7.8.2 $"
+#define _T_STORE_CXX
 #include <sal/types.h>
 #include <osl/diagnose.h>
 #include <osl/thread.h>
@@ -173,7 +174,7 @@ DirectoryTraveller::DirectoryTraveller (
       m_nCount   (0)
 {
     m_aPath += rName;
-    m_aPath += OUString::createFromAscii("/");
+    m_aPath += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 }
 
 /*
@@ -369,7 +370,7 @@ int SAL_CALL main (int argc, char **argv)
         {
             OUString aName (RTL_CONSTASCII_USTRINGPARAM("demostor-"));
             aName += OUString::valueOf ((sal_Int32)(i + 1), 10);
-            aName += OUString::createFromAscii (".dat");
+            aName += OUString(RTL_CONSTASCII_USTRINGPARAM (".dat"));
 
 #if (_DEMOSTOR_REMOVE == 1)
             eErrCode = aFile.remove (aPath, aName);
@@ -457,7 +458,7 @@ int SAL_CALL main (int argc, char **argv)
     {
         // Create symlink to (root) directory.
         eErrCode = aFile.symlink (
-            aPath,      OUString::createFromAscii("000000/"),
+            aPath,      OUString(RTL_CONSTASCII_USTRINGPARAM("000000/")),
             OUString(), aPath);
         OSL_POSTCOND(
             ((eErrCode == store_E_None         ) ||
@@ -469,7 +470,7 @@ int SAL_CALL main (int argc, char **argv)
 
         eErrCode = aFile.symlink (
             aPath, aLinkName,
-            aPath, OUString::createFromAscii("demostor-1.dat"));
+            aPath, OUString(RTL_CONSTASCII_USTRINGPARAM("demostor-1.dat")));
         OSL_POSTCOND(
             ((eErrCode == store_E_None         ) ||
              (eErrCode == store_E_AlreadyExists)    ),
@@ -499,23 +500,6 @@ int SAL_CALL main (int argc, char **argv)
             "t_store::main(): store_createDirectory() failed");
         if (eErrCode == store_E_None)
         {
-#if 0  /* NYI */
-            // Rename directory.
-            eErrCode = aFile.rename (
-                aPath, "demostor-1.dir/",
-                aPath, "Renamed demostor-1.dir");
-            OSL_POSTCOND(
-                ((eErrCode == store_E_None         ) ||
-                 (eErrCode == store_E_AlreadyExists)    ),
-                "t_store::main(): store_rename() failed");
-
-            eErrCode = aFile.rename (
-                aPath, "Renamed demostor-1.dir/",
-                aPath, "demostor-1.dir");
-            OSL_POSTCOND(
-                (eErrCode == store_E_None),
-                "t_store::main(): store_rename() failed");
-#endif  /* NYI */
         }
     }
 
@@ -533,7 +517,7 @@ int SAL_CALL main (int argc, char **argv)
         {
             // Open symlink entry.
             eErrCode = aRootDir.create (
-                aFile, aPath, OUString::createFromAscii("000000"),
+                aFile, aPath, OUString(RTL_CONSTASCII_USTRINGPARAM("000000")),
                 store_AccessReadOnly);
         }
         else
@@ -603,3 +587,5 @@ int SAL_CALL main (int argc, char **argv)
 
     return 0;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl b/udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl
index 5c1ffe05beb0..2933ba0195ab 100644
--- a/udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl
+++ b/udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_beans_GetDirectPropertyTolerantResult_idl__
 #define __com_sun_star_beans_GetDirectPropertyTolerantResult_idl__
 
-#ifndef __com_sun_star_beans_TolerantPropertySetResultType_idl__
 #include <com/sun/star/beans/TolerantPropertySetResultType.idl>
-#endif
-
-#ifndef __com_sun_star_beans_GetPropertyTolerantResult_idl__
 #include <com/sun/star/beans/GetPropertyTolerantResult.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl b/udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl
index bcde3011b5ab..9d3f749c0e84 100644
--- a/udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl
+++ b/udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_beans_GetPropertyTolerantResult_idl__
 #define __com_sun_star_beans_GetPropertyTolerantResult_idl__
 
-#ifndef __com_sun_star_beans_TolerantPropertySetResultType_idl__
 #include <com/sun/star/beans/TolerantPropertySetResultType.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyState_idl__
 #include <com/sun/star/beans/PropertyState.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/IllegalTypeException.idl b/udkapi/com/sun/star/beans/IllegalTypeException.idl
index 72fca7c45076..056ed22b6d22 100644
--- a/udkapi/com/sun/star/beans/IllegalTypeException.idl
+++ b/udkapi/com/sun/star/beans/IllegalTypeException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_IllegalTypeException_idl__
 #define __com_sun_star_beans_IllegalTypeException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/Introspection.idl b/udkapi/com/sun/star/beans/Introspection.idl
index 517c402d6efa..ca4f1adc3a5e 100644
--- a/udkapi/com/sun/star/beans/Introspection.idl
+++ b/udkapi/com/sun/star/beans/Introspection.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_Introspection_idl__
 #define __com_sun_star_beans_Introspection_idl__
 
-#ifndef __com_sun_star_beans_XIntrospection_idl__
 #include <com/sun/star/beans/XIntrospection.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/IntrospectionException.idl b/udkapi/com/sun/star/beans/IntrospectionException.idl
index 2f8e62589d24..358cdefb9de0 100644
--- a/udkapi/com/sun/star/beans/IntrospectionException.idl
+++ b/udkapi/com/sun/star/beans/IntrospectionException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_IntrospectionException_idl__
 #define __com_sun_star_beans_IntrospectionException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/NotRemoveableException.idl b/udkapi/com/sun/star/beans/NotRemoveableException.idl
index bdda8ed44fba..d1332aef9f51 100644
--- a/udkapi/com/sun/star/beans/NotRemoveableException.idl
+++ b/udkapi/com/sun/star/beans/NotRemoveableException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_NotRemoveableException_idl__
 #define __com_sun_star_beans_NotRemoveableException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/Property.idl b/udkapi/com/sun/star/beans/Property.idl
index bd633f9a448a..e1efef113791 100644
--- a/udkapi/com/sun/star/beans/Property.idl
+++ b/udkapi/com/sun/star/beans/Property.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_Property_idl__
 #define __com_sun_star_beans_Property_idl__
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyBag.idl b/udkapi/com/sun/star/beans/PropertyBag.idl
index c0026af4b81a..6febe2580625 100644
--- a/udkapi/com/sun/star/beans/PropertyBag.idl
+++ b/udkapi/com/sun/star/beans/PropertyBag.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_beans_PropertyBag_idl__
 #define __com_sun_star_beans_PropertyBag_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
 #include <com/sun/star/beans/XPropertyAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyChangeEvent.idl b/udkapi/com/sun/star/beans/PropertyChangeEvent.idl
index 874373a2b1c1..2f95217c437f 100644
--- a/udkapi/com/sun/star/beans/PropertyChangeEvent.idl
+++ b/udkapi/com/sun/star/beans/PropertyChangeEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_PropertyChangeEvent_idl__
 #define __com_sun_star_beans_PropertyChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyExistException.idl b/udkapi/com/sun/star/beans/PropertyExistException.idl
index 4013e3b092fc..766483dcae8c 100644
--- a/udkapi/com/sun/star/beans/PropertyExistException.idl
+++ b/udkapi/com/sun/star/beans/PropertyExistException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_PropertyExistException_idl__
 #define __com_sun_star_beans_PropertyExistException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertySet.idl b/udkapi/com/sun/star/beans/PropertySet.idl
index 3be077a2ca9e..fb1f79f9f682 100644
--- a/udkapi/com/sun/star/beans/PropertySet.idl
+++ b/udkapi/com/sun/star/beans/PropertySet.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_beans_PropertySet_idl__
 #define __com_sun_star_beans_PropertySet_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
 #include <com/sun/star/beans/XPropertyAccess.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertyState_idl__
 #include <com/sun/star/beans/XPropertyState.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
 #include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl b/udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl
index d0ccd39e9c63..a8d8434a7bec 100644
--- a/udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl
+++ b/udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_PropertySetInfoChangeEvent_idl__
 #define __com_sun_star_beans_PropertySetInfoChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl b/udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl
index 1de67bb152c9..9870d1bd0566 100644
--- a/udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl
+++ b/udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_beans_PropertyStateChangeEvent_idl__
 #define __com_sun_star_beans_PropertyStateChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyState_idl__
 #include <com/sun/star/beans/PropertyState.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyValue.idl b/udkapi/com/sun/star/beans/PropertyValue.idl
index 4f53b7f4334f..ae8a247aec27 100644
--- a/udkapi/com/sun/star/beans/PropertyValue.idl
+++ b/udkapi/com/sun/star/beans/PropertyValue.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_beans_PropertyValue_idl__
 #define __com_sun_star_beans_PropertyValue_idl__
 
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyState_idl__
 #include <com/sun/star/beans/PropertyState.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/PropertyValues.idl b/udkapi/com/sun/star/beans/PropertyValues.idl
index f3fe17efc07a..7294c4469cd3 100644
--- a/udkapi/com/sun/star/beans/PropertyValues.idl
+++ b/udkapi/com/sun/star/beans/PropertyValues.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_PropertyValues_idl__
 #define __com_sun_star_beans_PropertyValues_idl__
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/PropertyVetoException.idl b/udkapi/com/sun/star/beans/PropertyVetoException.idl
index c8abf8e95b45..3253203df201 100644
--- a/udkapi/com/sun/star/beans/PropertyVetoException.idl
+++ b/udkapi/com/sun/star/beans/PropertyVetoException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #define __com_sun_star_beans_PropertyVetoException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/UnknownPropertyException.idl b/udkapi/com/sun/star/beans/UnknownPropertyException.idl
index 5d216743e1af..5444185cc1e7 100644
--- a/udkapi/com/sun/star/beans/UnknownPropertyException.idl
+++ b/udkapi/com/sun/star/beans/UnknownPropertyException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #define __com_sun_star_beans_UnknownPropertyException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XExactName.idl b/udkapi/com/sun/star/beans/XExactName.idl
index 716e33651302..d036ff577bbe 100644
--- a/udkapi/com/sun/star/beans/XExactName.idl
+++ b/udkapi/com/sun/star/beans/XExactName.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_XExactName_idl__
 #define __com_sun_star_beans_XExactName_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XFastPropertySet.idl b/udkapi/com/sun/star/beans/XFastPropertySet.idl
index 89ffd4a4288d..4beef8bd2985 100644
--- a/udkapi/com/sun/star/beans/XFastPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XFastPropertySet.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_beans_XFastPropertySet_idl__
 #define __com_sun_star_beans_XFastPropertySet_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl b/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl
index 31991a335b98..1ec3645baeba 100644
--- a/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_beans_XHierarchicalPropertySet_idl__
 #define __com_sun_star_beans_XHierarchicalPropertySet_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__
 #include <com/sun/star/beans/XHierarchicalPropertySetInfo.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl b/udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl
index 8d2f2aac3ec9..13fc5eba282c 100644
--- a/udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl
+++ b/udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__
 #define __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XIntroTest.idl b/udkapi/com/sun/star/beans/XIntroTest.idl
index 34b799cc1330..85e616202053 100644
--- a/udkapi/com/sun/star/beans/XIntroTest.idl
+++ b/udkapi/com/sun/star/beans/XIntroTest.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_beans_XIntroTest_idl__
 #define __com_sun_star_beans_XIntroTest_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_uno_TypeClass_idl__
 #include <com/sun/star/uno/TypeClass.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/XIntrospection.idl b/udkapi/com/sun/star/beans/XIntrospection.idl
index 5c7d6ed02cc2..c0be2f84037a 100644
--- a/udkapi/com/sun/star/beans/XIntrospection.idl
+++ b/udkapi/com/sun/star/beans/XIntrospection.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_beans_XIntrospection_idl__
 #define __com_sun_star_beans_XIntrospection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XIntrospectionAccess_idl__
 #include <com/sun/star/beans/XIntrospectionAccess.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XIntrospectionAccess.idl b/udkapi/com/sun/star/beans/XIntrospectionAccess.idl
index efd340916857..8b9a33417e03 100644
--- a/udkapi/com/sun/star/beans/XIntrospectionAccess.idl
+++ b/udkapi/com/sun/star/beans/XIntrospectionAccess.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_beans_XIntrospectionAccess_idl__
 #define __com_sun_star_beans_XIntrospectionAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlMethod_idl__
 #include <com/sun/star/reflection/XIdlMethod.idl>
-#endif
 
-#ifndef __com_sun_star_lang_NoSuchMethodException_idl__
 #include <com/sun/star/lang/NoSuchMethodException.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
-#ifndef __com_sun_star_beans_IllegalTypeException_idl__
 #include <com/sun/star/beans/IllegalTypeException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/XMaterialHolder.idl b/udkapi/com/sun/star/beans/XMaterialHolder.idl
index b89a84ce15a9..0ca8fb45547f 100644
--- a/udkapi/com/sun/star/beans/XMaterialHolder.idl
+++ b/udkapi/com/sun/star/beans/XMaterialHolder.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_beans_XMaterialHolder_idl__
 #define __com_sun_star_beans_XMaterialHolder_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl b/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl
index cfd1950cdcbe..088a8fa2f381 100644
--- a/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_beans_XMultiHierarchicalPropertySet_idl__
 #define __com_sun_star_beans_XMultiHierarchicalPropertySet_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__
 #include <com/sun/star/beans/XHierarchicalPropertySetInfo.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/XMultiPropertySet.idl b/udkapi/com/sun/star/beans/XMultiPropertySet.idl
index 1388c5d672af..7b5348896cea 100644
--- a/udkapi/com/sun/star/beans/XMultiPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XMultiPropertySet.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_beans_XMultiPropertySet_idl__
 #define __com_sun_star_beans_XMultiPropertySet_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
 #include <com/sun/star/beans/XPropertySetInfo.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__
 #include <com/sun/star/beans/XPropertiesChangeListener.idl>
-#endif
 
 
 //=============================================================================
@@ -81,7 +69,7 @@ published interface XMultiPropertySet: com::sun::star::uno::XInterface
         <p>The values of the properties must change before the bound
         events are fired. The values of the constrained properties
         should change after the vetoable events are fired and only if no
-        exception occured. Unknown properties are ignored.  </p>
+        exception occurred. Unknown properties are ignored.  </p>
 
         @param aPropertyNames
             specifies the names of the properties. All names must be unique.
diff --git a/udkapi/com/sun/star/beans/XMultiPropertyStates.idl b/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
index 340d627f93a6..ff8e9f2a1301 100644
--- a/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
+++ b/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_beans_XMultiPropertyState_idl__
 #define __com_sun_star_beans_XMultiPropertyState_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyState_idl__
 #include <com/sun/star/beans/PropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyStateChangeListener_idl__
 #include <com/sun/star/beans/XPropertyStateChangeListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertiesChangeListener.idl b/udkapi/com/sun/star/beans/XPropertiesChangeListener.idl
index 15cc7ec68c69..909bb521513d 100644
--- a/udkapi/com/sun/star/beans/XPropertiesChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XPropertiesChangeListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__
 #define __com_sun_star_beans_XPropertiesChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__
 #include <com/sun/star/beans/PropertyChangeEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl b/udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl
index b2e1096525a2..160b6012f95c 100644
--- a/udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl
+++ b/udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 #define __com_sun_star_beans_XPropertiesChangeNotifier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__
 #include <com/sun/star/beans/XPropertiesChangeListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/XProperty.idl b/udkapi/com/sun/star/beans/XProperty.idl
index 789e2f7e48dd..06528d2110e9 100644
--- a/udkapi/com/sun/star/beans/XProperty.idl
+++ b/udkapi/com/sun/star/beans/XProperty.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_beans_XProperty_idl__
 #define __com_sun_star_beans_XProperty_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/XPropertyAccess.idl b/udkapi/com/sun/star/beans/XPropertyAccess.idl
index 993507cb17ab..edb1a446bd92 100644
--- a/udkapi/com/sun/star/beans/XPropertyAccess.idl
+++ b/udkapi/com/sun/star/beans/XPropertyAccess.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_beans_XPropertyAccess_idl__
 #define __com_sun_star_beans_XPropertyAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertyChangeListener.idl b/udkapi/com/sun/star/beans/XPropertyChangeListener.idl
index 0c54cf39dcef..428fe4682702 100644
--- a/udkapi/com/sun/star/beans/XPropertyChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XPropertyChangeListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
 #define __com_sun_star_beans_XPropertyChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__
 #include <com/sun/star/beans/PropertyChangeEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertyContainer.idl b/udkapi/com/sun/star/beans/XPropertyContainer.idl
index eb70ba48c068..6ee300284ab1 100644
--- a/udkapi/com/sun/star/beans/XPropertyContainer.idl
+++ b/udkapi/com/sun/star/beans/XPropertyContainer.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_beans_XPropertyContainer_idl__
 #define __com_sun_star_beans_XPropertyContainer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyExistException_idl__
 #include <com/sun/star/beans/PropertyExistException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_IllegalTypeException_idl__
 #include <com/sun/star/beans/IllegalTypeException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_NotRemoveableException_idl__
 #include <com/sun/star/beans/NotRemoveableException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/XPropertySet.idl b/udkapi/com/sun/star/beans/XPropertySet.idl
index 3e9410506e5a..47d65480d036 100644
--- a/udkapi/com/sun/star/beans/XPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XPropertySet.idl
@@ -27,37 +27,21 @@
 #ifndef __com_sun_star_beans_XPropertySet_idl__
 #define __com_sun_star_beans_XPropertySet_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
 #include <com/sun/star/beans/XPropertySetInfo.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
 #include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XVetoableChangeListener_idl__
 #include <com/sun/star/beans/XVetoableChangeListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertySetInfo.idl b/udkapi/com/sun/star/beans/XPropertySetInfo.idl
index 09484a462cc6..158d1160d362 100644
--- a/udkapi/com/sun/star/beans/XPropertySetInfo.idl
+++ b/udkapi/com/sun/star/beans/XPropertySetInfo.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_beans_XPropertySetInfo_idl__
 #define __com_sun_star_beans_XPropertySetInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_Property_idl__
 #include <com/sun/star/beans/Property.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl b/udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl
index d740adabf256..d4a026bf04ec 100644
--- a/udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_beans_XPropertySetInfoChangeListener_idl__
 #define __com_sun_star_beans_XPropertySetInfoChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertySetInfoChangeEvent_idl__
 #include <com/sun/star/beans/PropertySetInfoChangeEvent.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl b/udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl
index dbad0258eef1..6a4f63dfa5ce 100644
--- a/udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl
+++ b/udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 #define __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeListener_idl__
 #include <com/sun/star/beans/XPropertySetInfoChangeListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/XPropertyState.idl b/udkapi/com/sun/star/beans/XPropertyState.idl
index 9ac89996aef1..df29f7e4b43b 100644
--- a/udkapi/com/sun/star/beans/XPropertyState.idl
+++ b/udkapi/com/sun/star/beans/XPropertyState.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_beans_XPropertyState_idl__
 #define __com_sun_star_beans_XPropertyState_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyState_idl__
 #include <com/sun/star/beans/PropertyState.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertyStateChangeListener_idl__
 #include <com/sun/star/beans/XPropertyStateChangeListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl b/udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl
index a3d56571c978..1a0649b7f4f7 100644
--- a/udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_beans_XPropertyStateChangeListener_idl__
 #define __com_sun_star_beans_XPropertyStateChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyStateChangeEvent_idl__
 #include <com/sun/star/beans/PropertyStateChangeEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XPropertyWithState.idl b/udkapi/com/sun/star/beans/XPropertyWithState.idl
index bdf87545468d..dc947a799db4 100644
--- a/udkapi/com/sun/star/beans/XPropertyWithState.idl
+++ b/udkapi/com/sun/star/beans/XPropertyWithState.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_beans_XPropertyWithState_idl__
 #define __com_sun_star_beans_XPropertyWithState_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyState_idl__
 #include <com/sun/star/beans/PropertyState.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl b/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl
index 6f17b8cc748c..ad3b93f1d959 100644
--- a/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl
@@ -28,25 +28,11 @@
 #define __com_sun_star_beans_XTolerantMultiPropertySet_idl__
 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_GetDirectPropertyTolerantResult_idl__
 #include <com/sun/star/beans/GetDirectPropertyTolerantResult.idl>
-#endif
-
-#ifndef __com_sun_star_beans_GetPropertyTolerantResult_idl__
 #include <com/sun/star/beans/GetPropertyTolerantResult.idl>
-#endif
-
-#ifndef __com_sun_star_beans_SetPropertyTolerantFailed_idl__
 #include <com/sun/star/beans/SetPropertyTolerantFailed.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/beans/XVetoableChangeListener.idl b/udkapi/com/sun/star/beans/XVetoableChangeListener.idl
index 674cbc3c9496..5cf776e40411 100644
--- a/udkapi/com/sun/star/beans/XVetoableChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XVetoableChangeListener.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_beans_XVetoableChangeListener_idl__
 #define __com_sun_star_beans_XVetoableChangeListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__
 #include <com/sun/star/beans/PropertyChangeEvent.idl>
-#endif
 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
 #include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/bridge/Bridge.idl b/udkapi/com/sun/star/bridge/Bridge.idl
index 90b53687ea5d..5d0e739a5520 100644
--- a/udkapi/com/sun/star/bridge/Bridge.idl
+++ b/udkapi/com/sun/star/bridge/Bridge.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_bridge_Bridge_idl__
 #define __com_sun_star_bridge_Bridge_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_bridge_XBridge_idl__
 #include <com/sun/star/bridge/XBridge.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/bridge/BridgeFactory.idl b/udkapi/com/sun/star/bridge/BridgeFactory.idl
index 8bf10c381504..0ae30101423e 100644
--- a/udkapi/com/sun/star/bridge/BridgeFactory.idl
+++ b/udkapi/com/sun/star/bridge/BridgeFactory.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_bridge_BridgeFactory_idl__
 #define __com_sun_star_bridge_BridgeFactory_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_bridge_XBridgeFactory_idl__
 #include <com/sun/star/bridge/XBridgeFactory.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/bridge/IiopBridge.idl b/udkapi/com/sun/star/bridge/IiopBridge.idl
index 7b38e2052ca0..4421d4d32d9a 100644
--- a/udkapi/com/sun/star/bridge/IiopBridge.idl
+++ b/udkapi/com/sun/star/bridge/IiopBridge.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_bridge_Iiop_idl__
 #define __com_sun_star_bridge_Iiop_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_bridge_XBridge_idl__
 #include <com/sun/star/bridge/XBridge.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/bridge/OleApplicationRegistration.idl b/udkapi/com/sun/star/bridge/OleApplicationRegistration.idl
index 7ad209982130..88856212fa05 100644
--- a/udkapi/com/sun/star/bridge/OleApplicationRegistration.idl
+++ b/udkapi/com/sun/star/bridge/OleApplicationRegistration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_bridge_OleApplicationRegistration_idl__
 #define __com_sun_star_bridge_OleApplicationRegistration_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/bridge/OleBridgeSupplier.idl b/udkapi/com/sun/star/bridge/OleBridgeSupplier.idl
index 3d1b9a655717..c11149fb894e 100644
--- a/udkapi/com/sun/star/bridge/OleBridgeSupplier.idl
+++ b/udkapi/com/sun/star/bridge/OleBridgeSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_bridge_OleBridgeSupplier_idl__
 #define __com_sun_star_bridge_OleBridgeSupplier_idl__
 
-#ifndef __com_sun_star_bridge_XBridgeSupplier_idl__
 #include <com/sun/star/bridge/XBridgeSupplier.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl b/udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl
index e9bf3d696ff0..70fed12d810b 100644
--- a/udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl
+++ b/udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_bridge_OleBridgeSupplier2_idl__
 #define __com_sun_star_bridge_OleBridgeSupplier2_idl__
 
-#ifndef __com_sun_star_bridge_XBridgeSupplier2_idl__
 #include <com/sun/star/bridge/XBridgeSupplier2.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/bridge/OleBridgeSupplierVar1.idl b/udkapi/com/sun/star/bridge/OleBridgeSupplierVar1.idl
index 6a237efb3185..d1f3b901c35f 100644
--- a/udkapi/com/sun/star/bridge/OleBridgeSupplierVar1.idl
+++ b/udkapi/com/sun/star/bridge/OleBridgeSupplierVar1.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_bridge_OleBridgeSupplierVar1_idl__
 #define __com_sun_star_bridge_OleBridgeSupplierVar1_idl__
 
-#ifndef __com_sun_star_bridge_OBridgeSupplier2_idl__
 #include <com/sun/star/bridge/OleBridgeSupplier2.idl>
-#endif
 
 
  module com {  module sun {  module star {  module bridge {
diff --git a/udkapi/com/sun/star/bridge/OleObjectFactory.idl b/udkapi/com/sun/star/bridge/OleObjectFactory.idl
index 3bc0ab7d5d3f..cbd31d5e6f77 100644
--- a/udkapi/com/sun/star/bridge/OleObjectFactory.idl
+++ b/udkapi/com/sun/star/bridge/OleObjectFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_bridge_OleObjectFactory_idl__
 #define __com_sun_star_bridge_OleObjectFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/bridge/UrpBridge.idl b/udkapi/com/sun/star/bridge/UrpBridge.idl
index 15326e5dd8b4..0d73b431c917 100644
--- a/udkapi/com/sun/star/bridge/UrpBridge.idl
+++ b/udkapi/com/sun/star/bridge/UrpBridge.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_bridge_Urp_idl__
 #define __com_sun_star_bridge_Urp_idl__
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_bridge_XBridge_idl__
 #include <com/sun/star/bridge/XBridge.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/bridge/XBridgeSupplier.idl b/udkapi/com/sun/star/bridge/XBridgeSupplier.idl
index d0597be94ce5..bacc723a3bdf 100644
--- a/udkapi/com/sun/star/bridge/XBridgeSupplier.idl
+++ b/udkapi/com/sun/star/bridge/XBridgeSupplier.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_bridge_XBridgeSupplier_idl__
 #define __com_sun_star_bridge_XBridgeSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_uno_Uik_idl__
 #include <com/sun/star/uno/Uik.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl b/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl
index 5dbbbff5487d..18cce6a40a24 100644
--- a/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl
+++ b/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_bridge_XBridgeSupplier2_idl__
 #define __com_sun_star_bridge_XBridgeSupplier2_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl b/udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl
index 8abd2d8068a1..95a54be5d379 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_bridge_oleautomation_ApplicationRegistration_idl__
 #define __com_sun_star_bridge_oleautomation_ApplicationRegistration_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl b/udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl
index 508b8831c994..b28b79a82261 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_bridge_oleautomation_BridgeSupplier_idl__
 #define __com_sun_star_bridge_oleautomation_BridgeSupplier_idl__
 
-#ifndef __com_sun_star_bridge_XBridgeSupplier2_idl__
 #include <com/sun/star/bridge/XBridgeSupplier2.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/bridge/oleautomation/Factory.idl b/udkapi/com/sun/star/bridge/oleautomation/Factory.idl
index 3863e0f11a5f..a6a8fae77d64 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/Factory.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/Factory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_bridge_oleautomation_Factory_idl__
 #define __com_sun_star_bridge_oleautomation_Factory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl b/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl
index 6c165693bcdc..1f251cb3399d 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_bridge_oleautomation_XAutomationObject_idl__
 #define __com_sun_star_bridge_oleautomation_XAutomationObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com {  module sun {  module star {  module bridge { module oleautomation {
 
diff --git a/udkapi/com/sun/star/container/ContainerEvent.idl b/udkapi/com/sun/star/container/ContainerEvent.idl
index 76b7cb07cc70..284a409f3310 100644
--- a/udkapi/com/sun/star/container/ContainerEvent.idl
+++ b/udkapi/com/sun/star/container/ContainerEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_container_ContainerEvent_idl__
 #define __com_sun_star_container_ContainerEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/ElementExistException.idl b/udkapi/com/sun/star/container/ElementExistException.idl
index 34dcb52d3dc0..a21e8d485770 100644
--- a/udkapi/com/sun/star/container/ElementExistException.idl
+++ b/udkapi/com/sun/star/container/ElementExistException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_container_ElementExistException_idl__
 #define __com_sun_star_container_ElementExistException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/NoSuchElementException.idl b/udkapi/com/sun/star/container/NoSuchElementException.idl
index b5343a33d064..994ba2539d39 100644
--- a/udkapi/com/sun/star/container/NoSuchElementException.idl
+++ b/udkapi/com/sun/star/container/NoSuchElementException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_container_NoSuchElementException_idl__
 #define __com_sun_star_container_NoSuchElementException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XChild.idl b/udkapi/com/sun/star/container/XChild.idl
index bb1cff98b99b..22ee6067600b 100644
--- a/udkapi/com/sun/star/container/XChild.idl
+++ b/udkapi/com/sun/star/container/XChild.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_container_XChild_idl__
 #define __com_sun_star_container_XChild_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XComponentEnumeration.idl b/udkapi/com/sun/star/container/XComponentEnumeration.idl
index 1cc0f5597e84..07ffdb8338bf 100644
--- a/udkapi/com/sun/star/container/XComponentEnumeration.idl
+++ b/udkapi/com/sun/star/container/XComponentEnumeration.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_container_XComponentEnumeration_idl__
 #define __com_sun_star_container_XComponentEnumeration_idl__
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl b/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl
index e8fcb33f4730..427cfe183df7 100644
--- a/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_container_XComponentEnumerationAccess_idl__
 #define __com_sun_star_container_XComponentEnumerationAccess_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_XComponentEnumeration_idl__
 #include <com/sun/star/container/XComponentEnumeration.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XContainer.idl b/udkapi/com/sun/star/container/XContainer.idl
index 686f0b1ea4c4..372b99f7ea29 100644
--- a/udkapi/com/sun/star/container/XContainer.idl
+++ b/udkapi/com/sun/star/container/XContainer.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_container_XContainer_idl__
 #define __com_sun_star_container_XContainer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XContainerListener_idl__
 #include <com/sun/star/container/XContainerListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl b/udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl
index 0b1c7f2a6926..80eaa1cbd6eb 100644
--- a/udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl
+++ b/udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_container_XContainerApproveBroadcaster_idl__
 #define __com_sun_star_container_XContainerApproveBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XContainerApproveListener.idl b/udkapi/com/sun/star/container/XContainerApproveListener.idl
index 323e4038e13a..7d2e3d902155 100644
--- a/udkapi/com/sun/star/container/XContainerApproveListener.idl
+++ b/udkapi/com/sun/star/container/XContainerApproveListener.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_container_XContainerApproveListener_idl
 #define __com_sun_star_container_XContainerApproveListener_idl
 
-#ifndef __com_sun_star_container_ContainerEvent_idl__
 #include <com/sun/star/container/ContainerEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_util_XVeto_idl__
 #include <com/sun/star/util/XVeto.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XContainerListener.idl b/udkapi/com/sun/star/container/XContainerListener.idl
index 5c1367ff11e5..222e78974042 100644
--- a/udkapi/com/sun/star/container/XContainerListener.idl
+++ b/udkapi/com/sun/star/container/XContainerListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_container_XContainerListener_idl__
 #define __com_sun_star_container_XContainerListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_container_ContainerEvent_idl__
 #include <com/sun/star/container/ContainerEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XContainerQuery.idl b/udkapi/com/sun/star/container/XContainerQuery.idl
index 611138365dbe..6215df8c119e 100644
--- a/udkapi/com/sun/star/container/XContainerQuery.idl
+++ b/udkapi/com/sun/star/container/XContainerQuery.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_container_XContainerQuery_idl__
 #define __com_sun_star_container_XContainerQuery_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XContentEnumerationAccess.idl b/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
index 37f2bc34b372..bc0fbea389b2 100644
--- a/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_container_XContentEnumerationAccess_idl__
 #define __com_sun_star_container_XContentEnumerationAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XElementAccess.idl b/udkapi/com/sun/star/container/XElementAccess.idl
index 754c01e53ee7..0ed72f1980c1 100644
--- a/udkapi/com/sun/star/container/XElementAccess.idl
+++ b/udkapi/com/sun/star/container/XElementAccess.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_container_XElementAccess_idl__
 #define __com_sun_star_container_XElementAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XEnumeration.idl b/udkapi/com/sun/star/container/XEnumeration.idl
index 7da0c79f4d0f..7905b852a760 100644
--- a/udkapi/com/sun/star/container/XEnumeration.idl
+++ b/udkapi/com/sun/star/container/XEnumeration.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_container_XEnumeration_idl__
 #define __com_sun_star_container_XEnumeration_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XEnumerationAccess.idl b/udkapi/com/sun/star/container/XEnumerationAccess.idl
index 0282a7cd3592..6bb24926ffca 100644
--- a/udkapi/com/sun/star/container/XEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XEnumerationAccess.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #define __com_sun_star_container_XEnumerationAccess_idl__
 
-#ifndef __com_sun_star_container_XElementAccess_idl__
 #include <com/sun/star/container/XElementAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XHierarchicalName.idl b/udkapi/com/sun/star/container/XHierarchicalName.idl
index 5913390249c9..16389a68c10d 100644
--- a/udkapi/com/sun/star/container/XHierarchicalName.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalName.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_container_XHierarchicalName_idl__
 #define __com_sun_star_container_XHierarchicalName_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl b/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl
index b19e6ad1dcb5..640a73dab405 100644
--- a/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
 #define __com_sun_star_container_XHierarchicalNameAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XHierarchicalNameContainer.idl b/udkapi/com/sun/star/container/XHierarchicalNameContainer.idl
index ae6de0e81ef2..347a1af21a0d 100644
--- a/udkapi/com/sun/star/container/XHierarchicalNameContainer.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalNameContainer.idl
@@ -27,29 +27,15 @@
 #ifndef __com_sun_star_container_XHierarchicalNameContainer_idl__
 #define __com_sun_star_container_XHierarchicalNameContainer_idl__
 
-#ifndef __com_sun_star_container_XHierarchicalNameReplace_idl__
 #include <com/sun/star/container/XHierarchicalNameReplace.idl>
-#endif
-
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XHierarchicalNameReplace.idl b/udkapi/com/sun/star/container/XHierarchicalNameReplace.idl
index ac8110d4e7b6..1cea2eeabbb1 100644
--- a/udkapi/com/sun/star/container/XHierarchicalNameReplace.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalNameReplace.idl
@@ -27,25 +27,14 @@
 #ifndef __com_sun_star_container_XHierarchicalNameReplace_idl__
 #define __com_sun_star_container_XHierarchicalNameReplace_idl__
 
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XIdentifierAccess.idl b/udkapi/com/sun/star/container/XIdentifierAccess.idl
index a13b4761ae00..c89c0369531e 100644
--- a/udkapi/com/sun/star/container/XIdentifierAccess.idl
+++ b/udkapi/com/sun/star/container/XIdentifierAccess.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_container_XIdentifierAccess_idl__
 #define __com_sun_star_container_XIdentifierAccess_idl__
 
-#ifndef __com_sun_star_container_XElementAccess_idl__
 #include <com/sun/star/container/XElementAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XIdentifierContainer.idl b/udkapi/com/sun/star/container/XIdentifierContainer.idl
index 138db504bd51..c8ba03a713df 100644
--- a/udkapi/com/sun/star/container/XIdentifierContainer.idl
+++ b/udkapi/com/sun/star/container/XIdentifierContainer.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_container_XIdentifierContainer_idl__
 #define __com_sun_star_container_XIdentifierContainer_idl__
 
-#ifndef __com_sun_star_container_XIdentifierReplace_idl__
 #include <com/sun/star/container/XIdentifierReplace.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XIdentifierReplace.idl b/udkapi/com/sun/star/container/XIdentifierReplace.idl
index 6b5fda44eb66..06690dbe4302 100644
--- a/udkapi/com/sun/star/container/XIdentifierReplace.idl
+++ b/udkapi/com/sun/star/container/XIdentifierReplace.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_container_XIdentifierReplace_idl__
 #define __com_sun_star_container_XIdentifierReplace_idl__
 
-#ifndef __com_sun_star_container_XIdentifierAccess_idl__
 #include <com/sun/star/container/XIdentifierAccess.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XImplicitIDAccess.idl b/udkapi/com/sun/star/container/XImplicitIDAccess.idl
index 4c108918a724..3e2acad2b406 100644
--- a/udkapi/com/sun/star/container/XImplicitIDAccess.idl
+++ b/udkapi/com/sun/star/container/XImplicitIDAccess.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_container_XImplicitIDAccess_idl__
 #define __com_sun_star_container_XImplicitIDAccess_idl__
 
-#ifndef __com_sun_star_container_XElementAccess_idl__
 #include <com/sun/star/container/XElementAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XImplicitIDContainer.idl b/udkapi/com/sun/star/container/XImplicitIDContainer.idl
index c7cfb4ba828a..1f5fbde509de 100644
--- a/udkapi/com/sun/star/container/XImplicitIDContainer.idl
+++ b/udkapi/com/sun/star/container/XImplicitIDContainer.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_container_XImplicitIDContainer_idl__
 #define __com_sun_star_container_XImplicitIDContainer_idl__
 
-#ifndef __com_sun_star_container_XImplicitIDReplace_idl__
 #include <com/sun/star/container/XImplicitIDReplace.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XImplicitIDReplace.idl b/udkapi/com/sun/star/container/XImplicitIDReplace.idl
index df0a0d739f84..9756fb1009c6 100644
--- a/udkapi/com/sun/star/container/XImplicitIDReplace.idl
+++ b/udkapi/com/sun/star/container/XImplicitIDReplace.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_container_XImplicitIDReplace_idl__
 #define __com_sun_star_container_XImplicitIDReplace_idl__
 
-#ifndef __com_sun_star_container_XImplicitIDAccess_idl__
 #include <com/sun/star/container/XImplicitIDAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XIndexAccess.idl b/udkapi/com/sun/star/container/XIndexAccess.idl
index 6cac3654f362..7575fa90bba1 100644
--- a/udkapi/com/sun/star/container/XIndexAccess.idl
+++ b/udkapi/com/sun/star/container/XIndexAccess.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_container_XIndexAccess_idl__
 #define __com_sun_star_container_XIndexAccess_idl__
 
-#ifndef __com_sun_star_container_XElementAccess_idl__
 #include <com/sun/star/container/XElementAccess.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/container/XIndexContainer.idl b/udkapi/com/sun/star/container/XIndexContainer.idl
index 6af5913ffc69..125e24651fd7 100644
--- a/udkapi/com/sun/star/container/XIndexContainer.idl
+++ b/udkapi/com/sun/star/container/XIndexContainer.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_container_XIndexContainer_idl__
 #define __com_sun_star_container_XIndexContainer_idl__
 
-#ifndef __com_sun_star_container_XIndexReplace_idl__
 #include <com/sun/star/container/XIndexReplace.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XIndexReplace.idl b/udkapi/com/sun/star/container/XIndexReplace.idl
index 915063dbadb0..6c5b31544c1c 100644
--- a/udkapi/com/sun/star/container/XIndexReplace.idl
+++ b/udkapi/com/sun/star/container/XIndexReplace.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_container_XIndexReplace_idl__
 #define __com_sun_star_container_XIndexReplace_idl__
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XNameAccess.idl b/udkapi/com/sun/star/container/XNameAccess.idl
index a845f1085bbe..d34089517ddc 100644
--- a/udkapi/com/sun/star/container/XNameAccess.idl
+++ b/udkapi/com/sun/star/container/XNameAccess.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_container_XNameAccess_idl__
 #define __com_sun_star_container_XNameAccess_idl__
 
-#ifndef __com_sun_star_container_XElementAccess_idl__
 #include <com/sun/star/container/XElementAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XNameContainer.idl b/udkapi/com/sun/star/container/XNameContainer.idl
index b11763f8649e..5e44f540c319 100644
--- a/udkapi/com/sun/star/container/XNameContainer.idl
+++ b/udkapi/com/sun/star/container/XNameContainer.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_container_XNameContainer_idl__
 #define __com_sun_star_container_XNameContainer_idl__
 
-#ifndef __com_sun_star_container_XNameReplace_idl__
 #include <com/sun/star/container/XNameReplace.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XNameReplace.idl b/udkapi/com/sun/star/container/XNameReplace.idl
index 286f2241cc78..707a9f4cfe3d 100644
--- a/udkapi/com/sun/star/container/XNameReplace.idl
+++ b/udkapi/com/sun/star/container/XNameReplace.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_container_XNameReplace_idl__
 #define __com_sun_star_container_XNameReplace_idl__
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
 #include <com/sun/star/container/XNameAccess.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XNamed.idl b/udkapi/com/sun/star/container/XNamed.idl
index b503514ee539..5be1679fcb8f 100644
--- a/udkapi/com/sun/star/container/XNamed.idl
+++ b/udkapi/com/sun/star/container/XNamed.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_container_XNamed_idl__
 #define __com_sun_star_container_XNamed_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XSet.idl b/udkapi/com/sun/star/container/XSet.idl
index 5377c2a0785a..5400f71643b6 100644
--- a/udkapi/com/sun/star/container/XSet.idl
+++ b/udkapi/com/sun/star/container/XSet.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_container_XSet_idl__
 #define __com_sun_star_container_XSet_idl__
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XStringKeyMap.idl b/udkapi/com/sun/star/container/XStringKeyMap.idl
index 49848e2da791..c25152a4186e 100644
--- a/udkapi/com/sun/star/container/XStringKeyMap.idl
+++ b/udkapi/com/sun/star/container/XStringKeyMap.idl
@@ -28,25 +28,11 @@
 #ifndef __com_sun_star_container_XStringKeyMap_idl__
 #define __com_sun_star_container_XStringKeyMap_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
 #include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XUniqueIDAccess.idl b/udkapi/com/sun/star/container/XUniqueIDAccess.idl
index 28e19afc726e..dff3b411adb2 100644
--- a/udkapi/com/sun/star/container/XUniqueIDAccess.idl
+++ b/udkapi/com/sun/star/container/XUniqueIDAccess.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_container_XUniqueIDAccess_idl__
 #define __com_sun_star_container_XUniqueIDAccess_idl__
 
-#ifndef __com_sun_star_container_XElementAccess_idl__
 #include <com/sun/star/container/XElementAccess.idl>
-#endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/corba/giop/giop.idl b/udkapi/com/sun/star/corba/giop/giop.idl
index 56e6fe67eda4..133683c0d18e 100644
--- a/udkapi/com/sun/star/corba/giop/giop.idl
+++ b/udkapi/com/sun/star/corba/giop/giop.idl
@@ -24,6 +24,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_corba_giop_giop_idl__
+#define __com_sun_star_corba_giop_giop_idl__
+
 #include <com/sun/star/corba/iop/iop.idl>
 module com { module sun { module star { module corba { module giop
 {
@@ -248,4 +251,4 @@ published   struct FragmentHeader_1_2
 
 
 }; }; }; }; };
-
+#endif
diff --git a/udkapi/com/sun/star/corba/iiop/iiop.idl b/udkapi/com/sun/star/corba/iiop/iiop.idl
index 055b4c8506bb..9365febaa4be 100644
--- a/udkapi/com/sun/star/corba/iiop/iiop.idl
+++ b/udkapi/com/sun/star/corba/iiop/iiop.idl
@@ -24,6 +24,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_corba_iiop_iiop_idl__
+#define __com_sun_star_corba_iiop_iiop_idl__
+
 #include <com/sun/star/corba/giop/giop.idl>
 module com { module sun { module star { module corba { module iiop
 {
@@ -84,4 +87,4 @@ published   struct BiDirIIOPServiceContext
     };
 
 }; }; }; }; };
-
+#endif
diff --git a/udkapi/com/sun/star/corba/iop/iop.idl b/udkapi/com/sun/star/corba/iop/iop.idl
index 85be91f3ae47..eb7f189caf4c 100644
--- a/udkapi/com/sun/star/corba/iop/iop.idl
+++ b/udkapi/com/sun/star/corba/iop/iop.idl
@@ -24,6 +24,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_corba_iop_iop_idl__
+#define __com_sun_star_corba_iop_iop_idl__
+
 #include <com/sun/star/corba/corba.idl>
 module com { module sun { module star { module corba { module iop
 { // IDL
@@ -120,4 +123,4 @@ module com { module sun { module star { module corba { module iop
         };
 
 }; }; }; }; };
-
+#endif
diff --git a/udkapi/com/sun/star/io/AlreadyConnectedException.idl b/udkapi/com/sun/star/io/AlreadyConnectedException.idl
index 4430eacda8ad..0a932f937fb0 100644
--- a/udkapi/com/sun/star/io/AlreadyConnectedException.idl
+++ b/udkapi/com/sun/star/io/AlreadyConnectedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_AlreadyConnectedException_idl__
 #define __com_sun_star_io_AlreadyConnectedException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/BufferSizeExceededException.idl b/udkapi/com/sun/star/io/BufferSizeExceededException.idl
index 881ae786b1cc..a06f0beae137 100644
--- a/udkapi/com/sun/star/io/BufferSizeExceededException.idl
+++ b/udkapi/com/sun/star/io/BufferSizeExceededException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_BufferSizeExceededException_idl__
 #define __com_sun_star_io_BufferSizeExceededException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/ConnectException.idl b/udkapi/com/sun/star/io/ConnectException.idl
index f67ae57a0e78..d3ad296c24c3 100644
--- a/udkapi/com/sun/star/io/ConnectException.idl
+++ b/udkapi/com/sun/star/io/ConnectException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_ConnectException_idl__
 #define __com_sun_star_io_ConnectException_idl__
 
-#ifndef __com_sun_star_io_SocketException_idl__
 #include <com/sun/star/io/SocketException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/io/DataInputStream.idl b/udkapi/com/sun/star/io/DataInputStream.idl
index df11692395e0..7d1b982e2916 100644
--- a/udkapi/com/sun/star/io/DataInputStream.idl
+++ b/udkapi/com/sun/star/io/DataInputStream.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_io_DataInputStream_idl__
 #define __com_sun_star_io_DataInputStream_idl__
 
-#ifndef __com_sun_star_io_XDataInputStream_idl__
 #include <com/sun/star/io/XDataInputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif
 
-#ifndef __com_sun_star_io_XConnectable_idl__
 #include <com/sun/star/io/XConnectable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/DataOutputStream.idl b/udkapi/com/sun/star/io/DataOutputStream.idl
index 9bfe73312192..7b5214221d02 100644
--- a/udkapi/com/sun/star/io/DataOutputStream.idl
+++ b/udkapi/com/sun/star/io/DataOutputStream.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_DataOutputStream_idl__
 #define __com_sun_star_io_DataOutputStream_idl__
 
-#ifndef __com_sun_star_io_XDataOutputStream_idl__
 #include <com/sun/star/io/XDataOutputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
 #include <com/sun/star/io/XActiveDataSource.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/DataTransferEvent.idl b/udkapi/com/sun/star/io/DataTransferEvent.idl
index d78f6eb4d64c..81fc59bc266b 100644
--- a/udkapi/com/sun/star/io/DataTransferEvent.idl
+++ b/udkapi/com/sun/star/io/DataTransferEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_DataTransferEvent_idl__
 #define __com_sun_star_io_DataTransferEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/IOException.idl b/udkapi/com/sun/star/io/IOException.idl
index 6b2da1b6351d..4ed41a9de659 100644
--- a/udkapi/com/sun/star/io/IOException.idl
+++ b/udkapi/com/sun/star/io/IOException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_IOException_idl__
 #define __com_sun_star_io_IOException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/MarkableInputStream.idl b/udkapi/com/sun/star/io/MarkableInputStream.idl
index 65058592cc06..9f6bdd167934 100644
--- a/udkapi/com/sun/star/io/MarkableInputStream.idl
+++ b/udkapi/com/sun/star/io/MarkableInputStream.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_io_DataInputStream_idl__
 #define __com_sun_star_io_DataInputStream_idl__
 
-#ifndef __com_sun_star_io_XMarkableStream_idl__
 #include <com/sun/star/io/XMarkableStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif
 
-#ifndef __com_sun_star_io_XConnectable_idl__
 #include <com/sun/star/io/XConnectable.idl>
-#endif
 
 
 module com {  module sun {  module star {  module io {
diff --git a/udkapi/com/sun/star/io/MarkableOutputStream.idl b/udkapi/com/sun/star/io/MarkableOutputStream.idl
index 576f7f56452a..d05bbcc2d34f 100644
--- a/udkapi/com/sun/star/io/MarkableOutputStream.idl
+++ b/udkapi/com/sun/star/io/MarkableOutputStream.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_io_DataInputStream_idl__
 #define __com_sun_star_io_DataInputStream_idl__
 
-#ifndef __com_sun_star_io_XMarkableStream_idl__
 #include <com/sun/star/io/XMarkableStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-
-#ifndef __com_sun_star_io_XConnectable_idl__
 #include <com/sun/star/io/XConnectable.idl>
-#endif
 
 
 module com {  module sun {  module star {  module io {
diff --git a/udkapi/com/sun/star/io/NoRouteToHostException.idl b/udkapi/com/sun/star/io/NoRouteToHostException.idl
index c37663eaf55d..e4a7047542c7 100644
--- a/udkapi/com/sun/star/io/NoRouteToHostException.idl
+++ b/udkapi/com/sun/star/io/NoRouteToHostException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_NoRouteToHostException_idl__
 #define __com_sun_star_io_NoRouteToHostException_idl__
 
-#ifndef __com_sun_star_io_SocketException_idl__
 #include <com/sun/star/io/SocketException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/io/NotConnectedException.idl b/udkapi/com/sun/star/io/NotConnectedException.idl
index 956e10896f96..ac357644765c 100644
--- a/udkapi/com/sun/star/io/NotConnectedException.idl
+++ b/udkapi/com/sun/star/io/NotConnectedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_NotConnectedException_idl__
 #define __com_sun_star_io_NotConnectedException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/ObjectInputStream.idl b/udkapi/com/sun/star/io/ObjectInputStream.idl
index 69e98d3a1d6e..61d914cee565 100644
--- a/udkapi/com/sun/star/io/ObjectInputStream.idl
+++ b/udkapi/com/sun/star/io/ObjectInputStream.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_io_ObjectInputStream_idl__
 #define __com_sun_star_io_ObjectInputStream_idl__
 
-#ifndef __com_sun_star_io_XObjectInputStream_idl__
 #include <com/sun/star/io/XObjectInputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif
 
-#ifndef __com_sun_star_io_XConnectable_idl__
 #include <com/sun/star/io/XConnectable.idl>
-#endif
 
-#ifndef __com_sun_star_io_XMarkableStream_idl__
 #include <com/sun/star/io/XMarkableStream.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/ObjectOutputStream.idl b/udkapi/com/sun/star/io/ObjectOutputStream.idl
index 3669db12b723..5dbd4ac0d7db 100644
--- a/udkapi/com/sun/star/io/ObjectOutputStream.idl
+++ b/udkapi/com/sun/star/io/ObjectOutputStream.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_io_ObjectOutputStream_idl__
 #define __com_sun_star_io_ObjectOutputStream_idl__
 
-#ifndef __com_sun_star_io_XObjectOutputStream_idl__
 #include <com/sun/star/io/XObjectOutputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
 #include <com/sun/star/io/XActiveDataSource.idl>
-#endif
 
-#ifndef __com_sun_star_io_XConnectable_idl__
 #include <com/sun/star/io/XConnectable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/Pipe.idl b/udkapi/com/sun/star/io/Pipe.idl
index 256f6357a447..8bd19de420b3 100644
--- a/udkapi/com/sun/star/io/Pipe.idl
+++ b/udkapi/com/sun/star/io/Pipe.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_Pipe_idl__
 #define __com_sun_star_io_Pipe_idl__
 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/Pump.idl b/udkapi/com/sun/star/io/Pump.idl
index 7e52e917d979..9d5013d6d2aa 100644
--- a/udkapi/com/sun/star/io/Pump.idl
+++ b/udkapi/com/sun/star/io/Pump.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_io_Pipe_idl__
 #define __com_sun_star_io_Pipe_idl__
 
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
 #include <com/sun/star/io/XActiveDataSource.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataControl_idl__
 #include <com/sun/star/io/XActiveDataControl.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/SequenceInputStream.idl b/udkapi/com/sun/star/io/SequenceInputStream.idl
index e480b280c0bd..ce99952f1da0 100644
--- a/udkapi/com/sun/star/io/SequenceInputStream.idl
+++ b/udkapi/com/sun/star/io/SequenceInputStream.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_SequenceInputStream_idl__
 #define __com_sun_star_io_SequenceInputStream_idl__
 
-#ifndef __com_sun_star_io_XSeekableInputStream_idl__
 #include <com/sun/star/io/XSeekableInputStream.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/SequenceOutputStream.idl b/udkapi/com/sun/star/io/SequenceOutputStream.idl
index 7822ac991004..db5919c89bec 100644
--- a/udkapi/com/sun/star/io/SequenceOutputStream.idl
+++ b/udkapi/com/sun/star/io/SequenceOutputStream.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_SequenceOutputStream_idl__
 #define __com_sun_star_io_SequenceOutputStream_idl__
 
-#ifndef __com_sun_star_io_XSequenceOutputStream_idl__
 #include <com/sun/star/io/XSequenceOutputStream.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/SocketException.idl b/udkapi/com/sun/star/io/SocketException.idl
index 2d53f43c0579..96fba987a8b1 100644
--- a/udkapi/com/sun/star/io/SocketException.idl
+++ b/udkapi/com/sun/star/io/SocketException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_SocketException_idl__
 #define __com_sun_star_io_SocketException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/io/TempFile.idl b/udkapi/com/sun/star/io/TempFile.idl
index 2a799e7ec21d..06b77e2b5c20 100644
--- a/udkapi/com/sun/star/io/TempFile.idl
+++ b/udkapi/com/sun/star/io/TempFile.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_TempFile_idl__
 #define __com_sun_star_io_TempFile_idl__
 
-#ifndef __com_sun_star_io_XTempFile_idl__
 #include <com/sun/star/io/XTempFile.idl>
-#endif
 
 
 //=========================================================================
diff --git a/udkapi/com/sun/star/io/TextInputStream.idl b/udkapi/com/sun/star/io/TextInputStream.idl
index 6f5e8dd00ac5..14a4e39269d5 100644
--- a/udkapi/com/sun/star/io/TextInputStream.idl
+++ b/udkapi/com/sun/star/io/TextInputStream.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_io_TextInputStream_idl__
 #define __com_sun_star_io_TextInputStream_idl__
 
-#ifndef __com_sun_star_io_XTextInputStream_idl__
 #include <com/sun/star/io/XTextInputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif
 
-#ifndef __com_sun_star_io_XConnectable_idl__
 #include <com/sun/star/io/XConnectable.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/TextOutputStream.idl b/udkapi/com/sun/star/io/TextOutputStream.idl
index 879b58070580..2aa44d93e78f 100644
--- a/udkapi/com/sun/star/io/TextOutputStream.idl
+++ b/udkapi/com/sun/star/io/TextOutputStream.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_TextOutputStream_idl__
 #define __com_sun_star_io_TextOutputStream_idl__
 
-#ifndef __com_sun_star_io_XTextOutputStream_idl__
 #include <com/sun/star/io/XTextOutputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
 #include <com/sun/star/io/XActiveDataSource.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/UnexpectedEOFException.idl b/udkapi/com/sun/star/io/UnexpectedEOFException.idl
index 234174a69c32..1dd1e5f9be24 100644
--- a/udkapi/com/sun/star/io/UnexpectedEOFException.idl
+++ b/udkapi/com/sun/star/io/UnexpectedEOFException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_UnexpectedEOFException_idl__
 #define __com_sun_star_io_UnexpectedEOFException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/UnknownHostException.idl b/udkapi/com/sun/star/io/UnknownHostException.idl
index 6cb2cf423b5c..7a75d05c35e3 100644
--- a/udkapi/com/sun/star/io/UnknownHostException.idl
+++ b/udkapi/com/sun/star/io/UnknownHostException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_UnknownHostException_idl__
 #define __com_sun_star_io_UnknownHostException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/io/WrongFormatException.idl b/udkapi/com/sun/star/io/WrongFormatException.idl
index 8be8f31c2c1c..acb71d453db3 100644
--- a/udkapi/com/sun/star/io/WrongFormatException.idl
+++ b/udkapi/com/sun/star/io/WrongFormatException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_WrongFormatException_idl__
 #define __com_sun_star_io_WrongFormatException_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XActiveDataControl.idl b/udkapi/com/sun/star/io/XActiveDataControl.idl
index 9e53a38b3d44..332ff97df044 100644
--- a/udkapi/com/sun/star/io/XActiveDataControl.idl
+++ b/udkapi/com/sun/star/io/XActiveDataControl.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XActiveDataControl_idl__
 #define __com_sun_star_io_XActiveDataControl_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_XStreamListener_idl__
 #include <com/sun/star/io/XStreamListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XActiveDataSink.idl b/udkapi/com/sun/star/io/XActiveDataSink.idl
index 3602e4d7c538..49d1b7503ac9 100644
--- a/udkapi/com/sun/star/io/XActiveDataSink.idl
+++ b/udkapi/com/sun/star/io/XActiveDataSink.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XActiveDataSink_idl__
 #define __com_sun_star_io_XActiveDataSink_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XActiveDataSource.idl b/udkapi/com/sun/star/io/XActiveDataSource.idl
index 441dedf5f371..1db5b3610bc3 100644
--- a/udkapi/com/sun/star/io/XActiveDataSource.idl
+++ b/udkapi/com/sun/star/io/XActiveDataSource.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XActiveDataSource_idl__
 #define __com_sun_star_io_XActiveDataSource_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XActiveDataStreamer.idl b/udkapi/com/sun/star/io/XActiveDataStreamer.idl
index 686981525d90..bdbc599a7968 100644
--- a/udkapi/com/sun/star/io/XActiveDataStreamer.idl
+++ b/udkapi/com/sun/star/io/XActiveDataStreamer.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XActiveDataStreamer_idl__
 #define __com_sun_star_io_XActiveDataStreamer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl b/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
index 1aa25e82f253..377fd5396648 100644
--- a/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
+++ b/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
@@ -28,12 +28,8 @@
 #ifndef __com_sun_star_io_XAsyncOutputMonitor_idl__
 #define __com_sun_star_io_XAsyncOutputMonitor_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include "com/sun/star/io/IOException.idl"
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include "com/sun/star/uno/XInterface.idl"
-#endif
 
 module com { module sun { module star { module io {
 
diff --git a/udkapi/com/sun/star/io/XConnectable.idl b/udkapi/com/sun/star/io/XConnectable.idl
index 8286e5add4af..9676e4a0befa 100644
--- a/udkapi/com/sun/star/io/XConnectable.idl
+++ b/udkapi/com/sun/star/io/XConnectable.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_XConnectable_idl__
 #define __com_sun_star_io_XConnectable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XDataExporter.idl b/udkapi/com/sun/star/io/XDataExporter.idl
index 672342a8a7a9..ee83d10b2cce 100644
--- a/udkapi/com/sun/star/io/XDataExporter.idl
+++ b/udkapi/com/sun/star/io/XDataExporter.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_io_XDataExporter_idl__
 #define __com_sun_star_io_XDataExporter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_io_XDataTransferEventListener_idl__
 #include <com/sun/star/io/XDataTransferEventListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XDataImporter.idl b/udkapi/com/sun/star/io/XDataImporter.idl
index b395ad91ceb1..09f285ce243b 100644
--- a/udkapi/com/sun/star/io/XDataImporter.idl
+++ b/udkapi/com/sun/star/io/XDataImporter.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_io_XDataImporter_idl__
 #define __com_sun_star_io_XDataImporter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
 #include <com/sun/star/io/XActiveDataSource.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_io_XDataTransferEventListener_idl__
 #include <com/sun/star/io/XDataTransferEventListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XDataInputStream.idl b/udkapi/com/sun/star/io/XDataInputStream.idl
index fc5183e89acc..d548d7382f33 100644
--- a/udkapi/com/sun/star/io/XDataInputStream.idl
+++ b/udkapi/com/sun/star/io/XDataInputStream.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XDataInputStream_idl__
 #define __com_sun_star_io_XDataInputStream_idl__
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XDataOutputStream.idl b/udkapi/com/sun/star/io/XDataOutputStream.idl
index ab64c9920257..2950ce40950a 100644
--- a/udkapi/com/sun/star/io/XDataOutputStream.idl
+++ b/udkapi/com/sun/star/io/XDataOutputStream.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XDataOutputStream_idl__
 #define __com_sun_star_io_XDataOutputStream_idl__
 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XDataTransferEventListener.idl b/udkapi/com/sun/star/io/XDataTransferEventListener.idl
index 2cc7d83a9e73..9efa84e2b5f1 100644
--- a/udkapi/com/sun/star/io/XDataTransferEventListener.idl
+++ b/udkapi/com/sun/star/io/XDataTransferEventListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XDataTransferEventListener_idl__
 #define __com_sun_star_io_XDataTransferEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_io_DataTransferEvent_idl__
 #include <com/sun/star/io/DataTransferEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XInputStream.idl b/udkapi/com/sun/star/io/XInputStream.idl
index 2ebbde5d61b1..7e425bdbb249 100644
--- a/udkapi/com/sun/star/io/XInputStream.idl
+++ b/udkapi/com/sun/star/io/XInputStream.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_io_XInputStream_idl__
 #define __com_sun_star_io_XInputStream_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_NotConnectedException_idl__
 #include <com/sun/star/io/NotConnectedException.idl>
-#endif
 
-#ifndef __com_sun_star_io_BufferSizeExceededException_idl__
 #include <com/sun/star/io/BufferSizeExceededException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XInputStreamProvider.idl b/udkapi/com/sun/star/io/XInputStreamProvider.idl
index f45aae34fb06..9ac2fdedab20 100644
--- a/udkapi/com/sun/star/io/XInputStreamProvider.idl
+++ b/udkapi/com/sun/star/io/XInputStreamProvider.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_XInputStreamProvider_idl__
 #define __com_sun_star_io_XInputStreamProvider_idl__
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/io/XMarkableStream.idl b/udkapi/com/sun/star/io/XMarkableStream.idl
index 856b01cef2bf..1d1233012f75 100644
--- a/udkapi/com/sun/star/io/XMarkableStream.idl
+++ b/udkapi/com/sun/star/io/XMarkableStream.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_io_XMarkableStream_idl__
 #define __com_sun_star_io_XMarkableStream_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XObjectInputStream.idl b/udkapi/com/sun/star/io/XObjectInputStream.idl
index 565cf5f4e9a5..a53b5041528b 100644
--- a/udkapi/com/sun/star/io/XObjectInputStream.idl
+++ b/udkapi/com/sun/star/io/XObjectInputStream.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_io_XObjectInputStream_idl__
 #define __com_sun_star_io_XObjectInputStream_idl__
 
-#ifndef __com_sun_star_io_XDataInputStream_idl__
 #include <com/sun/star/io/XDataInputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_XPersistObject_idl__
 #include <com/sun/star/io/XPersistObject.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XObjectOutputStream.idl b/udkapi/com/sun/star/io/XObjectOutputStream.idl
index 31d34a96bda0..0bc9d5d7587e 100644
--- a/udkapi/com/sun/star/io/XObjectOutputStream.idl
+++ b/udkapi/com/sun/star/io/XObjectOutputStream.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XObjectOutputStream_idl__
 #define __com_sun_star_io_XObjectOutputStream_idl__
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
-#ifndef __com_sun_star_io_XDataOutputStream_idl__
 #include <com/sun/star/io/XDataOutputStream.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/io/XOutputStream.idl b/udkapi/com/sun/star/io/XOutputStream.idl
index cc2cd61bd963..74b168edd7eb 100644
--- a/udkapi/com/sun/star/io/XOutputStream.idl
+++ b/udkapi/com/sun/star/io/XOutputStream.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_io_XOutputStream_idl__
 #define __com_sun_star_io_XOutputStream_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_NotConnectedException_idl__
 #include <com/sun/star/io/NotConnectedException.idl>
-#endif
 
-#ifndef __com_sun_star_io_BufferSizeExceededException_idl__
 #include <com/sun/star/io/BufferSizeExceededException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XPersist.idl b/udkapi/com/sun/star/io/XPersist.idl
index 77f750c6599d..a3f6cc8416a1 100644
--- a/udkapi/com/sun/star/io/XPersist.idl
+++ b/udkapi/com/sun/star/io/XPersist.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XPersist_idl__
 #define __com_sun_star_io_XPersist_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XPersistObject.idl b/udkapi/com/sun/star/io/XPersistObject.idl
index 53da2b9a2e64..a206c4b3ac89 100644
--- a/udkapi/com/sun/star/io/XPersistObject.idl
+++ b/udkapi/com/sun/star/io/XPersistObject.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XPersistObject_idl__
 #define __com_sun_star_io_XPersistObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XSeekable.idl b/udkapi/com/sun/star/io/XSeekable.idl
index f22dbdb875ca..3a745c55aacc 100644
--- a/udkapi/com/sun/star/io/XSeekable.idl
+++ b/udkapi/com/sun/star/io/XSeekable.idl
@@ -27,16 +27,10 @@
 #ifndef __com_sun_star_io_XSeekable_idl__
 #define __com_sun_star_io_XSeekable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/io/XSeekableInputStream.idl b/udkapi/com/sun/star/io/XSeekableInputStream.idl
index 63cbf0a6d306..5ce3896eedbe 100644
--- a/udkapi/com/sun/star/io/XSeekableInputStream.idl
+++ b/udkapi/com/sun/star/io/XSeekableInputStream.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XSeekableInputStream_idl__
 #define __com_sun_star_io_XSeekableInputStream_idl__
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_XSeekable_idl__
 #include <com/sun/star/io/XSeekable.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/io/XSequenceOutputStream.idl b/udkapi/com/sun/star/io/XSequenceOutputStream.idl
index 43539f82c647..546e65826e2b 100644
--- a/udkapi/com/sun/star/io/XSequenceOutputStream.idl
+++ b/udkapi/com/sun/star/io/XSequenceOutputStream.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_io_XSequenceOutputStream_idl__
 #define __com_sun_star_io_XSequenceOutputStream_idl__
 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
 #include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XStream.idl b/udkapi/com/sun/star/io/XStream.idl
index c24dfd020e0c..f8b76beb9e0d 100644
--- a/udkapi/com/sun/star/io/XStream.idl
+++ b/udkapi/com/sun/star/io/XStream.idl
@@ -27,16 +27,9 @@
 #ifndef __com_sun_star_io_XStream_idl__
 #define __com_sun_star_io_XStream_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/io/XStreamListener.idl b/udkapi/com/sun/star/io/XStreamListener.idl
index 5fc5d0b15edc..b548211d3594 100644
--- a/udkapi/com/sun/star/io/XStreamListener.idl
+++ b/udkapi/com/sun/star/io/XStreamListener.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_io_XStreamListener_idl__
 #define __com_sun_star_io_XStreamListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XTempFile.idl b/udkapi/com/sun/star/io/XTempFile.idl
index 7912004a07ef..bda47cffa887 100644
--- a/udkapi/com/sun/star/io/XTempFile.idl
+++ b/udkapi/com/sun/star/io/XTempFile.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_io_XTempFile_idl__
 #define __com_sun_star_io_XTempFile_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
 #include <com/sun/star/io/XStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XSeekable_idl__
 #include <com/sun/star/io/XSeekable.idl>
-#endif
 
 
 //========================================================================
diff --git a/udkapi/com/sun/star/io/XTextInputStream.idl b/udkapi/com/sun/star/io/XTextInputStream.idl
index 73b79218001f..29ffdcebf39a 100644
--- a/udkapi/com/sun/star/io/XTextInputStream.idl
+++ b/udkapi/com/sun/star/io/XTextInputStream.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XTextInputStream_idl__
 #define __com_sun_star_io_XTextInputStream_idl__
 
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XTextOutputStream.idl b/udkapi/com/sun/star/io/XTextOutputStream.idl
index 423d18682abc..b667198bae2b 100644
--- a/udkapi/com/sun/star/io/XTextOutputStream.idl
+++ b/udkapi/com/sun/star/io/XTextOutputStream.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_io_XTextOutputStream_idl__
 #define __com_sun_star_io_XTextOutputStream_idl__
 
-#ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
-#endif
 
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/io/XTruncate.idl b/udkapi/com/sun/star/io/XTruncate.idl
index 719922b198eb..b76a2a5d2d6f 100644
--- a/udkapi/com/sun/star/io/XTruncate.idl
+++ b/udkapi/com/sun/star/io/XTruncate.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_io_XTruncate_idl__
 #define __com_sun_star_io_XTruncate_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
 #include <com/sun/star/io/IOException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/io/XXMLExtractor.idl b/udkapi/com/sun/star/io/XXMLExtractor.idl
index 12ee0f23083b..3a1451130964 100644
--- a/udkapi/com/sun/star/io/XXMLExtractor.idl
+++ b/udkapi/com/sun/star/io/XXMLExtractor.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_io_XXMLExtractor_idl__
 #define __com_sun_star_io_XXMLExtractor_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
 #include <com/sun/star/io/XInputStream.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl b/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl
index 66fa96465b10..dd9226e9a9c9 100755..100644
--- a/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl
+++ b/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_java_InvalidJavaSettingsException_idl__
 #define __com_sun_star_java_InvalidJavaSettingsException_idl__
 
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
 #include <com/sun/star/java/JavaInitializationException.idl>
-#endif
 
 module com { module sun { module star { module java {
 
diff --git a/udkapi/com/sun/star/java/JavaDisabledException.idl b/udkapi/com/sun/star/java/JavaDisabledException.idl
index ef226072c13f..3fe8569b65b1 100644
--- a/udkapi/com/sun/star/java/JavaDisabledException.idl
+++ b/udkapi/com/sun/star/java/JavaDisabledException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_java_JavaDisabledException_idl__
 #define __com_sun_star_java_JavaDisabledException_idl__
 
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
 #include <com/sun/star/java/JavaInitializationException.idl>
-#endif
 
 module com { module sun { module star { module java {
 
diff --git a/udkapi/com/sun/star/java/JavaInitializationException.idl b/udkapi/com/sun/star/java/JavaInitializationException.idl
index c43ea40709b5..cf1a6f131ca3 100644
--- a/udkapi/com/sun/star/java/JavaInitializationException.idl
+++ b/udkapi/com/sun/star/java/JavaInitializationException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_java_JavaInitializationException_idl__
 #define __com_sun_star_java_JavaInitializationException_idl__
 
-#ifndef __com_sun_star_uno_DeploymentException_idl__
 #include <com/sun/star/uno/DeploymentException.idl>
-#endif
 
 module com { module sun { module star { module java {
 
diff --git a/udkapi/com/sun/star/java/JavaNotConfiguredException.idl b/udkapi/com/sun/star/java/JavaNotConfiguredException.idl
index db69e409811f..674a5898f99d 100644
--- a/udkapi/com/sun/star/java/JavaNotConfiguredException.idl
+++ b/udkapi/com/sun/star/java/JavaNotConfiguredException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_java_JavaNotConfiguredException_idl__
 #define __com_sun_star_java_JavaNotConfiguredException_idl__
 
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
 #include <com/sun/star/java/JavaInitializationException.idl>
-#endif
 
 module com { module sun { module star { module java {
 
diff --git a/udkapi/com/sun/star/java/JavaNotFoundException.idl b/udkapi/com/sun/star/java/JavaNotFoundException.idl
index 5dbc369a9f6d..f104966bd6bb 100644
--- a/udkapi/com/sun/star/java/JavaNotFoundException.idl
+++ b/udkapi/com/sun/star/java/JavaNotFoundException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_java_JavaNotFoundException_idl__
 #define __com_sun_star_java_JavaNotFoundException_idl__
 
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
 #include <com/sun/star/java/JavaInitializationException.idl>
-#endif
 
 module com { module sun { module star { module java {
 
diff --git a/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl b/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl
index 6f027e9556fc..3be4f4a65fff 100644
--- a/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl
+++ b/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_java_JavaVMCreationFailureException_idl__
 #define __com_sun_star_java_JavaVMCreationFailureException_idl__
 
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
 #include <com/sun/star/java/JavaInitializationException.idl>
-#endif
 
 module com { module sun { module star { module java {
 
diff --git a/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl b/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl
index dd98d8eeaa3e..8a3083431752 100644
--- a/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl
+++ b/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_java_MissingJavaRuntimeException_idl__
 #define __com_sun_star_java_MissingJavaRuntimeException_idl__
 
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
 #include <com/sun/star/java/JavaInitializationException.idl>
-#endif
 
 module com { module sun { module star { module java {
 
diff --git a/udkapi/com/sun/star/java/RestartRequiredException.idl b/udkapi/com/sun/star/java/RestartRequiredException.idl
index c07271e424a1..2964727db439 100755..100644
--- a/udkapi/com/sun/star/java/RestartRequiredException.idl
+++ b/udkapi/com/sun/star/java/RestartRequiredException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_java_RestartRequiredException_idl__
 #define __com_sun_star_java_RestartRequiredException_idl__
 
-#ifndef __com_sun_star_java_JavaInitializationException_idl__
 #include <com/sun/star/java/JavaInitializationException.idl>
-#endif
 
 module com { module sun { module star { module java {
 
diff --git a/udkapi/com/sun/star/java/WrongJavaVersionException.idl b/udkapi/com/sun/star/java/WrongJavaVersionException.idl
index 5cf1840bbc61..dbb878117ff7 100644
--- a/udkapi/com/sun/star/java/WrongJavaVersionException.idl
+++ b/udkapi/com/sun/star/java/WrongJavaVersionException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_java_WrongJavaVersionException_idl__
 #define __com_sun_star_java_WrongJavaVersionException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include "com/sun/star/uno/Exception.idl"
-#endif
 
 module com { module sun { module star { module java {
 
diff --git a/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl b/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
index 788ecfec33f6..e4dd761fc3f0 100644
--- a/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
+++ b/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_java_XJavaThreadRegister_11_idl__
 #define __com_sun_star_java_XJavaThreadRegister_11_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/java/XJavaVM.idl b/udkapi/com/sun/star/java/XJavaVM.idl
index 4f31f3994ef1..239f0126197e 100644
--- a/udkapi/com/sun/star/java/XJavaVM.idl
+++ b/udkapi/com/sun/star/java/XJavaVM.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_java_XJavaVM_idl__
 #define __com_sun_star_java_XJavaVM_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl b/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl
index b491f06eb41a..a140bec80fc9 100644
--- a/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl
+++ b/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__
 #define __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__
 
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/ClassNotFoundException.idl b/udkapi/com/sun/star/lang/ClassNotFoundException.idl
index 4b2d3e3ed415..baf6aa0fbaf2 100644
--- a/udkapi/com/sun/star/lang/ClassNotFoundException.idl
+++ b/udkapi/com/sun/star/lang/ClassNotFoundException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_ClassNotFoundException_idl__
 #define __com_sun_star_lang_ClassNotFoundException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/DisposedException.idl b/udkapi/com/sun/star/lang/DisposedException.idl
index 5e404c6b1def..fa71abf2b6dc 100644
--- a/udkapi/com/sun/star/lang/DisposedException.idl
+++ b/udkapi/com/sun/star/lang/DisposedException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_DisposedException_idl__
 #define __com_sun_star_lang_DisposedException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/EventObject.idl b/udkapi/com/sun/star/lang/EventObject.idl
index 4cab388aafbf..b3565839783c 100644
--- a/udkapi/com/sun/star/lang/EventObject.idl
+++ b/udkapi/com/sun/star/lang/EventObject.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_EventObject_idl__
 #define __com_sun_star_lang_EventObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/IllegalAccessException.idl b/udkapi/com/sun/star/lang/IllegalAccessException.idl
index 0e9332b43019..cd9da6975f01 100644
--- a/udkapi/com/sun/star/lang/IllegalAccessException.idl
+++ b/udkapi/com/sun/star/lang/IllegalAccessException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_IllegalAccessException_idl__
 #define __com_sun_star_lang_IllegalAccessException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/IllegalArgumentException.idl b/udkapi/com/sun/star/lang/IllegalArgumentException.idl
index 4aafc1f08648..7e53d43b439f 100644
--- a/udkapi/com/sun/star/lang/IllegalArgumentException.idl
+++ b/udkapi/com/sun/star/lang/IllegalArgumentException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #define __com_sun_star_lang_IllegalArgumentException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl b/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl
index 33747c07b9a6..dc233efd91c6 100644
--- a/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl
+++ b/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #define __com_sun_star_lang_IndexOutOfBoundsException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/InvalidListenerException.idl b/udkapi/com/sun/star/lang/InvalidListenerException.idl
index 24460b32a607..ddf1419ffab4 100644
--- a/udkapi/com/sun/star/lang/InvalidListenerException.idl
+++ b/udkapi/com/sun/star/lang/InvalidListenerException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_InvalidListenerException_idl__
 #define __com_sun_star_lang_InvalidListenerException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/ListenerExistException.idl b/udkapi/com/sun/star/lang/ListenerExistException.idl
index 5505426b468e..3912ad1f1253 100644
--- a/udkapi/com/sun/star/lang/ListenerExistException.idl
+++ b/udkapi/com/sun/star/lang/ListenerExistException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_ListenerExistException_idl__
 #define __com_sun_star_lang_ListenerExistException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/MultiServiceFactory.idl b/udkapi/com/sun/star/lang/MultiServiceFactory.idl
index d55199784370..7eeaa6a9e504 100644
--- a/udkapi/com/sun/star/lang/MultiServiceFactory.idl
+++ b/udkapi/com/sun/star/lang/MultiServiceFactory.idl
@@ -27,16 +27,10 @@
 #ifndef __com_sun_star_lang_MultiServiceFactory_idl__
 #define __com_sun_star_lang_MultiServiceFactory_idl__
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
 #include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/NoSuchFieldException.idl b/udkapi/com/sun/star/lang/NoSuchFieldException.idl
index 2ae3045275f3..5d9c5caa2eec 100644
--- a/udkapi/com/sun/star/lang/NoSuchFieldException.idl
+++ b/udkapi/com/sun/star/lang/NoSuchFieldException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_NoSuchFieldException_idl__
 #define __com_sun_star_lang_NoSuchFieldException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/NoSuchMethodException.idl b/udkapi/com/sun/star/lang/NoSuchMethodException.idl
index dfaab8937843..f07550ce5652 100644
--- a/udkapi/com/sun/star/lang/NoSuchMethodException.idl
+++ b/udkapi/com/sun/star/lang/NoSuchMethodException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_NoSuchMethodException_idl__
 #define __com_sun_star_lang_NoSuchMethodException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/NoSupportException.idl b/udkapi/com/sun/star/lang/NoSupportException.idl
index 0048e2faf0a0..2632abfd36cd 100644
--- a/udkapi/com/sun/star/lang/NoSupportException.idl
+++ b/udkapi/com/sun/star/lang/NoSupportException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_NoSupportException_idl__
 #define __com_sun_star_lang_NoSupportException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/NotInitializedException.idl b/udkapi/com/sun/star/lang/NotInitializedException.idl
index b876d4180d27..f5113326fd28 100644
--- a/udkapi/com/sun/star/lang/NotInitializedException.idl
+++ b/udkapi/com/sun/star/lang/NotInitializedException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_lang_NotInitializedException_idl__
 #define __com_sun_star_lang_NotInitializedException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/lang/NullPointerException.idl b/udkapi/com/sun/star/lang/NullPointerException.idl
index 939c278ba797..047b67b577c2 100644
--- a/udkapi/com/sun/star/lang/NullPointerException.idl
+++ b/udkapi/com/sun/star/lang/NullPointerException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_NullPointerException_idl__
 #define __com_sun_star_lang_NullPointerException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/RegistryServiceManager.idl b/udkapi/com/sun/star/lang/RegistryServiceManager.idl
index 78cd1b018ac0..b4f9c070543f 100644
--- a/udkapi/com/sun/star/lang/RegistryServiceManager.idl
+++ b/udkapi/com/sun/star/lang/RegistryServiceManager.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_lang_RegistryServiceManager_idl__
 #define __com_sun_star_lang_RegistryServiceManager_idl__
 
-#ifndef __com_sun_star_lang_ServiceManager_idl__
 #include <com/sun/star/lang/ServiceManager.idl>
-#endif
 
-#ifndef __com_sun_star_lang_MultiServiceFactory_idl__
 #include <com/sun/star/lang/MultiServiceFactory.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
 #include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/ServiceManager.idl b/udkapi/com/sun/star/lang/ServiceManager.idl
index e49e21e8a648..5203b839b14b 100644
--- a/udkapi/com/sun/star/lang/ServiceManager.idl
+++ b/udkapi/com/sun/star/lang/ServiceManager.idl
@@ -27,37 +27,20 @@
 #ifndef __com_sun_star_lang_ServiceManager_idl__
 #define __com_sun_star_lang_ServiceManager_idl__
 
-#ifndef __com_sun_star_lang_MultiServiceFactory_idl__
 #include <com/sun/star/lang/MultiServiceFactory.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
-#ifndef __com_sun_star_container_XSet_idl__
 #include <com/sun/star/container/XSet.idl>
-#endif
 
-#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__
 #include <com/sun/star/container/XContentEnumerationAccess.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
 #include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl b/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl
index c75835b90194..51de3048b85e 100644
--- a/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl
+++ b/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__
 #define __com_sun_star_lang_ServiceNotRegisteredException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/SystemDependent.idl b/udkapi/com/sun/star/lang/SystemDependent.idl
index 5d4bf69be0e6..378fed5d9ed6 100644
--- a/udkapi/com/sun/star/lang/SystemDependent.idl
+++ b/udkapi/com/sun/star/lang/SystemDependent.idl
@@ -94,13 +94,6 @@ published constants SystemDependent
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_OS2
-    /** The called interface method returns a value specified for  the <em>OS/2</em> system.
-     */
-    const short SYSTEM_OS2 = 4;
-
-    //-------------------------------------------------------------------------
-
     // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_MAC
     /** The called interface method returns a value specified for the <em>MAC-OS</em> system.
      */
diff --git a/udkapi/com/sun/star/lang/WrappedTargetException.idl b/udkapi/com/sun/star/lang/WrappedTargetException.idl
index 169b0073f9a7..32ea7682f90b 100644
--- a/udkapi/com/sun/star/lang/WrappedTargetException.idl
+++ b/udkapi/com/sun/star/lang/WrappedTargetException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #define __com_sun_star_lang_WrappedTargetException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl b/udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl
index 0a48f02d672a..48e2a3e485c0 100644
--- a/udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl
+++ b/udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_WrappedTargetRuntimeException_idl__
 #define __com_sun_star_lang_WrappedTargetRuntimeException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/lang/XComponent.idl b/udkapi/com/sun/star/lang/XComponent.idl
index 250842aebd40..0b6071e3c204 100644
--- a/udkapi/com/sun/star/lang/XComponent.idl
+++ b/udkapi/com/sun/star/lang/XComponent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_XComponent_idl__
 #define __com_sun_star_lang_XComponent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/lang/XConnectionPoint.idl b/udkapi/com/sun/star/lang/XConnectionPoint.idl
index 7d20e9703465..292bcbf25a7f 100644
--- a/udkapi/com/sun/star/lang/XConnectionPoint.idl
+++ b/udkapi/com/sun/star/lang/XConnectionPoint.idl
@@ -27,21 +27,12 @@
 #ifndef __com_sun_star_lang_XConnectionPoint_idl__
 #define __com_sun_star_lang_XConnectionPoint_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XConnectionPointContainer_idl__
 #include <com/sun/star/lang/XConnectionPointContainer.idl>
-#endif
 
-#ifndef __com_sun_star_lang_ListenerExistException_idl__
 #include <com/sun/star/lang/ListenerExistException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_InvalidListenerException_idl__
 #include <com/sun/star/lang/InvalidListenerException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/XConnectionPointContainer.idl b/udkapi/com/sun/star/lang/XConnectionPointContainer.idl
index d21f97161ac1..c58887d4ac1a 100644
--- a/udkapi/com/sun/star/lang/XConnectionPointContainer.idl
+++ b/udkapi/com/sun/star/lang/XConnectionPointContainer.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_XConnectionPointContainer_idl__
 #define __com_sun_star_lang_XConnectionPointContainer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/lang/XEventListener.idl b/udkapi/com/sun/star/lang/XEventListener.idl
index 95128a6a78c6..cbecf3ec1148 100644
--- a/udkapi/com/sun/star/lang/XEventListener.idl
+++ b/udkapi/com/sun/star/lang/XEventListener.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_lang_XEventListener_idl__
 #define __com_sun_star_lang_XEventListener_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/XInitialization.idl b/udkapi/com/sun/star/lang/XInitialization.idl
index 26a7b5e7a5bf..ff1239e43cc9 100644
--- a/udkapi/com/sun/star/lang/XInitialization.idl
+++ b/udkapi/com/sun/star/lang/XInitialization.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_lang_XInitialization_idl__
 #define __com_sun_star_lang_XInitialization_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/XLocalizable.idl b/udkapi/com/sun/star/lang/XLocalizable.idl
index b270d9ecdc73..ed7083970e8f 100644
--- a/udkapi/com/sun/star/lang/XLocalizable.idl
+++ b/udkapi/com/sun/star/lang/XLocalizable.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_lang_XLocalizable_idl__
 #define __com_sun_star_lang_XLocalizable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/lang/XMain.idl b/udkapi/com/sun/star/lang/XMain.idl
index 85ce9b9e48ba..44bb7d6d6386 100644
--- a/udkapi/com/sun/star/lang/XMain.idl
+++ b/udkapi/com/sun/star/lang/XMain.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_lang_XMain_idl__
 #define __com_sun_star_lang_XMain_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/XMultiComponentFactory.idl b/udkapi/com/sun/star/lang/XMultiComponentFactory.idl
index 826b46257ce9..52be3fd4a955 100644
--- a/udkapi/com/sun/star/lang/XMultiComponentFactory.idl
+++ b/udkapi/com/sun/star/lang/XMultiComponentFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
 #define __com_sun_star_lang_XMultiComponentFactory_idl__
 
-#ifndef __com_sun_star_uno_XComponentContext_idl__
 #include <com/sun/star/uno/XComponentContext.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/XMultiServiceFactory.idl b/udkapi/com/sun/star/lang/XMultiServiceFactory.idl
index 73ed89b21b4c..a9b7baa78f20 100644
--- a/udkapi/com/sun/star/lang/XMultiServiceFactory.idl
+++ b/udkapi/com/sun/star/lang/XMultiServiceFactory.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #define __com_sun_star_lang_XMultiServiceFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/XServiceDisplayName.idl b/udkapi/com/sun/star/lang/XServiceDisplayName.idl
index 6715bc7e1212..def17b799765 100644
--- a/udkapi/com/sun/star/lang/XServiceDisplayName.idl
+++ b/udkapi/com/sun/star/lang/XServiceDisplayName.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_lang_XServiceDisplayName_idl__
 #define __com_sun_star_lang_XServiceDisplayName_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_Locale_idl__
 #include <com/sun/star/lang/Locale.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/lang/XServiceInfo.idl b/udkapi/com/sun/star/lang/XServiceInfo.idl
index 42f09f85e666..a75f4fee3ce9 100644
--- a/udkapi/com/sun/star/lang/XServiceInfo.idl
+++ b/udkapi/com/sun/star/lang/XServiceInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_XServiceInfo_idl__
 #define __com_sun_star_lang_XServiceInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/XServiceName.idl b/udkapi/com/sun/star/lang/XServiceName.idl
index ec4910e2a97f..cd3b246e0f45 100644
--- a/udkapi/com/sun/star/lang/XServiceName.idl
+++ b/udkapi/com/sun/star/lang/XServiceName.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_XServiceName_idl__
 #define __com_sun_star_lang_XServiceName_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/XSingleComponentFactory.idl b/udkapi/com/sun/star/lang/XSingleComponentFactory.idl
index 776003591d93..1f9bbb66ede2 100644
--- a/udkapi/com/sun/star/lang/XSingleComponentFactory.idl
+++ b/udkapi/com/sun/star/lang/XSingleComponentFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_XSingleComponentFactory_idl__
 #define __com_sun_star_lang_XSingleComponentFactory_idl__
 
-#ifndef __com_sun_star_uno_XComponentContext_idl__
 #include <com/sun/star/uno/XComponentContext.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/XSingleServiceFactory.idl b/udkapi/com/sun/star/lang/XSingleServiceFactory.idl
index e8b246394ce1..0defab1edc00 100644
--- a/udkapi/com/sun/star/lang/XSingleServiceFactory.idl
+++ b/udkapi/com/sun/star/lang/XSingleServiceFactory.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
 #define __com_sun_star_lang_XSingleServiceFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/lang/XTypeProvider.idl b/udkapi/com/sun/star/lang/XTypeProvider.idl
index 95b70e4febaf..721d7ecfe7c1 100644
--- a/udkapi/com/sun/star/lang/XTypeProvider.idl
+++ b/udkapi/com/sun/star/lang/XTypeProvider.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_lang_XTypeProvider_idl__
 #define __com_sun_star_lang_XTypeProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/lang/XUnoTunnel.idl b/udkapi/com/sun/star/lang/XUnoTunnel.idl
index c3fc7522a968..10176074fad1 100644
--- a/udkapi/com/sun/star/lang/XUnoTunnel.idl
+++ b/udkapi/com/sun/star/lang/XUnoTunnel.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_lang_XUnoTunnel_idl__
 #define __com_sun_star_lang_XUnoTunnel_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 
diff --git a/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl b/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl
index aaae21e4234f..adfd3ff761e0 100644
--- a/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl
+++ b/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_loader_CannotActivateFactoryException_idl__
 #define __com_sun_star_loader_CannotActivateFactoryException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/loader/Dynamic.idl b/udkapi/com/sun/star/loader/Dynamic.idl
index 800064c3050b..dcf19b826484 100644
--- a/udkapi/com/sun/star/loader/Dynamic.idl
+++ b/udkapi/com/sun/star/loader/Dynamic.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_loader_SharedLibrary_idl__
 #define __com_sun_star_loader_SharedLibrary_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
 module com {  module sun {  module star {  module loader {
 
diff --git a/udkapi/com/sun/star/loader/Java.idl b/udkapi/com/sun/star/loader/Java.idl
index 43ca17300bfe..ca34c0b64a1c 100644
--- a/udkapi/com/sun/star/loader/Java.idl
+++ b/udkapi/com/sun/star/loader/Java.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_loader_Java_idl__
 #define __com_sun_star_loader_Java_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
  module com {  module sun {  module star {  module loader {
 
diff --git a/udkapi/com/sun/star/loader/Java2.idl b/udkapi/com/sun/star/loader/Java2.idl
index 4e0c2ff2546a..e5e30f83cc4e 100644
--- a/udkapi/com/sun/star/loader/Java2.idl
+++ b/udkapi/com/sun/star/loader/Java2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_loader_Java2_idl__
 #define __com_sun_star_loader_Java2_idl__
 
-#ifndef __com_sun_star_loader_Java_idl__
 #include <com/sun/star/loader/Java.idl>
-#endif
 
 
 module com {  module sun {  module star {  module loader {
diff --git a/udkapi/com/sun/star/loader/SharedLibrary.idl b/udkapi/com/sun/star/loader/SharedLibrary.idl
index 29362851cba6..b6ae43b69120 100644
--- a/udkapi/com/sun/star/loader/SharedLibrary.idl
+++ b/udkapi/com/sun/star/loader/SharedLibrary.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_loader_SharedLibrary_idl__
 #define __com_sun_star_loader_SharedLibrary_idl__
 
-#ifndef __com_sun_star_lang_XServiceInfo_idl_idl__
 #include <com/sun/star/lang/XServiceInfo.idl>
-#endif
 
  module com {  module sun {  module star {  module loader {
 
diff --git a/udkapi/com/sun/star/loader/XImplementationLoader.idl b/udkapi/com/sun/star/loader/XImplementationLoader.idl
index 837c31867895..eca983010121 100644
--- a/udkapi/com/sun/star/loader/XImplementationLoader.idl
+++ b/udkapi/com/sun/star/loader/XImplementationLoader.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_loader_XImplementationLoader_idl__
 #define __com_sun_star_loader_XImplementationLoader_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_registry_XRegistryKey_idl__
 #include <com/sun/star/registry/XRegistryKey.idl>
-#endif
 
-#ifndef __com_sun_star_registry_CannotRegisterImplementationException_idl__
 #include <com/sun/star/registry/CannotRegisterImplementationException.idl>
-#endif
 
-#ifndef __com_sun_star_loader_CannotActivateFactoryException_idl__
 #include <com/sun/star/loader/CannotActivateFactoryException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/CoreReflection.idl b/udkapi/com/sun/star/reflection/CoreReflection.idl
index 3398897c1984..bebca7f2a958 100644
--- a/udkapi/com/sun/star/reflection/CoreReflection.idl
+++ b/udkapi/com/sun/star/reflection/CoreReflection.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_reflection_CoreReflection_idl__
 #define __com_sun_star_reflection_CoreReflection_idl__
 
-#ifndef __com_sun_star_reflection_XIdlReflection_idl__
 #include <com/sun/star/reflection/XIdlReflection.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl b/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
index 783763254a98..7750cc02dc52 100644
--- a/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
+++ b/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_reflection_InvaildTypeNameException_idl__
 #define __com_sun_star_reflection_InvalidTypeNameException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/InvocationTargetException.idl b/udkapi/com/sun/star/reflection/InvocationTargetException.idl
index cbc3e9aec5be..3e969968ab8e 100644
--- a/udkapi/com/sun/star/reflection/InvocationTargetException.idl
+++ b/udkapi/com/sun/star/reflection/InvocationTargetException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_reflection_InvocationTargetException_idl__
 #define __com_sun_star_reflection_InvocationTargetException_idl__
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl b/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl
index b553d4d0aedc..dc57a48ee6f4 100644
--- a/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl
+++ b/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_reflection_NoSuchTypeNameException_idl__
 #define __com_sun_star_reflection_NoSuchTypeNameException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/ParamInfo.idl b/udkapi/com/sun/star/reflection/ParamInfo.idl
index e3510a7502ea..4aadea8a1e92 100644
--- a/udkapi/com/sun/star/reflection/ParamInfo.idl
+++ b/udkapi/com/sun/star/reflection/ParamInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_reflection_ParamInfo_idl__
 #define __com_sun_star_reflection_ParamInfo_idl__
 
-#ifndef __com_sun_star_reflection_ParamMode_idl__
 #include <com/sun/star/reflection/ParamMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/ProxyFactory.idl b/udkapi/com/sun/star/reflection/ProxyFactory.idl
index 872a9b8529b3..e5a6d282a021 100644
--- a/udkapi/com/sun/star/reflection/ProxyFactory.idl
+++ b/udkapi/com/sun/star/reflection/ProxyFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_reflection_ProxyFactory_idl__
 #define __com_sun_star_reflection_ProxyFactory_idl__
 
-#ifndef __com_sun_star_reflection_XProxyFactory_idl__
 #include <com/sun/star/reflection/XProxyFactory.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl b/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
index 77dd99f6b2a5..08711da3405c 100644
--- a/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
+++ b/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_reflection_TypeDescriptionManager_idl__
 #define __com_sun_star_reflection_TypeDescriptionManager_idl__
 
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XSet_idl__
 #include <com/sun/star/container/XSet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XTypeDescriptionEnumerationAccess_idl__
 #include <com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl b/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl
index c99217a807fb..8923e950875d 100644
--- a/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl
+++ b/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_reflection_TypeDescriptionProvider_idl__
 #define __com_sun_star_reflection_TypeDescriptionProvider_idl__
 
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XTypeDescriptionEnumerationAccess_idl__
 #include <com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/XArrayTypeDescription.idl b/udkapi/com/sun/star/reflection/XArrayTypeDescription.idl
index 9719376f16ac..e4baf86e27c3 100644
--- a/udkapi/com/sun/star/reflection/XArrayTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XArrayTypeDescription.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_reflection_XArrayTypeDescription_idl__
 #define __com_sun_star_reflection_XArrayTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl b/udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl
index 4ac232067452..e4e1ae20a06e 100644
--- a/udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_reflection_XCompoundTypeDescription_idl__
 #define __com_sun_star_reflection_XCompoundTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl b/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl
index e830a191bb6e..623f04e71349 100644
--- a/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_reflection_XConstantTypeDescription_idl__
 #define __com_sun_star_reflection_XConstantTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl b/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl
index 438413614d98..521a0ccf61db 100644
--- a/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_reflection_XConstantsTypeDescription_idl__
 #define __com_sun_star_reflection_XConstantsTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XConstantTypeDescription_idl__
 #include <com/sun/star/reflection/XConstantTypeDescription.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/XEnumTypeDescription.idl b/udkapi/com/sun/star/reflection/XEnumTypeDescription.idl
index 8226b9e21361..d7b4caa7851e 100644
--- a/udkapi/com/sun/star/reflection/XEnumTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XEnumTypeDescription.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_reflection_XEnumTypeDescription_idl__
 #define __com_sun_star_reflection_XEnumTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlArray.idl b/udkapi/com/sun/star/reflection/XIdlArray.idl
index 702201642d2e..f2cf3cb9413b 100644
--- a/udkapi/com/sun/star/reflection/XIdlArray.idl
+++ b/udkapi/com/sun/star/reflection/XIdlArray.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_reflection_XIdlArray_idl__
 #define __com_sun_star_reflection_XIdlArray_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/ArrayIndexOutOfBoundsException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlClass.idl b/udkapi/com/sun/star/reflection/XIdlClass.idl
index fd9048ce111c..241a0e0ebcba 100644
--- a/udkapi/com/sun/star/reflection/XIdlClass.idl
+++ b/udkapi/com/sun/star/reflection/XIdlClass.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_reflection_XIdlClass_idl__
 #define __com_sun_star_reflection_XIdlClass_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_uno_TypeClass_idl__
 #include <com/sun/star/uno/TypeClass.idl>
-#endif
 
-#ifndef __com_sun_star_uno_Uik_idl__
 #include <com/sun/star/uno/Uik.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/XIdlClassProvider.idl b/udkapi/com/sun/star/reflection/XIdlClassProvider.idl
index 0b61cdd68bd8..106086b7f987 100644
--- a/udkapi/com/sun/star/reflection/XIdlClassProvider.idl
+++ b/udkapi/com/sun/star/reflection/XIdlClassProvider.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_reflection_XIdlClassProvider_idl__
 #define __com_sun_star_reflection_XIdlClassProvider_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlField.idl b/udkapi/com/sun/star/reflection/XIdlField.idl
index 76daf3a1d83e..fcdca2ed4754 100644
--- a/udkapi/com/sun/star/reflection/XIdlField.idl
+++ b/udkapi/com/sun/star/reflection/XIdlField.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_reflection_XIdlField_idl__
 #define __com_sun_star_reflection_XIdlField_idl__
 
-#ifndef __com_sun_star_reflection_XIdlMember_idl__
 #include <com/sun/star/reflection/XIdlMember.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_FieldAccessMode_idl__
 #include <com/sun/star/reflection/FieldAccessMode.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
 #include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlField2.idl b/udkapi/com/sun/star/reflection/XIdlField2.idl
index 87e516c906dd..e1df248aeb77 100644
--- a/udkapi/com/sun/star/reflection/XIdlField2.idl
+++ b/udkapi/com/sun/star/reflection/XIdlField2.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_reflection_XIdlField2_idl__
 #define __com_sun_star_reflection_XIdlField2_idl__
 
-#ifndef __com_sun_star_reflection_XIdlMember_idl__
 #include <com/sun/star/reflection/XIdlMember.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_FieldAccessMode_idl__
 #include <com/sun/star/reflection/FieldAccessMode.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
 #include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlMember.idl b/udkapi/com/sun/star/reflection/XIdlMember.idl
index b806b81652bf..9ed4d0a22a94 100644
--- a/udkapi/com/sun/star/reflection/XIdlMember.idl
+++ b/udkapi/com/sun/star/reflection/XIdlMember.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_reflection_XIdlMember_idl__
 #define __com_sun_star_reflection_XIdlMember_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlMethod.idl b/udkapi/com/sun/star/reflection/XIdlMethod.idl
index 8a9f106ce66a..f76baefab9f7 100644
--- a/udkapi/com/sun/star/reflection/XIdlMethod.idl
+++ b/udkapi/com/sun/star/reflection/XIdlMethod.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_reflection_XIdlMethod_idl__
 #define __com_sun_star_reflection_XIdlMethod_idl__
 
-#ifndef __com_sun_star_reflection_XIdlMember_idl__
 #include <com/sun/star/reflection/XIdlMember.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_ParamInfo_idl__
 #include <com/sun/star/reflection/ParamInfo.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_MethodMode_idl__
 #include <com/sun/star/reflection/MethodMode.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
 #include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIdlReflection.idl b/udkapi/com/sun/star/reflection/XIdlReflection.idl
index 9455430eabf1..a9fa9c2ced5c 100644
--- a/udkapi/com/sun/star/reflection/XIdlReflection.idl
+++ b/udkapi/com/sun/star/reflection/XIdlReflection.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_reflection_XIdlReflection_idl__
 #define __com_sun_star_reflection_XIdlReflection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl b/udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl
index ef80d722d55e..d127aec828f2 100644
--- a/udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_reflection_XIndirectTypeDescription_idl__
 #define __com_sun_star_reflection_XIndirectTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl b/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl
index c16d620d6f0d..3ab21508fd27 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_reflection_XInterfaceAttributeTypeDescription_idl__
 #define __com_sun_star_reflection_XInterfaceAttributeTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
 #include <com/sun/star/reflection/XInterfaceMemberTypeDescription.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl b/udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl
index bbc57be77c8e..75a374111d55 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
 #define __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl b/udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl
index c51af484f950..016c3b6de646 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_reflection_XInterfaceMethodTypeDescription_idl__
 #define __com_sun_star_reflection_XInterfaceMethodTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
 #include <com/sun/star/reflection/XInterfaceMemberTypeDescription.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XMethodParameter_idl__
 #include <com/sun/star/reflection/XMethodParameter.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl b/udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl
index d47dd7c3dd47..96f4f4a17ae6 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_reflection_XInterfaceTypeDescription_idl__
 #define __com_sun_star_reflection_XInterfaceTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
-#ifndef __com_sun_star_uno_Uik_idl__
 #include <com/sun/star/uno/Uik.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
 #include <com/sun/star/reflection/XInterfaceMemberTypeDescription.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XMethodParameter.idl b/udkapi/com/sun/star/reflection/XMethodParameter.idl
index c089f79336ac..1edd794e0c6e 100644
--- a/udkapi/com/sun/star/reflection/XMethodParameter.idl
+++ b/udkapi/com/sun/star/reflection/XMethodParameter.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_reflection_XMethodParameter_idl__
 #define __com_sun_star_reflection_XMethodParameter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl b/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl
index d102f246dc76..997a3b226a0b 100644
--- a/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_reflection_XModuleTypeDescription_idl__
 #define __com_sun_star_reflection_XModuleTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl b/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl
index f280998221e9..1d783736b598 100644
--- a/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_reflection_XPropertyTypeDescription_idl__
 #define __com_sun_star_reflection_XPropertyTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/XProxyFactory.idl b/udkapi/com/sun/star/reflection/XProxyFactory.idl
index 9b592e594031..421ff60b5b19 100644
--- a/udkapi/com/sun/star/reflection/XProxyFactory.idl
+++ b/udkapi/com/sun/star/reflection/XProxyFactory.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_reflection_XProxyFactory_idl__
 #define __com_sun_star_reflection_XProxyFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_XAggregation_idl__
 #include <com/sun/star/uno/XAggregation.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl b/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl
index 8fcd27642e2b..ab02dda44bff 100644
--- a/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_reflection_XServiceTypeDescription_idl__
 #define __com_sun_star_reflection_XServiceTypeDescription_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_reflection_XInterfaceTypeDescription_idl__
 #include <com/sun/star/reflection/XInterfaceTypeDescription.idl>
-#endif
-#ifndef __com_sun_star_reflection_XPropertyTypeDescription_idl__
 #include <com/sun/star/reflection/XPropertyTypeDescription.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl b/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl
index e77382730511..6dc525d24797 100644
--- a/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_reflection_XSingletonTypeDescription_idl__
 #define __com_sun_star_reflection_XSingletonTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XServiceTypeDescription_idl__
 #include <com/sun/star/reflection/XServiceTypeDescription.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/XTypeDescription.idl b/udkapi/com/sun/star/reflection/XTypeDescription.idl
index 34ce721d2f33..65bb1b98d091 100644
--- a/udkapi/com/sun/star/reflection/XTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XTypeDescription.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #define __com_sun_star_reflection_XTypeDescription_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_uno_TypeClass_idl__
 #include <com/sun/star/uno/TypeClass.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl b/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl
index bc47bdfc26d5..d34f7899f15f 100644
--- a/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl
+++ b/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl
@@ -28,15 +28,9 @@
 #ifndef __com_sun_star_reflection_XTypeDescriptionEnumeration_idl__
 #define __com_sun_star_reflection_XTypeDescriptionEnumeration_idl__
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl b/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl
index 5a7e129919b7..6e6f3341badc 100644
--- a/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl
+++ b/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl
@@ -28,24 +28,12 @@
 #ifndef __com_sun_star_reflection_XTypeDescriptionEnumerationAccess_idl__
 #define __com_sun_star_reflection_XTypeDescriptionEnumerationAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_TypeClass_idl__
 #include <com/sun/star/uno/TypeClass.idl>
-#endif
-#ifndef __com_sun_star_reflection_XTypeDescriptionEnumeration_idl__
 #include <com/sun/star/reflection/XTypeDescriptionEnumeration.idl>
-#endif
-#ifndef __com_sun_star_reflection_TypeDescriptionSearchDepth_idl__
 #include <com/sun/star/reflection/TypeDescriptionSearchDepth.idl>
-#endif
-#ifndef __com_sun_star_reflection_NoSuchTypeNameException_idl__
 #include <com/sun/star/reflection/NoSuchTypeNameException.idl>
-#endif
-#ifndef __com_sun_star_reflection_InvalidTypeNameException_idl__
 #include <com/sun/star/reflection/InvalidTypeNameException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/reflection/XUnionTypeDescription.idl b/udkapi/com/sun/star/reflection/XUnionTypeDescription.idl
index d02d6d53fd2d..7f9c54178f97 100644
--- a/udkapi/com/sun/star/reflection/XUnionTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XUnionTypeDescription.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_reflection_XUnionTypeDescription_idl__
 #define __com_sun_star_reflection_XUnionTypeDescription_idl__
 
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
 #include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl b/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl
index bcdea4f072b9..20056a436717 100644
--- a/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl
+++ b/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_registry_CannotRegisterImplementationException_idl__
 #define __com_sun_star_registry_CannotRegisterImplementationException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/registry/DefaultRegistry.idl b/udkapi/com/sun/star/registry/DefaultRegistry.idl
index 4de5566cf0f1..ca07251c1c22 100644
--- a/udkapi/com/sun/star/registry/DefaultRegistry.idl
+++ b/udkapi/com/sun/star/registry/DefaultRegistry.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_registry_DefaultRegistry_idl__
 #define __com_sun_star_registry_DefaultRegistry_idl__
 
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
 #include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/registry/ImplementationRegistration.idl b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
index 5e2dd27408b3..7bd8c2e7af01 100644
--- a/udkapi/com/sun/star/registry/ImplementationRegistration.idl
+++ b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_registry_ImplementationRegistration_idl__
 #define __com_sun_star_registry_ImplementationRegistration_idl__
 
-#ifndef __com_sun_star_registry_XImplementationRegistration_idl__
 #include <com/sun/star/registry/XImplementationRegistration.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/registry/InvalidRegistryException.idl b/udkapi/com/sun/star/registry/InvalidRegistryException.idl
index b9a3a1ef9aab..735e5dcb8f8a 100644
--- a/udkapi/com/sun/star/registry/InvalidRegistryException.idl
+++ b/udkapi/com/sun/star/registry/InvalidRegistryException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_registry_InvalidRegistryException_idl__
 #define __com_sun_star_registry_InvalidRegistryException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/registry/InvalidValueException.idl b/udkapi/com/sun/star/registry/InvalidValueException.idl
index 013fca9d8b49..0654ba67bb04 100644
--- a/udkapi/com/sun/star/registry/InvalidValueException.idl
+++ b/udkapi/com/sun/star/registry/InvalidValueException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_registry_InvalidValueException_idl__
 #define __com_sun_star_registry_InvalidValueException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/registry/MergeConflictException.idl b/udkapi/com/sun/star/registry/MergeConflictException.idl
index 67973f693af2..9523e63e036f 100644
--- a/udkapi/com/sun/star/registry/MergeConflictException.idl
+++ b/udkapi/com/sun/star/registry/MergeConflictException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_registry_MergeConflictException_idl__
 #define __com_sun_star_registry_MergeConflictException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/registry/NestedRegistry.idl b/udkapi/com/sun/star/registry/NestedRegistry.idl
index e10f9e7c8dc2..55758b48fe34 100644
--- a/udkapi/com/sun/star/registry/NestedRegistry.idl
+++ b/udkapi/com/sun/star/registry/NestedRegistry.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_registry_DefaultRegistry_idl__
 #define __com_sun_star_registry_DefaultRegistry_idl__
 
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
 #include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/registry/SimpleRegistry.idl b/udkapi/com/sun/star/registry/SimpleRegistry.idl
index 122b707cd3bb..7b55f463c40a 100644
--- a/udkapi/com/sun/star/registry/SimpleRegistry.idl
+++ b/udkapi/com/sun/star/registry/SimpleRegistry.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_registry_SimpleRegistry_idl__
 #define __com_sun_star_registry_SimpleRegistry_idl__
 
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
 #include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/registry/XImplementationRegistration.idl b/udkapi/com/sun/star/registry/XImplementationRegistration.idl
index 50ea2f8fd966..efab24bb2155 100644
--- a/udkapi/com/sun/star/registry/XImplementationRegistration.idl
+++ b/udkapi/com/sun/star/registry/XImplementationRegistration.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_registry_XImplementationRegistration_idl__
 #define __com_sun_star_registry_XImplementationRegistration_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
 #include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
 
-#ifndef __com_sun_star_registry_CannotRegisterImplementationException_idl__
 #include <com/sun/star/registry/CannotRegisterImplementationException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/registry/XImplementationRegistration2.idl b/udkapi/com/sun/star/registry/XImplementationRegistration2.idl
index 01c97b8274ab..5bace1628ecd 100644
--- a/udkapi/com/sun/star/registry/XImplementationRegistration2.idl
+++ b/udkapi/com/sun/star/registry/XImplementationRegistration2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_registry_XImplementationRegistration2_idl__
 #define __com_sun_star_registry_XImplementationRegistration2_idl__
 
-#ifndef __com_sun_star_registry_XImplementationRegistration_idl__
 #include <com/sun/star/registry/XImplementationRegistration.idl>
-#endif
 //=============================================================================
 
  module com {  module sun {  module star {  module registry {
diff --git a/udkapi/com/sun/star/registry/XRegistryKey.idl b/udkapi/com/sun/star/registry/XRegistryKey.idl
index 7920ca6945c0..5b47a243fdb3 100644
--- a/udkapi/com/sun/star/registry/XRegistryKey.idl
+++ b/udkapi/com/sun/star/registry/XRegistryKey.idl
@@ -27,25 +27,11 @@
 #ifndef __com_sun_star_registry_XRegistryKey_idl__
 #define __com_sun_star_registry_XRegistryKey_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_registry_InvalidRegistryException_idl__
 #include <com/sun/star/registry/InvalidRegistryException.idl>
-#endif
-
-#ifndef __com_sun_star_registry_RegistryKeyType_idl__
 #include <com/sun/star/registry/RegistryKeyType.idl>
-#endif
-
-#ifndef __com_sun_star_registry_RegistryValueType_idl__
 #include <com/sun/star/registry/RegistryValueType.idl>
-#endif
-
-#ifndef __com_sun_star_registry_InvalidValueException_idl__
 #include <com/sun/star/registry/InvalidValueException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/registry/XSimpleRegistry.idl b/udkapi/com/sun/star/registry/XSimpleRegistry.idl
index 4ebd9f4cd7c1..252fe0a6f04d 100644
--- a/udkapi/com/sun/star/registry/XSimpleRegistry.idl
+++ b/udkapi/com/sun/star/registry/XSimpleRegistry.idl
@@ -27,21 +27,10 @@
 #ifndef __com_sun_star_registry_XSimpleRegistry_idl__
 #define __com_sun_star_registry_XSimpleRegistry_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_registry_InvalidRegistryException_idl__
 #include <com/sun/star/registry/InvalidRegistryException.idl>
-#endif
-
-#ifndef __com_sun_star_registry_XRegistryKey_idl__
 #include <com/sun/star/registry/XRegistryKey.idl>
-#endif
-
-#ifndef __com_sun_star_registry_MergeConflictException_idl__
 #include <com/sun/star/registry/MergeConflictException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/AllEventObject.idl b/udkapi/com/sun/star/script/AllEventObject.idl
index 3ecaf84896ff..20df1d48f47b 100644
--- a/udkapi/com/sun/star/script/AllEventObject.idl
+++ b/udkapi/com/sun/star/script/AllEventObject.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_script_AllEventObject_idl__
 #define __com_sun_star_script_AllEventObject_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/AllListenerAdapter.idl b/udkapi/com/sun/star/script/AllListenerAdapter.idl
index 49e466108e53..0ead44325750 100644
--- a/udkapi/com/sun/star/script/AllListenerAdapter.idl
+++ b/udkapi/com/sun/star/script/AllListenerAdapter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_AllListenerAdapter_idl__
 #define __com_sun_star_script_AllListenerAdapter_idl__
 
-#ifndef __com_sun_star_script_XAllListenerAdapterService_idl__
 #include <com/sun/star/script/XAllListenerAdapterService.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/ArrayWrapper.idl b/udkapi/com/sun/star/script/ArrayWrapper.idl
index f152792e5cb8..47193e1f5603 100644
--- a/udkapi/com/sun/star/script/ArrayWrapper.idl
+++ b/udkapi/com/sun/star/script/ArrayWrapper.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_script_XArrayWrapper_idl__
 #define __com_sun_star_script_XArrayWrapper_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 module com {  module sun {  module star { module script {
diff --git a/udkapi/com/sun/star/script/BasicErrorException.idl b/udkapi/com/sun/star/script/BasicErrorException.idl
index 7b627a993700..eb34d9210fd3 100644
--- a/udkapi/com/sun/star/script/BasicErrorException.idl
+++ b/udkapi/com/sun/star/script/BasicErrorException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_BasicErrorException_idl__
 #define __com_sun_star_script_BasicErrorException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/CannotConvertException.idl b/udkapi/com/sun/star/script/CannotConvertException.idl
index 1d2ba4e2c910..7710c7bc5327 100644
--- a/udkapi/com/sun/star/script/CannotConvertException.idl
+++ b/udkapi/com/sun/star/script/CannotConvertException.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_script_CannotConvertException_idl__
 #define __com_sun_star_script_CannotConvertException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
-#ifndef __com_sun_star_uno_TypeClass_idl__
 #include <com/sun/star/uno/TypeClass.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/CannotCreateAdapterException.idl b/udkapi/com/sun/star/script/CannotCreateAdapterException.idl
index 6b7d33d1873e..d5becd7b4a44 100644
--- a/udkapi/com/sun/star/script/CannotCreateAdapterException.idl
+++ b/udkapi/com/sun/star/script/CannotCreateAdapterException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_CannotCreateAdapterException_idl__
 #define __com_sun_star_script_CannotCreateAdapterException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/Converter.idl b/udkapi/com/sun/star/script/Converter.idl
index f0a9167ab074..b58d524bd773 100644
--- a/udkapi/com/sun/star/script/Converter.idl
+++ b/udkapi/com/sun/star/script/Converter.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_Converter_idl__
 #define __com_sun_star_script_Converter_idl__
 
-#ifndef __com_sun_star_script_XTypeConverter_idl__
 #include <com/sun/star/script/XTypeConverter.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/Engine.idl b/udkapi/com/sun/star/script/Engine.idl
index 5e193a7fe679..5dc1eae4fc65 100644
--- a/udkapi/com/sun/star/script/Engine.idl
+++ b/udkapi/com/sun/star/script/Engine.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_Engine_idl__
 #define __com_sun_star_script_Engine_idl__
 
-#ifndef __com_sun_star_script_XEngine_idl__
 #include <com/sun/star/script/XEngine.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/FinishEngineEvent.idl b/udkapi/com/sun/star/script/FinishEngineEvent.idl
index 7ec3d6818657..5e97d35f8fcf 100644
--- a/udkapi/com/sun/star/script/FinishEngineEvent.idl
+++ b/udkapi/com/sun/star/script/FinishEngineEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_script_FinishEngineEvent_idl__
 #define __com_sun_star_script_FinishEngineEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_script_FinishReason_idl__
 #include <com/sun/star/script/FinishReason.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/InterruptEngineEvent.idl b/udkapi/com/sun/star/script/InterruptEngineEvent.idl
index b89fcf74503d..2ff5d96cafd0 100644
--- a/udkapi/com/sun/star/script/InterruptEngineEvent.idl
+++ b/udkapi/com/sun/star/script/InterruptEngineEvent.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_script_InterruptEngineEvent_idl__
 #define __com_sun_star_script_InterruptEngineEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_script_InterruptReason_idl__
 #include <com/sun/star/script/InterruptReason.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/Invocation.idl b/udkapi/com/sun/star/script/Invocation.idl
index 83eb11a37078..39f938a9b568 100644
--- a/udkapi/com/sun/star/script/Invocation.idl
+++ b/udkapi/com/sun/star/script/Invocation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_Invocation_idl__
 #define __com_sun_star_script_Invocation_idl__
 
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/InvocationAdapterFactory.idl b/udkapi/com/sun/star/script/InvocationAdapterFactory.idl
index 9363de749d6a..3061ddb0840a 100644
--- a/udkapi/com/sun/star/script/InvocationAdapterFactory.idl
+++ b/udkapi/com/sun/star/script/InvocationAdapterFactory.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_script_InvocationAdapterFactory_idl__
 #define __com_sun_star_script_InvocationAdapterFactory_idl__
 
-#ifndef __com_sun_star_script_XInvocationAdapterFactory_idl__
 #include <com/sun/star/script/XInvocationAdapterFactory.idl>
-#endif
-#ifndef __com_sun_star_script_XInvocationAdapterFactory2_idl__
 #include <com/sun/star/script/XInvocationAdapterFactory2.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/InvocationInfo.idl b/udkapi/com/sun/star/script/InvocationInfo.idl
index ba619e00461b..c34e6128f1ee 100644
--- a/udkapi/com/sun/star/script/InvocationInfo.idl
+++ b/udkapi/com/sun/star/script/InvocationInfo.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_script_InvocationInfo_idl__
 #define __com_sun_star_script_InvocationInfo_idl__
 
-#ifndef __com_sun_star_script_MemberType_idl__
 #include <com/sun/star/script/MemberType.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_ParamMode_idl__
 #include <com/sun/star/reflection/ParamMode.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/script/JavaScript.idl b/udkapi/com/sun/star/script/JavaScript.idl
index 1134ed10c2f4..1bfa70f54579 100644
--- a/udkapi/com/sun/star/script/JavaScript.idl
+++ b/udkapi/com/sun/star/script/JavaScript.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_JavaScript_idl__
 #define __com_sun_star_script_JavaScript_idl__
 
-#ifndef __com_sun_star_script_Engine_idl__
 #include <com/sun/star/script/Engine.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/ScriptEvent.idl b/udkapi/com/sun/star/script/ScriptEvent.idl
index 040124dbafd0..e7777fed2d87 100644
--- a/udkapi/com/sun/star/script/ScriptEvent.idl
+++ b/udkapi/com/sun/star/script/ScriptEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_ScriptEvent_idl__
 #define __com_sun_star_script_ScriptEvent_idl__
 
-#ifndef __com_sun_star_script_AllEventObject_idl__
 #include <com/sun/star/script/AllEventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XAllListener.idl b/udkapi/com/sun/star/script/XAllListener.idl
index d234edd05262..8b0b82f84b09 100644
--- a/udkapi/com/sun/star/script/XAllListener.idl
+++ b/udkapi/com/sun/star/script/XAllListener.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_script_XAllListener_idl__
 #define __com_sun_star_script_XAllListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_script_AllEventObject_idl__
 #include <com/sun/star/script/AllEventObject.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
 #include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XAllListenerAdapterService.idl b/udkapi/com/sun/star/script/XAllListenerAdapterService.idl
index d779be5a45b3..25a02fc6d2ef 100644
--- a/udkapi/com/sun/star/script/XAllListenerAdapterService.idl
+++ b/udkapi/com/sun/star/script/XAllListenerAdapterService.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_script_XAllListenerAdapterService_idl__
 #define __com_sun_star_script_XAllListenerAdapterService_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
-#ifndef __com_sun_star_script_XAllListener_idl__
 #include <com/sun/star/script/XAllListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/sal/osl/os2/dllentry.c b/udkapi/com/sun/star/script/XAutomationInvocation.idl
index 494119599f8b..d231ed88372d 100644
--- a/sal/osl/os2/dllentry.c
+++ b/udkapi/com/sun/star/script/XAutomationInvocation.idl
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -24,52 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef __com_sun_star_script_XAutomationInvocation_idl__
+#define __com_sun_star_script_XAutomationInvocation_idl__
 
-#include "system.h"
-#include "sockimpl.h"
-#include "secimpl.h"
-//#include "daemimpl.h"
+#include <com/sun/star/script/XInvocation.idl>
 
-#include <osl/diagnose.h>
 
-#ifndef GCC
-sal_uInt32 _System _DLL_InitTerm( sal_uInt32 nModule,
-                                     sal_uInt32 nFlag )
-{
-    switch( nFlag )
-    {
-        case 0:
-        {
-            /* initialize C runtime library */
-            _CRT_init();
-            {
-                LONG fhToAdd = 0;
-                ULONG fhOld = 0;
-                ULONG ngLastError = DosSetRelMaxFH(&fhToAdd, &fhOld);
-                if (fhOld < 200)
-                    ngLastError = DosSetMaxFH(200);
-            }
-
-            /* turn off hardware-errors and exception popups */
-            DosError(FERR_DISABLEHARDERR | FERR_DISABLEEXCEPTION);
+ module com {  module sun {  module star {  module script {
 
-            break;
-        }
+interface XAutomationInvocation: com::sun::star::script::XInvocation
+{
+    any invokeGetProperty(  [in] string aFunctionName, [in] sequence<any> aParams, [out] sequence<short> aOutParamIndex, [out] sequence<any> aOutParam ) raises( com::sun::star::lang::IllegalArgumentException, com::sun::star::script::CannotConvertException, com::sun::star::reflection::InvocationTargetException );
+    any invokePutProperty(  [in] string aFunctionName, [in] sequence<any> aParams, [out] sequence<short> aOutParamIndex, [out] sequence<any> aOutParam ) raises( com::sun::star::lang::IllegalArgumentException, com::sun::star::script::CannotConvertException, com::sun::star::reflection::InvocationTargetException );
 
-        case 1:
-        {
-            /* unload libs (sockets) */
-            ImplFreeTCPIP();
+};
 
-            /* unload libs (security) */
-            ImplFreeUPM();
+//=============================================================================
 
-            break;
-        }
-    }
+}; }; }; };
 
-    return (sal_True);
-}
 #endif
-
-
diff --git a/udkapi/com/sun/star/script/XDebugging.idl b/udkapi/com/sun/star/script/XDebugging.idl
index 55335e5c07eb..1ca6342e9e73 100644
--- a/udkapi/com/sun/star/script/XDebugging.idl
+++ b/udkapi/com/sun/star/script/XDebugging.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_script_XDebugging_idl__
 #define __com_sun_star_script_XDebugging_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_script_ContextInformation_idl__
 #include <com/sun/star/script/ContextInformation.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XDefaultMethod.idl b/udkapi/com/sun/star/script/XDefaultMethod.idl
index 5a2409145e28..d3c8cbfd0289 100644
--- a/udkapi/com/sun/star/script/XDefaultMethod.idl
+++ b/udkapi/com/sun/star/script/XDefaultMethod.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_script_XDefaultMethod_idl__
 #define __com_sun_star_script_XDefaultMethod_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module script {
 //==============================================================================
diff --git a/udkapi/com/sun/star/script/XDefaultProperty.idl b/udkapi/com/sun/star/script/XDefaultProperty.idl
index 61bee2515eb4..e5fa484a19f9 100644
--- a/udkapi/com/sun/star/script/XDefaultProperty.idl
+++ b/udkapi/com/sun/star/script/XDefaultProperty.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_script_XDefaultProperty_idl__
 #define __com_sun_star_script_XDefaultProperty_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com { module sun { module star { module script {
 //==============================================================================
diff --git a/udkapi/com/sun/star/script/XDirectInvocation.idl b/udkapi/com/sun/star/script/XDirectInvocation.idl
index 8a37c47dd781..64b1b83a3347 100644
--- a/udkapi/com/sun/star/script/XDirectInvocation.idl
+++ b/udkapi/com/sun/star/script/XDirectInvocation.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_script_XDirectInvocation_idl__
 #define __com_sun_star_script_XDirectInvocation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_script_CannotConvertException_idl__
 #include <com/sun/star/script/CannotConvertException.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
 #include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XEngine.idl b/udkapi/com/sun/star/script/XEngine.idl
index 17cfbe4b7426..aa6b925500f1 100644
--- a/udkapi/com/sun/star/script/XEngine.idl
+++ b/udkapi/com/sun/star/script/XEngine.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_script_XEngine_idl__
 #define __com_sun_star_script_XEngine_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_script_XLibraryAccess_idl__
 #include <com/sun/star/script/XLibraryAccess.idl>
-#endif
 
-#ifndef __com_sun_star_script_XEngineListener_idl__
 #include <com/sun/star/script/XEngineListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XEngineListener.idl b/udkapi/com/sun/star/script/XEngineListener.idl
index 0ba2b2fe0d70..85493a23c9d8 100644
--- a/udkapi/com/sun/star/script/XEngineListener.idl
+++ b/udkapi/com/sun/star/script/XEngineListener.idl
@@ -27,21 +27,13 @@
 #ifndef __com_sun_star_script_XEngineListener_idl__
 #define __com_sun_star_script_XEngineListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_script_InterruptEngineEvent_idl__
 #include <com/sun/star/script/InterruptEngineEvent.idl>
-#endif
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
-#ifndef __com_sun_star_script_FinishEngineEvent_idl__
 #include <com/sun/star/script/FinishEngineEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XErrorQuery.idl b/udkapi/com/sun/star/script/XErrorQuery.idl
new file mode 100644
index 000000000000..c1c881be6979
--- /dev/null
+++ b/udkapi/com/sun/star/script/XErrorQuery.idl
@@ -0,0 +1,23 @@
+#ifndef __com_sun_star_script_XErrorQuery_idl__
+#define __com_sun_star_script_XErrorQuery_idl__
+
+#include <com/sun/star/uno/XInterface.idl>
+
+module com { module sun { module star { module script {
+//==============================================================================
+
+interface XErrorQuery : ::com::sun::star::uno::XInterface
+{
+  //-----------------------------------------------------------------------
+  /**
+    Returns whether this object has an error
+
+    @return
+    <atom>boolean</atom> indicating an error or not
+  */
+  boolean hasError();
+
+};
+
+};  };  };  };
+#endif
diff --git a/udkapi/com/sun/star/script/XEventAttacher.idl b/udkapi/com/sun/star/script/XEventAttacher.idl
index 7acc672af968..a644a99c0fbb 100644
--- a/udkapi/com/sun/star/script/XEventAttacher.idl
+++ b/udkapi/com/sun/star/script/XEventAttacher.idl
@@ -27,33 +27,19 @@
 #ifndef __com_sun_star_script_XEventAttacher_idl__
 #define __com_sun_star_script_XEventAttacher_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_script_XAllListener_idl__
 #include <com/sun/star/script/XAllListener.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_IntrospectionException_idl__
 #include <com/sun/star/beans/IntrospectionException.idl>
-#endif
 
-#ifndef __com_sun_star_script_CannotCreateAdapterException_idl__
 #include <com/sun/star/script/CannotCreateAdapterException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__
 #include <com/sun/star/lang/ServiceNotRegisteredException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XEventAttacherManager.idl b/udkapi/com/sun/star/script/XEventAttacherManager.idl
index 16f209d876a5..aa5576491093 100644
--- a/udkapi/com/sun/star/script/XEventAttacherManager.idl
+++ b/udkapi/com/sun/star/script/XEventAttacherManager.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_script_XEventAttacherManager_idl__
 #define __com_sun_star_script_XEventAttacherManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_script_ScriptEventDescriptor_idl__
 #include <com/sun/star/script/ScriptEventDescriptor.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__
 #include <com/sun/star/lang/ServiceNotRegisteredException.idl>
-#endif
 
-#ifndef __com_sun_star_script_XScriptListener_idl__
 #include <com/sun/star/script/XScriptListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XInvocation.idl b/udkapi/com/sun/star/script/XInvocation.idl
index 9299dc8f8802..ecc6ead5bf14 100644
--- a/udkapi/com/sun/star/script/XInvocation.idl
+++ b/udkapi/com/sun/star/script/XInvocation.idl
@@ -27,29 +27,17 @@
 #ifndef __com_sun_star_script_XInvocation_idl__
 #define __com_sun_star_script_XInvocation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_beans_XIntrospectionAccess_idl__
 #include <com/sun/star/beans/XIntrospectionAccess.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_script_CannotConvertException_idl__
 #include <com/sun/star/script/CannotConvertException.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
 #include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XInvocation2.idl b/udkapi/com/sun/star/script/XInvocation2.idl
index 5cc24aa3bd38..7a2d9dc7c17b 100644
--- a/udkapi/com/sun/star/script/XInvocation2.idl
+++ b/udkapi/com/sun/star/script/XInvocation2.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_script_XInvocation2_idl__
 #define __com_sun_star_script_XInvocation2_idl__
 
-#ifndef __com_sun_star_script_XInvocation_idl__
 #include <com/sun/star/script/XInvocation.idl>
-#endif
 
-#ifndef __com_sun_star_script_InvocationInfo_idl__
 #include <com/sun/star/script/InvocationInfo.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/script/XInvocationAdapterFactory.idl b/udkapi/com/sun/star/script/XInvocationAdapterFactory.idl
index 6584bebbcb5f..07638e0c2113 100644
--- a/udkapi/com/sun/star/script/XInvocationAdapterFactory.idl
+++ b/udkapi/com/sun/star/script/XInvocationAdapterFactory.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_script_XInvocationAdapterFactory_idl__
 #define __com_sun_star_script_XInvocationAdapterFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_script_XInvocation_idl__
 #include <com/sun/star/script/XInvocation.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl b/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl
index 90c2e57fc5a7..ecf38066c014 100644
--- a/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl
+++ b/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_script_XInvocationAdapterFactory2_idl__
 #define __com_sun_star_script_XInvocationAdapterFactory2_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_script_XInvocation_idl__
 #include <com/sun/star/script/XInvocation.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XLibraryAccess.idl b/udkapi/com/sun/star/script/XLibraryAccess.idl
index 8bb54f02a2dd..b2dfe11998ce 100644
--- a/udkapi/com/sun/star/script/XLibraryAccess.idl
+++ b/udkapi/com/sun/star/script/XLibraryAccess.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_XLibraryAccess_idl__
 #define __com_sun_star_script_XLibraryAccess_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XScriptEventsAttacher.idl b/udkapi/com/sun/star/script/XScriptEventsAttacher.idl
index d60a593fcf52..281e07efa321 100644
--- a/udkapi/com/sun/star/script/XScriptEventsAttacher.idl
+++ b/udkapi/com/sun/star/script/XScriptEventsAttacher.idl
@@ -27,28 +27,16 @@
 #ifndef __com_sun_star_script_XScriptEventsAttacher_idl__
 #define __com_sun_star_script_XScriptEventsAttacher_idl__
 
-#ifndef __com_sun_star_script_XScriptListener_idl__
 #include <com/sun/star/script/XScriptListener.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_beans_IntrospectionException_idl__
 #include <com/sun/star/beans/IntrospectionException.idl>
-#endif
 
-#ifndef __com_sun_star_script_CannotCreateAdapterException_idl__
 #include <com/sun/star/script/CannotCreateAdapterException.idl>
-#endif
 
-#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__
 #include <com/sun/star/lang/ServiceNotRegisteredException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XScriptEventsSupplier.idl b/udkapi/com/sun/star/script/XScriptEventsSupplier.idl
index 3355b7dd83ae..affcdf1797ee 100644
--- a/udkapi/com/sun/star/script/XScriptEventsSupplier.idl
+++ b/udkapi/com/sun/star/script/XScriptEventsSupplier.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_script_XScriptEventsSupplier_idl__
 #define __com_sun_star_script_XScriptEventsSupplier_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XScriptListener.idl b/udkapi/com/sun/star/script/XScriptListener.idl
index f4404d39d645..745bde236179 100644
--- a/udkapi/com/sun/star/script/XScriptListener.idl
+++ b/udkapi/com/sun/star/script/XScriptListener.idl
@@ -27,17 +27,11 @@
 #ifndef __com_sun_star_script_XScriptListener_idl__
 #define __com_sun_star_script_XScriptListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
 
-#ifndef __com_sun_star_script_ScriptEvent_idl__
 #include <com/sun/star/script/ScriptEvent.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
 #include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XStarBasicAccess.idl b/udkapi/com/sun/star/script/XStarBasicAccess.idl
index 97a7bfd08da7..714eed7dcf10 100644
--- a/udkapi/com/sun/star/script/XStarBasicAccess.idl
+++ b/udkapi/com/sun/star/script/XStarBasicAccess.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_XStarBasicAccess_idl__
 #define __com_sun_star_script_XStarBasicAccess_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/script/XStarBasicDialogInfo.idl b/udkapi/com/sun/star/script/XStarBasicDialogInfo.idl
index ddcf583f2777..ca723758b834 100644
--- a/udkapi/com/sun/star/script/XStarBasicDialogInfo.idl
+++ b/udkapi/com/sun/star/script/XStarBasicDialogInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_XStarBasicDialogInfo_idl__
 #define __com_sun_star_script_XStarBasicDialogInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl b/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl
index 4b7337a0b33c..16fbc4b3aadf 100644
--- a/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl
+++ b/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_XStarBasicLibraryInfo_idl__
 #define __com_sun_star_script_XStarBasicLibraryInfo_idl__
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/script/XStarBasicModuleInfo.idl b/udkapi/com/sun/star/script/XStarBasicModuleInfo.idl
index 93421c3b9d6d..f93e3927a039 100644
--- a/udkapi/com/sun/star/script/XStarBasicModuleInfo.idl
+++ b/udkapi/com/sun/star/script/XStarBasicModuleInfo.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_script_XStarBasicModuleInfo_idl__
 #define __com_sun_star_script_XStarBasicModuleInfo_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/XTypeConverter.idl b/udkapi/com/sun/star/script/XTypeConverter.idl
index df854bed1e9f..8e7b6d35c065 100644
--- a/udkapi/com/sun/star/script/XTypeConverter.idl
+++ b/udkapi/com/sun/star/script/XTypeConverter.idl
@@ -27,25 +27,15 @@
 #ifndef __com_sun_star_script_XTypeConverter_idl__
 #define __com_sun_star_script_XTypeConverter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
 #include <com/sun/star/reflection/XIdlClass.idl>
-#endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
-#ifndef __com_sun_star_script_CannotConvertException_idl__
 #include <com/sun/star/script/CannotConvertException.idl>
-#endif
 
-#ifndef __com_sun_star_uno_TypeClass_idl__
 #include <com/sun/star/uno/TypeClass.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/makefile.mk b/udkapi/com/sun/star/script/makefile.mk
index c457b4a78657..0a16872f1107 100644
--- a/udkapi/com/sun/star/script/makefile.mk
+++ b/udkapi/com/sun/star/script/makefile.mk
@@ -82,6 +82,8 @@ IDLFILES=\
     XScriptEventsAttacher.idl\
     XDefaultMethod.idl\
     XDefaultProperty.idl\
+	XAutomationInvocation.idl\
+    XErrorQuery.idl\
 
 # ------------------------------------------------------------------
 
diff --git a/udkapi/com/sun/star/security/AccessControlException.idl b/udkapi/com/sun/star/security/AccessControlException.idl
index 289c312165f8..2bfe06b4e7ba 100644
--- a/udkapi/com/sun/star/security/AccessControlException.idl
+++ b/udkapi/com/sun/star/security/AccessControlException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_security_AccessControlException_idl__
 #define __com_sun_star_security_AccessControlException_idl__
 
-#ifndef __com_sun_star_uno_SecurityException_idl__
 #include <com/sun/star/uno/SecurityException.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/security/AccessController.idl b/udkapi/com/sun/star/security/AccessController.idl
index 35d1c51a1a61..eb4528b3bc92 100644
--- a/udkapi/com/sun/star/security/AccessController.idl
+++ b/udkapi/com/sun/star/security/AccessController.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_security_AccessController_idl__
 #define __com_sun_star_security_AccessController_idl__
 
-#ifndef __com_sun_star_security_XAccessController_idl__
 #include <com/sun/star/security/XAccessController.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/security/Policy.idl b/udkapi/com/sun/star/security/Policy.idl
index 027221fd2c6e..6ee317b3aeda 100644
--- a/udkapi/com/sun/star/security/Policy.idl
+++ b/udkapi/com/sun/star/security/Policy.idl
@@ -26,9 +26,7 @@
  ************************************************************************/
 #ifndef __com_sun_star_security_Policy_idl__
 #define __com_sun_star_security_Policy_idl__
-#ifndef __com_sun_star_security_XPolicy_idl__
 #include <com/sun/star/security/XPolicy.idl>
-#endif
 
 
 module com {  module sun {  module star {  module security {
diff --git a/udkapi/com/sun/star/security/XAccessControlContext.idl b/udkapi/com/sun/star/security/XAccessControlContext.idl
index 535e8753aa20..9f0e2343be3f 100644
--- a/udkapi/com/sun/star/security/XAccessControlContext.idl
+++ b/udkapi/com/sun/star/security/XAccessControlContext.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_security_XAccessControlContext_idl__
 #define __com_sun_star_security_XAccessControlContext_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_security_AccessControlException_idl__
 #include <com/sun/star/security/AccessControlException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/security/XAccessController.idl b/udkapi/com/sun/star/security/XAccessController.idl
index 708a884bad68..fd8a40ca2890 100644
--- a/udkapi/com/sun/star/security/XAccessController.idl
+++ b/udkapi/com/sun/star/security/XAccessController.idl
@@ -27,20 +27,10 @@
 #ifndef __com_sun_star_security_XAccessController_idl__
 #define __com_sun_star_security_XAccessController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_security_XAccessControlContext_idl__
 #include <com/sun/star/security/XAccessControlContext.idl>
-#endif
-
-#ifndef __com_sun_star_security_XAction_idl__
 #include <com/sun/star/security/XAction.idl>
-#endif
-
-#ifndef __com_sun_star_security_AccessControlException_idl__
 #include <com/sun/star/security/AccessControlException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/security/XAction.idl b/udkapi/com/sun/star/security/XAction.idl
index 7a61477ea628..822325bc7440 100644
--- a/udkapi/com/sun/star/security/XAction.idl
+++ b/udkapi/com/sun/star/security/XAction.idl
@@ -27,12 +27,8 @@
 #ifndef __com_sun_star_security_XAction_idl__
 #define __com_sun_star_security_XAction_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/security/XPolicy.idl b/udkapi/com/sun/star/security/XPolicy.idl
index b591eb32353f..9ea2642542e8 100644
--- a/udkapi/com/sun/star/security/XPolicy.idl
+++ b/udkapi/com/sun/star/security/XPolicy.idl
@@ -26,9 +26,7 @@
  ************************************************************************/
 #ifndef __com_sun_star_security_XPolicy_idl__
 #define __com_sun_star_security_XPolicy_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 module com {  module sun {  module star {  module security {
diff --git a/udkapi/com/sun/star/task/XInteractionAbort.idl b/udkapi/com/sun/star/task/XInteractionAbort.idl
index cef59c8ea7b8..d3ca2d42f92e 100644
--- a/udkapi/com/sun/star/task/XInteractionAbort.idl
+++ b/udkapi/com/sun/star/task/XInteractionAbort.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XInteractionAbort_idl__
 #define __com_sun_star_task_XInteractionAbort_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/task/XInteractionContinuation.idl b/udkapi/com/sun/star/task/XInteractionContinuation.idl
index c9b2ab5858cb..9cb8c450e723 100644
--- a/udkapi/com/sun/star/task/XInteractionContinuation.idl
+++ b/udkapi/com/sun/star/task/XInteractionContinuation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #define __com_sun_star_task_XInteractionContinuation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/task/XInteractionHandler.idl b/udkapi/com/sun/star/task/XInteractionHandler.idl
index 0bbd7fed3202..082ffd977362 100644
--- a/udkapi/com/sun/star/task/XInteractionHandler.idl
+++ b/udkapi/com/sun/star/task/XInteractionHandler.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_task_XInteractionHandler_idl__
 #define __com_sun_star_task_XInteractionHandler_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_task_XInteractionRequest_idl__
 #include <com/sun/star/task/XInteractionRequest.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/task/XInteractionHandler2.idl b/udkapi/com/sun/star/task/XInteractionHandler2.idl
index 1584e43b7934..80c7bb67bc59 100644
--- a/udkapi/com/sun/star/task/XInteractionHandler2.idl
+++ b/udkapi/com/sun/star/task/XInteractionHandler2.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XInteractionHandler2_idl__
 #define __com_sun_star_task_XInteractionHandler2_idl__
 
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/task/XInteractionRequest.idl b/udkapi/com/sun/star/task/XInteractionRequest.idl
index a0518fd7fd8a..c337fd2c408b 100644
--- a/udkapi/com/sun/star/task/XInteractionRequest.idl
+++ b/udkapi/com/sun/star/task/XInteractionRequest.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_task_XInteractionRequest_idl__
 #define __com_sun_star_task_XInteractionRequest_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/task/XInteractionRetry.idl b/udkapi/com/sun/star/task/XInteractionRetry.idl
index eab9ec1ab3c3..71cf6e26b193 100644
--- a/udkapi/com/sun/star/task/XInteractionRetry.idl
+++ b/udkapi/com/sun/star/task/XInteractionRetry.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_task_XInteractionRetry_idl__
 #define __com_sun_star_task_XInteractionRetry_idl__
 
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
 #include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/test/TestEvent.idl b/udkapi/com/sun/star/test/TestEvent.idl
index f5717fd903d5..2d87b158f722 100644
--- a/udkapi/com/sun/star/test/TestEvent.idl
+++ b/udkapi/com/sun/star/test/TestEvent.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_test_TestEvent_idl__
 #define __com_sun_star_test_TestEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/test/TestFactory.idl b/udkapi/com/sun/star/test/TestFactory.idl
index 100ac85d499f..cdb95042f42f 100644
--- a/udkapi/com/sun/star/test/TestFactory.idl
+++ b/udkapi/com/sun/star/test/TestFactory.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_test_TestFactory_idl__
 #define __com_sun_star_test_TestFactory_idl__
 
-#ifndef __com_sun_star_lang_MultiServiceFactory_idl__
 #include <com/sun/star/lang/MultiServiceFactory.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/test/XSimpleTest.idl b/udkapi/com/sun/star/test/XSimpleTest.idl
index f2a310f9a44c..012b378b26bc 100644
--- a/udkapi/com/sun/star/test/XSimpleTest.idl
+++ b/udkapi/com/sun/star/test/XSimpleTest.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_test_XSimpleTest_idl__
 #define __com_sun_star_test_XSimpleTest_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
@@ -95,7 +90,7 @@ published interface XSimpleTest: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /**States if one of the last test has failed. This is cumulative.
-        @return true if all test have been passed succesfully. false if an error has occured.
+        @return true if all test have been passed succesfully. false if an error has occurred.
 
     */
     boolean testPassed();
diff --git a/udkapi/com/sun/star/test/XTest.idl b/udkapi/com/sun/star/test/XTest.idl
index 12481184b15d..f46092a71b63 100644
--- a/udkapi/com/sun/star/test/XTest.idl
+++ b/udkapi/com/sun/star/test/XTest.idl
@@ -27,17 +27,9 @@
 #ifndef __com_sun_star_test_XTest_idl__
 #define __com_sun_star_test_XTest_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_test_XTestListener_idl__
 #include <com/sun/star/test/XTestListener.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/test/XTestListener.idl b/udkapi/com/sun/star/test/XTestListener.idl
index 3f385d96d8b9..40b0e936a357 100644
--- a/udkapi/com/sun/star/test/XTestListener.idl
+++ b/udkapi/com/sun/star/test/XTestListener.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_test_XTestListener_idl__
 #define __com_sun_star_test_XTestListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_test_TestEvent_idl__
 #include <com/sun/star/test/TestEvent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/test/bridge/XBridgeTest.idl b/udkapi/com/sun/star/test/bridge/XBridgeTest.idl
index 05f444a43318..bbab3ceb707a 100644
--- a/udkapi/com/sun/star/test/bridge/XBridgeTest.idl
+++ b/udkapi/com/sun/star/test/bridge/XBridgeTest.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_test_bridge_XBridge_idl__
 #define __com_sun_star_test_bridge_XBridge_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 module com
 {
diff --git a/udkapi/com/sun/star/test/performance/XPerformanceTest.idl b/udkapi/com/sun/star/test/performance/XPerformanceTest.idl
index 9ef559c240d6..f163543a9197 100644
--- a/udkapi/com/sun/star/test/performance/XPerformanceTest.idl
+++ b/udkapi/com/sun/star/test/performance/XPerformanceTest.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_test_performance_XPerformanceTest_idl__
 #define __com_sun_star_test_performance_XPerformanceTest_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 module com
 {
diff --git a/udkapi/com/sun/star/uno/DeploymentException.idl b/udkapi/com/sun/star/uno/DeploymentException.idl
index 5cf8e4f48bd7..39e2c0fb561a 100644
--- a/udkapi/com/sun/star/uno/DeploymentException.idl
+++ b/udkapi/com/sun/star/uno/DeploymentException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_uno_DeploymentException_idl__
 #define __com_sun_star_uno_DeploymentException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/uno/Exception.idl b/udkapi/com/sun/star/uno/Exception.idl
index 1ddfcdd3d8ce..9fb53ac2a5b9 100644
--- a/udkapi/com/sun/star/uno/Exception.idl
+++ b/udkapi/com/sun/star/uno/Exception.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_uno_Exception_idl__
 #define __com_sun_star_uno_Exception_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/uno/NamingService.idl b/udkapi/com/sun/star/uno/NamingService.idl
index db77fb65cb4c..a18cb6e968d8 100644
--- a/udkapi/com/sun/star/uno/NamingService.idl
+++ b/udkapi/com/sun/star/uno/NamingService.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_uno_NamingService_idl__
 #define __com_sun_star_uno_NamingService_idl__
 
-#ifndef __com_sun_star_uno_XNamingService_idl__
 #include <com/sun/star/uno/XNamingService.idl>
-#endif
 
  module com {  module sun {  module star {  module uno {
 
diff --git a/udkapi/com/sun/star/uno/RuntimeException.idl b/udkapi/com/sun/star/uno/RuntimeException.idl
index c5660e0895fc..b7a81c6250b5 100644
--- a/udkapi/com/sun/star/uno/RuntimeException.idl
+++ b/udkapi/com/sun/star/uno/RuntimeException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_uno_RuntimeException_idl__
 #define __com_sun_star_uno_RuntimeException_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/uno/SecurityException.idl b/udkapi/com/sun/star/uno/SecurityException.idl
index 341c79827453..32443f595245 100644
--- a/udkapi/com/sun/star/uno/SecurityException.idl
+++ b/udkapi/com/sun/star/uno/SecurityException.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_uno_SecurityException_idl__
 #define __com_sun_star_uno_SecurityException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
 #include <com/sun/star/uno/RuntimeException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/uno/XAdapter.idl b/udkapi/com/sun/star/uno/XAdapter.idl
index 875fc71c8113..474127848f8a 100644
--- a/udkapi/com/sun/star/uno/XAdapter.idl
+++ b/udkapi/com/sun/star/uno/XAdapter.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_uno_XAdapter_idl__
 #define __com_sun_star_uno_XAdapter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_uno_XReference_idl__
 #include <com/sun/star/uno/XReference.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/uno/XAggregation.idl b/udkapi/com/sun/star/uno/XAggregation.idl
index 3fe757bba7b3..c25a39b3a6aa 100644
--- a/udkapi/com/sun/star/uno/XAggregation.idl
+++ b/udkapi/com/sun/star/uno/XAggregation.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_uno_XAggregation_idl__
 #define __com_sun_star_uno_XAggregation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/uno/XComponentContext.idl b/udkapi/com/sun/star/uno/XComponentContext.idl
index fe43ed62e092..c73638c10b60 100644
--- a/udkapi/com/sun/star/uno/XComponentContext.idl
+++ b/udkapi/com/sun/star/uno/XComponentContext.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_uno_XComponentContext_idl__
 #define __com_sun_star_uno_XComponentContext_idl__
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
 
 module com {  module sun {  module star {  module lang {
diff --git a/udkapi/com/sun/star/uno/XCurrentContext.idl b/udkapi/com/sun/star/uno/XCurrentContext.idl
index 4cd83482afe6..7873ed68de29 100644
--- a/udkapi/com/sun/star/uno/XCurrentContext.idl
+++ b/udkapi/com/sun/star/uno/XCurrentContext.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_uno_XCurrentContext_idl__
 #define __com_sun_star_uno_XCurrentContext_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 module com {  module sun {  module star {  module uno {
diff --git a/udkapi/com/sun/star/uno/XNamingService.idl b/udkapi/com/sun/star/uno/XNamingService.idl
index c88da8638696..a987c40b1542 100644
--- a/udkapi/com/sun/star/uno/XNamingService.idl
+++ b/udkapi/com/sun/star/uno/XNamingService.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_uno_XNamingService_idl__
 #define __com_sun_star_uno_XNamingService_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
-#endif
 
  module com {  module sun {  module star {  module uno {
 
diff --git a/udkapi/com/sun/star/uno/XReference.idl b/udkapi/com/sun/star/uno/XReference.idl
index 540ba053abba..3d4c627e2aba 100644
--- a/udkapi/com/sun/star/uno/XReference.idl
+++ b/udkapi/com/sun/star/uno/XReference.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_uno_XReference_idl__
 #define __com_sun_star_uno_XReference_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/uno/XUnloadingPreference.idl b/udkapi/com/sun/star/uno/XUnloadingPreference.idl
index e87efd20d253..a21ba63e0ad9 100644
--- a/udkapi/com/sun/star/uno/XUnloadingPreference.idl
+++ b/udkapi/com/sun/star/uno/XUnloadingPreference.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_uno_XUnloadingPreference_idl__
 #define __com_sun_star_uno_XUnloadingPreference_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/uno/XWeak.idl b/udkapi/com/sun/star/uno/XWeak.idl
index 73b73090d286..4a9d41f6314b 100644
--- a/udkapi/com/sun/star/uno/XWeak.idl
+++ b/udkapi/com/sun/star/uno/XWeak.idl
@@ -27,13 +27,9 @@
 #ifndef __com_sun_star_uno_XWeak_idl__
 #define __com_sun_star_uno_XWeak_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
-#ifndef __com_sun_star_uno_XAdapter_idl__
 #include <com/sun/star/uno/XAdapter.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/util/BootstrapMacroExpander.idl b/udkapi/com/sun/star/util/BootstrapMacroExpander.idl
index 0d98381326fc..6c7faeb884ca 100644
--- a/udkapi/com/sun/star/util/BootstrapMacroExpander.idl
+++ b/udkapi/com/sun/star/util/BootstrapMacroExpander.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_BootstrapMacroExpander_idl__
 #define __com_sun_star_util_BootstrapMacroExpander_idl__
 
-#ifndef __com_sun_star_util_MacroExpander_idl__
 #include <com/sun/star/util/MacroExpander.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/util/MacroExpander.idl b/udkapi/com/sun/star/util/MacroExpander.idl
index 6e8ed2e04325..2b9af68eb41e 100644
--- a/udkapi/com/sun/star/util/MacroExpander.idl
+++ b/udkapi/com/sun/star/util/MacroExpander.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_MacroExpander_idl__
 #define __com_sun_star_util_MacroExpander_idl__
 
-#ifndef __com_sun_star_util_XMacroExpander_idl__
 #include <com/sun/star/util/XMacroExpander.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
 #include <com/sun/star/lang/XComponent.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/util/XMacroExpander.idl b/udkapi/com/sun/star/util/XMacroExpander.idl
index 86b14257c976..a7e755c1f567 100644
--- a/udkapi/com/sun/star/util/XMacroExpander.idl
+++ b/udkapi/com/sun/star/util/XMacroExpander.idl
@@ -27,13 +27,8 @@
 #ifndef __com_sun_star_util_XMacroExpander_idl__
 #define __com_sun_star_util_XMacroExpander_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
 
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/util/XVeto.idl b/udkapi/com/sun/star/util/XVeto.idl
index 813d72c6d69b..705c7dcf7a97 100644
--- a/udkapi/com/sun/star/util/XVeto.idl
+++ b/udkapi/com/sun/star/util/XVeto.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_XVeto_idl__
 #define __com_sun_star_util_XVeto_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/util/logging/Logger.idl b/udkapi/com/sun/star/util/logging/Logger.idl
index 4eaa06676f95..5f0262763865 100644
--- a/udkapi/com/sun/star/util/logging/Logger.idl
+++ b/udkapi/com/sun/star/util/logging/Logger.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_webtop_Logger_idl__
 #define __com_sun_star_webtop_Logger_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_logging_XLogger_idl__
 #include <XLogger.idl>
-#endif
-
-#ifndef __com_sun_star_util_logging_XLoggerRemote_idl__
 #include <XLoggerRemote.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/util/logging/LoggerRemote.idl b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
index 91c3c14eaba4..fa2c93b2e2e8 100644
--- a/udkapi/com/sun/star/util/logging/LoggerRemote.idl
+++ b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
@@ -28,17 +28,9 @@
 #ifndef __com_sun_star_webtop_Logger_idl__
 #define __com_sun_star_webtop_Logger_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_logging_XLogger_idl__
 #include <XLogger.idl>
-#endif
-
-#ifndef __com_sun_star_util_logging_XLoggerRemote_idl__
 #include <XLoggerRemote.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/util/logging/XLogger.idl b/udkapi/com/sun/star/util/logging/XLogger.idl
index ae3355914f25..10aeea62bb42 100644
--- a/udkapi/com/sun/star/util/logging/XLogger.idl
+++ b/udkapi/com/sun/star/util/logging/XLogger.idl
@@ -28,9 +28,7 @@
 #ifndef __com_sun_star_util_logging_XLogger_idl__
 #define __com_sun_star_util_logging_XLogger_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/util/logging/XLoggerRemote.idl b/udkapi/com/sun/star/util/logging/XLoggerRemote.idl
index 81e3482d13e4..334a96d4c6d2 100644
--- a/udkapi/com/sun/star/util/logging/XLoggerRemote.idl
+++ b/udkapi/com/sun/star/util/logging/XLoggerRemote.idl
@@ -28,13 +28,8 @@
 #ifndef __com_sun_star_util_logging_XLoggerRemote_idl__
 #define __com_sun_star_util_logging_XLoggerRemote_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__
 #include <com/sun/star/beans/XPropertiesChangeListener.idl>
-#endif
 
 //=============================================================================
 
diff --git a/udkapi/prj/d.lst b/udkapi/prj/d.lst
index f458df76ad21..13768ff54a03 100644
--- a/udkapi/prj/d.lst
+++ b/udkapi/prj/d.lst
@@ -1,55 +1,55 @@
-mkdir: %COMMON_DEST%\idl%_EXT%\com
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\beans
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge\oleautomation
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\connection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\container
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\io
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\java
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\lang
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\reflection
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\registry
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\loader
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test\performance
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test\bridge
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\uno
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util\logging
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\uri
-mkdir: %_DEST%\bin%_EXT%\ure
+mkdir: %COMMON_DEST%\idl\com
+mkdir: %COMMON_DEST%\idl\com\sun
+mkdir: %COMMON_DEST%\idl\com\sun\star
+mkdir: %COMMON_DEST%\idl\com\sun\star\beans
+mkdir: %COMMON_DEST%\idl\com\sun\star\bridge
+mkdir: %COMMON_DEST%\idl\com\sun\star\bridge\oleautomation
+mkdir: %COMMON_DEST%\idl\com\sun\star\connection
+mkdir: %COMMON_DEST%\idl\com\sun\star\container
+mkdir: %COMMON_DEST%\idl\com\sun\star\io
+mkdir: %COMMON_DEST%\idl\com\sun\star\java
+mkdir: %COMMON_DEST%\idl\com\sun\star\lang
+mkdir: %COMMON_DEST%\idl\com\sun\star\reflection
+mkdir: %COMMON_DEST%\idl\com\sun\star\registry
+mkdir: %COMMON_DEST%\idl\com\sun\star\loader
+mkdir: %COMMON_DEST%\idl\com\sun\star\script
+mkdir: %COMMON_DEST%\idl\com\sun\star\test
+mkdir: %COMMON_DEST%\idl\com\sun\star\test\performance
+mkdir: %COMMON_DEST%\idl\com\sun\star\test\bridge
+mkdir: %COMMON_DEST%\idl\com\sun\star\uno
+mkdir: %COMMON_DEST%\idl\com\sun\star\util
+mkdir: %COMMON_DEST%\idl\com\sun\star\util\logging
+mkdir: %COMMON_DEST%\idl\com\sun\star\security
+mkdir: %COMMON_DEST%\idl\com\sun\star\task
+mkdir: %COMMON_DEST%\idl\com\sun\star\uri
+mkdir: %_DEST%\bin\ure
 
-..\%__SRC%\misc\udkapi.autodoc %_DEST%\idl%_EXT%\udkapi.autodoc
-..\%__SRC%\ucr\udkapi.db %_DEST%\bin%_EXT%\udkapi.rdb
-..\%__SRC%\ucr\udkapi.db %_DEST%\bin%_EXT%\ure\types.rdb
-..\%__SRC%\ucrdoc\udkapi_doc.db %_DEST%\bin%_EXT%\udkapi_doc.rdb
+..\%__SRC%\misc\udkapi.autodoc %_DEST%\idl\udkapi.autodoc
+..\%__SRC%\ucr\udkapi.db %_DEST%\bin\udkapi.rdb
+..\%__SRC%\ucr\udkapi.db %_DEST%\bin\ure\types.rdb
+..\%__SRC%\ucrdoc\udkapi_doc.db %_DEST%\bin\udkapi_doc.rdb
 
-..\com\sun\star\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star
-..\com\sun\star\beans\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\beans
-..\com\sun\star\bridge\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge
-..\com\sun\star\bridge\oleautomation\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge\oleautomation
-..\com\sun\star\connection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\connection
-..\com\sun\star\container\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\container
-..\com\sun\star\io\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\io
-..\com\sun\star\java\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\java
-..\com\sun\star\lang\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\lang
-..\com\sun\star\reflection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\reflection
-..\com\sun\star\registry\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\registry
-..\com\sun\star\loader\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\loader
-..\com\sun\star\script\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script
-..\com\sun\star\test\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test
-..\com\sun\star\test\performance\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test\performance
-..\com\sun\star\test\bridge\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test\bridge
-..\com\sun\star\uno\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\uno
-..\com\sun\star\util\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util
-..\com\sun\star\util\logging\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util\logging
-..\com\sun\star\security\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\security
-..\com\sun\star\task\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\task
-..\com\sun\star\uri\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\uri
+..\com\sun\star\*.idl %COMMON_DEST%\idl\com\sun\star
+..\com\sun\star\beans\*.idl %COMMON_DEST%\idl\com\sun\star\beans
+..\com\sun\star\bridge\*.idl %COMMON_DEST%\idl\com\sun\star\bridge
+..\com\sun\star\bridge\oleautomation\*.idl %COMMON_DEST%\idl\com\sun\star\bridge\oleautomation
+..\com\sun\star\connection\*.idl %COMMON_DEST%\idl\com\sun\star\connection
+..\com\sun\star\container\*.idl %COMMON_DEST%\idl\com\sun\star\container
+..\com\sun\star\io\*.idl %COMMON_DEST%\idl\com\sun\star\io
+..\com\sun\star\java\*.idl %COMMON_DEST%\idl\com\sun\star\java
+..\com\sun\star\lang\*.idl %COMMON_DEST%\idl\com\sun\star\lang
+..\com\sun\star\reflection\*.idl %COMMON_DEST%\idl\com\sun\star\reflection
+..\com\sun\star\registry\*.idl %COMMON_DEST%\idl\com\sun\star\registry
+..\com\sun\star\loader\*.idl %COMMON_DEST%\idl\com\sun\star\loader
+..\com\sun\star\script\*.idl %COMMON_DEST%\idl\com\sun\star\script
+..\com\sun\star\test\*.idl %COMMON_DEST%\idl\com\sun\star\test
+..\com\sun\star\test\performance\*.idl %COMMON_DEST%\idl\com\sun\star\test\performance
+..\com\sun\star\test\bridge\*.idl %COMMON_DEST%\idl\com\sun\star\test\bridge
+..\com\sun\star\uno\*.idl %COMMON_DEST%\idl\com\sun\star\uno
+..\com\sun\star\util\*.idl %COMMON_DEST%\idl\com\sun\star\util
+..\com\sun\star\util\logging\*.idl %COMMON_DEST%\idl\com\sun\star\util\logging
+..\com\sun\star\security\*.idl %COMMON_DEST%\idl\com\sun\star\security
+..\com\sun\star\task\*.idl %COMMON_DEST%\idl\com\sun\star\task
+..\com\sun\star\uri\*.idl %COMMON_DEST%\idl\com\sun\star\uri
 
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
+..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib
diff --git a/unoil/climaker/makefile.mk b/unoil/climaker/makefile.mk
index 36de0bf117ca..d820e72d082e 100644
--- a/unoil/climaker/makefile.mk
+++ b/unoil/climaker/makefile.mk
@@ -34,7 +34,6 @@ TARGET = unotypes
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 
-#.INCLUDE : $(PRJ)$/util$/target.pmk
 .INCLUDE : target.mk
 
 .INCLUDE : version.txt
diff --git a/unoil/prj/d.lst b/unoil/prj/d.lst
index 30bd77c221c0..b4ee5815d778 100644
--- a/unoil/prj/d.lst
+++ b/unoil/prj/d.lst
@@ -1,5 +1,5 @@
-..\%__SRC%\class\unoil.jar %_DEST%\bin%_EXT%\unoil.jar
-..\%__SRC%\bin\cli_oootypes.dll %_DEST%\bin%_EXT%\cli_oootypes.dll
-..\%__SRC%\bin\cli_oootypes.config %_DEST%\bin%_EXT%\cli_oootypes.config
-..\%__SRC%\bin\policy*.dll %_DEST%\bin%_EXT%\policy*.dll
-..\%__SRC%\bin\clioootypesversion.mk %_DEST%\bin%_EXT%\clioootypesversion.mk 
+..\%__SRC%\class\unoil.jar %_DEST%\bin\unoil.jar
+..\%__SRC%\bin\cli_oootypes.dll %_DEST%\bin\cli_oootypes.dll
+..\%__SRC%\bin\cli_oootypes.config %_DEST%\bin\cli_oootypes.config
+..\%__SRC%\bin\policy*.dll %_DEST%\bin\policy*.dll
+..\%__SRC%\bin\clioootypesversion.mk %_DEST%\bin\clioootypesversion.mk 
diff --git a/ure/prj/d.lst b/ure/prj/d.lst
index 22cfb161c19a..f9e28443b177 100644
--- a/ure/prj/d.lst
+++ b/ure/prj/d.lst
@@ -1,11 +1,11 @@
-mkdir: %_DEST%\bin%_EXT%\ure
-mkdir: %_DEST%\xml%_EXT%\ure
-..\%__SRC%\bin\uretest.zip %COMMON_DEST%\bin%_EXT%\uretest.zip
-..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\ure\services.rdb
-..\source\README %_DEST%\bin%_EXT%\ure\README
-..\source\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\ure\THIRDPARTYLICENSEREADME.html
-..\source\jvmfwk3.ini %_DEST%\bin%_EXT%\ure\jvmfwk3.ini
-..\source\jvmfwk3rc %_DEST%\bin%_EXT%\ure\jvmfwk3rc
-..\source\startup.sh %_DEST%\bin%_EXT%\ure\startup.sh
-..\source\uno.ini %_DEST%\bin%_EXT%\ure\uno.ini
-..\source\unorc %_DEST%\bin%_EXT%\ure\unorc
+mkdir: %_DEST%\bin\ure
+mkdir: %_DEST%\xml\ure
+..\%__SRC%\bin\uretest.zip %COMMON_DEST%\bin\uretest.zip
+..\%__SRC%\misc\services.rdb %_DEST%\xml\ure\services.rdb
+..\source\README %_DEST%\bin\ure\README
+..\source\THIRDPARTYLICENSEREADME.html %_DEST%\bin\ure\THIRDPARTYLICENSEREADME.html
+..\source\jvmfwk3.ini %_DEST%\bin\ure\jvmfwk3.ini
+..\source\jvmfwk3rc %_DEST%\bin\ure\jvmfwk3rc
+..\source\startup.sh %_DEST%\bin\ure\startup.sh
+..\source\uno.ini %_DEST%\bin\ure\uno.ini
+..\source\unorc %_DEST%\bin\ure\unorc
diff --git a/ure/source/makefile.mk b/ure/source/makefile.mk
index bdd43656b32c..c8837a68186f 100644
--- a/ure/source/makefile.mk
+++ b/ure/source/makefile.mk
@@ -41,9 +41,6 @@ my_components = \
     introspection \
     invocadapt \
     invocation \
-    javaloader \
-    javavm \
-    juh \
     namingservice \
     proxyfac \
     reflection \
@@ -53,6 +50,15 @@ my_components = \
     textoutstream \
     uuresolver
 
+.IF "$(SOLAR_JAVA)" != ""
+
+my_components += \
+    javaloader \
+    javavm \
+    juh
+
+.ENDIF
+
 .INCLUDE: settings.mk
 .INCLUDE: target.mk
 
diff --git a/ure/source/startup.sh b/ure/source/startup.sh
index 7130d172809b..1b80e16cf3d6 100644
--- a/ure/source/startup.sh
+++ b/ure/source/startup.sh
@@ -39,8 +39,17 @@ epath=`dirname "$0"`
 if [ -x "${epath}/javaldx" ] ; then
     jpath=`"${epath}/javaldx" $my_envargs`
     if [ -n "${jpath}" ]; then
-        LD_LIBRARY_PATH=${jpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-        export LD_LIBRARY_PATH
+        sd_platform=`uname -s`
+        case $sd_platform in
+          AIX)
+            LIBPAT=${jpath}${LIBPATH:+:${LIBPATH}}
+            export LIBPATH
+            ;;
+          *)
+            LD_LIBRARY_PATH=${jpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+            export LD_LIBRARY_PATH
+            ;;
+        esac
     fi
 fi
 
diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile
index 7aaf580eb642..df5f811f01c2 100644
--- a/ure/source/uretest/Makefile
+++ b/ure/source/uretest/Makefile
@@ -57,13 +57,13 @@ endif
 
 
 .PHONY: ALL
-ALL: test
+ALL: check
 
 include $(PRJ)/settings/stdtarget.mk
 
 
-.PHONY: test
-test: test-cpptest test-javatest test-javanative test-clientserver
+.PHONY: check
+check: test-cpptest test-javatest test-javanative test-clientserver
 
 .PHONY: test-cpptest
 test-cpptest: out.sdk/cppmain.uno.$(SHAREDLIB_EXT) out.sdk/types.rdb \
@@ -120,7 +120,7 @@ out.sdk/cppmain.uno.$(SHAREDLIB_EXT): out.sdk/cppmain.$(OBJ_EXT) version.map | \
             out.sdk
 	$(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $< $(LINK_LIBS) \
             $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) \
-            $(STLPORTLIB) $(link_std_libs)
+            $(link_std_libs)
 
 out.sdk/cppmain.$(OBJ_EXT): cppmain.cc out.sdk/cpputypes.cppumaker.flag \
             out.sdk/types.cppumaker.flag | out.sdk
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index d5062a56810d..e8ec32056bde 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -40,8 +40,8 @@ GXX_INCLUDE_PATH ?= /usr/include/g++
 .DELETE_ON_ERROR:
 
 
-.PHONY: test
-test: test-regview test-cpptest test-javatest test-javanative test-clientserver
+.PHONY: check
+check: test-regview test-cpptest test-javatest test-javanative test-clientserver
 
 .PHONY: test-regview
 test-regview: out.pln/services.rdb
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index 0be81b637053..ee2ca081488c 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -26,12 +26,13 @@
  ************************************************************************/
 
 #include "sal/config.h"
+#include "sal/macros.h"
 
 #include <cstddef>
 #include <functional>
 #include <memory>
 #include <new>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 #include "com/sun/star/lang/XMain.hpp"
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
@@ -104,9 +105,9 @@ private:
     { // check for stlport
         osl::Mutex m;
         std::auto_ptr< cppu::OMultiTypeInterfaceContainerHelperVar<
-            int, std::hash< int >, std::equal_to< int > > > dummy(
+            int, boost::hash< int >, std::equal_to< int > > > dummy(
                 new cppu::OMultiTypeInterfaceContainerHelperVar<
-                int, std::hash< int >, std::equal_to< int > >(m));
+                int, boost::hash< int >, std::equal_to< int > >(m));
     }
     static char const * const services[] = {
         "com.sun.star.beans.Introspection",
@@ -151,26 +152,6 @@ private:
         "com.sun.star.uri.UriReferenceFactory",
         "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript",
         "com.sun.star.uri.VndSunStarPkgUrlReferenceFactory"
-        // "com.sun.star.beans.PropertyBag",
-        // "com.sun.star.beans.PropertySet",
-        // "com.sun.star.bridge.OleApplicationRegistration",
-        // "com.sun.star.bridge.OleBridgeSupplier",
-        // "com.sun.star.bridge.OleBridgeSupplier2",
-        // "com.sun.star.bridge.OleBridgeSupplierVar1",
-        // "com.sun.star.bridge.OleObjectFactory",
-        // "com.sun.star.bridge.oleautomation.ApplicationRegistration",
-        // "com.sun.star.bridge.oleautomation.BridgeSupplier",
-        // "com.sun.star.bridge.oleautomation.Factory",
-        // "com.sun.star.loader.Dynamic",
-        // "com.sun.star.registry.DefaultRegistry",
-        // "com.sun.star.script.AllListenerAdapter",
-        // "com.sun.star.script.Engine",
-        // "com.sun.star.script.JavaScript",
-        // "com.sun.star.test.TestFactory",
-        // "com.sun.star.util.BootstrapMacroExpander",
-        // "com.sun.star.util.MacroExpander",
-        // "com.sun.star.util.logging.Logger",
-        // "com.sun.star.util.logging.LoggerRemote"
     };
     ::css::uno::Reference< ::css::lang::XMultiComponentFactory > manager(
         context_->getServiceManager());
@@ -179,7 +160,7 @@ private:
             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no service manager")),
             static_cast< ::cppu::OWeakObject * >(this));
     }
-    for (::std::size_t i = 0; i < sizeof services / sizeof services[0]; ++i) {
+    for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) {
         ::css::uno::Reference< ::css::uno::XInterface > instance;
         try {
             instance = manager->createInstanceWithContext(
@@ -200,7 +181,7 @@ private:
     }
     static char const * const singletons[] = {
         "com.sun.star.util.theMacroExpander" };
-    for (::std::size_t i = 0; i < sizeof singletons / sizeof singletons[0]; ++i)
+    for (::std::size_t i = 0; i < SAL_N_ELEMENTS(singletons); ++i)
     {
         ::rtl::OUStringBuffer b;
         b.appendAscii(RTL_CONSTASCII_STRINGPARAM("/singletons/"));
@@ -278,14 +259,14 @@ extern "C" ::sal_Bool SAL_CALL component_writeInfo(
         serviceManager, registryKey, entries);
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return ::cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     char const ** envTypeName, ::uno_Environment **)
 {
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc
index e4e72e3933c7..68fe22e1fb19 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -111,14 +111,14 @@ extern "C" ::sal_Bool SAL_CALL component_writeInfo(
         serviceManager, registryKey, entries);
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return ::cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     char const ** envTypeName, ::uno_Environment **)
 {
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc
index c93050bd836b..9f2c40af19c8 100644
--- a/ure/source/uretest/cpptest.cc
+++ b/ure/source/uretest/cpptest.cc
@@ -111,14 +111,14 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
         serviceManager, registryKey, entries);
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     char const ** envTypeName, uno_Environment **)
 {
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
diff --git a/xml2cmp/prj/build.lst b/xml2cmp/prj/build.lst
index e9f2979af4ff..28ecf4f12ee0 100644
--- a/xml2cmp/prj/build.lst
+++ b/xml2cmp/prj/build.lst
@@ -1,4 +1,4 @@
-xc  xml2cmp : soltools stlport NULL
+xc  xml2cmp : soltools NULL
 xc  xml2cmp                         usr1    -	all	xc_mkout NULL
 xc  xml2cmp\prj                     get -	all	xc_prj NULL
 xc  xml2cmp\source\support                  nmake   -   all	xc_supp NULL
diff --git a/xml2cmp/prj/d.lst b/xml2cmp/prj/d.lst
index 51c51b4fc2d0..bb5adfa2109e 100644
--- a/xml2cmp/prj/d.lst
+++ b/xml2cmp/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\xml2cmp.exe %_DEST%\bin%_EXT%\xml2cmp.exe
-..\%__SRC%\bin\xml2cmp %_DEST%\bin%_EXT%\xml2cmp
-..\%__SRC%\bin\srvdepy.exe %_DEST%\bin%_EXT%\srvdepy.exe
-..\%__SRC%\bin\srvdepy %_DEST%\bin%_EXT%\srvdepy
+..\%__SRC%\bin\xml2cmp.exe %_DEST%\bin\xml2cmp.exe
+..\%__SRC%\bin\xml2cmp %_DEST%\bin\xml2cmp
+..\%__SRC%\bin\srvdepy.exe %_DEST%\bin\srvdepy.exe
+..\%__SRC%\bin\srvdepy %_DEST%\bin\srvdepy
diff --git a/xml2cmp/source/finder/dep_main.cxx b/xml2cmp/source/finder/dep_main.cxx
index 1f53dea346f4..6f6de46f0a18 100644
--- a/xml2cmp/source/finder/dep_main.cxx
+++ b/xml2cmp/source/finder/dep_main.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,4 @@ main( int       argc,
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/finder/dependy.cxx b/xml2cmp/source/finder/dependy.cxx
index 5bc7e599798a..8a7ae0a8d94f 100644
--- a/xml2cmp/source/finder/dependy.cxx
+++ b/xml2cmp/source/finder/dependy.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,7 +104,6 @@ DependencyFinder::FindNeededServices( StringVector &        o_rLibraries,
     aResult_Libraries.erase( aResult_Libraries.begin(), aResult_Libraries.end() );
     aResult_Services.erase( aResult_Services.begin(), aResult_Services.end() );
 
-//  const ServiceInfo & rSInfo = (*itService).second->FirstImplementation();
     Add2Result( *(*itService).second );
 
     for ( std::set< Simstr >::const_iterator il = aResult_Libraries.begin();
@@ -222,3 +222,4 @@ ShortName(const Simstr & i_rService)
         return i_rService;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/finder/dependy.hxx b/xml2cmp/source/finder/dependy.hxx
index 51311cd8178e..c2c2d7d9233f 100644
--- a/xml2cmp/source/finder/dependy.hxx
+++ b/xml2cmp/source/finder/dependy.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -114,3 +115,4 @@ class DependencyFinder
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/finder/makefile.mk b/xml2cmp/source/finder/makefile.mk
index 22ae524f360c..fee7e41c637c 100644
--- a/xml2cmp/source/finder/makefile.mk
+++ b/xml2cmp/source/finder/makefile.mk
@@ -37,7 +37,10 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
@@ -45,13 +48,10 @@ OBJFILES= \
     $(OBJ)$/dependy.obj	\
     $(OBJ)$/dep_main.obj
 
-
 # --- Targets ------------------------------------------------------
 
 APP1TARGET=	$(TARGET)
-.IF "$(GUI)"!="OS2"
 APP1STACK=	1000000
-.ENDIF
 
 LIBSALCPPRT=$(0)
 
@@ -59,11 +59,7 @@ LIBSALCPPRT=$(0)
 UWINAPILIB=$(0)
 .ENDIF
 
-
 APP1LIBS=	$(LB)$/$(TARGET).lib $(LB)$/x2c_xcdl.lib $(LB)$/x2c_support.lib
 APP1DEPN=	$(LB)$/$(TARGET).lib $(LB)$/x2c_xcdl.lib $(LB)$/x2c_support.lib
 
-
 .INCLUDE :  target.mk
-
-
diff --git a/xml2cmp/source/inc/lst_str.h b/xml2cmp/source/inc/lst_str.h
index 1a7ff7bb1f10..fdd162ad05b8 100644
--- a/xml2cmp/source/inc/lst_str.h
+++ b/xml2cmp/source/inc/lst_str.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,3 +98,4 @@ void                LSE_DeleteData( LSElem_THIS );
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/inc/new_del.h b/xml2cmp/source/inc/new_del.h
index 3c0fbaa59218..c00c4bb26e27 100644
--- a/xml2cmp/source/inc/new_del.h
+++ b/xml2cmp/source/inc/new_del.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,3 +54,4 @@ void                Delete(
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/inc/precomp.h b/xml2cmp/source/inc/precomp.h
index a909019b124e..72e1f368b2bf 100644
--- a/xml2cmp/source/inc/precomp.h
+++ b/xml2cmp/source/inc/precomp.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,3 +54,4 @@ typedef long        intt;
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/inc/str.h b/xml2cmp/source/inc/str.h
index 5d3a2a03040e..62192aaa9a71 100644
--- a/xml2cmp/source/inc/str.h
+++ b/xml2cmp/source/inc/str.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,4 @@ void                Cs_ToUpper( Cstring_THIS );
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/inc/textbuff.h b/xml2cmp/source/inc/textbuff.h
index bb9ee672dc2c..94fc16247d46 100644
--- a/xml2cmp/source/inc/textbuff.h
+++ b/xml2cmp/source/inc/textbuff.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,3 +84,4 @@ Bool                TB_EndOfBuffer( TextBuffer_THIS );
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/inc/textfile.h b/xml2cmp/source/inc/textfile.h
index 9c6b15fa0608..a86d355a9cf4 100644
--- a/xml2cmp/source/inc/textfile.h
+++ b/xml2cmp/source/inc/textfile.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,3 +75,4 @@ intt                TF_Size( TextFile_THIS );
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/badcast.cxx b/xml2cmp/source/support/badcast.cxx
index f36d9875b52c..37a763967dc1 100644
--- a/xml2cmp/source/support/badcast.cxx
+++ b/xml2cmp/source/support/badcast.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,3 +44,4 @@ _STD_END
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/cmdline.cxx b/xml2cmp/source/support/cmdline.cxx
index c8e10bb141ff..2af998cfd922 100644
--- a/xml2cmp/source/support/cmdline.cxx
+++ b/xml2cmp/source/support/cmdline.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,7 +163,7 @@ CommandLine::ParseIndexCommand( int                 argc,
                     argv  );
 
     sIndexFile = sOutputDirectory;
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     sIndexFile+= "\\xmlindex.html";
 #elif defined(UNX)
     sIndexFile+= "/xmlindex.html";
@@ -220,3 +221,5 @@ CommandLine::ParseSingleFileCommand( int                argc,
         }
     }   /* end for */
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/cmdline.hxx b/xml2cmp/source/support/cmdline.hxx
index 2faaf3cabe31..126cdeae138f 100644
--- a/xml2cmp/source/support/cmdline.hxx
+++ b/xml2cmp/source/support/cmdline.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,4 @@ class CommandLine
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/heap.cxx b/xml2cmp/source/support/heap.cxx
index 74896302bd27..e814cbe66eef 100644
--- a/xml2cmp/source/support/heap.cxx
+++ b/xml2cmp/source/support/heap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -205,3 +206,4 @@ HeapItem::SetNext( HeapItem * i_pNext )
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/heap.hxx b/xml2cmp/source/support/heap.hxx
index d1d51d8ce640..5d4a9bf0a610 100644
--- a/xml2cmp/source/support/heap.hxx
+++ b/xml2cmp/source/support/heap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,4 @@ class HeapItem
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/list.hxx b/xml2cmp/source/support/list.hxx
index 163cd74ece83..66888ee6bfbc 100644
--- a/xml2cmp/source/support/list.hxx
+++ b/xml2cmp/source/support/list.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,9 +73,6 @@ class List
 
     unsigned            size() const            { return len; }
     unsigned            space() const           { return allocated; }
-    bool                is_valid_index(
-                            unsigned            n) const
-                                                { return n < len; }
     // ACCESS
     XX &                front()                 { return elem(0); }
     XX &                back()                  { return elem(len-1); }
@@ -167,7 +165,7 @@ template <class XX>
 void
 List<XX>::checkSize(unsigned newLength)
 {
-   // neuen Platzbedarf pruefen:
+   // test new size requirement:
    unsigned newSpace = space();
    if (newLength > newSpace)
    {
@@ -186,7 +184,7 @@ List<XX>::checkSize(unsigned newLength)
       }
    }
 
-   // Veraenderung ?:
+   // change?
    if (newSpace != space())
       alloc(newSpace,true);
 }
@@ -238,7 +236,7 @@ template <class XY>
 void
 DynamicList<XY>::remove( unsigned           pos )
 {
-    if (!this->is_valid_index(pos) )
+    if (pos >= this->len)
         return;
     this->len--;
     delete this->inhalt[pos];
@@ -249,3 +247,4 @@ DynamicList<XY>::remove( unsigned           pos )
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/makefile.mk b/xml2cmp/source/support/makefile.mk
index 8f0abcd5a19c..4c243174cc1f 100644
--- a/xml2cmp/source/support/makefile.mk
+++ b/xml2cmp/source/support/makefile.mk
@@ -31,15 +31,16 @@ PRJNAME=xml2cmp
 TARGET=x2c_support
 TARGETTYPE=CUI
 
-
-
 # --- Settings -----------------------------------------------------
 
 ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
@@ -50,12 +51,7 @@ OBJFILES= \
     $(OBJ)$/syshelp.obj		\
     $(OBJ)$/badcast.obj
 
-
-
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
 
-
-
diff --git a/xml2cmp/source/support/sistr.cxx b/xml2cmp/source/support/sistr.cxx
index 1d506ba0afe3..1a59ea78cc50 100644
--- a/xml2cmp/source/support/sistr.cxx
+++ b/xml2cmp/source/support/sistr.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -398,3 +399,4 @@ operator>=(const char * str, const Simstr & S)
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/sistr.hxx b/xml2cmp/source/support/sistr.hxx
index 7ef22de18f8a..a7f747ead017 100644
--- a/xml2cmp/source/support/sistr.hxx
+++ b/xml2cmp/source/support/sistr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,8 +51,8 @@ class  Simstr
 
       // diverse utility functions
       const char *   str() const                { return sz; }
-      char *         s();   // ATTENTION !!!       // Only to be used, when a function needs a 'char*' but
-                                                   //   nevertheless THAT WILL BE NOT CHANGED!
+      char *         s();   // CAUTION!!!          // Only use when a function needs a 'char*' but
+                                                   //   still will NOT MODIFY THE STRING!
                                                    //   Typecasts to 'const char*' are performed automatically.
       int            l() const;                    // Length of string without '\0' at end.
       Simstr         operator+(
@@ -146,3 +147,4 @@ Simstr::is_empty() const               { return len == 0; }
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/syshelp.cxx b/xml2cmp/source/support/syshelp.cxx
index 4eb742030048..b6091e0b6917 100644
--- a/xml2cmp/source/support/syshelp.cxx
+++ b/xml2cmp/source/support/syshelp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,7 +37,7 @@
 
 #ifdef WNT
 #include <io.h>
-#elif defined(UNX) || defined(OS2)
+#elif defined(UNX)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
@@ -204,7 +205,7 @@ GatherFileNames( List<Simstr> &     o_sFiles,
 
     _findclose(hFile);
     delete [] sFilter;
-#elif defined(UNX) || defined(OS2)
+#elif defined(UNX)
     DIR * pDir = opendir( i_sSrcDirectory );
     dirent * pEntry = 0;
     char * sEnding;
@@ -286,7 +287,7 @@ GatherSubDirectories( List<Simstr> &    o_sSubDirectories,
     _findclose(hFile);
     delete [] sFilter;
 
-#elif defined(UNX) || defined(OS2)
+#elif defined(UNX)
     DIR * pDir = opendir( i_sParentdDirectory );
     dirent * pEntry = 0;
     struct stat     aEntryStatus;
@@ -312,3 +313,4 @@ GatherSubDirectories( List<Simstr> &    o_sSubDirectories,
 #endif
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/syshelp.hxx b/xml2cmp/source/support/syshelp.hxx
index bd380ccc1bb3..dda50c276e57 100644
--- a/xml2cmp/source/support/syshelp.hxx
+++ b/xml2cmp/source/support/syshelp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,7 @@ class Simstr;
 template <class XY> class List;
 
 
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
 const char   C_sSLASH[] = "\\";
 const char   C_cSLASH = '\\';
 #elif defined(UNX)
@@ -83,3 +84,4 @@ void                GatherSubDirectories(
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/x2cclass/x2cstl.hxx b/xml2cmp/source/x2cclass/x2cstl.hxx
deleted file mode 100644
index 472e474b1889..000000000000
--- a/xml2cmp/source/x2cclass/x2cstl.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef UDKSERVICE_X2CSTL_HXX
-#define UDKSERVICE_X2CSTL_HXX
-
-
-#if STLPORT_VERSION < 321
-#include <tools/presys.h>
-#include    <vector.h>
-#include <tools/postsys.h>
-#else
-#include    <vector>
-#endif  // STLPORT_VERSION < 321
-
-#ifdef _USE_NO_NAMERSPACES_
-#define std
-#endif
-
-
-#endif
-
-
diff --git a/xml2cmp/source/x2cclass/xml_cd.hxx b/xml2cmp/source/x2cclass/xml_cd.hxx
index ba075c5aa063..9f59aa476fcb 100644
--- a/xml2cmp/source/x2cclass/xml_cd.hxx
+++ b/xml2cmp/source/x2cclass/xml_cd.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 
 #include <tools/string.hxx>
-#include "x2cstl.hxx"
+#include <vector>
 
 
 
@@ -83,3 +84,4 @@ class ComponentDescription
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/x2cclass/xml_cdff.cxx b/xml2cmp/source/x2cclass/xml_cdff.cxx
index 5ce3b5508a2d..83827335dbe5 100644
--- a/xml2cmp/source/x2cclass/xml_cdff.cxx
+++ b/xml2cmp/source/x2cclass/xml_cdff.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -229,3 +230,4 @@ CompDescrsFromAnXmlFile::Empty()
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/x2cclass/xml_cdff.hxx b/xml2cmp/source/x2cclass/xml_cdff.hxx
index a2c47ad0bda2..6616abbf0edb 100644
--- a/xml2cmp/source/x2cclass/xml_cdff.hxx
+++ b/xml2cmp/source/x2cclass/xml_cdff.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,3 +103,4 @@ class CompDescrsFromAnXmlFile
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/x2cclass/xml_cdim.cxx b/xml2cmp/source/x2cclass/xml_cdim.cxx
index 05bb0d4741fb..ed9bc1b12c3e 100644
--- a/xml2cmp/source/x2cclass/xml_cdim.cxx
+++ b/xml2cmp/source/x2cclass/xml_cdim.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -181,3 +182,4 @@ ComponentDescriptionImpl::ValueList::Null_()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/x2cclass/xml_cdim.hxx b/xml2cmp/source/x2cclass/xml_cdim.hxx
index cbf611c03e07..c9a0d650fc6f 100644
--- a/xml2cmp/source/x2cclass/xml_cdim.hxx
+++ b/xml2cmp/source/x2cclass/xml_cdim.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -111,3 +112,4 @@ ComponentDescriptionImpl::DescriptionEndTagSize()
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/cr_html.cxx b/xml2cmp/source/xcd/cr_html.cxx
index 6796f320930c..c8d35c6e5de0 100644
--- a/xml2cmp/source/xcd/cr_html.cxx
+++ b/xml2cmp/source/xcd/cr_html.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,7 +54,7 @@ HtmlCreator::HtmlCreator( const char *              i_pOutputFileName,
                           const XmlElement &        i_rDocument,
                           const Simstr &            i_sIDL_BaseDirectory )
     :   aFile(i_pOutputFileName, std::ios::out
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
                                                | std::ios::binary
 #endif
                                                              ),
@@ -266,3 +267,4 @@ HtmlCreator::WriteElementName( const Simstr & i_sName,
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/cr_html.hxx b/xml2cmp/source/xcd/cr_html.hxx
index 33a2aff2986a..b68e641d88f1 100644
--- a/xml2cmp/source/xcd/cr_html.hxx
+++ b/xml2cmp/source/xcd/cr_html.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,3 +98,4 @@ class HtmlCreator
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/cr_index.cxx b/xml2cmp/source/xcd/cr_index.cxx
index e73d87971cb8..927517558f3b 100644
--- a/xml2cmp/source/xcd/cr_index.cxx
+++ b/xml2cmp/source/xcd/cr_index.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -158,7 +159,7 @@ Index::CreateHtmlFileName(  char *                      o_sOutputHtml,
     }
 
     strcpy( o_sOutputHtml, sOutputDirectory.str() );        // STRCPY SAFE HERE
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     strcat(o_sOutputHtml, "\\");                            // STRCAT SAFE HERE
 #elif defined(UNX)
     strcat(o_sOutputHtml, "/");                             // STRCAT SAFE HERE
@@ -240,7 +241,7 @@ Index::WriteHeap( std::ostream &    o_rOut,
 
 
 
-/** �bersicht der Struktur
+/** Structure overview
 
 MODULEDESCRIPTION
 {
@@ -273,3 +274,4 @@ MODULEDESCRIPTION
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/cr_index.hxx b/xml2cmp/source/xcd/cr_index.hxx
index a0de5d960952..eeea87ed1e46 100644
--- a/xml2cmp/source/xcd/cr_index.hxx
+++ b/xml2cmp/source/xcd/cr_index.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,4 @@ class Index
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/cr_metho.cxx b/xml2cmp/source/xcd/cr_metho.cxx
index b53ded109778..74e0d728cfb6 100644
--- a/xml2cmp/source/xcd/cr_metho.cxx
+++ b/xml2cmp/source/xcd/cr_metho.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,7 +64,7 @@ Create_AccessMethod( const char *           i_pOutputFileName,
     int    sDescrLen = (int) strlen(sDescrLineChange);
 
     std::ofstream aFile(i_pOutputFileName, std::ios::out
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
                                                | std::ios::binary
 #endif
     );
@@ -91,8 +92,6 @@ Create_AccessMethod( const char *           i_pOutputFileName,
                         break;
             case '\r':  aFile.write( "\\r", 2);
                         break;
-//          case '\t':  aFile.write( "\\t", 2);
-//                      break;
             default:    aFile.write( pTrans, 1);
         }
     }   /* end for */
@@ -104,3 +103,4 @@ Create_AccessMethod( const char *           i_pOutputFileName,
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/cr_metho.hxx b/xml2cmp/source/xcd/cr_metho.hxx
index 2a9e89da6c89..212d74045e20 100644
--- a/xml2cmp/source/xcd/cr_metho.hxx
+++ b/xml2cmp/source/xcd/cr_metho.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,3 +36,5 @@ void                Create_AccessMethod(
                         const char *            i_sText );
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/filebuff.cxx b/xml2cmp/source/xcd/filebuff.cxx
index 10f7dc0c2e16..4f65659d32b6 100644
--- a/xml2cmp/source/xcd/filebuff.cxx
+++ b/xml2cmp/source/xcd/filebuff.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,6 +26,10 @@
  *
  ************************************************************************/
 
+#ifdef AIX
+#    undef _THREAD_SAFE
+#endif
+
 #include "filebuff.hxx"
 
 #include <string.h>
@@ -39,7 +44,7 @@ LoadXmlFile( Buffer &           o_rBuffer,
     std::ifstream aXmlFile;
 
     aXmlFile.open(i_sXmlFilePath, std::ios::in
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
                                           | std::ios::binary
 #endif // WNT
     );
@@ -61,3 +66,4 @@ LoadXmlFile( Buffer &           o_rBuffer,
     return ret;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/filebuff.hxx b/xml2cmp/source/xcd/filebuff.hxx
index 5118ba82e647..053d5c9e9fa0 100644
--- a/xml2cmp/source/xcd/filebuff.hxx
+++ b/xml2cmp/source/xcd/filebuff.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,5 @@ bool                LoadXmlFile(
 
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
index d692149d2523..5a42d51db90b 100644
--- a/xml2cmp/source/xcd/main.cxx
+++ b/xml2cmp/source/xcd/main.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -127,16 +128,16 @@ Do_SingleFileCommandLine(const CommandLine & i_rCommandLine)
 int
 Do_IndexCommandLine(const CommandLine & i_rCommandLine)
 {
-    // Parsen files:
+    // Parse files:
     List<Simstr>    aFiles;
     Index           aIndex( i_rCommandLine.OutputDirectory(),
                             i_rCommandLine.IdlRootPath(),
                             i_rCommandLine.IndexedTags() );
 
-    std::cout << "Gather xml-files ..." << std::endl;
+    std::cout << "Gathering xml-files ..." << std::endl;
     GatherFileNames( aFiles, i_rCommandLine.XmlSrcDirectory() );
 
-    std::cout << "Create output ..." << std::endl;
+    std::cout << "Creating output ..." << std::endl;
     aIndex.GatherData(aFiles);
     aIndex.WriteOutput( i_rCommandLine.IndexOutputFile() );
 
@@ -171,73 +172,6 @@ Create_TypeInfo( const char *           o_sOutputFile,
         Put2StdOut_TypeInfo(i_rData);
     else
         Put2File_TypeInfo(o_sOutputFile,i_rData);
-
-#if 0
-    std::ofstream aOut(o_sOutputFile, std::ios::out
-#if defined(WNT) || defined(OS2)
-                                               | std::ios::binary
-#endif
-    );
-    if ( !aOut )
-    {
-        std::cerr << "Error: " << o_sOutputFile << " could not be created." << std::endl;
-        return;
-    }
-
-    Heap    aTypesHeap(12);
-    Simstr  sLibPrefix = i_rData.ModuleName();
-
-    // Gather types:
-    List< const MultipleTextElement * > aTypes;
-    i_rData.Get_Types(aTypes);
-
-    for ( unsigned t = 0; t < aTypes.size(); ++t )
-    {
-        unsigned i_max = aTypes[t]->Size();
-        for ( unsigned  i = 0; i < i_max; ++i )
-        {
-            aTypesHeap.InsertValue( aTypes[t]->Data(i), "" );
-        }  // end for
-    }
-
-    // Write types:
-    WriteStr( aOut, sLibPrefix );
-    WriteStr( aOut, "_XML2CMPTYPES= ");
-
-    HeapItem * pLastHeapTop = 0;
-    for ( HeapItem * pHeapTop = aTypesHeap.ReleaseTop(); pHeapTop != 0; pHeapTop = aTypesHeap.ReleaseTop() )
-    {
-        if (pLastHeapTop != 0)
-        {
-            if ( 0 == strcmp(pHeapTop->Key(), pLastHeapTop->Key()) )
-                continue;
-            delete pLastHeapTop;
-            // pLastHeapTop = 0;
-        }
-        pLastHeapTop = pHeapTop;
-
-        WriteStr( aOut, "\t\\\n\t\t" );
-
-        const char * sEnd = strchr( pHeapTop->Key(), ' ' );
-        if (sEnd != 0)
-        {
-            const char * sQuali = strrchr( pHeapTop->Key(), ' ' )+1;
-            WriteStr( aOut, sQuali );
-            WriteStr( aOut, "." );
-            aOut.write( pHeapTop->Key(), sEnd - pHeapTop->Key() );
-        }
-        else
-            WriteStr( aOut, pHeapTop->Key() );
-    }   // end for
-
-    if (pLastHeapTop != 0)
-    {
-        delete pLastHeapTop;
-        pLastHeapTop = 0;
-    }
-
-    aOut.close();
-#endif // 0
 }
 
 void
@@ -251,7 +185,7 @@ Put2File_TypeInfo( const char *            i_sOutputFile,
                    ModuleDescription &     i_rData )
 {
     std::ofstream aOut(i_sOutputFile, std::ios::out
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
                                                | std::ios::binary
 #endif
     );
@@ -299,7 +233,6 @@ StreamOut_TypeInfo( std::ostream &               o_rOut,
             if ( 0 == strcmp(pHeapTop->Key(), pLastHeapTop->Key()) )
                 continue;
             delete pLastHeapTop;
-            // pLastHeapTop = 0;
         }
         pLastHeapTop = pHeapTop;
 
@@ -324,3 +257,4 @@ StreamOut_TypeInfo( std::ostream &               o_rOut,
     }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/makefile.mk b/xml2cmp/source/xcd/makefile.mk
index cc9d2bca6aaa..096d5c786839 100644
--- a/xml2cmp/source/xcd/makefile.mk
+++ b/xml2cmp/source/xcd/makefile.mk
@@ -33,19 +33,19 @@ TARGETTYPE=CUI
 
 LIBTARGET=NO
 
-
-
 # --- Settings -----------------------------------------------------
 
 ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
-
 LIBONLYFILES=\
     $(OBJ)$/cr_html.obj		\
     $(OBJ)$/cr_index.obj	\
@@ -55,25 +55,18 @@ LIBONLYFILES=\
     $(OBJ)$/xmlelem.obj		\
     $(OBJ)$/xmltree.obj
 
-
 OBJFILES=\
     $(OBJ)$/main.obj		\
     $(LIBONLYFILES)
 
-
 LIB1TARGET=$(LB)$/$(TARGET).lib
 LIB1OBJFILES=\
     $(OBJFILES)
 
-
 LIB2TARGET=$(LB)$/$(TARGET)l.lib
 LIB2OBJFILES=\
     $(LIBONLYFILES)
 
-
-
-
 # --- Targets ------------------------------------------------------
 
-
 .INCLUDE :  target.mk
diff --git a/xml2cmp/source/xcd/parse.cxx b/xml2cmp/source/xcd/parse.cxx
index c17d74b5a948..454abb46d1ce 100644
--- a/xml2cmp/source/xcd/parse.cxx
+++ b/xml2cmp/source/xcd/parse.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -215,7 +216,7 @@ X2CParser::Parse_SglAttr( Simstr &          o_sAttrValue,
 
     Pass_White();
     if (*text == '>')
-        SyntaxError("no attribute found, where one was expected");
+        SyntaxError("no attribute found where one was expected");
     Simstr sAttrName;
     Get_Attribute(o_sAttrValue, sAttrName);
     if (sAttrName != i_sAttrName)
@@ -441,12 +442,9 @@ X2CParser::SyntaxError( const char * i_sText )
 void
 X2CParser::TestCurChar()
 {
-//  if (*text == '\0')
-//      SyntaxError("unexpected end of file");
-//  else
-
     if (*text == '\n')
         nFileLine++;
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/parse.hxx b/xml2cmp/source/xcd/parse.hxx
index f890e828c2c4..7bd726b9930a 100644
--- a/xml2cmp/source/xcd/parse.hxx
+++ b/xml2cmp/source/xcd/parse.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -141,3 +142,4 @@ class X2CParser
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/xmlelem.cxx b/xml2cmp/source/xcd/xmlelem.cxx
index 10662b3a40d4..3634d076c216 100644
--- a/xml2cmp/source/xcd/xmlelem.cxx
+++ b/xml2cmp/source/xcd/xmlelem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -207,7 +208,7 @@ MultipleTextElement::Data( unsigned i_nNr ) const
 {
     static const Simstr sNull_;
 
-    if (aContent.is_valid_index(i_nNr))
+    if (i_nNr < aContent.size())
         return aContent[i_nNr];
     return sNull_;
 }
@@ -262,3 +263,4 @@ MultipleAttrElement::Write2Html(    HtmlCreator & io_rHC ) const
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/xmlelem.hxx b/xml2cmp/source/xcd/xmlelem.hxx
index 1c09ca7708bb..66ebc4c76fdd 100644
--- a/xml2cmp/source/xcd/xmlelem.hxx
+++ b/xml2cmp/source/xcd/xmlelem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,8 +55,6 @@ class XmlElement
     virtual void        Insert2Index(
                             Index &             o_rIndex ) const;           // Default: Does nothing, but can be overwritten.
 
-//  virtual void        Put2Dependy() = 0;
-
     const Simstr &      Name() const            { return sName; }
 
   protected:
@@ -239,3 +238,4 @@ class MultipleAttrElement : public EmptyElement
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/xmltree.cxx b/xml2cmp/source/xcd/xmltree.cxx
index 2b4333dd3cfb..6c823a1d8054 100644
--- a/xml2cmp/source/xcd/xmltree.cxx
+++ b/xml2cmp/source/xcd/xmltree.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -247,40 +248,5 @@ Create_CompDescrOptional_Element( MultipleTextElement * & o_rTypes,
 }
 
 
-#if 0
-
-const TextElement *
-ModuleDescription::ServiceDependencies() const
-{
-    const unsigned nEarliestPossibleServiceDependenciesIndexInModules = 1;
-
-    for ( unsigned i = nEarliestPossibleServiceDependenciesIndexInModules;
-          i < Children().size();
-          ++i )
-    {
-        if ( strcmp(Children()[i]->Name(), C_sServiceDependency) == 0 )
-            return Children()[i];
-    }
-    return 0;
-}
-
-const TextElement &
-ComponentDescription::SupportedServices() const
-{
-    return *Children()[C_nSupportedServicesIndex];
-}
-
-const TextElement *
-ComponentDescription::ServiceDependencies() const
-{
-    for ( unsigned i = C_nEarliestPossibleServiceDependenciesIndex; i < Children().size(); ++i )
-    {
-        if ( strcmp(Children()[i]->Name(),C_sServiceDependency) == 0)
-            return Children()[i];
-    }
-    return 0;
-}
-
-#endif
-
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/xmltree.hxx b/xml2cmp/source/xcd/xmltree.hxx
index 3525236f4a41..9e0bdf05a8e9 100644
--- a/xml2cmp/source/xcd/xmltree.hxx
+++ b/xml2cmp/source/xcd/xmltree.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -144,3 +145,4 @@ class SupportedService : public MultipleTextElement
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/util/makefile.mk b/xml2cmp/util/makefile.mk
index e0f2799905c0..b50d318a1c37 100644
--- a/xml2cmp/util/makefile.mk
+++ b/xml2cmp/util/makefile.mk
@@ -36,15 +36,17 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-# --- Files --------------------------------------------------------
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
 
+# --- Files --------------------------------------------------------
 
 # --- Targets ------------------------------------------------------
 
 APP1TARGET=	$(TARGET)
-.IF "$(GUI)"!="OS2"
 APP1STACK=	1000000
-.ENDIF
 
 UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)
@@ -54,5 +56,3 @@ APP1DEPN=   $(LB)$/x2c_xcd.lib $(LB)$/x2c_support.lib
 APP1RPATH=  NONE
 
 .INCLUDE :  target.mk
-
-
diff --git a/xmlreader/prj/d.lst b/xmlreader/prj/d.lst
index e69de29bb2d1..e69de29bb2d1 100755..100644
--- a/xmlreader/prj/d.lst
+++ b/xmlreader/prj/d.lst